misc code cleanup

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index e4f6b60d6cde214cf01ce5ee5d3f403380841b9d..44a345e288f3c8bddff3512cbeedfef2319cf402 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -61,11 +61,6 @@
 
                        print "<p>".__("Showing top 25 registered feeds, sorted by popularity:")."</p>";
 
-#                      $result = db_query($link, "SELECT feed_url,count(id) AS subscribers 
-#                              FROM ttrss_feeds 
-#                              WHERE auth_login = '' AND auth_pass = '' AND private = false
-#                              GROUP BY feed_url ORDER BY subscribers DESC LIMIT 25");
-
                        $owner_uid = $_SESSION["uid"];
 
                        $result = db_query($link, "SELECT feed_url,COUNT(id) AS subscribers
@@ -859,14 +854,6 @@
                                onclick=\"javascript:updateFeedList()\" value=\"".__('Search')."\">
                        </div>";
                
-/*             print "<input id=\"fadd_link\" 
-                               onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
-                               onchange=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
-                               size=\"40\">
-                       <input type=\"submit\" class=\"button\"
-                               disabled=\"true\" id=\"fadd_submit_btn\"
-                               onclick=\"addFeed()\" value=\"".__('Subscribe')."\">"; */
-
                print "<input onclick=\"javascript:displayDlg('quickAddFeed')\"
                        type=\"submit\" id=\"subscribe_to_feed_btn\" 
                        class=\"button\" value=\"".__('Subscribe to feed')."\">"; 
@@ -1128,26 +1115,6 @@
                                }
 
                        print "</select>";
-
-                       /* print "<input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:editSelectedFeed()\" value=\"".__('Edit')."\">
-                       <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:removeSelectedFeeds()\" 
-                               value=\"".__('Unsubscribe')."\">"; */
-
-//                     if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
-/*                             print " <input type=\"submit\" class=\"button\"
-                                       onclick=\"javascript:editFeedCats()\" value=\"".
-                                       __("Edit categories")."\">"; */
-
-#                              print "&nbsp;|&nbsp;";                          
-
-//                             }
-               } else {
-
-//                     print "<p>No feeds defined.</p>";
-
                }
 
                print "<h3>".__('OPML')."</h3>

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 4fb59d4ae4652d72e0d6f51a3ce3c2bc40010c43..b7f29705ecd5bd09075f424f16a3cd2a9eccfa31 100644 (file)
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -27,8 +27,6 @@
                        print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
                        print "<input type=\"hidden\" name=\"id\" value=\"$filter_id\">";
                        print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">"; 
-
-//                     print "<div class=\"notice\"><b>Note:</b> filter will only apply to new articles.</div>";
                        
                        $result = db_query($link, "SELECT id,description 
                                FROM ttrss_filter_types ORDER BY description");
@@ -374,7 +372,6 @@
                                $onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'";
 
                                print "<td $onclick>" . $line["reg_exp"] . "</td>";             
-       
                                print "<td $onclick>" . $line["feed_title"] . "</td>";                  
 
                                $inverse_label = "";
@@ -383,11 +380,7 @@
                                        $inverse_label = " <span class='insensitive'>".__('(Inverse)')."</span>";
                                }
        
-                               print "<td $onclick>" . $line["filter_type_descr"] . "$inverse_label</td>";             
-               
-/*                             print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
-                                       $line["action_description"]."</td>"; */
-
+                               print "<td $onclick>" . $line["filter_type_descr"] . "$inverse_label</td>";
                                print "<td $onclick>" . $line["action_param"] . "</td>";
 
                                print "</tr>";