From 66665fba79c97dc3b96103e60945aedd0b9be676 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 13 Dec 2011 14:00:36 +0400
Subject: add Pref_Users class

---
 classes/pref_users.php | 483 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 483 insertions(+)
 create mode 100644 classes/pref_users.php

(limited to 'classes/pref_users.php')

diff --git a/classes/pref_users.php b/classes/pref_users.php
new file mode 100644
index 000000000..5f762b50e
--- /dev/null
+++ b/classes/pref_users.php
@@ -0,0 +1,483 @@
+<?php
+class Pref_Users extends Handler {
+
+		function before() {
+			if (parent::before()) {
+				if ($_SESSION["access_level"] < 10) {
+					print __("Your access level is insufficient to open this tab.");
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		function userdetails() {
+
+			header("Content-Type: text/xml");
+			print "<dlg>";
+
+			$uid = sprintf("%d", $_REQUEST["id"]);
+
+			print "<title>".__('User details')."</title>";
+
+			print "<content><![CDATA[";
+
+			$result = db_query($this->link, "SELECT login,
+				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
+				access_level,
+				(SELECT COUNT(int_id) FROM ttrss_user_entries
+					WHERE owner_uid = id) AS stored_articles,
+				".SUBSTRING_FOR_DATE."(created,1,16) AS created
+				FROM ttrss_users
+				WHERE id = '$uid'");
+
+			if (db_num_rows($result) == 0) {
+				print "<h1>".__('User not found')."</h1>";
+				return;
+			}
+
+			// print "<h1>User Details</h1>";
+
+			$login = db_fetch_result($result, 0, "login");
+
+			print "<table width='100%'>";
+
+			$last_login = make_local_datetime($this->link,
+				db_fetch_result($result, 0, "last_login"), true);
+
+			$created = make_local_datetime($this->link,
+				db_fetch_result($result, 0, "created"), true);
+
+			$access_level = db_fetch_result($result, 0, "access_level");
+			$stored_articles = db_fetch_result($result, 0, "stored_articles");
+
+			print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
+			print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
+
+			$result = db_query($this->link, "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
+				WHERE owner_uid = '$uid'");
+
+			$num_feeds = db_fetch_result($result, 0, "num_feeds");
+
+			print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
+
+			print "</table>";
+
+			print "<h1>".__('Subscribed feeds')."</h1>";
+
+			$result = db_query($this->link, "SELECT id,title,site_url FROM ttrss_feeds
+				WHERE owner_uid = '$uid' ORDER BY title");
+
+			print "<ul class=\"userFeedList\">";
+
+			$row_class = "odd";
+
+			while ($line = db_fetch_assoc($result)) {
+
+				$icon_file = ICONS_URL."/".$line["id"].".ico";
+
+				if (file_exists($icon_file) && filesize($icon_file) > 0) {
+					$feed_icon = "<img class=\"tinyFeedIcon\" src=\"$icon_file\">";
+				} else {
+					$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+				}
+
+				print "<li class=\"$row_class\">$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
+
+				$row_class = $row_class == "even" ? "odd" : "even";
+
+			}
+
+			if (db_num_rows($result) < $num_feeds) {
+				// FIXME - add link to show ALL subscribed feeds here somewhere
+				print "<li><img
+					class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">&nbsp;...</li>";
+			}
+
+			print "</ul>";
+
+			print "<div align='center'>
+				<button onclick=\"closeInfoBox()\">".__("Close this window").
+				"</button></div>";
+
+			print "]]></content></dlg>";
+
+			return;
+		}
+
+		function edit() {
+			global $access_level_names;
+
+			header("Content-Type: text/xml");
+
+			$id = db_escape_string($_REQUEST["id"]);
+
+			print "<dlg id=\"$method\">";
+			print "<title>".__('User Editor')."</title>";
+			print "<content><![CDATA[";
+
+			print "<form id=\"user_edit_form\" onsubmit='return false'>";
+
+			print "<input type=\"hidden\" name=\"id\" value=\"$id\">";
+			print "<input type=\"hidden\" name=\"op\" value=\"pref-users\">";
+			print "<input type=\"hidden\" name=\"method\" value=\"editSave\">";
+
+			$result = db_query($this->link, "SELECT * FROM ttrss_users WHERE id = '$id'");
+
+			$login = db_fetch_result($result, 0, "login");
+			$access_level = db_fetch_result($result, 0, "access_level");
+			$email = db_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 type=\"hidden\" name=\"login\" value=\"$login\">";
+				print "<input size=\"30\" style=\"font-size : 16px\"
+					onkeypress=\"return filterCR(event, userEditSave)\" $sel_disabled
+					value=\"$login\">";
+			} else {
+				print "<input size=\"30\" style=\"font-size : 16px\"
+					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,
+					$sel_disabled);
+			} else {
+				print_select_hash("", $access_level, $access_level_names,
+					$sel_disabled);
+				print "<input type=\"hidden\" name=\"access_level\" value=\"$access_level\">";
+			}
+
+			print "<br/>";
+
+			print __('Change password to') .
+				" <input size=\"20\" onkeypress=\"return filterCR(event, userEditSave)\"
+				name=\"password\">";
+
+			print "</div>";
+
+			print "<div class=\"dlgSec\">".__("Options")."</div>";
+			print "<div class=\"dlgSecCont\">";
+
+			print __('E-mail: ').
+				" <input size=\"30\" name=\"email\" onkeypress=\"return filterCR(event, userEditSave)\"
+				value=\"$email\">";
+
+			print "</div>";
+
+			print "</table>";
+
+			print "</form>";
+
+			print "<div class=\"dlgButtons\">
+				<button onclick=\"return userEditSave()\">".
+					__('Save')."</button>
+				<button onclick=\"return userEditCancel()\">".
+					__('Cancel')."</button></div>";
+
+			print "]]></content></dlg>";
+
+			return;
+		}
+
+		function editSave() {
+			$login = db_escape_string(trim($_REQUEST["login"]));
+			$uid = db_escape_string($_REQUEST["id"]);
+			$access_level = (int) $_REQUEST["access_level"];
+			$email = db_escape_string(trim($_REQUEST["email"]));
+			$password = db_escape_string(trim($_REQUEST["password"]));
+
+			if ($password) {
+				$pwd_hash = encrypt_password($password, $login);
+				$pass_query_part = "pwd_hash = '$pwd_hash', ";
+			} else {
+				$pass_query_part = "";
+			}
+
+			db_query($this->link, "UPDATE ttrss_users SET $pass_query_part login = '$login',
+				access_level = '$access_level', email = '$email' WHERE id = '$uid'");
+
+		}
+
+		function remove() {
+			$ids = split(",", db_escape_string($_REQUEST["ids"]));
+
+			foreach ($ids as $id) {
+				if ($id != $_SESSION["uid"] && $id != 1) {
+					db_query($this->link, "DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
+					db_query($this->link, "DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
+					db_query($this->link, "DELETE FROM ttrss_users WHERE id = '$id'");
+				}
+			}
+		}
+
+		function add() {
+
+			$login = db_escape_string(trim($_REQUEST["login"]));
+			$tmp_user_pwd = make_password(8);
+			$pwd_hash = encrypt_password($tmp_user_pwd, $login);
+
+			$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
+				login = '$login'");
+
+			if (db_num_rows($result) == 0) {
+
+				db_query($this->link, "INSERT INTO ttrss_users
+					(login,pwd_hash,access_level,last_login,created)
+					VALUES ('$login', '$pwd_hash', 0, null, NOW())");
+
+
+				$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
+					login = '$login' AND pwd_hash = '$pwd_hash'");
+
+				if (db_num_rows($result) == 1) {
+
+					$new_uid = db_fetch_result($result, 0, "id");
+
+					print format_notice(T_sprintf("Added user <b>%s</b> with password <b>%s</b>",
+						$login, $tmp_user_pwd));
+
+					initialize_user($this->link, $new_uid);
+
+				} else {
+
+					print format_warning(T_sprintf("Could not create user <b>%s</b>", $login));
+
+				}
+			} else {
+				print format_warning(T_sprintf("User <b>%s</b> already exists.", $login));
+			}
+		}
+
+		function resetPass() {
+
+			$uid = db_escape_string($_REQUEST["id"]);
+
+			$result = db_query($this->link, "SELECT login,email
+				FROM ttrss_users WHERE id = '$uid'");
+
+			$login = db_fetch_result($result, 0, "login");
+			$email = db_fetch_result($result, 0, "email");
+			$tmp_user_pwd = make_password(8);
+			$pwd_hash = encrypt_password($tmp_user_pwd, $login);
+
+			db_query($this->link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash'
+				WHERE id = '$uid'");
+
+			print T_sprintf("Changed password of user <b>%s</b>
+				 to <b>%s</b>", $login, $tmp_user_pwd);
+
+			require_once 'lib/phpmailer/class.phpmailer.php';
+
+			if ($email) {
+				print " ";
+				print T_sprintf("Notifying <b>%s</b>.", $email);
+
+				require_once "lib/MiniTemplator.class.php";
+
+				$tpl = new MiniTemplator;
+
+				$tpl->readTemplateFromFile("templates/resetpass_template.txt");
+
+				$tpl->setVariable('LOGIN', $login);
+				$tpl->setVariable('NEWPASS', $tmp_user_pwd);
+
+				$tpl->addBlock('message');
+
+				$message = "";
+
+				$tpl->generateOutputToString($message);
+
+				$mail = new PHPMailer();
+
+				$mail->PluginDir = "lib/phpmailer/";
+				$mail->SetLanguage("en", "lib/phpmailer/language/");
+
+				$mail->CharSet = "UTF-8";
+
+				$mail->From = DIGEST_FROM_ADDRESS;
+				$mail->FromName = DIGEST_FROM_NAME;
+				$mail->AddAddress($email, $login);
+
+				if (DIGEST_SMTP_HOST) {
+					$mail->Host = DIGEST_SMTP_HOST;
+					$mail->Mailer = "smtp";
+					$mail->SMTPAuth = DIGEST_SMTP_LOGIN != '';
+					$mail->Username = DIGEST_SMTP_LOGIN;
+					$mail->Password = DIGEST_SMTP_PASSWORD;
+				}
+
+				$mail->IsHTML(false);
+				$mail->Subject = __("[tt-rss] Password change notification");
+				$mail->Body = $message;
+
+				$rc = $mail->Send();
+
+				if (!$rc) print_error($mail->ErrorInfo);
+			}
+
+			print "</div>";
+		}
+
+		function index() {
+
+			global $access_level_names;
+
+			print "<div id=\"pref-user-wrap\" dojoType=\"dijit.layout.BorderContainer\" gutters=\"false\">";
+			print "<div id=\"pref-user-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">";
+
+			print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">";
+
+			$user_search = db_escape_string($_REQUEST["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;'>
+				<input dojoType=\"dijit.form.TextBox\" id=\"user_search\" size=\"20\" type=\"search\"
+					value=\"$user_search\">
+				<button dojoType=\"dijit.form.Button\" onclick=\"javascript:updateUsersList()\">".
+					__('Search')."</button>
+				</div>";
+
+			$sort = db_escape_string($_REQUEST["sort"]);
+
+			if (!$sort || $sort == "undefined") {
+				$sort = "login";
+			}
+
+			print "<div dojoType=\"dijit.form.DropDownButton\">".
+					"<span>" . __('Select')."</span>";
+			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+			print "<div onclick=\"selectTableRows('prefUserList', 'all')\"
+				dojoType=\"dijit.MenuItem\">".__('All')."</div>";
+			print "<div onclick=\"selectTableRows('prefUserList', 'none')\"
+				dojoType=\"dijit.MenuItem\">".__('None')."</div>";
+			print "</div></div>";
+
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"javascript:addUser()\">".__('Create user')."</button>";
+
+			print "
+				<button dojoType=\"dijit.form.Button\" onclick=\"javascript:selectedUserDetails()\">".
+				__('Details')."</button dojoType=\"dijit.form.Button\">
+				<button dojoType=\"dijit.form.Button\" onclick=\"javascript:editSelectedUser()\">".
+				__('Edit')."</button dojoType=\"dijit.form.Button\">
+				<button dojoType=\"dijit.form.Button\" onclick=\"javascript:removeSelectedUsers()\">".
+				__('Remove')."</button dojoType=\"dijit.form.Button\">
+				<button dojoType=\"dijit.form.Button\" onclick=\"javascript:resetSelectedUserPass()\">".
+				__('Reset password')."</button dojoType=\"dijit.form.Button\">";
+
+			print "</div>"; #toolbar
+			print "</div>"; #pane
+			print "<div id=\"pref-user-content\" dojoType=\"dijit.layout.ContentPane\" region=\"center\">";
+
+			print "<div id=\"sticky-status-msg\"></div>";
+
+			if ($user_search) {
+
+				$user_search = split(" ", $user_search);
+				$tokens = array();
+
+				foreach ($user_search as $token) {
+					$token = trim($token);
+					array_push($tokens, "(UPPER(login) LIKE UPPER('%$token%'))");
+				}
+
+				$user_search_query = "(" . join($tokens, " AND ") . ") AND ";
+
+			} else {
+				$user_search_query = "";
+			}
+
+			$result = db_query($this->link, "SELECT
+					id,login,access_level,email,
+					".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login,
+					".SUBSTRING_FOR_DATE."(created,1,16) as created
+				FROM
+					ttrss_users
+				WHERE
+					$user_search_query
+					id > 0
+				ORDER BY $sort");
+
+			if (db_num_rows($result) > 0) {
+
+			print "<p><table width=\"100%\" cellspacing=\"0\"
+				class=\"prefUserList\" id=\"prefUserList\">";
+
+			print "<tr class=\"title\">
+						<td align='center' width=\"5%\">&nbsp;</td>
+						<td width=''><a href=\"#\" onclick=\"updateUsersList('login')\">".__('Login')."</a></td>
+						<td width='20%'><a href=\"#\" onclick=\"updateUsersList('access_level')\">".__('Access Level')."</a></td>
+						<td width='20%'><a href=\"#\" onclick=\"updateUsersList('created')\">".__('Registered')."</a></td>
+						<td width='20%'><a href=\"#\" onclick=\"updateUsersList('last_login')\">".__('Last login')."</a></td></tr>";
+
+			$lnum = 0;
+
+			while ($line = db_fetch_assoc($result)) {
+
+				$class = ($lnum % 2) ? "even" : "odd";
+
+				$uid = $line["id"];
+
+				print "<tr class=\"$class\" id=\"UMRR-$uid\">";
+
+				$line["login"] = htmlspecialchars($line["login"]);
+
+				$line["created"] = make_local_datetime($this->link, $line["created"], false);
+				$line["last_login"] = make_local_datetime($this->link, $line["last_login"], false);
+
+				print "<td align='center'><input onclick='toggleSelectRow(this);'
+					type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
+
+				$onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'";
+
+				print "<td $onclick>" . $line["login"] . "</td>";
+
+				if (!$line["email"]) $line["email"] = "&nbsp;";
+
+				print "<td $onclick>" .	$access_level_names[$line["access_level"]] . "</td>";
+				print "<td $onclick>" . $line["created"] . "</td>";
+				print "<td $onclick>" . $line["last_login"] . "</td>";
+
+				print "</tr>";
+
+				++$lnum;
+			}
+
+			print "</table>";
+
+			} else {
+				print "<p>";
+				if (!$user_search) {
+					print_warning(__('No users defined.'));
+				} else {
+					print_warning(__('No matching users found.'));
+				}
+				print "</p>";
+
+			}
+
+			print "</div>"; #pane
+			print "</div>"; #container
+
+		}
+
+	}
+?>
-- 
cgit v1.2.3-54-g00ecf


From 46da73c255353a3f874d9742d7b2f9c64e7607b5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 13 Dec 2011 14:15:42 +0400
Subject: implement ProtectedHandler

---
 classes/article.php           |  2 +-
 classes/dlg.php               | 16 ++++----
 classes/feeds.php             | 94 +++++++++++++++++++++----------------------
 classes/pref_feeds.php        | 12 +++---
 classes/pref_filters.php      |  2 +-
 classes/pref_labels.php       |  2 +-
 classes/pref_prefs.php        |  2 +-
 classes/pref_users.php        |  2 +-
 classes/protected_handler.php |  8 ++++
 classes/rpc.php               | 10 ++---
 10 files changed, 79 insertions(+), 71 deletions(-)
 create mode 100644 classes/protected_handler.php

(limited to 'classes/pref_users.php')

diff --git a/classes/article.php b/classes/article.php
index 70ecd2653..90ca129b9 100644
--- a/classes/article.php
+++ b/classes/article.php
@@ -1,5 +1,5 @@
 <?php
-class Article extends Handler {
+class Article extends Protected_Handler {
 
 	function redirect() {
 		$id = db_escape_string($_REQUEST['id']);
diff --git a/classes/dlg.php b/classes/dlg.php
index 3a66bf129..dce583e01 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -1,7 +1,7 @@
 <?php
-class Dlg extends Handler {
+class Dlg extends Protected_Handler {
 	private $param;
-	
+
 	function before() {
 		if (parent::before()) {
 			header("Content-Type: text/xml; charset=utf-8");
@@ -11,14 +11,14 @@ class Dlg extends Handler {
 		}
 		return false;
 	}
-	
+
 	function after() {
 		print "</dlg>";
 	}
 
 	function importOpml() {
 		header("Content-Type: text/html"); # required for iframe
-		
+
 		print "<div class=\"prefFeedOPMLHolder\">";
 		$owner_uid = $_SESSION["uid"];
 
@@ -534,7 +534,7 @@ class Dlg extends Handler {
 	}
 
 	function inactiveFeeds() {
-	
+
 		if (DB_TYPE == "pgsql") {
 			$interval_qpart = "NOW() - INTERVAL '3 months'";
 		} else {
@@ -714,7 +714,7 @@ class Dlg extends Handler {
 	}
 
 	function printTagSelect() {
-	
+
 		print "<title>" . __('Select item(s) by tags') . "</title>";
 		print "<content><![CDATA[";
 
@@ -851,7 +851,7 @@ class Dlg extends Handler {
 	}
 
 	function generatedFeed() {
-	
+
 		print "<title>".__('View as RSS')."</title>";
 		print "<content><![CDATA[";
 
@@ -884,7 +884,7 @@ class Dlg extends Handler {
 	}
 
 	function newVersion() {
-	
+
 		$version_data = check_for_update($this->link);
 		$version = $version_data['version'];
 		$id = $version_data['version_id'];
diff --git a/classes/feeds.php b/classes/feeds.php
index a654c92ae..f4d19c00c 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1,11 +1,11 @@
 <?php
-class Feeds extends Handler {
-	
+class Feeds extends Protected_Handler {
+
 	function catchupAll() {
 		db_query($this->link, "UPDATE ttrss_user_entries SET
 						last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
 		ccache_zero_all($this->link, $_SESSION["uid"]);
-	}	
+	}
 
 	function collapse() {
 		$cat_id = db_escape_string($_REQUEST["cid"]);
@@ -15,36 +15,36 @@ class Feeds extends Handler {
 
 	function index() {
 		$root = (bool)$_REQUEST["root"];
-	
+
 		if (!$root) {
 			print json_encode(outputFeedList($this->link));
 		} else {
-		
+
 			$feeds = outputFeedList($this->link, false);
-		
+
 			$root = array();
 			$root['id'] = 'root';
 			$root['name'] = __('Feeds');
 			$root['items'] = $feeds['items'];
-		
+
 			$fl = array();
 			$fl['identifier'] = 'id';
 			$fl['label'] = 'name';
 			$fl['items'] = array($root);
-		
+
 			print json_encode($fl);
 		}
-	}	
-	
+	}
+
 	function view() {
 		$timing_info = getmicrotime();
-		
+
 		$reply = array();
-		
+
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("0", $timing_info);
-		
+
 		$omode = db_escape_string($_REQUEST["omode"]);
-		
+
 		$feed = db_escape_string($_REQUEST["feed"]);
 		$method = db_escape_string($_REQUEST["m"]);
 		$view_mode = db_escape_string($_REQUEST["view_mode"]);
@@ -54,19 +54,19 @@ class Feeds extends Handler {
 		@$offset = db_escape_string($_REQUEST["skip"]);
 		@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
 		$order_by = db_escape_string($_REQUEST["order_by"]);
-		
+
 		if (is_numeric($feed)) $feed = (int) $feed;
-		
+
 		/* Feed -5 is a special case: it is used to display auxiliary information
 		 * when there's nothing to load - e.g. no stuff in fresh feed */
-		
+
 		if ($feed == -5) {
 			print json_encode(generate_dashboard_feed($this->link));
 			return;
 		}
-		
+
 		$result = false;
-		
+
 		if ($feed < -10) {
 			$label_feed = -11-$feed;
 			$result = db_query($this->link, "SELECT id FROM ttrss_labels2 WHERE
@@ -78,45 +78,45 @@ class Feeds extends Handler {
 			$result = db_query($this->link, "SELECT id FROM ttrss_feed_categories WHERE
 							id = '$feed' AND owner_uid = " . $_SESSION['uid']);
 		}
-		
+
 		if ($result && db_num_rows($result) == 0) {
 			print json_encode(generate_error_feed($this->link, __("Feed not found.")));
 			return;
 		}
-		
+
 		/* Updating a label ccache means recalculating all of the caches
 		 * so for performance reasons we don't do that here */
-		
+
 		if ($feed >= 0) {
 			ccache_update($this->link, $feed, $_SESSION["uid"], $cat_view);
 		}
-		
+
 		set_pref($this->link, "_DEFAULT_VIEW_MODE", $view_mode);
 		set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);
 		set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);
-		
+
 		if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
 			db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()
 							WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
 		}
-		
+
 		$reply['headlines'] = array();
-		
+
 		if (!$next_unread_feed)
 			$reply['headlines']['id'] = $feed;
 		else
 			$reply['headlines']['id'] = $next_unread_feed;
-		
+
 		$reply['headlines']['is_cat'] = (bool) $cat_view;
-		
+
 		$override_order = false;
-		
+
 		if (get_pref($this->link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
 			$date_sort_field = "updated";
 		} else {
 			$date_sort_field = "date_entered";
 		}
-		
+
 		switch ($order_by) {
 			case "date":
 				if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
@@ -125,7 +125,7 @@ class Feeds extends Handler {
 					$override_order = "$date_sort_field DESC";
 				}
 				break;
-		
+
 			case "title":
 				if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
 					$override_order = "title DESC, $date_sort_field";
@@ -133,7 +133,7 @@ class Feeds extends Handler {
 					$override_order = "title, $date_sort_field DESC";
 				}
 				break;
-		
+
 			case "score":
 				if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
 					$override_order = "score, $date_sort_field";
@@ -142,46 +142,46 @@ class Feeds extends Handler {
 				}
 				break;
 		}
-		
+
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("04", $timing_info);
-		
+
 		$ret = format_headlines_list($this->link, $feed, $method,
 			$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
 			$vgroup_last_feed, $override_order);
-		
+
 		$topmost_article_ids = $ret[0];
 		$headlines_count = $ret[1];
 		$returned_feed = $ret[2];
 		$disable_cache = $ret[3];
 		$vgroup_last_feed = $ret[4];
-		
+
 		$reply['headlines']['content'] =& $ret[5]['content'];
 		$reply['headlines']['toolbar'] =& $ret[5]['toolbar'];
-		
+
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("05", $timing_info);
-		
+
 		$reply['headlines-info'] = array("count" => (int) $headlines_count,
 						"vgroup_last_feed" => $vgroup_last_feed,
 						"disable_cache" => (bool) $disable_cache);
-		
+
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("20", $timing_info);
-		
+
 		if (is_array($topmost_article_ids) && !get_pref($this->link, 'COMBINED_DISPLAY_MODE') && !$_SESSION["bw_limit"]) {
 			$articles = array();
-		
+
 			foreach ($topmost_article_ids as $id) {
 				array_push($articles, format_article($this->link, $id, false));
 			}
-		
+
 			$reply['articles'] = $articles;
 		}
-		
+
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("30", $timing_info);
-		
+
 		$reply['runtime-info'] = make_runtime_info($this->link);
-		
+
 		print json_encode($reply);
-		
+
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php
index bf15bf25a..783d29f79 100644
--- a/classes/pref_feeds.php
+++ b/classes/pref_feeds.php
@@ -1,5 +1,5 @@
 <?php
-class Pref_Feeds extends Handler {
+class Pref_Feeds extends Protected_Handler {
 	function batch_edit_cbox($elem, $label = false) {
 		print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
 			onchange=\"dijit.byId('feedEditDlg').toggleField(this, '$elem', '$label')\">";
@@ -529,7 +529,7 @@ class Pref_Feeds extends Handler {
 		global $purge_intervals;
 		global $update_intervals;
 		global $update_methods;
-			
+
 		$feed_ids = db_escape_string($_REQUEST["ids"]);
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"ids\" value=\"$feed_ids\">";
@@ -688,13 +688,13 @@ class Pref_Feeds extends Handler {
 	function batchEditSave() {
 		return editsaveops(true);
 	}
-		
+
 	function editSave() {
 		return editsaveops(false);
 	}
-	
-	function editsaveops($batch) {	
-		
+
+	function editsaveops($batch) {
+
 		$feed_title = db_escape_string(trim($_POST["title"]));
 		$feed_link = db_escape_string(trim($_POST["feed_url"]));
 		$upd_intl = (int) db_escape_string($_POST["update_interval"]);
diff --git a/classes/pref_filters.php b/classes/pref_filters.php
index 754e8d211..fdae5f59e 100644
--- a/classes/pref_filters.php
+++ b/classes/pref_filters.php
@@ -1,5 +1,5 @@
 <?php
-class Pref_Filters extends Handler {
+class Pref_Filters extends Protected_Handler {
 
 	function filter_test($filter_type, $reg_exp,
 			$action_id, $action_param, $filter_param, $inverse, $feed_id) {
diff --git a/classes/pref_labels.php b/classes/pref_labels.php
index 5de4443f7..0d60731f3 100644
--- a/classes/pref_labels.php
+++ b/classes/pref_labels.php
@@ -1,5 +1,5 @@
 <?php
-class Pref_Labels extends Handler {
+class Pref_Labels extends Protected_Handler {
 
 	function edit() {
 		$label_id = db_escape_string($_REQUEST['id']);
diff --git a/classes/pref_prefs.php b/classes/pref_prefs.php
index 896268275..5a216d2b1 100644
--- a/classes/pref_prefs.php
+++ b/classes/pref_prefs.php
@@ -1,5 +1,5 @@
 <?php
-class Pref_Prefs extends Handler {
+class Pref_Prefs extends Protected_Handler {
 
 	function changepassword() {
 
diff --git a/classes/pref_users.php b/classes/pref_users.php
index 5f762b50e..63e1fd22c 100644
--- a/classes/pref_users.php
+++ b/classes/pref_users.php
@@ -1,5 +1,5 @@
 <?php
-class Pref_Users extends Handler {
+class Pref_Users extends Protected_Handler {
 
 		function before() {
 			if (parent::before()) {
diff --git a/classes/protected_handler.php b/classes/protected_handler.php
new file mode 100644
index 000000000..e8a6d40a7
--- /dev/null
+++ b/classes/protected_handler.php
@@ -0,0 +1,8 @@
+<?php
+class Protected_Handler extends Handler {
+
+	function before() {
+		return parent::before() && $_SESSION['uid'];
+	}
+}
+?>
diff --git a/classes/rpc.php b/classes/rpc.php
index 8f03381f8..c6fc8c263 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -1,9 +1,9 @@
 <?php
-class RPC extends Handler {
+class RPC extends Protected_Handler {
 
 	function setprofile() {
 		$id = db_escape_string($_REQUEST["id"]);
-		
+
 		$_SESSION["profile"] = $id;
 		$_SESSION["prefs_cache"] = array();
 	}
@@ -215,7 +215,7 @@ class RPC extends Handler {
 
 		 if ($last_article_id != getLastArticleId($this->link)) {
 				$omode = $_REQUEST["omode"];
-	
+
 			if ($omode != "T")
 				$reply['counters'] = getAllCounters($this->link, $omode);
 			else
@@ -403,11 +403,11 @@ class RPC extends Handler {
 	function assigntolabel() {
 		return labelops(true);
 	}
-	
+
 	function removefromlabel() {
 		return labelops(false);
 	}
-	
+
 	function labelops($assign) {
 		$reply = array();
 
-- 
cgit v1.2.3-54-g00ecf