Changeset 851:0993f64c4809

Timestamp:

07/31/12 13:52:11 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

sexy step 2 : no more cats.

Files:

• admin/categories.php (deleted)
• admin/category.php (deleted)
• admin/index.php (modified) (2 diffs)
• admin/post.php (modified) (6 diffs)
• admin/posts.php (modified) (9 diffs)
• admin/posts_actions.php (modified) (4 diffs)
• admin/search.php (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/admin/lib.pager.php (modified) (3 diffs)
• inc/admin/prepend.php (modified) (2 diffs)
• inc/core/class.dc.auth.php (modified) (1 diff)
• inc/core/class.dc.blog.php (modified) (15 diffs)
• inc/core/class.dc.categories.php (deleted)
• inc/core/class.dc.rs.extensions.php (modified) (1 diff)
• inc/core/class.dc.xmlrpc.php (modified) (14 diffs)
• inc/dbschema/db-schema.php (modified) (4 diffs)
• inc/prepend.php (modified) (2 diffs)
• inc/public/class.dc.template.php (modified) (20 diffs)
• inc/public/lib.tpl.context.php (modified) (3 diffs)
• inc/public/lib.urlhandlers.php (modified) (1 diff)
• locales/en/resources.php (modified) (1 diff)
• plugins/widgets/_default_widgets.php (modified) (3 diffs)
• plugins/widgets/_widgets_functions.php (modified) (2 diffs)

admin/index.php

@@ -294 +294 @@
      if ($core->auth->check('usage,contentadmin',$core->blog->id))
      {
-          $categories_combo = array(' ' => '');
-          try {
-               $categories = $core->blog->getCategories(array('post_type'=>'post'));
-               while ($categories->fetch()) {
-                    $categories_combo[] = new formSelectOption(
-                         str_repeat('  ',$categories->level-1).
-                         ($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
-                         $categories->cat_id
-                    );
-               }
-          } catch (Exception $e) { }
-     
           echo
           '<div id="quick">'.
@@ -318 +306 @@
           form::textarea('post_content',50,7).
           '</p>'.
-          '<p><label for="cat_id" class="classic">'.__('Category:').' '.
-          form::combo('cat_id',$categories_combo).'</label></p>'.
           '<p><input type="submit" value="'.__('Save').'" name="save" /> '.
           ($core->auth->check('publish',$core->blog->id)

admin/post.php

@@ -16 +16 @@
 
 $post_id = '';
-$cat_id = '';
 $post_dt = '';
 $post_format = $core->auth->getOption('post_format');
@@ -48 +47 @@
 }
 
-# Getting categories
-$categories_combo = array(' ' => '');
-try {
-     $categories = $core->blog->getCategories(array('post_type'=>'post'));
-     while ($categories->fetch()) {
-          $categories_combo[] = new formSelectOption(
-               str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
-               $categories->cat_id
-          );
-     }
-} catch (Exception $e) { }
-
 # Status combo
 foreach ($core->blog->getAllPostStatus() as $k => $v) {
@@ -101 +88 @@
      {
           $post_id = $post->post_id;
-          $cat_id = $post->cat_id;
           $post_dt = date('Y-m-d H:i',strtotime($post->post_dt));
           $post_format = $post->post_format;
@@ -153 +139 @@
      $post_title = $_POST['post_title'];
      
-     $cat_id = (integer) $_POST['cat_id'];
-     
      if (isset($_POST['post_status'])) {
           $post_status = (integer) $_POST['post_status'];
@@ -188 +172 @@
      
      $cur->post_title = $post_title;
-     $cur->cat_id = ($cat_id ? $cat_id : null);
      $cur->post_dt = $post_dt ? date('Y-m-d H:i:00',strtotime($post_dt)) : '';
      $cur->post_format = $post_format;
@@ -389 +372 @@
      
      echo
-     '<p><label for="cat_id">'.__('Category:').
-     form::combo('cat_id',$categories_combo,$cat_id,'maximal').
-     '</label></p>'.
-     
      '<p><label for="post_status">'.__('Entry status:').
      form::combo('post_status',$status_combo,$post_status,'','',!$can_publish).

admin/posts.php

@@ -15 +15 @@
 dcPage::check('usage,contentadmin');
 
-# Getting categories
-try {
-     $categories = $core->blog->getCategories(array('post_type'=>'post'));
-} catch (Exception $e) {
-     $core->error->add($e->getMessage());
-}
-
 # Getting authors
 try {
@@ -47 +40 @@
 {
      # Filter form we'll put in html_block
-     $users_combo = $categories_combo = array();
-     $users_combo['-'] = $categories_combo['-'] = '';
+     $users_combo = array();
+     $users_combo['-'] = '';
      while ($users->fetch())
      {
@@ -61 +54 @@
      }
      
-     $categories_combo[__('None')] = 'NULL';
-     while ($categories->fetch()) {
-          $categories_combo[str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').
-               html::escapeHTML($categories->cat_title).
-               ' ('.$categories->nb_post.')'] = $categories->cat_id;
-     }
-     
      $status_combo = array(
      '-' => ''
@@ -95 +81 @@
      __('Date') => 'post_dt',
      __('Title') => 'post_title',
-     __('Category') => 'cat_title',
      __('Author') => 'user_id',
      __('Status') => 'post_status',
@@ -122 +107 @@
      __('Mark as unselected') => 'unselected'
 );
-$combo_action[__('Change')] = array(__('Change category') => 'category');
+$combo_action[__('Change')] = array();
 if ($core->auth->check('admin',$core->blog->id))
 {
@@ -139 +124 @@
 -------------------------------------------------------- */
 $user_id = !empty($_GET['user_id']) ?   $_GET['user_id'] : '';
-$cat_id = !empty($_GET['cat_id']) ?     $_GET['cat_id'] : '';
 $status = isset($_GET['status']) ? $_GET['status'] : '';
 $selected = isset($_GET['selected']) ?  $_GET['selected'] : '';
@@ -168 +152 @@
 } else {
      $user_id='';
-}
-
-# - Categories filter
-if ($cat_id !== '' && in_array($cat_id,$categories_combo)) {
-     $params['cat_id'] = $cat_id;
-     $show_filters = true;
-} else {
-     $cat_id='';
 }
 
@@ -263 +239 @@
      '<label for="user_id">'.__('Author:').
      form::combo('user_id',$users_combo,$user_id).'</label> '.
-     '<label for="cat_id">'.__('Category:').
-     form::combo('cat_id',$categories_combo,$cat_id).'</label> '.
      '<label for="status">'.__('Status:').
      form::combo('status',$status_combo,$status).'</label> '.
@@ -305 +279 @@
      '<input type="submit" value="'.__('ok').'" /></p>'.
      form::hidden(array('user_id'),$user_id).
-     form::hidden(array('cat_id'),$cat_id).
      form::hidden(array('status'),$status).
      form::hidden(array('selected'),$selected).

admin/posts_actions.php

@@ -32 +32 @@
           $redir =
           'posts.php?user_id='.$_POST['user_id'].
-          '&cat_id='.$_POST['cat_id'].
           '&status='.$_POST['status'].
           '&selected='.$_POST['selected'].
@@ -117 +116 @@
           
      }
-     elseif ($action == 'category' && isset($_POST['new_cat_id']))
-     {
-          try
-          {
-               while ($posts->fetch())
-               {
-                    $new_cat_id = (integer) $_POST['new_cat_id'];
-                    $core->blog->updPostCategory($posts->post_id,$new_cat_id);
-               }
-               http::redirect($redir);
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
      elseif ($action == 'author' && isset($_POST['new_auth_id'])
      && $core->auth->check('admin',$core->blog->id))
@@ -187 +170 @@
      $hidden_fields .=
      form::hidden(array('user_id'),$_POST['user_id']).
-     form::hidden(array('cat_id'),$_POST['cat_id']).
      form::hidden(array('status'),$_POST['status']).
      form::hidden(array('selected'),$_POST['selected']).
@@ -205 +187 @@
 $core->callBehavior('adminPostsActionsContent',$core,$action,$hidden_fields);
 
-if ($action == 'category')
-{
-     echo '<h2 class="page-title">'.__('Change category for entries').'</h2>';
-     
-     # categories list
-     # Getting categories
-     $categories_combo = array('&nbsp;' => '');
-     try {
-          $categories = $core->blog->getCategories(array('post_type'=>'post'));
-          while ($categories->fetch()) {
-               $categories_combo[] = new formSelectOption(
-                    str_repeat('&nbsp;&nbsp;',$categories->level-1).
-                    ($categories->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($categories->cat_title),
-                    $categories->cat_id
-               );
-          }
-     } catch (Exception $e) { }
-     
-     echo
-     '<form action="posts_actions.php" method="post">'.
-     '<p><label for="new_cat_id" class="classic">'.__('Category:').' '.
-     form::combo('new_cat_id',$categories_combo,'').
-     '</label> ';
-     
-     echo
-     $hidden_fields.
-     $core->formNonce().
-     form::hidden(array('action'),'category').
-     '<input type="submit" value="'.__('Save').'" /></p>'.
-     '</form>';
-}
-elseif ($action == 'author' && $core->auth->check('admin',$core->blog->id))
+if ($action == 'author' && $core->auth->check('admin',$core->blog->id))
 {
      echo '<h2 class="page-title">'.__('Change author for entries').'</h2>';

admin/search.php

@@ -81 +81 @@
                $combo_action[__('mark as pending')] = 'pending';
           }
-          $combo_action[__('change category')] = 'category';
-          if ($core->auth->check('admin',$core->blog->id)) {
-               $combo_action[__('change author')] = 'author';
-          }
           if ($core->auth->check('delete,contentadmin',$core->blog->id))
           {

inc/admin/lib.dc.page.php

@@ -414 +414 @@
           self::jsVar('dotclear.msg.confirm_delete_user',
                __('Are you sure you want to delete selected users (%s)?')).
-          self::jsVar('dotclear.msg.confirm_delete_category',
-               __('Are you sure you want to delete category "%s"?')).
-          self::jsVar('dotclear.msg.confirm_reorder_categories',
-               __('Are you sure you want to reorder all categories?')).
           self::jsVar('dotclear.msg.confirm_delete_media',
                __('Are you sure you want to remove media "%s"?')).

inc/admin/lib.pager.php

@@ -47 +47 @@
                '<th colspan="2">'.__('Title').'</th>'.
                '<th>'.__('Date').'</th>'.
-               '<th>'.__('Category').'</th>'.
                '<th>'.__('Author').'</th>'.
                '<th>'.__('Status').'</th>'.
@@ -75 +74 @@
      private function postLine()
      {
-          if ($this->core->auth->check('categories',$this->core->blog->id)) {
-               $cat_link = '<a href="category.php?id=%s">%s</a>';
-          } else {
-               $cat_link = '%2$s';
-          }
-          
-          if ($this->rs->cat_title) {
-               $cat_title = sprintf($cat_link,$this->rs->cat_id,
-               html::escapeHTML($this->rs->cat_title));
-          } else {
-               $cat_title = __('None');
-          }
-          
           $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
           switch ($this->rs->post_status) {
@@ -130 +116 @@
           html::escapeHTML($this->rs->post_title).'</a></td>'.
           '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
-          '<td class="nowrap">'.$cat_title.'</td>'.
           '<td class="nowrap">'.$this->rs->user_id.'</td>'.
           '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.

inc/admin/prepend.php

@@ -238 +238 @@
           'images/menu/search.png','images/menu/search-b.png',
           'usage,contentadmin',null,null));
-     $_fav['categories'] = new ArrayObject(array('categories','Categories','categories.php',
-          'images/menu/categories.png','images/menu/categories-b.png',
-          'categories',null,null));
      $_fav['media'] = new ArrayObject(array('media','Media manager','media.php',
           'images/menu/media.png','images/menu/media-b.png',
@@ -302 +299 @@
           preg_match('/media(_item)?.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->check('media,media_admin',$core->blog->id));
-     $_menu['Blog']->prependItem(__('Categories'),'categories.php','images/menu/categories.png',
-          preg_match('/categories.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
-          $core->auth->check('categories',$core->blog->id));
      $_menu['Blog']->prependItem(__('Search'),'search.php','images/menu/search.png',
           preg_match('/search.php(\?.*)?$/',$_SERVER['REQUEST_URI']),

inc/core/class.dc.auth.php

@@ -76 +76 @@
                'delete' => __('delete entries and comments'),
                'contentadmin' => __('manage all entries and comments'),
-               'categories' => __('manage categories'),
                'media' => __('manage their own media items'),
                'media_admin' => __('manage all media items')

inc/core/class.dc.blog.php

@@ -56 +56 @@
      private $post_status = array();
      
-     private $categories;
-     
      /** @var boolean Disallow entries password protection */
      public $without_password = true;
@@ -169 +167 @@
           $this->core->callBehavior('coreBlogAfterTriggerBlog',$cur);
      }
-          
-     /// @name Categories management methods
-     //@{
-     public function categories()
-     {
-          if (!($this->categories instanceof dcCategories)) {
-               $this->categories = new dcCategories($this->core);
-          }
-          
-          return $this->categories;
-     }
-     
-     /**
-     Retrieves categories. <var>$params</var> is an associative array which can
-     take the following parameters:
-     
-     - post_type: Get only entries with given type (default "post")
-     - cat_url: filter on cat_url field
-     - cat_id: filter on cat_id field
-     - start: start with a given category
-     - level: categories level to retrieve
-     
-     @param    params    <b>array</b>        Parameters
-     @return   <b>record</b>
-     */
-     public function getCategories($params=array())
-     {
-          $c_params = array();
-          if (isset($params['post_type'])) {
-               $c_params['post_type'] = $params['post_type'];
-               unset($params['post_type']);
-          }
-          $counter = $this->getCategoriesCounter($c_params);
-          
-          $without_empty = $this->core->auth->userID() == false; # For public display
-          
-          $start = isset($params['start']) ? (integer) $params['start'] : 0;
-          $l = isset($params['level']) ? (integer) $params['level'] : 0;
-          
-          $rs = $this->categories()->getChildren($start,null,'desc');
-          
-          # Get each categories total posts count
-          $data = array();
-          $stack = array();
-          $level = 0;
-          $cols = $rs->columns();
-          while ($rs->fetch())
-          {
-               $nb_post = isset($counter[$rs->cat_id]) ? (integer) $counter[$rs->cat_id] : 0;
-               
-               if ($rs->level > $level) {
-                    $nb_total = $nb_post;
-                    $stack[$rs->level] = (integer) $nb_post;
-               } elseif ($rs->level == $level) {
-                    $nb_total = $nb_post;
-                    $stack[$rs->level] += $nb_post;
-               } else {
-                    $nb_total = $stack[$rs->level+1] + $nb_post;
-                    if (isset($stack[$rs->level])) {
-                         $stack[$rs->level] += $nb_total;
-                    } else {
-                         $stack[$rs->level] = $nb_total;
-                    }
-                    unset($stack[$rs->level+1]);
-               }
-               
-               if ($nb_total == 0 && $without_empty) {
-                    continue;
-               }
-               
-               $level = $rs->level;
-               
-               $t = array();
-               foreach ($cols as $c) {
-                    $t[$c] = $rs->f($c);
-               }
-               $t['nb_post'] = $nb_post;
-               $t['nb_total'] = $nb_total;
-               
-               if ($l == 0 || ($l > 0 && $l == $rs->level)) {
-                    array_unshift($data,$t);
-               }
-          }
-          
-          # We need to apply filter after counting
-          if (isset($params['cat_id']) && $params['cat_id'] !== '')
-          {
-               $found = false;
-               foreach ($data as $v) {
-                    if ($v['cat_id'] == $params['cat_id']) {
-                         $found = true;
-                         $data = array($v);
-                         break;
-                    }
-               }
-               if (!$found) {
-                    $data = array();
-               }
-          }
-          
-          if (isset($params['cat_url']) && ($params['cat_url'] !== '') 
-               && !isset($params['cat_id']))
-          {
-               $found = false;
-               foreach ($data as $v) {
-                    if ($v['cat_url'] == $params['cat_url']) {
-                         $found = true;
-                         $data = array($v);
-                         break;
-                    }
-               }
-               if (!$found) {
-                    $data = array();
-               }
-          }
-          
-          return staticRecord::newFromArray($data);
-     }
-     
-     /**
-     Retrieves a category by its ID.
-     
-     @param    id        <b>integer</b>      Category ID
-     @return   <b>record</b>
-     */
-     public function getCategory($id)
-     {
-          return $this->getCategories(array('cat_id' => $id));
-     }
-     
-     /**
-     Retrieves parents of a given category.
-     
-     @param    id        <b>integer</b>      Category ID
-     @return   <b>record</b>
-     */
-     public function getCategoryParents($id)
-     {
-          return $this->categories()->getParents($id);
-     }
-     
-     /**
-     Retrieves first parent of a given category.
-     
-     @param    id        <b>integer</b>      Category ID
-     @return   <b>record</b>
-     */
-     public function getCategoryParent($id)
-     {
-          return $this->categories()->getParent($id);
-     }
-     
-     /**
-     Retrieves all category's first children
-     
-     @param    id        <b>integer</b>      Category ID
-     @return   <b>record</b>
-     */
-     public function getCategoryFirstChildren($id)
-     {
-          return $this->getCategories(array('start' => $id,'level' => $id == 0 ? 1 : 2));
-     }
-     
-     private function getCategoriesCounter($params=array())
-     {
-          $strReq =
-          'SELECT  C.cat_id, COUNT(P.post_id) AS nb_post '.
-          'FROM '.$this->prefix.'category AS C '.
-          'JOIN '.$this->prefix."post P ON (C.cat_id = P.cat_id AND P.blog_id = '".$this->con->escape($this->id)."' ) ".
-          "WHERE C.blog_id = '".$this->con->escape($this->id)."' ";
-          
-          if (!$this->core->auth->userID()) {
-               $strReq .= 'AND P.post_status = 1 ';
-          }
-          
-          if (!empty($params['post_type'])) {
-               $strReq .= 'AND P.post_type '.$this->con->in($params['post_type']);
-          }
-          
-          $strReq .= 'GROUP BY C.cat_id ';
-          
-          $rs = $this->con->select($strReq);
-          $counters = array();
-          while ($rs->fetch()) {
-               $counters[$rs->cat_id] = $rs->nb_post;
-          }
-          
-          return $counters;
-     }
-     
-     /**
-     Creates a new category. Takes a cursor as input and returns the new category
-     ID.
-     
-     @param    cur       <b>cursor</b>       Category cursor
-     @return   <b>integer</b>      New category ID
-     */
-     public function addCategory($cur,$parent=0)
-     {
-          if (!$this->core->auth->check('categories',$this->id)) {
-               throw new Exception(__('You are not allowed to add categories'));
-          }
-          
-          $url = array();
-          if ($parent != 0)
-          {
-               $rs = $this->getCategory($parent);
-               if ($rs->isEmpty()) {
-                    $url = array();
-               } else {
-                    $url[] = $rs->cat_url;
-               }
-          }
-          
-          if ($cur->cat_url == '') {
-               $url[] = text::tidyURL($cur->cat_title,false);
-          } else {
-               $url[] = $cur->cat_url;
-          }
-          
-          $cur->cat_url = implode('/',$url);
-          
-          $this->getCategoryCursor($cur);
-          $cur->blog_id = (string) $this->id;
-          
-          # --BEHAVIOR-- coreBeforeCategoryCreate
-          $this->core->callBehavior('coreBeforeCategoryCreate',$this,$cur);
-          
-          $this->categories()->addNode($cur,$parent);
-          
-          # --BEHAVIOR-- coreAfterCategoryCreate
-          $this->core->callBehavior('coreAfterCategoryCreate',$this,$cur);
-          $this->triggerBlog();
-          
-          return $cur->cat_id;
-     }
-     
-     /**
-     Updates an existing category.
-     
-     @param    id        <b>integer</b>      Category ID
-     @param    cur       <b>cursor</b>       Category cursor
-     */
-     public function updCategory($id,$cur)
-     {
-          if (!$this->core->auth->check('categories',$this->id)) {
-               throw new Exception(__('You are not allowed to update categories'));
-          }
-          
-          if ($cur->cat_url == '')
-          {
-               $url = array();
-               $rs = $this->categories()->getParents($id);
-               while ($rs->fetch()) {
-                    if ($rs->index() == $rs->count()-1) {
-                         $url[] = $rs->cat_url;
-                    }
-               }
-               
-               
-               $url[] = text::tidyURL($cur->cat_title,false);
-               $cur->cat_url = implode('/',$url);
-          }
-          
-          $this->getCategoryCursor($cur,$id);
-          
-          # --BEHAVIOR-- coreBeforeCategoryUpdate
-          $this->core->callBehavior('coreBeforeCategoryUpdate',$this,$cur);
-          
-          $cur->update(
-          'WHERE cat_id = '.(integer) $id.' '.
-          "AND blog_id = '".$this->con->escape($this->id)."' ");
-          
-          # --BEHAVIOR-- coreAfterCategoryUpdate
-          $this->core->callBehavior('coreAfterCategoryUpdate',$this,$cur);
-          
-          $this->triggerBlog();
-     }
-     
-     /**
-     DEPRECATED METHOD. Use dcBlog::setCategoryParent and dcBlog::moveCategory
-     instead.
-     
-     @param    id        <b>integer</b>      Category ID
-     @param    order     <b>integer</b>      Category position
-     */
-     public function updCategoryOrder($id,$order)
-     {
-          return;
-     }
-     
-     /**
-     Set a category parent
-     
-     @param    id        <b>integer</b>      Category ID
-     @param    parent    <b>integer</b>      Parent Category ID
-     */
-     public function setCategoryParent($id,$parent)
-     {
-          $this->categories()->setNodeParent($id,$parent);
-          $this->triggerBlog();
-     }
-     
-     /**
-     Set category position
-     
-     @param    id        <b>integer</b>      Category ID
-     @param    sibling   <b>integer</b>      Sibling Category ID
-     @param    move      <b>integer</b>      Order (before|after)
-     */
-     public function setCategoryPosition($id,$sibling,$move)
-     {
-          $this->categories()->setNodePosition($id,$sibling,$move);
-          $this->triggerBlog();
-     }
-     
-     /**
-     Deletes a category.
-     
-     @param    id        <b>integer</b>      Category ID
-     */
-     public function delCategory($id)
-     {
-          if (!$this->core->auth->check('categories',$this->id)) {
-               throw new Exception(__('You are not allowed to delete categories'));
-          }
-          
-          $strReq = 'SELECT COUNT(post_id) AS nb_post '.
-                    'FROM '.$this->prefix.'post '.
-                    'WHERE cat_id = '.(integer) $id.' '.
-                    "AND blog_id = '".$this->con->escape($this->id)."' ";
-          
-          $rs = $this->con->select($strReq);
-          
-          if ($rs->nb_post > 0) {
-               throw new Exception(__('This category is not empty.'));
-          }
-          
-          $this->categories()->deleteNode($id,true);
-          $this->triggerBlog();
-     }
-     
-     /**
-     Reset categories order and relocate them to first level
-     */
-     public function resetCategoriesOrder()
-     {
-          if (!$this->core->auth->check('categories',$this->id)) {
-               throw new Exception(__('You are not allowed to reset categories order'));
-          }
-          
-          $this->categories()->resetOrder();
-          $this->triggerBlog();
-     }
-     
-     private function checkCategory($title,$url,$id=null)
-     {
-          $strReq = 'SELECT cat_id '.
-                    'FROM '.$this->prefix.'category '.
-                    "WHERE cat_url = '".$this->con->escape($url)."' ".
-                    "AND blog_id = '".$this->con->escape($this->id)."' ";
-          
-          if ($id !== null) {
-               $strReq .= 'AND cat_id <> '.(integer) $id.' ';
-          }
-          
-          $rs = $this->con->select($strReq);
-          
-          if (!$rs->isEmpty()) {
-               throw new Exception(__('Category URL must be unique.'));
-          }
-     }
-     
-     private function getCategoryCursor($cur,$id=null)
-     {
-          if ($cur->cat_title == '') {
-               throw new Exception(__('You must provide a category title'));
-          }
-          
-          # If we don't have any cat_url, let's do one
-          if ($cur->cat_url == '') {
-               $cur->cat_url = text::tidyURL($cur->cat_title,false);
-          }
-          
-          # Still empty ?
-          if ($cur->cat_url == '') {
-               throw new Exception(__('You must provide a category URL'));
-          } else {
-               $cur->cat_url = text::tidyURL($cur->cat_url,true);
-          }
-          
-          # Check if title or url are unique
-          $this->checkCategory($cur->cat_title,$cur->cat_url,$id);
-          
-          if ($cur->cat_desc !== null) {
-               $cur->cat_desc = $this->core->HTMLfilter($cur->cat_desc);
-          }
-     }
-     //@}
      
      /// @name Entries management methods
@@ -580 +179 @@
      - post_url: Get entry with given post_url field
      - user_id: (integer) Get entries belonging to given user ID
-     - cat_id: (string or array) Get entries belonging to given category ID
-     - cat_id_not: deprecated (use cat_id with "id ?not" instead)
-     - cat_url: (string or array) Get entries belonging to given category URL
-     - cat_url_not: deprecated (use cat_url with "url ?not" instead)
      - post_status: (integer) Get entries with given post_status
      - post_selected: (boolean) Get select flaged entries
@@ -598 +193 @@
      - sql_only : return the sql request instead of results. Only ids are selected
      
-     Please note that on every cat_id or cat_url, you can add ?not to exclude
-     the category and ?sub to get subcategories.
-     
      @param    params         <b>array</b>        Parameters
      @param    count_only     <b>boolean</b>      Only counts results
@@ -634 +226 @@
                
                $strReq =
-               'SELECT P.post_id, P.blog_id, P.user_id, P.cat_id, post_dt, '.
+               'SELECT P.post_id, P.blog_id, P.user_id, post_dt, '.
                'post_tz, post_creadt, post_upddt, post_format, post_password, '.
                'post_url, post_lang, post_title, '.$content_req.
                'post_type, post_meta, post_status, post_selected, post_position, '.
                'U.user_name, U.user_firstname, U.user_displayname, U.user_email, '.
-               'U.user_url, '.
-               'C.cat_title, C.cat_url, C.cat_desc ';
+               'U.user_url ';
           }
           
           $strReq .=
           'FROM '.$this->prefix.'post P '.
-          'INNER JOIN '.$this->prefix.'user U ON U.user_id = P.user_id '.
-          'LEFT OUTER JOIN '.$this->prefix.'category C ON P.cat_id = C.cat_id ';
+          'INNER JOIN '.$this->prefix.'user U ON U.user_id = P.user_id ';
           
           if (!empty($params['from'])) {
@@ -697 +287 @@
           if (!empty($params['user_id'])) {
                $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
-          }
-          
-          if (isset($params['cat_id']) && $params['cat_id'] !== '')
-          {
-               if (!is_array($params['cat_id'])) {
-                    $params['cat_id'] = array($params['cat_id']);
-               }
-               if (!empty($params['cat_id_not'])) {
-                    array_walk($params['cat_id'],create_function('&$v,$k','$v=$v." ?not";'));
-               }
-               $strReq .= 'AND '.$this->getPostsCategoryFilter($params['cat_id'],'cat_id').' ';
-          }
-          elseif (isset($params['cat_url']) && $params['cat_url'] !== '')
-          {
-               if (!is_array($params['cat_url'])) {
-                    $params['cat_url'] = array($params['cat_url']);
-               }
-               if (!empty($params['cat_url_not'])) {
-                    array_walk($params['cat_url'],create_function('&$v,$k','$v=$v." ?not";'));
-               }
-               $strReq .= 'AND '.$this->getPostsCategoryFilter($params['cat_url'],'cat_url').' ';
           }
           
@@ -808 +377 @@
      @param    post_id                  <b>integer</b>      Post ID
      @param    dir                      <b>integer</b>      Search direction
-     @param    restrict_to_category     <b>boolean</b>      Restrict to post with same category
      @param    restrict_to_lang         <b>boolean</b>      Restrict to post with same lang
      @return   record
      */
-     public function getNextPost($post,$dir,$restrict_to_category=false, $restrict_to_lang=false)
+     public function getNextPost($post, $dir, $restrict_to_lang=false)
      {
           $dt = $post->post_dt;
@@ -835 +403 @@
           ') ';
           
-          if ($restrict_to_category) {
-               $params['sql'] .= $post->cat_id ? 'AND P.cat_id = '.(integer) $post->cat_id.' ' : 'AND P.cat_id IS NULL ';
-          }
-          
           if ($restrict_to_lang) {
                $params['sql'] .= $post->post_lang ? 'AND P.post_lang = \''. $this->con->escape($post->post_lang) .'\' ': 'AND P.post_lang IS NULL ';
@@ -918 +482 @@
      - month: (integer) Get dates for given month
      - day: (integer) Get dates for given day
-     - cat_id: (integer) Category ID filter
-     - cat_url: Category URL filter
      - post_lang: lang of the posts
      - next: Get date following match
@@ -946 +508 @@
           $cat_field = $catReq = $limit = '';
           
-          if (isset($params['cat_id']) && $params['cat_id'] !== '') {
-               $catReq = 'AND P.cat_id = '.(integer) $params['cat_id'].' ';
-               $cat_field = ', C.cat_url ';
-          } elseif (isset($params['cat_url']) && $params['cat_url'] !== '') {
-               $catReq = "AND C.cat_url = '".$this->con->escape($params['cat_url'])."' ";
-               $cat_field = ', C.cat_url ';
-          }
           if (!empty($params['post_lang'])) {
                $catReq = 'AND P.post_lang = \''. $params['post_lang'].'\' ';
@@ -958 +513 @@
           
           $strReq = 'SELECT DISTINCT('.$this->con->dateFormat('post_dt',$dt_f).') AS dt '.
-                    $cat_field.
                     ',COUNT(P.post_id) AS nb_post '.
-                    'FROM '.$this->prefix.'post P LEFT JOIN '.$this->prefix.'category C '.
-                    'ON P.cat_id = C.cat_id '.
+                    'FROM '.$this->prefix.'post P '.
                     "WHERE P.blog_id = '".$this->con->escape($this->id)."' ".
                     $catReq;
@@ -1017 +570 @@
           }
           
-          $strReq .= 'GROUP BY dt '.$cat_field;
-          
           $order = 'desc';
           if (!empty($params['order']) && preg_match('/^(desc|asc)$/i',$params['order'])) {
@@ -1196 +747 @@
      public function updPostSelected($id,$selected)
      {
-          if (!$this->core->auth->check('usage,contentadmin',$this->id)) {
-               throw new Exception(__('You are not allowed to change this entry category'));
-          }
-          
           $id = (integer) $id;
           $selected = (boolean) $selected;
@@ -1222 +769 @@
           
           $cur->post_selected = (integer) $selected;
-          $cur->post_upddt = date('Y-m-d H:i:s');
-          
-          $cur->update(
-               'WHERE post_id = '.$id.' '.
-               "AND blog_id = '".$this->con->escape($this->id)."' "
-          );
-          $this->triggerBlog();
-     }
-     
-     /**
-     Updates post category. <var>$cat_id</var> can be null.
-     
-     @param    id        <b>integer</b>      Post ID
-     @param    cat_id    <b>integer</b>      Category ID
-     */
-     public function updPostCategory($id,$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;
-          $cat_id = (integer) $cat_id;
-          
-          # 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'));
-               }
-          }
-          
-          $cur = $this->con->openCursor($this->prefix.'post');
-          
-          $cur->cat_id = ($cat_id ? $cat_id : null);
           $cur->post_upddt = date('Y-m-d H:i:s');
           
@@ -1390 +894 @@
      }
      
-     private function getPostsCategoryFilter($arr,$field='cat_id')
-     {
-          $field = $field == 'cat_id' ? 'cat_id' : 'cat_url';
-          
-          $sub = array();
-          $not = array();
-          $queries = array();
-          
-          foreach ($arr as $v)
-          {
-               $v = trim($v);
-               $args = preg_split('/\s*[?]\s*/',$v,-1,PREG_SPLIT_NO_EMPTY);
-               $id = array_shift($args);
-               $args = array_flip($args);
-               
-               if (isset($args['not'])) { $not[$id] = 1; }
-               if (isset($args['sub'])) { $sub[$id] = 1; }
-               if ($field == 'cat_id') {
-                    if (preg_match('/^null$/i',$id)) {
-                         $queries[$id] = 'P.cat_id IS NULL';
-                    }
-                    else {
-                         $queries[$id] = 'P.cat_id = '.(integer) $id;
-                    }
-               } else {
-                    $queries[$id] = "C.cat_url = '".$this->con->escape($id)."' ";
-               }
-          }
-          
-          if (!empty($sub)) {
-               $rs = $this->con->select(
-                    'SELECT cat_id, cat_url, cat_lft, cat_rgt FROM '.$this->prefix.'category '.
-                    "WHERE blog_id = '".$this->con->escape($this->id)."' ".
-                    'AND '.$field.' '.$this->con->in(array_keys($sub))
-               );
-               
-               while ($rs->fetch()) {
-                    $queries[$rs->f($field)] = '(C.cat_lft BETWEEN '.$rs->cat_lft.' AND '.$rs->cat_rgt.')';
-               }
-          }
-          
-          # Create queries
-          $sql = array(
-               0 => array(), # wanted categories
-               1 => array()  # excluded categories
-          );
-          
-          foreach ($queries as $id => $q) {
-               $sql[(integer) isset($not[$id])][] = $q;
-          }
-          
-          $sql[0] = implode(' OR ',$sql[0]);
-          $sql[1] = implode(' OR ',$sql[1]);
-          
-          if ($sql[0]) {
-               $sql[0] = '('.$sql[0].')';
-          } else {
-               unset($sql[0]);
-          }
-          
-          if ($sql[1]) {
-               $sql[1] = '(P.cat_id IS NULL OR NOT('.$sql[1].'))';
-          } else {
-               unset($sql[1]);
-          }
-          
-          return implode(' AND ',$sql);
-     }
-     
      private function getPostCursor($cur,$post_id=null)
      {

inc/core/class.dc.rs.extensions.php

@@ -130 +130 @@
      
      /**
-     Returns full post category URL.
-     
-     @param    rs   Invisible parameter
-     @return   <b>string</b>
-     */
-     public static function getCategoryURL($rs)
-     {
-          return $rs->core->blog->url.$rs->core->url->getURLFor('category',html::sanitizeURL($rs->cat_url));
-     }
-     
-     /**
      Returns whether post has an excerpt.
      

inc/core/class.dc.xmlrpc.php

@@ -75 +75 @@
                'List of most recent posts in the system');
           
-          $this->addCallback('metaWeblog.getCategories',array($this,'mw_getCategories'),
-               array('array','string','string','string'),
-               'List of all categories defined in the weblog');
-          
           $this->addCallback('metaWeblog.newMediaObject',array($this,'mw_newMediaObject'),
                array('struct','string','string','string','struct'),
@@ -88 +84 @@
                'List of most recent posts in the system');
           
-          $this->addCallback('mt.getCategoryList',array($this,'mt_getCategoryList'),
-               array('array','string','string','string'),
-               'List of all categories defined in the weblog');
-          
-          $this->addCallback('mt.getPostCategories',array($this,'mt_getPostCategories'),
-               array('array','string','string','string'),
-               'List of all categories to which the post is assigned');
-          
-          $this->addCallback('mt.setPostCategories',array($this,'mt_setPostCategories'),
-               array('boolean','string','string','string','array'),
-               'Sets the categories for a post');
-          
           $this->addCallback('mt.publishPost',array($this,'mt_publishPost'),
                array('boolean','string','string','string'),
@@ -143 +127 @@
                'Get an array of users for the blog.');
           
-          $this->addCallback('wp.getCategories',array($this,'wp_getCategories'),
-               array('array','integer','string','string'),
-               'Get an array of available categories on a blog.');
-          
           $this->addCallback('wp.getTags',array($this,'wp_getTags'),
                array('array','integer','string','string'),
                'Get list of all tags for the blog.');
-          
-          $this->addCallback('wp.newCategory',array($this,'wp_newCategory'),
-               array('integer','integer','string','string','struct'),
-               'Create a new category.');
-          
-          $this->addCallback('wp.deleteCategory',array($this,'wp_deleteCategory'),
-               array('boolean','integer','string','string','integer'),
-               'Delete a category with a given ID.');
-          
-          $this->addCallback('wp.suggestCategories',array($this,'wp_suggestCategories'),
-               array('array','integer','string','string','string','integer'),
-               'Get an array of categories that start with a given string.');
           
           $this->addCallback('wp.uploadFile',array($this,'wp_uploadFile'),
@@ -288 +256 @@
           
           return $rs;
-     }
-     
-     private function getCatID($cat_url)
-     {
-          $rs = $this->core->blog->getCategories(array('cat_url' => $cat_url));
-          
-          return $rs->isEmpty() ? null : $rs->cat_id;
      }
      
@@ -344 +305 @@
           }
           
-          # Categories in an array
-          if (isset($struct['categories']) && is_array($struct['categories']))
-          {
-               $categories = $struct['categories'];
-               $cat_id = !empty($categories[0]) ? $categories[0] : null;
-               
-               $cur->cat_id = $this->getCatID($cat_id);
-          }
-          
           if (isset($struct['wp_slug'])) {
                $cur->post_url = $struct['wp_slug'];
@@ -448 +400 @@
           }
           
-          # Categories in an array
-          if (isset($struct['categories']) && is_array($struct['categories']))
-          {
-               $categories = $struct['categories'];
-               $cat_id = !empty($categories[0]) ? $categories[0] : null;
-               
-               $cur->cat_id = $this->getCatID($cat_id);
-          }
-          
           if (isset($struct['wp_slug'])) {
                $cur->post_url = $struct['wp_slug'];
@@ -504 +447 @@
           $res['userid'] = $post->user_id;
           $res['postid'] = $post->post_id;
-          
-          if ($post->cat_id) {
-               $res['categories'] = array($post->cat_url);
-          }
           
           if ($type == 'blogger') {
@@ -566 +505 @@
                $tres['userid'] = $posts->user_id;
                $tres['postid'] = $posts->post_id;
-               
-               if ($posts->cat_id) {
-                    $tres['categories'] = array($posts->cat_url);
-               }
                
                if ($type == 'blogger') {
@@ -621 +556 @@
                'url' => $this->core->auth->getInfo('user_url')
           );
-     }
-     
-     private function getCategories($blog_id,$user,$pwd)
-     {
-          $this->setUser($user,$pwd);
-          $this->setBlog();
-          $rs = $this->core->blog->getCategories();
-          
-          $res = array();
-          
-          $l = $rs->level;
-          $stack = array('',$rs->cat_url);
-          
-          while ($rs->fetch())
-          {
-               $d = $rs->level - $l;
-               if ($d == 0) {
-                    array_pop($stack);
-                    $parent = end($stack);
-               } elseif ($d > 0) {
-                    $parent = end($stack);
-               } elseif ($d < 0) {
-                    $D = abs($d);
-                    for ($i=0; $i<=$D; $i++) {
-                         array_pop($stack);
-                    }
-                    $parent = end($stack);
-               }
-               
-               $res[] = array(
-                    'categoryId' => $rs->cat_url,
-                    'parentId' => $parent,
-                    'description' => $rs->cat_title,
-                    'categoryName' => $rs->cat_url,
-                    'htmlUrl' => $this->core->blog->url.
-                         $this->core->url->getURLFor('category',$rs->cat_url),
-                    'rssUrl' => $this->core->blog->url.
-                         $this->core->url->getURLFor('feed','category/'.$rs->cat_url.'/rss2')
-               );
-               
-               $stack[] = $rs->cat_url;
-               $l = $rs->level;
-          }
-          
-          return $res;
-     }
-     
-     private function getPostCategories($post_id,$user,$pwd)
-     {
-          $post_id = (integer) $post_id;
-          
-          $post = $this->getPostRS($post_id,$user,$pwd);
-          
-          return array(
-               array(
-               'categoryName' => $post->cat_url,
-               'categoryId' => (string) $post->cat_url,
-               'isPrimary' => true
-               )
-          );
-     }
-     
-     private function setPostCategories($post_id,$user,$pwd,$categories)
-     {
-          $post_id = (integer) $post_id;
-          
-          $post = $this->getPostRS($post_id,$user,$pwd);
-          
-          $cat_id = (!empty($categories[0]['categoryId'])) ? $categories[0]['categoryId'] : null;
-          
-          foreach($categories as $v)
-          {
-               if (isset($v['isPrimary']) && $v['isPrimary']) {
-                    $cat_id = $v['categoryId'];
-                    break;
-               }
-          }
-          
-          # w.bloggar sends -1 for no category.
-          if ($cat_id == -1) {
-               $cat_id = null;
-          }
-          
-          if ($cat_id) {
-               $cat_id = $this->getCatID($cat_id);
-          }
-          
-          $this->core->blog->updPostCategory($post_id,(integer) $cat_id);
-          
-          return true;
      }
      
@@ -929 +774 @@
                     "link"                   => $posts->getURL(),
                     "permaLink"              => $posts->getURL(),
-                    "categories"             => array(),
                     "excerpt"                => $posts->post_excerpt_xhtml,
                     "text_more"              => '',
@@ -1036 +880 @@
      }
      
-     private function newCategory($user,$pwd,$struct)
-     {
-          $this->setUser($user,$pwd);
-          $this->setBlog();
-          
-          if (empty($struct['name'])) {
-               throw new Exception('You mus give a category name.');
-          }
-          
-          $cur = $this->core->con->openCursor($this->core->prefix.'category');
-          $cur->cat_title = $struct['name'];
-          
-          if (!empty($struct['slug'])) {
-               $cur->cat_url = $struct['slug'];
-          }
-          if (!empty($struct['category_description'])) {
-               $cur->cat_desc = $struct['category_description'];
-               if (html::clean($cur->cat_desc) == $cur->cat_desc) {
-                    $cur->cat_desc = '<p>'.$cur->cat_desc.'</p>';
-               }
-          }
-          
-          $parent = !empty($struct['category_parent']) ? (integer) $struct['category_parent'] : 0;
-          
-          $id = $this->core->blog->addCategory($cur,$parent);
-          $rs = $this->core->blog->getCategory($id);
-          return $rs->cat_url;
-     }
-     
-     private function deleteCategory($user,$pwd,$cat_id)
-     {
-          $this->setUser($user,$pwd);
-          $this->setBlog();
-          
-          $c = $this->core->blog->getCategories(array('cat_url' => $cat_id));
-          if ($c->isEmpty()) {
-               throw new Exception(__('This category does not exist.'));
-          }
-          $cat_id = $c->cat_id;
-          unset($c);
-          
-          $this->core->blog->delCategory((integer) $cat_id);
-          return true;
-     }
-     
-     private function searchCategories($user,$pwd,$category,$limit)
-     {
-          $this->setUser($user,$pwd);
-          $this->setBlog();
-          
-          $strReq = 'SELECT cat_id, cat_title, cat_url '.
-                    'FROM '.$this->core->prefix.'category '.
-                    "WHERE blog_id = '".$this->core->con->escape($this->core->blog->id)."' ".
-                    "AND LOWER(cat_title) LIKE LOWER('%".$this->core->con->escape($category)."%') ".
-                    ($limit > 0 ? $this->core->con->limit($limit) : '');
-          
-          $rs = $this->core->con->select($strReq);
-          
-          $res = array();
-          while ($rs->fetch())
-          {
-               $res[] = array(
-                    'category_id' => $rs->cat_url,
-                    'category_name' => $rs->cat_url
-               );
-          }
-          return $res;
-     }
-     
      /* Blogger methods
      --------------------------------------------------- */
@@ -1165 +940 @@
      }
      
-     public function mw_getCategories($blogid,$username,$password)
-     {
-          return $this->getCategories($blogid,$username,$password);
-     }
-     
      public function mw_newMediaObject($blogid,$username,$password,$file)
      {
@@ -1180 +950 @@
      {
           return $this->getRecentPosts($blogid,$username,$password,$numberOfPosts,'mt');
-     }
-     
-     public function mt_getCategoryList($blogid,$username,$password)
-     {
-          return $this->getCategories($blogid,$username,$password);
-     }
-     
-     public function mt_getPostCategories($postid,$username,$password)
-     {
-          return $this->getPostCategories($postid,$username,$password);
-     }
-     
-     public function mt_setPostCategories($postid,$username,$password,$categories)
-     {
-          return $this->setPostCategories($postid,$username,$password,$categories);
      }
      
@@ -1266 +1021 @@
      }
      
-     public function wp_getCategories($blogid,$username,$password)
-     {
-          return $this->getCategories($blogid,$username,$password);
-     }
-     
      public function wp_getTags($blogid,$username,$password)
      {
           return $this->getTags($username,$password);
-     }
-     
-     public function wp_newCategory($blogid,$username,$password,$content)
-     {
-          return $this->newCategory($username,$password,$content);
-     }
-     
-     public function wp_deleteCategory($blogid,$username,$password,$categoryid)
-     {
-          return $this->deleteCategory($username,$password,$categoryid);
-     }
-     
-     public function wp_suggestCategories($blogid,$username,$password,$category,$max_results=0)
-     {
-          return $this->searchCategories($username,$password,$category,$max_results);
      }
      

inc/dbschema/db-schema.php

@@ -29 +29 @@
      
      ->primary('pk_blog','blog_id')
-     ;
-
-$_s->category
-     ->cat_id       ('bigint',     0,   false)
-     ->blog_id      ('varchar',    32,  false)
-     ->cat_title    ('varchar',    255, false)
-     ->cat_url      ('varchar',    255, false)
-     ->cat_desc     ('text',       0,   true)
-     ->cat_position ('integer',    0,   true,     0)
-     ->cat_lft      ('integer',    0,   true)
-     ->cat_rgt      ('integer',    0,   true)
-     
-     ->primary('pk_category','cat_id')
-     
-     ->unique('uk_cat_url','cat_url','blog_id')
      ;
 
@@ -102 +87 @@
      ->blog_id                ('varchar',    32,  false)
      ->user_id                ('varchar',    32,  false)
-     ->cat_id                 ('bigint',     0,   true)
      ->post_dt                ('timestamp',  0,   false,    'now()')
      ->post_tz                ('varchar',    128, false,    "'UTC'")
@@ -192 +176 @@
 /* References indexes
 -------------------------------------------------------- */
-$_s->category->index     ('idx_category_blog_id',           'btree',  'blog_id');
-$_s->category->index     ('idx_category_cat_lft_blog_id',   'btree',  'blog_id', 'cat_lft');
-$_s->category->index     ('idx_category_cat_rgt_blog_id',   'btree',  'blog_id', 'cat_rgt');
 $_s->setting->index      ('idx_setting_blog_id',            'btree',  'blog_id');
 $_s->user->index         ('idx_user_user_default_blog',     'btree',  'user_default_blog');
 $_s->permissions->index  ('idx_permissions_blog_id',        'btree',  'blog_id');
-$_s->post->index         ('idx_post_cat_id',                'btree',  'cat_id');
 $_s->post->index         ('idx_post_user_id',               'btree',  'user_id');
 $_s->post->index         ('idx_post_blog_id',               'btree',  'blog_id');
@@ -220 +200 @@
 /* Foreign keys
 -------------------------------------------------------- */
-$_s->category->reference('fk_category_blog','blog_id','blog','blog_id','cascade','cascade');
 $_s->setting->reference('fk_setting_blog','blog_id','blog','blog_id','cascade','cascade');
 $_s->user->reference('fk_user_default_blog','user_default_blog','blog','blog_id','cascade','set null');
 $_s->permissions->reference('fk_permissions_blog','blog_id','blog','blog_id','cascade','cascade');
 $_s->permissions->reference('fk_permissions_user','user_id','user','user_id','cascade','cascade');
-$_s->post->reference('fk_post_category','cat_id','category','cat_id','cascade','set null');
 $_s->post->reference('fk_post_user','user_id','user','user_id','cascade','cascade');
 $_s->post->reference('fk_post_blog','blog_id','blog','blog_id','cascade','cascade');

inc/prepend.php

@@ -29 +29 @@
 $__autoload['dcAuth']                   = dirname(__FILE__).'/core/class.dc.auth.php';
 $__autoload['dcBlog']                   = dirname(__FILE__).'/core/class.dc.blog.php';
-$__autoload['dcCategories']             = dirname(__FILE__).'/core/class.dc.categories.php';
 $__autoload['dcError']                  = dirname(__FILE__).'/core/class.dc.error.php';
 $__autoload['dcMeta']                   = dirname(__FILE__).'/core/class.dc.meta.php';
@@ -202 +201 @@
 $core->url->register('post','post','^post/(.+)$',array('dcUrlHandlers','post'));
 $core->url->register('preview','preview','^preview/(.+)$',array('dcUrlHandlers','preview'));
-$core->url->register('category','category','^category/(.+)$',array('dcUrlHandlers','category'));
 $core->url->register('archive','archive','^archive(/.+)?$',array('dcUrlHandlers','archive'));
 

inc/public/class.dc.template.php

@@ -68 +68 @@
           $this->addValue('BlogMetaRobots',array($this,'BlogMetaRobots'));
           
-          # Categories
-          $this->addBlock('Categories',array($this,'Categories'));
-          $this->addBlock('CategoriesHeader',array($this,'CategoriesHeader'));
-          $this->addBlock('CategoriesFooter',array($this,'CategoriesFooter'));
-          $this->addBlock('CategoryIf',array($this,'CategoryIf'));
-          $this->addBlock('CategoryFirstChildren',array($this,'CategoryFirstChildren'));
-          $this->addBlock('CategoryParents',array($this,'CategoryParents'));
-          $this->addValue('CategoryFeedURL',array($this,'CategoryFeedURL'));
-          $this->addValue('CategoryURL',array($this,'CategoryURL'));
-          $this->addValue('CategoryShortURL',array($this,'CategoryShortURL'));
-          $this->addValue('CategoryDescription',array($this,'CategoryDescription'));
-          $this->addValue('CategoryTitle',array($this,'CategoryTitle'));
-          
           # Entries
           $this->addBlock('DateFooter',array($this,'DateFooter'));
@@ -95 +82 @@
           $this->addValue('EntryAuthorURL',array($this,'EntryAuthorURL'));
           $this->addValue('EntryBasename',array($this,'EntryBasename'));
-          $this->addValue('EntryCategory',array($this,'EntryCategory'));
-          $this->addBlock('EntryCategoriesBreadcrumb',array($this,'EntryCategoriesBreadcrumb'));
-          $this->addValue('EntryCategoryID',array($this,'EntryCategoryID'));
-          $this->addValue('EntryCategoryURL',array($this,'EntryCategoryURL'));
-          $this->addValue('EntryCategoryShortURL',array($this,'EntryCategoryShortURL'));
           $this->addValue('EntryContent',array($this,'EntryContent'));
           $this->addValue('EntryDate',array($this,'EntryDate'));
@@ -458 +440 @@
      <!ATTLIST tpl:Archives
      type      (day|month|year)    #IMPLIED  -- Get days, months or years, default to month --
-     category  CDATA               #IMPLIED  -- Get dates of given category --
      no_context (1|0)              #IMPLIED  -- Override context information
      order     (asc|desc)          #IMPLIED  -- Sort asc or desc --
@@ -473 +454 @@
           }
           
-          if (isset($attr['category'])) {
-               $p .= "\$params['cat_url'] = '".addslashes($attr['category'])."';\n";
-          }
-        
           if (isset($attr['post_type'])) {
                $p .= "\$params['post_type'] = '".addslashes($attr['post_type'])."';\n";
@@ -483 +460 @@
           if (isset($attr['post_lang'])) {
                $p .= "\$params['post_lang'] = '".addslashes($attr['post_lang'])."';\n";
-          }
-          
-          if (empty($attr['no_context']) && !isset($attr['category']))
-          {
-               $p .=
-               'if ($_ctx->exists("categories")) { '.
-                    "\$params['cat_id'] = \$_ctx->categories->cat_id; ".
-               "}\n";
           }
           
@@ -851 +820 @@
      }
      
-     /* Categories ----------------------------------------- */
-     
-     /*dtd
-     <!ELEMENT tpl:Categories - - -- Categories loop -->
-     */
-     public function Categories($attr,$content)
-     {
-          $p = "if (!isset(\$params)) \$params = array();\n";
-          
-          if (isset($attr['url'])) {
-               $p .= "\$params['cat_url'] = '".addslashes($attr['url'])."';\n";
-          }
-          
-          if (!empty($attr['post_type'])) {
-               $p .= "\$params['post_type'] = '".addslashes($attr['post_type'])."';\n";
-          }
-          
-          if (!empty($attr['level'])) {
-               $p .= "\$params['level'] = ".(integer) $attr['level'].";\n";
-          }
-          
-          $res = "<?php\n";
-          $res .= $p;
-          $res .= $this->core->callBehavior("templatePrepareParams", 
-               array("tag" => "Categories","method" => "blog::getCategories"), 
-               $attr,$content);
-          $res .= '$_ctx->categories = $core->blog->getCategories($params);'."\n";
-          $res .= "?>\n";
-          $res .= '<?php while ($_ctx->categories->fetch()) : ?>'.$content.'<?php endwhile; $_ctx->categories = null; unset($params); ?>';
-          
-          return $res;
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoriesHeader - - -- First Categories result container -->
-     */
-     public function CategoriesHeader($attr,$content)
-     {
-          return
-          "<?php if (\$_ctx->categories->isStart()) : ?>".
-          $content.
-          "<?php endif; ?>";
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoriesFooter - - -- Last Categories result container -->
-     */
-     public function CategoriesFooter($attr,$content)
-     {
-          return
-          "<?php if (\$_ctx->categories->isEnd()) : ?>".
-          $content.
-          "<?php endif; ?>";
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoryIf - - -- tests on current entry -->
-     <!ATTLIST tpl:CategoryIf
-     url       CDATA     #IMPLIED  -- category has given url
-     has_entries    (0|1)     #IMPLIED  -- post is the first post from list (value : 1) or not (value : 0)
-     has_description     (0|1)     #IMPLIED  -- category has description (value : 1) or not (value : 0) 
-     >
-     */
-     public function CategoryIf($attr,$content)
-     {
-          $if = new ArrayObject();
-          $operator = isset($attr['operator']) ? $this->getOperator($attr['operator']) : '&&';
-          
-          if (isset($attr['url'])) {
-               $url = addslashes(trim($attr['url']));
-               if (substr($url,0,1) == '!') {
-                    $url = substr($url,1);
-                    $if[] = '($_ctx->categories->cat_url != "'.$url.'")';
-               } else {
-                    $if[] = '($_ctx->categories->cat_url == "'.$url.'")';
-               }
-          }
-          
-          if (isset($attr['has_entries'])) {
-               $sign = (boolean) $attr['has_entries'] ? '>' : '==';
-               $if[] = '$_ctx->categories->nb_post '.$sign.' 0';
-          }
-          
-          if (isset($attr['has_description'])) { 
-               $sign = (boolean) $attr['has_description'] ? '!=' : '=='; 
-               $if[] = '$_ctx->categories->cat_desc '.$sign.' ""'; 
-          } 
-          
-          $this->core->callBehavior('tplIfConditions','CategoryIf',$attr,$content,$if);
-          
-          if (count($if) != 0) {
-               return '<?php if('.implode(' '.$operator.' ', (array) $if).') : ?>'.$content.'<?php endif; ?>';
-          } else {
-               return $content;
-          }
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoryFirstChildren - - -- Current category first children loop -->
-     */
-     public function CategoryFirstChildren($attr,$content)
-     {
-          return
-          "<?php\n".
-          '$_ctx->categories = $core->blog->getCategoryFirstChildren($_ctx->categories->cat_id);'."\n".
-          'while ($_ctx->categories->fetch()) : ?>'.$content.'<?php endwhile; $_ctx->categories = null; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoryParents - - -- Current category parents loop -->
-     */
-     public function CategoryParents($attr,$content)
-     {
-          return
-          "<?php\n".
-          '$_ctx->categories = $core->blog->getCategoryParents($_ctx->categories->cat_id);'."\n".
-          'while ($_ctx->categories->fetch()) : ?>'.$content.'<?php endwhile; $_ctx->categories = null; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoryFeedURL - O -- Category feed URL -->
-     <!ATTLIST tpl:CategoryFeedURL
-     type (rss2|atom)    #IMPLIED  -- feed type (default : rss2)
-     >
-     */
-     public function CategoryFeedURL($attr)
-     {
-          $type = !empty($attr['type']) ? $attr['type'] : 'atom';
-          
-          if (!preg_match('#^(rss2|atom)$#',$type)) {
-               $type = 'atom';
-          }
-          
-          $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getURLFor("feed","category/".'.
-          '$_ctx->categories->cat_url."/'.$type.'")').'; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoryURL - O -- Category URL (complete iabsolute URL, including blog URL) -->
-     */
-     public function CategoryURL($attr)
-     {
-          $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getURLFor("category",'.
-               '$_ctx->categories->cat_url)').'; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoryShortURL - O -- Category short URL (relative URL, from /category/) -->
-     */
-     public function CategoryShortURL($attr)
-     {
-          $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->categories->cat_url').'; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoryDescription - O -- Category description -->
-     */
-     public function CategoryDescription($attr)
-     {
-          $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->categories->cat_desc').'; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:CategoryTitle - O -- Category title -->
-     */
-     public function CategoryTitle($attr)
-     {
-          $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->categories->cat_title').'; ?>';
-     }
-     
      /* Entries -------------------------------------------- */
      /*dtd
@@ -1032 +826 @@
      lastn     CDATA     #IMPLIED  -- limit number of results to specified value
      author    CDATA     #IMPLIED  -- get entries for a given user id
-     category  CDATA     #IMPLIED  -- get entries for specific categories only (multiple comma-separated categories can be specified. Use "!" as prefix to exclude a category)
-     no_category    CDATA     #IMPLIED  -- get entries without category
      no_context (1|0)    #IMPLIED  -- Override context information
      sortby    (title|selected|author|date|id)    #IMPLIED  -- specify entries sort criteria (default : date) (multiple comma-separated sortby can be specified. Use "?asc" or "?desc" as suffix to provide an order for each sorby)
@@ -1072 +864 @@
           }
           
-          if (isset($attr['category'])) {
-               $p .= "\$params['cat_url'] = '".addslashes($attr['category'])."';\n";
-               $p .= "context::categoryPostParam(\$params);\n";
-          }
-          
-          if (isset($attr['no_category']) && $attr['no_category']) {
-               $p .= "@\$params['sql'] .= ' AND P.cat_id IS NULL ';\n";
-               $p .= "unset(\$params['cat_url']);\n";
-          }
-          
           if (!empty($attr['type'])) {
                $p .= "\$params['post_type'] = preg_split('/\s*,\s*/','".addslashes($attr['type'])."',-1,PREG_SPLIT_NO_EMPTY);\n";
@@ -1097 +879 @@
                     'if ($_ctx->exists("users")) { '.
                          "\$params['user_id'] = \$_ctx->users->user_id; ".
-                    "}\n";
-               }
-               
-               if (!isset($attr['category']) && (!isset($attr['no_category']) || !$attr['no_category']))
-               {
-                    $p .=
-                    'if ($_ctx->exists("categories")) { '.
-                         "\$params['cat_id'] = \$_ctx->categories->cat_id; ".
                     "}\n";
                }
@@ -1185 +959 @@
      <!ATTLIST tpl:EntryIf
      type CDATA     #IMPLIED  -- post has a given type (default: "post")
-     category  CDATA     #IMPLIED  -- post has a given category
      first     (0|1)     #IMPLIED  -- post is the first post from list (value : 1) or not (value : 0)
      odd  (0|1)     #IMPLIED  -- post is in an odd position (value : 1) or not (value : 0)
@@ -1191 +964 @@
      extended  (0|1)     #IMPLIED  -- post has an excerpt (value : 1) or not (value : 0)
      selected  (0|1)     #IMPLIED  -- post is selected (value : 1) or not (value : 0)
-     has_category   (0|1)     #IMPLIED  -- post has a category (value : 1) or not (value : 0)
      has_attachment (0|1)     #IMPLIED  -- post has attachments (value : 1) or not (value : 0) (see Attachment plugin for code)
      operator  (and|or)  #IMPLIED  -- combination of conditions, if more than 1 specifiec (default: and)
@@ -1201 +973 @@
           $if = new ArrayObject();
           $extended = null;
-          $hascategory = null;
           
           $operator = isset($attr['operator']) ? $this->getOperator($attr['operator']) : '&&';
@@ -1221 +992 @@
           }
           
-          if (isset($attr['category'])) {
-               $category = addslashes(trim($attr['category']));
-               if (substr($category,0,1) == '!') {
-                    $category = substr($category,1);
-                    $if[] = '($_ctx->posts->cat_url != "'.$category.'")';
-               } else {
-                    $if[] = '($_ctx->posts->cat_url == "'.$category.'")';
-               }
-          }
-          
           if (isset($attr['first'])) {
                $sign = (boolean) $attr['first'] ? '=' : '!';
@@ -1249 +1010 @@
                $sign = (boolean) $attr['selected'] ? '' : '!';
                $if[] = $sign.'(boolean)$_ctx->posts->post_selected';
-          }
-          
-          if (isset($attr['has_category'])) {
-               $sign = (boolean) $attr['has_category'] ? '' : '!';
-               $if[] = $sign.'$_ctx->posts->cat_id';
           }
           
@@ -1430 +1186 @@
      
      /*dtd
-     <!ELEMENT tpl:EntryCategory - O -- Entry category (full name) -->
-     */
-     public function EntryCategory($attr)
-     {
-          $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->posts->cat_title').'; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:EntryCategoriesBreadcrumb - - -- Current entry parents loop (without last one) -->
-     */
-     public function EntryCategoriesBreadcrumb($attr,$content)
-     {
-          return
-          "<?php\n".
-          '$_ctx->categories = $core->blog->getCategoryParents($_ctx->posts->cat_id);'."\n".
-          'while ($_ctx->categories->fetch()) : ?>'.$content.'<?php endwhile; $_ctx->categories = null; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:EntryCategoryID - O -- Entry category ID -->
-     */
-     public function EntryCategoryID($attr)
-     {
-          $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->posts->cat_id').'; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:EntryCategoryURL - O -- Entry category URL -->
-     */
-     public function EntryCategoryURL($attr)
-     {
-          $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->posts->getCategoryURL()').'; ?>';
-     }
-     
-     /*dtd
-     <!ELEMENT tpl:EntryCategoryShortURL - O -- Entry category short URL (relative URL, from /category/) -->
-     */
-     public function EntryCategoryShortURL($attr)
-     {
-          $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->posts->cat_url').'; ?>';
-     }
-     
-     
-     /*dtd
      <!ELEMENT tpl:EntryFeedID - O -- Entry feed ID -->
      */
@@ -1491 +1199 @@
      size           (sq|t|s|m|o)   #IMPLIED  -- Image size to extract
      class          CDATA          #IMPLIED  -- Class to add on image tag
-     with_category  (1|0)          #IMPLIED  -- Search in entry category description if present (default 0)
      >
      */
@@ -1500 +1207 @@
           $with_category = !empty($attr['with_category']) ? 'true' : 'false';
           
-          return "<?php echo context::EntryFirstImageHelper('".addslashes($size)."',".$with_category.",'".addslashes($class)."'); ?>";
+          return "<?php echo context::EntryFirstImageHelper('".addslashes($size)."','".addslashes($class)."'); ?>";
      }
      
@@ -1529 +1236 @@
      <!ELEMENT tpl:EntryNext - - -- Next entry block -->
      <!ATTLIST tpl:EntryNext
-     restrict_to_category     (0|1)     #IMPLIED  -- find next post in the same category (default: 0)
      restrict_to_lang         (0|1)     #IMPLIED  -- find next post in the same language (default: 0)
      >
@@ -1877 +1583 @@
      <!ELEMENT tpl:SysIf - - -- System settings tester container -->
      <!ATTLIST tpl:SysIf
-     categories          (0|1)     #IMPLIED  -- test if categories are set in current context (value : 1) or not (value : 0)
      posts               (0|1)     #IMPLIED  -- test if posts are set in current context (value : 1) or not (value : 0)
      blog_lang           CDATA     #IMPLIED  -- tests if blog language is the one given in parameter
@@ -1894 +1599 @@
           
           $operator = isset($attr['operator']) ? $this->getOperator($attr['operator']) : '&&';
-          
-          if (isset($attr['categories'])) {
-               $sign = (boolean) $attr['categories'] ? '!' : '=';
-               $if[] = '$_ctx->categories '.$sign.'== null';
-          }
           
           if (isset($attr['posts'])) {

inc/public/lib.tpl.context.php

@@ -162 +162 @@
      }
      
-     public static function categoryPostParam(&$p)
-     {
-          $not = substr($p['cat_url'],0,1) == '!';
-          if ($not) {
-               $p['cat_url'] = substr($p['cat_url'],1);
-          }
-          
-          $p['cat_url'] = preg_split('/\s*,\s*/',$p['cat_url'],-1,PREG_SPLIT_NO_EMPTY);
-          
-          foreach ($p['cat_url'] as &$v)
-          {
-               if ($not) {
-                    $v .= ' ?not';
-               }
-               if ($GLOBALS['_ctx']->exists('categories') && preg_match('/#self/',$v)) {
-                    $v = preg_replace('/#self/',$GLOBALS['_ctx']->categories->cat_url,$v);
-               } elseif ($GLOBALS['_ctx']->exists('posts') && preg_match('/#self/',$v)) {
-                    $v = preg_replace('/#self/',$GLOBALS['_ctx']->posts->cat_url,$v);
-               }
-          }
-     }
-     
      # Static methods for pagination
      public static function PaginationNbPages()
@@ -341 +319 @@
      
      # First post image helpers
-     public static function EntryFirstImageHelper($size,$with_category,$class="")
+     public static function EntryFirstImageHelper($size,$class="")
      {
           global $core, $_ctx;
@@ -378 +356 @@
           }
           
-          # No src, look in category description if available
-          if (!$src && $with_category && $_ctx->categories)
-          {
-               if (preg_match_all($pattern,$_ctx->categories->cat_desc,$m) > 0)
-               {
-                    foreach ($m[1] as $i => $img) {
-                         if (($src = self::ContentFirstImageLookup($p_root,$img,$size)) !== false) {
-                              $src = $p_url.(dirname($img) != '/' ? dirname($img) : '').'/'.$src;
-                              if (preg_match('/alt="([^"]+)"/',$m[0][$i],$malt)) {
-                                   $alt = $malt[1];
-                              }
-                              break;
-                         }
-                    }
-               };
-          }
-          
           if ($src) {
                return '<img alt="'.$alt.'" src="'.$src.'" class="'.$class.'" />';

inc/public/lib.urlhandlers.php

@@ -245 +245 @@
                $_ctx->cur_lang = $args;
                self::home(null);
-          }
-     }
-     
-     public static function category($args)
-     {
-          $_ctx =& $GLOBALS['_ctx'];
-          $core =& $GLOBALS['core'];
-          
-          $n = self::getPageNumber($args);
-          
-          if ($args == '' && !$n) {
-               # No category was specified.
-               self::p404();
-          }
-          else
-          {
-               $params = new ArrayObject(array(
-                    'cat_url' => $args,
-                    'post_type' => 'post'));
-               
-               $core->callBehavior('publicCategoryBeforeGetCategories',$params,$args);
-               
-               $_ctx->categories = $core->blog->getCategories($params);
-               
-               if ($_ctx->categories->isEmpty()) {
-                    # The specified category does no exist.
-                    self::p404();
-               }
-               else
-               {
-                    if ($n) {
-                         $GLOBALS['_page_number'] = $n;
-                    }
-                    self::serveDocument('category.html');
-               }
           }
      }

locales/en/resources.php

@@ -24 +24 @@
 $__resources['help'] = array(
      'core_blog_pref' => dirname(__FILE__).'/help/blog_pref.html',
-     'core_categories' => dirname(__FILE__).'/help/categories.html',
      'core_media' => dirname(__FILE__).'/help/media.html',
      'core_post' => dirname(__FILE__).'/help/post.html',

plugins/widgets/_default_widgets.php

@@ -33 +33 @@
 $__widgets->langs->setting('homeonly',__('Home page only'),1,'check');
 
-$__widgets->create('categories',__('Categories list'),array('defaultWidgets','categories'));
-$__widgets->categories->setting('title',__('Title:'),__('Categories'));
-$__widgets->categories->setting('postcount',__('With entries counts'),0,'check');
-
 $__widgets->create('subscribe',__('Subscribe links'),array('defaultWidgets','subscribe'));
 $__widgets->subscribe->setting('title',__('Title:'),__('Subscribe'));
@@ -55 +51 @@
 $__widgets->create('lastposts',__('Last entries'),array('defaultWidgets','lastposts'));
 $__widgets->lastposts->setting('title',__('Title:'),__('Last entries'));
-$rs = $core->blog->getCategories(array('post_type'=>'post'));
-$categories = array('' => '', __('Uncategorized') => 'null');
-while ($rs->fetch()) {
-     $categories[str_repeat('  ',$rs->level-1).($rs->level-1 == 0 ? '' : '• ').html::escapeHTML($rs->cat_title)] = $rs->cat_id;
-}
-$__widgets->lastposts->setting('category',__('Category:'),'','combo',$categories);
-unset($rs,$categories);
 if ($core->plugins->moduleExists('tags')) {
      $__widgets->lastposts->setting('tag',__('Tag:'),'');
@@ -84 +73 @@
 $__default_widgets['nav']->append($__widgets->navigation);
 $__default_widgets['nav']->append($__widgets->bestof);
-$__default_widgets['nav']->append($__widgets->categories);
 $__default_widgets['extra']->append($__widgets->subscribe);
 

plugins/widgets/_widgets_functions.php

@@ -58 +58 @@
      }
      
-     public static function categories($w)
-     {
-          global $core, $_ctx;
-          
-          $rs = $core->blog->getCategories(array('post_type'=>'post'));
-          if ($rs->isEmpty()) {
-               return;
-          }
-          
-          $res =
-          '<div class="categories">'.
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '');
-          
-          $ref_level = $level = $rs->level-1;
-          while ($rs->fetch())
-          {
-               $class = '';
-               if (($core->url->type == 'category' && $_ctx->categories instanceof record && $_ctx->categories->cat_id == $rs->cat_id)
-               || ($core->url->type == 'post' && $_ctx->posts instanceof record && $_ctx->posts->cat_id == $rs->cat_id)) {
-                    $class = ' class="category-current"';
-               }
-               
-               if ($rs->level > $level) {
-                    $res .= str_repeat('<ul><li'.$class.'>',$rs->level - $level);
-               } elseif ($rs->level < $level) {
-                    $res .= str_repeat('</li></ul>',-($rs->level - $level));
-               }
-               
-               if ($rs->level <= $level) {
-                    $res .= '</li><li'.$class.'>';
-               }
-               
-               $res .=
-               '<a href="'.$core->blog->url.$core->url->getURLFor('category', $rs->cat_url).'">'.
-               html::escapeHTML($rs->cat_title).'</a>'.
-               ($w->postcount ? ' <span>('.$rs->nb_post.')</span>' : '');
-               
-               
-               $level = $rs->level;
-          }
-          
-          if ($ref_level - $level < 0) {
-               $res .= str_repeat('</li></ul>',-($ref_level - $level));
-          }
-          $res .= '</div>';
-          
-          return $res;
-     }
-     
      public static function bestof($w)
      {
@@ -292 +243 @@
           $params['no_content'] = true;
           
-          if ($w->category)
-          {
-               if ($w->category == 'null') {
-                    $params['sql'] = ' AND P.cat_id IS NULL ';
-               } elseif (is_numeric($w->category)) {
-                    $params['cat_id'] = (integer) $w->category;
-               } else {
-                    $params['cat_url'] = $w->category;
-               }
-          }
-          
           if ($w->tag)
           {