Changeset 1545:84fe045224ab

Timestamp:

08/23/13 15:40:43 (10 years ago)

Author:

Franck Paul <carnet.franck.paul@…>

Branch:

2.5

Parents:

1538:b956d78197c5 (diff), 1544:44671003d62c (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:

Merged in lipki/dotclear/Ticket #1430 (pull request #33) - fixes #1430

Files:

• inc/core/class.dc.blog.php (modified) (3 diffs)
• inc/core/class.dc.blog.php (modified) (2 diffs)

inc/core/class.dc.blog.php

@@ -733 +733 @@
      - 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
@@ -753 +753 @@
      - 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
@@ -846 +847 @@
                }
                $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']);
           }
           

inc/core/class.dc.blog.php

@@ -645 +645 @@
      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.' ';
-          }
+          # Let's check if URL is taken...
+          $strReq = 
+               'SELECT cat_url FROM '.$this->prefix.'category '.
+               "WHERE cat_url = '".$this->con->escape($url)."' ".
+               ($id ? 'AND cat_id <> '.(integer) $id. ' ' : '').
+               "AND blog_id = '".$this->con->escape($this->id)."' ".
+               'ORDER BY cat_url DESC';
           
           $rs = $this->con->select($strReq);
           
-          if (!$rs->isEmpty()) {
-               throw new Exception(__('Category URL must be unique.'));
-          }
+          if (!$rs->isEmpty())
+          {
+               if ($this->con->driver() == 'mysql') {
+                    $clause = "REGEXP '^".$this->con->escape($url)."[0-9]+$'";
+               } elseif ($this->con->driver() == 'pgsql') {
+                    $clause = "~ '^".$this->con->escape($url)."[0-9]+$'";
+               } else {
+                    $clause = "LIKE '".$this->con->escape($url)."%'";
+               }
+               $strReq = 
+                    'SELECT cat_url FROM '.$this->prefix.'category '.
+                    "WHERE cat_url ".$clause.' '.
+                    ($id ? 'AND cat_id <> '.(integer) $id. ' ' : '').
+                    "AND blog_id = '".$this->con->escape($this->id)."' ".
+                    'ORDER BY cat_url DESC ';
+               
+               $rs = $this->con->select($strReq);
+               $a = array();
+               while ($rs->fetch()) {
+                    $a[] = $rs->cat_url;
+               }
+               
+               natsort($a);
+               $t_url = end($a);
+               
+               if (preg_match('/(.*?)([0-9]+)$/',$t_url,$m)) {
+                    $i = (integer) $m[2];
+                    $url = $m[1];
+               } else {
+                    $i = 1;
+               }
+               
+               return $url.($i+1);
+          }
+          
+          # URL is empty?
+          if ($url == '') {
+               throw new Exception(__('Empty category URL'));
+          }
+          
+          return $url;
      }
      
@@ -680 +717 @@
           
           # Check if title or url are unique
-          $this->checkCategory($cur->cat_title,$cur->cat_url,$id);
+          $cur->cat_url = $this->checkCategory($cur->cat_title,$cur->cat_url,$id);
           
           if ($cur->cat_desc !== null) {