diff options
Diffstat (limited to 'classes/pref/users.php')
| -rw-r--r-- | classes/pref/users.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/classes/pref/users.php b/classes/pref/users.php index 5ec7aa2e6..4d804b8de 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -191,10 +191,10 @@ class Pref_Users extends Handler_Protected { } function editSave() { - $login = trim(clean($_REQUEST["login"])); + $login = clean($_REQUEST["login"]); $uid = clean($_REQUEST["id"]); $access_level = (int) clean($_REQUEST["access_level"]); - $email = trim(clean($_REQUEST["email"])); + $email = clean($_REQUEST["email"]); $password = clean($_REQUEST["password"]); if ($password) { @@ -230,7 +230,7 @@ class Pref_Users extends Handler_Protected { } function add() { - $login = trim(clean($_REQUEST["login"])); + $login = clean($_REQUEST["login"]); $tmp_user_pwd = make_password(); $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true); @@ -315,12 +315,12 @@ class Pref_Users extends Handler_Protected { print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; print "<div dojoType='fox.Toolbar'>"; - $user_search = trim(clean($_REQUEST["search"])); + $user_search = clean($_REQUEST["search"] ?? ""); if (array_key_exists("search", $_REQUEST)) { $_SESSION["prefs_user_search"] = $user_search; } else { - $user_search = $_SESSION["prefs_user_search"]; + $user_search = ($_SESSION["prefs_user_search"] ?? ""); } print "<div style='float : right; padding-right : 4px;'> @@ -330,7 +330,7 @@ class Pref_Users extends Handler_Protected { __('Search')."</button> </div>"; - $sort = clean($_REQUEST["sort"]); + $sort = clean($_REQUEST["sort"] ?? ""); if (!$sort || $sort == "undefined") { $sort = "login"; @@ -339,9 +339,9 @@ class Pref_Users extends Handler_Protected { print "<div dojoType='fox.form.DropDownButton'>". "<span>" . __('Select')."</span>"; print "<div dojoType='dijit.Menu' style='display: none'>"; - print "<div onclick=\"Tables.select('prefUserList', true)\" + print "<div onclick=\"Tables.select('users-list', true)\" dojoType='dijit.MenuItem'>".__('All')."</div>"; - print "<div onclick=\"Tables.select('prefUserList', false)\" + print "<div onclick=\"Tables.select('users-list', false)\" dojoType='dijit.MenuItem'>".__('None')."</div>"; print "</div></div>"; @@ -380,7 +380,7 @@ class Pref_Users extends Handler_Protected { ORDER BY $sort"); $sth->execute([":search" => $user_search ? "%$user_search%" : ""]); - print "<p><table width='100%' cellspacing='0' class='prefUserList' id='prefUserList'>"; + print "<table width='100%' class='users-list' id='users-list'>"; print "<tr class='title'> <td align='center' width='5%'> </td> @@ -457,9 +457,12 @@ class Pref_Users extends Handler_Protected { } static function logout_user() { - @session_destroy(); + if (session_status() === PHP_SESSION_ACTIVE) + session_destroy(); + if (isset($_COOKIE[session_name()])) { setcookie(session_name(), '', time()-42000, '/'); + } session_commit(); } |