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

New: Add name and version into disconnect popup

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-17 19:26:48 +00:00
parent 71e48fe180
commit 94e0b5c868
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/main.inc.php
View File

@ -25,7 +25,7 @@
* \file htdocs/main.inc.php * \file htdocs/main.inc.php
* \ingroup core * \ingroup core
* \brief File that defines environment for Dolibarr pages only (variables not required by scripts) * \brief File that defines environment for Dolibarr pages only (variables not required by scripts)
* \version $Id: main.inc.php,v 1.762 2011/08/17 09:51:39 cdelambert Exp $ * \version $Id: main.inc.php,v 1.763 2011/08/17 19:26:48 eldy Exp $
*/ */
@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP
@ -137,31 +137,6 @@ session_start();
// This include will set: $conf, $db, $langs, $user, $mysoc objects // This include will set: $conf, $db, $langs, $user, $mysoc objects
require_once("master.inc.php"); require_once("master.inc.php");
// Activate error interceptions
/*
function processError($code, $message, $file, $line, $context)
{
$errmess='ERROR '.$file.' - '.$line.' - '.error_reporting()." - ".$code."<br>\n";
//print $errmess;
if (error_reporting() & $code) {
print $errmess;
throw new Exception($message, $code);
}
}
set_error_handler('processError');
*/
// GET and POST converter
/*
foreach($_REQUEST as $key => $value)
{
// For prevent conflict
$var = '__'.$key;
// Create variable with tested value
$$var = GETPOST($key);
}
*/
// Activate end of page function // Activate end of page function
register_shutdown_function('dol_shutdown'); register_shutdown_function('dol_shutdown');
@ -1227,9 +1202,13 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
if (! empty($conf->browser->phone)) $loginhtmltext.='<br><b>'.$langs->trans("Phone").'</b>: '.$conf->browser->phone; if (! empty($conf->browser->phone)) $loginhtmltext.='<br><b>'.$langs->trans("Phone").'</b>: '.$conf->browser->phone;
if (! empty($_SESSION["disablemodules"])) $loginhtmltext.='<br><b>'.$langs->trans("DisabledModules").'</b>: <br>'.join(', ',explode(',',$_SESSION["disablemodules"])); if (! empty($_SESSION["disablemodules"])) $loginhtmltext.='<br><b>'.$langs->trans("DisabledModules").'</b>: <br>'.join(', ',explode(',',$_SESSION["disablemodules"]));
$appli='Dolibarr';
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
// Link info // Link info
$logouthtmltext=''; $logouttext=''; $logouttext='';
$logouthtmltext=$langs->trans("Logout").'<br>'; $logouthtmltext=$appli.' '.DOL_VERSION.'<br>';
$logouthtmltext.=$langs->trans("Logout").'<br>';
//$logouthtmltext.="<br>"; //$logouthtmltext.="<br>";
if ($_SESSION["dol_authmode"] != 'forceuser' if ($_SESSION["dol_authmode"] != 'forceuser'
&& $_SESSION["dol_authmode"] != 'http') && $_SESSION["dol_authmode"] != 'http')