Changeset 1492:a7112dcc916c for inc/core

Timestamp:

08/20/13 11:01:52 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

1491:2b9253624dbe (diff), 1486:602b24e80834 (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) (2 diffs)

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
@@ -81 +81 @@
                $this->desc = $b->blog_desc;
                $this->url = $b->blog_url;
-               $this->host = http::getHostFromURL($this->url);
+               $this->host = preg_replace('|^([a-z]{3,}://)(.*?)/.*$|','$1$2',$this->url);
                $this->creadt = strtotime($b->blog_creadt);
                $this->upddt = strtotime($b->blog_upddt);
@@ -842 +842 @@
           
           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'])." ";
           }
           
@@ -926 +926 @@
                     $strReq .= 'ORDER BY post_dt DESC ';
                }
-          }
-          
-          if (!$count_only && !empty($params['limit'])) {
-               $strReq .= $this->con->limit($params['limit']);
+               if (!empty($params['limit'])) {
+                    $strReq .= $this->con->limit($params['limit']);
+               }
           }
           

inc/core/class.dc.blog.php

@@ -634 +634 @@
      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;
      }
      
@@ -669 +706 @@
           
           # 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) {