Changeset 1775

Timestamp:

12/27/07 01:28:47 (11 months ago)

Author:

cfriesen

Message:

Option on search form to show only read, unread, or both (default to both)

Location:

trunk/gregarius

Files:

• cls/search.php (modified) (2 diffs)
• cls/wrappers/searchform.php (modified) (1 diff)
• themes/default/web/searchform.php (modified) (1 diff)

trunk/gregarius/cls/search.php

@@ -44 +44 @@
 define ('QUERY_MATCH_EXACT','exact');
 define ('QUERY_MATCH_WITHIN', 'within');
+
+define ('QUERY_MATCH_STATE', 'state');
+define ('QUERY_MATCH_UNREAD', 'unread');
+define ('QUERY_MATCH_READ', 'read');
+define ('QUERY_MATCH_BOTH', 'both');
 
 // This is needed for some constants
@@ -213 +218 @@
             $qWhere .= " and not(i.unread & ".RSS_MODE_PRIVATE_STATE.") ";
         }
+
         $qWhere .= " and not(i.unread & ".RSS_MODE_DELETED_STATE.") ";
+        
+        if(array_key_exists(QUERY_MATCH_STATE, $_REQUEST) && QUERY_MATCH_READ == $_REQUEST[QUERY_MATCH_STATE]) {
+                // Show only read items.
+                $qWhere .= " and not (i.unread & " . RSS_MODE_UNREAD_STATE . ") ";
+                }
+                else if(array_key_exists(QUERY_MATCH_STATE, $_REQUEST) && QUERY_MATCH_UNREAD == $_REQUEST[QUERY_MATCH_STATE]) {
+                        // Show only unread items.
+                        $qWhere .= " and (i.unread & " . RSS_MODE_UNREAD_STATE . ") ";
+                }
 
         if ($this->orderBy == QUERY_ORDER_BY_DATE) {

trunk/gregarius/cls/wrappers/searchform.php

@@ -69 +69 @@
     return ((array_key_exists(QUERY_MATCH_TYPE, $_REQUEST) &&
         $_REQUEST[QUERY_MATCH_TYPE] == QUERY_MATCH_WITHIN)?" checked=\"checked\"":"");  
+}
+
+function rss_search_state_read_checked() {
+    return ((array_key_exists(QUERY_MATCH_STATE, $_REQUEST) &&
+        $_REQUEST[QUERY_MATCH_STATE] == QUERY_MATCH_READ) ?" checked=\"checked\"":"");  
+}
+
+function rss_search_state_unread_checked() {
+    return ((array_key_exists(QUERY_MATCH_STATE, $_REQUEST) &&
+        $_REQUEST[QUERY_MATCH_STATE] == QUERY_MATCH_UNREAD) ?" checked=\"checked\"":"");    
+}
+
+function rss_search_state_both_checked() {
+    return ((array_key_exists(QUERY_MATCH_STATE, $_REQUEST) &&
+        $_REQUEST[QUERY_MATCH_STATE] == QUERY_MATCH_BOTH) ||
+        !array_key_exists(QUERY_MATCH_STATE, $_REQUEST) ?" checked=\"checked\"":"");    
 }
 

trunk/gregarius/themes/default/web/searchform.php

@@ -21 +21 @@
         <label for="qry_match_within"><?php echo __('Search within words') ?></label>
         <input type="checkbox" id="qry_match_within" name="<?php echo QUERY_MATCH_TYPE ?>" value="<?php echo QUERY_MATCH_WITHIN ?>" <?php echo rss_search_within() ?> />
+    </p>
+    
+    <p>
+        <label for="qry_match_unread"><?php echo __('Unread Only') ?></label>
+        <input type="radio" id="qry_match_unread" name="<?php echo QUERY_MATCH_STATE ?>" value="<?php echo QUERY_MATCH_UNREAD ?>" <?php echo rss_search_state_unread_checked() ?> />
+        
+        <label for="qry_match_read"><?php echo __('Read Only') ?></label>
+        <input type="radio" id="qry_match_read" name="<?php echo QUERY_MATCH_STATE ?>" value="<?php echo QUERY_MATCH_READ ?>" <?php echo rss_search_state_read_checked() ?> />
+
+        <label for="qry_match_both"><?php echo __('Unread & Read') ?></label>
+        <input type="radio" id="qry_match_both" name="<?php echo QUERY_MATCH_STATE ?>" value="<?php echo QUERY_MATCH_BOTH ?>" <?php echo rss_search_state_both_checked() ?> />      
     </p>