Some minor fixes

fof-db.php

@@ -1257,9 +1257,9 @@ function fof_db_get_subscription_to_tags() {
 		$user_id = $row['user_id'];
 		$prefs = unserialize($row['subscription_prefs']);
 		if (!isset($r[$feed_id])) {
-			$r[$feed_id] = array();
+			$r[(int)$feed_id] = array();
 		}
-		$r[$feed_id][$user_id] = $prefs['tags'];
+		$r[(int)$feed_id][(int)$user_id] = $prefs['tags'];
 	}
 
 	return $r;

fof-main.php

@@ -310,7 +310,7 @@ function fof_tag_item($user_id, $item_id, $tag) {
 
 	foreach ($tags as $tag) {
 		// remove tag, if it starts with '-'
-		if ($tag{0} == '-') {
+		if ($tag[0] == '-') {
 			fof_untag_item($user_id, $item_id, substr($tag, 1));
 			continue;
 		}
@@ -1515,28 +1515,6 @@ function fof_repair_drain_bamage() {
 	if (ini_get('register_globals')) {
 		foreach ($_REQUEST as $k => $v) {unset($GLOBALS[$k]);}
 	}
-
-	// thanks to submitter of http://bugs.php.net/bug.php?id=39859
-	if (get_magic_quotes_gpc()) {
-		function undoMagicQuotes($array, $topLevel = true) {
-			$newArray = array();
-			foreach ($array as $key => $value) {
-				if (!$topLevel) {
-					$key = stripslashes($key);
-				}
-				if (is_array($value)) {
-					$newArray[$key] = undoMagicQuotes($value, false);
-				} else {
-					$newArray[$key] = stripslashes($value);
-				}
-			}
-			return $newArray;
-		}
-		$_GET = undoMagicQuotes($_GET);
-		$_POST = undoMagicQuotes($_POST);
-		$_COOKIE = undoMagicQuotes($_COOKIE);
-		$_REQUEST = undoMagicQuotes($_REQUEST);
-	}
 }
 
 /** Fetch the specified image, cache it, and return its cached name.

fof.css

@@ -673,3 +673,13 @@ td.feed-prefs-header {
     z-index: 1501;
   }
 }
+
+#marker {
+  width: 100%;
+  height: 1em;
+  border: dotted rgba(0, 100, 100, 0.5) 1px;
+  background: rgba(255,255,0,0.25);
+  position: absolute;
+  top: -10px;
+  transform: translateY(-100%);
+}

fof.js

@@ -298,11 +298,13 @@ function keyboard(e) {
                 if (itemBottom > scrollBottom) {
                     // There is more to read, so scroll down
                     window.scrollTo(0, getScrollY() + windowHeight*0.8);
+                    document.getElementById('marker').style.top = scrollBottom + 'px';
                 } else if (isItem(nextElement)) {
                     // Jump to the next item
                     unselect(itemElement);
                     itemElement = nextElement;
                     select(nextElement, true);
+                    document.getElementById('marker').style.top = '-100px';
                 } else if (confirm("No more items! Mark flagged as read?")) {
                     mark_read();
                 }

header.php

@@ -71,3 +71,4 @@
 <div id="handle" class="hide-on-mobile" onmousedown="startResize(event)"></div>
 
 <div id="items">
+<div id="marker"></div>

update-quiet.php

@@ -31,7 +31,7 @@
 
 $now = time();
 while (($feed = fof_db_get_row($result)) !== false) {
-	if (($now - $feed['feed_cache_date']) > ($fof_admin_prefs['autotimeout'] * 60)
+	if (($now - $feed['feed_cache_attempt_date']) > ($fof_admin_prefs['autotimeout'] * 60)
 		&& ($now > $feed['feed_cache_next_attempt'])) {
 		$feeds[] = $feed;
 	} else {

update.php

@@ -40,7 +40,7 @@
 	}
 
 	while (($feed = fof_db_get_row($result)) !== false) {
-		if ((time() - $feed['feed_cache_date']) < ($admin_prefs['manualtimeout'] * 60)) {
+		if ((time() - $feed['feed_cache_attempt_date']) < ($admin_prefs['manualtimeout'] * 60)) {
 			list($timestamp) = fof_nice_time_stamp($feed['feed_cache_date']);
 			$feed_status = " was just updated $timestamp!";
 		} else if (time() < $feed['feed_cache_next_attempt']) {