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

mobile: properly handle going back from article to flat category list

This commit is contained in:
Andrew Dolgov 2011-04-13 15:09:00 +04:00
parent bdea432bbb
commit 9de6ced109
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/article.php
View File

@ -23,7 +23,8 @@
$id = db_escape_string($_REQUEST["id"]); $id = db_escape_string($_REQUEST["id"]);
$feed_id = db_escape_string($_REQUEST["feed"]); $feed_id = db_escape_string($_REQUEST["feed"]);
$cat_id = db_escape_string($_REQUEST["cat"]); $cat_id = db_escape_string($_REQUEST["cat"]);
$is_cat = db_escape_string($_REQUEST["is_cat"]);
render_article($link, $id, $feed_id, $cat_id); render_article($link, $id, $feed_id, $cat_id, $is_cat);
?> ?>

11
mobile/functions.php
View File

@ -388,7 +388,7 @@
$icon_url = "../images/blank_icon.gif"; $icon_url = "../images/blank_icon.gif";
} }
print "<li class='$class'><a href='article.php?id=$id&feed=$feed_id&cat=$cat_id'> print "<li class='$class'><a href='article.php?id=$id&feed=$feed_id&cat=$cat_id&is_cat=$is_cat'>
<img class='tinyIcon' src='$icon_url'>"; <img class='tinyIcon' src='$icon_url'>";
print $line["title"]; print $line["title"];
print "</a></li>"; print "</a></li>";
@ -429,7 +429,7 @@
} }
function render_article($link, $id, $feed_id, $cat_id) { function render_article($link, $id, $feed_id, $cat_id, $is_cat) {
$query = "SELECT title,link,content,feed_id,comments,int_id, $query = "SELECT title,link,content,feed_id,comments,int_id,
marked,unread,published, marked,unread,published,
@ -455,11 +455,14 @@
$title = $line["title"]; $title = $line["title"];
$article_link = $line["link"]; $article_link = $line["link"];
$feed_title = getFeedTitle($link, $feed_id, false); if (!$is_cat)
$feed_title = getFeedTitle($link, $feed_id);
else
$feed_title = getCategoryTitle($link, $feed_id);
print "<div class=\"panel\" id=\"article-$id\" title=\"$title\" print "<div class=\"panel\" id=\"article-$id\" title=\"$title\"
selected=\"true\" selected=\"true\"
myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id'>"; myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id&is_cat=$is_cat'>";
print "<h2><a target='_blank' href='$article_link'>$title</a></h2>"; print "<h2><a target='_blank' href='$article_link'>$title</a></h2>";