Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 08:02:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy)
2025-01-30 23:09:46 +01:00
parent 9530afc85e 249047c1f9
commit b5091dd425
6 changed files with 66 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -779,13 +779,13 @@ function getStructuredData($type, $data = array())
$pageurl = $websitepage->pageurl;
$title = $websitepage->title;
$image = $websitepage->image;
$image = getImageFromHtmlContent($websitepage->content);
$companyname = $mysoc->name;
$description = $websitepage->description;
$pageurl = str_replace('__WEBSITE_KEY__', $website->ref, $pageurl);
$title = str_replace('__WEBSITE_KEY__', $website->ref, $title);
$image = '/medias'.(preg_match('/^\//', $image) ? '' : '/').str_replace('__WEBSITE_KEY__', $website->ref, $image);
$imagepath = '/medias'.(preg_match('/^\//', $image) ? '' : '/').str_replace('__WEBSITE_KEY__', $website->ref, $image);
$companyname = str_replace('__WEBSITE_KEY__', $website->ref, $companyname);
$description = str_replace('__WEBSITE_KEY__', $website->ref, $description);
@@ -798,10 +798,14 @@ function getStructuredData($type, $data = array())
"@type": "WebPage",
"@id": "'.dol_escape_json($pageurl).'"
},
"headline": "'.dol_escape_json($title).'",
"headline": "'.dol_escape_json($title).'",';
if ($image) {
$ret .= '
"image": [
"'.dol_escape_json($image).'"
],
"'.dol_escape_json($imagepath).'"
],';
}
$ret .= '
"dateCreated": "'.dol_print_date($websitepage->date_creation, 'dayhourrfc').'",
"datePublished": "'.dol_print_date($websitepage->date_creation, 'dayhourrfc').'",
"dateModified": "'.dol_print_date($websitepage->date_modification, 'dayhourrfc').'",
@@ -814,7 +818,7 @@ function getStructuredData($type, $data = array())
"name": "'.dol_escape_json($companyname).'",
"logo": {
"@type": "ImageObject",
"url": "/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'"
"url": "/wrapper.php?modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo).'"
}
},'."\n";
if ($websitepage->keywords) {