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

Uniformize code

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-19 19:14:17 +01:00
parent 52e2253e20
commit d7cc1bdc88
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/admin/security.php
View File

@ -26,6 +26,8 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php");
$action=GETPOST('action');
$langs->load("users"); $langs->load("users");
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");
@ -41,7 +43,7 @@ $mesg = '';
/* /*
* Actions * Actions
*/ */
if ($_GET["action"] == 'setgeneraterule') if ($action == 'setgeneraterule')
{ {
if (! dolibarr_set_const($db, 'USER_PASSWORD_GENERATED',$_GET["value"],'chaine',0,'',$conf->entity)) if (! dolibarr_set_const($db, 'USER_PASSWORD_GENERATED',$_GET["value"],'chaine',0,'',$conf->entity))
{ {
@ -54,7 +56,7 @@ if ($_GET["action"] == 'setgeneraterule')
} }
} }
if ($_GET["action"] == 'activate_encrypt') if ($action == 'activate_encrypt')
{ {
$error=0; $error=0;
@ -109,7 +111,7 @@ if ($_GET["action"] == 'activate_encrypt')
dol_print_error($db,''); dol_print_error($db,'');
} }
} }
else if ($_GET["action"] == 'disable_encrypt') else if ($action == 'disable_encrypt')
{ {
//On n'autorise pas l'annulation de l'encryption car les mots de passe ne peuvent pas etre decodes //On n'autorise pas l'annulation de l'encryption car les mots de passe ne peuvent pas etre decodes
//Do not allow "disable encryption" as passwords cannot be decrypted //Do not allow "disable encryption" as passwords cannot be decrypted
@ -121,7 +123,7 @@ else if ($_GET["action"] == 'disable_encrypt')
exit; exit;
} }
if ($_GET["action"] == 'activate_encryptdbpassconf') if ($action == 'activate_encryptdbpassconf')
{ {
$result = encodedecode_dbpassconf(1); $result = encodedecode_dbpassconf(1);
if ($result > 0) if ($result > 0)
@ -136,7 +138,7 @@ if ($_GET["action"] == 'activate_encryptdbpassconf')
$mesg='<div class="warning">'.$langs->trans('InstrucToEncodePass',dol_encode($dolibarr_main_db_pass)).'</div>'; $mesg='<div class="warning">'.$langs->trans('InstrucToEncodePass',dol_encode($dolibarr_main_db_pass)).'</div>';
} }
} }
else if ($_GET["action"] == 'disable_encryptdbpassconf') else if ($action == 'disable_encryptdbpassconf')
{ {
$result = encodedecode_dbpassconf(0); $result = encodedecode_dbpassconf(0);
if ($result > 0) if ($result > 0)
@ -152,26 +154,26 @@ else if ($_GET["action"] == 'disable_encryptdbpassconf')
} }
} }
if ($_GET["action"] == 'activate_pdfsecurity') if ($action == 'activate_pdfsecurity')
{ {
dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1",'chaine',0,'',$conf->entity); dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1",'chaine',0,'',$conf->entity);
Header("Location: security.php"); Header("Location: security.php");
exit; exit;
} }
else if ($_GET["action"] == 'disable_pdfsecurity') else if ($action == 'disable_pdfsecurity')
{ {
dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION",$conf->entity); dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION",$conf->entity);
Header("Location: security.php"); Header("Location: security.php");
exit; exit;
} }
if ($_GET["action"] == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK') if ($action == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK')
{ {
dolibarr_set_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", '1','chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", '1','chaine',0,'',$conf->entity);
Header("Location: security.php"); Header("Location: security.php");
exit; exit;
} }
else if ($_GET["action"] == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK') else if ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
{ {
dolibarr_del_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK",$conf->entity); dolibarr_del_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK",$conf->entity);
Header("Location: security.php"); Header("Location: security.php");
@ -190,7 +192,7 @@ llxHeader('',$langs->trans("Passwords"));
print_fiche_titre($langs->trans("SecuritySetup"),'','setup'); print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
if ($mesg) print $mesg."<br>\n"; dol_htmloutput_mesg($mesg);
print $langs->trans("GeneratedPasswordDesc")."<br>\n"; print $langs->trans("GeneratedPasswordDesc")."<br>\n";
print "<br>\n"; print "<br>\n";

15
htdocs/core/lib/security.lib.php
View File

@ -27,10 +27,11 @@
/** /**
* Encode a string * Encode a string with base 64 algorithm + specific change
* Code of this function is useless and we should use base64_encode only instead
* *
* @param string $chain chaine de caracteres a encoder * @param string $chain string to encode
* @return string chaine de caracteres encodees * @return string encoded string
*/ */
function dol_encode($chain) function dol_encode($chain)
{ {
@ -45,10 +46,12 @@ function dol_encode($chain)
} }
/** /**
* Decode a string * Decode a base 64 encoded + specific string.
* This function is called by filefunc.inc.php at each page call.
* Code of this function is useless and we should use base64_decode only instead
* *
* @param string $chain chaine de caracteres a decoder * @param string $chain string to decode
* @return string chaine de caracteres decodee * @return string decoded string
*/ */
function dol_decode($chain) function dol_decode($chain)
{ {