Changeset 1620:542c321dc040 for inc/core

Timestamp:

08/30/13 10:37:08 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1619:5d925866b5b3 (diff), 1593:0c884219a872 (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:

Merge 2.5 into default

Files:

• inc/core/class.dc.blog.php (modified) (4 diffs)
• inc/core/class.dc.blog.php (modified) (8 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);
@@ -91 +91 @@
                $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');
+               $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
@@ -300 +300 @@
           $counter = $this->getCategoriesCounter($c_params);
           
-          $without_empty = $this->core->auth->userID() == false; # For public display
+          if (isset($params['without_empty']) && ($params['without_empty'] == false)) {
+               $without_empty = false;
+          } else {
+               $without_empty = $this->core->auth->userID() == false; # Get all categories if in admin display
+          }
           
           $start = isset($params['start']) ? (integer) $params['start'] : 0;
@@ -550 +554 @@
           $this->triggerBlog();
      }
+
+        /**
+        Set category position
+
+        @param  id              <b>integer</b>          Category ID
+        @param  left            <b>integer</b>          Category ID before
+        @param  right           <b>integer</b>          Category ID after
+        */
+        public function updCategoryPosition($id,$left,$right)
+        {
+                $this->categories()->updatePosition($id,$left,$right);
+                $this->triggerBlog();
+        }
      
      /**

inc/core/class.dc.blog.php

@@ -203 +203 @@
      @param    ids       <b>mixed</b>        Comment(s) ID(s)
      @param    del       <b>boolean</b>      If comment is delete, set this to true
-     */
-     public function triggerComments($ids,$del=false)
-     {
-          $co_ids = dcUtils::cleanIds($ids);
-          
-          # a) Retrieve posts affected by comments edition
+     @param    affected_posts      <b>mixed</b>        Posts(s) ID(s)
+     */
+     public function triggerComments($ids, $del=false, $affected_posts=null)
+     {
+          $comments_ids = dcUtils::cleanIds($ids);
+          
+          # Get posts affected by comments edition
+          if (empty($affected_posts)) {
+               $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()) {
+                    $affected_posts[] = (integer) $rs->post_id;
+               }
+          }
+          
+          if (!is_array($affected_posts) || empty($affected_posts)) {
+               return;
+          }
+          
+          # Count number of comments if exists for affected posts
           $strReq = 
-               'SELECT post_id, comment_trackback '.
-               'FROM '.$this->prefix.'comment '.
-               'WHERE comment_id'.$this->con->in($co_ids).
-               'GROUP BY post_id,comment_trackback';
-          
-          $rs = $this->con->select($strReq);
-          
-          $a_ids = $a_tbs = array();
-          while ($rs->fetch()) {
-               $a_ids[] = (integer) $rs->post_id;
-               $a_tbs[] = (integer) $rs->comment_trackback;
-          }
-          
-          # b) Count comments of each posts previously retrieved
-          # Note that this does not return posts without comment
-          $strReq = 
-               'SELECT post_id, COUNT(post_id) AS nb_comment,comment_trackback '.
+               'SELECT post_id, COUNT(post_id) AS nb_comment, comment_trackback '.
                'FROM '.$this->prefix.'comment '.
                'WHERE comment_status = 1 '.
-               (count($a_ids) > 0 ? 'AND post_id'.$this->con->in($a_ids) : ' ');
-          
-          if ($del) {
-               $strReq .= 
-                    'AND comment_id NOT'.$this->con->in($co_ids);
-          }
-          
-          $strReq .= 
+               'AND post_id'.$this->con->in($affected_posts).
                'GROUP BY post_id,comment_trackback';
           
           $rs = $this->con->select($strReq);
           
-          $b_ids = $b_tbs = $b_nbs = array();
+          $posts = array();
           while ($rs->fetch()) {
-               $b_ids[] = (integer) $rs->post_id;
-               $b_tbs[] = (integer) $rs->comment_trackback;
-               $b_nbs[] = (integer) $rs->nb_comment;
-          }
-          
-          # c) Update comments numbers on posts
-          # This compare previous requests to update also posts without comment
+               if ($rs->comment_trackback) {
+                    $posts[$rs->post_id]['trackback'] = $rs->nb_comment;
+               } else {
+                    $posts[$rs->post_id]['comment'] = $rs->nb_comment;
+               }
+          }
+          
+          # Update number of comments on affected posts
           $cur = $this->con->openCursor($this->prefix.'post');
-          
-          foreach($a_ids as $a_key => $a_id)
-          {
-               $nb_comment = $nb_trackback = 0;
-               foreach($b_ids as $b_key => $b_id)
-               {
-                    if ($a_id != $b_id || $a_tbs[$a_key] != $b_tbs[$b_key]) {
-                         continue;
-                    }
-                    
-                    if ($b_tbs[$b_key]) {
-                         $nb_trackback = $b_nbs[$b_key];
-                    } else {
-                         $nb_comment = $b_nbs[$b_key];
-                    }
-               }
-               
-               if ($a_tbs[$a_key]) {
-                    $cur->nb_trackback = $nb_trackback;
+          foreach($affected_posts as $post_id)
+          {
+               $cur->clean();
+               
+               if (!array_key_exists($post_id,$posts)) {
+                    $cur->nb_trackback = 0;
+                    $cur->nb_comment = 0;
                } else {
-                    $cur->nb_comment = $nb_comment;
-               }
-               $cur->update('WHERE post_id = '.$a_id);
+                    $cur->nb_trackback = empty($posts[$post_id]['trackback']) ? 0 : $posts[$post_id]['trackback'];
+                    $cur->nb_comment = empty($posts[$post_id]['comment']) ? 0 : $posts[$post_id]['comment'];
+               }
+               
+               $cur->update('WHERE post_id = '.$post_id);
           }
      }
@@ -509 +498 @@
           $this->core->callBehavior('coreBeforeCategoryCreate',$this,$cur);
           
-          $this->categories()->addNode($cur,$parent);
+          $id = $this->categories()->addNode($cur,$parent);
+          # Update category's cursor
+          $rs = $this->getCategory($id);
+          if (!$rs->isEmpty()) {
+               $cur->cat_lft = $rs->cat_lft;
+               $cur->cat_rgt = $rs->cat_rgt;
+          }
           
           # --BEHAVIOR-- coreAfterCategoryCreate
@@ -739 +734 @@
      - 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)
-     - post_id: (integer) Get entry with given post_id
+     - post_id: (integer or array) Get entry with given post_id
      - post_url: Get entry with given post_url field
      - user_id: (integer) Get entries belonging to given user ID
@@ -759 +754 @@
      - limit: Limit parameter
      - 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
@@ -852 +848 @@
                }
                $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'])) {
+                    array_walk($params['exclude_post_id'],create_function('&$v,$k','if($v!==null){$v=(integer)$v;}'));
+               } else {
+                    $params['exclude_post_id'] = array((integer) $params['exclude_post_id']);
+               }
+               $strReq .= 'AND P.post_id NOT '.$this->con->in($params['exclude_post_id']);
           }
           
@@ -2235 +2240 @@
           $co_ids = dcUtils::cleanIds($ids);
           
-          if (empty($ids)) {
+          if (empty($co_ids)) {
                throw new Exception(__('No such comment ID'));
+          }
+          
+          # Retrieve posts affected by comments edition
+          $affected_posts = array();
+          $strReq =
+               'SELECT post_id '.
+               'FROM '.$this->prefix.'comment '.
+               '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;
           }
           
@@ -2266 +2285 @@
           
           $this->con->execute($strReq);
-          $this->triggerComments($co_ids,true);
+          $this->triggerComments($co_ids, true, $affected_posts);
           $this->triggerBlog();
      }
@@ -2321 +2340 @@
           
           if ($cur->comment_site !== null && $cur->comment_site != '') {
-               if (!preg_match('|^http(s?)://|',$cur->comment_site)) {
+               if (!preg_match('|^http(s?)://|i',$cur->comment_site, $matches)) {
                     $cur->comment_site = 'http://'.$cur->comment_site;
+               }else{
+                    $cur->comment_site = strtolower($matches[0]).substr($cur->comment_site, strlen($matches[0]));
                }
           }