Changeset 242:57cb73269f1e for inc/admin/lib.pager.php

Timestamp:

05/11/11 18:13:45 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

formfilters

Message:

Makes custom lists work

File:

• inc/admin/lib.pager.php (modified) (9 diffs)

inc/admin/lib.pager.php

@@ -32 +32 @@
                throw new Exception(__('Invalid column title'));
           }
+          
           if (is_null($html) || !is_string($html)) {
                $html = '';
           }
+          if (!empty($html)) {
+               $html = ' '.$html;
+          }
+          
           if (!is_int($order)) {
                $order = null;
@@ -40 +45 @@
           
           try {
+               if (!is_array($callback) || count($callback) < 2) {
+                    throw new Exception(__('Callback parameter should be an array'));
+               }
                $r = new ReflectionClass($callback[0]);
                $f = $r->getMethod($callback[1]);
                $p = $r->getParentClass();
                if (!$p || $p->name != 'adminGenericList') {
-                    throw new Exception(__('Invalid callback'));
+                    throw new Exception(__('Callback class should be inherited of adminGenericList class'));
                }
           }
           catch (Exception $e) {
-               throw new Exception(__('Invalid callback'));
+               throw new Exception(sprintf(__('Invalid column callback: %s'),$e->getMessage()));
           }
           
@@ -84 +92 @@
      protected $columns;
      
-     
      public function __construct($core,$rs,$rs_count)
      {
@@ -92 +99 @@
           $this->context = get_class($this);
           $this->columns = array();
-          $this->column_pattern = 'c_%s';
+          $this->form_prefix = 'col_%s';
+          $this->form_trigger = 'add_filter';
           
           $this->html_prev = __('&#171;prev.');
@@ -120 +128 @@
           $this->addColumn('adminCommentList','edit','',array('adminCommentList','getEdit'));
           
-          # Comment columns
+          # User columns
           $this->addColumn('adminUserList','username',__('Username'),array('adminUserList','getUserName'));
           $this->addColumn('adminUserList','firstname',__('First name'),array('adminUserList','getFirstName'));
@@ -151 +159 @@
      public function setColumnsVisibility()
      {
+          if (array_key_exists($this->form_trigger,$_REQUEST)) {
+               foreach ($this->columns[$this->context] as $k => $v) {
+                    $key = sprintf($this->form_prefix,$k);
+                    if (!array_key_exists($key,$_REQUEST)) {
+                         $v->setVisibility(false);
+                    }
+               }
+          }
+     }
+     
+     public function getColumnsForm()
+     {
+          $block = 
+          '<h3>'.__('Displayed information').'</h3>'.
+          '<ul>%s</ul>';
+          
+          $list = array();
+          
           foreach ($this->columns[$this->context] as $k => $v) {
-               $key = sprintf($this->column_pattern,$k);
-               if (array_key_exists($key,$_REQUEST)) {
-                    $v->setVisibility((bool) $key);
-               }
-          }
+               $col_id = sprintf($this->form_prefix,$k);
+               $col_label = sprintf('<label for="%s">%s</label>',$col_id,$v->getInfo('title'));
+               $col_html = sprintf('<li class="line">%s</li>',$col_label.form::checkbox($col_id,1,$v->isVisible()));
+               
+               array_push($list,$col_html);
+          }
+          
+          return !empty($list) ? sprintf($block,implode('',$list)) : '';
      }
      
@@ -330 +359 @@
      }
      
-     protected function getContent()
-     {
-          return
-          '<tr class="line'.($this->rs->comment_status != 1 ? ' offline' : '').'"'.
-          ' id="c'.$this->rs->comment_id.'">%s</tr>';
-     }
-     
      protected function getTitle()
      {
@@ -342 +364 @@
           
           return
-          '<td class="maximal"><a href="'.$post_url.'">'.
+          '<td class="maximal">'.
+          form::checkbox(array('comments[]'),$this->rs->comment_id,'','','',0).'&nbsp'.
+          '<a href="'.$post_url.'">'.
           html::escapeHTML($this->rs->post_title).'</a>'.
           ($this->rs->post_type != 'post' ? ' ('.html::escapeHTML($this->rs->post_type).')' : '').'</td>';
@@ -425 +449 @@
           return
           '<td class="maximal">'.form::hidden(array('nb_post[]'),(integer) $this->rs->nb_post).
-          form::checkbox(array('user_id[]'),$this->rs->user_id).
+          form::checkbox(array('user_id[]'),$this->rs->user_id).'&nbsp;'.
           '<a href="user.php?id='.$this->rs->user_id.'">'.
           $this->rs->user_id.'</a>&nbsp;'.$img_status.'</td>';