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

Merge pull request #2660 from marcosgdf/develop

Browse Source 
Close #2657 Bug: CRITICAL Dolibarr is broken
This commit is contained in:
Juanjo Menent 2015-04-18 22:19:01 +02:00
commit 98e2284566
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/filefunc.inc.php
View File

@ -66,15 +66,12 @@ $conffiletoshow = "htdocs/conf/conf.php";
//$conffile = "/etc/dolibarr/conf.php";
//$conffiletoshow = "/etc/dolibarr/conf.php";
// Replace conf filename with "conf" parameter on url by GET
if (GETPOST('conf'))
{
setcookie('dolconf', GETPOST('conf'),0,'/');
$conffile = 'conf/' . dol_sanitizeFileName(GETPOST('conf')) . '.php';
}
else
{
$conffile = 'conf/' . dol_sanitizeFileName((!empty($_COOKIE['dolconf']) ? $_COOKIE['dolconf'] : 'conf') . '.php');
//replace conf filename with "conf" parameter on url by GET
if (!empty($_GET['conf'])) {
setcookie('dolconf', $_GET['conf'],0,'/');
$conffile = 'conf/' . $_GET['conf'] . '.php';
} else {
$conffile = 'conf/' . (!empty($_COOKIE['dolconf']) ? $_COOKIE['dolconf'] : 'conf') . '.php';
}