Changeset 157

Timestamp:

08/17/05 13:12:00 (5 years ago)

Author:

anti

Message:

+ implement get_collection_by_name
+ do not allow collections with duplicate names, ticket #60

Location:

trunk

Files:

• admin/plog-admin-functions.php (modified) (4 diffs)
• plog-functions.php (modified) (1 diff)

trunk/admin/plog-admin-functions.php

@@ -184 +184 @@
         };
 
+        // do not allow collections with duplicate names, otherwise mod_rewritten links will start
+        // to behave weird.
+        $collection_exists = get_collection_by_name($collection_name);
+        if ($collection_exists) {
+                return array("errors" => 'New collection could not be created, because there already is one named `'.$collection_exists['name'].'`!');
+        }
+
         $collection_folder = strtolower(sanitize_filename($collection_name));
         // first try to create the directory, and only if that succeeds, then insert
@@ -221 +228 @@
 
         $errors = $output = "";
+        
+        $name = trim(SmartStripSlashes($name));
+        if (empty($name)) {
+                return array("errors" => "Please enter a valid name for the collection");
+        };
 
         $target_name = strtolower(sanitize_filename($name));
-        /*
-        if (!is_valid_directory($name)) {
-                $errors .= 'Collection name contains invalid characters!';
-                return array("errors" => $errors);
-        };
-        */
+        
 
         $errors = $output = "";
@@ -240 +247 @@
         // rename the directory
         // first, get the collection name of our source collection
-        $sql = "SELECT c.path as collection_path
+        $sql = "SELECT c.path as collection_path,name
                         FROM ".$TABLE_PREFIX."collections c
                         WHERE c.id = '$collection_id'";
@@ -246 +253 @@
         $result = run_query($sql);
         $row = mysql_fetch_assoc($result);
+        
+        // do not allow collections with duplicate names, otherwise mod_rewritten links will start
+        // to behave weird.
+        $collection_exists = get_collection_by_name($name);
+        if ($row["name"] != $name && $collection_exists) {
+                return array("errors" => 'Collection `' . $row['name'] . '` could not be renamed to `'.$name.'`, because there is another collection with that name');
+        }
 
         $source_collection_name = $row["collection_path"];

trunk/plog-functions.php

@@ -84 +84 @@
         };
         return $picdata;
+}
+
+function get_collection_by_name($name) {
+        global $TABLE_PREFIX;
+        $name = mysql_real_escape_string($name);
+        $sql = "SELECT * FROM `".$TABLE_PREFIX."collections` WHERE name = '$name'";
+        $result = run_query($sql);
+        $collection = mysql_fetch_assoc($result);
+        return $collection;
 }