Changeset 1435

Timestamp:

04/13/06 11:20:37 (3 years ago)

Author:

mbonetti

Message:

EXPERIMENTAL: page navigation (only used in /state/*, for testing purpose)

Location:

trunk/rss

Files:

• cls/items.php (modified) (6 diffs)
• cls/wrappers/itemlist.php (modified) (1 diff)
• state.php (modified) (1 diff)
• themes/default/web/css/look.css (modified) (1 diff)
• themes/default/web/itemlist.php (modified) (1 diff)
• themes/default/web/pagination.php (added)

trunk/rss/cls/items.php

@@ -244 +244 @@
     var $unreadIids = array();
     var $rss;
-    
-
+    var $_template;
+    
+    var $_sqlActualWhat = "";
+    var $_sqlActualFrom = "";
+    var $_sqlActualWhere= "";
+    var $_sqlActualOrder= "";
+    var $_sqlActualLimit= "";
     
     function ItemList() {
-    
+        $this -> _template = 'itemlist.php';
         $this -> rss = &$GLOBALS['rss'];
         
@@ -277 +282 @@
     function populate($sqlWhere, $sqlOrder="", $startItem = 0, $itemCount = -1, $hint = ITEM_SORT_HINT_MIXED, $includeDeprecated = false) {
 
-        _pf('ItemList::populate()');
-        $sql = "select i.title,  c.title, c.id, i.unread, "
+      _pf('ItemList::populate()');
+        $this -> _sqlActualWhat = " i.title,  c.title, c.id, i.unread, "
             ."i.url, i.enclosure, i.author, i.description, c.icon, "
             ." unix_timestamp(ifnull(i.pubdate,i.added)) as ts, "
-            ." i.pubdate is not null as ispubdate, i.id, r.rating  "
-            ." from ".getTable("item") ." i "
+            ." i.pubdate is not null as ispubdate, i.id, r.rating  ";
+        $this -> _sqlActualFrom =   getTable("item") ." i "
             ." left join "
             . getTable("rating") ." r on (i.id = r.iid), "
             .getTable("channels")." c, "
-            .getTable("folders") ." f "
-
-            ." where "
-            ." i.cid = c.id and "
+            .getTable("folders") ." f ";
+
+        $this -> _sqlActualWhere = " i.cid = c.id and "
             ." f.id=c.parent and ". (false == $includeDeprecated ? " not(c.mode & ".RSS_MODE_DELETED_STATE.") and " : "")
             ." not(i.unread & ".RSS_MODE_DELETED_STATE.") and ";
@@ -296 +300 @@
 
         if (hidePrivate()) {
-            $sql .= " not(i.unread & ".RSS_MODE_PRIVATE_STATE.") and ";
-        }
-
-        if ($sqlWhere) {
-            $sql .= $sqlWhere ." and ";
-        }
-        $sql .= " 1=1 ";
+            $this -> _sqlActualWhere .= " not(i.unread & ".RSS_MODE_PRIVATE_STATE.") and ";
+        }
+
+        if ($this -> _sqlActualWhere) {
+            $this -> _sqlActualWhere .= $sqlWhere ." and ";
+        }
+        $this -> _sqlActualWhere .= " 1=1 ";
         
         /// Order by
@@ -318 +322 @@
                     break;
             }
-            $sql .= " order by  ";
+
             if (!getConfig('rss.config.feedgrouping')) {
                 if(getConfig("rss.config.datedesc.$skey")){
-                    $sql .= " ts desc, f.position asc, c.position asc ";
+                    $this -> _sqlActualOrder = " ts desc, f.position asc, c.position asc ";
                 }else{
-                    $sql .= " ts asc, f.position asc, c.position asc ";
+                    $this -> _sqlActualOrder = " ts asc, f.position asc, c.position asc ";
                 }
             } elseif (getConfig('rss.config.absoluteordering')) {
-                $sql .= " f.position asc, c.position asc";
+                $this -> _sqlActualOrder = " f.position asc, c.position asc";
             } else {
-                $sql .= " f.name asc, c.title asc";
+                $this -> _sqlActualOrder = " f.name asc, c.title asc";
             }
             if(getConfig("rss.config.datedesc.$skey")){
-                $sql .= ", ts desc, i.id asc";
+                $this -> _sqlActualOrder  .= ", ts desc, i.id asc";
             }else{
-                $sql .= ", ts asc, i.id asc";
+                $this -> _sqlActualOrder  .= ", ts asc, i.id asc";
             }
         } else {
-            $sql .= " $sqlOrder ";  
+            $this -> _sqlActualOrder = " $sqlOrder ";   
         }
         if (($itemCount < 0) || ($itemCount > RSS_DB_MAX_QUERY_RESULTS)) {
             $itemCount = RSS_DB_MAX_QUERY_RESULTS;
         }
-        $sql .= " limit $startItem, $itemCount";
-
+        $this -> _sqlActualLimit = " $startItem, $itemCount";
+
+        $sql = "select "
+            .$this -> _sqlActualWhat
+            . " from "
+            .$this -> _sqlActualFrom
+            . " where "
+            . $this -> _sqlActualWhere
+            . " order by "
+            . $this -> _sqlActualOrder
+            . " limit "
+            . $this -> _sqlActualLimit;
+            
         //echo $sql;        
         $this -> iids = array();
@@ -461 +476 @@
         rss_plugin_hook('rss.plugins.items.beforeitems', null);
 
-        eval($this-> rss ->getCachedTemplateFile("itemlist.php"));
+        eval($this-> rss ->getCachedTemplateFile($this -> _template));
         
         _pf("done: ItemList -> render()");
@@ -470 +485 @@
 }
 
-
+class ItemListNavigation {
+    var $_parent;
+    var $pages;
+    function ItemListNavigation($il) {
+        $this -> _parent = $il;
+        $this -> pages = array();
+        $base = $_SERVER["REQUEST_URI"];
+        if (!preg_match('#page=[0-9]+$#',$base)) {
+            $base .= "?page=0";
+        }
+        $last = ceil( $this -> _parent -> numItems / $this -> _parent -> itemsPerPage);
+        $lastin = 0;
+        for ($i = 0; $i < $last; $i++) {
+            if ($i == 0 || $i == $last-1 || abs($i - $this -> _parent -> page) < 3) {
+                $url = preg_replace('#^(.+)page=[0-9]+$#','${1}page='.$i, $base);
+                $this -> pages[$i] = array($url, $i == $this -> _parent -> page, false);
+                $lastin = $i;
+            } elseif ($i - 1 == $lastin) {
+                $this -> pages[$i] = array(null,false,true);
+            }
+        }
+    }
+    function render() {
+        eval($this-> _parent -> rss ->getCachedTemplateFile('pagination.php'));
+    }
+}
+
+class PaginatedItemList extends ItemList {
+    var $page;
+    var $navigation;
+    var $itemsPerPage = 0;
+    var $numItems = 0;
+    function PaginatedItemList() { 
+        parent::ItemList(); 
+        if (isset($_REQUEST['page'])) {
+            $this -> page = sanitize($_REQUEST['page'], RSS_SANITIZER_NUMERIC);
+        } else {
+            $this -> page = 0;
+        }
+        
+        $this ->  itemsPerPage = getConfig('rss.output.frontpage.numitems');
+    }
+    function populate($sqlWhere, $sqlOrder="", $startItem = 0, $itemCount = -1, $hint = ITEM_SORT_HINT_MIXED, $includeDeprecated = false) {
+
+        $si = $this -> page * $this ->  itemsPerPage;
+        parent::populate($sqlWhere, $sqlOrder, $si, $this ->  itemsPerPage, $hint, $includeDeprecated);
+        
+        $sql = "select count(*) as cnt "
+            . " from "
+            . $this -> _sqlActualFrom
+            . " where "
+            . $this -> _sqlActualWhere;
+        list($this -> numItems) = rss_fetch_row(rss_query($sql));
+        $this -> navigation = new ItemListNavigation(& $this);
+    }
+}
 ?>

trunk/rss/cls/wrappers/itemlist.php

@@ -91 +91 @@
 }
 
+function rss_itemlist_navigation() {
+    if (isset($GLOBALS['rss'] -> currentItemList -> navigation)) {
+        $GLOBALS['rss'] -> currentItemList -> navigation -> render();
+    }
+}
+
+function rss_itemlist_navigation_pages() {
+    if (isset($GLOBALS['rss'] -> currentItemList -> navigation)) {
+        return $GLOBALS['rss'] -> currentItemList -> navigation -> pages;
+    }
+}
 ?>

trunk/rss/state.php

@@ -29 +29 @@
 require_once('init.php');
 
-$items = new ItemList();
+$items = new PaginatedItemList();
 $items -> setRenderOptions(IL_NO_COLLAPSE);
 

trunk/rss/themes/default/web/css/look.css

@@ -444 +444 @@
     width: 100%;
 }
+

trunk/rss/themes/default/web/itemlist.php

@@ -15 +15 @@
 <?php } ?>
 <?php echo rss_itemlist_before_list(); ?>
+<?php rss_itemlist_navigation(); ?>
 <?php rss_itemlist_feeds(); ?>
+<?php rss_itemlist_navigation(); ?>
 <?php echo rss_itemlist_after_list(); ?>