Changeset 2593:6741802596a0 for inc/core/class.dc.blog.php

Timestamp:

11/27/13 16:32:38 (12 years ago)

Author:

Dsls

Branch:

twig

Children:

2612:1537212bd291, 2613:014098e27ea0

Parents:

2468:d7fda5a0bd39 (diff), 2589:3d427735ca70 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fusion avec default

Files:

• inc/core/class.dc.blog.php (modified) (4 diffs)
• inc/core/class.dc.blog.php (modified) (156 diffs)

inc/core/class.dc.blog.php

@@ -81 +81 @@
                $this->desc = $b->blog_desc;
                $this->url = $b->blog_url;
-               $this->host = preg_replace('|^([a-z]{3,}://)(.*?)/.*$|','$1$2',$this->url);
+               $this->host = http::getHostFromURL($this->url);
                $this->creadt = strtotime($b->blog_creadt);
                $this->upddt = strtotime($b->blog_upddt);
@@ -963 +963 @@
                     $strReq .= 'ORDER BY post_dt DESC ';
                }
-               if (!empty($params['limit'])) {
+          }
+
+          if (!$count_only && !empty($params['limit'])) {
                     $strReq .= $this->con->limit($params['limit']);
                }
-          }
           
           if (!empty($params['sql_only'])) {
@@ -1893 +1894 @@
      - post_id: (integer) Get comments belonging to given post_id
      - cat_id: (integer or array) Get comments belonging to entries of given category ID
-     - comment_id: (integer) Get comment with given ID
+     - comment_id: (integer or array) Get comment with given ID (or IDs)
      - comment_site: (string) Get comments with given comment_site
      - comment_status: (integer) Get comments with given comment_status
@@ -1983 +1984 @@
           
           if (isset($params['comment_id']) && $params['comment_id'] !== '') {
-               $strReq .= 'AND comment_id = '.(integer) $params['comment_id'].' ';
+               if (is_array($params['comment_id'])) {
+                    array_walk($params['comment_id'],create_function('&$v,$k','if($v!==null){$v=(integer)$v;}'));
+               } else {
+                    $params['comment_id'] = array((integer) $params['comment_id']);
+               }
+               $strReq .= 'AND comment_id '.$this->con->in($params['comment_id']);
           }
           

inc/core/class.dc.blog.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -27 +27 @@
      /** @var string Database table prefix */
      public $prefix;
-
+     
      /** @var string Blog ID */
      public $id;
@@ -46 +46 @@
      /** @var string Blog status */
      public $status;
-
+     
      /** @var dcSettings dcSettings object */
      public $settings;
@@ -53 +53 @@
      /** @var string Blog public path */
      public $public_path;
-
+     
      private $post_status = array();
      private $comment_status = array();
-
+     
      private $categories;
-
+     
      /** @var boolean Disallow entries password protection */
      public $without_password = true;
-
+     
      /**
      Inits dcBlog object
-
+     
      @param    core      <b>dcCore</b>       Dotclear core reference
      @param    id        <b>string</b>       Blog ID
@@ -73 +73 @@
           $this->prefix = $core->prefix;
           $this->core =& $core;
-
+          
           if (($b = $this->core->getBlog($id)) !== false)
           {
@@ -85 +85 @@
                $this->upddt = strtotime($b->blog_upddt);
                $this->status = $b->blog_status;
-
+               
                $this->settings = new dcSettings($this->core,$this->id);
-
+               
                $this->themes_path = path::fullFromRoot($this->settings->system->themes_path,DC_ROOT);
                $this->public_path = path::fullFromRoot($this->settings->system->public_path,DC_ROOT);
-
+               
                $this->post_status['-2'] = __('Pending');
                $this->post_status['-1'] = __('Scheduled');
                $this->post_status['0'] = __('Unpublished');
                $this->post_status['1'] = __('Published');
-
+               
                $this->comment_status['-2'] = __('Junk');
                $this->comment_status['-1'] = __('Pending');
                $this->comment_status['0'] = __('Unpublished');
                $this->comment_status['1'] = __('Published');
-
+               
                # --BEHAVIOR-- coreBlogConstruct
                $this->core->callBehavior('coreBlogConstruct',$this);
           }
      }
-
+     
      /// @name Common public methods
      //@{
@@ -116 +116 @@
                return $this->url.'?';
           }
-
+          
           return $this->url;
      }
-
+     
      /**
      Returns an entry status name given to a code. Status are translated, never
      use it for tests. If status code does not exist, returns <i>unpublished</i>.
-
+     
      @param    s    <b>integer</b> Status code
      @return   <b>string</b> Blog status name
@@ -134 +134 @@
           return $this->post_status['0'];
      }
-
+     
      /**
      Returns an array of available entry status codes and names.
-
+     
      @return   <b>array</b> Simple array with codes in keys and names in value
      */
@@ -144 +144 @@
           return $this->post_status;
      }
-
+     
      /**
      Returns an array of available comment status codes and names.
-
+     
      @return   <b>array</b> Simple array with codes in keys and names in value
      */
@@ -154 +154 @@
           return $this->comment_status;
      }
-
+     
      /**
      Disallows entries password protection. You need to set it to
      <var>false</var> while serving a public blog.
-
+     
      @param    v         <b>boolean</b>
      */
@@ -166 +166 @@
      }
      //@}
-
+     
      /// @name Triggers methods
      //@{
@@ -176 +176 @@
      {
           $cur = $this->con->openCursor($this->prefix.'blog');
-
+          
           $cur->blog_upddt = date('Y-m-d H:i:s');
-
+          
           $cur->update("WHERE blog_id = '".$this->con->escape($this->id)."' ");
-
+          
           # --BEHAVIOR-- coreBlogAfterTriggerBlog
           $this->core->callBehavior('coreBlogAfterTriggerBlog',$cur);
      }
-
+     
      /**
      Updates comment and trackback counters in post table. Should be called
      every time a comment or trackback is added, removed or changed its status.
-
+     
      @param    id        <b>integer</b>      Comment ID
      @param    del       <b>boolean</b>      If comment is delete, set this to true
@@ -196 +196 @@
           $this->triggerComments($id,$del);
      }
-
+     
      /**
      Updates comments and trackbacks counters in post table. Should be called
      every time comments or trackbacks are added, removed or changed their status.
-
+     
      @param    ids       <b>mixed</b>        Comment(s) ID(s)
      @param    del       <b>boolean</b>      If comment is delete, set this to true
@@ -208 +208 @@
      {
           $comments_ids = dcUtils::cleanIds($ids);
-
+          
           # Get posts affected by comments edition
           if (empty($affected_posts)) {
-               $strReq =
+               $strReq = 
                     'SELECT post_id '.
                     'FROM '.$this->prefix.'comment '.
                     'WHERE comment_id'.$this->con->in($comments_ids).
                     'GROUP BY post_id';
-
+               
                $rs = $this->con->select($strReq);
-
+               
                $affected_posts = array();
                while ($rs->fetch()) {
@@ -224 +224 @@
                }
           }
-
+          
           if (!is_array($affected_posts) || empty($affected_posts)) {
                return;
           }
-
+          
           # Count number of comments if exists for affected posts
-          $strReq =
+          $strReq = 
                'SELECT post_id, COUNT(post_id) AS nb_comment, comment_trackback '.
                'FROM '.$this->prefix.'comment '.
@@ -236 +236 @@
                'AND post_id'.$this->con->in($affected_posts).
                'GROUP BY post_id,comment_trackback';
-
+          
           $rs = $this->con->select($strReq);
-
+          
           $posts = array();
           while ($rs->fetch()) {
@@ -247 +247 @@
                }
           }
-
+          
           # Update number of comments on affected posts
           $cur = $this->con->openCursor($this->prefix.'post');
@@ -253 +253 @@
           {
                $cur->clean();
-
+               
                if (!array_key_exists($post_id,$posts)) {
                     $cur->nb_trackback = 0;
@@ -261 +261 @@
                     $cur->nb_comment = empty($posts[$post_id]['comment']) ? 0 : $posts[$post_id]['comment'];
                }
-
+               
                $cur->update('WHERE post_id = '.$post_id);
           }
      }
      //@}
-
+     
      /// @name Categories management methods
      //@{
@@ -274 +274 @@
                $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
@@ -287 +287 @@
      - start: start with a given category
      - level: categories level to retrieve
-
+     
      @param    params    <b>array</b>        Parameters
      @return   <b>record</b>
@@ -299 +299 @@
           }
           $counter = $this->getCategoriesCounter($c_params);
-
+          
           if (isset($params['without_empty']) && ($params['without_empty'] == false)) {
                $without_empty = false;
@@ -305 +305 @@
                $without_empty = $this->core->auth->userID() == false; # Get all categories if in admin 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();
@@ -319 +319 @@
           {
                $nb_post = isset($counter[$rs->cat_id]) ? (integer) $counter[$rs->cat_id] : 0;
-
+               
                if ($rs->level > $level) {
                     $nb_total = $nb_post;
@@ -335 +335 @@
                     unset($stack[$rs->level+1]);
                }
-
+               
                if ($nb_total == 0 && $without_empty) {
                     continue;
                }
-
+               
                $level = $rs->level;
-
+               
                $t = array();
                foreach ($cols as $c) {
@@ -348 +348 @@
                $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'] !== '')
@@ -369 +369 @@
                }
           }
-
-          if (isset($params['cat_url']) && ($params['cat_url'] !== '')
+          
+          if (isset($params['cat_url']) && ($params['cat_url'] !== '') 
                && !isset($params['cat_id']))
           {
@@ -385 +385 @@
                }
           }
-
+          
           return staticRecord::newFromArray($data);
      }
-
+     
      /**
      Retrieves a category by its ID.
-
+     
      @param    id        <b>integer</b>      Category ID
      @return   <b>record</b>
@@ -399 +399 @@
           return $this->getCategories(array('cat_id' => $id));
      }
-
+     
      /**
      Retrieves parents of a given category.
-
+     
      @param    id        <b>integer</b>      Category ID
      @return   <b>record</b>
@@ -410 +410 @@
           return $this->categories()->getParents($id);
      }
-
+     
      /**
      Retrieves first parent of a given category.
-
+     
      @param    id        <b>integer</b>      Category ID
      @return   <b>record</b>
@@ -421 +421 @@
           return $this->categories()->getParent($id);
      }
-
+     
      /**
      Retrieves all category's first children
-
+     
      @param    id        <b>integer</b>      Category ID
      @return   <b>record</b>
@@ -432 +432 @@
           return $this->getCategories(array('start' => $id,'level' => $id == 0 ? 1 : 2));
      }
-
+     
      private function getCategoriesCounter($params=array())
      {
@@ -440 +440 @@
           '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();
@@ -456 +456 @@
                $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
@@ -472 +472 @@
                throw new Exception(__('You are not allowed to add categories'));
           }
-
+          
           $url = array();
           if ($parent != 0)
@@ -483 +483 @@
                }
           }
-
+          
           if ($cur->cat_url == '') {
                $url[] = text::tidyURL($cur->cat_title,false);
@@ -489 +489 @@
                $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);
-
+          
           $id = $this->categories()->addNode($cur,$parent);
           # Update category's cursor
@@ -505 +505 @@
                $cur->cat_rgt = $rs->cat_rgt;
           }
-
+          
           # --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
@@ -524 +524 @@
                throw new Exception(__('You are not allowed to update categories'));
           }
-
+          
           if ($cur->cat_url == '')
           {
@@ -534 +534 @@
                     }
                }
-
-
+               
+               
                $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();
      }
@@ -567 +567 @@
                 $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
@@ -579 +579 @@
           return;
      }
-
+     
      /**
      Set a category parent
-
+     
      @param    id        <b>integer</b>      Category ID
      @param    parent    <b>integer</b>      Parent Category ID
@@ -591 +591 @@
           $this->triggerBlog();
      }
-
+     
      /**
      Set category position
-
+     
      @param    id        <b>integer</b>      Category ID
      @param    sibling   <b>integer</b>      Sibling Category ID
@@ -604 +604 @@
           $this->triggerBlog();
      }
-
+     
      /**
      Deletes a category.
-
+     
      @param    id        <b>integer</b>      Category ID
      */
@@ -615 +615 @@
                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
@@ -639 +639 @@
                throw new Exception(__('You are not allowed to reset categories order'));
           }
-
+          
           $this->categories()->resetOrder();
           $this->triggerBlog();
      }
-
+     
      private function checkCategory($title,$url,$id=null)
      {
           # Let's check if URL is taken...
-          $strReq =
+          $strReq = 
                'SELECT cat_url FROM '.$this->prefix.'category '.
                "WHERE cat_url = '".$this->con->escape($url)."' ".
@@ -653 +653 @@
                "AND blog_id = '".$this->con->escape($this->id)."' ".
                'ORDER BY cat_url DESC';
-
+          
           $rs = $this->con->select($strReq);
-
+          
           if (!$rs->isEmpty())
           {
@@ -665 +665 @@
                     $clause = "LIKE '".$this->con->escape($url)."%'";
                }
-               $strReq =
+               $strReq = 
                     'SELECT cat_url FROM '.$this->prefix.'category '.
                     "WHERE cat_url ".$clause.' '.
@@ -671 +671 @@
                     "AND blog_id = '".$this->con->escape($this->id)."' ".
                     'ORDER BY cat_url DESC ';
-
+               
                $rs = $this->con->select($strReq);
                $a = array();
@@ -677 +677 @@
                     $a[] = $rs->cat_url;
                }
-
+               
                natsort($a);
                $t_url = end($a);
-
+               
                if (preg_match('/(.*?)([0-9]+)$/',$t_url,$m)) {
                     $i = (integer) $m[2];
@@ -687 +687 @@
                     $i = 1;
                }
-
+               
                return $url.($i+1);
           }
-
+          
           # URL is empty?
           if ($url == '') {
                throw new Exception(__('Empty category URL'));
           }
-
+          
           return $url;
      }
-
+     
      private function getCategoryCursor($cur,$id=null)
      {
@@ -704 +704 @@
                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 == '') {
@@ -716 +716 @@
                $cur->cat_url = text::tidyURL($cur->cat_url,true);
           }
-
+          
           # Check if title or url are unique
           $cur->cat_url = $this->checkCategory($cur->cat_title,$cur->cat_url,$id);
-
+          
           if ($cur->cat_desc !== null) {
                $cur->cat_desc = $this->core->HTMLfilter($cur->cat_desc);
@@ -725 +725 @@
      }
      //@}
-
+     
      /// @name Entries management methods
      //@{
@@ -731 +731 @@
      Retrieves entries. <b>$params</b> is an array taking the following
      optionnal parameters:
-
+     
      - no_content: Don't retrieve entry content (excerpt and content)
      - post_type: Get only entries with given type (default "post", array for many types and '' for no type)
@@ -755 +755 @@
      - sql_only : return the sql request instead of results. Only ids are selected
      - exclude_post_id : (integer or array) Exclude entries with given post_id
-
+     
      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
@@ -773 +773 @@
                $strReq = 'SELECT count(DISTINCT P.post_id) ';
           }
-          elseif (!empty($params['sql_only']))
+          elseif (!empty($params['sql_only'])) 
           {
                $strReq = 'SELECT P.post_id ';
@@ -786 +786 @@
                     'post_content, post_content_xhtml, post_notes, ';
                }
-
+               
                if (!empty($params['columns']) && is_array($params['columns'])) {
                     $content_req .= implode(', ',$params['columns']).', ';
                }
-
+               
 
                $strReq =
@@ -802 +802 @@
                'C.cat_title, C.cat_url, C.cat_desc ';
           }
-
+          
           $strReq .=
           'FROM '.$this->prefix.'post P '.
@@ -811 +811 @@
                $strReq .= $params['from'].' ';
           }
-
+          
           $strReq .=
           "WHERE P.blog_id = '".$this->con->escape($this->id)."' ";
-
+          
           if (!$this->core->auth->check('contentadmin',$this->id)) {
                $strReq .= 'AND ((post_status = 1 ';
-
+               
                if ($this->without_password) {
                     $strReq .= 'AND post_password IS NULL ';
                }
                $strReq .= ') ';
-
+               
                if ($this->core->auth->userID()) {
                     $strReq .= "OR P.user_id = '".$this->con->escape($this->core->auth->userID())."')";
@@ -829 +829 @@
                }
           }
-
+          
           #Adding parameters
           if (isset($params['post_type']))
@@ -841 +841 @@
                $strReq .= "AND post_type = 'post' ";
           }
-
+          
           if (isset($params['post_id']) && $params['post_id'] !== '') {
                if (is_array($params['post_id'])) {
@@ -850 +850 @@
                $strReq .= 'AND P.post_id '.$this->con->in($params['post_id']);
           }
-
+          
           if (isset($params['exclude_post_id']) && $params['exclude_post_id'] !== '') {
                if (is_array($params['exclude_post_id'])) {
@@ -859 +859 @@
                $strReq .= 'AND P.post_id NOT '.$this->con->in($params['exclude_post_id']);
           }
-
+          
           if (isset($params['post_url']) && $params['post_url'] !== '') {
                $strReq .= "AND post_url = '".$this->con->escape($params['post_url'])."' ";
           }
-
+          
           if (!empty($params['user_id'])) {
-               $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
-          }
-
+               $strReq .= "AND U.user_id ".$this->con->in($params['user_id'])." ";
+          }
+          
           if (isset($params['cat_id']) && $params['cat_id'] !== '')
           {
@@ -888 +888 @@
                $strReq .= 'AND '.$this->getPostsCategoryFilter($params['cat_url'],'cat_url').' ';
           }
-
+          
           /* Other filters */
           if (isset($params['post_status'])) {
                $strReq .= 'AND post_status = '.(integer) $params['post_status'].' ';
           }
-
+          
           if (isset($params['post_selected'])) {
                $strReq .= 'AND post_selected = '.(integer) $params['post_selected'].' ';
           }
-
+          
           if (!empty($params['post_year'])) {
                $strReq .= 'AND '.$this->con->dateFormat('post_dt','%Y').' = '.
                "'".sprintf('%04d',$params['post_year'])."' ";
           }
-
+          
           if (!empty($params['post_month'])) {
                $strReq .= 'AND '.$this->con->dateFormat('post_dt','%m').' = '.
                "'".sprintf('%02d',$params['post_month'])."' ";
           }
-
+          
           if (!empty($params['post_day'])) {
                $strReq .= 'AND '.$this->con->dateFormat('post_dt','%d').' = '.
                "'".sprintf('%02d',$params['post_day'])."' ";
           }
-
+          
           if (!empty($params['post_lang'])) {
                $strReq .= "AND P.post_lang = '".$this->con->escape($params['post_lang'])."' ";
           }
-
+          
           if (!empty($params['search']))
           {
                $words = text::splitWords($params['search']);
-
+               
                if (!empty($words))
                {
@@ -927 +927 @@
                          $this->core->callBehavior('corePostSearch',$this->core,array(&$words,&$strReq,&$params));
                     }
-
+                    
                     if ($words)
                     {
@@ -937 +937 @@
                }
           }
-
+          
           if (isset($params['media'])) {
                if ($params['media'] == '0') {
                     $strReq .= 'AND NOT ';
                } else {
-                    $strReq .= 'AND ';
+                    $strReq .= 'AND ';                 
                }
                $strReq .= 'EXISTS (SELECT M.post_id FROM '.$this->prefix.'post_media M '.
@@ -966 +966 @@
 
           if (!$count_only && !empty($params['limit'])) {
-               $strReq .= $this->con->limit($params['limit']);
-          }
-
+                    $strReq .= $this->con->limit($params['limit']);
+               }
+          
           if (!empty($params['sql_only'])) {
                return $strReq;
@@ -977 +977 @@
           $rs->_nb_media = array();
           $rs->extend('rsExtPost');
-
+          
           # --BEHAVIOR-- coreBlogGetPosts
           $this->core->callBehavior('coreBlogGetPosts',$rs);
-
+          
           return $rs;
      }
-
+     
      /**
      Returns a record with post id, title and date for next or previous post
      according to the post ID.
      $dir could be 1 (next post) or -1 (previous post).
-
+     
      @param    post_id                  <b>integer</b>      Post ID
      @param    dir                      <b>integer</b>      Search direction
@@ -999 +999 @@
           $dt = $post->post_dt;
           $post_id = (integer) $post->post_id;
-
+          
           if($dir > 0) {
                $sign = '>';
@@ -1008 +1008 @@
                $order = 'DESC';
           }
-
+          
           $params['post_type'] = $post->post_type;
           $params['limit'] = 1;
@@ -1017 +1017 @@
           "    OR post_dt ".$sign." '".$this->con->escape($dt)."' ".
           ') ';
-
+          
           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 ';
           }
-
+          
           $rs = $this->getPosts($params);
-
+          
           if ($rs->isEmpty()) {
                return null;
           }
-
+          
           return $rs;
      }
-
+     
      /**
      Retrieves different languages and post count on blog, based on post_lang
      field. <var>$params</var> is an array taking the following optionnal
      parameters:
-
+     
      - post_type: Get only entries with given type (default "post", '' for no type)
      - lang: retrieve post count for selected lang
      - order: order statement (default post_lang DESC)
-
+     
      @param    params    <b>array</b>        Parameters
      @return   record
@@ -1054 +1054 @@
                     "AND post_lang <> '' ".
                     "AND post_lang IS NOT NULL ";
-
+          
           if (!$this->core->auth->check('contentadmin',$this->id)) {
                $strReq .= 'AND ((post_status = 1 ';
-
+               
                if ($this->without_password) {
                     $strReq .= 'AND post_password IS NULL ';
                }
                $strReq .= ') ';
-
+               
                if ($this->core->auth->userID()) {
                     $strReq .= "OR user_id = '".$this->con->escape($this->core->auth->userID())."')";
@@ -1069 +1069 @@
                }
           }
-
+          
           if (isset($params['post_type'])) {
                if ($params['post_type'] != '') {
@@ -1077 +1077 @@
                $strReq .= "AND post_type = 'post' ";
           }
-
+          
           if (isset($params['lang'])) {
                $strReq .= "AND post_lang = '".$this->con->escape($params['lang'])."' ";
           }
-
+          
           $strReq .= 'GROUP BY post_lang ';
-
+          
           $order = 'desc';
           if (!empty($params['order']) && preg_match('/^(desc|asc)$/i',$params['order'])) {
@@ -1089 +1089 @@
           }
           $strReq .= 'ORDER BY post_lang '.$order.' ';
-
+          
           return $this->con->select($strReq);
      }
-
+     
      /**
      Returns a record with all distinct blog dates and post count.
      <var>$params</var> is an array taking the following optionnal parameters:
-
+     
      - type: (day|month|year) Get days, months or years
      - year: (integer) Get dates for given year
@@ -1107 +1107 @@
      - previous: Get date before match
      - order: Sort by date "ASC" or "DESC"
-
+     
      @param    params    <b>array</b>        Parameters array
      @return   record
@@ -1126 +1126 @@
           $dt_f .= ' 00:00:00';
           $dt_fc .= '000000';
-
+          
           $cat_field = $catReq = $limit = '';
-
+          
           if (isset($params['cat_id']) && $params['cat_id'] !== '') {
                $catReq = 'AND P.cat_id = '.(integer) $params['cat_id'].' ';
@@ -1139 +1139 @@
                $catReq = 'AND P.post_lang = \''. $params['post_lang'].'\' ';
           }
-
+          
           $strReq = 'SELECT DISTINCT('.$this->con->dateFormat('post_dt',$dt_f).') AS dt '.
                     $cat_field.
@@ -1147 +1147 @@
                     "WHERE P.blog_id = '".$this->con->escape($this->id)."' ".
                     $catReq;
-
+          
           if (!$this->core->auth->check('contentadmin',$this->id)) {
                $strReq .= 'AND ((post_status = 1 ';
-
+               
                if ($this->without_password) {
                     $strReq .= 'AND post_password IS NULL ';
                }
                $strReq .= ') ';
-
+               
                if ($this->core->auth->userID()) {
                     $strReq .= "OR P.user_id = '".$this->con->escape($this->core->auth->userID())."')";
@@ -1162 +1162 @@
                }
           }
-
+          
           if (!empty($params['post_type'])) {
                $strReq .= "AND post_type ".$this->con->in($params['post_type'])." ";
@@ -1168 +1168 @@
                $strReq .= "AND post_type = 'post' ";
           }
-
+          
           if (!empty($params['year'])) {
                $strReq .= 'AND '.$this->con->dateFormat('post_dt','%Y')." = '".sprintf('%04d',$params['year'])."' ";
           }
-
+          
           if (!empty($params['month'])) {
                $strReq .= 'AND '.$this->con->dateFormat('post_dt','%m')." = '".sprintf('%02d',$params['month'])."' ";
           }
-
+          
           if (!empty($params['day'])) {
                $strReq .= 'AND '.$this->con->dateFormat('post_dt','%d')." = '".sprintf('%02d',$params['day'])."' ";
           }
-
+          
           # Get next or previous date
           if (!empty($params['next']) || !empty($params['previous']))
@@ -1193 +1193 @@
                     $dt = $params['previous'];
                }
-
+               
                $dt = date('YmdHis',strtotime($dt));
-
+               
                $strReq .= 'AND '.$this->con->dateFormat('post_dt',$dt_fc).$pdir."'".$dt."' ";
                $limit = $this->con->limit(1);
           }
-
+          
           $strReq .= 'GROUP BY dt '.$cat_field;
-
+          
           $order = 'desc';
           if (!empty($params['order']) && preg_match('/^(desc|asc)$/i',$params['order'])) {
                $order = $params['order'];
           }
-
+          
           $strReq .=
           'ORDER BY dt '.$order.' '.
           $limit;
-
+          
           $rs = $this->con->select($strReq);
           $rs->extend('rsExtDates');
           return $rs;
      }
-
+     
      /**
      Creates a new entry. Takes a cursor as input and returns the new entry
      ID.
-
+     
      @param    cur       <b>cursor</b>       Post cursor
      @return   <b>integer</b>      New post ID
@@ -1228 +1228 @@
                throw new Exception(__('You are not allowed to create an entry'));
           }
-
+          
           $this->con->writeLock($this->prefix.'post');
           try
@@ -1235 +1235 @@
                $rs = $this->con->select(
                     'SELECT MAX(post_id) '.
-                    'FROM '.$this->prefix.'post '
+                    'FROM '.$this->prefix.'post ' 
                     );
-
+               
                $cur->post_id = (integer) $rs->f(0) + 1;
                $cur->blog_id = (string) $this->id;
@@ -1243 +1243 @@
                $cur->post_upddt = date('Y-m-d H:i:s');
                $cur->post_tz = $this->core->auth->getInfo('user_tz');
-
+               
                # Post excerpt and content
                $this->getPostContent($cur,$cur->post_id);
-
+               
                $this->getPostCursor($cur);
-
+               
                $cur->post_url = $this->getPostURL($cur->post_url,$cur->post_dt,$cur->post_title,$cur->post_id);
-
+               
                if (!$this->core->auth->check('publish,contentadmin',$this->id)) {
                     $cur->post_status = -2;
                }
-
+               
                # --BEHAVIOR-- coreBeforePostCreate
                $this->core->callBehavior('coreBeforePostCreate',$this,$cur);
-
+               
                $cur->insert();
                $this->con->unlock();
@@ -1266 +1266 @@
                throw $e;
           }
-
+          
           # --BEHAVIOR-- coreAfterPostCreate
           $this->core->callBehavior('coreAfterPostCreate',$this,$cur);
-
+          
           $this->triggerBlog();
-
+          
           return $cur->post_id;
      }
-
+     
      /**
      Updates an existing post.
-
+     
      @param    id        <b>integer</b>      Post ID
      @param    cur       <b>cursor</b>       Post cursor
@@ -1286 +1286 @@
                throw new Exception(__('You are not allowed to update entries'));
           }
-
+          
           $id = (integer) $id;
-
+          
           if (empty($id)) {
                throw new Exception(__('No such entry ID'));
           }
-
+          
           # Post excerpt and content
           $this->getPostContent($cur,$id);
-
+          
           $this->getPostCursor($cur);
-
+          
           if ($cur->post_url !== null) {
                $cur->post_url = $this->getPostURL($cur->post_url,$cur->post_dt,$cur->post_title,$id);
           }
-
+          
           if (!$this->core->auth->check('publish,contentadmin',$this->id)) {
                $cur->unsetField('post_status');
           }
-
+          
           $cur->post_upddt = date('Y-m-d H:i:s');
-
+          
           #If user is only "usage", we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
@@ -1315 +1315 @@
                          'WHERE post_id = '.$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 edit this entry'));
                }
           }
-
+          
           # --BEHAVIOR-- coreBeforePostUpdate
           $this->core->callBehavior('coreBeforePostUpdate',$this,$cur);
-
+          
           $cur->update('WHERE post_id = '.$id.' ');
-
+          
           # --BEHAVIOR-- coreAfterPostUpdate
           $this->core->callBehavior('coreAfterPostUpdate',$this,$cur);
-
+          
           $this->triggerBlog();
      }
-
+     
      /**
      Updates post status.
-
+     
      @param    id        <b>integer</b>      Post ID
      @param    status    <b>integer</b>      Post status
@@ -1344 +1344 @@
           $this->updPostsStatus($id,$status);
      }
-
+     
      /**
      Updates posts status.
-
+     
      @param    ids       <b>mixed</b>        Post(s) ID(s)
      @param    status    <b>integer</b>      Post status
@@ -1356 +1356 @@
                throw new Exception(__('You are not allowed to change this entry status'));
           }
-
+          
           $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))
@@ -1368 +1368 @@
                $strReq .= "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
-
+          
           $cur = $this->con->openCursor($this->prefix.'post');
-
+          
           $cur->post_status = $status;
           $cur->post_upddt = date('Y-m-d H:i:s');
-
+          
           $cur->update($strReq);
           $this->triggerBlog();
      }
-
+     
      /**
      Updates post selection.
-
+     
      @param    id        <b>integer</b>      Post ID
      @param    selected  <b>integer</b>      Is selected post
@@ -1388 +1388 @@
           $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)
@@ -1400 +1400 @@
                throw new Exception(__('You are not allowed to change this entry category'));
           }
-
+          
           $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))
@@ -1412 +1412 @@
                $strReq .= "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
-
+          
           $cur = $this->con->openCursor($this->prefix.'post');
-
+          
           $cur->post_selected = (integer) $selected;
           $cur->post_upddt = date('Y-m-d H:i:s');
-
+          
           $cur->update($strReq);
           $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
@@ -1432 +1432 @@
           $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
@@ -1444 +1444 @@
                throw new Exception(__('You are not allowed to change this entry category'));
           }
-
+          
           $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))
@@ -1456 +1456 @@
                $strReq .= "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
-
+          
           $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');
-
+          
           $cur->update($strReq);
           $this->triggerBlog();
      }
-
+     
      /**
      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
@@ -1477 +1477 @@
                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.' '.
@@ -1492 +1492 @@
           $this->triggerBlog();
      }
-
+     
      /**
      Deletes a post.
-
+     
      @param    id        <b>integer</b>      Post ID
      */
@@ -1502 +1502 @@
           $this->delPosts($id);
      }
-
+     
      /**
      Deletes multiple posts.
-
+     
      @param    ids       <b>mixed</b>        Post(s) ID(s)
      */
@@ -1513 +1513 @@
                throw new Exception(__('You are not allowed to delete entries'));
           }
-
+          
           $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))
@@ -1529 +1529 @@
                $strReq .= "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
-
+          
           $this->con->execute($strReq);
           $this->triggerBlog();
      }
-
+     
      /**
      Publishes all entries flaged as "scheduled".
@@ -1543 +1543 @@
                     'WHERE post_status = -1 '.
                     "AND blog_id = '".$this->con->escape($this->id)."' ";
-
+          
           $rs = $this->con->select($strReq);
-
+          
           $now = dt::toUTC(time());
           $to_change = new ArrayObject();
@@ -1552 +1552 @@
                return;
           }
-
+          
           while ($rs->fetch())
           {
                # Now timestamp with post timezone
                $now_tz = $now + dt::getTimeOffset($rs->post_tz,$now);
-
+               
                # Post timestamp
                $post_ts = strtotime($rs->post_dt);
-
+               
                # If now_tz >= post_ts, we publish the entry
                if ($now_tz >= $post_ts) {
@@ -1582 +1582 @@
                $this->core->callBehavior('coreAfterScheduledEntriesPublish',$this,$to_change);
           }
-
-     }
-
+          
+     }
+     
      /**
      Retrieves all users having posts on current blog.
-
+     
      @param    post_type      <b>string</b>       post_type filter (post)
      @return   record
@@ -1598 +1598 @@
                     'WHERE P.user_id = U.user_id '.
                     "AND blog_id = '".$this->con->escape($this->id)."' ";
-
+          
           if ($post_type) {
                $strReq .= "AND post_type = '".$this->con->escape($post_type)."' ";
           }
-
+          
           $strReq .= 'GROUP BY P.user_id, user_name, user_firstname, user_displayname, user_email ';
-
+          
           return $this->con->select($strReq);
      }
-
+     
      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)
           {
@@ -1622 +1622 @@
                $id = array_shift($args);
                $args = array_flip($args);
-
+               
                if (isset($args['not'])) { $not[$id] = 1; }
                if (isset($args['sub'])) { $sub[$id] = 1; }
@@ -1636 +1636 @@
                }
           }
-
+          
           if (!empty($sub)) {
                $rs = $this->con->select(
@@ -1643 +1643 @@
                     '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(
@@ -1654 +1654 @@
                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].')';
@@ -1667 +1667 @@
                unset($sql[0]);
           }
-
+          
           if ($sql[1]) {
                $sql[1] = '(P.cat_id IS NULL OR NOT('.$sql[1].'))';
@@ -1673 +1673 @@
                unset($sql[1]);
           }
-
+          
           return implode(' AND ',$sql);
      }
-
+     
      private function getPostCursor($cur,$post_id=null)
      {
@@ -1682 +1682 @@
                throw new Exception(__('No entry title'));
           }
-
+          
           if ($cur->post_content == '') {
                throw new Exception(__('No entry content'));
           }
-
+          
           if ($cur->post_password === '') {
                $cur->post_password = null;
           }
-
+          
           if ($cur->post_dt == '') {
                $offset = dt::getTimeOffset($this->core->auth->getInfo('user_tz'));
@@ -1696 +1696 @@
                $cur->post_dt = date('Y-m-d H:i:00',$now);
           }
-
+          
           $post_id = is_int($post_id) ? $post_id : $cur->post_id;
-
+          
           if ($cur->post_content_xhtml == '') {
                throw new Exception(__('No entry content'));
           }
-
+          
           # Words list
           if ($cur->post_title !== null && $cur->post_excerpt_xhtml !== null
@@ -1711 +1711 @@
                $cur->post_excerpt_xhtml.' '.
                $cur->post_content_xhtml;
-
+               
                $cur->post_words = implode(' ',text::splitWords($words));
           }
      }
-
+     
      private function getPostContent($cur,$post_id)
      {
@@ -1722 +1722 @@
           $post_content = $cur->post_content;
           $post_content_xhtml = $cur->post_content_xhtml;
-
+          
           $this->setPostContent(
                $post_id,$cur->post_format,$cur->post_lang,
@@ -1728 +1728 @@
                $post_content,$post_content_xhtml
           );
-
+          
           $cur->post_excerpt = $post_excerpt;
           $cur->post_excerpt_xhtml = $post_excerpt_xhtml;
@@ -1734 +1734 @@
           $cur->post_content_xhtml = $post_content_xhtml;
      }
-
+     
      /**
      Creates post HTML content, taking format and lang into account.
-
+     
      @param         post_id        <b>integer</b>      Post ID
      @param         format         <b>string</b>       Post format
@@ -1771 +1771 @@
                }
           }
-
+          
           if ($excerpt) {
                $excerpt_xhtml = $this->core->callFormater($format,$excerpt);
@@ -1778 +1778 @@
                $excerpt_xhtml = '';
           }
-
+          
           if ($content) {
                $content_xhtml = $this->core->callFormater($format,$content);
@@ -1785 +1785 @@
                $content_xhtml = '';
           }
-
+          
           # --BEHAVIOR-- coreAfterPostContentFormat
           $this->core->callBehavior('coreAfterPostContentFormat',array(
@@ -1794 +1794 @@
           ));
      }
-
+     
      /**
      Returns URL for a post according to blog setting <var>post_url_format</var>.
      It will try to guess URL and append some figures if needed.
-
+     
      @param    url            <b>string</b>       Origin URL, could be empty
      @param    post_dt        <b>string</b>       Post date (in YYYY-MM-DD HH:mm:ss)
@@ -1808 +1808 @@
      {
           $url = trim($url);
-
+          
           $url_patterns = array(
           '{y}' => date('Y',strtotime($post_dt)),
@@ -1816 +1816 @@
           '{id}' => (integer) $post_id
           );
-
+          
           # If URL is empty, we create a new one
           if ($url == '')
@@ -1831 +1831 @@
                $url = text::tidyURL($url);
           }
-
+          
           # Let's check if URL is taken...
           $strReq = 'SELECT post_url FROM '.$this->prefix.'post '.
@@ -1838 +1838 @@
                     "AND blog_id = '".$this->con->escape($this->id)."' ".
                     'ORDER BY post_url DESC';
-
+          
           $rs = $this->con->select($strReq);
-
+          
           if (!$rs->isEmpty())
           {
@@ -1855 +1855 @@
                          "AND blog_id = '".$this->con->escape($this->id)."' ".
                          'ORDER BY post_url DESC ';
-
+               
                $rs = $this->con->select($strReq);
                $a = array();
@@ -1861 +1861 @@
                     $a[] = $rs->post_url;
                }
-
+               
                natsort($a);
                $t_url = end($a);
-
+               
                if (preg_match('/(.*?)([0-9]+)$/',$t_url,$m)) {
                     $i = (integer) $m[2];
@@ -1871 +1871 @@
                     $i = 1;
                }
-
+               
                return $url.($i+1);
           }
-
+          
           # URL is empty?
           if ($url == '') {
                throw new Exception(__('Empty entry URL'));
           }
-
+          
           return $url;
      }
      //@}
-
+     
      /// @name Comments management methods
      //@{
@@ -1889 +1889 @@
      Retrieves comments. <b>$params</b> is an array taking the following
      optionnal parameters:
-
+     
      - no_content: Don't retrieve comment content
-     - post_type: Get only entries with given type (default no type, array for many types)
+     - post_type: Get only entries with given type (default no type, array for many types) 
      - post_id: (integer) Get comments belonging to given post_id
      - cat_id: (integer or array) Get comments belonging to entries of given category ID
@@ -1907 +1907 @@
      - limit: Limit parameter
      - sql_only : return the sql request instead of results. Only ids are selected
-
+     
      @param    params         <b>array</b>        Parameters
      @param    count_only     <b>boolean</b>      Only counts results
@@ -1918 +1918 @@
                $strReq = 'SELECT count(comment_id) ';
           }
-          elseif (!empty($params['sql_only']))
+          elseif (!empty($params['sql_only'])) 
           {
                $strReq = 'SELECT P.post_id ';
@@ -1929 +1929 @@
                     $content_req = 'comment_content, ';
                }
-
+               
                if (!empty($params['columns']) && is_array($params['columns'])) {
                     $content_req .= implode(', ',$params['columns']).', ';
                }
-
+               
                $strReq =
                'SELECT C.comment_id, comment_dt, comment_tz, comment_upddt, '.
@@ -1942 +1942 @@
                'P.post_dt, P.user_id, U.user_email, U.user_url ';
           }
-
+          
           $strReq .=
           'FROM '.$this->prefix.'comment C '.
           'INNER JOIN '.$this->prefix.'post P ON C.post_id = P.post_id '.
           'INNER JOIN '.$this->prefix.'user U ON P.user_id = U.user_id ';
-
+          
           if (!empty($params['from'])) {
                $strReq .= $params['from'].' ';
           }
-
+          
           $strReq .=
           "WHERE P.blog_id = '".$this->con->escape($this->id)."' ";
-
+          
           if (!$this->core->auth->check('contentadmin',$this->id)) {
                $strReq .= 'AND ((comment_status = 1 AND P.post_status = 1 ';
-
+               
                if ($this->without_password) {
                     $strReq .= 'AND post_password IS NULL ';
                }
                $strReq .= ') ';
-
+               
                if ($this->core->auth->userID()) {
                     $strReq .= "OR P.user_id = '".$this->con->escape($this->core->auth->userID())."')";
@@ -1969 +1969 @@
                }
           }
-
+          
           if (!empty($params['post_type']))
           {
                $strReq .= 'AND post_type '.$this->con->in($params['post_type']);
           }
-
+          
           if (isset($params['post_id']) && $params['post_id'] !== '') {
                $strReq .= 'AND P.post_id = '.(integer) $params['post_id'].' ';
           }
-
+          
           if (isset($params['cat_id']) && $params['cat_id'] !== '') {
                $strReq .= 'AND P.cat_id = '.(integer) $params['cat_id'].' ';
           }
-
+          
           if (isset($params['comment_id']) && $params['comment_id'] !== '') {
                if (is_array($params['comment_id'])) {
@@ -1991 +1991 @@
                $strReq .= 'AND comment_id '.$this->con->in($params['comment_id']);
           }
-
+          
           if (isset($params['comment_site'])) {
                $comment_site = $this->con->escape(str_replace('*','%',$params['comment_site']));
                $strReq .= "AND comment_site LIKE '".$comment_site."' ";
           }
-
+          
           if (isset($params['comment_status'])) {
                $strReq .= 'AND comment_status = '.(integer) $params['comment_status'].' ';
           }
-
+          
           if (!empty($params['comment_status_not']))
           {
                $strReq .= 'AND comment_status <> '.(integer) $params['comment_status_not'].' ';
           }
-
+          
           if (isset($params['comment_trackback'])) {
                $strReq .= 'AND comment_trackback = '.(integer) (boolean) $params['comment_trackback'].' ';
           }
-
+          
           if (isset($params['comment_ip'])) {
                $comment_ip = $this->con->escape(str_replace('*','%',$params['comment_ip']));
                $strReq .= "AND comment_ip LIKE '".$comment_ip."' ";
           }
-
+          
           if (isset($params['q_author'])) {
                $q_author = $this->con->escape(str_replace('*','%',strtolower($params['q_author'])));
                $strReq .= "AND LOWER(comment_author) LIKE '".$q_author."' ";
           }
-
+          
           if (!empty($params['search']))
           {
                $words = text::splitWords($params['search']);
-
+               
                if (!empty($words))
                {
@@ -2030 +2030 @@
                          $this->core->callBehavior('coreCommentSearch',$this->core,array(&$words,&$strReq,&$params));
                     }
-
+                    
                     if ($words)
                     {
@@ -2040 +2040 @@
                }
           }
-
+          
           if (!empty($params['sql'])) {
                $strReq .= $params['sql'].' ';
           }
-
+          
           if (!$count_only)
           {
@@ -2053 +2053 @@
                }
           }
-
+          
           if (!$count_only && !empty($params['limit'])) {
                $strReq .= $this->con->limit($params['limit']);
@@ -2061 +2061 @@
                return $strReq;
           }
-
+          
           $rs = $this->con->select($strReq);
           $rs->core = $this->core;
           $rs->extend('rsExtComment');
-
+          
           # --BEHAVIOR-- coreBlogGetComments
           $this->core->callBehavior('coreBlogGetComments',$rs);
-
+          
           return $rs;
      }
-
+     
      /**
      Creates a new comment. Takes a cursor as input and returns the new comment
      ID.
-
+     
      @param    cur       <b>cursor</b>       Comment cursor
      @return   <b>integer</b>      New comment ID
@@ -2087 +2087 @@
                $rs = $this->con->select(
                     'SELECT MAX(comment_id) '.
-                    'FROM '.$this->prefix.'comment '
+                    'FROM '.$this->prefix.'comment ' 
                );
-
+               
                $cur->comment_id = (integer) $rs->f(0) + 1;
                $cur->comment_upddt = date('Y-m-d H:i:s');
-
+               
                $offset = dt::getTimeOffset($this->settings->system->blog_timezone);
                $cur->comment_dt = date('Y-m-d H:i:s',time() + $offset);
                $cur->comment_tz = $this->settings->system->blog_timezone;
-
+               
                $this->getCommentCursor($cur);
-
+               
                if ($cur->comment_ip === null) {
                     $cur->comment_ip = http::realIP();
                }
-
+               
                # --BEHAVIOR-- coreBeforeCommentCreate
                $this->core->callBehavior('coreBeforeCommentCreate',$this,$cur);
-
+               
                $cur->insert();
                $this->con->unlock();
@@ -2114 +2114 @@
                throw $e;
           }
-
+          
           # --BEHAVIOR-- coreAfterCommentCreate
           $this->core->callBehavior('coreAfterCommentCreate',$this,$cur);
-
+          
           $this->triggerComment($cur->comment_id);
           if ($cur->comment_status != -2) {
                $this->triggerBlog();
-          }
+          }    
           return $cur->comment_id;
      }
-
+     
      /**
      Updates an existing comment.
-
+     
      @param    id        <b>integer</b>      Comment ID
      @param    cur       <b>cursor</b>       Comment cursor
@@ -2136 +2136 @@
                throw new Exception(__('You are not allowed to update comments'));
           }
-
+          
           $id = (integer) $id;
-
+          
           if (empty($id)) {
                throw new Exception(__('No such comment ID'));
           }
-
+          
           $rs = $this->getComments(array('comment_id' => $id));
-
+          
           if ($rs->isEmpty()) {
                throw new Exception(__('No such comment ID'));
           }
-
+          
           #If user is only usage, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
@@ -2156 +2156 @@
                }
           }
-
+          
           $this->getCommentCursor($cur);
-
+          
           $cur->comment_upddt = date('Y-m-d H:i:s');
-
+          
           if (!$this->core->auth->check('publish,contentadmin',$this->id)) {
                $cur->unsetField('comment_status');
           }
-
+          
           # --BEHAVIOR-- coreBeforeCommentUpdate
           $this->core->callBehavior('coreBeforeCommentUpdate',$this,$cur,$rs);
-
+          
           $cur->update('WHERE comment_id = '.$id.' ');
-
+          
           # --BEHAVIOR-- coreAfterCommentUpdate
           $this->core->callBehavior('coreAfterCommentUpdate',$this,$cur,$rs);
-
+          
           $this->triggerComment($id);
           $this->triggerBlog();
      }
-
+     
      /**
      Updates comment status.
-
+     
      @param    id        <b>integer</b>      Comment ID
      @param    status    <b>integer</b>      Comment status
@@ -2187 +2187 @@
           $this->updCommentsStatus($id,$status);
      }
-
+     
      /**
      Updates comments status.
-
+     
      @param    ids       <b>mixed</b>        Comment(s) ID(s)
      @param    status    <b>integer</b>      Comment status
@@ -2199 +2199 @@
                throw new Exception(__("You are not allowed to change this comment's status"));
           }
-
+          
           $co_ids = dcUtils::cleanIds($ids);
           $status = (integer) $status;
-
-          $strReq =
+          
+          $strReq = 
                'UPDATE '.$this->prefix.'comment tc ';
-
+          
           # mySQL uses "JOIN" synthax
           if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
-               $strReq .=
+               $strReq .= 
                     'JOIN '.$this->prefix.'post tp ON tc.post_id = tp.post_id ';
           }
-
-          $strReq .=
+          
+          $strReq .= 
                'SET comment_status = '.$status.' ';
-
+          
           # pgSQL uses "FROM" synthax
           if ($this->con->driver() != 'mysql' && $this->con->driver() != 'mysqli') {
-               $strReq .=
+               $strReq .= 
                     'FROM '.$this->prefix.'post tp ';
           }
-
+          
           $strReq .=
                "WHERE blog_id = '".$this->con->escape($this->id)."' ".
                'AND comment_id'.$this->con->in($co_ids);
-
+          
           # add pgSQL "WHERE" clause
           if ($this->con->driver() != 'mysql' && $this->con->driver() != 'mysqli') {
-               $strReq .=
+               $strReq .= 
                     'AND tc.post_id = tp.post_id ';
           }
-
+          
           #If user is only usage, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
-               $strReq .=
+               $strReq .= 
                     "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
-
+          
           $this->con->execute($strReq);
           $this->triggerComments($co_ids);
           $this->triggerBlog();
      }
-
+     
      /**
      Delete a comment
-
+     
      @param    id        <b>integer</b>      Comment ID
      */
@@ -2252 +2252 @@
           $this->delComments($id);
      }
-
+     
      /**
      Delete comments
-
+     
      @param    ids       <b>mixed</b>        Comment(s) ID(s)
      */
@@ -2263 +2263 @@
                throw new Exception(__('You are not allowed to delete comments'));
           }
-
+          
           $co_ids = dcUtils::cleanIds($ids);
-
+          
           if (empty($co_ids)) {
                throw new Exception(__('No such comment ID'));
           }
-
+          
           # Retrieve posts affected by comments edition
           $affected_posts = array();
@@ -2277 +2277 @@
                'WHERE comment_id'.$this->con->in($co_ids).
                'GROUP BY post_id';
-
+          
           $rs = $this->con->select($strReq);
-
+          
           while ($rs->fetch()) {
                $affected_posts[] = (integer) $rs->post_id;
           }
-
+          
           # mySQL uses "INNER JOIN" synthax
           if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
-               $strReq =
+               $strReq = 
                     'DELETE FROM tc '.
                     'USING '.$this->prefix.'comment tc '.
@@ -2293 +2293 @@
           # pgSQL uses nothing special
           else {
-               $strReq =
+               $strReq = 
                     'DELETE FROM '.$this->prefix.'comment tc '.
                     'USING '.$this->prefix.'post tp ';
           }
-
-          $strReq .=
+          
+          $strReq .= 
                'WHERE tc.post_id = tp.post_id '.
                "AND tp.blog_id = '".$this->con->escape($this->id)."' ".
                'AND comment_id'.$this->con->in($co_ids);
-
+          
           #If user can only delete, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
-               $strReq .=
+               $strReq .= 
                     "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
-
+          
           $this->con->execute($strReq);
           $this->triggerComments($co_ids, true, $affected_posts);
@@ -2320 +2320 @@
                throw new Exception(__('You are not allowed to delete comments'));
           }
-
+          
           # mySQL uses "INNER JOIN" synthax
           if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
-               $strReq =
+               $strReq = 
                     'DELETE FROM tc '.
                     'USING '.$this->prefix.'comment tc '.
@@ -2330 +2330 @@
           # pgSQL uses nothing special
           else {
-               $strReq =
+               $strReq = 
                     'DELETE FROM '.$this->prefix.'comment tc '.
                     'USING '.$this->prefix.'post tp ';
           }
-
-          $strReq .=
+          
+          $strReq .= 
                'WHERE tc.post_id = tp.post_id '.
                "AND tp.blog_id = '".$this->con->escape($this->id)."' ".
                'AND comment_status = -2';
-
+          
           #If user can only delete, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
-               $strReq .=
+               $strReq .= 
                     "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
-
+          
           $this->con->execute($strReq);
           $this->triggerBlog();
      }
-
+     
      private function getCommentCursor($cur)
      {
@@ -2356 +2356 @@
                throw new Exception(__('You must provide a comment'));
           }
-
+          
           if ($cur->comment_author !== null && $cur->comment_author == '') {
                throw new Exception(__('You must provide an author name'));
           }
-
+          
           if ($cur->comment_email != '' && !text::isEmail($cur->comment_email)) {
                throw new Exception(__('Email address is not valid.'));
           }
-
+          
           if ($cur->comment_site !== null && $cur->comment_site != '') {
                if (!preg_match('|^http(s?)://|i',$cur->comment_site, $matches)) {
@@ -2372 +2372 @@
                }
           }
-
+          
           if ($cur->comment_status === null) {
                $cur->comment_status = (integer) $this->settings->system->comments_pub;
           }
-
+          
           # Words list
           if ($cur->comment_content !== null)
@@ -2385 +2385 @@
      //@}
 }
+?>