From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 5 Nov 2010 14:16:29 +0000 (+0300)
Subject: do some warning housekeeping
X-Git-Tag: 1.5.0~398
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c3fddd057f1d62297a170abcf657a52a8e039a4e;p=tt-rss.git

do some warning housekeeping
---

diff --git a/backend.php b/backend.php
index e13019d4..52147205 100644
--- a/backend.php
+++ b/backend.php
@@ -282,10 +282,10 @@
 			$subop = db_escape_string($_REQUEST["subop"]);
 			$view_mode = db_escape_string($_REQUEST["view_mode"]);
 			$limit = (int) get_pref($link, "DEFAULT_ARTICLE_LIMIT");
-			$cat_view = db_escape_string($_REQUEST["cat"]);
-			$next_unread_feed = db_escape_string($_REQUEST["nuf"]);
-			$offset = db_escape_string($_REQUEST["skip"]);
-			$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
+			@$cat_view = db_escape_string($_REQUEST["cat"]);
+			@$next_unread_feed = db_escape_string($_REQUEST["nuf"]);
+			@$offset = db_escape_string($_REQUEST["skip"]);
+			@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
 			$csync = $_REQUEST["csync"];
 			$order_by = db_escape_string($_REQUEST["order_by"]);
 
diff --git a/db-prefs.php b/db-prefs.php
index 228fa7ff..af187df1 100644
--- a/db-prefs.php
+++ b/db-prefs.php
@@ -11,10 +11,11 @@
 
 		$pref_name = db_escape_string($pref_name);
 		$prefs_cache = true;
+		$profile = false;
 
 		if (!$user_id) {
 			$user_id = $_SESSION["uid"];
-			$profile = $_SESSION["profile"];
+			@$profile = $_SESSION["profile"];
 		} else {
 			$user_id = sprintf("%d", $user_id);
 			$prefs_cache = false;
@@ -29,7 +30,7 @@
 		if (get_schema_version($link) < 63) $profile_qpart = "";
 
 		if ($prefs_cache && !defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {	
-			if ($_SESSION["prefs_cache"] && $_SESSION["prefs_cache"][$pref_name]) {
+			if ($_SESSION["prefs_cache"] && @$_SESSION["prefs_cache"][$pref_name]) {
 				$tuple = $_SESSION["prefs_cache"][$pref_name];
 				return convert_pref_type($tuple["value"], $tuple["type"]);
 			}
@@ -84,7 +85,7 @@
 
 		if (!$user_id) {
 			$user_id = $_SESSION["uid"];
-			$profile = $_SESSION["profile"];
+			@$profile = $_SESSION["profile"];
 		} else {
 			$user_id = sprintf("%d", $user_id);
 			$prefs_cache = false;
diff --git a/functions.php b/functions.php
index 256a6402..11c53915 100644
--- a/functions.php
+++ b/functions.php
@@ -2066,6 +2066,7 @@
 	}
 
 	function get_user_theme_path($link) {
+		$theme_path = '';
 
 		if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
 			$theme_name = get_pref($link, "_THEME_ID");
@@ -2677,6 +2678,7 @@
 				$feeds_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
 			} else {
 				$from_qpart = "ttrss_user_entries,ttrss_entries";
+				$feeds_qpart = '';
 			}
 
 			$query = "SELECT count(int_id) AS unread 
@@ -3302,6 +3304,8 @@
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
+		$ext_tables_part = "";
+
 			if ($search) {
 			
 				$search_query_part = getSearchSql($search, $match_on);
@@ -3547,7 +3551,6 @@
 					FROM
 						$from_qpart
 					WHERE
-					$group_limit_part
 					$feed_check_qpart
 					ttrss_user_entries.ref_id = ttrss_entries.id AND
 					ttrss_user_entries.owner_uid = '$owner_uid' AND
@@ -4148,9 +4151,7 @@
 			print "<div id=\"subtoolbar_ftitle\">";
 
 			if ($feed_site_url) {
-				if (!$bottom) {
-					$target = "target=\"_blank\"";
-				}
+				$target = "target=\"_blank\"";
 				print "<a title=\"".__("Visit the website")."\"$target href=\"$feed_site_url\">".
 					truncate_string($feed_title,30)."</a>";
 			} else {
@@ -4179,6 +4180,8 @@
 
 			if ($search) {
 				$search_q = "&q=$search&m=$match_on&smode=$search_mode";
+			} else {
+				$search_q = "";
 			}
 
 			$rss_link = "backend.php?op=rss&id=$feed_id&is_cat=$is_cat&view-mode=$view_mode$search_q";
@@ -5004,8 +5007,9 @@
 			catchup_feed($link, $subop_split[1], false);
 		}
 
+		// FIXME: might break tag display?
 
-		if ($feed_id > 0) {		
+		if ($feed > 0) {		
 			$result = db_query($link,
 				"SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
 		
@@ -5040,14 +5044,14 @@
 
 		/// START /////////////////////////////////////////////////////////////////////////////////
 
-		$search = db_escape_string($_REQUEST["query"]);
+		@$search = db_escape_string($_REQUEST["query"]);
 
 		if ($search) { 
 			$disable_cache = true;
 		}
 
-		$search_mode = db_escape_string($_REQUEST["search_mode"]);
-		$match_on = db_escape_string($_REQUEST["match_on"]);
+		@$search_mode = db_escape_string($_REQUEST["search_mode"]);
+		@$match_on = db_escape_string($_REQUEST["match_on"]);
 
 		if (!$match_on) {
 			$match_on = "both";
@@ -5295,7 +5299,7 @@
 #							$line["feed_title"]."</a>	
 
 					if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
-						if ($line["feed_title"]) {			
+						if (@$line["feed_title"]) {			
 							print "<span class=\"hlFeed\">
 								(<a href=\"javascript:viewfeed($feed_id, '', false)\">".
 								$line["feed_title"]."</a>)
@@ -5314,7 +5318,7 @@
 
 					print "<td class='hlMarkedPic'>$score_pic</td>";
 
-					if ($line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
+					if (@$line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
 						print "<td onclick=\"viewfeed($feed_id)\" class=\"hlFeedIcon\">$feed_icon_img</td>";
 					}
 
@@ -6373,6 +6377,7 @@
 
 			$label_id = $line["id"];
 			$label_caption = $line["caption"];
+			$id = $line["id"];
 
 			if ($feed_id < -10 && $feed_id == -11-$label_id) {
 				print "<li id=\"LHDL-$id\"