Changeset 847

Timestamp:

10/18/2007 03:46:48 PM (14 months ago)

Author:

Geert

Message:

• Implementing similar uri_segment 'label' functionality to Pagination library.
  
• $uri_label is gone.
  

Location:

trunk

Files:

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

trunk/application/controllers/welcome.php

@@ -169 +169 @@
                 // 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
+                        // 'base_url'    => 'welcome/pagination_example/page/', // base_url will default to current uri
+                        'uri_segment'    => 'page', // pass a string as uri_segment to trigger former 'label' functionality
                         '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

trunk/system/libraries/Pagination.php

@@ -25 +25 @@
         public $style              = 'classic';
         public $uri_segment        = 3;
-        public $uri_label;
         public $items_per_page     = 10;
         
@@ -46 +45 @@
          * @return  void
          */
-        public function __construct($setup = array())
+        public function __construct($config = array())
         {
-                // Load pagination setup values
-                $setup = array_merge(Config::load('pagination', FALSE), $setup);
+                // Merge all pagination config values
+                $config = array_merge(Config::load('pagination', FALSE), (array) $config);
                 
-                foreach ($setup as $key => $value)
+                // Assign config values to the object
+                foreach ($config as $key => $value)
                 {
                         if (property_exists($this, $key))
@@ -59 +59 @@
                 }
                 
-                // Explode the base_url into segments
+                // Set a default base_url if none given via config
+                if ($this->base_url == '')
+                {
+                        $this->base_url = (string) Kohana::instance()->uri;
+                }
+                
+                // Explode 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))
+                // Convert uri 'label' to corresponding integer if needed
+                if (is_string($this->uri_segment))
                 {
-                        $uri_label_segment = array_search($this->uri_label, $this->base_url);
-                        
-                        if ($uri_label_segment !== FALSE)
+                        if (($key = array_search($this->uri_segment, $this->base_url)) === FALSE)
                         {
-                                $this->uri_segment = $uri_label_segment + 2;
+                                // If uri 'label' is not found, auto add it to base_url
+                                $this->base_url[] = $this->uri_segment;
+                                $this->uri_segment = count($this->base_url) + 1;
+                        }
+                        else
+                        {
+                                $this->uri_segment = $key + 2;
                         }
                 }
-                
+
                 // Create a generic base_url with {page} placeholder
                 $this->base_url[$this->uri_segment - 1] = '{page}';
-                $this->base_url = implode('/', $this->base_url);
-                $this->base_url = url::site($this->base_url);
+                $this->base_url = url::site(implode('/', $this->base_url));
                 
                 // Core pagination values