if (!$icon_file) $icon_file = getFeedIcon($feed_id);
- $theme_path = get_user_theme_path($link);
-
- if ($theme_path && strpos($icon_file, "images") !== false) {
- $icon_file = $theme_path . $icon_file;
+ if (strpos($icon_file, "images") !== false) {
+ $icon_file = theme_image($link, $icon_file);
}
if (file_exists($icon_file) && filesize($icon_file) > 0) {
}
}
+ 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) {
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/*");
$entry["name"] = $ini['theme']['name'];
$entry["version"] = $ini['theme']['version'];
$entry["author"] = $ini['theme']['author'];
+ $entry["options"] = $ini['theme']['options'];
array_push($rv, $entry);
}
}
}
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") . "\"/>";
}
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) {
$result = db_query($link, "SELECT rtl_content, always_display_enclosures FROM ttrss_feeds
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
- $theme_path = get_user_theme_path($link);
-
if (db_num_rows($result) == 1) {
$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
$always_display_enclosures = sql_bool_to_bool(db_fetch_result($result, 0, "always_display_enclosures"));
if (!$entry_comments) $entry_comments = " "; # placeholder
print "<div style='float : right'>
- <img src='${theme_path}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>";
- print "<img src=\"${theme_path}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=\"${theme_path}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')."'>";
$fresh_intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE") * 60 * 60;
- $theme_path = get_user_theme_path($link);
-
while ($line = db_fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
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=\"${theme_path}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=\"${theme_path}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=\"${theme_path}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=\"${theme_path}images/pub_set.png\"
+ $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=\"${theme_path}images/pub_unset.png\"
+ $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) {
$tags_str = format_tags_string(get_article_tags($link, $id), $id);
print "<span class='s1'>
- <img class='tagsPic' src='${theme_path}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>";
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";
}
}