From 8b6d613cb009be96505aff6a802059181a7a5f62 Mon Sep 17 00:00:00 2001 From: Andrelec1 Date: Tue, 12 Aug 2014 12:29:20 +0200 Subject: [PATCH 1/2] Hidde version on login page Create option and use it in login template --- htdocs/admin/security_other.php | 29 +++++++++++++++++++++++++++++ htdocs/core/tpl/login.tpl.php | 6 ++++-- htdocs/langs/fr_FR/admin.lang | 1 + 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 54bc933374c..86c89edb6fb 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -105,6 +105,13 @@ else if ($action == 'MAIN_ANTIVIRUS_PARAM') if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity)) dol_print_error($db); else setEventMessage($langs->trans("RecordModifiedSuccessfully")); } +else if ($action == 'MAIN_SECURITY_HIDDENNUMVER') +{ + if (! dolibarr_set_const($db, "MAIN_SECURITY_HIDDENNUMVER", $_POST["MAIN_SECURITY_HIDDENNUMVER"],'chaine',0,'',$conf->entity)) dol_print_error($db); + else setEventMessage($langs->trans("RecordModifiedSuccessfully")); +} + + // Delete file else if ($action == 'delete') @@ -177,6 +184,28 @@ print ''.$langs->trans("Parameters").''; print ''.$langs->trans("Status").''; print ''; +// Hidde version number +$var=!$var; +print ""; +print ''.$langs->trans("HiddeNumVersion").''; // TODO add lag +print ''; +if (! empty($conf->use_javascript_ajax)) +{ + print ajax_constantonoff('MAIN_SECURITY_HIDDENNUMVER'); +} +else +{ + if (empty($conf->global->MAIN_SECURITY_HIDDENNUMVER)) + { + print ''.img_picto($langs->trans("Disabled"),'off').''; + } + else + { + print ''.img_picto($langs->trans("Enabled"),'on').''; + } +} +print ''; + // Enable Captcha code $var=!$var; print ""; diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index efd0b46d6b4..78830d0ca23 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -27,6 +27,8 @@ if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1; $arrayofjs=array('/core/js/dst.js'.(empty($conf->dol_use_jmobile)?'':'?version='.urlencode(DOL_VERSION))); // Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second $titleofloginpage=$langs->trans('Login').' '.$title; // title is defined by dol_loginfunction in security2.lib.php +$titleAff = !empty($conf->$global->MAIN_SECURITY_HIDDENNUMVER) ? dol_escape_htmltag($title) : "Dolibarr" ; + print top_htmlhead('',$titleofloginpage,0,0,$arrayofjs); ?> @@ -61,8 +63,8 @@ $(document).ready(function () { - - +
+

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 1624a8222bd..dc1eca63322 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -81,6 +81,7 @@ MustBeLowerThanPHPLimit=Remarque : Votre PHP limite la taille des envois à NoMaxSizeByPHPLimit=Aucune limite configurée dans votre serveur PHP MaxSizeForUploadedFiles=Taille maximum des fichiers envoyés (0 pour interdire l'envoi) UseCaptchaCode=Utilisation du code graphique (CAPTCHA) sur la page de connexion +HiddeNumVersion=Cacher le numero de version sur la page de login UseAvToScanUploadedFiles=Utiliser un antivirus pour vérifier les fichiers envoyés AntiVirusCommand= Chemin complet vers la commande antivirus AntiVirusCommandExample= Exemple pour ClamWin : c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Exemple pour ClamAv : /usr/bin/clamscan From 1ffb964dd15eb7208383db93dbea1c131263ac4c Mon Sep 17 00:00:00 2001 From: Andrelec1 Date: Thu, 14 Aug 2014 16:06:43 +0200 Subject: [PATCH 2/2] Change method Replace by existing constant .. --- htdocs/admin/security_other.php | 45 ++++++++++++++------------------- htdocs/core/tpl/login.tpl.php | 5 ++-- htdocs/langs/fr_FR/admin.lang | 3 ++- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 86c89edb6fb..8c65d1f3359 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -105,9 +105,9 @@ else if ($action == 'MAIN_ANTIVIRUS_PARAM') if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity)) dol_print_error($db); else setEventMessage($langs->trans("RecordModifiedSuccessfully")); } -else if ($action == 'MAIN_SECURITY_HIDDENNUMVER') +else if ($action == 'MAIN_APPLICATION_TITLE') { - if (! dolibarr_set_const($db, "MAIN_SECURITY_HIDDENNUMVER", $_POST["MAIN_SECURITY_HIDDENNUMVER"],'chaine',0,'',$conf->entity)) dol_print_error($db); + if (! dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity)) dol_print_error($db); else setEventMessage($langs->trans("RecordModifiedSuccessfully")); } @@ -170,8 +170,24 @@ print 'global->MAIN_APPLICATION_TITLE)) $conf->global->MAIN_APPLICATION_TITLE=""; +print '
'; +print ''; +print ''; +print ''.$langs->trans("HiddeNumVersion").''; +print $form->textwithpicto('',$langs->trans("HiddeNumVersionExample",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); +print ''; +print ''; +print ' '; +print ''; +print ''; +print ''; +print ''; +print '
'; +print ''; print '
'; @@ -184,28 +200,6 @@ print ''.$langs->trans("Parameters").''; print ''.$langs->trans("Status").''; print ''; -// Hidde version number -$var=!$var; -print ""; -print ''.$langs->trans("HiddeNumVersion").''; // TODO add lag -print ''; -if (! empty($conf->use_javascript_ajax)) -{ - print ajax_constantonoff('MAIN_SECURITY_HIDDENNUMVER'); -} -else -{ - if (empty($conf->global->MAIN_SECURITY_HIDDENNUMVER)) - { - print ''.img_picto($langs->trans("Disabled"),'off').''; - } - else - { - print ''.img_picto($langs->trans("Enabled"),'on').''; - } -} -print ''; - // Enable Captcha code $var=!$var; print ""; @@ -362,6 +356,5 @@ $formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestF $filearray=dol_dir_list($upload_dir, "files", 0, '', '', 'name', SORT_ASC, 1); $formfile->list_of_documents($filearray, '', 'admin_temp', ''); - llxFooter(); $db->close(); diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 78830d0ca23..e943619f563 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -27,7 +27,6 @@ if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1; $arrayofjs=array('/core/js/dst.js'.(empty($conf->dol_use_jmobile)?'':'?version='.urlencode(DOL_VERSION))); // Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second $titleofloginpage=$langs->trans('Login').' '.$title; // title is defined by dol_loginfunction in security2.lib.php -$titleAff = !empty($conf->$global->MAIN_SECURITY_HIDDENNUMVER) ? dol_escape_htmltag($title) : "Dolibarr" ; print top_htmlhead('',$titleofloginpage,0,0,$arrayofjs); ?> @@ -63,8 +62,8 @@ $(document).ready(function () { - - + +
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index dc1eca63322..b3774d477eb 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -81,7 +81,8 @@ MustBeLowerThanPHPLimit=Remarque : Votre PHP limite la taille des envois à NoMaxSizeByPHPLimit=Aucune limite configurée dans votre serveur PHP MaxSizeForUploadedFiles=Taille maximum des fichiers envoyés (0 pour interdire l'envoi) UseCaptchaCode=Utilisation du code graphique (CAPTCHA) sur la page de connexion -HiddeNumVersion=Cacher le numero de version sur la page de login +HiddeNumVersion=Modifier titre du site +HiddeNumVersionExample=Remplace titre du site, si laisser vide cela affiche la valeur par defaut ( Dolibarr X.X.X ) UseAvToScanUploadedFiles=Utiliser un antivirus pour vérifier les fichiers envoyés AntiVirusCommand= Chemin complet vers la commande antivirus AntiVirusCommandExample= Exemple pour ClamWin : c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Exemple pour ClamAv : /usr/bin/clamscan