diff options
author | Andrew Dolgov <[email protected]> | 2013-04-17 18:34:18 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-04-17 18:34:18 +0400 |
commit | a42c55f02b7e313ab61bf826794d0888f2dceae1 (patch) | |
tree | 7946572f0e45015a0b54830bd1296be548584ed8 /plugins/mobile | |
parent | 72ff0137298f60970c664f0be24327b120bf4ac7 (diff) |
fix blank character after opening bracket in function calls
Diffstat (limited to 'plugins/mobile')
-rw-r--r-- | plugins/mobile/article.php | 12 | ||||
-rw-r--r-- | plugins/mobile/backend.php | 24 | ||||
-rw-r--r-- | plugins/mobile/cat.php | 6 | ||||
-rw-r--r-- | plugins/mobile/feed.php | 14 | ||||
-rw-r--r-- | plugins/mobile/home.php | 8 | ||||
-rw-r--r-- | plugins/mobile/index.php | 8 | ||||
-rw-r--r-- | plugins/mobile/mobile-functions.php | 90 | ||||
-rw-r--r-- | plugins/mobile/prefs.php | 14 |
8 files changed, 88 insertions, 88 deletions
diff --git a/plugins/mobile/article.php b/plugins/mobile/article.php index 17fc39395..f51c8962c 100644 --- a/plugins/mobile/article.php +++ b/plugins/mobile/article.php @@ -20,13 +20,13 @@ init_plugins($link); - login_sequence( true); + login_sequence(true); - $id = db_escape_string( $_REQUEST["id"]); - $feed_id = db_escape_string( $_REQUEST["feed"]); - $cat_id = db_escape_string( $_REQUEST["cat"]); - $is_cat = db_escape_string( $_REQUEST["is_cat"]); + $id = db_escape_string($_REQUEST["id"]); + $feed_id = db_escape_string($_REQUEST["feed"]); + $cat_id = db_escape_string($_REQUEST["cat"]); + $is_cat = db_escape_string($_REQUEST["is_cat"]); - render_article( $id, $feed_id, $cat_id, $is_cat); + render_article($id, $feed_id, $cat_id, $is_cat); ?> diff --git a/plugins/mobile/backend.php b/plugins/mobile/backend.php index a62f462d5..872798814 100644 --- a/plugins/mobile/backend.php +++ b/plugins/mobile/backend.php @@ -31,28 +31,28 @@ switch ($op) { case "toggleMarked": - $cmode = db_escape_string( $_REQUEST["mark"]); - $id = db_escape_string( $_REQUEST["id"]); + $cmode = db_escape_string($_REQUEST["mark"]); + $id = db_escape_string($_REQUEST["id"]); - markArticlesById( array($id), $cmode); + markArticlesById(array($id), $cmode); break; case "togglePublished": - $cmode = db_escape_string( $_REQUEST["pub"]); - $id = db_escape_string( $_REQUEST["id"]); + $cmode = db_escape_string($_REQUEST["pub"]); + $id = db_escape_string($_REQUEST["id"]); - publishArticlesById( array($id), $cmode); + publishArticlesById(array($id), $cmode); break; case "toggleUnread": - $cmode = db_escape_string( $_REQUEST["unread"]); - $id = db_escape_string( $_REQUEST["id"]); + $cmode = db_escape_string($_REQUEST["unread"]); + $id = db_escape_string($_REQUEST["id"]); - catchupArticlesById( array($id), $cmode); + catchupArticlesById(array($id), $cmode); break; case "setPref": - $id = db_escape_string( $_REQUEST["id"]); - $value = db_escape_string( $_REQUEST["to"]); - mobile_set_pref( $id, $value); + $id = db_escape_string($_REQUEST["id"]); + $value = db_escape_string($_REQUEST["to"]); + mobile_set_pref($id, $value); print_r($_SESSION); break; default: diff --git a/plugins/mobile/cat.php b/plugins/mobile/cat.php index ec5bbf3d9..5164d0049 100644 --- a/plugins/mobile/cat.php +++ b/plugins/mobile/cat.php @@ -20,10 +20,10 @@ init_plugins($link); - login_sequence( true); + login_sequence(true); - $cat_id = db_escape_string( $_REQUEST["id"]); + $cat_id = db_escape_string($_REQUEST["id"]); - render_category( $cat_id); + render_category($cat_id); ?> diff --git a/plugins/mobile/feed.php b/plugins/mobile/feed.php index 08e916e21..e09f9432a 100644 --- a/plugins/mobile/feed.php +++ b/plugins/mobile/feed.php @@ -20,14 +20,14 @@ init_plugins($link); - login_sequence( true); + login_sequence(true); - $feed_id = db_escape_string( $_REQUEST["id"]); - $cat_id = db_escape_string( $_REQUEST["cat"]); - $offset = (int) db_escape_string( $_REQUEST["skip"]); - $search = db_escape_string( $_REQUEST["search"]); - $is_cat = (bool) db_escape_string( $_REQUEST["is_cat"]); + $feed_id = db_escape_string($_REQUEST["id"]); + $cat_id = db_escape_string($_REQUEST["cat"]); + $offset = (int) db_escape_string($_REQUEST["skip"]); + $search = db_escape_string($_REQUEST["search"]); + $is_cat = (bool) db_escape_string($_REQUEST["is_cat"]); - render_headlines_list( $feed_id, $cat_id, $offset, $search, $is_cat); + render_headlines_list($feed_id, $cat_id, $offset, $search, $is_cat); ?> diff --git a/plugins/mobile/home.php b/plugins/mobile/home.php index 57b18cd85..71ef81def 100644 --- a/plugins/mobile/home.php +++ b/plugins/mobile/home.php @@ -20,14 +20,14 @@ init_plugins($link); - login_sequence( true); + login_sequence(true); - $use_cats = mobile_get_pref( 'ENABLE_CATS'); - $offset = (int) db_escape_string( $_REQUEST["skip"]); + $use_cats = mobile_get_pref('ENABLE_CATS'); + $offset = (int) db_escape_string($_REQUEST["skip"]); if ($use_cats) { render_categories_list($link); } else { - render_flat_feed_list( $offset); + render_flat_feed_list($offset); } ?> diff --git a/plugins/mobile/index.php b/plugins/mobile/index.php index 8202f4043..7154ebdc2 100644 --- a/plugins/mobile/index.php +++ b/plugins/mobile/index.php @@ -20,7 +20,7 @@ init_plugins($link); - login_sequence( true); + login_sequence(true); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -76,13 +76,13 @@ </div> <?php - $use_cats = mobile_get_pref( 'ENABLE_CATS'); - $offset = (int) db_escape_string( $_REQUEST["skip"]); + $use_cats = mobile_get_pref('ENABLE_CATS'); + $offset = (int) db_escape_string($_REQUEST["skip"]); if ($use_cats) { render_categories_list($link); } else { - render_flat_feed_list( $offset); + render_flat_feed_list($offset); } ?> diff --git a/plugins/mobile/mobile-functions.php b/plugins/mobile/mobile-functions.php index 0395ee7a5..dd5914516 100644 --- a/plugins/mobile/mobile-functions.php +++ b/plugins/mobile/mobile-functions.php @@ -8,34 +8,34 @@ /* TODO replace with interface to db-prefs */ - function mobile_pref_toggled( $id) { - if (get_pref( "_MOBILE_$id")) + function mobile_pref_toggled($id) { + if (get_pref("_MOBILE_$id")) return "true"; else return ""; } - function mobile_get_pref( $id) { + function mobile_get_pref($id) { //return $_SESSION["mobile-prefs"][$id]; - return get_pref( "_MOBILE_$id"); + return get_pref("_MOBILE_$id"); } - function mobile_set_pref( $id, $value) { + function mobile_set_pref($id, $value) { //$_SESSION["mobile-prefs"][$id] = $value; - return set_pref( "_MOBILE_$id", $value); + return set_pref("_MOBILE_$id", $value); } function mobile_feed_has_icon($id) { return file_exists("../../".ICONS_DIR."/$id.ico"); } - function render_flat_feed_list( $offset) { + function render_flat_feed_list($offset) { $owner_uid = $_SESSION["uid"]; $limit = 0; if (!$offset) $offset = 0; - if (mobile_get_pref( "SORT_FEEDS_UNREAD")) { + if (mobile_get_pref("SORT_FEEDS_UNREAD")) { $order_by = "unread DESC, title"; } else { $order_by = "title"; @@ -47,7 +47,7 @@ $limit_qpart = ""; } - $result = db_query( "SELECT id, + $result = db_query("SELECT id, title, (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries WHERE feed_id = ttrss_feeds.id AND unread = true @@ -85,7 +85,7 @@ $icon_url = "../../images/blank_icon.gif"; } - if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) { + if ($unread > 0 || !mobile_get_pref("HIDE_READ")) { print "<li class='$class'><a href='feed.php?id=$id'>" . "<img class='tinyIcon' src='$icon_url'/>". $line["title"] . "</a></li>"; @@ -103,7 +103,7 @@ } - function render_category( $cat_id, $offset) { + function render_category($cat_id, $offset) { $owner_uid = $_SESSION["uid"]; if ($cat_id >= 0) { @@ -114,13 +114,13 @@ $cat_query = "cat_id IS NULL"; } - if (mobile_get_pref( "SORT_FEEDS_UNREAD")) { + if (mobile_get_pref("SORT_FEEDS_UNREAD")) { $order_by = "unread DESC, title"; } else { $order_by = "title"; } - $result = db_query( "SELECT id, + $result = db_query("SELECT id, title, (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries WHERE feed_id = ttrss_feeds.id AND unread = true @@ -132,7 +132,7 @@ $cat_query ORDER BY $order_by"); - $title = getCategoryTitle( $cat_id); + $title = getCategoryTitle($cat_id); print "<ul id='cat-$cat_id' title='$title' myBackLabel='".__("Home")."' myBackHref='home.php'>"; @@ -158,7 +158,7 @@ $icon_url = "../../images/blank_icon.gif"; } - if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) { + if ($unread > 0 || !mobile_get_pref("HIDE_READ")) { print "<li class='$class'><a href='feed.php?id=$id&cat=$cat_id'>" . "<img class='tinyIcon' src='$icon_url'/>". $line["title"] . "</a></li>"; @@ -174,8 +174,8 @@ myBackHref='home.php'>"; foreach (array(-4, -3, -1, -2, 0) as $id) { - $title = getFeedTitle( $id); - $unread = getFeedUnread( $id, false); + $title = getFeedTitle($id); + $unread = getFeedUnread($id, false); $icon = getFeedIcon($id); if ($unread > 0) { @@ -185,7 +185,7 @@ $class = 'oldItem'; } - if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) { + if ($unread > 0 || !mobile_get_pref("HIDE_READ")) { print "<li class='$class'> <a href='feed.php?id=$id&cat=-1'> <img class='tinyIcon' src='../$icon'/>$title</a></li>"; @@ -200,7 +200,7 @@ print "<ul id='cat--2' title='$title' myBackLabel='".__("Home")."' myBackHref='home.php'>"; - $result = db_query( "SELECT id, caption FROM ttrss_labels2 + $result = db_query("SELECT id, caption FROM ttrss_labels2 WHERE owner_uid = '$owner_uid'"); $label_data = array(); @@ -209,7 +209,7 @@ $id = label_to_feed_id($line["id"]); - $unread = getFeedUnread( $id); + $unread = getFeedUnread($id); $title = $line["caption"]; if ($unread > 0) { @@ -219,7 +219,7 @@ $class = 'oldItem'; } - if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) { + if ($unread > 0 || !mobile_get_pref("HIDE_READ")) { print "<li class='$class'> <a href='feed.php?id=$id&cat=-2'>$title</a></li>"; } @@ -231,7 +231,7 @@ function render_categories_list($link) { $owner_uid = $_SESSION["uid"]; - $cat_browse = mobile_get_pref( "BROWSE_CATS"); + $cat_browse = mobile_get_pref("BROWSE_CATS"); print '<ul id="home" title="'.__('Home').'" selected="true" myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">'; @@ -239,8 +239,8 @@ // print "<li><a href='#searchForm'>Search...</a></li>"; foreach (array(-1, -2) as $id) { - $title = getCategoryTitle( $id); - $unread = getFeedUnread( $id, true); + $title = getCategoryTitle($id); + $unread = getFeedUnread($id, true); if ($unread > 0) { $title = $title . " ($unread)"; $class = ''; @@ -254,7 +254,7 @@ print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>$title</a></li>"; } - $result = db_query( "SELECT + $result = db_query("SELECT ttrss_feed_categories.id, ttrss_feed_categories.title, COUNT(ttrss_feeds.id) AS num_feeds @@ -269,7 +269,7 @@ if ($line["num_feeds"] > 0) { - $unread = getFeedUnread( $line["id"], true); + $unread = getFeedUnread($line["id"], true); $id = $line["id"]; if ($unread > 0) { @@ -279,7 +279,7 @@ $class = 'oldItem'; } - if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) { + if ($unread > 0 || !mobile_get_pref("HIDE_READ")) { if ($cat_browse) print "<li class='$class'><a href='cat.php?id=$id'>" . @@ -292,13 +292,13 @@ } - $result = db_query( "SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE + $result = db_query("SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE cat_id IS NULL and owner_uid = '$owner_uid'"); $num_feeds = db_fetch_result($result, 0, "nf"); if ($num_feeds > 0) { - $unread = getFeedUnread( 0, true); + $unread = getFeedUnread(0, true); $title = "Uncategorized"; if ($unread > 0) { @@ -308,7 +308,7 @@ $class = 'oldItem'; } - if ($unread > 0 || !mobile_get_pref( "HIDE_READ")) { + if ($unread > 0 || !mobile_get_pref("HIDE_READ")) { if ($cat_browse) print "<li class='$class'><a href='cat.php?id=0'>$title</a></li>"; else @@ -320,14 +320,14 @@ print "</ul>"; } - function render_headlines_list( $feed_id, $cat_id, $offset, $search, + function render_headlines_list($feed_id, $cat_id, $offset, $search, $is_cat = false) { $feed_id = $feed_id; $limit = 15; $filter = ''; - if (!mobile_get_pref( "HIDE_READ")) + if (!mobile_get_pref("HIDE_READ")) $view_mode = "all_articles"; else $view_mode = 'adaptive'; @@ -338,9 +338,9 @@ $search_mode = ''; } - $qfh_ret = queryFeedHeadlines( $feed_id, $limit, + $qfh_ret = queryFeedHeadlines($feed_id, $limit, $view_mode, $is_cat, $search, $search_mode, - "score DESC, date_entered ".(mobile_get_pref( 'REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset); + "score DESC, date_entered ".(mobile_get_pref('REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset); $result = $qfh_ret[0]; $feed_title = $qfh_ret[1]; @@ -364,7 +364,7 @@ </form>"; if ($cat_id) { - $cat_title = getCategoryTitle( $cat_id); + $cat_title = getCategoryTitle($cat_id); print "<ul id=\"feed-$feed_id\" title=\"$feed_title\" selected=\"true\" myBackLabel='$cat_title' myBackHref='cat.php?id=$cat_id'>"; @@ -413,7 +413,7 @@ // print "<a target='_replace' href='feed.php?id=$feed_id&cat=$cat_id&skip=0'>Next $limit articles...</a>"; $next_offset = $offset + $num_headlines; - $num_unread = getFeedUnread( $feed_id, $is_cat); + $num_unread = getFeedUnread($feed_id, $is_cat); /* FIXME needs normal implementation */ @@ -435,7 +435,7 @@ } - function render_article( $id, $feed_id, $cat_id, $is_cat) { + function render_article($id, $feed_id, $cat_id, $is_cat) { $query = "SELECT title,link,content,feed_id,comments,int_id, marked,unread,published, @@ -445,33 +445,33 @@ WHERE id = '$id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"] ; - $result = db_query( $query); + $result = db_query($query); if (db_num_rows($result) != 0) { $line = db_fetch_assoc($result); - $tmp_result = db_query( "UPDATE ttrss_user_entries + $tmp_result = db_query("UPDATE ttrss_user_entries SET unread = false,last_read = NOW() WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); - $updated_fmt = make_local_datetime( $line['updated'], false); + $updated_fmt = make_local_datetime($line['updated'], false); $title = $line["title"]; $article_link = $line["link"]; if (!$is_cat) - $feed_title = getFeedTitle( $feed_id); + $feed_title = getFeedTitle($feed_id); else - $feed_title = getCategoryTitle( $feed_id); + $feed_title = getCategoryTitle($feed_id); print "<div class=\"panel\" id=\"article-$id\" title=\"$title\" selected=\"true\" myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id&is_cat=$is_cat'>"; if ($line['feed_id'] != $feed_id) { - $real_feed_title = getFeedTitle( $line['feed_id']); + $real_feed_title = getFeedTitle($line['feed_id']); $real_feed_id = $line['feed_id']; $feed_link = "(<a href=\"feed.php?id=$real_feed_id\">$real_feed_title</a>)"; } @@ -497,10 +497,10 @@ // print "</fieldset>"; - $content = sanitize( $line["content"]); + $content = sanitize($line["content"]); $content = preg_replace("/href=/i", "target=\"_blank\" href=", $content); - if (!mobile_get_pref( "SHOW_IMAGES")) { + if (!mobile_get_pref("SHOW_IMAGES")) { $content = preg_replace('/<img[^>]+>/is', '', $content); } diff --git a/plugins/mobile/prefs.php b/plugins/mobile/prefs.php index 78b6e8a7b..ac7762fe5 100644 --- a/plugins/mobile/prefs.php +++ b/plugins/mobile/prefs.php @@ -22,7 +22,7 @@ init_plugins($link); - login_sequence( true); + login_sequence(true); ?> <div class="panel" id="prefs" selected="yes" title="Preferences" @@ -32,33 +32,33 @@ <div class="row"> <label><?php echo __('Enable categories') ?></label> - <div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> + <div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("ENABLE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> </div> <div class="row"> <label><?php echo __('Browse categories like folders') ?></label> - <div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> + <div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> </div> <div class="row"> <label><?php echo __('Show images in posts') ?></label> - <div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> + <div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> </div> <div class="row"> <label><?php echo __('Hide read articles and feeds') ?></label> - <div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> + <div class="toggle" id="HIDE_READ" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("HIDE_READ") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> </div> <div class="row"> <label><?php echo __('Sort feeds by unread count') ?></label> - <div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> + <div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> </div> <div class="row"> <label><?php echo __('Reverse headline order (oldest first)') ?></label> - <div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled( "REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> + <div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled("REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div> </div> </fieldset> |