save active tab in prefs, fix schema

diff --git a/functions.php b/functions.php
index 3968764f75423e015e27eb8241478988e33e0444..bfed27be46e471f2b51f9bd17f8bd7311b9aa571 100644 (file)
--- 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 725389362130aa0e38c2b4ecbc7c77781b6338d6..104dd93f5519491a63c56025086f48299273ed78 100644 (file)
--- 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 caca952ad1a899162e13d5862b46abb63533b40a..78a2cff279b1ab7d1dea4652ab61f7e9664886c8 100644 (file)
--- 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 da9cbdaa2c4e1b3cbe4ad183bd7f6ac49dd04f00..07b9eca71254f499872bfe0d9e5c1c294bf8bd5a 100644 (file)
--- 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 c07d6132f0554e0a45b5f99aa350fb8d22bc8f29..697263ac8b4f626b8706c6ed7fb23d4eb68e59ed 100644 (file)
--- 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 37c6c9b5f68f38c586c443998f48acb78f8c39f8..3a14c0d39a8d05b682310eda3fc0dcaebbc877e5 100644 (file)
--- 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 b337a1a093d36a8c42497973c9208a54afa70ecc..06ee9d22ba19aeae3376daa777086862aebbcc8c 100644 (file)
--- 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 bf72209b79db5ca6b017cc10eea656e8bcceefa9..d9eb9024d1a42f9f9717d15ad4bc968780320ed4 100644 (file)
--- 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 c7e5677c65ebf5d608053f5341097cf8394f2727..6db955e5fce0ffed2422ddc17486866a0a74a6ec 100644 (file)
--- 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 35dc31e4f7c82c130e74d41a91ed62f39763d44e..e5509a981738ca54c359918026a83c3d43aa946c 100644 (file)
--- 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,