Changeset 443

Timestamp:

08/29/2007 12:02:58 PM (14 months ago)

Author:

Geert

Message:

• More bug fixes
  
• I added a temporary pagination example to the welcome controller. Go check it out!
  

Location:

trunk

Files:

• application/controllers/welcome.php (modified) (1 diff)
• system/libraries/Pagination.php (modified) (5 diffs)

trunk/application/controllers/welcome.php

@@ -8 +8 @@
                 print_r ($db);
         }
+        
+        function pagination_example()
+        {
+                // You HAVE TO use $this->pagination when initializing the Pagination library.
+                // This is because the pagination views call $this->pagination->url().
+                // Problem: what in case your page has multiple pagination areas? Hmm...
+                $this->pagination = new Pagination(array(
+                        'base_url'       => 'welcome/pagination_example/page/', // page segment doesn't need to be the last one
+                        'uri_segment'    => 4, // 'uri_label' => 'page' would have the same result
+                        'total_items'    => 254, // use db count query here of course
+                        'items_per_page' => 10, // it may be handy to set defaults for stuff like this in config/pagination.php
+                        'style'          => 'classic' // pick one from: classic (default), digg, extended, punbb, or add your own!
+                ));
+                
+                // Just echoing it is enough to display the links (__toString() rocks!)
+                echo 'Classic style: '.$this->pagination;
+                
+                // You can also use the create_links() method and pick a style on the fly if you want
+                echo '<hr />Digg style:     '.$this->pagination->create_links('digg');
+                echo '<hr />Extended style: '.$this->pagination->create_links('extended');
+                echo '<hr />PunBB style:    '.$this->pagination->create_links('punbb');
+        }
 
 }

trunk/system/libraries/Pagination.php

@@ -3 +3 @@
 class Pagination_Core {
         
-        public $base_url;
+        public $base_url           = '';
         public $style              = 'classic';
         public $uri_segment        = 3;
@@ -40 +40 @@
                 }
                 
+                // Explode the base_url into segments
+                $this->base_url = explode('/', trim($this->base_url, '/'));
+
                 // If a uri_label is given, look for the corresponding uri_segment
                 if (isset($this->uri_label))
                 {
-                        $uri_label_segment = array_search($this->uri_label, Kohana::instance()->uri->segment_array());
+                        $uri_label_segment = array_search($this->uri_label, $this->base_url);
                         
                         if ($uri_label_segment !== FALSE)
                         {
-                                $this->uri_segment = $uri_label_segment + 1;
+                                $this->uri_segment = $uri_label_segment + 2;
                         }
                 }
                 
                 // Create a generic base_url with {page} placeholder
-                $this->base_url = (isset($this->base_url)) ? $this->base_url : Kohana::instance()->uri->string();
-                $this->base_url = explode('/', $this->base_url);
                 $this->base_url[$this->uri_segment - 1] = '{page}';
                 $this->base_url = implode('/', $this->base_url);
@@ -89 +90 @@
                 $style = (isset($style)) ? $style : $this->style;
                 
-                return (string) new View('views/pagination/'.$style, get_object_vars($this));
+                return (string) new View('pagination/'.$style, get_object_vars($this));
         }
         
@@ -98 +99 @@
 
         /**
-         * Returns a URL with the specified page number
+         * Returns the base_url with the specified page number
          *
          * @access  public
@@ -106 +107 @@
         public function url($page = NULL)
         {
-                $page = (int) (isset($page)) ? $this->current_page : $page;
+                $page = (int) (isset($page)) ? $page : $this->current_page;
                 
                 return str_replace('{page}', $page, $this->base_url);