diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 9d63e096cd5..2a343808c8b 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -163,7 +163,6 @@ $a.=' ('.(getServerTimeZoneInt()>=0?'+':'').(getServerTimeZoneInt()*3600).')'; print $form->textwithtooltip($a,$txt,2,1,img_info('')); print ''."\n"; // value defined in http://fr3.php.net/manual/en/timezones.europe.php $var=!$var; -print dol_now(); print '  => '.$langs->trans("CurrentHour").''.dol_print_date(dol_now(),'dayhour','tzserver').''."\n"; $var=!$var; print '  => dol_print_date(0,"dayhourtext")'.dol_print_date(0,"dayhourtext").''; diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php index d57d18b7b87..4cb4ea4a653 100644 --- a/htdocs/admin/system/web.php +++ b/htdocs/admin/system/web.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2012 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,15 +17,23 @@ /** * \file htdocs/admin/system/web.php - * \brief Page des infos systeme du serveur Web + * \brief Page with web server system information */ require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); $langs->load("admin"); -if (!$user->admin) - accessforbidden(); +if (!$user->admin) accessforbidden(); + + +/* + * Action + */ + +// None + /* * View @@ -43,8 +51,16 @@ print "".$langs->trans("IP")."".$_SERVER[" print "".$langs->trans("Port")."" . $_SERVER["SERVER_PORT"] . "\n"; print "".$langs->trans("DocumentRootServer")."".$_SERVER["DOCUMENT_ROOT"]."\n"; print "".$langs->trans("DataRootServer")."" . DOL_DATA_ROOT . "\n"; +$labeluser=dol_getwebuser('user'); +$labelgroup=dol_getwebuser('group'); +if ($labeluser && $labelgroup) +{ + print "".$langs->trans("WebUserGroup")."".$labeluser.'/'.$labelgroup."\n"; +} print ''; llxFooter(); + +$db->close(''); ?> diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 78ba24a1318..f93b8ced2b2 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -19,6 +19,7 @@ ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connec UnlockNewSessions=Remove connection lock YourSession=Your session Sessions=Users session +WebUserGroup=Web server user/group NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). HTMLCharset=Charset for generated HTML pages DBStoringCharset=Database charset to store data diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 7deef9db821..cb2a27f075e 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -19,6 +19,7 @@ ConfirmLockNewSessions=Êtes-vous sûr de vouloir restreindre l'accès Dolibarr UnlockNewSessions=Lever blocage des connexions YourSession=Votre session Sessions=Sessions utilisateurs +WebUserGroup=Web serveur utilisateur/group NoSessionFound=Votre PHP ne semble pas pouvoir lister les sessions actives. Le répertoire de sauvegarde des sessions (%s) est peut être protégé (Par exemple, par les permissions de l'OS ou par la directive open_basedir de votre PHP, ce qui d'un point de vue sécurité est une bonne chose). HTMLCharset= Charset des pages HTML générées DBStoringCharset= Charset base pour stockage données