if (!$icon_file) $icon_file = getFeedIcon($feed_id);
+ if (strpos($icon_file, "images") !== false) {
+ $icon_file = theme_image($link, $icon_file);
+ }
+
if (file_exists($icon_file) && filesize($icon_file) > 0) {
$feed_icon = "<img id=\"FIMG-$feed_id\" src=\"$icon_file\">";
} else {
}
}
- function initialize_user_prefs($link, $uid) {
+ function initialize_user_prefs($link, $uid, $profile = false) {
$uid = db_escape_string($uid);
+ if (!$profile) {
+ $profile = "NULL";
+ $profile_qpart = "AND profile IS NULL";
+ } else {
+ $profile_qpart = "AND profile = '$profile'";
+ }
+
+ if (get_schema_version($link) < 63) $profile_qpart = "";
+
db_query($link, "BEGIN");
$result = db_query($link, "SELECT pref_name,def_value FROM ttrss_prefs");
$u_result = db_query($link, "SELECT pref_name
- FROM ttrss_user_prefs WHERE owner_uid = '$uid'");
+ FROM ttrss_user_prefs WHERE owner_uid = '$uid' $profile_qpart");
$active_prefs = array();
if (array_search($line["pref_name"], $active_prefs) === FALSE) {
// print "adding " . $line["pref_name"] . "<br>";
- db_query($link, "INSERT INTO ttrss_user_prefs
- (owner_uid,pref_name,value) VALUES
- ('$uid', '".$line["pref_name"]."','".$line["def_value"]."')");
+ if (get_schema_version($link) < 63) {
+ db_query($link, "INSERT INTO ttrss_user_prefs
+ (owner_uid,pref_name,value) VALUES
+ ('$uid', '".$line["pref_name"]."','".$line["def_value"]."')");
+
+ } else {
+ db_query($link, "INSERT INTO ttrss_user_prefs
+ (owner_uid,pref_name,value, profile) VALUES
+ ('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)");
+ }
}
}
db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
$_SESSION["uid"]);
- $user_theme = get_user_theme_path($link);
-
- $_SESSION["theme"] = $user_theme;
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
$_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
$_SESSION["uid"] = 1;
$_SESSION["name"] = "admin";
- $user_theme = get_user_theme_path($link);
-
- $_SESSION["theme"] = $user_theme;
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
initialize_user_prefs($link, $_SESSION["uid"]);
}
}
+ if ($_SESSION["ref_schema_version"] != get_schema_version($link, true)) {
+ return false;
+ }
+
if ($_SESSION["uid"]) {
$result = db_query($link,
function login_sequence($link, $mobile = false) {
if (!SINGLE_USER_MODE) {
- if (defined('_DEBUG_USER_SWITCH') && $_SESSION["uid"]) {
- $swu = db_escape_string($_REQUEST["swu"]);
- if ($swu) {
- $_SESSION["prefs_cache"] = false;
- return authenticate_user($link, $swu, null, true);
- }
- }
-
$login_action = $_POST["login_action"];
# try to authenticate user if called from login form
$_POST["password"] = "";
$_SESSION["language"] = $_POST["language"];
+ $_SESSION["ref_schema_version"] = get_schema_version($link, true);
$_SESSION["bw_limit"] = !!$_POST["bw_limit"];
+ if ($_POST["profile"]) {
+
+ $profile = db_escape_string($_POST["profile"]);
+
+ $result = db_query($link, "SELECT id FROM ttrss_settings_profiles
+ WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]);
+
+ if (db_num_rows($result) != 0) {
+ $_SESSION["profile"] = $profile;
+ $_SESSION["prefs_cache"] = array();
+ }
+ }
+
header("Location: " . $_SERVER["REQUEST_URI"]);
exit;
}
}
+ function theme_image($link, $filename) {
+ if ($link) {
+ $theme_path = get_user_theme_path($link);
+
+ if ($theme_path && is_file($theme_path.$filename)) {
+ return $theme_path.$filename;
+ } else {
+ return $filename;
+ }
+ } else {
+ return $filename;
+ }
+ }
+
+ function get_user_theme($link) {
+
+ if (get_schema_version($link) >= 63) {
+ $theme_name = get_pref($link, "_THEME_ID");
+ if (is_dir("themes/$theme_name")) {
+ return $theme_name;
+ } else {
+ return '';
+ }
+ } else {
+ return '';
+ }
+
+ }
+
function get_user_theme_path($link) {
- $result = db_query($link, "SELECT theme_path
- FROM
- ttrss_themes,ttrss_users
- WHERE ttrss_themes.id = theme_id AND ttrss_users.id = " . $_SESSION["uid"]);
- if (db_num_rows($result) != 0) {
- return db_fetch_result($result, 0, "theme_path");
+
+ if (get_schema_version($link) >= 63) {
+ $theme_name = get_pref($link, "_THEME_ID");
+
+ if ($theme_name && is_dir("themes/$theme_name")) {
+ $theme_path = "themes/$theme_name/";
+ } else {
+ $theme_name = '';
+ }
} else {
- return null;
+ $theme_path = '';
+ }
+
+ return $theme_path;
+ }
+
+ function get_user_theme_options($link) {
+ $t = get_user_theme_path($link);
+
+ if ($t) {
+ if (is_file("$t/theme.ini")) {
+ $ini = parse_ini_file("$t/theme.ini", true);
+ if ($ini['theme']['version']) {
+ return $ini['theme']['options'];
+ }
+ }
+ }
+ return false;
+ }
+
+
+ function get_all_themes() {
+ $themes = glob("themes/*");
+
+ asort($themes);
+
+ $rv = array();
+
+ foreach ($themes as $t) {
+ if (is_file("$t/theme.ini")) {
+ $ini = parse_ini_file("$t/theme.ini", true);
+ if ($ini['theme']['version'] && !$ini['theme']['disabled']) {
+ $entry = array();
+ $entry["path"] = $t;
+ $entry["base"] = basename($t);
+ $entry["name"] = $ini['theme']['name'];
+ $entry["version"] = $ini['theme']['version'];
+ $entry["author"] = $ini['theme']['author'];
+ $entry["options"] = $ini['theme']['options'];
+ array_push($rv, $entry);
+ }
+ }
}
+
+ return $rv;
}
function smart_date_time($timestamp) {
return "even";
}
+ function get_schema_version($link, $nocache = false) {
+ if (!$_SESSION["schema_version"] || $nocache) {
+ $result = db_query($link, "SELECT schema_version FROM ttrss_version");
+ $version = db_fetch_result($result, 0, "schema_version");
+ $_SESSION["schema_version"] = $version;
+ return $version;
+ } else {
+ return $_SESSION["schema_version"];
+ }
+ }
+
function sanity_check($link) {
error_reporting(0);
$error_code = 0;
- $result = db_query($link, "SELECT schema_version FROM ttrss_version");
- $schema_version = db_fetch_result($result, 0, "schema_version");
+ $schema_version = get_schema_version($link);
if ($schema_version != SCHEMA_VERSION) {
$error_code = 5;
print "</rpc-reply>";
}
- function subscribe_to_feed($link, $feed_link, $cat_id = 0,
+ function subscribe_to_feed($link, $url, $cat_id = 0,
$auth_login = '', $auth_pass = '') {
- # check for feed:http://url
- $feed_link = trim(preg_replace("/^feed:/", "", $feed_link));
+ $parts = parse_url($url);
- # check for feed://URL
- if (strpos($feed_link, "//") === 0) {
- $feed_link = "http:$feed_link";
- }
+ if (!validate_feed_url($url)) return 2;
- if ($feed_link == "") return;
+ if ($parts['scheme'] == 'feed') $parts['scheme'] = 'http';
+
+ $url = make_url_from_parts($parts);
if ($cat_id == "0" || !$cat_id) {
$cat_qpart = "NULL";
$result = db_query($link,
"SELECT id FROM ttrss_feeds
- WHERE feed_url = '$feed_link' AND owner_uid = ".$_SESSION["uid"]);
+ WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
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)
- VALUES ('".$_SESSION["uid"]."', '$feed_link',
+ VALUES ('".$_SESSION["uid"]."', '$url',
'[Unknown]', $cat_qpart, '$auth_login', '$auth_pass')");
$result = db_query($link,
- "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'
+ "SELECT id FROM ttrss_feeds WHERE feed_url = '$url'
AND owner_uid = " . $_SESSION["uid"]);
$feed_id = db_fetch_result($result, 0, "id");
if ($feed_id) {
- update_rss_feed($link, $feed_link, $feed_id, true);
+ update_rss_feed($link, $url, $feed_id, true);
}
- return true;
+ return 1;
} else {
- return false;
+ return 0;
}
}
return "images/mark_set.png";
break;
case -2:
- return "images/pub_set.gif";
+ return "images/pub_set.png";
break;
case -3:
return "images/fresh.png";
}
}
- print "<param key=\"theme\" value=\"".$_SESSION["theme"]."\"/>";
+ print "<param key=\"theme\" value=\"".get_user_theme($link)."\"/>";
+ print "<param key=\"theme_options\" value=\"".get_user_theme_options($link)."\"/>";
print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
print "<param key=\"daemon_refresh_only\" value=\"true\"/>";
+ print "<param key=\"sign_progress\" value=\"".
+ theme_image($link, "images/indicator_white.gif")."\"/>";
+
+ print "<param key=\"sign_progress_tiny\" value=\"".
+ theme_image($link, "images/indicator_tiny.gif")."\"/>";
+
+ print "<param key=\"sign_excl\" value=\"".
+ theme_image($link, "images/sign_excl.png")."\"/>";
+
+ print "<param key=\"sign_info\" value=\"".
+ theme_image($link, "images/sign_info.png")."\"/>";
+
print "<param key=\"on_catchup_show_next_feed\" value=\"" .
get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
}
if (get_pref($link, "STRIP_IMAGES", $owner)) {
-
$res = preg_replace('/<img[^>]+>/is', '', $res);
+ }
+ if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
+ $res = preg_replace("/href=/i", "target=\"_blank\" href=", $res);
}
return $res;
print "<li onclick=\"$archive_sel_link\"> ".__('Archive')."</li>";
} else {
print "<li onclick=\"$archive_sel_link\"> ".__('Move back')."</li>";
- }
+ print "<li onclick=\"$delete_sel_link\"> ".__('Delete')."</li>";
- print "<li onclick=\"$delete_sel_link\"> ".__('Delete')."</li>";
+ }
//print "<li><span class=\"insensitive\">--------</span></li>";
print "<li class=\"insensitive\">".__('Assign label:')."</li>";
}
function format_warning($msg, $id = "") {
+ global $link;
return "<div class=\"warning\" id=\"$id\">
- <img src=\"images/sign_excl.gif\">$msg</div>";
+ <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
}
function format_notice($msg) {
- return "<div class=\"notice\">
- <img src=\"images/sign_info.gif\">$msg</div>";
+ global $link;
+ return "<div class=\"notice\" id=\"$id\">
+ <img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>";
}
function format_error($msg) {
- return "<div class=\"error\">
- <img src=\"images/sign_excl.gif\">$msg</div>";
+ global $link;
+ return "<div class=\"error\" id=\"$id\">
+ <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
}
function print_notice($msg) {
if ($result) {
- $link_target = "";
-
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
- $link_target = "target=\"_blank\"";
- }
-
$line = db_fetch_assoc($result);
if ($line["icon_url"]) {
} else {
$comments_url = $line["link"];
}
- $entry_comments = "<a $link_target href=\"$comments_url\">$num_comments comments</a>";
+ $entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>";
} else {
if ($line["comments"] && $line["link"] != $line["comments"]) {
- $entry_comments = "<a $link_target href=\"".$line["comments"]."\">comments</a>";
+ $entry_comments = "<a target='_blank' href=\"".$line["comments"]."\">comments</a>";
}
}
print "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
if ($line["link"]) {
- print "<div clear='both'><a $link_target href=\"" . $line["link"] . "\">" .
+ print "<div clear='both'><a target='_blank' href=\"" . $line["link"] . "\">" .
$line["title"] . "</a><span class='author'>$entry_author</span></div>";
} else {
print "<div clear='both'>" . $line["title"] . "$entry_author</div>";
if (!$entry_comments) $entry_comments = " "; # placeholder
print "<div style='float : right'>
- <img src='images/tag.png' class='tagsPic' alt='Tags' title='Tags'> ";
+ <img src='".theme_image($link, 'images/tag.png')."'
+ class='tagsPic' alt='Tags' title='Tags'> ";
if (!$zoom_mode) {
print "<span id=\"ATSTR-$id\">$tags_str</span>
<a title=\"".__('Edit tags for this article')."\"
href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a>";
- if (defined('_ENABLE_INLINE_VIEW')) {
-
- print "<img src=\"images/art-inline.png\" class='tagsPic'
- style=\"cursor : pointer\" style=\"cursor : pointer\"
- onclick=\"showOriginalArticleInline($id)\"
- alt='Inline' title='".__('Display original article content')."'>";
-
- }
-
- print "<img src=\"images/art-zoom.png\" class='tagsPic'
- style=\"cursor : pointer\" style=\"cursor : pointer\"
+ print "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
+ class='tagsPic' style=\"cursor : pointer\" style=\"cursor : pointer\"
onclick=\"zoomToArticle($id)\"
alt='Zoom' title='".__('Show article summary in new window')."'>";
$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
- print "<img src=\"images/art-pub-note.png\" class='tagsPic'
- style=\"cursor : pointer\" style=\"cursor : pointer\"
+ print "<img src=\"".theme_image($link, 'images/art-pub-note.png')."\"
+ class='tagsPic' style=\"cursor : pointer\" style=\"cursor : pointer\"
onclick=\"publishWithNote($id, '$note_escaped')\"
alt='PubNote' title='".__('Publish article with a note')."'>";
$article_content = sanitize_rss($link, $line["content"]);
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
- $article_content = preg_replace("/href=/i", "target=\"_blank\" href=",
- $article_content);
- }
-
print "<div id=\"POSTNOTE-$id\">";
if ($line['note']) {
print format_article_note($id, $line['note']);
} else {
print "
<div style=\"text-align : center\">
- <input type=\"submit\" onclick=\"return window.close()\"
- value=\"".__("Close this window")."\"></div>";
+ <button onclick=\"return window.close()\">".
+ __("Close this window")."</button></div>";
print "</body></html>";
}
if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {
- $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\"
+ $update_pic = "<img id='FUPDPIC-$id' src=\"".
+ theme_image($link, 'images/updated.png')."\"
alt=\"Updated\">";
} else {
$update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"
if (sql_bool_to_bool($line["unread"]) &&
time() - strtotime($line["updated_noms"]) < $fresh_intl) {
- $update_pic = "<img id='FUPDPIC-$id' src=\"images/fresh_sign.png\"
- alt=\"Fresh\">";
+ $update_pic = "<img id='FUPDPIC-$id' src=\"".
+ theme_image($link, 'images/fresh_sign.png')."\" alt=\"Fresh\">";
}
if ($line["unread"] == "t" || $line["unread"] == "1") {
}
if ($line["marked"] == "t" || $line["marked"] == "1") {
- $marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_set.png\"
- class=\"markedPic\"
- alt=\"Unstar article\" onclick='javascript:tMark($id)'>";
+ $marked_pic = "<img id=\"FMPIC-$id\"
+ src=\"".theme_image($link, 'images/mark_set.png')."\"
+ class=\"markedPic\" alt=\"Unstar article\"
+ onclick='javascript:tMark($id)'>";
} else {
- $marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_unset.png\"
- class=\"markedPic\"
- alt=\"Star article\" onclick='javascript:tMark($id)'>";
+ $marked_pic = "<img id=\"FMPIC-$id\"
+ src=\"".theme_image($link, 'images/mark_unset.png')."\"
+ class=\"markedPic\" alt=\"Star article\"
+ onclick='javascript:tMark($id)'>";
}
if ($line["published"] == "t" || $line["published"] == "1") {
- $published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_set.gif\"
+ $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
+ 'images/pub_set.png')."\"
class=\"markedPic\"
alt=\"Unpublish article\" onclick='javascript:tPub($id)'>";
} else {
- $published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_unset.gif\"
+ $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
+ 'images/pub_unset.png')."\"
class=\"markedPic\"
alt=\"Publish article\" onclick='javascript:tPub($id)'>";
}
$score = $line["score"];
- $score_pic = get_score_pic($score);
+ $score_pic = theme_image($link,
+ "images/" . get_score_pic($score));
/* $score_title = __("(Click to change)");
$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
onclick=\"adjustArticleScore($id, $score)\" title=\"$score $score_title\">"; */
- $score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
+ $score_pic = "<img class='hlScorePic' src=\"$score_pic\"
title=\"$score\">";
if ($score > 500) {
print "</span></div>";
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
- $line["content_preview"] = preg_replace("/href=/i",
- "target=\"_blank\" href=", $line["content_preview"]);
- }
-
if ($show_excerpt) {
print "<div class=\"cdmExcerpt\" id=\"CEXC-$id\"
onclick=\"cdmExpandArticle($id)\"
$tags_str = format_tags_string(get_article_tags($link, $id), $id);
-// print "<img src='images/tag.png' class='markedPic'>";
-
print "<span class='s1'>
- <img class='tagsPic' src='images/tag.png' alt='Tags' title='Tags'>
+ <img class='tagsPic' src='".theme_image($link,
+ 'images/tag.png')."' alt='Tags' title='Tags'>
<span id=\"ATSTR-$id\">$tags_str</span>
<a title=\"".__('Edit tags for this article')."\"
href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
}
$url_path .= $_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
- $url_path .= "/backend.php?op=publish&key=" . get_pref($link, "_PREFS_PUBLISH_KEY");
+ $url_path .= "/backend.php?op=publish&key=" .
+ get_pref($link, "_PREFS_PUBLISH_KEY", $_SESSION["uid"]);
return $url_path;
}
if ($score > 100) {
return "score_high.png";
} else if ($score > 0) {
- return "score_half_high.png";
+ return "score_half_high.png";
} else if ($score < -100) {
- return "score_low.png";
+ return "score_low.png";
} else if ($score < 0) {
- return "score_half_low.png";
+ return "score_half_low.png";
} else {
- return "score_neutral.png";
+ return "score_neutral.png";
}
}
$num_tags = 0;
- if ($_SESSION["theme"] == "3pane") {
+/* if (get_user_theme($link) == "3pane") {
$tag_limit = 3;
} else {
$tag_limit = 6;
- }
+ } */
+
+ $tag_limit = 6;
$formatted_tags = array();
db_query($link, "COMMIT");
- if (file_exists(ICONS_DIR . "/$id.ico")) {
+/* if (file_exists(ICONS_DIR . "/$id.ico")) {
unlink(ICONS_DIR . "/$id.ico");
- }
+ } */
ccache_remove($link, $id, $owner_uid);
return 0;
}
}
+
+ function make_url_from_parts($parts) {
+ $url = $parts['scheme'] . '://' . $parts['host'];
+
+ if ($parts['path']) $url .= $parts['path'];
+ if ($parts['query']) $url .= '?' . $parts['query'];
+
+ return $url;
+ }
+
+ function validate_feed_url($url) {
+ $parts = parse_url($url);
+
+ return ($parts['scheme'] == 'http' || $parts['scheme'] == 'feed' || $parts['scheme'] == 'https');
+
+ }
+
?>
git.wh0rd.org / tt-rss.git / blobdiff