diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index fc2c4e141d5..2669e741c6e 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -153,7 +153,7 @@ if (ini_get('safe_mode') && !empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
}
}
-print '';
+print '';
if (defined('MAIN_ANTIVIRUS_COMMAND')) {
print '
'.$langs->trans("ValueIsForcedBySystem").'';
}
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index 460e568501b..0668e4612ae 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -83,6 +83,7 @@ print '';
print ''.$langs->trans("OfficialWebSite").'';
print '';
// Show local site
+/*
if (preg_match('/^fr_/i', $langs->getDefaultLang()))
{
print '';
@@ -112,7 +113,7 @@ if (preg_match('/^de_/i', $langs->getDefaultLang()))
print '';
print ''.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Germany")).'';
print '';
-}
+}*/
print '';
print ''.$langs->trans("OfficialWiki").'';
print '';
@@ -168,7 +169,7 @@ print $langs->trans("OtherResources").':';
print '';
$url = 'https://saas.dolibarr.org'; $title = $langs->trans("OfficialWebHostingService");
-if (preg_match('/^fr_/i', $langs->getDefaultLang())) $url = 'https://wiki.dolibarr.org/index.php/Solutions_de_Cloud';
+if (preg_match('/^fr_/i', $langs->getDefaultLang())) $url = 'https://wiki.dolibarr.org/index.php/Solutions_Cloud_pour_Dolibarr_ERP_CRM';
if (preg_match('/^es_/i', $langs->getDefaultLang())) $url = 'https://wiki.dolibarr.org/index.php/Soluciones_en_la_Nube';
print '- ';
print ''.$title.'';
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 80c4556c35a..6d9e3574789 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -62,7 +62,7 @@ print "
Web server - ".$langs->trans("Version").": ".$_SERVE
print '
';
print ''.$langs->trans("XDebug").': ';
$test = !function_exists('xdebug_is_enabled');
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
else {
print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("XDebug"));
print ' - '.$langs->trans("MoreInformation").' XDebug admin page';
@@ -73,7 +73,7 @@ print '
';
print '
';
print ''.$langs->trans("Syslog").': ';
$test = empty($conf->syslog->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
else {
print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("Syslog"));
//print ' '.$langs->trans("MoreInformation").' XDebug admin page';
@@ -84,7 +84,7 @@ print '
';
print '
';
print ''.$langs->trans("DebugBar").': ';
$test = empty($conf->debugbar->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
else {
print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("DebugBar"));
//print ' '.$langs->trans("MoreInformation").' XDebug admin page';
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index cb708090386..a959aee2e54 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -66,32 +66,40 @@ print "PHP safe_mode = ".(ini_get('safe_mode') ? ini_get('safe_
print "PHP open_basedir = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0))."
\n";
print '
';
+print '
';
print load_fiche_titre($langs->trans("ConfigFile"), '', '');
print ''.$langs->trans("dolibarr_main_prod").': '.$dolibarr_main_prod;
+if (empty($dolibarr_main_prod)) {
+ print img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis");
+}
// dolibarr_main_prod
+print '
';
print '
';
print '
';
+print load_fiche_titre($langs->trans("Permissions"), '', '');
-print load_fiche_titre($langs->trans("PermissionsOnFiles"), '', '');
-
-print ''.$langs->trans("PermissionOnFileInWebRoot").': ';
-// TODO
+print ''.$langs->trans("PermissionsOnFilesInWebRoot").': ';
+// TODO Check permission are read only except for custom dir
print 'TODO';
-
-
-print '
';
print '
';
+print ''.$langs->trans("PermissionsOnFile", 'conf.php').': ';
+// TODO Check permission on file conf.php (read only for the web user)
+print 'TODO';
+print '
';
+print '
';
+
+print '
';
print load_fiche_titre($langs->trans("Modules"), '', '');
// XDebug
print ''.$langs->trans("XDebug").': ';
$test = !function_exists('xdebug_is_enabled');
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
else {
print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("XDebug"));
print ' - '.$langs->trans("MoreInformation").' XDebug admin page';
@@ -102,7 +110,7 @@ print '
';
print '
';
print ''.$langs->trans("Syslog").': ';
$test = empty($conf->syslog->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
else {
print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("Syslog"));
//print ' '.$langs->trans("MoreInformation").' XDebug admin page';
@@ -113,14 +121,15 @@ print '
';
print '
';
print ''.$langs->trans("DebugBar").': ';
$test = empty($conf->debugbar->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
else {
print img_picto('', 'error').' '.$langs->trans("ModuleActivatedDoNotUseInProduction", $langs->transnoentities("DebugBar"));
//print ' '.$langs->trans("MoreInformation").' XDebug admin page';
}
print '
';
-print '
';
+print '
';
+print '
';
print load_fiche_titre($langs->trans("SecuritySetup"), '', '');
//print ''.$langs->trans("PasswordEncryption").': ';
@@ -130,7 +139,13 @@ print '
';
// TODO
print ''.$langs->trans("AntivirusEnabledOnUpload").': ';
-// TODO
+print yn($conf->global->MAIN_ANTIVIRUS_COMMAND ? 1 : 0);
+if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
+ print ' - '.$conf->global->MAIN_ANTIVIRUS_COMMAND;
+ if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+ print ' - '.$langs->trans("ValueIsForcedBySystem").'';
+ }
+}
print '
';
print '
';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 0221bed09f7..a908556230d 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -763,9 +763,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu->add('/admin/system/os.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoOS'), 1);
$newmenu->add('/admin/system/web.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoWebServer'), 1);
$newmenu->add('/admin/system/phpinfo.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1);
- //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);
$newmenu->add('/admin/system/database.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
- //$newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoPerf"),1);
+ if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+ $newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoPerf"),1);
+ $newmenu->add("/admin/system/security.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoSecurity"),1);
+ }
$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&leftmenu=admintools", $langs->trans("Backup"), 1);
$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools", $langs->trans("Restore"), 1);
$newmenu->add("/admin/tools/update.php?mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 354d204715f..0309706312f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
YourSession=Your session
Sessions=Users Sessions
WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (%s) may be protected (for example by OS permissions or by PHP directive open_basedir).
DBStoringCharset=Database charset to store data
DBSortingCharset=Database charset to sort data
@@ -1179,6 +1181,7 @@ InfoWebServer=About Web Server
InfoDatabase=About Database
InfoPHP=About PHP
InfoPerf=About Performances
+InfoSecurity=About Security
BrowserName=Browser name
BrowserOS=Browser OS
ListOfSecurityEvents=List of Dolibarr security events
@@ -1558,7 +1561,9 @@ LDAPDescValues=Example values are designed for OpenLDAP with following lo
ForANonAnonymousAccess=For an authenticated access (for a write access for example)
PerfDolibarr=Performance setup/optimizing report
YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
ApplicativeCache=Applicative cache
MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server.
MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -2032,6 +2037,8 @@ UseDebugBar=Use the debug bar
DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
EXPORTS_SHARE_MODELS=Export models are share with everybody
ExportSetup=Setup of module Export
ImportSetup=Setup of module Import
@@ -2069,3 +2076,6 @@ MailToSendEventPush=Event reminder email
SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
DictionaryProductNature= Nature of product
CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
\ No newline at end of file