lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-05-18 14:53:57 +02:00
commit d60598b848
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/core/lib/website.lib.php
View File

@ -520,7 +520,7 @@ function includeContainer($containerref)
$tmpoutput = ob_get_contents(); $tmpoutput = ob_get_contents();
ob_end_clean(); ob_end_clean();
print "\n".'<!-- include '.$fullpathfile.' level = '.$includehtmlcontentopened.' -->'."\n"; print "\n".'<!-- include '.$websitekey.'/'.$containerref.' level = '.$includehtmlcontentopened.' -->'."\n";
print preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput); print preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
if (!$res) if (!$res)
@ -533,8 +533,9 @@ function includeContainer($containerref)
/** /**
* Return HTML content to add structured data for an article, news or Blog Post. * Return HTML content to add structured data for an article, news or Blog Post.
* Use the json-ld format.
* *
* @param string $type 'blogpost', 'product', 'software'... * @param string $type 'blogpost', 'product', 'software', 'organization', ...
* @param array $data Array of data parameters for structured data * @param array $data Array of data parameters for structured data
* @return string HTML content * @return string HTML content
*/ */
@ -551,7 +552,7 @@ function getStructuredData($type, $data = array())
"@type": "SoftwareApplication", "@type": "SoftwareApplication",
"name": "'.dol_escape_json($data['name']).'", "name": "'.dol_escape_json($data['name']).'",
"operatingSystem": "'.dol_escape_json($data['os']).'", "operatingSystem": "'.dol_escape_json($data['os']).'",
"applicationCategory": "https://schema.org/GameApplication", "applicationCategory": "https://schema.org/'.$data['applicationCategory'].'",
"aggregateRating": { "aggregateRating": {
"@type": "AggregateRating", "@type": "AggregateRating",
"ratingValue": "'.$data['ratingvalue'].'", "ratingValue": "'.$data['ratingvalue'].'",
@ -575,21 +576,24 @@ function getStructuredData($type, $data = array())
$ret .= '{ $ret .= '{
"@context": "https://schema.org", "@context": "https://schema.org",
"@type": "Organization", "@type": "Organization",
"name": "'.dol_escape_json($companyname).'", "name": "'.dol_escape_json($data['name'] ? $data['name'] : $companyname).'",
"url": "'.$url.'", "url": "'.dol_escape_json($data['url'] ? $data['url'] : $url).'",
"logo": "/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'", "logo": "'.($data['logo'] ? dol_escape_json($data['logo']) : '/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo)).'",
"contactPoint": { "contactPoint": {
"@type": "ContactPoint", "@type": "ContactPoint",
"contactType": "Contact", "contactType": "Contact",
"email": "'.dol_escape_json($mysoc->email).'" "email": "'.dol_escape_json($data['email'] ? $data['email'] : $mysoc->email).'"
},'; },'."\n";
if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) { if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
$ret .= '"sameAs": ['; $ret .= '"sameAs": [';
$i = 0; $i = 0;
foreach($mysoc->socialnetworks as $key => $value) { foreach($mysoc->socialnetworks as $key => $value) {
if ($key == 'linkedin') { if ($key == 'linkedin') {
$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"'; $ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
} else { } elseif ($key == 'youtube') {
$ret.= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';
}
else {
$ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"'; $ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
} }
$i++; $i++;