Changeset 764:1f013109b32f

Timestamp:

11/14/11 16:09:59 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

Next step in formfilters : columns now work, sorting still broken...

Files:

• admin/comments.php (modified) (4 diffs)
• admin/posts.php (modified) (5 diffs)
• inc/admin/class.dc.filter.php (modified) (18 diffs)
• inc/admin/class.dc.list.php (modified) (8 diffs)
• inc/core/class.dc.blog.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)

admin/comments.php

@@ -47 +47 @@
 
 # - Limit, sortby and order filter
-$params = $comment_list->applyFilters($params);
 
 # Actions combo box
@@ -80 +79 @@
           
 $core->callBehavior('adminCommentsFilters',$filterSet);
+$filterSet->setExtra($comment_list);
 
 $filterSet->setup($_GET,$_POST);
@@ -105 +105 @@
      $core->error->add($e->getMessage());
 }
-$filterSet->setExtraData($comment_list->getColumnsForm());
 
 /* DISPLAY
@@ -150 +149 @@
      form::hidden(array('status'),$status).
      form::hidden(array('ip'),preg_replace('/%/','%%',$ip)).
-     $comment_list->getFormFieldsAsHidden().
      '</div>'.
      

admin/posts.php

@@ -123 +123 @@
 $params = new ArrayObject();
 $params['no_content'] = true;
-
-# - Limit, sortby and order filter
-$params = $post_list->applyFilters($params);
 
 $filterSet = new dcFilterSet('posts','posts.php');
@@ -152 +149 @@
 
 $core->callBehavior('adminPostsFilters',$filterSet);
+$filterSet->setExtra($post_list);
 
 $filterSet->setup($_GET,$_POST);
@@ -174 +172 @@
 }
 
-$filterSet->setExtraData($post_list->getColumnsForm());
 
 /* DISPLAY
@@ -191 +188 @@
 
      $filterSet->display();
-
      # Show posts
      $post_list->display('<form action="posts_actions.php" method="post" id="form-entries">'.
@@ -204 +200 @@
      '<input type="submit" value="'.__('ok').'" /></p>'.
      $filterSet->getFormFieldsAsHidden().
-     $post_list->getFormFieldsAsHidden().
      $core->formNonce().
      '</div>'.
      '</form>'
      );
-}
+
+     
+     }
+
 
 dcPage::helpBlock('core_posts');

inc/admin/class.dc.filter.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
+
+/**
+@ingroup DC_CORE
+@nosubgrouping
+@brief Interface to add extra data to filterset.
+
+Note : the instance will be cloned to ensure dual filter edit fields / displayed fields
+Be sure to enable correct object cloning then, using the __clone method
+*/
+interface dcFilterExtraInterface {
+     /**
+     Return extra data to display in right column
+     
+     @param    core      <b>dcCore</b>       Dotclear core reference
+     @param    form_prefix    <b>string</b>       form prefix to use for parameters
+     */
+     public function getFormContent();
+
+     /**
+     Set dedicated data from form submission 
+     (either $_GET or $_POST depending on the context
+     
+     @param    data      <b>array</b>        Data to retrieve information from
+     */
+     public function initializeFromData($data);
+     
+     /**
+     Save data to configuration
+     */
+     public function save();
+     
+     /**
+     Load data from configuration
+     */
+     public function load();
+          
+     /**
+     Update query parameters with given settings
+     @param    params         <b>ArrayObject</b>       Params being sent to query
+     */
+     public function applyFilters($params);
+     
+     
+     /**
+     Update parameters that will be used for inter-forms communications
+     (either query string or hidden fields).
+     The associative has to be updated with $param['key']='value'
+     @param    params         <b>ArrayObject</b>       Params to update
+     */
+     public function updateRequestParams($params);
+}
+
 /**
 @ingroup DC_CORE
@@ -20 +72 @@
 class dcFilterSet {
 
-     protected $lfilters;               /// <b>array</b> lists of defined filters
-     protected $efilters;               /// <b>array</b> lists of defined filters
+     protected $lfilters;          /// <b>array</b> lists of defined filters
+     protected $efilters;          /// <b>array</b> lists of defined filters
      protected $form_prefix;       /// <b>string</b> displayed form prefix
      protected $action;            /// <b>string</b> form action page
      protected $hideform;          /// <b>boolean</b> start form display hidden by default or not
-     protected $extra_data;   /// <b>string</b> columns form
+     protected $lextra;            /// <b>string</b> columns form
+     protected $eextra;            /// <b>string</b> columns form
      protected $name;              /// <b>string</b> fieldset name
      
@@ -40 +93 @@
           $this->efilters = new ArrayObject();
           $this->action = $action;
-          $this->extra_data = '';
+          $this->lextra = null;
+          $this->eextra = null;
           $this->filtered = false;
      }
@@ -63 +117 @@
           $ser = array();
           $ws = $GLOBALS['core']->auth->user_prefs->addWorkspace('filters');
-          $data = array();
+          $data = new ArrayObject();
           $data= $this->getFiltersAsParams($this->efilters);
           $ws->put($this->name,serialize($data->getArrayCopy()),'string');
@@ -87 +141 @@
      @param    form_data <b>array</b>   form values (usually $_GET or $_POST)
      */
-     protected function initializeFromData ($filters, $form_data) {
+     protected function initializeFromData ($filters, $extra, $form_data) {
           $this->hideform = true;
           foreach ($filters as $filter) {
                $filter->initializeFromData ($form_data);
           }
+          if ($extra != null) {
+               $extra-> initializeFromData ($form_data);
+          }
      }
      
@@ -99 +156 @@
      @param    html <b>string</b>       the code to add
      */
-     public function setExtraData($html)
+     public function setExtra($extra)
      {
-          $this->extra_data = $html;
+          $this->lextra = $extra;
+          $this->eextra = clone $extra;
+          
      }
      
@@ -111 +170 @@
      public function getFormFieldsAsHidden() {
           $ret='';
-          foreach ($this->lfilters as $filter) {
-               $ret.= $filter->getFormFieldAsHidden();
+          $arr = new ArrayObject();
+          foreach ($this->lfilters as $f) {
+               if ($f->isEnabled())
+                    $f->updateRequestParams($arr);
+          }
+          if ($this->lextra != null) {
+               $this->lextra->updateRequestParams($arr);
+          }
+          foreach ($arr as $k=>$v) {
+               $ret.= form::hidden($k,$v);
           }
           return $ret;
@@ -149 +216 @@
                // Use case (1)
                if ($action != 'clear_filters' && $action != 'reset')  {
-                    $this->initializeFromData($this->efilters,$post);
+                    $this->initializeFromData($this->efilters,$this->eextra, $post);
                     if ($action == 'add'){
                          if (isset($post['add_filter']) 
@@ -156 +223 @@
                          }
                     } elseif (strpos($action,'del_') === 0) {
-
                          $count = preg_match('#del_(.+)_([0-9]+)#',$action,$match);
                          if (($count == 1) && isset($this->efilters[$match[1]])) {
@@ -163 +229 @@
                     } elseif ($action=="apply") {
                          $data = $this->saveFilters();
+                         if ($this->eextra != null) {
+                              $this->eextra->save();
+                              $this->eextra->updateRequestParams($data);
+                         }
                          http::redirect($this->action.'?'.http_build_query($data,'','&'));
                          exit;
@@ -169 +239 @@
                if (isset($post[$this->form_prefix."query"])) {
                     parse_str($post[$this->form_prefix."query"],$out);
-                    $this->initializeFromData($this->lfilters,$out);
+                    $this->initializeFromData($this->lfilters,$this->lextra, $out);
                     if ($action == 'reset') {
-                         $this->initializeFromData($this->efilters,$out);
+                         $this->initializeFromData($this->efilters,$this->eextra, $out);
                     }
                }
@@ -178 +248 @@
                // Use case (2)
                if (count($get)==0) {
-                    $get = $this->loadFilters();
+                    $get = new ArrayObject($this->loadFilters());
+                    if ($this->eextra != null) {
+                         $this->eextra->load();
+                         $this->eextra->updateRequestParams($get);
+                    }
                }
-               $this->initializeFromData($this->efilters, $get);
-               $this->initializeFromData($this->lfilters, $get);
+               $this->initializeFromData($this->efilters, $this->eextra, $get);
+               $this->initializeFromData($this->lfilters, $this->lextra, $get);
           }
      }
@@ -231 +305 @@
                $this->form_prefix.'reset" /></p>'.
                '</div>';
-          if ($this->extra_data != '') {
+          if ($this->eextra != '') {
                $ret .=
                     '<div class="col30">'.
-                    $this->extra_data.
+                    $this->eextra->getFormContent().
                     '</div>';
           }
+          $queryParams = $this->getFiltersAsParams($this->lfilters);
+          if ($this->lextra != null) {
+               $this->lextra->updateRequestParams($queryParams);
+          }
+          
           $ret .=
                '<p class="clear margintop">'.
                '<input type="submit" value="'.__('Apply filters and display options').
                '" name="'.$this->form_prefix.'apply" /></p>'.
-               form::hidden($this->form_prefix."query",http_build_query($this->getFiltersAsParams($this->lfilters))).
+               form::hidden($this->form_prefix."query",http_build_query($queryParams)).
                $GLOBALS['core']->formNonce().
                '</form>'.
@@ -260 +339 @@
           foreach ($filters as $f) {
                if ($f->isEnabled())
-                    $f->fillQS($arr);
+                    $f->updateRequestParams($arr);
           }
           return $arr;
@@ -308 +387 @@
                     $this->filtered = true;
                }
+          }
+          if ($this->lextra != null) {
+               $this->lextra->applyFilters($params);
           }
           return $this->filtered;
@@ -461 +543 @@
      }
      
-     public function fillQS($arr) {
+     public function updateRequestParams($arr) {
           for ($cur=0; $cur < count($this->values); $cur++) {
                $arr[$this->getFieldId($cur)]=$this->values[$cur];
-          }
-     }
-     
-     /**
-     Returns form fields as hidden fields
-     
-     @return   <b>string</b>  the corresponding html code
-     */   
-     public function getFormFieldAsHidden () {
-          $ret='';
-          for ($cur=0; $cur < count($this->values); $cur++) {
-               $ret .= form::hidden($this->getFieldId($cur), $this->values[$cur]);
           }
      }
@@ -586 +656 @@
           return $ret;
      }
-
-     public function getFormFieldAsHidden () {
-          return parent::getFormFieldAsHidden().form::hidden($this->field_id."_v",$this->verb);
-     }
-     
-     public function fillQS($arr) {
-          parent::fillQS($arr);
+     
+     public function updateRequestParams($arr) {
+          parent::updateRequestParams($arr);
           
           $arr[$this->field_id.'_v']=$this->verb;
@@ -712 +778 @@
      
 }
+
+
 ?>

inc/admin/class.dc.list.php

@@ -259 +259 @@
 Dotclear items list handles administration lists
 */
-abstract class adminItemsList
+abstract class adminItemsList implements dcFilterExtraInterface
 {
      protected $core;
@@ -285 +285 @@
           $this->core = $core;
           $this->context = get_class($this);
-          $this->columns = array();
+          $this->columns = new ArrayObject();
           $this->form_prefix = 'col_%s';
-          $this->form_trigger = 'add_filter';
           
           $this->html_prev = __('prev');
@@ -294 +293 @@
           $this->html_end = __('end');
           
-          $this->setOptions();
+          $this->nb_per_page = 10;
           
           $this->setColumns();
@@ -301 +300 @@
           $core->callBehavior('adminItemsListConstruct',$this);
           
-          $this->setColumnsVisibility();
-     }
-     
+     }
+     
+     public function __clone() {
+          $arr = new ArrayObject();
+          foreach ($this->columns as $k=>$v) {
+               $arr[$k]= clone $v;
+          }
+          $this->columns = $arr;
+     }
      /**
      Apply limit, sortby and order filters to items parameters
@@ -347 +352 @@
      @return   <b>string</b>       HTML code form
      */
-     public function getColumnsForm()
+     public function getFormContent()
      {
           $block = 
@@ -372 +377 @@
           '</label>&nbsp;'.form::field('nb_per_page',3,3,$nb_per_page).
           '</p>';
+     }
+     
+     public function updateRequestParams($params) {
+          if (!is_null($this->sortby)) {
+               $params['sortby'] = $this->sortby;
+          }
+          if (!is_null($this->order)) {
+               $params['order'] = $this->order;
+          }
+          if (!is_null($this->nb_per_page)) {
+               $params['nb_per_page'] = $this->nb_per_page;
+          }
+          if (!is_null($this->page)) {
+               $params['page'] = $this->page;
+          }
+          foreach ($this->columns as $k => $v) {
+               if($v->isVisible())
+                    $params[sprintf($this->form_prefix,$k)] = 1;
+          }
+
      }
      
@@ -514 +539 @@
      
      /**
-     Returns default HTMl code line
+     Returns default HTML code line
      
      @return   <b>string</b>       Default HTMl code line
@@ -524 +549 @@
      
      /**
-     Sets options of defined list
-     */
-     private function setOptions()
-     {
-          $opts = $_GET;
-          
+     Loads list from user settings
+     */
+     public function load() {
           $ws = $this->core->auth->user_prefs->addWorkspace('lists');
-          
           $user_pref = !is_null($ws->{$this->context.'_opts'}) ? unserialize($ws->{$this->context.'_opts'}) : array();
-          # Sortby
           $this->sortby = array_key_exists('sortby',$user_pref) ? $user_pref['sortby'] : null;
-          $this->sortby = array_key_exists('sortby',$opts) ? $opts['sortby'] : $this->sortby;
-          $user_pref['sortby'] = $this->sortby;
-          # Order
           $this->order = array_key_exists('order',$user_pref) ? $user_pref['order'] : null;
-          $this->order = array_key_exists('order',$opts) ? $opts['order'] : $this->order;
-          $user_pref['order'] = $this->order;
-          # Number per page
           $this->nb_per_page = array_key_exists('nb_per_page',$user_pref) ? $user_pref['nb_per_page'] : 10;
-          $this->nb_per_page = array_key_exists('nb_per_page',$opts) ? $opts['nb_per_page'] : $this->nb_per_page;
-          $user_pref['nb_per_page'] = $this->nb_per_page;
-          
-          if (array_key_exists('sortby',$opts) || array_key_exists('order',$opts) || array_key_exists('nb_per_page',$opts)) {
-               $this->core->auth->user_prefs->lists->put($this->context.'_opts',serialize($user_pref),'string');
-          }
-          
-          # Page
-          $this->page = array_key_exists('page',$opts) ? $opts['page'] : 1;
-     }
-     
-     /**
-     Sets columns visibility of defined list
-     */
-     private function setColumnsVisibility()
-     {
-          $opts = $_GET;
-          
-          # Visibility
-          $ws = $this->core->auth->user_prefs->addWorkspace('lists');
-          
           $user_pref = !is_null($ws->{$this->context.'_col'}) ? unserialize($ws->{$this->context.'_col'}) : array();
-          
           foreach ($this->columns as $k => $v) {
                $visibility =  array_key_exists($k,$user_pref) ? $user_pref[$k] : true;
-               if (array_key_exists($this->form_trigger,$opts)) {
-                    $key = sprintf($this->form_prefix,$k);
-                    $visibility = !array_key_exists($key,$opts) ? false : true;
-               }
                $v->setVisibility($visibility);
-               $user_pref[$k] = $visibility;
-          }
-          
-          if (array_key_exists($this->form_trigger,$opts)) {
-               $this->core->auth->user_prefs->lists->put($this->context.'_col',serialize($user_pref),'string');
+          }
+     }
+     
+     /**
+     Saves list to user settings
+     */
+     public function save() {
+          $ws = $this->core->auth->user_prefs->addWorkspace('lists');
+          $user_pref = !is_null($ws->{$this->context.'_opts'}) ? unserialize($ws->{$this->context.'_opts'}) : array();
+          $user_pref['order'] = $this->order;
+          $user_pref['nb_per_page'] = $this->nb_per_page;
+          $user_pref['sortby'] = $this->sortby;
+          
+          $this->core->auth->user_prefs->lists->put($this->context.'_opts',serialize($user_pref),'string');
+          
+          $user_pref = !is_null($ws->{$this->context.'_col'}) ? unserialize($ws->{$this->context.'_col'}) : array();
+          
+          foreach ($this->columns as $k => $v) {
+               $user_pref[$k] = $v->isVisible();
+          }
+          $this->core->auth->user_prefs->lists->put($this->context.'_col',serialize($user_pref),'string');
+     }
+     
+     /**
+     Set dedicated data from form submission 
+     (either $_GET or $_POST depending on the context
+     
+     @param    data      <b>array</b>        Data to retrieve information from
+     */
+     public function initializeFromData ($data)
+     {
+          # Sortby
+          $this->sortby = array_key_exists('sortby',$data) ? $data['sortby'] : $this->sortby;
+          $this->order = array_key_exists('order',$data) ? $data['order'] : $this->order;
+          $this->nb_per_page = array_key_exists('nb_per_page',$data) ? $data['nb_per_page'] : $this->nb_per_page;
+          
+          # Page
+          $this->page = array_key_exists('page',$data) ? $data['page'] : 1;
+          foreach ($this->columns as $k => $v) {
+               $key = sprintf($this->form_prefix,$k);
+               $visibility = !array_key_exists($key,$data) ? false : true;
+               $v->setVisibility($visibility);
           }
      }

inc/core/class.dc.blog.php

@@ -1463 +1463 @@
                     if (preg_match('/^null$/i',$id)) {
                          $queries[$id] = 'P.cat_id IS NULL';
-                         if ($not[$id]) {
+                         if (isset($not[$id]) && ($not[$id] == 1)) {
                               $nullExcluded = true;
                          }

inc/prepend.php

@@ -77 +77 @@
 $__autoload['textFilter']                    = dirname(__FILE__).'/admin/class.dc.filter.php';
 $__autoload['comboFilter']                   = dirname(__FILE__).'/admin/class.dc.filter.php';
+$__autoload['dcFilterExtraInterface']                  = dirname(__FILE__).'/admin/class.dc.filter.php';
 
 $__autoload['dcTemplate']               = dirname(__FILE__).'/public/class.dc.template.php';