From d4c64ecc77a46c174d64ba6173a92834bbc1f74f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 29 Mar 2012 14:44:52 +0400
Subject: pref_prefs: only disable password changing block in single user mode
 (closes #444)

---
 classes/pref_prefs.php | 79 +++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/classes/pref_prefs.php b/classes/pref_prefs.php
index 2cbdddabd..beaca2a9a 100644
--- a/classes/pref_prefs.php
+++ b/classes/pref_prefs.php
@@ -160,60 +160,60 @@ class Pref_Prefs extends Protected_Handler {
 					"SSL_CERT_SERIAL", "DIGEST_PREFERRED_TIME");
 
 
-		if (!SINGLE_USER_MODE) {
+		$_SESSION["prefs_op_result"] = "";
 
-			$_SESSION["prefs_op_result"] = "";
+		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
+		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Personal data / Authentication')."\">";
 
-			print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
-			print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Personal data / Authentication')."\">";
+		print "<form dojoType=\"dijit.form.Form\" id=\"changeUserdataForm\">";
 
-			print "<form dojoType=\"dijit.form.Form\" id=\"changeUserdataForm\">";
+		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+		evt.preventDefault();
+		if (this.validate()) {
+			notify_progress('Saving data...', true);
 
-			print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
-			evt.preventDefault();
-			if (this.validate()) {
-				notify_progress('Saving data...', true);
+			new Ajax.Request('backend.php', {
+				parameters: dojo.objectToQuery(this.getValues()),
+				onComplete: function(transport) {
+					notify_callback2(transport);
+			} });
 
-				new Ajax.Request('backend.php', {
-					parameters: dojo.objectToQuery(this.getValues()),
-					onComplete: function(transport) {
-						notify_callback2(transport);
-				} });
+		}
+		</script>";
 
-			}
-			</script>";
+		print "<table width=\"100%\" class=\"prefPrefsList\">";
 
-			print "<table width=\"100%\" class=\"prefPrefsList\">";
+		$result = db_query($this->link, "SELECT email,full_name,
+			access_level FROM ttrss_users
+			WHERE id = ".$_SESSION["uid"]);
 
-			$result = db_query($this->link, "SELECT email,full_name,
-				access_level FROM ttrss_users
-				WHERE id = ".$_SESSION["uid"]);
+		$email = htmlspecialchars(db_fetch_result($result, 0, "email"));
+		$full_name = htmlspecialchars(db_fetch_result($result, 0, "full_name"));
 
-			$email = htmlspecialchars(db_fetch_result($result, 0, "email"));
-			$full_name = htmlspecialchars(db_fetch_result($result, 0, "full_name"));
+		print "<tr><td width=\"40%\">".__('Full name')."</td>";
+		print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"full_name\" required=\"1\"
+			value=\"$full_name\"></td></tr>";
 
-			print "<tr><td width=\"40%\">".__('Full name')."</td>";
-			print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"full_name\" required=\"1\"
-				value=\"$full_name\"></td></tr>";
+		print "<tr><td width=\"40%\">".__('E-mail')."</td>";
+		print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"email\" required=\"1\" value=\"$email\"></td></tr>";
 
-			print "<tr><td width=\"40%\">".__('E-mail')."</td>";
-			print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"email\" required=\"1\" value=\"$email\"></td></tr>";
+		if (!SINGLE_USER_MODE) {
+			$access_level = db_fetch_result($result, 0, "access_level");
+			print "<tr><td width=\"40%\">".__('Access level')."</td>";
+			print "<td>" . $access_level_names[$access_level] . "</td></tr>";
+		}
 
-			if (!SINGLE_USER_MODE) {
-				$access_level = db_fetch_result($result, 0, "access_level");
-				print "<tr><td width=\"40%\">".__('Access level')."</td>";
-				print "<td>" . $access_level_names[$access_level] . "</td></tr>";
-			}
+		print "</table>";
 
-			print "</table>";
+		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-prefs\">";
+		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"changeemail\">";
 
-			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-prefs\">";
-			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"changeemail\">";
+		print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
+			__("Save data")."</button>";
 
-			print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
-				__("Save data")."</button>";
+		print "</form>";
 
-			print "</form>";
+		if (!SINGLE_USER_MODE) {
 
 			$result = db_query($this->link, "SELECT id FROM ttrss_users
 				WHERE id = ".$_SESSION["uid"]." AND pwd_hash
@@ -270,9 +270,10 @@ class Pref_Prefs extends Protected_Handler {
 
 			print "</form>";
 
-			print "</div>"; #pane
 		}
 
+		print "</div>"; #pane
+
 		print "<div dojoType=\"dijit.layout.AccordionPane\" selected=\"true\" title=\"".__('Preferences')."\">";
 
 		print "<form dojoType=\"dijit.form.Form\" id=\"changeSettingsForm\">";
-- 
cgit v1.2.3