digest: cleanup the code a bit

diff --git a/digest.php b/digest.php
index ee26b2124b11e414348d25ac12da389842294c09..e16421fe37e633c5ca54f59d64abab8ba9f176d1 100644 (file)
--- a/digest.php
+++ b/digest.php
@@ -72,10 +72,10 @@
 
        <div class="links">
 
-       <?php if (!SINGLE_USER_MODE) { ?>
+       <?php if (!$_SESSION["hide_hello"]) { ?>
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
        <?php } ?>
-       <?php if (!SINGLE_USER_MODE) { ?>
+       <?php if (!$_SESSION["hide_logout"]) { ?>
                        <a href="backend.php?op=logout"><?php echo __('Logout') ?></a> |
        <?php } ?>
                        <a href='<?php echo get_self_url_prefix() ?>/index.php?mobile=false'>

diff --git a/js/digest.js b/js/digest.js
index 81dee4bd037704b1c62198614eb646f56f117469..241328ab2c2c1484de9eda99f0c56ac83c593c4e 100644 (file)
--- a/js/digest.js
+++ b/js/digest.js
@@ -452,8 +452,6 @@ function add_headline_entry(article, feed, no_effects) {
                if (d.getTime() / 1000 - article.updated < fresh_max)
                        li_class = "fresh";
 
-               //"<img title='" + __("Share on Twitter") + "' onclick=\"tweet_article("+article.id+", true)\" src='images/art-tweet.png'>" +
-
                //"<img title='" + __("Mark as read") + "' onclick=\"view("+article.id+", true)\" src='images/digest_checkbox.png'>" +
 
                var checkbox_part = "<input type=\"checkbox\" class=\"cb\" onclick=\"toggle_select_article(this)\"/>";
@@ -798,37 +796,6 @@ function update_title(unread) {
        }
 }
 
-function tweet_article(id) {
-       try {
-
-               var query = "?op=rpc&method=getTweetInfo&id=" + param_escape(id);
-
-               console.log(query);
-
-               var d = new Date();
-      var ts = d.getTime();
-
-               var w = window.open('backend.php?op=backend&method=loading', 'ttrss_tweet',
-                       "status=0,toolbar=0,location=0,width=500,height=400,scrollbars=1,menubar=0");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               var ti = JSON.parse(transport.responseText);
-
-                               var share_url = "http://twitter.com/share?_=" + ts +
-                                       "&text=" + param_escape(ti.title) +
-                                       "&url=" + param_escape(ti.link);
-
-                               w.location.href = share_url;
-
-                       } });
-
-       } catch (e) {
-               exception_error("tweet_article", e);
-       }
-}
-
 function toggle_select_article(elem) {
        try {
                var article = elem.parentNode;