diff options
| -rw-r--r-- | classes/article.php | 12 | ||||
| -rwxr-xr-x | classes/feeds.php | 2 | ||||
| -rw-r--r-- | include/controls.php | 25 | ||||
| -rw-r--r-- | include/functions2.php | 35 |
4 files changed, 38 insertions, 36 deletions
diff --git a/classes/article.php b/classes/article.php index 2e7a05e0b..b842ea40b 100644 --- a/classes/article.php +++ b/classes/article.php @@ -80,7 +80,7 @@ class Article extends Handler_Protected { WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); } - $feed_id = getArticleFeed($id); + $feed_id = $this->getArticleFeed($id); ccache_update($feed_id, $_SESSION["uid"]); } @@ -371,6 +371,16 @@ class Article extends Handler_Protected { print json_encode($reply); } + function getArticleFeed($id) { + $result = db_query("SELECT feed_id FROM ttrss_user_entries + WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); + + if (db_num_rows($result) != 0) { + return db_fetch_result($result, 0, "feed_id"); + } else { + return 0; + } + } } diff --git a/classes/feeds.php b/classes/feeds.php index 4c4972d76..4d4707a94 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -1241,5 +1241,7 @@ class Feeds extends Handler_Protected { <?php } + + } ?> diff --git a/include/controls.php b/include/controls.php index 0c5683082..3ddf4fd9d 100644 --- a/include/controls.php +++ b/include/controls.php @@ -300,3 +300,28 @@ function format_inline_player($url, $ctype) { return ""; } + +function print_label_select($name, $value, $attributes = "") { + + $result = db_query("SELECT caption FROM ttrss_labels2 + WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption"); + + print "<select default=\"$value\" name=\"" . htmlspecialchars($name) . + "\" $attributes>"; + + while ($line = db_fetch_assoc($result)) { + + $issel = ($line["caption"] == $value) ? "selected=\"1\"" : ""; + + print "<option value=\"".htmlspecialchars($line["caption"])."\" + $issel>" . htmlspecialchars($line["caption"]) . "</option>"; + + } + +# print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>"; + + print "</select>"; + + +} + diff --git a/include/functions2.php b/include/functions2.php index c89e572f2..e92202350 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -1669,17 +1669,6 @@ return false; } - function getArticleFeed($id) { - $result = db_query("SELECT feed_id FROM ttrss_user_entries - WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); - - if (db_num_rows($result) != 0) { - return db_fetch_result($result, 0, "feed_id"); - } else { - return 0; - } - } - /** * Fixes incomplete URLs by prepending "http://". * Also replaces feed:// with http://, and @@ -1825,30 +1814,6 @@ return is_html(fetch_file_contents($url, false, $login, $pass)); } - function print_label_select($name, $value, $attributes = "") { - - $result = db_query("SELECT caption FROM ttrss_labels2 - WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption"); - - print "<select default=\"$value\" name=\"" . htmlspecialchars($name) . - "\" $attributes>"; - - while ($line = db_fetch_assoc($result)) { - - $issel = ($line["caption"] == $value) ? "selected=\"1\"" : ""; - - print "<option value=\"".htmlspecialchars($line["caption"])."\" - $issel>" . htmlspecialchars($line["caption"]) . "</option>"; - - } - -# print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>"; - - print "</select>"; - - - } - function format_article_enclosures($id, $always_display_enclosures, $article_content, $hide_images = false) { |