Changeset 1606 for branches/multiuser/admin

Timestamp:

10/16/06 08:11:03 (2 years ago)

Author:

mdodoo

Message:

This was really annoying, and took more time than the previous commit. For some reason, "svn diff" does not work correctly on my machine.

Location:

branches/multiuser/admin

Files:

• channels.php (modified) (2 diffs)
• index.php (modified) (1 diff)
• items.php (modified) (2 diffs)

branches/multiuser/admin/channels.php

@@ -61 +61 @@
 
     echo "<p style=\"font-size:small\">" . __('Subscription bookmarklet [<a href="http://www.squarefree.com/bookmarklets/">?</a>]:') . " <a class=\"bookmarklet\" href=\"$bookmarklet\">".__('Subscribe in Gregarius!')."</a></p>\n";
+    // feed handler - similar to bookmarklet, but with %s
+    $feedhandler_url = "javascript:navigator.registerContentHandler(\'application/vnd.mozilla.maybe.feed\',\'$b_url%s\',\'Gregarius\');";
+    echo "<script type=\"text/javascript\">\n"
+    ."//<!--\n"
+    ."if (navigator && typeof(navigator.registerContentHandler) == 'function'){\n"
+    ."\tdocument.write('<p style=\"font-size:small\">" 
+    . __('Register as Feed Handler [<a href="http://www.bengoodger.com/software/mb/feeds/feed-handling.html">?</a>]:') 
+    . " <a class=\"bookmarklet\" href=\"$feedhandler_url\">"
+    .__('Register Gregarius!')."</a></p>');\n"
+    ."}\n"
+    ."// -->\n"
+    ."</script>\n";
 
     // feeds
@@ -162 +174 @@
         .((getConfig('rss.output.showfavicons') && $icon != "")?
           "<img src=\"$icon\" class=\"favicon\" alt=\"\" width=\"16\" height=\"16\" />":"")
-        ."<label for=\"scb_$id\">".($dead ? "<strike>" : "").$title.($dead ? "</strike>" : "")."</label>"
+        ."<label for=\"scb_$id\"".($dead ? ' style="text-decoration:line-through">' : ">").$title."</label>"
         ."</td>\n"
         ."\t<td class=\"cntr\">".preg_replace('/ /','&nbsp;',$parentLabel)."</td>\n"

branches/multiuser/admin/index.php

@@ -270 +270 @@
     );
     while (false !== ($entry = $d->read())) {
-        if (preg_match('#^[a-z]{2}_[A-Z]{2}$#',$entry)) {
+        if (preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$entry)) {
             $ret[$entry]=getLanguageInfo($entry);
         } 

branches/multiuser/admin/items.php

@@ -52 +52 @@
     . "<p><label for=\"prune_include_sticky\">".__('Delete Sticky items too: ')."</label>\n"
     . "<input type=\"checkbox\" id=\"prune_include_sticky\" name=\"prune_include_sticky\" value=\"1\"/></p>\n"
+    . "<p><label for=\"prune_include_unread\">".__('Delete Unread items too: ')."</label>\n"
+    . "<input type=\"checkbox\" id=\"prune_include_unread\" name=\"prune_include_unread\" value=\"1\"/></p>\n"
     . "<p><label for=\"prune_exclude_tags\">".__('Do not delete items tagged... ')."</label>\n"
     . "<input type=\"text\" id=\"prune_exclude_tags\" name=\"prune_exclude_tags\" value=\"\"/></p>\n"
@@ -112 +114 @@
             if (!array_key_exists('prune_include_sticky', $_REQUEST)
                     || $_REQUEST['prune_include_sticky'] != '1') {
-
                 $sql .= " and not(unread & " .RSS_MODE_STICKY_STATE .") ";
             }
 
-            if (array_key_exists('prune_exclude_tags', $_REQUEST)
-                    && trim($_REQUEST['prune_exclude_tags'])) {
+
+            if (!array_key_exists('prune_include_unread', $_REQUEST) 
+                    || $_REQUEST['prune_include_unread'] != '1') {
+                $sql .= " and not(unread & " .RSS_MODE_UNREAD_STATE .") "; 
+            }
+            
+             if (array_key_exists('prune_exclude_tags', $_REQUEST) && trim($_REQUEST['prune_exclude_tags'])) {
 
                 if ( trim($_REQUEST['prune_exclude_tags']) == '*') {