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

Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2

Browse Source
This commit is contained in:
lmarcouiller 2021-04-27 16:26:06 +02:00
commit a499f8f1f8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/website.lang
View File

@ -140,7 +140,7 @@ DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languag
GenerateSitemaps=Generate website sitemap file GenerateSitemaps=Generate website sitemap file
ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file... ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
ConfirmSitemapsCreation=Confirm sitemap generation ConfirmSitemapsCreation=Confirm sitemap generation
SitemapGenerated=Sitemap file generated SitemapGenerated=Sitemap file <b>%s</b> generated
ImportFavicon=Favicon ImportFavicon=Favicon
ErrorFaviconType=Favicon must be png ErrorFaviconType=Favicon must be png
ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64 ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64

15
htdocs/website/index.php
View File

@ -2260,7 +2260,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
$domtree->formatOutput = true; $domtree->formatOutput = true;
$xmlname = 'sitemap.'.$websitekey.'.xml'; $xmlname = 'sitemap.xml';
$sql = "SELECT wp.rowid, wp.type_container , wp.pageurl, wp.lang, wp.fk_page, wp.tms as tms,"; $sql = "SELECT wp.rowid, wp.type_container , wp.pageurl, wp.lang, wp.fk_page, wp.tms as tms,";
$sql .= " w.virtualhost, w.fk_default_home"; $sql .= " w.virtualhost, w.fk_default_home";
@ -2285,7 +2285,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
$shortlangcode = substr($objp->lang, 0, 2); // en_US or en-US -> en $shortlangcode = substr($objp->lang, 0, 2); // en_US or en-US -> en
} }
if (empty($shortlangcode)) { if (empty($shortlangcode)) {
$shortlangcode = substr($object->lang, 0, 2); // en_US or en-US -> en $shortlangcode = substr($object->lang, 0, 2); // Use short lang code of website
} }
// Forge $pageurl, adding language prefix if it is an alternative language // Forge $pageurl, adding language prefix if it is an alternative language
@ -2344,7 +2344,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
$xhtmllink = $domtree->createElement('xhtml:link', ''); $xhtmllink = $domtree->createElement('xhtml:link', '');
$xhtmllink->setAttribute("rel", "alternante"); $xhtmllink->setAttribute("rel", "alternante");
$xhtmllink->setAttribute("hreflang", $tmpshortlangcode); $xhtmllink->setAttribute("hreflang", $tmpshortlangcode);
$xhtmllink->setAttribute("href", $domainname.($objp->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($objp->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php')); $xhtmllink->setAttribute("href", $domainname.($objp->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php'));
$url->appendChild($xhtmllink); $url->appendChild($xhtmllink);
$alternatefound++; $alternatefound++;
@ -2353,7 +2353,8 @@ if ($action == 'generatesitemaps' && $usercanedit) {
} }
// Add "has translation pages" // Add "has translation pages"
$sql = 'SELECT rowid as id, lang, pageurl from '.MAIN_DB_PREFIX.'website_page where fk_page IN ('.$db->sanitize($objp->rowid.($translationof ? ', '.$translationof : '')).")"; $sql = 'SELECT rowid as id, lang, pageurl from '.MAIN_DB_PREFIX.'website_page';
$sql .= ' WHERE status = '.WebsitePage::STATUS_VALIDATED.' AND fk_page IN ('.$db->sanitize($objp->rowid.($translationof ? ', '.$translationof : '')).")";
$resqlhastrans = $db->query($sql); $resqlhastrans = $db->query($sql);
if ($resqlhastrans) { if ($resqlhastrans) {
$num_rows_hastrans = $db->num_rows($resqlhastrans); $num_rows_hastrans = $db->num_rows($resqlhastrans);
@ -2367,7 +2368,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
$xhtmllink = $domtree->createElement('xhtml:link', ''); $xhtmllink = $domtree->createElement('xhtml:link', '');
$xhtmllink->setAttribute("rel", "alternate"); $xhtmllink->setAttribute("rel", "alternate");
$xhtmllink->setAttribute("hreflang", $tmpshortlangcode); $xhtmllink->setAttribute("hreflang", $tmpshortlangcode);
$xhtmllink->setAttribute("href", $domainname.($objp->fk_default_home == $objhastrans->id ? '/' : (($tmpshortlangcode != substr($objp->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$objhastrans->pageurl.'.php')); $xhtmllink->setAttribute("href", $domainname.($objp->fk_default_home == $objhastrans->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$objhastrans->pageurl.'.php'));
$url->appendChild($xhtmllink); $url->appendChild($xhtmllink);
$alternatefound++; $alternatefound++;
@ -2396,7 +2397,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
if (!empty($conf->global->MAIN_UMASK)) { if (!empty($conf->global->MAIN_UMASK)) {
@chmod($tempdir.$xmlname, octdec($conf->global->MAIN_UMASK)); @chmod($tempdir.$xmlname, octdec($conf->global->MAIN_UMASK));
} }
setEventMessages($langs->trans("SitemapGenerated"), null, 'mesgs'); setEventMessages($langs->trans("SitemapGenerated", $xmlname), null, 'mesgs');
} else { } else {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
@ -2414,7 +2415,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
$robotsitemap = "Sitemap: ".$domainname."/".$xmlname; $robotsitemap = "Sitemap: ".$domainname."/".$xmlname;
$result = strpos($robotcontent, 'Sitemap: '); $result = strpos($robotcontent, 'Sitemap: ');
if ($result) { if ($result) {
$result = preg_replace("/Sitemap.*\n/", $robotsitemap, $robotcontent); $result = preg_replace('/Sitemap:.*/', $robotsitemap, $robotcontent);
$robotcontent = $result ? $result : $robotcontent; $robotcontent = $result ? $result : $robotcontent;
} else { } else {
$robotcontent .= $robotsitemap."\n"; $robotcontent .= $robotsitemap."\n";