diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index ca569b66b76..0109538f71f 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -74,7 +74,7 @@ llxHeader('', $langs->trans("Audit"), $wikihelp); //$linkback=''.$langs->trans("BackToModuleList").''; print load_fiche_titre($langs->trans("SecuritySetup"), '', 'title_setup'); -print $langs->trans("LogEventDesc", $langs->transnoentitiesnoconv("AdminTools"), $langs->transnoentitiesnoconv("Audit"))."
\n"; +print ''.$langs->trans("LogEventDesc", $langs->transnoentitiesnoconv("AdminTools"), $langs->transnoentitiesnoconv("Audit"))."
\n"; print "
\n"; diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 23fa06887a9..a9c581733a4 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -66,8 +66,7 @@ llxHeader('', $langs->trans("DefaultRights"), $wikihelp); print load_fiche_titre($langs->trans("SecuritySetup"), '', 'title_setup'); -print $langs->trans("DefaultRightsDesc"); -print " ".$langs->trans("OnlyActiveElementsAreShown")."

\n"; +print ''.$langs->trans("DefaultRightsDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."

\n"; $db->begin(); diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 9974e58a1f6..670e6e43b54 100644 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -82,7 +82,7 @@ llxHeader('', $langs->trans("Proxy"), $wikihelp); print load_fiche_titre($langs->trans("SecuritySetup"), '', 'title_setup'); -print $langs->trans("ProxyDesc")."
\n"; +print ''.$langs->trans("ProxyDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 1760651b693..7a1f5c04dd2 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -194,6 +194,7 @@ if ($action == 'maj_pattern') /* * View */ + $form = new Form($db); $wikihelp = 'EN:Setup_Security|FR:Paramétrage_Sécurité|ES:Configuración_Seguridad'; @@ -201,7 +202,7 @@ llxHeader('', $langs->trans("Passwords"), $wikihelp); print load_fiche_titre($langs->trans("SecuritySetup"), '', 'title_setup'); -print $langs->trans("GeneratedPasswordDesc")."
\n"; +print ''.$langs->trans("GeneratedPasswordDesc")."
\n"; print "
\n"; diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index aeb2ee0fe19..7b11aa3570e 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -90,7 +90,7 @@ llxHeader('', $langs->trans("Files"), $wikihelp); print load_fiche_titre($langs->trans("SecuritySetup"), '', 'title_setup'); -print $langs->trans("SecurityFilesDesc")."
\n"; +print ''.$langs->trans("SecurityFilesDesc")."
\n"; print "
\n"; diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 84fc87d35f8..a742c5c45fd 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -250,11 +250,11 @@ $dolibarr_main_prod='0'; $dolibarr_main_restrict_os_commands='mysqldump, mysql, pg_dump, pgrestore'; // $dolibarr_main_restrict_ip -// To restrict access to backoffice to some ip addresses only. +// To restrict access to backoffice to some ip addresses only. Use a comma to separate values. // Note: Pages that does not need login (like public pages, web site) are not protected with this. // Default value: '' // Examples: -// $dolibarr_main_restrict_ip='127.0.0.1, 192.168.0.1'; +// $dolibarr_main_restrict_ip='127.0.0.1, ::1, 192.168.0.1'; // $dolibarr_main_restrict_ip=''; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 4824ced47db..6eeb1cb8cb7 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -309,7 +309,7 @@ if (!defined('NOLOGIN') && !defined('NOIPCHECK') && !empty($dolibarr_main_restri } if (!$found) { - print 'Access refused by IP protection'; + print 'Access refused by IP protection. Your detected IP is '.$_SERVER['REMOTE_ADDR']; exit; } }