}
require_once 'db-prefs.php';
- require_once 'compat.php';
require_once 'errors.php';
require_once 'version.php';
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');
$config = HTMLPurifier_Config::createDefault();
- $allowed = "p,a[href],i,em,b,strong,code,pre,blockquote,br,img[src|alt|title],ul,ol,li,h1,h2,h3,h4";
+ $allowed = "p,a[href],i,em,b,strong,code,pre,blockquote,br,img[src|alt|title],ul,ol,li,h1,h2,h3,h4,s";
$config->set('HTML', 'Allowed', $allowed);
$purifier = new HTMLPurifier($config);
}
function fetch_file_contents($url, $type = false) {
- if (USE_CURL_FOR_ICONS) {
+ if (USE_CURL) {
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
$favicon_url = rewrite_relative_url($url, "/favicon.ico");
// Run a test to see if what we have attempted to get actually exists.
- if(USE_CURL_FOR_ICONS || url_validate($favicon_url)) {
+ if(USE_CURL || url_validate($favicon_url)) {
return $favicon_url;
} else {
return false;
} 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)) {
_debug("enabling image cache");
}
- $rss->set_image_handler('./image.php', 'i');
+ $rss->set_image_handler(get_self_url_prefix() . '/image.php', 'i');
}
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
$feed = db_escape_string($feed);
- if ($use_simplepie) {
+ if ($update_method == 2) {
$fetch_ok = !$rss->error();
} else {
$fetch_ok = !!$rss;
$icon_url = substr($icon_url, 0, 250);
if ($icon_url && $orig_icon_url != $icon_url) {
- if (USE_CURL_FOR_ICONS || url_validate($icon_url)) {
+ if (USE_CURL || url_validate($icon_url)) {
db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
}
}
$filters = load_filters($link, $feed, $owner_uid);
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ print_r($filters);
+ }
+
if ($use_simplepie) {
$iterator = $rss->get_items();
} else {
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>";
}
}
function validate_session($link) {
- if (SINGLE_USER_MODE) {
- return true;
- }
+ if (SINGLE_USER_MODE) return true;
- if (SESSION_CHECK_ADDRESS && $_SESSION["uid"]) {
- if ($_SESSION["ip_address"]) {
- if ($_SESSION["ip_address"] != $_SERVER["REMOTE_ADDR"]) {
- $_SESSION["login_error_msg"] = __("Session failed to validate (incorrect IP)");
- return false;
- }
- }
- }
+ $check_ip = $_SESSION['ip_address'];
- if ($_SESSION["ref_schema_version"] != get_schema_version($link, true)) {
+ switch (SESSION_CHECK_ADDRESS) {
+ case 0:
+ $check_ip = '';
+ break;
+ case 1:
+ $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
+ break;
+ case 2:
+ $check_ip = substr($check_ip, 0, strrpos($check_ip, '.'));
+ $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
+ break;
+ };
+
+ if ($check_ip && strpos($_SERVER['REMOTE_ADDR'], $check_ip) !== 0) {
+ $_SESSION["login_error_msg"] =
+ __("Session failed to validate (incorrect IP)");
return false;
}
+ if ($_SESSION["ref_schema_version"] != get_schema_version($link, true))
+ return false;
+
if ($_SESSION["uid"]) {
$result = db_query($link,
}
if (!$_SESSION["uid"] || !validate_session($link)) {
- render_login_form($link, $mobile);
- //header("Location: login.php");
- exit;
+ if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH
+ && $_SERVER["REMOTE_USER"] && defined('AUTO_LOGIN') && AUTO_LOGIN) {
+ authenticate_user($link,$_SERVER['REMOTE_USER'],null);
+ $_SESSION["ref_schema_version"] = get_schema_version($link, true);
+ } else {
+ render_login_form($link, $mobile);
+ //header("Location: login.php");
+ exit;
+ }
} else {
/* bump login timestamp */
db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
}
}
- function truncate_string($str, $max_len) {
+ function truncate_string($str, $max_len, $suffix = '…') {
if (mb_strlen($str, "utf-8") > $max_len - 3) {
- return mb_substr($str, 0, $max_len, "utf-8") . "…";
+ return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
} else {
return $str;
}
}
}
- function update_generic_feed($link, $feed, $cat_view, $force_update = false) {
- if ($cat_view) {
-
- if ($feed > 0) {
- $cat_qpart = "cat_id = '$feed'";
- } else {
- $cat_qpart = "cat_id IS NULL";
- }
-
- $tmp_result = db_query($link, "SELECT id FROM ttrss_feeds
- WHERE $cat_qpart AND owner_uid = " . $_SESSION["uid"]);
-
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- $feed_id = $tmp_line["id"];
- update_rss_feed($link, $feed_id, $force_update);
- }
-
- } else {
- update_rss_feed($link, $feed, $force_update);
- }
- }
-
function getAllCounters($link, $omode = "flc", $active_feed = false) {
if (!$omode) $omode = "flc";
} else if ($n_feed == -2) {
$match_part = "published = true";
} else if ($n_feed == -3) {
- $match_part = "unread = true";
+ $match_part = "unread = true AND score >= 0";
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
$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;
}
foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
"ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
"CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT",
- "HIDE_READ_SHOWS_SPECIAL", "HIDE_FEEDLIST", "COMBINED_DISPLAY_MODE") as $param) {
+ "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
$params[strtolower($param)] = (int) get_pref($link, $param);
}
$params["default_view_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE");
$params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT");
$params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY");
- $params["prefs_active_tab"] = get_pref($link, "_PREFS_ACTIVE_TAB");
- $params["infobox_disable_overlay"] = get_pref($link, "_INFOBOX_DISABLE_OVERLAY");
$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;
}
} else if ($feed == -3) { // fresh virtual feed
- $query_strategy_part = "unread = true";
+ $query_strategy_part = "unread = true AND score >= 0";
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
$feed_kind = "Tags";
- $result = db_query($link, "SELECT
+ $result = db_query($link, "SELECT DISTINCT
+ date_entered,
guid,
note,
ttrss_entries.id as id,title,
$res = preg_replace('/<img[^>]+>/is', '', $res);
}
+ if (strpos($res, "href=") === false)
+ $res = rewrite_urls($res);
+
$charset_hack = '<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
</head>';
}
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 ($rss) {
-
- 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 (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) {
+ $version_url = "http://tt-rss.org/version.php?ver=" . VERSION;
- if (!is_array($items) || count($items) == 0) {
- return;
- }
+ $version_data = @fetch_file_contents($version_url);
- $latest_item = $items[0];
+ if ($version_data) {
+ $version_data = json_decode($version_data, true);
+ if ($version_data && $version_data['version']) {
- 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;
+ }
+ }
}
-
- 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) {
function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
$feed_id, $is_cat, $search, $match_on,
- $search_mode, $view_mode) {
-
-# print "<div class=\"headlinesSubToolbar\">";
+ $search_mode, $view_mode, $error) {
$page_prev_link = "viewFeedGoPage(-1)";
$page_next_link = "viewFeedGoPage(1)";
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>";
+ $rss_link = htmlspecialchars(get_self_url_prefix() .
+ "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat&view_mode=$view_mode$search_q");
-# print "</optgroup>";
+ print "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
print "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
$target = "target=\"_blank\"";
print "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>";
+
+ if ($error) {
+ print " (<span class=\"error\" title=\"$error\">Error</span>)";
+ }
+
} else {
if ($feed_id < -10) {
$label_id = -11-$feed_id;
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")."\"
$result = db_query($link, "SELECT * FROM
ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
-
- 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)) {
+ if (db_num_rows($result) > 0) {
+
+ 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)) {
+
+ $label_id = -$line['id'] - 11;
+ $count = getFeedUnread($link, $label_id);
- $label_id = -$line['id'] - 11;
- $count = getFeedUnread($link, $label_id);
+ $feed = feedlist_init_feed($link, $label_id, false, $count);
- array_push($cat['items'], feedlist_init_feed($link, $label_id,
- false, $count));
- }
+ $feed['fg_color'] = $line['fg_color'];
+ $feed['bg_color'] = $line['bg_color'];
- if ($enable_cats) {
- array_push($feedlist['items'], $cat);
- } else {
- $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
+ array_push($cat['items'], $feed);
+ }
+
+ if ($enable_cats) {
+ array_push($feedlist['items'], $cat);
+ } else {
+ $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
+ }
}
}
<img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
}
- function format_notice($msg) {
+ function format_notice($msg, $id = "") {
global $link;
return "<div class=\"notice\" id=\"$id\">
<img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>";
}
- function format_error($msg) {
+ function format_error($msg, $id = "") {
global $link;
return "<div class=\"error\" id=\"$id\">
<img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
$entry = "";
- if (($ctype == __("audio/mpeg")) && (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {
-
- $entry .= "<object type=\"application/x-shockwave-flash\"
- data=\"extras/button/musicplayer.swf?song_url=$url\"
- width=\"17\" height=\"17\">
- <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object>";
- }
+ if (strpos($ctype, "audio/") === 0) {
- /*
+ if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
+ strpos($_SERVER['HTTP_USER_AGENT'], "Chrome") !== false ||
+ strpos($_SERVER['HTTP_USER_AGENT'], "Safari") !== false )) {
- if (substr($ctype,0,6)=="audio/" || $ctype=="application/ogg" || $ctype=="application/x-ogg") {
- $entry .= "<audio controls=\"controls\"><source src=\"$url\" type=\"$ctype\" />";
- if (($ctype == __("audio/mpeg")) &&
- (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {
- $entry .= "<span><object type=\"application/x-shockwave-flash\" data=\"extras/button/musicplayer.swf?song_url=$url\" width=\"17\" height=\"17\"> <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object></span>";
- }
- $entry .= "</audio> ";
- if (($ctype == __("audio/mpeg")) &&
- (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {
- $entry .= "<a id='switchToFlashLink' href='#' onclick='return switchToFlash(this)'>".__('Switch to Flash Player')."</a>";
- $entry .= "<script type='text/javascript'>html5AudioOrFlash('$ctype');</script>";
+ $id = 'AUDIO-' . uniqid();
+
+ $entry .= "<audio id=\"$id\"\">
+ <source src=\"$url\"></source>
+ </audio>";
+
+ $entry .= "<span onclick=\"player(this)\"
+ title=\"".__("Click to play")."\" status=\"0\"
+ class=\"player\" audio-id=\"$id\">".__("Play")."</span>";
+
+ } else {
+
+ $entry .= "<object type=\"application/x-shockwave-flash\"
+ data=\"extras/button/musicplayer.swf?song_url=$url\"
+ width=\"17\" height=\"17\" style='float : left; margin-right : 5px;'>
+ <param name=\"movie\"
+ value=\"extras/button/musicplayer.swf?song_url=$url\" />
+ </object>";
}
- } elseif (substr($ctype,0,6)=="video/") {
- $entry .= "<video controls=\"controls\"><source src=\"$url\" type=\"$ctype\" />";
- $entry .= "</video>";
- } */
+ }
+ $filename = substr($url, strrpos($url, "/")+1);
+ $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
+ $filename . " (" . $ctype . ")" . "</a>";
return $entry;
}
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 "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
if ($line["link"]) {
- print "<div clear='both'><a target='_blank' href=\"" .
+ print "<div clear='both'><a target='_blank'
+ title=\"".htmlspecialchars($line['title'])."\"
+ href=\"" .
$line["link"] . "\">" .
- $line["title"] . "<span class='author'>$entry_author</span></a></div>";
+ truncate_string($line["title"], 100) .
+ "<span class='author'>$entry_author</span></a></div>";
} else {
print "<div clear='both'>" . $line["title"] . "$entry_author</div>";
}
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);
+ //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
print "<img src=\"".theme_image($link, 'images/art-pub-note.png')."\"
class='tagsPic' style=\"cursor : pointer\"
- onclick=\"publishWithNote($id, '$note_escaped')\"
- alt='PubNote' title='".__('Publish article with a note')."'>";
+ onclick=\"editArticleNote($id)\"
+ alt='PubNote' title='".__('Edit article note')."'>";
if (DIGEST_ENABLE) {
print "<img src=\"".theme_image($link, 'images/art-email.png')."\"
alt='Zoom' title='".__('Forward by email')."'>";
}
+ if (ENABLE_TWEET_BUTTON) {
+ print "<img src=\"".theme_image($link, 'images/art-tweet.png')."\"
+ class='tagsPic' style=\"cursor : pointer\"
+ onclick=\"tweetArticle($id)\"
+ alt='Zoom' title='".__('Share on Twitter')."'>";
+ }
+
print "<img src=\"".theme_image($link, 'images/digest_checkbox.png')."\"
class='tagsPic' style=\"cursor : pointer\"
onclick=\"closeArticlePanel($id)\"
href=\"".htmlspecialchars($feed_site_url)."\">".
$feed_icon . "</a></div>";
- print "<div class=\"postContent\">";
-
- $article_content = sanitize_rss($link, $line["content"], false, false,
- $feed_site_url);
-
print "<div id=\"POSTNOTE-$id\">";
if ($line['note']) {
print format_article_note($id, $line['note']);
}
print "</div>";
+ print "<div class=\"postContent\">";
+
+ $article_content = sanitize_rss($link, $line["content"], false, false,
+ $feed_site_url);
+
print $article_content;
print_article_enclosures($link, $id, $always_display_enclosures,
catchupArticlesById($link, $ids, $cmode);
}
- if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0 && !$cat_view) {
- update_generic_feed($link, $feed, $cat_view, true);
+ if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
+ update_rss_feed($link, $feed, true);
}
if ($subop == "MarkAllRead") {
if (db_num_rows($result) > 0) {
print_headline_subtoolbar($link, $feed_site_url, $feed_title,
- $feed, $cat_view, $search, $match_on, $search_mode, $view_mode);
+ $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
+ $last_error);
// print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
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')) {
onclick=\"return cdmClicked(event, $id);\"
class=\"titleWrap$hlc_suffix\">
<a class=\"title\"
- target=\"_blank\" href=\"".$line["link"]."\">".$line["title"]."</a>
- $entry_author";
+ title=\"".htmlspecialchars($line['title'])."\"
+ target=\"_blank\" href=\"".
+ htmlspecialchars($line["link"])."\">".
+ truncate_string($line["title"], 100) .
+ " $entry_author</a>";
print $labels_str;
alt='Zoom'
title='".__('Open article in new tab')."'>";
+ //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
+
+ print "<img src=\"images/art-pub-note.png\"
+ style=\"cursor : pointer\" style=\"cursor : pointer\"
+ onclick=\"editArticleNote($id)\"
+ alt='PubNote' title='".__('Edit article note')."'>";
+
if (DIGEST_ENABLE) {
print "<img src=\"".theme_image($link, 'images/art-email.png')."\"
style=\"cursor : pointer\"
alt='Zoom' title='".__('Forward by email')."'>";
}
- $note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
-
- print "<img src=\"images/art-pub-note.png\"
- style=\"cursor : pointer\" style=\"cursor : pointer\"
- onclick=\"publishWithNote($id, '$note_escaped')\"
- alt='PubNote' title='".__('Publish article with a note')."'>";
+ if (ENABLE_TWEET_BUTTON) {
+ print "<img src=\"".theme_image($link, 'images/art-tweet.png')."\"
+ class='tagsPic' style=\"cursor : pointer\"
+ onclick=\"tweetArticle($id)\"
+ alt='Zoom' title='".__('Share on Twitter')."'>";
+ }
print "<img src=\"images/digest_checkbox.png\"
style=\"cursor : pointer\" style=\"cursor : pointer\"
function format_article_note($id, $note) {
- $note_escaped = htmlspecialchars($note, ENT_QUOTES);
-
- $str = "<div class='articleNote'>";
- $str .= $note;
- $str .= "<div class='articleNoteOps'>";
- $str .= "<a href=\"javascript:publishWithNote($id, '$note_escaped')\">".
- __('edit note')."</a>";
- $str .= "</div>";
- $str .= "</div>";
+ $str = "<div class='articleNote' title=\"".__('edit note')."\"
+ onclick=\"editArticleNote($id)\">$note</div>";
return $str;
}
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>";
if (!$ctype) $ctype = __("unknown type");
- $filename = substr($url, strrpos($url, "/")+1);
+# $filename = substr($url, strrpos($url, "/")+1);
$entry = format_inline_player($link, $url, $ctype);
-
$entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
- $filename . " (" . $ctype . ")" . "</a>";
+
# $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
+# $filename . " (" . $ctype . ")" . "</a>";
array_push($entries_html, $entry);
if (!$title)
$title = getFeedTitle($link, $feed_id, false);
- if (!$unread)
+ if ($unread === false)
$unread = getFeedUnread($link, $feed_id, false);
$obj['id'] = 'FEED:' . $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;
+ }
+ }
+
+ function print_user_stylesheet($link) {
+ $value = get_pref($link, 'USER_STYLESHEET');
+
+ if ($value) {
+ print "<style type=\"text/css\">";
+ print str_replace("<br/>", "\n", $value);
+ print "</style>";
+ }
+
+ }
+
+ function rewrite_urls($line) {
+ global $url_regex;
+
+ $urls = null;
+
+ $result = preg_replace("/((?<!=.)((http|https|ftp)+):\/\/[^ ,!]+)/i",
+ "<a target=\"_blank\" href=\"\\1\">\\1</a>", $line);
+
+ return $result;
+ }
+
?>
git.wh0rd.org / tt-rss.git / blobdiff