save active tab in prefs, fix schema

10 files changed, 18 insertions, 3 deletions

diff --git a/functions.php b/functions.php
index 3968764f7..bfed27be4 100644
--- a/functions.php
+++ b/functions.php
@@ -2223,6 +2223,9 @@
 		print "<param key=\"default_view_limit\" value=\"" . 
 			sprintf("%d", get_pref($link, "_DEFAULT_VIEW_LIMIT")) . "\"/>";
 
+		print "<param key=\"prefs_active_tab\" value=\"" . 
+			get_pref($link, "_PREFS_ACTIVE_TAB") . "\"/>";
+
 		print "</init-params>";
 	}
 
diff --git a/modules/pref-feed-browser.php b/modules/pref-feed-browser.php
index 725389362..104dd93f5 100644
--- a/modules/pref-feed-browser.php
+++ b/modules/pref-feed-browser.php
@@ -72,6 +72,8 @@
 			return;
 		}
 
+		set_pref($link, "_PREFS_ACTIVE_TAB", "feedBrowser");
+
 		print "<div>".__('This panel shows feeds subscribed by other users of this system, just in case you are interested in them too.')."</div>";
 
 		$limit = db_escape_string($_GET["limit"]);
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index caca952ad..78a2cff27 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -589,6 +589,8 @@
 				}
 			}
 
+			set_pref($link, "_PREFS_ACTIVE_TAB", "feedConfig");
+
 			print "<div class=\"prefGenericAddBox\">
 				<input id=\"fadd_cat\" 
 					onkeypress=\"return filterCR(event, addFeedCat)\"
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index da9cbdaa2..07b9eca71 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -199,6 +199,8 @@
 
 		if ($quiet) return;
 
+		set_pref($link, "_PREFS_ACTIVE_TAB", "filterConfig");
+
 		$sort = db_escape_string($_GET["sort"]);
 
 		if (!$sort || $sort == "undefined") {
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index c07d6132f..697263ac8 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -192,6 +192,8 @@
 			return;
 		}
 
+		set_pref($link, "_PREFS_ACTIVE_TAB", "labelConfig");
+
 		$sort = db_escape_string($_GET["sort"]);
 
 		if (!$sort || $sort == "undefined") {
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 37c6c9b5f..3a14c0d39 100644
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -173,6 +173,8 @@
 
 //			print check_for_update($link);
 
+			set_pref($link, "_PREFS_ACTIVE_TAB", "genConfig");
+
 			if (!SINGLE_USER_MODE) {
 
 				$result = db_query($link, "SELECT id,email FROM ttrss_users
diff --git a/modules/pref-users.php b/modules/pref-users.php
index b337a1a09..06ee9d22b 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -174,6 +174,8 @@
 			}
 		}
 
+		set_pref($link, "_PREFS_ACTIVE_TAB", "userConfig");
+
 		$sort = db_escape_string($_GET["sort"]);
 
 		if (!$sort || $sort == "undefined") {
diff --git a/prefs.js b/prefs.js
index bf72209b7..d9eb9024d 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1298,7 +1298,7 @@ function init_second_stage() {
 
 	try {
 		active_tab = getInitParam("prefs_active_tab");
-		if (!active_tab) active_tab = "genConfig";
+		if (!active_tab || active_tab == '0') active_tab = "genConfig";
 
 		document.onkeydown = pref_hotkey_handler;
 
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index c7e5677c6..6db955e5f 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -272,7 +272,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_LIMIT', 3, '30', '', 1);
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ACTIVE_TAB', 3, '', '', 1);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ACTIVE_TAB', 2, '', '', 1);
 
 create table ttrss_user_prefs (
    owner_uid integer not null,
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 35dc31e4f..e5509a981 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -252,7 +252,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_LIMIT', 3, '30', '', 1);
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ACTIVE_TAB', 3, '', '', 1);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ACTIVE_TAB', 2, '', '', 1);
 
 create table ttrss_user_prefs (
 	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,