vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix warning

Browse source
This commit is contained in:
Laurent Destailleur 2024-02-25 16:57:45 +01:00
parent 4c3830b909
commit 05914b4c78
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
htdocs/core/lib/website.lib.php
View file

@ -676,13 +676,13 @@ function getStructuredData($type, $data = array())
$ret .= '{
"@context": "https://schema.org",
"@type": "Organization",
"name": "'.dol_escape_json($data['name'] ? $data['name'] : $companyname).'",
"url": "'.dol_escape_json($data['url'] ? $data['url'] : $url).'",
"name": "'.dol_escape_json(!empty($data['name']) ? $data['name'] : $companyname).'",
"url": "'.dol_escape_json(!empty($data['url']) ? $data['url'] : $url).'",
"logo": "'.($data['logo'] ? dol_escape_json($data['logo']) : '/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo)).'",
"contactPoint": {
"@type": "ContactPoint",
"contactType": "Contact",
"email": "'.dol_escape_json($data['email'] ? $data['email'] : $mysoc->email).'"
"email": "'.dol_escape_json(!empty($data['email']) ? $data['email'] : $mysoc->email).'"
}'."\n";
if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
$ret .= ",\n";

2
htdocs/core/website.inc.php
View file

@ -67,7 +67,7 @@ if (!is_object($weblangs)) {
if (!is_object($pagelangs)) {
$pagelangs = new Translate('', $conf);
}
if ($pageid > 0) {
if (!empty($pageid) && $pageid > 0) {
$websitepage->fetch($pageid);
$weblangs->setDefaultLang(GETPOSTISSET('lang') ? GETPOST('lang', 'aZ09') : (empty($_COOKIE['weblangs-shortcode']) ? 'auto' : preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['weblangs-shortcode'])));

7
htdocs/website/class/website.class.php
View file

@ -77,10 +77,15 @@ class Website extends CommonObject
public $description;
/**
* @var string Main language of web site
* @var string Main language on 5 chars of web site
*/
public $lang;
/**
* @var string Main language on 2 chars of web site
*/
public $shortlang;
/**
* @var string List of languages of web site ('fr', 'es_MX', ...)
*/