[Customisation Database Commits] r173 - in /branches/highwayoflife/titania/includes: authors/authors_main.php class_pagination.php

[David Lewis]

Author: HighwayofLife
Date: Thu Nov 13 07:33:01 2008
New Revision: 173

Log:
- Finished the pagination class, it now works with the PHP5 member overloading.
- Fixed authors_main list method to work with the updated pagination and sort settings

Modified:
    branches/highwayoflife/titania/includes/authors/authors_main.php
    branches/highwayoflife/titania/includes/class_pagination.php

Modified: branches/highwayoflife/titania/includes/authors/authors_main.php
==============================================================================
*** branches/highwayoflife/titania/includes/authors/authors_main.php (original)
--- branches/highwayoflife/titania/includes/authors/authors_main.php Thu Nov 13 07:33:01 2008
***************
*** 105,111 ****
  		$sort->sort_request(false);
  
  		$pagination = new pagination();
! 		$pagination->set_result_lang('AUTHOR');
  		$start = $pagination->set_start();
  		$limit = $pagination->set_limit();
  
--- 105,111 ----
  		$sort->sort_request(false);
  
  		$pagination = new pagination();
! 		$pagination->result_lang = 'AUTHOR';
  		$start = $pagination->set_start();
  		$limit = $pagination->set_limit();
  
***************
*** 177,187 ****
  		$pagination->sql_total_count($sql_ary, 'a.author_id');
  
  		$pagination->set_params(array(
! 			'sk'	=> $sort->get_sort_key(),
! 			'sd'	=> $sort->get_sort_dir(),
  		));
  
! 		$pagination->build_pagination($this->page);
  
  		$template->assign_vars(array(
  			'S_MODE_SELECT'		=> $sort->get_sort_key_list(),
--- 177,187 ----
  		$pagination->sql_total_count($sql_ary, 'a.author_id');
  
  		$pagination->set_params(array(
! 			'sk'	=> $sort->get_sort_key(false),
! 			'sd'	=> $sort->get_sort_dir(false),
  		));
  
! 		$pagination->build_pagination($this->u_action);
  
  		$template->assign_vars(array(
  			'S_MODE_SELECT'		=> $sort->get_sort_key_list(),

Modified: branches/highwayoflife/titania/includes/class_pagination.php
==============================================================================
*** branches/highwayoflife/titania/includes/class_pagination.php (original)
--- branches/highwayoflife/titania/includes/class_pagination.php Thu Nov 13 07:33:01 2008
***************
*** 24,29 ****
--- 24,36 ----
  class pagination extends titania_object
  {
  	/**
+ 	 * URL Params
+ 	 *
+ 	 * @var array
+ 	 */
+ 	private $params = array();
+ 
+ 	/**
  	 * Set some default variables, set template_vars default values
  	 */
  	public function __construct()
***************
*** 46,52 ****
  					'S_MODE_ACTION'	=> 'S_MODE_ACTION',
  				),
  			),
- 			'params'		=> array('default' => array()),
  		));
  	}
  
--- 53,58 ----
***************
*** 56,62 ****
  	 * @param string $start_name _REQUEST name used for start
  	 * @return int	start
  	 */
! 	public function start($start_name = 'start', $default = 0)
  	{
  		$this->start = request_var($start_name, (int) $default);
  
--- 62,68 ----
  	 * @param string $start_name _REQUEST name used for start
  	 * @return int	start
  	 */
! 	public function set_start($start_name = 'start', $default = 0)
  	{
  		$this->start = request_var($start_name, (int) $default);
  
***************
*** 89,133 ****
  		{
  			if ($value)
  			{
! 				$this->params[$key] = $key . '=' . $value;
  			}
  		}
  	}
  
  	/**
! 	 * Set total_results, generally from config or SQL COUNT() Query
! 	 *
! 	 * @param int $total_results
! 	 */
! 	public function set_total_results($total_results)
! 	{
! 		$this->total_results = $total_results;
! 
! 		return true;
! 	}
! 
! 	/**
! 	 * Set the results, usually from a manual count of while loop
! 	 *
! 	 * @param int $results
! 	 */
! 	public function set_results($results)
! 	{
! 		$this->results = $results;
! 
! 		return true;
! 	}
! 
! 	/**
! 	 * set result language var, e.g.: TOTAL_ROW, plural language var appended automatically
  	 *
! 	 * @param string $lang_var
  	 */
! 	public function set_result_lang($lang_var)
  	{
! 		$this->result_lang = $lang_var;
! 
! 		return true;
  	}
  
  	/**
--- 95,116 ----
  		{
  			if ($value)
  			{
! 				$key = (string) $key;
! 				$this->params[$key] = $key . '=' . (string) $value;
  			}
  		}
  	}
  
  	/**
! 	 * Set single URL parameter
  	 *
! 	 * @param string $key
! 	 * @param string $value
  	 */
! 	public function set_param($key, $value)
  	{
! 		$key = (string) $key;
! 		$this->params[$key] = $key . '=' . (string) $value;
  	}
  
  	/**
***************
*** 149,156 ****
  		{
  			$this->template_vars[$key] = $lang;
  		}
  
! 		return true;
  	}
  
  	/**
--- 132,148 ----
  		{
  			$this->template_vars[$key] = $lang;
  		}
+ 	}
  
! 	/**
! 	 * Set single template variable
! 	 *
! 	 * @param string $key
! 	 * @param string $value
! 	 */
! 	public function set_template_var($key, $value)
! 	{
! 		$this->template_vars[$key] = $value;
  	}
  
  	/**