Changeset 504:218a2726906d

Timestamp:

07/04/11 09:43:43 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Children:

506:f97697c66830, 508:7dbb15fcd538

Message:

Added multiple post status support

Files:

• admin/posts.php (modified) (1 diff)
• inc/core/class.dc.blog.php (modified) (4 diffs)

admin/posts.php

@@ -161 +161 @@
           'category',__('Category'), 'cat_id', $categories_combo))
      ->addFilter(new comboFilter(
-          'post_status',__('Status'), 'post_status', $status_combo,array('singleval' => 1)))
+          'post_status',__('Status'), 'post_status', $status_combo))
      ->addFilter(new booleanFilter(
           'post_selected',__('The post :'), 'post_selected', $selected_combo))

inc/core/class.dc.blog.php

@@ -90 +90 @@
      }
      
+     /**
+     Returns sql statement for a given parameter. 
+     Computes in() or not_in lists in parameter
+
+     @param    params    <b>array</b> query parameters
+     @param    param_name     <b>array</b> parameter to check
+     @param    sql column     <b>array</b> sql column matching parameter name
+     
+     @return   <b>string</b> the generated SQL statement
+     */
+     protected function getInParamStr($params, $param_name, $sql_column) {
+          $not='';
+          if (isset($params[$param_name.'_not'])) {
+               $not = "NOT ";
+          }
+          return $sql_column.' '.$not.$this->con->in($params[$param_name]).' ';
+     }
+     
      /// @name Common public methods
      //@{
@@ -736 +754 @@
           
           if (!empty($params['user_id'])) {
-               if (!empty($params['user_id_not'])) {
-                    $not = "NOT ";
-               } else {
-                    $not = "";
-               }
-               $strReq .= "AND U.user_id ".$not.$this->con->in($params['user_id'])." ";
+               $strReq .= 'AND '.$this->getInParamStr($params,'user_id','U.user_id');
           }
           
@@ -767 +780 @@
           /* Other filters */
           if (isset($params['post_status'])) {
-               $strReq .= 'AND post_status = '.(integer) $params['post_status'].' ';
+               $strReq .= 'AND '.$this->getInParamStr($params,'post_status','post_status');
           }
           
@@ -790 +803 @@
           
           if (!empty($params['post_lang'])) {
-               $strReq .= "AND P.post_lang = '".$this->con->escape($params['post_lang'])."' ";
+               $strReq .= 'AND '.$this->getInParamStr($params,'post_lang','P.post_lang');
           }