require_once 'lib/phpmailer/class.phpmailer.php';
require_once 'lib/sphinxapi.php';
+ require_once 'lib/twitteroauth/twitteroauth.php';
//define('MAGPIE_USER_AGENT_EXT', ' (Tiny Tiny RSS/' . VERSION . ')');
define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . VERSION . ' (http://tt-rss.org/)');
define('MAGPIE_USER_AGENT', SELF_USER_AGENT);
+ ini_set('user_agent', SELF_USER_AGENT);
+
require_once "lib/simplepie/simplepie.inc";
require_once "lib/magpierss/rss_fetch.inc";
require_once 'lib/magpierss/rss_utils.inc';
} else {
$result = db_query($link, "SELECT id,update_interval,auth_login,
- feed_url,auth_pass,cache_images,update_method,last_updated
+ feed_url,auth_pass,cache_images,update_method,last_updated,
+ owner_uid
FROM ttrss_feeds WHERE id = '$feed'");
}
$update_method = db_fetch_result($result, 0, "update_method");
$last_updated = db_fetch_result($result, 0, "last_updated");
+ $owner_uid = db_fetch_result($result, 0, "owner_uid");
db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW()
WHERE id = '$feed'");
$auth_login = db_fetch_result($result, 0, "auth_login");
$auth_pass = db_fetch_result($result, 0, "auth_pass");
- if (DEFAULT_UPDATE_METHOD == "1") {
- $use_simplepie = $update_method != 1;
- } else {
- $use_simplepie = $update_method == 2;
- }
+ if ($update_method == 0)
+ $update_method = DEFAULT_UPDATE_METHOD + 1;
+
+ // 1 - Magpie
+ // 2 - SimplePie
+ // 3 - Twitter OAuth
+
+ if ($update_method == 2)
+ $use_simplepie = true;
+ else
+ $use_simplepie = false;
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("use simplepie: $use_simplepie (feed setting: $update_method)\n");
+ _debug("update method: $update_method (feed setting: $update_method) (use simplepie: $use_simplepie)\n");
}
- if (!$use_simplepie) {
+ if ($update_method == 1) {
$auth_login = urlencode($auth_login);
$auth_pass = urlencode($auth_pass);
}
$feed = db_escape_string($feed);
- if ($auth_login && $auth_pass) {
+ if ($auth_login && $auth_pass && $updated != 3) {
$url_parts = array();
preg_match("/(^[^:]*):\/\/(.*)/", $fetch_url, $url_parts);
} else {
- if (!$use_simplepie) {
+ if ($update_method == 3) {
+ $rss = fetch_twitter_rss($link, $fetch_url, $owner_uid);
+ } else if ($update_method == 1) {
$rss = @fetch_rss($fetch_url);
} else {
if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
$feed = db_escape_string($feed);
- if ($use_simplepie) {
+ if ($update_method == 2) {
$fetch_ok = !$rss->error();
} else {
$fetch_ok = !!$rss;
print "<select name=\"$id\" id=\"$id\" $attributes>";
foreach ($values as $v) {
if ($v == $default)
- $sel = " selected";
+ $sel = "selected=\"1\"";
else
$sel = "";
- print "<option$sel>$v</option>";
+ print "<option value=\"$v\" $sel>$v</option>";
}
print "</select>";
}
$sel .= " value=\"0\"";
}
- print "<input class=\"noborder\"
+ print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
type=\"radio\" $sel $attributes name=\"$id\"> $v ";
}
}
if ($theme_path) {
- if (is_file("$t/theme.ini")) {
- $ini = parse_ini_file("$t/theme.ini", true);
- if ($ini['theme']['version'] > THEME_VERSION_REQUIRED) {
+ if (is_file("$theme_path/theme.ini")) {
+ $ini = parse_ini_file("$theme_path/theme.ini", true);
+ if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED) {
return $theme_path;
}
}
return '';
}
+ function print_theme_includes($link) {
+
+ $t = get_user_theme_path($link);
+ $time = time();
+
+ if ($t) {
+ print "<link rel=\"stylesheet\" type=\"text/css\"
+ href=\"$t/theme.css?$time \">";
+ if (file_exists("$t/theme.js")) {
+ print "<script type=\"text/javascript\" src=\"$t/theme.js?$time\">
+ </script>";
+ }
+ }
+ }
function get_all_themes() {
$themes = glob("themes/*");
foreach ($themes as $t) {
if (is_file("$t/theme.ini")) {
$ini = parse_ini_file("$t/theme.ini", true);
- if ($ini['theme']['version'] > THEME_VERSION_REQUIRED &&
+ if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED &&
!$ini['theme']['disabled']) {
$entry = array();
$entry["path"] = $t;
$auth_login = '', $auth_pass = '') {
$url = fix_url($url);
- if (!validate_feed_url($url)) return 2;
- if (!fetch_file_contents($url)) return 5;
- if (url_is_html($url)) {
- $feedUrls = get_feeds_from_html($url);
- if (count($feedUrls) == 0) {
- return 3;
- } else if (count($feedUrls) > 1) {
- return 4;
+ if (!$url || !validate_feed_url($url)) return 2;
+
+ $update_method = 0;
+
+ if (strpos($url, '://twitter.com') === false) {
+ if (!fetch_file_contents($url)) return 5;
+
+ if (url_is_html($url)) {
+ $feedUrls = get_feeds_from_html($url);
+ if (count($feedUrls) == 0) {
+ return 3;
+ } else if (count($feedUrls) > 1) {
+ return 4;
+ }
+ //use feed url as new URL
+ $url = key($feedUrls);
}
- //use feed url as new URL
- $url = key($feedUrls);
- }
+ } else {
+ if (!fetch_twitter_rss($link, $url, $_SESSION['uid']))
+ return 5;
+
+ $update_method = 3;
+ }
if ($cat_id == "0" || !$cat_id) {
$cat_qpart = "NULL";
} else {
if (db_num_rows($result) == 0) {
$result = db_query($link,
"INSERT INTO ttrss_feeds
- (owner_uid,feed_url,title,cat_id, auth_login,auth_pass)
+ (owner_uid,feed_url,title,cat_id, auth_login,auth_pass,update_method)
VALUES ('".$_SESSION["uid"]."', '$url',
- '[Unknown]', $cat_qpart, '$auth_login', '$auth_pass')");
+ '[Unknown]', $cat_qpart, '$auth_login', '$auth_pass', '$update_method')");
$result = db_query($link,
"SELECT id FROM ttrss_feeds WHERE feed_url = '$url'
$line["id"], htmlspecialchars($line["title"]));
}
- print "<option value=\"ADD_CAT\">" .__("Add category...") . "</option>";
+# print "<option value=\"ADD_CAT\">" .__("Add category...") . "</option>";
print "</select>";
}
if ($id < -10) {
return "images/label.png";
} else {
- return ICONS_URL . "/$id.ico";
+ if (file_exists(ICONS_DIR . "/$id.ico"))
+ return ICONS_URL . "/$id.ico";
}
break;
}
$params["bw_limit"] = (int) $_SESSION["bw_limit"];
$params["offline_enabled"] = (int) get_pref($link, "ENABLE_OFFLINE_READING");
- $result = db_query($link, "SELECT COUNT(*) AS cf FROM
+ $result = db_query($link, "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
- $num_feeds = db_fetch_result($result, 0, "cf");
+ $max_feed_id = db_fetch_result($result, 0, "mid");
+ $num_feeds = db_fetch_result($result, 0, "nf");
+ $params["max_feed_id"] = (int) $max_feed_id;
$params["num_feeds"] = (int) $num_feeds;
+
$params["collapsed_feedlist"] = (int) get_pref($link, "_COLLAPSED_FEEDLIST");
return $params;
}
function make_runtime_info($link) {
- $result = db_query($link, "SELECT COUNT(*) AS cf FROM
+ $data = array();
+
+ $result = db_query($link, "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
- $num_feeds = db_fetch_result($result, 0, "cf");
+ $max_feed_id = db_fetch_result($result, 0, "mid");
+ $num_feeds = db_fetch_result($result, 0, "nf");
- $data = array();
+ $data["max_feed_id"] = (int) $max_feed_id;
+ $data["num_feeds"] = (int) $num_feeds;
- $data['num_feeds'] = (int) $num_feeds;
$data['last_article_id'] = getLastArticleId($link);
$data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED');
}
}
- if (CHECK_FOR_NEW_VERSION && $_SESSION["access_level"] >= 10) {
-
- if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
+ if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
$new_version_details = @check_for_update($link);
- $data['new_version_available'] = (int) $new_version_details != "";
+ $data['new_version_available'] = (int) ($new_version_details != false);
$_SESSION["last_version_check"] = time();
- }
}
return $data;
}
if (strtolower($entry->nodeName) == "a") {
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
- $entry->setAttribute("target", "_blank");
- }
+ $entry->setAttribute("target", "_blank");
}
if (strtolower($entry->nodeName) == "img" && !$br_inserted) {
}
function check_for_update($link) {
- $releases_feed = "http://tt-rss.org/releases.rss";
-
- if (!CHECK_FOR_NEW_VERSION || $_SESSION["access_level"] < 10) {
- return;
- }
-
- if (DEFAULT_UPDATE_METHOD == "1") {
- $rss = new SimplePie();
- $rss->set_useragent(SELF_USER_AGENT);
- $rss->set_feed_url($fetch_url);
- $rss->set_output_encoding('UTF-8');
- $rss->init();
- } else {
- $rss = fetch_rss($releases_feed);
- }
+ if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) {
+ $version_url = "http://tt-rss.org/version.php?ver=" . VERSION;
- if ($rss) {
+ $version_data = @fetch_file_contents($version_url);
- if (DEFAULT_UPDATE_METHOD == "1") {
- $items = $rss->get_items();
- } else {
- $items = $rss->items;
-
- if (!$items || !is_array($items)) $items = $rss->entries;
- if (!$items || !is_array($items)) $items = $rss;
- }
+ if ($version_data) {
+ $version_data = json_decode($version_data, true);
+ if ($version_data && $version_data['version']) {
- if (!is_array($items) || count($items) == 0) {
- return;
- }
-
- $latest_item = $items[0];
-
- if (DEFAULT_UPDATE_METHOD == "1") {
- $last_title = $latest_item->get_title();
- } else {
- $last_title = $latest_item["title"];
- }
-
- $latest_version = trim(preg_replace("/(Milestone)|(completed)/", "", $last_title));
-
- if (DEFAULT_UPDATE_METHOD == "1") {
- $release_url = sanitize_rss($link, $latest_item->get_link());
- $content = sanitize_rss($link, $latest_item->get_description());
- } else {
- $release_url = sanitize_rss($link, $latest_item["link"]);
- $content = sanitize_rss($link, $latest_item["description"]);
+ if (version_compare(VERSION, $version_data['version']) == -1) {
+ return $version_data['version'];
+ }
+ }
}
-
- if (version_compare(VERSION, $latest_version) == -1) {
- return sprintf("New version of Tiny-Tiny RSS (%s) is available:",
- $latest_version)."<div class='milestoneDetails'>$content</div>";
- } else {
- return false;
- }
}
+ return false;
}
function markArticlesById($link, $ids, $cmode) {
$feed_id, $is_cat, $search, $match_on,
$search_mode, $view_mode) {
-# print "<div class=\"headlinesSubToolbar\">";
-
$page_prev_link = "viewFeedGoPage(-1)";
$page_next_link = "viewFeedGoPage(1)";
$page_first_link = "viewFeedGoPage(0)";
print "<select dojoType=\"dijit.form.Select\"
onchange=\"headlineActionsChange(this)\">";
- print "<option value=\"\">".__('Actions...')."</option>";
-
-# print "<optgroup label=\"".__("Selection toggle:")."\">";
+ print "<option value=\"false\">".__('Actions...')."</option>";
- print "<option value=\"$tog_unread_link\">".__('Toggle unread')."</option>
- <option value=\"$tog_marked_link\">".__('Toggle starred')."</option>
- <option value=\"$tog_published_link\">".__('Toggle published')."</option>";
+ print "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
-# print "</optgroup>
-# <optgroup label=\"".__("Selection:")."\">";
+ print "<option value=\"$tog_unread_link\">".__('Unread')."</option>
+ <option value=\"$tog_marked_link\">".__('Starred')."</option>
+ <option value=\"$tog_published_link\">".__('Published')."</option>";
- print "<option>----------</option>";
+ print "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";
print "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";
print "<option value=\"emailArticle(false)\">".__('Forward by email').
"</option>";
-# print "<optgroup label=\"".__("Assign label:")."\">";
- print "<option>----------</option>";
-
- print_labels_headlines_dropdown($link, $feed_id);
-
- print "<option>----------</option>";
-
-# print "</optgroup>";
+ $rss_link = htmlspecialchars(get_self_url_prefix() .
+ "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat$view_mode$search_q");
print "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
else
$view_mode = "&view-mode=$view_mode";
- $rss_link = htmlspecialchars(get_self_url_prefix() .
- "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat$view_mode$search_q");
-
- #print "
- # <a target=\"_blank\"
- # title=\"".__("View as RSS feed")."\"
- # href=\"$rss_link\">
- # <img class=\"noborder\" src=\"images/feed-icon-12x12.png\"></a>";
-
print "
<a href=\"#\"
title=\"".__("View as RSS feed")."\"
}
- function outputFeedList($link) {
+ function outputFeedList($link, $special = true) {
$feedlist = array();
/* virtual feeds */
- if ($enable_cats) {
- $cat_hidden = get_pref($link, "_COLLAPSED_SPECIAL");
- $cat = feedlist_init_cat($link, -1, $cat_hidden);
- } else {
- $cat['items'] = array();
- }
-
- foreach (array(-4, -3, -1, -2, 0) as $i) {
- array_push($cat['items'], feedlist_init_feed($link, $i));
- }
-
- if ($enable_cats) {
- array_push($feedlist['items'], $cat);
- } else {
- $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
- }
+ if ($special) {
- $result = db_query($link, "SELECT * FROM
- ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
+ if ($enable_cats) {
+ $cat_hidden = get_pref($link, "_COLLAPSED_SPECIAL");
+ $cat = feedlist_init_cat($link, -1, $cat_hidden);
+ } else {
+ $cat['items'] = array();
+ }
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
- $cat = feedlist_init_cat($link, -2, $cat_hidden);
- } else {
- $cat['items'] = array();
- }
-
- while ($line = db_fetch_assoc($result)) {
+ foreach (array(-4, -3, -1, -2, 0) as $i) {
+ array_push($cat['items'], feedlist_init_feed($link, $i));
+ }
+
+ if ($enable_cats) {
+ array_push($feedlist['items'], $cat);
+ } else {
+ $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
+ }
+
+ $result = db_query($link, "SELECT * FROM
+ ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
- $label_id = -$line['id'] - 11;
- $count = getFeedUnread($link, $label_id);
+ if (db_num_rows($result) > 0) {
- array_push($cat['items'], feedlist_init_feed($link, $label_id,
- false, $count));
- }
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
+ $cat = feedlist_init_cat($link, -2, $cat_hidden);
+ } else {
+ $cat['items'] = array();
+ }
- if ($enable_cats) {
- array_push($feedlist['items'], $cat);
- } else {
- $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
+ while ($line = db_fetch_assoc($result)) {
+
+ $label_id = -$line['id'] - 11;
+ $count = getFeedUnread($link, $label_id);
+
+ $feed = feedlist_init_feed($link, $label_id, false, $count);
+
+ $feed['fg_color'] = $line['fg_color'];
+ $feed['bg_color'] = $line['bg_color'];
+
+ array_push($cat['items'], $feed);
+ }
+
+ if ($enable_cats) {
+ array_push($feedlist['items'], $cat);
+ } else {
+ $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
+ }
+ }
}
/* if (get_pref($link, 'ENABLE_FEED_CATS')) {
}
} */
+ /* real feeds */
+
if ($enable_cats)
- $order_by_qpart = "order_id,category,title";
+ $order_by_qpart = "ttrss_feed_categories.order_id,category,
+ ttrss_feeds.order_id,title";
else
$order_by_qpart = "title";
$actid = $_REQUEST["actid"];
- /* real feeds */
-
- $category = "";
-
- if (!$enable_cats)
- $cat['items'] = array();
- else
- $cat = false;
+ if (db_num_rows($result) > 0) {
- while ($line = db_fetch_assoc($result)) {
+ $category = "";
+
+ if (!$enable_cats)
+ $cat['items'] = array();
+ else
+ $cat = false;
+
+ while ($line = db_fetch_assoc($result)) {
+
+ $feed = htmlspecialchars(trim($line["title"]));
+
+ if (!$feed) $feed = "[Untitled]";
+
+ $feed_id = $line["id"];
+ $unread = $line["unread"];
+
+ $cat_id = $line["cat_id"];
+ $tmp_category = $line["category"];
+ if (!$tmp_category) $tmp_category = __("Uncategorized");
+
+ if ($category != $tmp_category && $enable_cats) {
- $feed = htmlspecialchars(trim($line["title"]));
-
- if (!$feed) $feed = "[Untitled]";
-
- $feed_id = $line["id"];
- $unread = $line["unread"];
-
- $cat_id = $line["cat_id"];
- $tmp_category = $line["category"];
- if (!$tmp_category) $tmp_category = __("Uncategorized");
-
- if ($category != $tmp_category && $enable_cats) {
+ $category = $tmp_category;
- $category = $tmp_category;
-
- $collapsed = sql_bool_to_bool($line["collapsed"]);
-
- // workaround for NULL category
- if ($category == __("Uncategorized")) {
- $collapsed = get_pref($link, "_COLLAPSED_UNCAT");
+ $collapsed = sql_bool_to_bool($line["collapsed"]);
+
+ // workaround for NULL category
+ if ($category == __("Uncategorized")) {
+ $collapsed = get_pref($link, "_COLLAPSED_UNCAT");
+ }
+
+ if ($cat) array_push($feedlist['items'], $cat);
+
+ $cat = feedlist_init_cat($link, $cat_id, $collapsed);
}
-
- if ($cat) array_push($feedlist['items'], $cat);
-
- $cat = feedlist_init_cat($link, $cat_id, $collapsed);
+
+ $updated = make_local_datetime($link, $line["updated_noms"], false);
+
+ array_push($cat['items'], feedlist_init_feed($link, $feed_id,
+ $feed, $unread, $line['last_error'], $updated));
+ }
+
+ if ($enable_cats) {
+ array_push($feedlist['items'], $cat);
+ } else {
+ $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
}
- $updated = make_local_datetime($link, $line["updated_noms"], false);
-
- array_push($cat['items'], feedlist_init_feed($link, $feed_id,
- $feed, $unread, $line['last_error'], $updated));
- }
-
- if ($enable_cats) {
- array_push($feedlist['items'], $cat);
- } else {
- $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
}
return $feedlist;
truncate_string(strip_tags($line['title']), 15) . "</div>";
print "<div class=\"postReply\" id=\"POST-$id\">";
- print "<div
- onclick=\"return postClicked(event, $id)\"
- class=\"postHeader\">";
+
+ /* print "<div dojoType=\"dijit.Menu\" style=\"display: none;\"
+ targetNodeIds=\"POSTHDR-$id\">";
+ print "<div onclick=\"postOpenInNewTab(event, $id)\"
+ dojoType=\"dijit.MenuItem\">".__('View in a new tab')."</div>";
+ print "<div dojoType=\"dijit.MenuSeparator\"></div>";
+ print "<div onclick=\"openArticleInNewWindow($id)\"
+ dojoType=\"dijit.MenuItem\">".__('Open original article')."</div>";
+ print "</div>"; */
+
+ print "<div onclick=\"return postClicked(event, $id)\"
+ class=\"postHeader\" id=\"POSTHDR-$id\">";
$entry_author = $line["author"];
print "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
class='tagsPic' style=\"cursor : pointer\"
- onclick=\"zoomToArticle(event, $id)\"
+ onclick=\"postOpenInNewTab(event, $id)\"
alt='Zoom' title='".__('Open article in new tab')."'>";
$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
print_article_enclosures($link, $id, $always_display_enclosures,
$article_content);
+ $short_title = truncate_string(strip_tags($line['title']), 90);
+
+ print "<br/><a href=\"http://twitter.com/share\"
+ class=\"twitter-share-button\"
+ data-text=\"$short_title\"
+ data-url=\"".htmlspecialchars($line["link"])."\"
+ data-count=\"horizontal\">Tweet</a>";
+
print "</div>";
print "</div>";
if ($has_feed_icon) {
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
} else {
- //$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
- $feed_icon_img = "";
+ $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/feed-icon-12x12.png\" alt=\"\">";
}
if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
print "</div>";
+
+
print "<div class=\"hlRight\">";
print "<span class=\"hlUpdated\">$updated_fmt</span>";
print $score_pic;
onclick=\"return cdmClicked(event, $id);\"
class=\"titleWrap$hlc_suffix\">
<a class=\"title\"
- target=\"_blank\" href=\"".$line["link"]."\">".$line["title"]."</a>
- $entry_author";
+ target=\"_blank\" href=\"".
+ htmlspecialchars($line["link"])."\">".$line["title"].
+ " $entry_author</a>";
print $labels_str;
print_article_enclosures($link, $id, $always_display_enclosures,
$article_content);
+ $short_title = truncate_string(
+ strip_tags($line['title']), 90);
+
+ print "<br/><a href=\"http://twitter.com/share\"
+ class=\"twitter-share-button\"
+ data-text=\"$short_title\"
+ data-url=\"".htmlspecialchars($line["link"])."\"
+ data-count=\"horizontal\">Tweet</a>";
+
print "</div>";
print "<div class=\"cdmFooter\">";
if (strpos($url, '/', strpos($url, ':') + 3) === false) {
$url .= '/';
}
- return $url;
+
+ if ($url != "http:///")
+ return $url;
+ else
+ return '';
}
function validate_feed_url($url) {
return true;
}
- function print_label_select($link, $name, $value, $style = "") {
+ function print_label_select($link, $name, $value, $attributes = "") {
$result = db_query($link, "SELECT caption FROM ttrss_labels2
WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
- "\" style=\"$style\" onchange=\"labelSelectOnChange(this)\" >";
+ "\" $attributes onchange=\"labelSelectOnChange(this)\" >";
while ($line = db_fetch_assoc($result)) {
$issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
- print "<option $issel>" . htmlspecialchars($line["caption"]) . "</option>";
+ print "<option value=\"".htmlspecialchars($line["caption"])."\"
+ $issel>" . htmlspecialchars($line["caption"]) . "</option>";
}
- print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
+# print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
print "</select>";
$cat_unread = getCategoryUnread($link, $cat_id);
}
- $obj['id'] = 'CAT:' . ((int)$cat_id);
+ $obj['id'] = 'CAT:' . $cat_id;
$obj['items'] = array();
$obj['name'] = getCategoryTitle($link, $cat_id);
$obj['type'] = 'feed';
$obj['unread'] = (int) $cat_unread;
$obj['hidden'] = $hidden;
+ $obj['bare_id'] = $cat_id;
return $obj;
}
function feedlist_init_feed($link, $feed_id, $title = false, $unread = false, $error = '', $updated = '') {
$obj = array();
+ $feed_id = (int) $feed_id;
if (!$title)
$title = getFeedTitle($link, $feed_id, false);
- if (!$unread)
+ if ($unread === false)
$unread = getFeedUnread($link, $feed_id, false);
$obj['id'] = 'FEED:' . $feed_id;
$obj['error'] = $error;
$obj['updated'] = $updated;
$obj['icon'] = getFeedIcon($feed_id);
+ $obj['bare_id'] = $feed_id;
return $obj;
}
+ function fetch_twitter_rss($link, $url, $owner_uid) {
+ $result = db_query($link, "SELECT twitter_oauth FROM ttrss_users
+ WHERE id = $owner_uid");
+
+ $access_token = json_decode(db_fetch_result($result, 0, 'twitter_oauth'), true);
+
+ if ($access_token) {
+
+ /* Create a TwitterOauth object with consumer/user tokens. */
+ $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
+
+ /* If method is set change API call made. Test is called by default. */
+ $content = $connection->get($url);
+
+ $rss = new MagpieRSS($content, MAGPIE_OUTPUT_ENCODING,
+ MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+
+ return $rss;
+ } else {
+ return false;
+ }
+ }
+
?>
git.wh0rd.org / tt-rss.git / blobdiff