Changeset 780:a80ff8f1c92a

Timestamp:

12/06/11 10:53:56 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

Handled after-actions redirections, columns selection now works, author filter autocompletion ok.

Files:

• admin/comments.php (modified) (2 diffs)
• admin/comments_actions.php (modified) (1 diff)
• admin/posts.php (modified) (1 diff)
• admin/posts_actions.php (modified) (1 diff)
• inc/admin/class.dc.filter.php (modified) (2 diffs)
• inc/admin/class.dc.list.php (modified) (5 diffs)
• plugins/antispam/filters/class.dc.filter.ip.php (modified) (1 diff)

admin/comments.php

@@ -86 +86 @@
      $authorFilter->setValue($_GET['author']);
 }
+$with_spam=true;
 /* Get comments
 -------------------------------------------------------- */
@@ -145 +146 @@
      $core->formNonce().
      '<input type="submit" value="'.__('ok').'" /></p>'.
-     form::hidden(array('type'),$type).
-     form::hidden(array('author'),preg_replace('/%/','%%',$author)).
-     form::hidden(array('status'),$status).
-     form::hidden(array('ip'),preg_replace('/%/','%%',$ip)).
+     str_replace('%','%%',$filterSet->getFormFieldsAsHidden()).
      '</div>'.
      

admin/comments_actions.php

@@ -30 +30 @@
      {
           $redir =
-          'comments.php?type='.$_POST['type'].
-          '&author='.$_POST['author'].
-          '&status='.$_POST['status'].
-          '&sortby='.$_POST['sortby'].
-          '&ip='.$_POST['ip'].
-          '&order='.$_POST['order'].
-          '&page='.$_POST['page'].
-          '&nb='.(integer) $_POST['nb'];
+          'comments.php?'.urldecode($_POST['f_query']);
      }
      

admin/posts.php

@@ -199 +199 @@
      form::combo('action',$combo_action).
      '<input type="submit" value="'.__('ok').'" /></p>'.
-     $filterSet->getFormFieldsAsHidden().
+     str_replace('%','%%',$filterSet->getFormFieldsAsHidden()).
      $core->formNonce().
      '</div>'.

admin/posts_actions.php

@@ -31 +31 @@
      {
           $redir =
-          'posts.php?user_id='.$_POST['user_id'].
-          '&cat_id='.$_POST['cat_id'].
-          '&status='.$_POST['status'].
-          '&selected='.$_POST['selected'].
-          '&month='.$_POST['month'].
-          '&lang='.$_POST['lang'].
-          '&sortby='.$_POST['sortby'].
-          '&order='.$_POST['order'].
-          '&page='.$_POST['page'].
-          '&nb='.$_POST['nb'];
+          'posts.php?'.urldecode($_POST['f_query']);
      }
      

inc/admin/class.dc.filter.php

@@ -179 +179 @@
           }
           foreach ($arr as $k=>$v) {
-               $ret.= form::hidden($k,$v);
-          }
+               $ret.= form::hidden(array($k),$v);
+          }
+          $queryParams = $this->getFiltersAsParams($this->lfilters);
+          if ($this->lextra != null) {
+               $this->lextra->updateRequestParams($queryParams);
+          }
+          $ret .= form::hidden(array($this->form_prefix."query"), http_build_query($queryParams));
           return $ret;
      }
@@ -327 +332 @@
                '<input type="submit" value="'.__('Apply filters and display options').
                '" name="'.$this->form_prefix.'apply" /></p>'.
-               form::hidden($this->form_prefix."query",http_build_query($queryParams)).
+               form::hidden(array($this->form_prefix."query"),http_build_query($queryParams)).
                $GLOBALS['core']->formNonce().
                '</form>'.

inc/admin/class.dc.list.php

@@ -286 +286 @@
           $this->context = get_class($this);
           $this->columns = new ArrayObject();
-          $this->form_prefix = 'col_%s';
+          $this->form_prefix = 'col_';
           
           $this->html_prev = __('prev');
@@ -361 +361 @@
           
           foreach ($this->columns as $k => $v) {
-               $col_id = sprintf($this->form_prefix,$k);
+               $col_id = $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(),null,null,!$v->canHide()));
@@ -394 +394 @@
           foreach ($this->columns as $k => $v) {
                if($v->isVisible())
-                    $params[sprintf($this->form_prefix,$k)] = 1;
+                    $params[$this->form_prefix.$k] = 1;
           }
 
@@ -594 +594 @@
           $load_from_settings = true;
           foreach ($data as $k=>$v) {
-               if (strpos($this->form_prefix,$k)===0) {
+               if (strpos($k,$this->form_prefix) === 0) {
                     $load_from_settings = false;
                }
@@ -609 +609 @@
           if ($load_from_settings)
                return;
+
           foreach ($this->columns as $k => $v) {
-               $key = sprintf($this->form_prefix,$k);
+               $key = $this->form_prefix.$k;
                $visibility = !array_key_exists($key,$data) ? false : true;
                $v->setVisibility($visibility);

plugins/antispam/filters/class.dc.filter.ip.php

@@ -311 +311 @@
 }
 ?>
-