diff options
| author | Andrew Dolgov <[email protected]> | 2005-11-16 18:09:27 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2005-11-16 18:09:27 +0100 |
| commit | 4062022e0fd5eda07e4230cc3f39b91e77465ff2 (patch) | |
| tree | b95acc67e12f1213fd83b8f2eab0042e51f8048f | |
| parent | 3bac89ad2a44562f4d0b1c458ed20740379c03fc (diff) | |
sql-ize tt-rss.php prefs
| -rw-r--r-- | backend.php | 1 | ||||
| -rw-r--r-- | db-prefs.php | 19 | ||||
| -rw-r--r-- | tt-rss.php | 30 |
3 files changed, 32 insertions, 18 deletions
diff --git a/backend.php b/backend.php index 954c4daca..958ca26f6 100644 --- a/backend.php +++ b/backend.php @@ -16,7 +16,6 @@ $script_started = getmicrotime(); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - $dbprefs_link = $link; if (!$link) { if (DB_TYPE == "mysql") { diff --git a/db-prefs.php b/db-prefs.php index c0f6159e7..38382193d 100644 --- a/db-prefs.php +++ b/db-prefs.php @@ -3,20 +3,27 @@ require_once "config.php"; require_once "db.php"; - global $dbprefs_link; - - function get_pref($pref_name) { + function get_pref($link, $pref_name) { $pref_name = db_escape_string($pref_name); - $result = db_query($dbprefs_link, "SELECT - value,ttrss_prefs_types.id as type_name + $result = db_query($link, "SELECT + value,ttrss_prefs_types.type_name as type_name FROM ttrss_prefs,ttrss_prefs_types WHERE pref_name = '$pref_name' AND ttrss_prefs_types.id = type_id"); if (db_num_rows($result) > 0) { $value = db_fetch_result($result, 0, "value"); - return $value; + $type_name = db_fetch_result($result, 0, "type_name"); + + if ($type_name == "bool") { + return $value == "true"; + } else if ($type_name == "integer") { + return sprintf("%d", $value); + } else { + return $value; + } + } else { die("Fatal error, unknown preferences key: $pref_name"); } diff --git a/tt-rss.php b/tt-rss.php index 2d29d4455..a6a1842c6 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -1,13 +1,17 @@ -<? require_once "version.php" ?> -<? require_once "config.php" ?> +<? + require_once "version.php"; + require_once "config.php"; + require_once "db-prefs.php"; + $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); +?> <html> <head> <title>Tiny Tiny RSS</title> <link rel="stylesheet" type="text/css" href="tt-rss.css"> - <? if (USE_COMPACT_STYLESHEET) { ?> + <? if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { ?> <link rel="stylesheet" href="tt-rss_compact.css" type="text/css"> @@ -28,7 +32,7 @@ <body onload="init()"> -<? if (ENABLE_SPLASH) { ?> +<? if (get_pref($link, 'ENABLE_SPLASH')) { ?> <div id="splash"> <table width='100%' height='100%'><tr> <td class="innerSplash" valign="middle" align="center"> @@ -39,7 +43,7 @@ <? } ?> <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main"> -<? if (DISPLAY_HEADER) { ?> +<? if (get_pref($link, 'DISPLAY_HEADER')) { ?> <tr> <td colspan="2" class="headerBox"> <table cellspacing="0" cellpadding="0" width="100%"><tr> @@ -69,7 +73,7 @@ src="backend.php?op=error&msg=Loading,%20please wait..." id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe> - <? if (DISPLAY_FEEDLIST_ACTIONS) { ?> + <? if (get_pref($link, 'DISPLAY_FEEDLIST_ACTIONS')) { ?> <div align="center">All feeds: @@ -120,8 +124,12 @@ <? $limits = array(15 => 15, 30 => 30, 60 => 60); - if (DEFAULT_ARTILE_LIMIT >= 0) { - $limits[DEFAULT_ARTICLE_LIMIT] = DEFAULT_ARTICLE_LIMIT; + $def_art_limit = get_pref($link, 'DEFAULT_ARTICLE_LIMIT'); + + print $def_art_limit; + + if ($def_art_limit >= 0) { + $limits[$def_art_limit] = $def_art_limit; } asort($limits); @@ -130,14 +138,14 @@ foreach ($limits as $key) { print "<option"; - if ($key == DEFAULT_ARTICLE_LIMIT) { print " selected"; } + if ($key == $def_art_limit) { print " selected"; } print ">"; if ($limits[$key] == 0) { print "All"; } else { print $limits[$key]; } print "</option>"; } ?> - + </select> Feed: <input class="button" type="submit" @@ -178,7 +186,7 @@ id="content-frame" class="contentFrame"> </iframe> </td> </tr> -<? if (DISPLAY_FOOTER) { ?> +<? if (get_pref($link, 'DISPLAY_FOOTER')) { ?> <tr> <td colspan="2" class="footer"> <a href="http://bah.spb.su/~fox/tt-rss/">Tiny-Tiny RSS</a> v<?= VERSION ?> © 2005 Andrew Dolgov |