--- /tmp/dsg/dolibarr/htdocs/public/website/github_index.php +++ /tmp/dsg/dolibarr/htdocs/public/website/client_index.php @@ -36,8 +36,6 @@ if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); -if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip -if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1'); /** * Header empty @@ -97,7 +95,8 @@ if ($result > 0) { $pageid = $objectpage->id; - } elseif ($result == 0) + } + elseif ($result == 0) { // Page not found from ref=pageurl, we try using alternative alias $result = $objectpage->fetch(0, $object->id, null, $pageref); @@ -106,7 +105,9 @@ $pageid = $objectpage->id; } } - } else { + } + else + { if ($object->fk_default_home > 0) { $result = $objectpage->fetch($object->fk_default_home); @@ -163,7 +164,9 @@ //else header('Cache-Control: no-cache'); $original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php'; -} else { +} +else +{ $original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php'; } --- /tmp/dsg/dolibarr/htdocs/public/website/github_styles.css.php +++ /tmp/dsg/dolibarr/htdocs/public/website/client_styles.css.php @@ -27,8 +27,6 @@ if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); -if (!defined('NOIPCHECK')) define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip -if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1'); /** * Header empty @@ -71,20 +69,22 @@ if (empty($pageid)) { - require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; - require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php'; + require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; + require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php'; - $object = new Website($db); - if ($websiteid) - { - $object->fetch($websiteid); - $website = $object->ref; - } else { - $object->fetch(0, $website); - } + $object = new Website($db); + if ($websiteid) + { + $object->fetch($websiteid); + $website = $object->ref; + } + else + { + $object->fetch(0, $website); + } - $objectpage = new WebsitePage($db); - /* Not required for CSS file + $objectpage = new WebsitePage($db); + /* Not required for CSS file $array=$objectpage->fetchAll($object->id); if (is_array($array) && count($array) > 0) @@ -115,7 +115,7 @@ // Limite acces si droits non corrects if (!$accessallowed) { - accessforbidden(); + accessforbidden(); } // Security: @@ -123,10 +123,10 @@ // les noms de fichiers. if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file)) { - dol_syslog("Refused to deliver file ".$original_file); - $file = basename($original_file); // Do no show plain path of original_file in shown error message - dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $file)); - exit; + dol_syslog("Refused to deliver file ".$original_file); + $file = basename($original_file); // Do no show plain path of original_file in shown error message + dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $file)); + exit; } clearstatcache(); @@ -140,10 +140,10 @@ // This test if file exists should be useless. We keep it to find bug more easily if (!file_exists($original_file_osencoded)) { - $langs->load("website"); - print $langs->trans("RequestedPageHasNoContentYet", $pageid); - //dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file)); - exit; + $langs->load("website"); + print $langs->trans("RequestedPageHasNoContentYet", $pageid); + //dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file)); + exit; }