Changeset 1030:ad4942bddbdb for inc/core

Timestamp:

11/19/12 12:34:31 (13 years ago)

Author:

JcDenis

Branch:

default

Message:

Enhance mass posts actions by reducing SQL queries, addresses #943

Location:

inc/core

Files:

• class.dc.blog.php (modified) (8 diffs)
• class.dc.utils.php (modified) (1 diff)

inc/core/class.dc.blog.php

@@ -1223 +1223 @@
      public function updPostStatus($id,$status)
      {
+          $this->updPostsStatus($id,$status);
+     }
+     
+     /**
+     Updates posts status.
+     
+     @param    ids       <b>mixed</b>        Post(s) ID(s)
+     @param    status    <b>integer</b>      Post status
+     */
+     public function updPostsStatus($ids,$status)
+     {
           if (!$this->core->auth->check('publish,contentadmin',$this->id)) {
                throw new Exception(__('You are not allowed to change this entry status'));
           }
           
-          $id = (integer) $id;
+          $posts_ids = dcUtils::cleanIds($ids);
           $status = (integer) $status;
+          
+          $strReq = "WHERE blog_id = '".$this->con->escape($this->id)."' ".
+                    "AND post_id ".$this->con->in($posts_ids);
           
           #If user can only publish, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
-               $strReq = 'SELECT post_id '.
-                         'FROM '.$this->prefix.'post '.
-                         'WHERE post_id = '.$id.' '.
-                         "AND blog_id = '".$this->con->escape($this->id)."' ".
-                         "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
-               
-               $rs = $this->con->select($strReq);
-               
-               if ($rs->isEmpty()) {
-                    throw new Exception(__('You are not allowed to change this entry status'));
-               }
+               $strReq .= "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
           
@@ -1251 +1255 @@
           $cur->post_upddt = date('Y-m-d H:i:s');
           
-          $cur->update(
-               'WHERE post_id = '.$id.' '.
-               "AND blog_id = '".$this->con->escape($this->id)."' "
-               );
+          $cur->update($strReq);
           $this->triggerBlog();
      }
      
+     /**
+     Updates post selection.
+     
+     @param    id        <b>integer</b>      Post ID
+     @param    selected  <b>integer</b>      Is selected post
+     */
      public function updPostSelected($id,$selected)
+     {
+          $this->updPostsSelected($id,$selected);
+     }
+     
+     /**
+     Updates posts selection.
+     
+     @param    ids       <b>mixed</b>        Post(s) ID(s)
+     @param    selected  <b>integer</b>      Is selected post(s)
+     */
+     public function updPostsSelected($ids,$selected)
      {
           if (!$this->core->auth->check('usage,contentadmin',$this->id)) {
@@ -1264 +1282 @@
           }
           
-          $id = (integer) $id;
+          $posts_ids = dcUtils::cleanIds($ids);
           $selected = (boolean) $selected;
+          
+          $strReq = "WHERE blog_id = '".$this->con->escape($this->id)."' ".
+                    "AND post_id ".$this->con->in($posts_ids);
           
           # If user is only usage, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
-               $strReq = 'SELECT post_id '.
-                         'FROM '.$this->prefix.'post '.
-                         'WHERE post_id = '.$id.' '.
-                         "AND blog_id = '".$this->con->escape($this->id)."' ".
-                         "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
-               
-               $rs = $this->con->select($strReq);
-               
-               if ($rs->isEmpty()) {
-                    throw new Exception(__('You are not allowed to mark this entry as selected'));
-               }
+               $strReq .= "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
           
@@ -1288 +1299 @@
           $cur->post_upddt = date('Y-m-d H:i:s');
           
-          $cur->update(
-               'WHERE post_id = '.$id.' '.
-               "AND blog_id = '".$this->con->escape($this->id)."' "
-          );
+          $cur->update($strReq);
           $this->triggerBlog();
      }
@@ -1303 +1311 @@
      public function updPostCategory($id,$cat_id)
      {
+          $this->updPostsCategory($id,$cat_id);
+     }
+     
+     /**
+     Updates posts category. <var>$cat_id</var> can be null.
+     
+     @param    ids       <b>mixed</b>        Post(s) ID(s)
+     @param    cat_id    <b>integer</b>      Category ID
+     */
+     public function updPostsCategory($ids,$cat_id)
+     {
           if (!$this->core->auth->check('usage,contentadmin',$this->id)) {
                throw new Exception(__('You are not allowed to change this entry category'));
           }
           
-          $id = (integer) $id;
+          $posts_ids = dcUtils::cleanIds($ids);
           $cat_id = (integer) $cat_id;
+          
+          $strReq = "WHERE blog_id = '".$this->con->escape($this->id)."' ".
+                    "AND post_id ".$this->con->in($posts_ids);
           
           # If user is only usage, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
-               $strReq = 'SELECT post_id '.
-                         'FROM '.$this->prefix.'post '.
-                         'WHERE post_id = '.$id.' '.
-                         "AND blog_id = '".$this->con->escape($this->id)."' ".
-                         "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
-               
-               $rs = $this->con->select($strReq);
-               
-               if ($rs->isEmpty()) {
-                    throw new Exception(__('You are not allowed to change this entry category'));
-               }
+               $strReq .= "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
           
@@ -1331 +1343 @@
           $cur->post_upddt = date('Y-m-d H:i:s');
           
-          $cur->update(
-               'WHERE post_id = '.$id.' '.
-               "AND blog_id = '".$this->con->escape($this->id)."' "
-          );
+          $cur->update($strReq);
           $this->triggerBlog();
      }
@@ -1344 +1353 @@
      @param    new_cat_id     <b>integer</b>      New category ID
      */
-     public function updPostsCategory($old_cat_id,$new_cat_id)
+     public function changePostsCategory($old_cat_id,$new_cat_id)
      {
           if (!$this->core->auth->check('contentadmin,categories',$this->id)) {
@@ -1372 +1381 @@
      public function delPost($id)
      {
+          $this->delPosts($id);
+     }
+     
+     /**
+     Deletes multiple posts.
+     
+     @param    ids       <b>mixed</b>        Post(s) ID(s)
+     */
+     public function delPosts($ids)
+     {
           if (!$this->core->auth->check('delete,contentadmin',$this->id)) {
                throw new Exception(__('You are not allowed to delete entries'));
           }
           
-          $id = (integer) $id;
-          
-          if (empty($id)) {
+          $posts_ids = dcUtils::cleanIds($ids);
+          
+          if (empty($posts_ids)) {
                throw new Exception(__('No such entry ID'));
           }
+          
+          $strReq = 'DELETE FROM '.$this->prefix.'post '.
+                    "WHERE blog_id = '".$this->con->escape($this->id)."' ".
+                    "AND post_id ".$this->con->in($posts_ids);
           
           #If user can only delete, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
-               $strReq = 'SELECT post_id '.
-                         'FROM '.$this->prefix.'post '.
-                         'WHERE post_id = '.$id.' '.
-                         "AND blog_id = '".$this->con->escape($this->id)."' ".
-                         "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
-               
-               $rs = $this->con->select($strReq);
-               
-               if ($rs->isEmpty()) {
-                    throw new Exception(__('You are not allowed to delete this entry'));
-               }
-          }
-          
-          
-          $strReq = 'DELETE FROM '.$this->prefix.'post '.
-                    'WHERE post_id = '.$id.' '.
-                    "AND blog_id = '".$this->con->escape($this->id)."' ";
+               $strReq .= "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
+          }
           
           $this->con->execute($strReq);

inc/core/class.dc.utils.php

@@ -49 +49 @@
           return $user_id;
      }
+     
+     /**
+     Cleanup a list of IDs
+     
+     @param    ids            <b>mixed</b>   ID(s)
+     @return   <b>array</b>
+     */
+     public static function cleanIds($ids)
+     {
+          $clean_ids = array();
+          
+          if (!is_array($ids)) {
+               $ids = array($ids);
+          }
+          
+          foreach($ids as $id)
+          {
+               $id = abs((integer) $id);
+               
+               if (!empty($id)) {
+                    $clean_ids[] = $id;
+               }
+          }
+          return $clean_ids;
+     }
 }