From bf9cc9ad9526471551b057e6390f6c040599e531 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 12 Aug 2015 20:19:38 +0300
Subject: [PATCH] combine user edit & user details

---
 classes/pref/users.php | 176 +++++++++++++++++++++--------------------
 js/functions.js        |  21 -----
 js/prefs.js            |   1 -
 3 files changed, 89 insertions(+), 109 deletions(-)

diff --git a/classes/pref/users.php b/classes/pref/users.php
index 89554ba6..a10404d0 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -17,9 +17,93 @@ class Pref_Users extends Handler_Protected {
 			return array_search($method, $csrf_ignored) !== false;
 		}
 
-		function userdetails() {
+		function edit() {
+			global $access_level_names;
 
-			$uid = sprintf("%d", $_REQUEST["id"]);
+			print '<div dojoType="dijit.layout.TabContainer" style="height : 400px">
+        		<div dojoType="dijit.layout.ContentPane" title="'.__('Edit user').'">';
+
+			print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
+
+			$id = (int) $this->dbh->escape_string($_REQUEST["id"]);
+
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$id\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-users\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"editSave\">";
+
+			$result = $this->dbh->query("SELECT * FROM ttrss_users WHERE id = '$id'");
+
+			$login = $this->dbh->fetch_result($result, 0, "login");
+			$access_level = $this->dbh->fetch_result($result, 0, "access_level");
+			$email = $this->dbh->fetch_result($result, 0, "email");
+
+			$sel_disabled = ($id == $_SESSION["uid"]) ? "disabled" : "";
+
+			print "<div class=\"dlgSec\">".__("User")."</div>";
+			print "<div class=\"dlgSecCont\">";
+
+			if ($sel_disabled) {
+				print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"login\" value=\"$login\">";
+			}
+
+			print "<input size=\"30\" style=\"font-size : 16px\"
+				dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				$sel_disabled
+				name=\"login\" value=\"$login\">";
+
+			print "</div>";
+
+			print "<div class=\"dlgSec\">".__("Authentication")."</div>";
+			print "<div class=\"dlgSecCont\">";
+
+			print __('Access level: ') . " ";
+
+			if (!$sel_disabled) {
+				print_select_hash("access_level", $access_level, $access_level_names,
+					"dojoType=\"dijit.form.Select\" $sel_disabled");
+			} else {
+				print_select_hash("", $access_level, $access_level_names,
+					"dojoType=\"dijit.form.Select\" $sel_disabled");
+				print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"access_level\" value=\"$access_level\">";
+			}
+
+			print "<hr/>";
+
+			print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" size=\"20\" placeholder=\"Change password\"
+				name=\"password\">";
+
+			print "</div>";
+
+			print "<div class=\"dlgSec\">".__("Options")."</div>";
+			print "<div class=\"dlgSecCont\">";
+
+			print "<input dojoType=\"dijit.form.TextBox\" size=\"30\" name=\"email\" placeholder=\"E-mail\"
+				value=\"$email\">";
+
+			print "</div>";
+
+			print "</table>";
+
+			print "</form>";
+
+			print '</div>'; #tab
+			print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\"
+				dojoType=\"dijit.layout.ContentPane\" title=\"".__('User details')."\">";
+
+			print '</div>';
+			print '</div>';
+
+			print "<div class=\"dlgButtons\">
+				<button dojoType=\"dijit.form.Button\" type=\"submit\">".
+				__('Save')."</button>
+				<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('userEditDlg').hide()\">".
+				__('Cancel')."</button></div>";
+
+			return;
+		}
+
+		function userdetails() {
+			$id = (int) $this->dbh->escape_string($_REQUEST["id"]);
 
 			$result = $this->dbh->query("SELECT login,
 				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
@@ -28,7 +112,7 @@ class Pref_Users extends Handler_Protected {
 					WHERE owner_uid = id) AS stored_articles,
 				".SUBSTRING_FOR_DATE."(created,1,16) AS created
 				FROM ttrss_users
-				WHERE id = '$uid'");
+				WHERE id = '$id'");
 
 			if ($this->dbh->num_rows($result) == 0) {
 				print "<h1>".__('User not found')."</h1>";
@@ -49,7 +133,7 @@ class Pref_Users extends Handler_Protected {
 			print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
 			$result = $this->dbh->query("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
-				WHERE owner_uid = '$uid'");
+				WHERE owner_uid = '$id'");
 
 			$num_feeds = $this->dbh->fetch_result($result, 0, "num_feeds");
 
@@ -61,7 +145,7 @@ class Pref_Users extends Handler_Protected {
 			print "<h1>".__('Subscribed feeds')."</h1>";
 
 			$result = $this->dbh->query("SELECT id,title,site_url FROM ttrss_feeds
-				WHERE owner_uid = '$uid' ORDER BY title");
+				WHERE owner_uid = '$id' ORDER BY title");
 
 			print "<ul class=\"userFeedList\">";
 
@@ -86,86 +170,6 @@ class Pref_Users extends Handler_Protected {
 			}
 
 			print "</ul>";
-
-			print "<div align='center'>
-				<button dojoType=\"dijit.form.Button\" type=\"submit\">".__("Close this window").
-				"</button></div>";
-
-			return;
-		}
-
-		function edit() {
-			global $access_level_names;
-
-			$id = $this->dbh->escape_string($_REQUEST["id"]);
-			print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
-
-			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$id\">";
-			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-users\">";
-			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"editSave\">";
-
-			$result = $this->dbh->query("SELECT * FROM ttrss_users WHERE id = '$id'");
-
-			$login = $this->dbh->fetch_result($result, 0, "login");
-			$access_level = $this->dbh->fetch_result($result, 0, "access_level");
-			$email = $this->dbh->fetch_result($result, 0, "email");
-
-			$sel_disabled = ($id == $_SESSION["uid"]) ? "disabled" : "";
-
-			print "<div class=\"dlgSec\">".__("User")."</div>";
-			print "<div class=\"dlgSecCont\">";
-
-			if ($sel_disabled) {
-				print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"login\" value=\"$login\">";
-			}
-
-			print "<input size=\"30\" style=\"font-size : 16px\"
-				dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
-				onkeypress=\"return filterCR(event, userEditSave)\" $sel_disabled
-				name=\"login\" value=\"$login\">";
-
-			print "</div>";
-
-			print "<div class=\"dlgSec\">".__("Authentication")."</div>";
-			print "<div class=\"dlgSecCont\">";
-
-			print __('Access level: ') . " ";
-
-			if (!$sel_disabled) {
-				print_select_hash("access_level", $access_level, $access_level_names,
-					"dojoType=\"dijit.form.Select\" $sel_disabled");
-			} else {
-				print_select_hash("", $access_level, $access_level_names,
-					"dojoType=\"dijit.form.Select\" $sel_disabled");
-				print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"access_level\" value=\"$access_level\">";
-			}
-
-			print "<hr/>";
-
-			print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" size=\"20\" onkeypress=\"return filterCR(event, userEditSave)\" placeholder=\"Change password\"
-				name=\"password\">";
-
-			print "</div>";
-
-			print "<div class=\"dlgSec\">".__("Options")."</div>";
-			print "<div class=\"dlgSecCont\">";
-
-			print "<input dojoType=\"dijit.form.TextBox\" size=\"30\" name=\"email\" onkeypress=\"return filterCR(event, userEditSave)\" placeholder=\"E-mail\"
-				value=\"$email\">";
-
-			print "</div>";
-
-			print "</table>";
-
-			print "</form>";
-
-			print "<div class=\"dlgButtons\">
-				<button dojoType=\"dijit.form.Button\" type=\"submit\">".
-					__('Save')."</button>
-				<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('userEditDlg').hide()\">".
-					__('Cancel')."</button></div>";
-
-			return;
 		}
 
 		function editSave() {
@@ -338,8 +342,6 @@ class Pref_Users extends Handler_Protected {
 			print "<button dojoType=\"dijit.form.Button\" onclick=\"addUser()\">".__('Create user')."</button>";
 
 			print "
-				<button dojoType=\"dijit.form.Button\" onclick=\"selectedUserDetails()\">".
-				__('Details')."</button dojoType=\"dijit.form.Button\">
 				<button dojoType=\"dijit.form.Button\" onclick=\"editSelectedUser()\">".
 				__('Edit')."</button dojoType=\"dijit.form.Button\">
 				<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedUsers()\">".
diff --git a/js/functions.js b/js/functions.js
index a0f954e0..843edaec 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -502,27 +502,6 @@ function infobox_callback2(transport, title) {
 	}
 }
 
-function filterCR(e, f)
-{
-     var key;
-
-     if(window.event)
-          key = window.event.keyCode;     //IE
-     else
-          key = e.which;     //firefox
-
-	if (key == 13) {
-  		if (typeof f != 'undefined') {
-			f();
-			return false;
-		} else {
-			return false;
-		}
-	} else {
-		return true;
-	}
-}
-
 function getInitParam(key) {
 	return init_params[key];
 }
diff --git a/js/prefs.js b/js/prefs.js
index 159b9ecb..66288764 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -109,7 +109,6 @@ function editUser(id, event) {
 			style: "width: 600px",
 			execute: function() {
 				if (this.validate()) {
-
 					notify_progress("Saving data...", true);
 
 					var query = dojo.formToQuery("user_edit_form");