sux0r

Update of /cvsroot/sux0r/sux0r2/modules/admin
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16033/modules/admin

Modified Files:
	admin.php 
Log Message:
Changed sorting methodology

Index: admin.php
===================================================================
RCS file: /cvsroot/sux0r/sux0r2/modules/admin/admin.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin.php	25 Jan 2009 03:17:07 -0000	1.8
--- admin.php	25 Jan 2009 20:53:41 -0000	1.9
***************
*** 67,99 ****
      function userlist() {
  
          // Sort / Order
          $sort = null;
          if (isset($_GET['sort'])) $sort = $_GET['sort'];
-         $order = null;
-         if (isset($_GET['order'])) $order = $_GET['order'];
  
!         // Extra params for pager
!         $params = array();
!         if ($sort) $params = array('sort' => $sort, 'order' => $order);
  
          // Pager
          $this->pager->limit = $this->per_page;
          $this->pager->setStart();
- 
          $this->pager->setPages($this->user->countUsers());
          $this->r->text['pager'] = $this->pager->pageList(suxFunct::makeUrl('/admin', $params));
-         $this->r->arr['ulist'] = $this->user->getUsers($this->pager->limit, $this->pager->start, $sort, $order);
  
          // Template
!         $this->tpl->assign('sort', $sort);
  
!         $inverse = ($sort == 'nickname' && $order != 'desc') ? 'desc' : 'asc';
!         $this->tpl->assign('nickname_sort_url', suxFunct::makeUrl('/admin', array('sort' => 'nickname', 'order' => $inverse)));
!         $inverse = ($sort == 'banned' && $order != 'desc') ? 'desc' : 'asc';
!         $this->tpl->assign('banned_sort_url', suxFunct::makeUrl('/admin', array('sort' => 'banned', 'order' => $inverse)));
!         $inverse = ($sort == 'root' && $order != 'desc') ? 'desc' : 'asc';
!         $this->tpl->assign('root_sort_url', suxFunct::makeUrl('/admin', array('sort' => 'root', 'order' => $inverse)));
!         $inverse = ($sort == 'ts' && $order != 'desc') ? 'desc' : 'asc';
!         $this->tpl->assign('ts_sort_url', suxFunct::makeUrl('/admin', array('sort' => 'ts', 'order' => $inverse)));
  
          $this->r->title .= " | {$this->r->gtext['admin']}";
--- 67,101 ----
      function userlist() {
  
+         // -------------------------------------------------------------------
          // Sort / Order
+         // -------------------------------------------------------------------
+ 
          $sort = null;
          if (isset($_GET['sort'])) $sort = $_GET['sort'];
  
!         $order = 'DESC';
!         if (!empty($_GET['order'])) $order = $_GET['order'];
! 
  
+         // -------------------------------------------------------------------
          // Pager
+         // -------------------------------------------------------------------
+ 
+         $params = array(); // Extra params
+         if ($sort) $params = array('sort' => $sort, 'order' => $order);
+ 
          $this->pager->limit = $this->per_page;
          $this->pager->setStart();
          $this->pager->setPages($this->user->countUsers());
          $this->r->text['pager'] = $this->pager->pageList(suxFunct::makeUrl('/admin', $params));
  
+         // -------------------------------------------------------------------
          // Template
!         // -------------------------------------------------------------------
  
!         $this->r->arr['ulist'] = $this->user->getUsers($this->pager->limit, $this->pager->start, $sort, $order);
! 
!         $this->tpl->assign('sort', $sort);
!         $this->r->text['sort_url'] = suxFunct::makeUrl('/admin', array('order' => (mb_strtolower($order) == 'desc' ? 'ASC' : 'DESC')));
  
          $this->r->title .= " | {$this->r->gtext['admin']}";