diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php index b99a1678444..beee503c37c 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.lib.php @@ -518,8 +518,8 @@ class DoliDb if (! $return) $return.=' ORDER BY '; else $return.=','; - $return.=$val; - if ($sortorder) $return.=' '.$sortorder; + $return.=preg_replace('/[^0-9a-z_\.]/i','',$val); + if ($sortorder) $return.=' '.preg_replace('/[^0-9a-z]/i','',$sortorder); } return $return; } diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index d7d36383a24..9f2e56379ff 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -494,6 +494,7 @@ class DoliDb /** * Define sort criteria of request + * * @param sortfield List of sort fields * @param sortorder Sort order * @return string String to provide syntax of a sort sql string @@ -510,8 +511,8 @@ class DoliDb if (! $return) $return.=' ORDER BY '; else $return.=','; - $return.=$val; - if ($sortorder) $return.=' '.$sortorder; + $return.=preg_replace('/[^0-9a-z_\.]/i','',$val); + if ($sortorder) $return.=' '.preg_replace('/[^0-9a-z]/i','',$sortorder); } return $return; } diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index 5ca31f120bb..3128071e3bc 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -524,8 +524,8 @@ class DoliDb if (! $return) $return.=' ORDER BY '; else $return.=','; - $return.=$val; - if ($sortorder) $return.=' '.$sortorder; + $return.=preg_replace('/[^0-9a-z_\.]/i','',$val); + if ($sortorder) $return.=' '.preg_replace('/[^0-9a-z]/i','',$sortorder); } return $return; } diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index d9c9676d74e..173b0862f66 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -666,8 +666,8 @@ class DoliDb if (! $return) $return.=' ORDER BY '; else $return.=','; - $return.=$val; - if ($sortorder) $return.=' '.$sortorder; + $return.=preg_replace('/[^0-9a-z_\.]/i','',$val); + if ($sortorder) $return.=' '.preg_replace('/[^0-9a-z]/i','',$sortorder); } return $return; } diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 52883b081a7..8da1304236b 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -35,6 +35,11 @@ require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +$id=GETPOST('id','int'); +$action=GETPOST("action"); +$group=GETPOST("group","int",3); +$confirm=GETPOST("confirm"); + // Define value to know what current user can do on users $canadduser=($user->admin || $user->rights->user->user->creer); $canreaduser=($user->admin || $user->rights->user->user->lire); @@ -48,26 +53,22 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $caneditgroup=($user->admin || $user->rights->user->group_advance->write); } // Define value to know what current user can do on properties of edited user -if ($_GET["id"]) +if ($id) { - // $user est le user qui edite, $_GET["id"] est l'id de l'utilisateur edite - $caneditfield=( (($user->id == $_GET["id"]) && $user->rights->user->self->creer) - || (($user->id != $_GET["id"]) && $user->rights->user->user->creer) ); - $caneditpassword=( (($user->id == $_GET["id"]) && $user->rights->user->self->password) - || (($user->id != $_GET["id"]) && $user->rights->user->user->password) ); + // $user est le user qui edite, $id est l'id de l'utilisateur edite + $caneditfield=( (($user->id == $id) && $user->rights->user->self->creer) + || (($user->id != $id) && $user->rights->user->user->creer) ); + $caneditpassword=( (($user->id == $id) && $user->rights->user->self->password) + || (($user->id != $id) && $user->rights->user->user->password) ); } -$action=GETPOST("action"); -$group=GETPOST("group","int",3); -$confirm=GETPOST("confirm"); - // Security check $socid=0; if ($user->societe_id > 0) $socid = $user->societe_id; $feature2='user'; -if ($user->id == $_GET["id"]) { $feature2=''; $canreaduser=1; } // A user can always read its own card -$result = restrictedArea($user, 'user', $_GET["id"], '', $feature2); -if ($user->id <> $_GET["id"] && ! $canreaduser) accessforbidden(); +if ($user->id == $id) { $feature2=''; $canreaduser=1; } // A user can always read its own card +$result = restrictedArea($user, 'user', $id, '', $feature2); +if ($user->id <> $id && ! $canreaduser) accessforbidden(); $langs->load("users"); $langs->load("companies"); @@ -82,36 +83,36 @@ $form = new Form($db); if ($_GET["subaction"] == 'addrights' && $canedituser) { $edituser = new User($db); - $edituser->fetch($_GET["id"]); + $edituser->fetch($id); $edituser->addrights($_GET["rights"]); } if ($_GET["subaction"] == 'delrights' && $canedituser) { $edituser = new User($db); - $edituser->fetch($_GET["id"]); + $edituser->fetch($id); $edituser->delrights($_GET["rights"]); } if ($action == 'confirm_disable' && $confirm == "yes" && $candisableuser) { - if ($_GET["id"] <> $user->id) + if ($id <> $user->id) { $edituser = new User($db); - $edituser->fetch($_GET["id"]); + $edituser->fetch($id); $edituser->setstatus(0); - Header("Location: ".DOL_URL_ROOT.'/user/fiche.php?id='.$_GET["id"]); + Header("Location: ".DOL_URL_ROOT.'/user/fiche.php?id='.$id); exit; } } if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser) { - if ($_GET["id"] <> $user->id) + if ($id <> $user->id) { $message=''; $edituser = new User($db); - $edituser->fetch($_GET["id"]); + $edituser->fetch($id); if (!empty($conf->file->main_limit_users)) { @@ -125,7 +126,7 @@ if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser) if (! $message) { $edituser->setstatus(1); - Header("Location: ".DOL_URL_ROOT.'/user/fiche.php?id='.$_GET["id"]); + Header("Location: ".DOL_URL_ROOT.'/user/fiche.php?id='.$id); exit; } } @@ -133,10 +134,10 @@ if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser) if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser) { - if ($_GET["id"] <> $user->id) + if ($id <> $user->id) { $edituser = new User($db); - $edituser->id=$_GET["id"]; + $edituser->id=$id; $result = $edituser->delete(); if ($result < 0) { @@ -232,13 +233,13 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield) $editgroup->oldcopy=dol_clone($editgroup); $edituser = new User($db); - $edituser->fetch($_GET["id"]); + $edituser->fetch($id); if ($action == 'addgroup') $edituser->SetInGroup($group,GETPOST('entity')); if ($action == 'removegroup') $edituser->RemoveFromGroup($group,GETPOST('entity')); if ($result > 0) { - header("Location: fiche.php?id=".$_GET["id"]); + header("Location: fiche.php?id=".$id); exit; } else @@ -271,7 +272,7 @@ if ($action == 'update' && ! $_POST["cancel"]) { $db->begin(); $edituser = new User($db); - $edituser->fetch($_GET["id"]); + $edituser->fetch($id); $edituser->oldcopy=dol_clone($edituser); @@ -360,7 +361,7 @@ if ($action == 'update' && ! $_POST["cancel"]) else if ($caneditpassword) // Case we can edit only password { $edituser = new User($db); - $edituser->fetch($_GET["id"]); + $edituser->fetch($id); $edituser->oldcopy=dol_clone($edituser); @@ -377,7 +378,7 @@ if ((($action == 'confirm_password' && $confirm == 'yes') || ($action == 'confirm_passwordsend' && $confirm == 'yes')) && $caneditpassword) { $edituser = new User($db); - $edituser->fetch($_GET["id"]); + $edituser->fetch($id); $newpassword=$edituser->setPassword($user,''); if ($newpassword < 0) @@ -800,10 +801,10 @@ else /* */ /* ************************************************************************** */ - if ($_GET["id"]) + if ($id) { $fuser = new User($db); - $fuser->fetch($_GET["id"]); + $fuser->fetch($id); // Connexion ldap // pour recuperer passDoNotExpire et userChangePassNextLogon @@ -1169,13 +1170,13 @@ else // Si on a un gestionnaire de generation de mot de passe actif if ($conf->global->USER_PASSWORD_GENERATED != 'none') { - if (($user->id != $_GET["id"] && $caneditpassword) && $fuser->login && !$fuser->ldap_sid && + if (($user->id != $id && $caneditpassword) && $fuser->login && !$fuser->ldap_sid && (empty($conf->multicompany->enabled) || ($fuser->entity == $conf->entity))) { print ''.$langs->trans("ReinitPassword").''; } - if (($user->id != $_GET["id"] && $caneditpassword) && $fuser->login && !$fuser->ldap_sid && + if (($user->id != $id && $caneditpassword) && $fuser->login && !$fuser->ldap_sid && (empty($conf->multicompany->enabled) || ($fuser->entity == $conf->entity)) ) { if ($fuser->email) print ''.$langs->trans("SendNewPassword").''; @@ -1184,19 +1185,19 @@ else } // Activer - if ($user->id <> $_GET["id"] && $candisableuser && $fuser->statut == 0 && + if ($user->id <> $id && $candisableuser && $fuser->statut == 0 && (empty($conf->multicompany->enabled) || ($fuser->entity == $conf->entity)) ) { print ''.$langs->trans("Reactivate").''; } // Desactiver - if ($user->id <> $_GET["id"] && $candisableuser && $fuser->statut == 1 && + if ($user->id <> $id && $candisableuser && $fuser->statut == 1 && (empty($conf->multicompany->enabled) || ($fuser->entity == $conf->entity)) ) { print ''.$langs->trans("DisableUser").''; } // Delete - if ($user->id <> $_GET["id"] && $candisableuser && + if ($user->id <> $id && $candisableuser && (empty($conf->multicompany->enabled) || ($fuser->entity == $conf->entity)) ) { print ''.$langs->trans("DeleteUser").''; @@ -1232,7 +1233,7 @@ else if ($caneditgroup) { $form = new Form($db); - print '