From 874560db547f718b82d77657dc019d840c30e0ed Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Dec 2018 10:33:58 +0300 Subject: remove obsolete row selection functions move getUrlParam() to Utils --- classes/pref/users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/pref/users.php') diff --git a/classes/pref/users.php b/classes/pref/users.php index 1e6eae227..eda3e1a0e 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -419,7 +419,7 @@ class Pref_Users extends Handler_Protected { $line["created"] = make_local_datetime($line["created"], false); $line["last_login"] = make_local_datetime($line["last_login"], false); - print ""; -- cgit v1.2.3 From e23b6e397dbbbba90f9a15a6fe2d45eb862efdc5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Dec 2018 11:25:32 +0300 Subject: prefs: store active tab for reload, remove most old table row functions --- classes/pref/users.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'classes/pref/users.php') diff --git a/classes/pref/users.php b/classes/pref/users.php index eda3e1a0e..fb7afcf04 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -354,9 +354,9 @@ class Pref_Users extends Handler_Protected { print "
". "" . __('Select').""; print "
"; - print "
".__('All')."
"; - print "
".__('None')."
"; print "
"; @@ -412,7 +412,7 @@ class Pref_Users extends Handler_Protected { $uid = $line["id"]; - print ""; + print ""; $line["login"] = htmlspecialchars($line["login"]); @@ -420,8 +420,7 @@ class Pref_Users extends Handler_Protected { $line["last_login"] = make_local_datetime($line["last_login"], false); print ""; + dojoType=\"dijit.form.CheckBox\" type=\"checkbox\">"; $onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'"; -- cgit v1.2.3 From b9869dbc01f505e87def7463e032914cab49f26c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Dec 2018 16:17:36 +0300 Subject: prefs: remove some more stuff from global context (user management, etc) --- classes/pref/users.php | 54 +++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) (limited to 'classes/pref/users.php') diff --git a/classes/pref/users.php b/classes/pref/users.php index fb7afcf04..aeab28153 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -218,12 +218,13 @@ class Pref_Users extends Handler_Protected { } function add() { - $login = trim(clean($_REQUEST["login"])); $tmp_user_pwd = make_password(8); $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true); + if (!$login) return; // no blank usernames + $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?"); $sth->execute([$login]); @@ -243,18 +244,18 @@ class Pref_Users extends Handler_Protected { $new_uid = $row['id']; - print format_notice(T_sprintf("Added user %s with password %s", - $login, $tmp_user_pwd)); + print T_sprintf("Added user %s with password %s", + $login, $tmp_user_pwd); initialize_user($new_uid); } else { - print format_warning(T_sprintf("Could not create user %s", $login)); + print T_sprintf("Could not create user %s", $login); } } else { - print format_warning(T_sprintf("User %s already exists.", $login)); + print T_sprintf("User %s already exists.", $login); } } @@ -282,9 +283,9 @@ class Pref_Users extends Handler_Protected { $sth->execute([$pwd_hash, $new_salt, $uid]); if ($show_password) { - print T_sprintf("Changed password of user %s to %s", $login, $tmp_user_pwd); + print T_sprintf("Changed password of user %s to %s", $login, $tmp_user_pwd); } else { - print_notice(T_sprintf("Sending new password of user %s to %s", $login, $email)); + print_notice(T_sprintf("Sending new password of user %s to %s", $login, $email)); } if ($email) { @@ -341,7 +342,7 @@ class Pref_Users extends Handler_Protected { print "
-
"; @@ -360,14 +361,14 @@ class Pref_Users extends Handler_Protected { dojoType=\"dijit.MenuItem\">".__('None').""; print ""; - print ""; + print ""; print " - - - "; PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, @@ -400,11 +401,11 @@ class Pref_Users extends Handler_Protected { print "   - ".__('Login')." - ".__('Access Level')." - ".__('Subscribed feeds')." - ".__('Registered')." - ".__('Last login').""; + ".__('Login')." + ".__('Access Level')." + ".__('Subscribed feeds')." + ".__('Registered')." + ".__('Last login').""; $lnum = 0; @@ -412,26 +413,21 @@ class Pref_Users extends Handler_Protected { $uid = $line["id"]; - print ""; + print ""; $line["login"] = htmlspecialchars($line["login"]); - $line["created"] = make_local_datetime($line["created"], false); $line["last_login"] = make_local_datetime($line["last_login"], false); - print ""; - $onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'"; - - print " " . $line["login"] . ""; - - if (!$line["email"]) $line["email"] = " "; + print " " . $line["login"] . ""; - print "" . $access_level_names[$line["access_level"]] . ""; - print "" . $line["num_feeds"] . ""; - print "" . $line["created"] . ""; - print "" . $line["last_login"] . ""; + print "" . $access_level_names[$line["access_level"]] . ""; + print "" . $line["num_feeds"] . ""; + print "" . $line["created"] . ""; + print "" . $line["last_login"] . ""; print ""; -- cgit v1.2.3