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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-09 16:18:41 +01:00
commit 8190a68bba
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/remx.php
View File

@ -539,7 +539,7 @@ if ($socid > 0)
else else
{ {
$colspan = 8; $colspan = 8;
if (!empty($conf->multicurrency->enabled)) $colspan+=2; if (!empty($conf->multicurrency->enabled)) $colspan += 2;
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'; print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
} }
$db->free($resql); $db->free($resql);
@ -695,7 +695,7 @@ if ($socid > 0)
else else
{ {
$colspan = 8; $colspan = 8;
if (!empty($conf->multicurrency->enabled)) $colspan+=2; if (!empty($conf->multicurrency->enabled)) $colspan += 2;
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'; print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
} }
$db->free($resql); $db->free($resql);
@ -897,7 +897,7 @@ if ($socid > 0)
else else
{ {
$colspan = 8; $colspan = 8;
if (!empty($conf->multicurrency->enabled)) $colspan+=2; if (!empty($conf->multicurrency->enabled)) $colspan += 2;
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'; print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
} }
@ -1073,7 +1073,7 @@ if ($socid > 0)
else else
{ {
$colspan = 8; $colspan = 8;
if (!empty($conf->multicurrency->enabled)) $colspan+=2; if (!empty($conf->multicurrency->enabled)) $colspan += 2;
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'; print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
} }

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

@ -28,31 +28,31 @@ include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php'; include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
// Define $website // 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 // 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 // Define $websitepage if we have $websitepagefile defined
if (! $pageid && ! empty($websitepagefile)) if (!$pageid && !empty($websitepagefile))
{ {
$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile)); $pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile));
if ($pageid == 'index.php') $pageid = $website->fk_default_home; if ($pageid == 'index.php') $pageid = $website->fk_default_home;
} }
if (! is_object($websitepage)) if (!is_object($websitepage))
{ {
$websitepage=new WebsitePage($db); $websitepage = new WebsitePage($db);
} }
if ($pageid > 0) if ($pageid > 0)
{ {
$websitepage->fetch($pageid); $websitepage->fetch($pageid);
if (! defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other'))) if (!defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other')))
{ {
$weblangs->load("website"); $weblangs->load("website");
http_response_code(404); http_response_code(404);
@ -61,7 +61,7 @@ if ($pageid > 0)
} }
} }
if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
header("X-Content-Type-Options: nosniff"); header("X-Content-Type-Options: nosniff");
/* TODO Manage allow_frames flag on websitepage. /* TODO Manage allow_frames flag on websitepage.
if (empty($websitepage->allow_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) { if (empty($websitepage->allow_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) {
@ -78,13 +78,13 @@ 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'))
{ {
$sql ="SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page"; $sql = "SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page";
$sql.=" FROM ".MAIN_DB_PREFIX."website_page as wp"; $sql .= " FROM ".MAIN_DB_PREFIX."website_page as wp";
$sql.=" WHERE wp.fk_website = ".$website->id; $sql .= " WHERE wp.fk_website = ".$website->id;
$sql.=" AND (wp.fk_page = ".$pageid." OR wp.rowid = ".$pageid; $sql .= " AND (wp.fk_page = ".$pageid." OR wp.rowid = ".$pageid;
if (is_object($websitepage) && $websitepage->fk_page > 0) $sql.=" OR wp.fk_page = ".$websitepage->fk_page." OR wp.rowid = ".$websitepage->fk_page; if (is_object($websitepage) && $websitepage->fk_page > 0) $sql .= " OR wp.fk_page = ".$websitepage->fk_page." OR wp.rowid = ".$websitepage->fk_page;
$sql.=")"; $sql .= ")";
$sql.= " AND wp.lang = '".$db->escape(GETPOST('l', 'aZ09'))."'"; $sql .= " AND wp.lang = '".$db->escape(GETPOST('l', 'aZ09'))."'";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
@ -112,7 +112,7 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php') // If we browsing
} }
// Show off line message // Show off line message
if (! defined('USEDOLIBARREDITOR') && empty($website->status)) if (!defined('USEDOLIBARREDITOR') && empty($website->status))
{ {
$weblangs->load("website"); $weblangs->load("website");
http_response_code(503); http_response_code(503);