obsolete cookie storage for collapsed status of feedlist and special categories (bump schema)

2 files changed, 28 insertions, 38 deletions

diff --git a/mobile/classic/functions.php b/mobile/classic/functions.php
index 88b25ab25..823af122f 100644
--- a/mobile/classic/functions.php
+++ b/mobile/classic/functions.php
@@ -30,11 +30,8 @@
 			/* virtual feeds */
 
 			if (get_pref($link, 'ENABLE_FEED_CATS')) {
-				if ($_COOKIE["ttrss_vf_vclps"] == 1) {
-					$collapsed = true;
-				} else {
-					$collapsed = false;
-				}
+
+				$collapsed = get_pref($link, "_COLLAPSED_SPECIAL");
 
 				if ($collapsed == "t" || $collapsed == "1") {
 					$holder_class = "invisible";
@@ -100,11 +97,7 @@
 				if (db_num_rows($result) > 0) {
 					if (get_pref($link, 'ENABLE_FEED_CATS')) {
 
-						if ($_COOKIE["ttrss_vf_lclps"] == 1) {
-							$collapsed = true;
-						} else {
-							$collapsed = false;
-						}
+						$collapsed = get_pref($link, "_COLLAPSED_LABELS");
 
 						if ($collapsed == "t" || $collapsed == "1") {
 							$holder_class = "invisible";
@@ -250,9 +243,7 @@
 
 					// workaround for NULL category
 					if ($category == "Uncategorized") {
-						if ($_COOKIE["ttrss_vf_uclps"] == 1) {
-							$collapsed = "t";
-						}
+						$collapsed = get_pref($link, "_COLLAPSED_UNCAT");
 					}
 
 					if ($collapsed == "t" || $collapsed == "1") {
diff --git a/mobile/classic/index.php b/mobile/classic/index.php
index 6a3aa5226..4b158395b 100644
--- a/mobile/classic/index.php
+++ b/mobile/classic/index.php
@@ -27,35 +27,34 @@
 		
 		$cat_id = db_escape_string($_GET["id"]);
 
-		switch ($cat_id) {
-		case 0:
-			if ($_COOKIE["ttrss_vf_uclps"] != 1) {
-				setcookie("ttrss_vf_uclps", 1);
-			} else {
-				setcookie("ttrss_vf_uclps", 0);
-			}
-			break;
-		case -1:
-			if ($_COOKIE["ttrss_vf_vclps"] != 1) {
-				setcookie("ttrss_vf_vclps", 1);
-			} else {
-				setcookie("ttrss_vf_vclps", 0);
-			}
-			break;
-		case -2:
-			if ($_COOKIE["ttrss_vf_lclps"] != 1) {
-				setcookie("ttrss_vf_lclps", 1);
-			} else {
-				setcookie("ttrss_vf_lclps", 0);
-			}
-			break;
-		default:
+		if ($cat_id > 0) {
 			db_query($link, "UPDATE ttrss_feed_categories SET
 				collapsed = NOT collapsed WHERE id = '$cat_id' AND owner_uid = " . 
 				$_SESSION["uid"]);
-			break;
+		} else {
+			$pref_name = '';
+
+			switch ($cat_id) {
+			case -1:
+				$pref_name = '_COLLAPSED_SPECIAL';
+				break;
+			case -2:
+				$pref_name = '_COLLAPSED_LABELS';
+				break;
+			case 0:
+				$pref_name = '_COLLAPSED_UNCAT';
+				break;
+			}
+
+			if ($pref_name) {
+				if (get_pref($link, $pref_name)) {
+					set_pref($link, $pref_name, 'false');
+				} else {
+					set_pref($link, $pref_name, 'true');
+				}
+			}
 		}
-	
+
 		header("Location: index.php");
 		return;
 	}