sql-ize backend.php

diff --git a/backend.php b/backend.php
index 958ca26f657b684577b4e98779e8fc5d3adf35eb..06563e689308289a3147cefe23f4ce0281d98a96 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -136,7 +136,7 @@
                        <title>Tiny Tiny RSS : Feedlist</title>
                        <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">";
 
-               if (USE_COMPACT_STYLESHEET) {
+               if (get_pref($link, 'USE_COMPACT_STYLESHEET')) {
                        print "<link rel=\"stylesheet\" type=\"text/css\" 
                                href=\"tt-rss_compact.css\"/>";
                } else {
@@ -166,7 +166,7 @@
                        printFeedEntry(-1, $class, "Starred articles", $num_starred, 
                                "images/mark_set.png");
 
-                       if (ENABLE_LABELS) {
+                       if (get_pref($link, 'ENABLE_LABELS')) {
        
                                $result = db_query($link, "SELECT id,sql_exp,description FROM
                                        ttrss_labels ORDER by description");
@@ -494,7 +494,7 @@
                                <title>Tiny Tiny RSS : Feed $feed</title>
                                <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">";
 
-                       if (USE_COMPACT_STYLESHEET) {
+                       if (get_pref($link, 'USE_COMPACT_STYLESHEET')) {
                                print "<link rel=\"stylesheet\" 
                                                type=\"text/css\" href=\"tt-rss_compact.css\"/>";
 
@@ -845,9 +845,11 @@
 
                                foreach ($ids as $id) {
                                        db_query($link, "DELETE FROM ttrss_feeds WHERE id = '$id'");
+
+                                       $icons_dir = get_pref($link, 'ICONS_DIR');
                                        
-                                       if (file_exists(ICONS_DIR . "/$id.ico")) {
-                                               unlink(ICONS_DIR . "/$id.ico");
+                                       if (file_exists($icons_dir . "/$id.ico")) {
+                                               unlink($icons_dir . "/$id.ico");
                                        }
                                }
                        }
@@ -930,11 +932,11 @@
 
                        print "<tr class=\"$class\" id=\"FEEDR-$feed_id\">";
 
-                       $icon_file = ICONS_DIR . "/$feed_id.ico";
+                       $icon_file = get_pref($link, 'ICONS_DIR') . "/$feed_id.ico";
 
                        if (file_exists($icon_file) && filesize($icon_file) > 0) {
                                        $feed_icon = "<img width=\"16\" height=\"16\"
-                                               src=\"" . ICONS_URL . "/$feed_id.ico\">";
+                                               src=\"" . get_pref($link, 'ICONS_URL') . "/$feed_id.ico\">";
                        } else {
                                $feed_icon = "&nbsp;";
                        }
@@ -1032,7 +1034,7 @@
                        <input type=\"submit\" class=\"button\" 
                                onclick=\"javascript:removeSelectedFeeds()\" value=\"Remove\">";
                                
-                       if (ENABLE_PREFS_CATCHUP_UNCATCHUP) {
+                       if (get_pref($link, 'ENABLE_PREFS_CATCHUP_UNCATCHUP')) {
                                print "
                                <input type=\"submit\" class=\"button\" 
                                        onclick=\"javascript:readSelectedFeeds()\" value=\"Mark as read\">

diff --git a/functions.php b/functions.php
index d8e95594b7e746f1fdd10f2a4255f805497337fb..b9392d8184a0b725c19effa54aacec5c8b1325b7 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -32,7 +32,7 @@
 
        function update_all_feeds($link, $fetch) {
 
-               if (get_pref($link, 'WEB_DEMO_MODE')) return;
+               if (WEB_DEMO_MODE) return;
 
                if (get_pref($link, 'DAEMON_REFRESH_ONLY')) {
                        if (!$_GET["daemon"]) {
@@ -104,7 +104,7 @@
 
        function update_rss_feed($link, $feed_url, $feed) {
 
-               if (get_pref($link, 'WEB_DEMO_MODE')) return;
+               if (WEB_DEMO_MODE) return;
 
                $feed = db_escape_string($feed);
 

diff --git a/opml.php b/opml.php
index 89f9a94615a87f07985a3fc81911c13d789ff736..d5eb0e0e577fa62d3e9d28cae4a4ded5f037f51d 100644 (file)
--- a/opml.php
+++ b/opml.php
@@ -95,7 +95,7 @@
                        <body><h1>Importing OPML...</h1>
                        <div>";
 
-               if (get_pref($link, 'WEB_DEMO_MODE')) {
+               if (WEB_DEMO_MODE) {
                        print "OPML import is disabled in demo-mode.";
                        print "<p><a class=\"button\" href=\"prefs.php\">
                        Return to preferences</a></div></body></html>";

diff --git a/prefs.php b/prefs.php
index 92413e3417afa51883c1f7606bc2794c07586d21..09fbc9e54321ec52dceb8b4841841658df1e07cc 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -61,7 +61,7 @@
 <tr>
        <td class="footer" colspan="2">
                <a href="http://bah.spb.su/~fox/tt-rss/">Tiny-Tiny RSS</a> v<?= VERSION ?> &copy; 2005 Andrew Dolgov
-               <? if (get_pref($link, 'WEB_DEMO_MODE')) { ?>
+               <? if (WEB_DEMO_MODE) { ?>
                <br>Running in demo mode, some functionality is disabled.
                <? } ?>
        </td>

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index fa4b160cbf9f6cff0419bb553a13ef95e70ad520..6fade732060b4737b29972b840cd2867147f8264 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -115,13 +115,12 @@ create table ttrss_prefs (pref_name varchar(250) primary key,
 
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('CONTENT_CHECK_MD5', 1, 'false', 'false');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('MIN_UPDATE_TIME', 3, '1800', '1800');
-insert into ttrss_prefs (pref_name,type_id,value,def_value) values('WEB_DEMO_MODE', 1, 'false', 'false');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ENABLE_FEED_ICONS', 1, 'true', 'true');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ICONS_DIR', 2, 'icons', 'icons');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ICONS_URL', 2, 'icons', 'icons');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('PURGE_OLD_DAYS', 3, '60', '60');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('UPDATE_POST_ON_CHECKSUM_CHANGE', 1, 'true', 'true');
-insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ENABLE_PREFS_CATCHUP_UNCATCHUP', 1, 'true', 'true');
+insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ENABLE_PREFS_CATCHUP_UNCATCHUP', 1, 'false', 'false');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ENABLE_LABELS', 1, 'false', 'false');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('DEFAULT_UPDATE_INTERVAL', 3, '30', '30');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('DISPLAY_HEADER', 1, 'true', 'true');

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index a892a80f6655532e6325919914ccfaaff1eaf94b..7162eeecb765d945ea90cd1b33f5cf10c0332a09 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -110,13 +110,12 @@ create table ttrss_prefs (pref_name varchar(250) primary key,
 
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('CONTENT_CHECK_MD5', 1, 'false', 'false');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('MIN_UPDATE_TIME', 3, '1800', '1800');
-insert into ttrss_prefs (pref_name,type_id,value,def_value) values('WEB_DEMO_MODE', 1, 'false', 'false');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ENABLE_FEED_ICONS', 1, 'true', 'true');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ICONS_DIR', 2, 'icons', 'icons');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ICONS_URL', 2, 'icons', 'icons');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('PURGE_OLD_DAYS', 3, '60', '60');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('UPDATE_POST_ON_CHECKSUM_CHANGE', 1, 'true', 'true');
-insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ENABLE_PREFS_CATCHUP_UNCATCHUP', 1, 'true', 'true');
+insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ENABLE_PREFS_CATCHUP_UNCATCHUP', 1, 'false', 'false');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('ENABLE_LABELS', 1, 'false', 'false');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('DEFAULT_UPDATE_INTERVAL', 3, '30', '30');
 insert into ttrss_prefs (pref_name,type_id,value,def_value) values('DISPLAY_HEADER', 1, 'true', 'true');