codysnider / tt-rss

classes/pref/labels.php

Indentation +180 added lines, -180 removed lines

@@ -1,286 +1,286 @@ 
 <?php
 class Pref_Labels extends Handler_Protected {
 
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index", "getlabeltree", "edit");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index", "getlabeltree", "edit");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public function edit() {
-		$label_id = clean($_REQUEST['id']);
+    public function edit() {
+        $label_id = clean($_REQUEST['id']);
 
-		$sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE
+        $sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE
 			id = ? AND owner_uid = ?");
-		$sth->execute([$label_id, $_SESSION['uid']]);
+        $sth->execute([$label_id, $_SESSION['uid']]);
 
-		if ($line = $sth->fetch()) {
+        if ($line = $sth->fetch()) {
 
-			print_hidden("id", "$label_id");
-			print_hidden("op", "pref-labels");
-			print_hidden("method", "save");
+            print_hidden("id", "$label_id");
+            print_hidden("op", "pref-labels");
+            print_hidden("method", "save");
 
-			print "<form onsubmit='return false;'>";
+            print "<form onsubmit='return false;'>";
 
-			print "<header>".__("Caption")."</header>";
+            print "<header>".__("Caption")."</header>";
 
-			print "<section>";
+            print "<section>";
 
-			$fg_color = $line['fg_color'];
-			$bg_color = $line['bg_color'] ? $line['bg_color'] : '#fff7d5';
+            $fg_color = $line['fg_color'];
+            $bg_color = $line['bg_color'] ? $line['bg_color'] : '#fff7d5';
 
-			print "<input style='font-size : 16px; color : $fg_color; background : $bg_color; transition : background 0.1s linear'
+            print "<input style='font-size : 16px; color : $fg_color; background : $bg_color; transition : background 0.1s linear'
 				id='labelEdit_caption' name='caption' dojoType='dijit.form.ValidationTextBox'
 				required='true' value=\"".htmlspecialchars($line['caption'])."\">";
 
-			print "</section>";
+            print "</section>";
 
-			print "<header>" . __("Colors") . "</header>";
-			print "<section>";
+            print "<header>" . __("Colors") . "</header>";
+            print "<section>";
 
-			print "<table>";
-			print "<tr><th style='text-align : left'>".__("Foreground:")."</th><th style='text-align : left'>".__("Background:")."</th></tr>";
-			print "<tr><td style='padding-right : 10px'>";
+            print "<table>";
+            print "<tr><th style='text-align : left'>".__("Foreground:")."</th><th style='text-align : left'>".__("Background:")."</th></tr>";
+            print "<tr><td style='padding-right : 10px'>";
 
-			print "<input dojoType='dijit.form.TextBox'
+            print "<input dojoType='dijit.form.TextBox'
 				style='display : none' id='labelEdit_fgColor'
 				name='fg_color' value='$fg_color'>";
-			print "<input dojoType='dijit.form.TextBox'
+            print "<input dojoType='dijit.form.TextBox'
 				style='display : none' id='labelEdit_bgColor'
 				name='bg_color' value='$bg_color'>";
 
-			print "<div dojoType='dijit.ColorPalette'>
+            print "<div dojoType='dijit.ColorPalette'>
 			<script type='dojo/method' event='onChange' args='fg_color'>
 				dijit.byId('labelEdit_fgColor').attr('value', fg_color);
 				dijit.byId('labelEdit_caption').domNode.setStyle({color: fg_color});
 			</script>
 			</div>";
 
-			print "</td><td>";
+            print "</td><td>";
 
-			print "<div dojoType='dijit.ColorPalette'>
+            print "<div dojoType='dijit.ColorPalette'>
 			<script type='dojo/method' event='onChange' args='bg_color'>
 				dijit.byId('labelEdit_bgColor').attr('value', bg_color);
 				dijit.byId('labelEdit_caption').domNode.setStyle({backgroundColor: bg_color});
 			</script>
 			</div>";
 
-			print "</td></tr></table>";
-			print "</section>";
+            print "</td></tr></table>";
+            print "</section>";
 
-			print "<footer>";
-			print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"dijit.byId('labelEditDlg').execute()\">".
-				__('Save')."</button>";
-			print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('labelEditDlg').hide()\">".
-				__('Cancel')."</button>";
-			print "</footer>";
+            print "<footer>";
+            print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"dijit.byId('labelEditDlg').execute()\">".
+                __('Save')."</button>";
+            print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('labelEditDlg').hide()\">".
+                __('Cancel')."</button>";
+            print "</footer>";
 
-			print "</form>";
-		}
-	}
+            print "</form>";
+        }
+    }
 
-	public function getlabeltree() {
-		$root = array();
-		$root['id'] = 'root';
-		$root['name'] = __('Labels');
-		$root['items'] = array();
+    public function getlabeltree() {
+        $root = array();
+        $root['id'] = 'root';
+        $root['name'] = __('Labels');
+        $root['items'] = array();
 
-		$sth = $this->pdo->prepare("SELECT *
+        $sth = $this->pdo->prepare("SELECT *
 			FROM ttrss_labels2
 			WHERE owner_uid = ?
 			ORDER BY caption");
-		$sth->execute([$_SESSION['uid']]);
-
-		while ($line = $sth->fetch()) {
-			$label = array();
-			$label['id'] = 'LABEL:' . $line['id'];
-			$label['bare_id'] = $line['id'];
-			$label['name'] = $line['caption'];
-			$label['fg_color'] = $line['fg_color'];
-			$label['bg_color'] = $line['bg_color'];
-			$label['type'] = 'label';
-			$label['checkbox'] = false;
-
-			array_push($root['items'], $label);
-		}
-
-		$fl = array();
-		$fl['identifier'] = 'id';
-		$fl['label'] = 'name';
-		$fl['items'] = array($root);
-
-		print json_encode($fl);
-		return;
-	}
-
-	public function colorset() {
-		$kind = clean($_REQUEST["kind"]);
-		$ids = explode(',', clean($_REQUEST["ids"]));
-		$color = clean($_REQUEST["color"]);
-		$fg = clean($_REQUEST["fg"]);
-		$bg = clean($_REQUEST["bg"]);
-
-		foreach ($ids as $id) {
-
-			if ($kind == "fg" || $kind == "bg") {
-				$sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
+        $sth->execute([$_SESSION['uid']]);
+
+        while ($line = $sth->fetch()) {
+            $label = array();
+            $label['id'] = 'LABEL:' . $line['id'];
+            $label['bare_id'] = $line['id'];
+            $label['name'] = $line['caption'];
+            $label['fg_color'] = $line['fg_color'];
+            $label['bg_color'] = $line['bg_color'];
+            $label['type'] = 'label';
+            $label['checkbox'] = false;
+
+            array_push($root['items'], $label);
+        }
+
+        $fl = array();
+        $fl['identifier'] = 'id';
+        $fl['label'] = 'name';
+        $fl['items'] = array($root);
+
+        print json_encode($fl);
+        return;
+    }
+
+    public function colorset() {
+        $kind = clean($_REQUEST["kind"]);
+        $ids = explode(',', clean($_REQUEST["ids"]));
+        $color = clean($_REQUEST["color"]);
+        $fg = clean($_REQUEST["fg"]);
+        $bg = clean($_REQUEST["bg"]);
+
+        foreach ($ids as $id) {
+
+            if ($kind == "fg" || $kind == "bg") {
+                $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
 					${kind}_color = ? WHERE id = ?
 					AND owner_uid = ?");
 
-				$sth->execute([$color, $id, $_SESSION['uid']]);
+                $sth->execute([$color, $id, $_SESSION['uid']]);
 
-			} else {
+            } else {
 
-				$sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
+                $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
 					fg_color = ?, bg_color = ? WHERE id = ?
 					AND owner_uid = ?");
 
-				$sth->execute([$fg, $bg, $id, $_SESSION['uid']]);
-			}
+                $sth->execute([$fg, $bg, $id, $_SESSION['uid']]);
+            }
 
-			/* Remove cached data */
+            /* Remove cached data */
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE owner_uid = ?");
-			$sth->execute([$_SESSION['uid']]);
-		}
-	}
+            $sth->execute([$_SESSION['uid']]);
+        }
+    }
 
-	public function colorreset() {
-		$ids = explode(',', clean($_REQUEST["ids"]));
+    public function colorreset() {
+        $ids = explode(',', clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
+        foreach ($ids as $id) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
 				fg_color = '', bg_color = '' WHERE id = ?
 				AND owner_uid = ?");
-			$sth->execute([$id, $_SESSION['uid']]);
+            $sth->execute([$id, $_SESSION['uid']]);
 
-			/* Remove cached data */
+            /* Remove cached data */
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE owner_uid = ?");
-			$sth->execute([$_SESSION['uid']]);
-		}
-	}
+            $sth->execute([$_SESSION['uid']]);
+        }
+    }
 
-	public function save() {
+    public function save() {
 
-		$id = clean($_REQUEST["id"]);
-		$caption = trim(clean($_REQUEST["caption"]));
+        $id = clean($_REQUEST["id"]);
+        $caption = trim(clean($_REQUEST["caption"]));
 
-		$this->pdo->beginTransaction();
+        $this->pdo->beginTransaction();
 
-		$sth = $this->pdo->prepare("SELECT caption FROM ttrss_labels2
+        $sth = $this->pdo->prepare("SELECT caption FROM ttrss_labels2
 			WHERE id = ? AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
+        $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$old_caption = $row["caption"];
+        if ($row = $sth->fetch()) {
+            $old_caption = $row["caption"];
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_labels2
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_labels2
 				WHERE caption = ? AND owner_uid = ?");
-			$sth->execute([$caption, $_SESSION['uid']]);
+            $sth->execute([$caption, $_SESSION['uid']]);
 
-			if (!$sth->fetch()) {
-				if ($caption) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
+            if (!$sth->fetch()) {
+                if ($caption) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
 						caption = ? WHERE id = ? AND
 						owner_uid = ?");
-					$sth->execute([$caption, $id, $_SESSION['uid']]);
+                    $sth->execute([$caption, $id, $_SESSION['uid']]);
 
-					/* Update filters that reference label being renamed */
+                    /* Update filters that reference label being renamed */
 
-					$sth = $this->pdo->prepare("UPDATE ttrss_filters2_actions SET
+                    $sth = $this->pdo->prepare("UPDATE ttrss_filters2_actions SET
 						action_param = ? WHERE action_param = ?
 						AND action_id = 7
 						AND filter_id IN (SELECT id FROM ttrss_filters2 WHERE owner_uid = ?)");
 
-					$sth->execute([$caption, $old_caption, $_SESSION['uid']]);
+                    $sth->execute([$caption, $old_caption, $_SESSION['uid']]);
 
-					print clean($_REQUEST["value"]);
-				} else {
-					print $old_caption;
-				}
-			} else {
-				print $old_caption;
-			}
-		}
+                    print clean($_REQUEST["value"]);
+                } else {
+                    print $old_caption;
+                }
+            } else {
+                print $old_caption;
+            }
+        }
 
-		$this->pdo->commit();
+        $this->pdo->commit();
 
-	}
+    }
 
-	public function remove() {
+    public function remove() {
 
-		$ids = explode(",", clean($_REQUEST["ids"]));
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			Labels::remove($id, $_SESSION["uid"]);
-		}
+        foreach ($ids as $id) {
+            Labels::remove($id, $_SESSION["uid"]);
+        }
 
-	}
+    }
 
-	public function add() {
-		$caption = clean($_REQUEST["caption"]);
-		$output = clean($_REQUEST["output"]);
+    public function add() {
+        $caption = clean($_REQUEST["caption"]);
+        $output = clean($_REQUEST["output"]);
 
-		if ($caption) {
+        if ($caption) {
 
-			if (Labels::create($caption)) {
-				if (!$output) {
-					print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
-				}
-			}
+            if (Labels::create($caption)) {
+                if (!$output) {
+                    print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
+                }
+            }
 
-			if ($output == "select") {
-				header("Content-Type: text/xml");
+            if ($output == "select") {
+                header("Content-Type: text/xml");
 
-				print "<rpc-reply><payload>";
+                print "<rpc-reply><payload>";
 
-				print_label_select("select_label",
-					$caption, "");
+                print_label_select("select_label",
+                    $caption, "");
 
-				print "</payload></rpc-reply>";
-			}
-		}
+                print "</payload></rpc-reply>";
+            }
+        }
 
-		return;
-	}
+        return;
+    }
 
-	public function index() {
+    public function index() {
 
-		print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
-		print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
-		print "<div dojoType='fox.Toolbar'>";
+        print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
+        print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
+        print "<div dojoType='fox.Toolbar'>";
 
-		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\"
+        print "<div dojoType='fox.form.DropDownButton'>".
+                "<span>" . __('Select')."</span>";
+        print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+        print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-		print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(false)\"
+        print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-		print "</div></div>";
+        print "</div></div>";
 
-		print"<button dojoType=\"dijit.form.Button\" onclick=\"CommonDialogs.addLabel()\">".
-			__('Create label')."</button dojoType=\"dijit.form.Button\"> ";
+        print"<button dojoType=\"dijit.form.Button\" onclick=\"CommonDialogs.addLabel()\">".
+            __('Create label')."</button dojoType=\"dijit.form.Button\"> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">".
-			__('Remove')."</button dojoType=\"dijit.form.Button\"> ";
+        print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">".
+            __('Remove')."</button dojoType=\"dijit.form.Button\"> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').resetColors()\">".
-			__('Clear colors')."</button dojoType=\"dijit.form.Button\">";
+        print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').resetColors()\">".
+            __('Clear colors')."</button dojoType=\"dijit.form.Button\">";
 
 
-		print "</div>"; #toolbar
-		print "</div>"; #pane
-		print "<div style='padding : 0px' dojoType=\"dijit.layout.ContentPane\" region=\"center\">";
+        print "</div>"; #toolbar
+        print "</div>"; #pane
+        print "<div style='padding : 0px' dojoType=\"dijit.layout.ContentPane\" region=\"center\">";
 
-		print "<div id=\"labellistLoading\">
+        print "<div id=\"labellistLoading\">
 		<img src='images/indicator_tiny.gif'>".
-		 __("Loading, please wait...")."</div>";
+            __("Loading, please wait...")."</div>";
 
-		print "<div dojoType=\"dojo.data.ItemFileWriteStore\" jsId=\"labelStore\"
+        print "<div dojoType=\"dojo.data.ItemFileWriteStore\" jsId=\"labelStore\"
 			url=\"backend.php?op=pref-labels&method=getlabeltree\">
 		</div>
 		<div dojoType=\"lib.CheckBoxStoreModel\" jsId=\"labelModel\" store=\"labelStore\"
@@ -302,12 +302,12 @@ 
 		</script>
 		</div>";
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefLabels");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefLabels");
 
-		print "</div>"; #container
+        print "</div>"; #container
 
-	}
+    }
 }

classes/pref/users.php

Indentation +266 added lines, -266 removed lines

@@ -1,130 +1,130 @@ 
 <?php
 class Pref_Users extends Handler_Protected {
-		public function before($method) {
-			if (parent::before($method)) {
-				if ($_SESSION["access_level"] < 10) {
-					print __("Your access level is insufficient to open this tab.");
-					return false;
-				}
-				return true;
-			}
-			return false;
-		}
+        public function before($method) {
+            if (parent::before($method)) {
+                if ($_SESSION["access_level"] < 10) {
+                    print __("Your access level is insufficient to open this tab.");
+                    return false;
+                }
+                return true;
+            }
+            return false;
+        }
 
-		public function csrf_ignore($method) {
-			$csrf_ignored = array("index", "edit", "userdetails");
+        public function csrf_ignore($method) {
+            $csrf_ignored = array("index", "edit", "userdetails");
 
-			return array_search($method, $csrf_ignored) !== false;
-		}
+            return array_search($method, $csrf_ignored) !== false;
+        }
 
-		public function edit() {
-			global $access_level_names;
+        public function edit() {
+            global $access_level_names;
 
-			print "<form id='user_edit_form' onsubmit='return false' dojoType='dijit.form.Form'>";
+            print "<form id='user_edit_form' onsubmit='return false' dojoType='dijit.form.Form'>";
 
-			print '<div dojoType="dijit.layout.TabContainer" style="height : 400px">
+            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\">";
+            //print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
 
-			$id = (int) clean($_REQUEST["id"]);
+            $id = (int) clean($_REQUEST["id"]);
 
-			print_hidden("id", "$id");
-			print_hidden("op", "pref-users");
-			print_hidden("method", "editSave");
+            print_hidden("id", "$id");
+            print_hidden("op", "pref-users");
+            print_hidden("method", "editSave");
 
-			$sth = $this->pdo->prepare("SELECT * FROM ttrss_users WHERE id = ?");
-			$sth->execute([$id]);
+            $sth = $this->pdo->prepare("SELECT * FROM ttrss_users WHERE id = ?");
+            $sth->execute([$id]);
 
-			if ($row = $sth->fetch()) {
+            if ($row = $sth->fetch()) {
 
-				$login = $row["login"];
-				$access_level = $row["access_level"];
-				$email = $row["email"];
+                $login = $row["login"];
+                $access_level = $row["access_level"];
+                $email = $row["email"];
 
-				$sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : "";
+                $sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : "";
 
-				print "<header>".__("User")."</header>";
-				print "<section>";
+                print "<header>".__("User")."</header>";
+                print "<section>";
 
-				if ($sel_disabled) {
-					print_hidden("login", "$login");
-				}
+                if ($sel_disabled) {
+                    print_hidden("login", "$login");
+                }
 
-				print "<fieldset>";
-				print "<label>" . __("Login:") . "</label>";
-				print "<input style='font-size : 16px'
+                print "<fieldset>";
+                print "<label>" . __("Login:") . "</label>";
+                print "<input style='font-size : 16px'
 					dojoType='dijit.form.ValidationTextBox' required='1'
 					$sel_disabled name='login' value=\"$login\">";
-				print "</fieldset>";
+                print "</fieldset>";
 
-				print "</section>";
+                print "</section>";
 
-				print "<header>".__("Authentication")."</header>";
-				print "<section>";
+                print "<header>".__("Authentication")."</header>";
+                print "<section>";
 
-				print "<fieldset>";
+                print "<fieldset>";
 
-				print "<label>" . __('Access level: ') . "</label> ";
+                print "<label>" . __('Access level: ') . "</label> ";
 
-				if (!$sel_disabled) {
-					print_select_hash("access_level", $access_level, $access_level_names,
-						"dojoType=\"fox.form.Select\" $sel_disabled");
-				} else {
-					print_select_hash("", $access_level, $access_level_names,
-						"dojoType=\"fox.form.Select\" $sel_disabled");
-					print_hidden("access_level", "$access_level");
-				}
+                if (!$sel_disabled) {
+                    print_select_hash("access_level", $access_level, $access_level_names,
+                        "dojoType=\"fox.form.Select\" $sel_disabled");
+                } else {
+                    print_select_hash("", $access_level, $access_level_names,
+                        "dojoType=\"fox.form.Select\" $sel_disabled");
+                    print_hidden("access_level", "$access_level");
+                }
 
-				print "</fieldset>";
-				print "<fieldset>";
+                print "</fieldset>";
+                print "<fieldset>";
 
-				print "<label>" . __("New password:") . "</label> ";
-				print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password'
+                print "<label>" . __("New password:") . "</label> ";
+                print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password'
 					name='password'>";
 
-				print "</fieldset>";
+                print "</fieldset>";
 
-				print "</section>";
+                print "</section>";
 
-				print "<header>".__("Options")."</header>";
-				print "<section>";
+                print "<header>".__("Options")."</header>";
+                print "<section>";
 
-				print "<fieldset>";
-				print "<label>" . __("E-mail:") . "</label> ";
-				print "<input dojoType='dijit.form.TextBox' size='30' name='email'
+                print "<fieldset>";
+                print "<label>" . __("E-mail:") . "</label> ";
+                print "<input dojoType='dijit.form.TextBox' size='30' name='email'
 					value=\"$email\">";
-				print "</fieldset>";
+                print "</fieldset>";
 
-				print "</section>";
+                print "</section>";
 
-				print "</table>";
+                print "</table>";
 
-			}
+            }
 
-			print '</div>'; #tab
-			print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\"
+            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>';
+            print '</div>';
 
-			print "<footer>
+            print "<footer>
 				<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"dijit.byId('userEditDlg').execute()\">".
-				__('Save')."</button>
+                __('Save')."</button>
 				<button dojoType='dijit.form.Button' onclick=\"dijit.byId('userEditDlg').hide()\">".
-				__('Cancel')."</button>
+                __('Cancel')."</button>
 				</footer>";
 
-			print "</form>";
+            print "</form>";
 
-			return;
-		}
+            return;
+        }
 
-		public function userdetails() {
-			$id = (int) clean($_REQUEST["id"]);
+        public function userdetails() {
+            $id = (int) clean($_REQUEST["id"]);
 
-			$sth = $this->pdo->prepare("SELECT login,
+            $sth = $this->pdo->prepare("SELECT login,
 				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
 				access_level,
 				(SELECT COUNT(int_id) FROM ttrss_user_entries
@@ -132,242 +132,242 @@ 
 				".SUBSTRING_FOR_DATE."(created,1,16) AS created
 				FROM ttrss_users
 				WHERE id = ?");
-			$sth->execute([$id]);
+            $sth->execute([$id]);
 
-			if ($row = $sth->fetch()) {
-				print "<table width='100%'>";
+            if ($row = $sth->fetch()) {
+                print "<table width='100%'>";
 
-				$last_login = make_local_datetime(
-					$row["last_login"], true);
+                $last_login = make_local_datetime(
+                    $row["last_login"], true);
 
-				$created = make_local_datetime(
-					$row["created"], true);
+                $created = make_local_datetime(
+                    $row["created"], true);
 
-				$stored_articles = $row["stored_articles"];
+                $stored_articles = $row["stored_articles"];
 
-				print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
-				print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
+                print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
+                print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
-				$sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
+                $sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
 					WHERE owner_uid = ?");
-				$sth->execute([$id]);
-				$row = $sth->fetch();
-				$num_feeds = $row["num_feeds"];
+                $sth->execute([$id]);
+                $row = $sth->fetch();
+                $num_feeds = $row["num_feeds"];
 
-				print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
-				print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
+                print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
+                print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
 
-				print "</table>";
+                print "</table>";
 
-				print "<h1>".__('Subscribed feeds')."</h1>";
+                print "<h1>".__('Subscribed feeds')."</h1>";
 
-				$sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds
+                $sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds
 					WHERE owner_uid = ? ORDER BY title");
-				$sth->execute([$id]);
+                $sth->execute([$id]);
 
-				print "<ul class=\"panel panel-scrollable list list-unstyled\">";
+                print "<ul class=\"panel panel-scrollable list list-unstyled\">";
 
-				while ($line = $sth->fetch()) {
+                while ($line = $sth->fetch()) {
 
-					$icon_file = ICONS_URL."/".$line["id"].".ico";
+                    $icon_file = ICONS_URL."/".$line["id"].".ico";
 
-					if (file_exists($icon_file) && filesize($icon_file) > 0) {
-						$feed_icon = "<img class=\"icon\" src=\"$icon_file\">";
-					} else {
-						$feed_icon = "<img class=\"icon\" src=\"images/blank_icon.gif\">";
-					}
+                    if (file_exists($icon_file) && filesize($icon_file) > 0) {
+                        $feed_icon = "<img class=\"icon\" src=\"$icon_file\">";
+                    } else {
+                        $feed_icon = "<img class=\"icon\" src=\"images/blank_icon.gif\">";
+                    }
 
-					print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
+                    print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
 
-				}
+                }
 
-				print "</ul>";
+                print "</ul>";
 
 
-			} else {
-				print "<h1>".__('User not found')."</h1>";
-			}
+            } else {
+                print "<h1>".__('User not found')."</h1>";
+            }
 
-		}
+        }
 
-		public function editSave() {
-			$login = trim(clean($_REQUEST["login"]));
-			$uid = clean($_REQUEST["id"]);
-			$access_level = (int) clean($_REQUEST["access_level"]);
-			$email = trim(clean($_REQUEST["email"]));
-			$password = clean($_REQUEST["password"]);
+        public function editSave() {
+            $login = trim(clean($_REQUEST["login"]));
+            $uid = clean($_REQUEST["id"]);
+            $access_level = (int) clean($_REQUEST["access_level"]);
+            $email = trim(clean($_REQUEST["email"]));
+            $password = clean($_REQUEST["password"]);
 
-			if ($password) {
-				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$pwd_hash = encrypt_password($password, $salt, true);
-				$pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).",
+            if ($password) {
+                $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $pwd_hash = encrypt_password($password, $salt, true);
+                $pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).",
 					salt = ".$this->pdo->quote($salt).",";
-			} else {
-				$pass_query_part = "";
-			}
+            } else {
+                $pass_query_part = "";
+            }
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?,
+            $sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?,
 				access_level = ?, email = ?, otp_enabled = false WHERE id = ?");
-			$sth->execute([$login, $access_level, $email, $uid]);
+            $sth->execute([$login, $access_level, $email, $uid]);
 
-		}
+        }
 
-		public function remove() {
-			$ids = explode(",", clean($_REQUEST["ids"]));
+        public function remove() {
+            $ids = explode(",", clean($_REQUEST["ids"]));
 
-			foreach ($ids as $id) {
-				if ($id != $_SESSION["uid"] && $id != 1) {
-					$sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?");
-					$sth->execute([$id]);
+            foreach ($ids as $id) {
+                if ($id != $_SESSION["uid"] && $id != 1) {
+                    $sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?");
+                    $sth->execute([$id]);
 
-					$sth = $this->pdo->prepare("DELETE FROM ttrss_feeds WHERE owner_uid = ?");
-					$sth->execute([$id]);
+                    $sth = $this->pdo->prepare("DELETE FROM ttrss_feeds WHERE owner_uid = ?");
+                    $sth->execute([$id]);
 
-					$sth = $this->pdo->prepare("DELETE FROM ttrss_users WHERE id = ?");
-					$sth->execute([$id]);
-				}
-			}
-		}
+                    $sth = $this->pdo->prepare("DELETE FROM ttrss_users WHERE id = ?");
+                    $sth->execute([$id]);
+                }
+            }
+        }
 
-		public function add() {
-			$login = trim(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);
+        public function add() {
+            $login = trim(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);
 
-			if (!$login) return; // no blank usernames
+            if (!$login) return; // no blank usernames
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
 				login = ?");
-			$sth->execute([$login]);
+            $sth->execute([$login]);
 
-			if (!$sth->fetch()) {
+            if (!$sth->fetch()) {
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_users
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_users
 					(login,pwd_hash,access_level,last_login,created, salt)
 					VALUES (?, ?, 0, null, NOW(), ?)");
-				$sth->execute([$login, $pwd_hash, $salt]);
+                $sth->execute([$login, $pwd_hash, $salt]);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
 					login = ? AND pwd_hash = ?");
-				$sth->execute([$login, $pwd_hash]);
+                $sth->execute([$login, $pwd_hash]);
 
-				if ($row = $sth->fetch()) {
+                if ($row = $sth->fetch()) {
 
-					$new_uid = $row['id'];
+                    $new_uid = $row['id'];
 
-					print 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);
+                    initialize_user($new_uid);
 
-				} else {
+                } else {
 
-					print T_sprintf("Could not create user %s", $login);
+                    print T_sprintf("Could not create user %s", $login);
 
-				}
-			} else {
-				print T_sprintf("User %s already exists.", $login);
-			}
-		}
+                }
+            } else {
+                print T_sprintf("User %s already exists.", $login);
+            }
+        }
 
-		public static function resetUserPassword($uid, $format_output = false) {
+        public static function resetUserPassword($uid, $format_output = false) {
 
-			$pdo = Db::pdo();
+            $pdo = Db::pdo();
 
-			$sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?");
-			$sth->execute([$uid]);
+            $sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?");
+            $sth->execute([$uid]);
 
-			if ($row = $sth->fetch()) {
+            if ($row = $sth->fetch()) {
 
-				$login = $row["login"];
+                $login = $row["login"];
 
-				$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$tmp_user_pwd = make_password();
+                $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $tmp_user_pwd = make_password();
 
-				$pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
+                $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
 
-				$sth = $pdo->prepare("UPDATE ttrss_users
+                $sth = $pdo->prepare("UPDATE ttrss_users
 					  SET pwd_hash = ?, salt = ?, otp_enabled = false
 					WHERE id = ?");
-				$sth->execute([$pwd_hash, $new_salt, $uid]);
+                $sth->execute([$pwd_hash, $new_salt, $uid]);
 
-				$message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
+                $message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
 
-				if ($format_output)
-					print_notice($message);
-				else
-					print $message;
+                if ($format_output)
+                    print_notice($message);
+                else
+                    print $message;
 
-			}
-		}
+            }
+        }
 
-		public function resetPass() {
-			$uid = clean($_REQUEST["id"]);
-			Pref_Users::resetUserPassword($uid);
-		}
+        public function resetPass() {
+            $uid = clean($_REQUEST["id"]);
+            Pref_Users::resetUserPassword($uid);
+        }
 
-		public function index() {
+        public function index() {
 
-			global $access_level_names;
+            global $access_level_names;
 
-			print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
-			print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
-			print "<div dojoType='fox.Toolbar'>";
+            print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
+            print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
+            print "<div dojoType='fox.Toolbar'>";
 
-			$user_search = trim(clean($_REQUEST["search"]));
+            $user_search = trim(clean($_REQUEST["search"]));
 
-			if (array_key_exists("search", $_REQUEST)) {
-				$_SESSION["prefs_user_search"] = $user_search;
-			} else {
-				$user_search = $_SESSION["prefs_user_search"];
-			}
+            if (array_key_exists("search", $_REQUEST)) {
+                $_SESSION["prefs_user_search"] = $user_search;
+            } else {
+                $user_search = $_SESSION["prefs_user_search"];
+            }
 
-			print "<div style='float : right; padding-right : 4px;'>
+            print "<div style='float : right; padding-right : 4px;'>
 				<input dojoType='dijit.form.TextBox' id='user_search' size='20' type='search'
 					value=\"$user_search\">
 				<button dojoType='dijit.form.Button' onclick='Users.reload()'>".
-					__('Search')."</button>
+                    __('Search')."</button>
 				</div>";
 
-			$sort = clean($_REQUEST["sort"]);
+            $sort = clean($_REQUEST["sort"]);
 
-			if (!$sort || $sort == "undefined") {
-				$sort = "login";
-			}
+            if (!$sort || $sort == "undefined") {
+                $sort = "login";
+            }
 
-			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 dojoType='fox.form.DropDownButton'>".
+                    "<span>" . __('Select')."</span>";
+            print "<div dojoType='dijit.Menu' style='display: none'>";
+            print "<div onclick=\"Tables.select('prefUserList', true)\"
 				dojoType='dijit.MenuItem'>".__('All')."</div>";
-			print "<div onclick=\"Tables.select('prefUserList', false)\"
+            print "<div onclick=\"Tables.select('prefUserList', false)\"
 				dojoType='dijit.MenuItem'>".__('None')."</div>";
-			print "</div></div>";
+            print "</div></div>";
 
-			print "<button dojoType='dijit.form.Button' onclick='Users.add()'>".__('Create user')."</button>";
+            print "<button dojoType='dijit.form.Button' onclick='Users.add()'>".__('Create user')."</button>";
 
-			print "
+            print "
 				<button dojoType='dijit.form.Button' onclick='Users.editSelected()'>".
-				__('Edit')."</button dojoType=\"dijit.form.Button\">
+                __('Edit')."</button dojoType=\"dijit.form.Button\">
 				<button dojoType='dijit.form.Button' onclick='Users.removeSelected()'>".
-				__('Remove')."</button dojoType=\"dijit.form.Button\">
+                __('Remove')."</button dojoType=\"dijit.form.Button\">
 				<button dojoType='dijit.form.Button' onclick='Users.resetSelected()'>".
-				__('Reset password')."</button dojoType=\"dijit.form.Button\">";
+                __('Reset password')."</button dojoType=\"dijit.form.Button\">";
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-				"hook_prefs_tab_section", "prefUsersToolbar");
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+                "hook_prefs_tab_section", "prefUsersToolbar");
 
-			print "</div>"; #toolbar
-			print "</div>"; #pane
-			print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>";
+            print "</div>"; #toolbar
+            print "</div>"; #pane
+            print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>";
 
-			$sort = $this->validate_field($sort,
-				["login", "access_level", "created", "num_feeds", "created", "last_login"], "login");
+            $sort = $this->validate_field($sort,
+                ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login");
 
-			if ($sort != "login") $sort = "$sort DESC";
+            if ($sort != "login") $sort = "$sort DESC";
 
-			$sth = $this->pdo->prepare("SELECT
+            $sth = $this->pdo->prepare("SELECT
 					tu.id,
 					login,access_level,email,
 					".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login,
@@ -378,11 +378,11 @@ 
 				WHERE
 					(:search = '' OR login LIKE :search) AND tu.id > 0
 				ORDER BY $sort");
-			$sth->execute([":search" => $user_search ? "%$user_search%" : ""]);
+            $sth->execute([":search" => $user_search ? "%$user_search%" : ""]);
 
-			print "<p><table width='100%' cellspacing='0' class='prefUserList' id='prefUserList'>";
+            print "<p><table width='100%' cellspacing='0' class='prefUserList' id='prefUserList'>";
 
-			print "<tr class='title'>
+            print "<tr class='title'>
 						<td align='center' width='5%'>&nbsp;</td>
 						<td width='20%'><a href='#' onclick=\"Users.reload('login')\">".__('Login')."</a></td>
 						<td width='20%'><a href='#' onclick=\"Users.reload('access_level')\">".__('Access Level')."</a></td>
@@ -390,57 +390,57 @@ 
 						<td width='20%'><a href='#' onclick=\"Users.reload('created')\">".__('Registered')."</a></td>
 						<td width='20%'><a href='#' onclick=\"Users.reload('last_login')\">".__('Last login')."</a></td></tr>";
 
-			$lnum = 0;
+            $lnum = 0;
 
-			while ($line = $sth->fetch()) {
+            while ($line = $sth->fetch()) {
 
-				$uid = $line["id"];
+                $uid = $line["id"];
 
-				print "<tr data-row-id='$uid' onclick='Users.edit($uid)'>";
+                print "<tr data-row-id='$uid' onclick='Users.edit($uid)'>";
 
-				$line["login"] = htmlspecialchars($line["login"]);
-				$line["created"] = make_local_datetime($line["created"], false);
-				$line["last_login"] = make_local_datetime($line["last_login"], false);
+                $line["login"] = htmlspecialchars($line["login"]);
+                $line["created"] = make_local_datetime($line["created"], false);
+                $line["last_login"] = make_local_datetime($line["last_login"], false);
 
-				print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();'
+                print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();'
 					dojoType='dijit.form.CheckBox' type='checkbox'></td>";
 
-				print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>";
+                print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>";
 
-				print "<td>" .	$access_level_names[$line["access_level"]] . "</td>";
-				print "<td>" . $line["num_feeds"] . "</td>";
-				print "<td>" . $line["created"] . "</td>";
-				print "<td>" . $line["last_login"] . "</td>";
+                print "<td>" .	$access_level_names[$line["access_level"]] . "</td>";
+                print "<td>" . $line["num_feeds"] . "</td>";
+                print "<td>" . $line["created"] . "</td>";
+                print "<td>" . $line["last_login"] . "</td>";
 
-				print "</tr>";
+                print "</tr>";
 
-				++$lnum;
-			}
+                ++$lnum;
+            }
 
-			print "</table>";
+            print "</table>";
 
-			if ($lnum == 0) {
-				if (!$user_search) {
-					print_warning(__('No users defined.'));
-				} else {
-					print_warning(__('No matching users found.'));
-				}
-			}
+            if ($lnum == 0) {
+                if (!$user_search) {
+                    print_warning(__('No users defined.'));
+                } else {
+                    print_warning(__('No matching users found.'));
+                }
+            }
 
-			print "</div>"; #pane
+            print "</div>"; #pane
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-				"hook_prefs_tab", "prefUsers");
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+                "hook_prefs_tab", "prefUsers");
 
-			print "</div>"; #container
+            print "</div>"; #container
 
-		}
+        }
 
-		public function validate_field($string, $allowed, $default = "") {
-			if (in_array($string, $allowed))
-				return $string;
-			else
-				return $default;
-		}
+        public function validate_field($string, $allowed, $default = "") {
+            if (in_array($string, $allowed))
+                return $string;
+            else
+                return $default;
+        }
 
 }

classes/pref/system.php

Indentation +63 added lines, -63 removed lines

@@ -2,50 +2,50 @@ 
 
 class Pref_System extends Handler_Protected {
 
-	public function before($method) {
-		if (parent::before($method)) {
-			if ($_SESSION["access_level"] < 10) {
-				print __("Your access level is insufficient to open this tab.");
-				return false;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index");
-
-		return array_search($method, $csrf_ignored) !== false;
-	}
-
-	public function clearLog() {
-		$this->pdo->query("DELETE FROM ttrss_error_log");
-	}
-
-	public function index() {
-
-		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+    public function before($method) {
+        if (parent::before($method)) {
+            if ($_SESSION["access_level"] < 10) {
+                print __("Your access level is insufficient to open this tab.");
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index");
+
+        return array_search($method, $csrf_ignored) !== false;
+    }
+
+    public function clearLog() {
+        $this->pdo->query("DELETE FROM ttrss_error_log");
+    }
+
+    public function index() {
+
+        print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>report</i> ".__('Event Log')."\">";
 
-		if (LOG_DESTINATION == "sql") {
+        if (LOG_DESTINATION == "sql") {
 
-			$res = $this->pdo->query("SELECT errno, errstr, filename, lineno,
+            $res = $this->pdo->query("SELECT errno, errstr, filename, lineno,
 				created_at, login, context FROM ttrss_error_log
 				LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
 				ORDER BY ttrss_error_log.id DESC
 				LIMIT 100");
 
-			print "<button dojoType=\"dijit.form.Button\"
+            print "<button dojoType=\"dijit.form.Button\"
 				onclick=\"Helpers.updateEventLog()\">".__('Refresh')."</button> ";
 
-			print "&nbsp;<button dojoType=\"dijit.form.Button\"
+            print "&nbsp;<button dojoType=\"dijit.form.Button\"
 				class=\"alt-danger\" onclick=\"Helpers.clearEventLog()\">".__('Clear')."</button> ";
 
-			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
+            print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
 
-			print "<tr class=\"title\">
+            print "<tr class=\"title\">
 				<td width='5%'>".__("Error")."</td>
 				<td>".__("Filename")."</td>
 				<td>".__("Message")."</td>
@@ -53,52 +53,52 @@ 
 				<td width='5%'>".__("Date")."</td>
 				</tr>";
 
-			while ($line = $res->fetch()) {
-				print "<tr>";
+            while ($line = $res->fetch()) {
+                print "<tr>";
 
-				foreach ($line as $k => $v) {
-					$line[$k] = htmlspecialchars($v);
-				}
+                foreach ($line as $k => $v) {
+                    $line[$k] = htmlspecialchars($v);
+                }
 
-				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
-				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
-				print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>";
-				print "<td class='login'>" . $line["login"] . "</td>";
+                print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
+                print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
+                print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>";
+                print "<td class='login'>" . $line["login"] . "</td>";
 
-				print "<td class='timestamp'>" .
-					make_local_datetime(
-					$line["created_at"], false) . "</td>";
+                print "<td class='timestamp'>" .
+                    make_local_datetime(
+                    $line["created_at"], false) . "</td>";
 
-				print "</tr>";
-			}
+                print "</tr>";
+            }
 
-			print "</table>";
-		} else {
+            print "</table>";
+        } else {
 
-			print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
+            print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
 
-		}
+        }
 
-		print "</div>";
+        print "</div>";
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>info</i> ".__('PHP Information')."\">";
 
-		ob_start();
-		phpinfo();
-		$info = ob_get_contents();
-		ob_end_clean();
+        ob_start();
+        phpinfo();
+        $info = ob_get_contents();
+        ob_end_clean();
 
-		print "<div class='phpinfo'>";
-		print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info);
-		print "</div>";
+        print "<div class='phpinfo'>";
+        print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info);
+        print "</div>";
 
-		print "</div>";
+        print "</div>";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefSystem");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefSystem");
 
-		print "</div>"; #container
-	}
+        print "</div>"; #container
+    }
 
 }

classes/dlg.php

Indentation +127 added lines, -127 removed lines

@@ -1,206 +1,206 @@
 <?php
 class Dlg extends Handler_Protected {
-	private $param;
+    private $param;
     private $params;
 
     function before($method) {
-		if (parent::before($method)) {
-			header("Content-Type: text/html"); # required for iframe
+        if (parent::before($method)) {
+            header("Content-Type: text/html"); # required for iframe
 
-			$this->param = $_REQUEST["param"];
-			return true;
-		}
-		return false;
-	}
+            $this->param = $_REQUEST["param"];
+            return true;
+        }
+        return false;
+    }
 
-	public function importOpml() {
-		print_notice("If you have imported labels and/or filters, you might need to reload preferences to see your new data.");
+    public function importOpml() {
+        print_notice("If you have imported labels and/or filters, you might need to reload preferences to see your new data.");
 
-		print "<div class='panel panel-scrollable'>";
+        print "<div class='panel panel-scrollable'>";
 
-		$opml = new Opml($_REQUEST);
+        $opml = new Opml($_REQUEST);
 
-		$opml->opml_import($_SESSION["uid"]);
+        $opml->opml_import($_SESSION["uid"]);
 
-		print "</div>";
+        print "</div>";
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('opmlImportDlg').execute()\">".
-			__('Close this window')."</button>";
-		print "</footer>";
+            __('Close this window')."</button>";
+        print "</footer>";
 
-		print "</div>";
+        print "</div>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function pubOPMLUrl() {
-		$url_path = Opml::opml_publish_url();
+    public function pubOPMLUrl() {
+        $url_path = Opml::opml_publish_url();
 
-		print "<header>" . __("Your Public OPML URL is:") . "</header>";
+        print "<header>" . __("Your Public OPML URL is:") . "</header>";
 
-		print "<section>";
+        print "<section>";
 
-		print "<div class='panel text-center'>";
-		print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
-		print "</div>";
+        print "<div class='panel text-center'>";
+        print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
+        print "</div>";
 
-		print "</section>";
+        print "</section>";
 
-		print "<footer class='text-center'>";
+        print "<footer class='text-center'>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return Helpers.OPML.changeKey()\">".
-			__('Generate new URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' onclick=\"return Helpers.OPML.changeKey()\">".
+            __('Generate new URL')."</button> ";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function explainError() {
-		print "<div class=\"errorExplained\">";
+    public function explainError() {
+        print "<div class=\"errorExplained\">";
 
-		if ($this->param == 1) {
-			print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
+        if ($this->param == 1) {
+            print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
 
-			$stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+            $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
-			print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
+            print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
 
-		}
+        }
 
-		if ($this->param == 3) {
-			print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
+        if ($this->param == 3) {
+            print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
 
-			$stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+            $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
-			print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
+            print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
 
-		}
+        }
 
-		print "</div>";
+        print "</div>";
 
-		print "<footer class='text-center'>";
-		print "<button onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
-		print "</footer>";
+        print "<footer class='text-center'>";
+        print "<button onclick=\"return CommonDialogs.closeInfoBox()\">".
+            __('Close this window')."</button>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function printTagCloud() {
-		print "<div class='panel text-center'>";
+    public function printTagCloud() {
+        print "<div class='panel text-center'>";
 
-		// from here: http://www.roscripts.com/Create_tag_cloud-71.html
+        // from here: http://www.roscripts.com/Create_tag_cloud-71.html
 
-		$sth = $this->pdo->prepare("SELECT tag_name, COUNT(post_int_id) AS count
+        $sth = $this->pdo->prepare("SELECT tag_name, COUNT(post_int_id) AS count
 			FROM ttrss_tags WHERE owner_uid = ?
 			GROUP BY tag_name ORDER BY count DESC LIMIT 50");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		$tags = array();
+        $tags = array();
 
-		while ($line = $sth->fetch()) {
-			$tags[$line["tag_name"]] = $line["count"];
-		}
+        while ($line = $sth->fetch()) {
+            $tags[$line["tag_name"]] = $line["count"];
+        }
 
         if(count($tags) == 0 ){ return; }
 
-		ksort($tags);
+        ksort($tags);
 
-		$max_size = 32; // max font size in pixels
-		$min_size = 11; // min font size in pixels
+        $max_size = 32; // max font size in pixels
+        $min_size = 11; // min font size in pixels
 
-		// largest and smallest array values
-		$max_qty = max(array_values($tags));
-		$min_qty = min(array_values($tags));
+        // largest and smallest array values
+        $max_qty = max(array_values($tags));
+        $min_qty = min(array_values($tags));
 
-		// find the range of values
-		$spread = $max_qty - $min_qty;
-		if ($spread == 0) { // we don't want to divide by zero
-				$spread = 1;
-		}
+        // find the range of values
+        $spread = $max_qty - $min_qty;
+        if ($spread == 0) { // we don't want to divide by zero
+                $spread = 1;
+        }
 
-		// set the font-size increment
-		$step = ($max_size - $min_size) / ($spread);
+        // set the font-size increment
+        $step = ($max_size - $min_size) / ($spread);
 
-		// loop through the tag array
-		foreach ($tags as $key => $value) {
-			// calculate font-size
-			// find the $value in excess of $min_qty
-			// multiply by the font-size increment ($size)
-			// and add the $min_size set above
-			$size = round($min_size + (($value - $min_qty) * $step));
+        // loop through the tag array
+        foreach ($tags as $key => $value) {
+            // calculate font-size
+            // find the $value in excess of $min_qty
+            // multiply by the font-size increment ($size)
+            // and add the $min_size set above
+            $size = round($min_size + (($value - $min_qty) * $step));
 
-			$key_escaped = str_replace("'", "\\'", $key);
+            $key_escaped = str_replace("'", "\\'", $key);
 
-			echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: " .
-				$size . "px\" title=\"$value articles tagged with " .
-				$key . '">' . $key . '</a> ';
-		}
+            echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: " .
+                $size . "px\" title=\"$value articles tagged with " .
+                $key . '">' . $key . '</a> ';
+        }
 
 
 
-		print "</div>";
+        print "</div>";
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
-		print "</footer>";
+            __('Close this window')."</button>";
+        print "</footer>";
 
-	}
+    }
 
-	public function generatedFeed() {
+    public function generatedFeed() {
 
-		$this->params = explode(":", $this->param, 3);
-		$feed_id = $this->params[0];
-		$is_cat = (bool) $this->params[1];
+        $this->params = explode(":", $this->param, 3);
+        $feed_id = $this->params[0];
+        $is_cat = (bool) $this->params[1];
 
-		$key = Feeds::get_feed_access_key($feed_id, $is_cat);
+        $key = Feeds::get_feed_access_key($feed_id, $is_cat);
 
-		$url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
+        $url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
 
-		$feed_title = Feeds::getFeedTitle($feed_id, $is_cat);
+        $feed_title = Feeds::getFeedTitle($feed_id, $is_cat);
 
-		print "<header>".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."</header>";
+        print "<header>".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."</header>";
 
-		print "<section>";
-		print "<div class='panel text-center'>";
-		print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
-		print "</div>";
-		print "</section>";
+        print "<section>";
+        print "<div class='panel text-center'>";
+        print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
+        print "</div>";
+        print "</section>";
 
-		print "<footer>";
+        print "<footer>";
 
-		print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/GeneratedFeeds\")'>
+        print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/GeneratedFeeds\")'>
 			<i class='material-icons'>help</i> ".__("More info...")."</button>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.genUrlChangeKey('$feed_id', '$is_cat')\">".
-			__('Generate new URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.genUrlChangeKey('$feed_id', '$is_cat')\">".
+            __('Generate new URL')."</button> ";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function defaultPasswordWarning() {
+    public function defaultPasswordWarning() {
 
-    	print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
+        print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".
-			__('Open Preferences')."</button> ";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".
+            __('Open Preferences')."</button> ";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
-		print "</footeer>";
-	}
+            __('Close this window')."</button>";
+        print "</footeer>";
+    }
 }

classes/logger/sql.php

Indentation +27 added lines, -27 removed lines

@@ -1,45 +1,45 @@
 <?php
 class Logger_SQL {
 
-	private $pdo;
+    private $pdo;
 
-	public function log_error($errno, $errstr, $file, $line, $context) {
+    public function log_error($errno, $errstr, $file, $line, $context) {
 
-		// separate PDO connection object is used for logging
-		if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
+        // separate PDO connection object is used for logging
+        if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
 
-		if ($this->pdo && get_schema_version() > 117) {
+        if ($this->pdo && get_schema_version() > 117) {
 
-			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
+            $owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
 
-			// limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
-			$context = mb_substr($context, 0, 8192);
+            // limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
+            $context = mb_substr($context, 0, 8192);
 
-			$server_params = [
-				"IP" => "REMOTE_ADDR",
-				"Request URI" => "REQUEST_URI",
-				"User agent" => "HTTP_USER_AGENT",
-			];
+            $server_params = [
+                "IP" => "REMOTE_ADDR",
+                "Request URI" => "REQUEST_URI",
+                "User agent" => "HTTP_USER_AGENT",
+            ];
 
-			foreach ($server_params as $n => $p) {
-				if (isset($_SERVER[$p]))
-					$context .= "\n$n: " . $_SERVER[$p];
-			}
+            foreach ($server_params as $n => $p) {
+                if (isset($_SERVER[$p]))
+                    $context .= "\n$n: " . $_SERVER[$p];
+            }
 
-			// passed error message may contain invalid unicode characters, failing to insert an error here
-			// would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
-			$errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
-			$context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
+            // passed error message may contain invalid unicode characters, failing to insert an error here
+            // would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
+            $errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
+            $context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
 
-			$sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
+            $sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
 				(errno, errstr, filename, lineno, context, owner_uid, created_at) VALUES
 				(?, ?, ?, ?, ?, ?, NOW())");
-			$sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
+            $sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
 
-			return $sth->rowCount();
-		}
+            return $sth->rowCount();
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }

classes/logger/syslog.php

Indentation +24 added lines, -24 removed lines

@@ -1,33 +1,33 @@
 <?php
 class Logger_Syslog {
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public function log_error($errno, $errstr, $file, $line, $context) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function log_error($errno, $errstr, $file, $line, $context) {
 
-		switch ($errno) {
-		case E_ERROR:
-		case E_PARSE:
-		case E_CORE_ERROR:
-		case E_COMPILE_ERROR:
-		case E_USER_ERROR:
-			$priority = LOG_ERR;
-			break;
-		case E_WARNING:
-		case E_CORE_WARNING:
-		case E_COMPILE_WARNING:
-		case E_USER_WARNING:
-			$priority = LOG_WARNING;
-			break;
-		default:
-			$priority = LOG_INFO;
-		}
+        switch ($errno) {
+        case E_ERROR:
+        case E_PARSE:
+        case E_CORE_ERROR:
+        case E_COMPILE_ERROR:
+        case E_USER_ERROR:
+            $priority = LOG_ERR;
+            break;
+        case E_WARNING:
+        case E_CORE_WARNING:
+        case E_COMPILE_WARNING:
+        case E_USER_WARNING:
+            $priority = LOG_WARNING;
+            break;
+        default:
+            $priority = LOG_INFO;
+        }
 
-		$errname = Logger::$errornames[$errno] . " ($errno)";
+        $errname = Logger::$errornames[$errno] . " ($errno)";
 
-		syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
+        syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
 
-	}
+    }
 
 }

classes/db/prefs.php

Indentation +125 added lines, -125 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 class Db_Prefs {
-	private $pdo;
-	private static $instance;
-	private $cache;
+    private $pdo;
+    private static $instance;
+    private $cache;
 
-	public function __construct() {
-		$this->pdo = Db::pdo();
-		$this->cache = array();
+    public function __construct() {
+        $this->pdo = Db::pdo();
+        $this->cache = array();
 
-		if ($_SESSION["uid"]) $this->cache();
-	}
+        if ($_SESSION["uid"]) $this->cache();
+    }
 
-	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function get() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	public function cache() {
-		$user_id = $_SESSION["uid"];
-		@$profile = $_SESSION["profile"];
+    public function cache() {
+        $user_id = $_SESSION["uid"];
+        @$profile = $_SESSION["profile"];
 
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+        if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
 
-		$sth = $this->pdo->prepare("SELECT
+        $sth = $this->pdo->prepare("SELECT
 			value,ttrss_prefs_types.type_name as type_name,ttrss_prefs.pref_name AS pref_name
 			FROM
 				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -35,35 +35,35 @@ 
 				owner_uid = :uid AND
 				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name");
 
-		$sth->execute([":profile" => $profile, ":uid" => $user_id]);
+        $sth->execute([":profile" => $profile, ":uid" => $user_id]);
 
-		while ($line = $sth->fetch()) {
-			if ($user_id == $_SESSION["uid"]) {
-				$pref_name = $line["pref_name"];
+        while ($line = $sth->fetch()) {
+            if ($user_id == $_SESSION["uid"]) {
+                $pref_name = $line["pref_name"];
 
-				$this->cache[$pref_name]["type"] = $line["type_name"];
-				$this->cache[$pref_name]["value"] = $line["value"];
-			}
-		}
-	}
+                $this->cache[$pref_name]["type"] = $line["type_name"];
+                $this->cache[$pref_name]["value"] = $line["value"];
+            }
+        }
+    }
 
-	public function read($pref_name, $user_id = false, $die_on_error = false) {
+    public function read($pref_name, $user_id = false, $die_on_error = false) {
 
-		if (!$user_id) {
-			$user_id = $_SESSION["uid"];
-			@$profile = $_SESSION["profile"];
-		} else {
-			$profile = false;
-		}
+        if (!$user_id) {
+            $user_id = $_SESSION["uid"];
+            @$profile = $_SESSION["profile"];
+        } else {
+            $profile = false;
+        }
 
-		if ($user_id == $_SESSION['uid'] && isset($this->cache[$pref_name])) {
-			$tuple = $this->cache[$pref_name];
-			return $this->convert($tuple["value"], $tuple["type"]);
-		}
+        if ($user_id == $_SESSION['uid'] && isset($this->cache[$pref_name])) {
+            $tuple = $this->cache[$pref_name];
+            return $this->convert($tuple["value"], $tuple["type"]);
+        }
 
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+        if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
 
-		$sth = $this->pdo->prepare("SELECT
+        $sth = $this->pdo->prepare("SELECT
 			value,ttrss_prefs_types.type_name as type_name
 			FROM
 				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -73,96 +73,96 @@ 
 				ttrss_prefs_types.id = type_id AND
 				owner_uid = :uid AND
 				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name");
-		$sth->execute([":uid" => $user_id, ":profile" => $profile, ":pref_name" => $pref_name]);
-
-		if ($row = $sth->fetch()) {
-			$value = $row["value"];
-			$type_name = $row["type_name"];
-
-			if ($user_id == $_SESSION["uid"]) {
-				$this->cache[$pref_name]["type"] = $type_name;
-				$this->cache[$pref_name]["value"] = $value;
-			}
-
-			return $this->convert($value, $type_name);
-
-		} else if ($die_on_error) {
-			user_error("Fatal error, unknown preferences key: $pref_name (owner: $user_id)", E_USER_ERROR);
-			return null;
-		} else {
-			return null;
-		}
-	}
-
-	public function convert($value, $type_name) {
-		if ($type_name == "bool") {
-			return $value == "true";
-		} else if ($type_name == "integer") {
-			return (int)$value;
-		} else {
-			return $value;
-		}
-	}
-
-	public function write($pref_name, $value, $user_id = false, $strip_tags = true) {
-		if ($strip_tags) $value = strip_tags($value);
-
-		if (!$user_id) {
-			$user_id = $_SESSION["uid"];
-			@$profile = $_SESSION["profile"];
-		} else {
-			$profile = null;
-		}
-
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
-
-		$type_name = "";
-		$current_value = "";
-
-		if (isset($this->cache[$pref_name])) {
-			$type_name = $this->cache[$pref_name]["type"];
-			$current_value = $this->cache[$pref_name]["value"];
-		}
-
-		if (!$type_name) {
-			$sth = $this->pdo->prepare("SELECT type_name
+        $sth->execute([":uid" => $user_id, ":profile" => $profile, ":pref_name" => $pref_name]);
+
+        if ($row = $sth->fetch()) {
+            $value = $row["value"];
+            $type_name = $row["type_name"];
+
+            if ($user_id == $_SESSION["uid"]) {
+                $this->cache[$pref_name]["type"] = $type_name;
+                $this->cache[$pref_name]["value"] = $value;
+            }
+
+            return $this->convert($value, $type_name);
+
+        } else if ($die_on_error) {
+            user_error("Fatal error, unknown preferences key: $pref_name (owner: $user_id)", E_USER_ERROR);
+            return null;
+        } else {
+            return null;
+        }
+    }
+
+    public function convert($value, $type_name) {
+        if ($type_name == "bool") {
+            return $value == "true";
+        } else if ($type_name == "integer") {
+            return (int)$value;
+        } else {
+            return $value;
+        }
+    }
+
+    public function write($pref_name, $value, $user_id = false, $strip_tags = true) {
+        if ($strip_tags) $value = strip_tags($value);
+
+        if (!$user_id) {
+            $user_id = $_SESSION["uid"];
+            @$profile = $_SESSION["profile"];
+        } else {
+            $profile = null;
+        }
+
+        if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+
+        $type_name = "";
+        $current_value = "";
+
+        if (isset($this->cache[$pref_name])) {
+            $type_name = $this->cache[$pref_name]["type"];
+            $current_value = $this->cache[$pref_name]["value"];
+        }
+
+        if (!$type_name) {
+            $sth = $this->pdo->prepare("SELECT type_name
 				FROM ttrss_prefs,ttrss_prefs_types
 				WHERE pref_name = ? AND type_id = ttrss_prefs_types.id");
-			$sth->execute([$pref_name]);
-
-			if ($row = $sth->fetch())
-				$type_name = $row["type_name"];
-
-		} else if ($current_value == $value) {
-			return;
-		}
-
-		if ($type_name) {
-			if ($type_name == "bool") {
-				if ($value == "1" || $value == "true") {
-					$value = "true";
-				} else {
-					$value = "false";
-				}
-			} else if ($type_name == "integer") {
-				$value = (int)$value;
-			}
-
-			if ($pref_name == 'USER_TIMEZONE' && $value == '') {
-				$value = 'UTC';
-			}
-
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_prefs SET
+            $sth->execute([$pref_name]);
+
+            if ($row = $sth->fetch())
+                $type_name = $row["type_name"];
+
+        } else if ($current_value == $value) {
+            return;
+        }
+
+        if ($type_name) {
+            if ($type_name == "bool") {
+                if ($value == "1" || $value == "true") {
+                    $value = "true";
+                } else {
+                    $value = "false";
+                }
+            } else if ($type_name == "integer") {
+                $value = (int)$value;
+            }
+
+            if ($pref_name == 'USER_TIMEZONE' && $value == '') {
+                $value = 'UTC';
+            }
+
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_prefs SET
 				value = :value WHERE pref_name = :pref_name
 					AND (profile = :profile OR (:profile IS NULL AND profile IS NULL))
 					AND owner_uid = :uid");
 
-			$sth->execute([":pref_name" => $pref_name, ":value" => $value, ":uid" => $user_id, ":profile" => $profile]);
+            $sth->execute([":pref_name" => $pref_name, ":value" => $value, ":uid" => $user_id, ":profile" => $profile]);
 
-			if ($user_id == $_SESSION["uid"]) {
-				$this->cache[$pref_name]["type"] = $type_name;
-				$this->cache[$pref_name]["value"] = $value;
-			}
-		}
-	}
+            if ($user_id == $_SESSION["uid"]) {
+                $this->cache[$pref_name]["type"] = $type_name;
+                $this->cache[$pref_name]["value"] = $value;
+            }
+        }
+    }
 }

classes/db/pgsql.php

Indentation +65 added lines, -65 removed lines

@@ -1,91 +1,91 @@
 <?php
 class Db_Pgsql implements IDb {
-	private $link;
-	private $last_error;
+    private $link;
+    private $last_error;
 
-	public function connect($host, $user, $pass, $db, $port) {
-		$string = "dbname=$db user=$user";
+    public function connect($host, $user, $pass, $db, $port) {
+        $string = "dbname=$db user=$user";
 
-		if ($pass) {
-			$string .= " password=$pass";
-		}
+        if ($pass) {
+            $string .= " password=$pass";
+        }
 
-		if ($host) {
-			$string .= " host=$host";
-		}
+        if ($host) {
+            $string .= " host=$host";
+        }
 
-		if (is_numeric($port) && $port > 0) {
-			$string = "$string port=" . $port;
-		}
+        if (is_numeric($port) && $port > 0) {
+            $string = "$string port=" . $port;
+        }
 
-		$this->link = pg_connect($string);
+        $this->link = pg_connect($string);
 
-		if (!$this->link) {
-			print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
-			exit(102);
-		}
+        if (!$this->link) {
+            print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
+            exit(102);
+        }
 
-		$this->init();
+        $this->init();
 
-		return $this->link;
-	}
+        return $this->link;
+    }
 
-	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
+    public function escape_string($s, $strip_tags = true) {
+        if ($strip_tags) $s = strip_tags($s);
 
-		return pg_escape_string($s);
-	}
+        return pg_escape_string($s);
+    }
 
-	public function query($query, $die_on_error = true) {
-		$result = @pg_query($this->link, $query);
+    public function query($query, $die_on_error = true) {
+        $result = @pg_query($this->link, $query);
 
-		if (!$result) {
-			$this->last_error = @pg_last_error($this->link);
+        if (!$result) {
+            $this->last_error = @pg_last_error($this->link);
 
-			@pg_query($this->link, "ROLLBACK");
-			$query = htmlspecialchars($query); // just in case
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
-				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
-		}
-		return $result;
-	}
+            @pg_query($this->link, "ROLLBACK");
+            $query = htmlspecialchars($query); // just in case
+            user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+        }
+        return $result;
+    }
 
-	public function fetch_assoc($result) {
-		return pg_fetch_assoc($result);
-	}
+    public function fetch_assoc($result) {
+        return pg_fetch_assoc($result);
+    }
 
 
-	public function num_rows($result) {
-		return pg_num_rows($result);
-	}
+    public function num_rows($result) {
+        return pg_num_rows($result);
+    }
 
-	public function fetch_result($result, $row, $param) {
-		return pg_fetch_result($result, $row, $param);
-	}
+    public function fetch_result($result, $row, $param) {
+        return pg_fetch_result($result, $row, $param);
+    }
 
-	public function close() {
-		return pg_close($this->link);
-	}
+    public function close() {
+        return pg_close($this->link);
+    }
 
-	public function affected_rows($result) {
-		return pg_affected_rows($result);
-	}
+    public function affected_rows($result) {
+        return pg_affected_rows($result);
+    }
 
-	public function last_error() {
-		return pg_last_error($this->link);
-	}
+    public function last_error() {
+        return pg_last_error($this->link);
+    }
 
-	public function last_query_error() {
-		return $this->last_error;
-	}
+    public function last_query_error() {
+        return $this->last_error;
+    }
 
-	public function init() {
-		$this->query("set client_encoding = 'UTF-8'");
-		pg_set_client_encoding("UNICODE");
-		$this->query("set datestyle = 'ISO, european'");
-		$this->query("set TIME ZONE 0");
-		$this->query("set cpu_tuple_cost = 0.5");
+    public function init() {
+        $this->query("set client_encoding = 'UTF-8'");
+        pg_set_client_encoding("UNICODE");
+        $this->query("set datestyle = 'ISO, european'");
+        $this->query("set TIME ZONE 0");
+        $this->query("set cpu_tuple_cost = 0.5");
 
-		return true;
-	}
+        return true;
+    }
 }

classes/db/mysqli.php

Indentation +81 added lines, -81 removed lines

@@ -1,85 +1,85 @@
 <?php
 class Db_Mysqli implements IDb {
-	private $link;
-	private $last_error;
-
-	public function connect($host, $user, $pass, $db, $port) {
-		if ($port)
-			$this->link = mysqli_connect($host, $user, $pass, $db, $port);
-		else
-			$this->link = mysqli_connect($host, $user, $pass, $db);
-
-		if ($this->link) {
-			$this->init();
-
-			return $this->link;
-		} else {
-			print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
-			exit(102);
-		}
-	}
-
-	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
-
-		return mysqli_real_escape_string($this->link, $s);
-	}
-
-	public function query($query, $die_on_error = true) {
-		$result = @mysqli_query($this->link, $query);
-		if (!$result) {
-			$this->last_error = @mysqli_error($this->link);
-
-			@mysqli_query($this->link, "ROLLBACK");
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
-				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
-		}
-
-		return $result;
-	}
-
-	public function fetch_assoc($result) {
-		return mysqli_fetch_assoc($result);
-	}
-
-
-	public function num_rows($result) {
-		return mysqli_num_rows($result);
-	}
-
-	public function fetch_result($result, $row, $param) {
-		if (mysqli_data_seek($result, $row)) {
-			$line = mysqli_fetch_assoc($result);
-			return $line[$param];
-		} else {
-			return false;
-		}
-	}
-
-	public function close() {
-		return mysqli_close($this->link);
-	}
-
-	public function affected_rows($result) {
-		return mysqli_affected_rows($this->link);
-	}
-
-	public function last_error() {
-		return mysqli_error($this->link);
-	}
-
-	public function last_query_error() {
-		return $this->last_error;
-	}
-
-	public function init() {
-		$this->query("SET time_zone = '+0:0'");
-
-		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-			mysqli_set_charset($this->link, MYSQL_CHARSET);
-		}
-
-		return true;
-	}
+    private $link;
+    private $last_error;
+
+    public function connect($host, $user, $pass, $db, $port) {
+        if ($port)
+            $this->link = mysqli_connect($host, $user, $pass, $db, $port);
+        else
+            $this->link = mysqli_connect($host, $user, $pass, $db);
+
+        if ($this->link) {
+            $this->init();
+
+            return $this->link;
+        } else {
+            print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
+            exit(102);
+        }
+    }
+
+    public function escape_string($s, $strip_tags = true) {
+        if ($strip_tags) $s = strip_tags($s);
+
+        return mysqli_real_escape_string($this->link, $s);
+    }
+
+    public function query($query, $die_on_error = true) {
+        $result = @mysqli_query($this->link, $query);
+        if (!$result) {
+            $this->last_error = @mysqli_error($this->link);
+
+            @mysqli_query($this->link, "ROLLBACK");
+            user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+        }
+
+        return $result;
+    }
+
+    public function fetch_assoc($result) {
+        return mysqli_fetch_assoc($result);
+    }
+
+
+    public function num_rows($result) {
+        return mysqli_num_rows($result);
+    }
+
+    public function fetch_result($result, $row, $param) {
+        if (mysqli_data_seek($result, $row)) {
+            $line = mysqli_fetch_assoc($result);
+            return $line[$param];
+        } else {
+            return false;
+        }
+    }
+
+    public function close() {
+        return mysqli_close($this->link);
+    }
+
+    public function affected_rows($result) {
+        return mysqli_affected_rows($this->link);
+    }
+
+    public function last_error() {
+        return mysqli_error($this->link);
+    }
+
+    public function last_query_error() {
+        return $this->last_error;
+    }
+
+    public function init() {
+        $this->query("SET time_zone = '+0:0'");
+
+        if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+            mysqli_set_charset($this->link, MYSQL_CHARSET);
+        }
+
+        return true;
+    }
 
 }