Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Grand Philippe
2013-02-24 15:30:39 +01:00
parent 7596096b89 3baf8a6c00
commit 8c765ace99
12 changed files with 231 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/security2.lib.php
View File

@@ -148,6 +148,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
$php_self = $_SERVER['PHP_SELF'];
$php_self.= $_SERVER["QUERY_STRING"]?'?'.$_SERVER["QUERY_STRING"]:'';
if (! preg_match('/mainmenu=/',$php_self)) $php_self.=(preg_match('/\?/',$php_self)?'&':'?').'mainmenu=home';
// Title
$title='Dolibarr '.DOL_VERSION;
@@ -190,7 +191,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
}
}
// Set cookie for timeout management
$prefix=dol_getprefix();
$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;