valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code cleanup (remove dashboard initial stuff)

This commit is contained in:
Andrew Dolgov 2009-01-16 17:12:28 +01:00
parent cc914918fa
commit a5c815d358
2 changed files with 45 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
backend.php
View File

@ -282,62 +282,55 @@
} }
print "<headlines id=\"$feed\"><![CDATA["; print "<headlines id=\"$feed\"><![CDATA[";
$override_order = false;
if ($feed == -4) { switch ($order_by) {
case "date":
generate_dashboard_feed($link); if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
$override_order = "updated";
} else { } else {
$override_order = false;
switch ($order_by) {
case "date":
if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
$override_order = "updated";
} else {
$override_order = "updated DESC";
}
break;
case "title":
$override_order = "updated DESC"; $override_order = "updated DESC";
break;
case "score":
$override_order = "score DESC";
break;
}
$ret = outputHeadlinesList($link, $feed, $subop,
$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
$vgroup_last_feed, $override_order);
$topmost_article_ids = $ret[0];
$headlines_count = $ret[1];
$returned_feed = $ret[2];
$disable_cache = $ret[3];
$vgroup_last_feed = $ret[4];
print "]]></headlines>";
print "<headlines-count value=\"$headlines_count\"/>";
print "<vgroup-last-feed value=\"$vgroup_last_feed\"/>";
$headlines_unread = ccache_find($link, $returned_feed, $_SESSION["uid"]);
print "<headlines-unread value=\"$headlines_unread\"/>";
printf("<disable-cache value=\"%d\"/>", $disable_cache);
if ($_GET["debug"]) $timing_info = print_checkpoint("10", $timing_info);
if (is_array($topmost_article_ids) && !get_pref($link, 'COMBINED_DISPLAY_MODE') && !$_SESSION["bw_limit"]) {
print "<articles>";
foreach ($topmost_article_ids as $id) {
outputArticleXML($link, $id, $feed, false);
} }
print "</articles>"; break;
case "title":
$override_order = "updated DESC";
break;
case "score":
$override_order = "score DESC";
break;
}
$ret = outputHeadlinesList($link, $feed, $subop,
$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
$vgroup_last_feed, $override_order);
$topmost_article_ids = $ret[0];
$headlines_count = $ret[1];
$returned_feed = $ret[2];
$disable_cache = $ret[3];
$vgroup_last_feed = $ret[4];
print "]]></headlines>";
print "<headlines-count value=\"$headlines_count\"/>";
print "<vgroup-last-feed value=\"$vgroup_last_feed\"/>";
$headlines_unread = ccache_find($link, $returned_feed, $_SESSION["uid"]);
print "<headlines-unread value=\"$headlines_unread\"/>";
printf("<disable-cache value=\"%d\"/>", $disable_cache);
if ($_GET["debug"]) $timing_info = print_checkpoint("10", $timing_info);
if (is_array($topmost_article_ids) && !get_pref($link, 'COMBINED_DISPLAY_MODE') && !$_SESSION["bw_limit"]) {
print "<articles>";
foreach ($topmost_article_ids as $id) {
outputArticleXML($link, $id, $feed, false);
} }
print "</articles>";
} }
if ($_GET["debug"]) $timing_info = print_checkpoint("20", $timing_info); if ($_GET["debug"]) $timing_info = print_checkpoint("20", $timing_info);

35
functions.php
View File

@ -4077,8 +4077,6 @@
} }
if (!$dashboard_menu) {
if (strpos($_SESSION["client.userAgent"], "MSIE") === false) { if (strpos($_SESSION["client.userAgent"], "MSIE") === false) {
print "<td class=\"headlineActions$rtl_cpart\"> print "<td class=\"headlineActions$rtl_cpart\">
@ -4157,11 +4155,6 @@
print "</td>"; print "</td>";
} }
} else { // dashboard menu actions
// not implemented
print "</td>";
}
print "<td class=\"headlineTitle$rtl_cpart\">"; print "<td class=\"headlineTitle$rtl_cpart\">";
@ -4284,11 +4277,6 @@
printCategoryHeader($link, -1, $cat_hidden, false); printCategoryHeader($link, -1, $cat_hidden, false);
} }
if (defined('_ENABLE_DASHBOARD')) {
printFeedEntry(-4, "virt", __("Dashboard"), 0,
"images/tag.png", $link);
}
$num_starred = getFeedUnread($link, -1); $num_starred = getFeedUnread($link, -1);
$num_published = getFeedUnread($link, -2); $num_published = getFeedUnread($link, -2);
$num_fresh = getFeedUnread($link, -3); $num_fresh = getFeedUnread($link, -3);
@ -5843,29 +5831,6 @@
} // function update_daemon_common } // function update_daemon_common
function generate_dashboard_feed($link) {
print "<div id=\"headlinesContainer\">";
print_headline_subtoolbar($link, "", "Dashboard",
false, false, -4, false, false, false,
false, 0, 0, true, true, "tag.png");
print "<div id=\"headlinesInnerContainer\" class=\"dashboard\">";
print "<div>There is <b>666</b> unread articles in <b>666</b> feeds.</div>";
print "</div>";
print "</div>";
print "]]></headlines>";
print "<headlines-count value=\"0\"/>";
print "<headlines-unread value=\"0\"/>";
print "<disable-cache value=\"1\"/>";
print "<articles>";
print "</articles>";
}
function sanitize_article_content($text) { function sanitize_article_content($text) {
# we don't support CDATA sections in articles, they break our own escaping # we don't support CDATA sections in articles, they break our own escaping
$text = preg_replace("/\[\[CDATA/", "", $text); $text = preg_replace("/\[\[CDATA/", "", $text);