Changeset 1015:10227e338321

Timestamp:

11/17/12 14:19:52 (13 years ago)

Author:

JcDenis

Branch:

default

Message:

Fix #1171 : Add ability to delete non empty category (and move its content)

Files:

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

admin/categories.php

@@ -20 +20 @@
      try
      {
+          # Check if category to delete exists
           $c = $core->blog->getCategory((integer) $_POST['del_cat']);
           if ($c->isEmpty()) {
@@ -25 +26 @@
           }
           unset($c);
+          
+          # Check if category where to move posts exists
+          $mov_cat = (integer) $_POST['mov_cat'];
+          $mov_cat = $mov_cat ? $mov_cat : null;
+          if ($mov_cat !== null) {
+               $c = $core->blog->getCategory((integer) $_POST['del_cat']);
+               if ($c->isEmpty()) {
+                    throw new Exception(__('This category does not exist.'));
+               }
+               unset($c);
+          }
+          
+          # Move posts
+          $core->blog->updPostsCategory($_POST['del_cat'],$mov_cat);
+          
+          # Delete category
           $core->blog->delCategory($_POST['del_cat']);
+          
           http::redirect('categories.php?del=1');
      }
@@ -143 +161 @@
 if (!$rs->isEmpty())
 {
-     $deletable = array();
+     $cats = array();
+     $dest = array(' ' => '');
      $l = $rs->level;
      $full_name = array($rs->cat_title);
@@ -154 +173 @@
           }
           $full_name[] = html::escapeHTML($rs->cat_title);
-          if ($rs->nb_post == 0) {
-               $deletable[implode(' / ',$full_name)] = $rs->cat_id;
-          }
+          
+          $cats[implode(' / ',$full_name)] = $rs->cat_id;
+          $dest[implode(' / ',$full_name)] = $rs->cat_id;
+          
           $l = $rs->level;
      }
      
-     if (count($deletable) > 0)
-     {
-          echo
-          '<form action="categories.php" method="post" id="delete-category">'.
-          '<fieldset><legend>'.__('Remove a category').'</legend>'.
-          '<p><label for="del_cat">'.__('Choose a category to remove:').' '.
-          form::combo('del_cat',$deletable).'</label></p> '.
-          '<p><input type="submit" value="'.__('Delete').'" class="delete" /></p>'.
-          $core->formNonce().
-          '</fieldset>'.
-          '</form>';
-     }
+     echo
+     '<form action="categories.php" method="post" id="delete-category">'.
+     '<fieldset><legend>'.__('Remove a category').'</legend>'.
+     '<p><label for="del_cat">'.__('Choose a category to remove:').' '.
+     form::combo('del_cat',$cats).'</label></p> '.
+     '<p><label for="mov_cat">'.__('Move its content to another category:').' '.
+     form::combo('mov_cat',$dest).'</label></p> '.
+     '<p><input type="submit" value="'.__('Delete').'" class="delete" /></p>'.
+     $core->formNonce().
+     '</fieldset>'.
+     '</form>';
      
      echo

inc/core/class.dc.blog.php

@@ -1339 +1339 @@
      
      /**
+     Updates posts category. <var>$new_cat_id</var> can be null.
+     
+     @param    old_cat_id     <b>integer</b>      Old category ID
+     @param    new_cat_id     <b>integer</b>      New category ID
+     */
+     public function updPostsCategory($old_cat_id,$new_cat_id)
+     {
+          if (!$this->core->auth->check('contentadmin,categories',$this->id)) {
+               throw new Exception(__('You are not allowed to change entries category'));
+          }
+          
+          $old_cat_id = (integer) $old_cat_id;
+          $new_cat_id = (integer) $new_cat_id;
+          
+          $cur = $this->con->openCursor($this->prefix.'post');
+          
+          $cur->cat_id = ($new_cat_id ? $new_cat_id : null);
+          $cur->post_upddt = date('Y-m-d H:i:s');
+          
+          $cur->update(
+               'WHERE cat_id = '.$old_cat_id.' '.
+               "AND blog_id = '".$this->con->escape($this->id)."' "
+          );
+          $this->triggerBlog();
+     }
+     
+     /**
      Deletes a post.