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

Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy

Browse Source
This commit is contained in:
Alexandre SPANGARO 2018-10-16 06:33:46 +02:00
commit a6e000ec79
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,7 +305,7 @@ function redirectToContainer($containerref, $containeraliasalt='',$containerid=0
*/ */
function includeContainer($containerref) function includeContainer($containerref)
{ {
global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $weblangs; // Very important. Required to have var available when running inluded containers. global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
global $includehtmlcontentopened; global $includehtmlcontentopened;
global $websitekey, $websitepagefile; global $websitekey, $websitepagefile;
@ -624,7 +624,7 @@ function dolSavePageContent($filetpl, $object, $objectpage)
$tplcontent.= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n"; $tplcontent.= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
$tplcontent.= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n"; $tplcontent.= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
$tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n"; $tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
$tplcontent.= '<link href="/'.$objectpage->pageurl.'.php" rel="canonical" />'."\n"; $tplcontent.= '<link href="/'.(($objectpage->id == $object->fk_default_home) ? '' : ($objectpage->pageurl.'.php')).'" rel="canonical" />'."\n";
$tplcontent.= '<!-- Include link to CSS file -->'."\n"; $tplcontent.= '<!-- Include link to CSS file -->'."\n";
$tplcontent.= '<link rel="stylesheet" href="styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n"; $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
$tplcontent.= '<!-- Include HTML header from common file -->'."\n"; $tplcontent.= '<!-- Include HTML header from common file -->'."\n";

70
htdocs/core/website.inc.php
View File

@ -25,16 +25,28 @@
// Load website class // Load website class
include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
// Define $website and $weblangs // Define $website
if (! is_object($website)) if (! is_object($website))
{ {
$website=new Website($db); $website=new Website($db);
$website->fetch(0,$websitekey); $website->fetch(0,$websitekey);
} }
// Define $weblangs
if (! is_object($weblangs)) if (! is_object($weblangs))
{ {
$weblangs = dol_clone($langs); // TODO Use an object lang from a language set into $website object instead of backoffice $weblangs = dol_clone($langs); // TODO Use an object lang from a language set into $website object instead of backoffice
} }
// Define $websitepage if we have $websitepagefile defined
if (! $pageid && ! empty($websitepagefile))
{
$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile));
}
if ($pageid > 0)
{
include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
$websitepage=new WebsitePage($db);
$websitepage->fetch($pageid);
}
// A lang was forced, so we change weblangs init // A lang was forced, so we change weblangs init
if (GETPOST('l','aZ09')) $weblangs->setDefaultLang(GETPOST('l','aZ09')); if (GETPOST('l','aZ09')) $weblangs->setDefaultLang(GETPOST('l','aZ09'));
@ -44,44 +56,32 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php') // If we browsing
//print_r(get_defined_constants(true));exit; //print_r(get_defined_constants(true));exit;
if (GETPOST('l','aZ09')) if (GETPOST('l','aZ09'))
{ {
if (! $pageid && ! empty($websitepagefile)) $sql ="SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page";
{ $sql.=" FROM ".MAIN_DB_PREFIX."website_page as wp";
$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile)); $sql.=" WHERE wp.fk_website = ".$website->id;
} $sql.=" AND (wp.fk_page = ".$pageid." OR wp.rowid = ".$pageid;
if ($pageid > 0) if (is_object($websitepage) && $websitepage->fk_page > 0) $sql.=" OR wp.fk_page = ".$websitepage->fk_page." OR wp.rowid = ".$websitepage->fk_page;
{ $sql.=")";
// Load tmppage if we have $websitepagefile defined $sql.= " AND wp.lang = '".$db->escape(GETPOST('l','aZ09'))."'";
include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
$tmppage=new WebsitePage($db);
$tmppage->fetch($pageid);
$sql ="SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page"; $resql = $db->query($sql);
$sql.=" FROM ".MAIN_DB_PREFIX."website_page as wp"; if ($resql)
$sql.=" WHERE wp.fk_website = ".$website->id; {
$sql.=" AND (wp.fk_page = ".$pageid." OR wp.rowid = ".$pageid; $obj = $db->fetch_object($resql);
if ($tmppage->fk_page > 0) $sql.=" OR wp.fk_page = ".$tmppage->fk_page." OR wp.rowid = ".$tmppage->fk_page; if ($obj)
$sql.=")";
$sql.= " AND wp.lang = '".$db->escape(GETPOST('l','aZ09'))."'";
$resql = $db->query($sql);
if ($resql)
{ {
$obj = $db->fetch_object($resql); $newpageid = $obj->rowid;
if ($obj) if ($newpageid != $pageid) // To avoid to make a redirect on same page (infinite loop)
{ {
$newpageid = $obj->rowid; if (defined('USEDOLIBARRSERVER')) {
if ($newpageid != $pageid) // To avoid to make a redirect on same page (infinite loop) header("Location: ".DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$newpageid.'&l='.GETPOST('l','aZ09'));
exit;
}
else
{ {
if (defined('USEDOLIBARRSERVER')) { $newpageref = $obj->pageurl;
header("Location: ".DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$newpageid.'.php&l='.GETPOST('l','aZ09')); header("Location: ".$newpageref.'.php?l='.GETPOST('l','aZ09'));
exit; exit;
}
else
{
$newpageref = $obj->pageurl;
header("Location: ".$newpageref.'.php?l='.GETPOST('l','aZ09'));
exit;
}
} }
} }
} }