Changeset 401 for branches

Timestamp:

05/15/06 19:14:50 (3 years ago)

Author:

stefan

Message:

Continuing tag development:

• Removed unused import, added check for actual exif data, changed from tabs to spaces and extracted an "insert_picture" function in plog-admin-functions.php
• Changed the index type in the tag related tables from INDEX to UNIQUE in both _install.php and _upgrade.php.
• Added some tag functionality:
  • Added delete_picture_tags($picture_id) to delete all tag associations with a particular picture.
  • Added get_tag_by_name and get_tag_by_id functions.
  • Started to create the get_popular_tags function.
  • Added insert_tag to abstract the core task of adding a tag to the database.
  • Added a add_picture_tags method that adds tags to a specified picture. The method adds tags to the database if needed but reuses older tag definitions if they exist.
  • Added delete_tags function that removes tags by their ids and also removes all picture tag associations
• Continued development of tag unit tests:
  • Added setUp() and tearDown() functions that add and remove a test collection and album used for the test run.
  • Added test_add_tags() that thoroughly tests the add tag functionality.

Location:

branches/plogger-with-tags

Files:

• _install.php (modified) (1 diff)
• _upgrade.php (modified) (1 diff)
• admin/plog-admin-functions.php (modified) (7 diffs)
• plog-tag-functions.php (modified) (5 diffs)
• unittests/tag-tests.php (modified) (3 diffs)

branches/plogger-with-tags/_install.php

@@ -257 +257 @@
                   `urlified` char(50) NOT NULL default '',
                   PRIMARY KEY  (`id`),
-                  KEY `tag` (`tag`),
-                  KEY `urlified` (`urlified`)
+                  UNIQUE `tag` (`tag`),
+                  UNIQUE `urlified` (`urlified`)
                 ) Type=MyISAM $default_charset";
                 mysql_query($query) or die(mysql_error().'<br /><br />'. $query);

branches/plogger-with-tags/_upgrade.php

@@ -135 +135 @@
         `urlified` char(50) NOT NULL default '',
         PRIMARY KEY  (`id`),
-        KEY `tag` (`tag`),
-        KEY `urlified` (`urlified`)
+        UNIQUE `tag` (`tag`),
+        UNIQUE `urlified` (`urlified`)
 ");
 

branches/plogger-with-tags/admin/plog-admin-functions.php

@@ -1 +1 @@
 <?php
-require_once("plog-admin.php");
+//require_once("plog-admin.php");
 require_once("../plog-load_config.php");
 require_once($config['basedir'] . "/plog-functions.php");
@@ -6 +6 @@
 
 function get_files($directory) {
-        // Try to open the directory
-        if($dir = opendir($directory)) {
-        // Create an array for all files found
-        $tmp = Array();
-
-        // Add the files
-        while($file = readdir($dir)) {
-                // Make sure the file exists
-                if($file != "." && $file != ".." && $file[0] != '.') {
-                        // If it's a directiry, list all files within it
-                        if(is_dir($directory . "/" . $file)) {
-                                $tmp2 = get_files($directory . "/" . $file);
-                                if(is_array($tmp2)) {
-                                        $tmp = array_merge($tmp, $tmp2);
-                                }
-                        } else if (is_readable($directory . "/" . $file)) {
-                                $filename = basename(stripslashes($file));
-                                $pi = pathinfo($file);
-                                if (is_allowed_extension($pi["extension"])) {
-                                        array_push($tmp, $directory . "/" . $file);
-                                }
-                        }
-           }
-       }
-       // Finish off the function
-       closedir($dir);
-       return $tmp;
+   // Try to open the directory
+   if($dir = opendir($directory)) {
+      // Create an array for all files found
+      $tmp = Array();
+      // Add the files
+      while($file = readdir($dir)) {
+         // Make sure the file exists
+         if($file != "." && $file != ".." && $file[0] != '.') {
+            // If it's a directiry, list all files within it
+            if(is_dir($directory . "/" . $file)) {
+               $tmp2 = get_files($directory . "/" . $file);
+               if(is_array($tmp2)) {
+                  $tmp = array_merge($tmp, $tmp2);
+               }
+            } else if (is_readable($directory . "/" . $file)) {
+               $filename = basename(stripslashes($file));
+               $pi = pathinfo($file);
+               if (is_allowed_extension($pi["extension"])) {
+                  array_push($tmp, $directory . "/" . $file);
+               }
+            }
+         }
+      }
+      // Finish off the function
+      closedir($dir);
+      return $tmp;
    }
 }
 
 function add_picture($album_id,$tmpname,$filename,$caption,$desc) {
-        global $TABLE_PREFIX;
-        global $config;
-
-        
-        $filename_parts = explode(".",strrev($filename),2);
-        $filename_base = strrev($filename_parts[1]);
-        $filename_ext = strrev($filename_parts[0]);
-
-        $result = array(
-                'output' => '',
-                'picture_id' => false,
-        );
-
-        $i = 0;
-
-        $unique_filename_base = strtolower(sanitize_filename($filename_base));
-
-        // now get the name of the collection
-
-        $sql = "SELECT c.path AS collection_path, c.id AS collection_id,
-                        a.path AS album_path, a.id AS album_id
-                        FROM ".$TABLE_PREFIX."albums a, ".$TABLE_PREFIX."collections c
-                        WHERE c.id = a.parent_id AND a.id = '$album_id'";
-
-        $sql_result = run_query($sql);
-        $albumdata = mysql_fetch_assoc($sql_result);
-
-        // this shouldn't happen in normal cases
-        if (empty($albumdata)) {
-                $result['errors'] .= 'No such album!';
-                return $result;
-        }
-
-        $dest_album_name = SmartStripSlashes($albumdata["album_path"]);
-        $dest_collection_name = SmartStripSlashes($albumdata["collection_path"]);
-
-        $create_path = $dest_collection_name."/".$dest_album_name;
-
-        while (is_file('images/'.$create_path."/".$unique_filename_base . "." . $filename_ext)){
-                $unique_filename_base = $filename_base . " (" . ++$i .")";
-        }
-
-        $final_filename = $unique_filename_base . "." . $filename_ext;
-
-        // final fully qualified file name
-        $final_fqfn = $config["basedir"].'images/'.$create_path.'/'.$final_filename;
-
-        if (!makeDirs($config['basedir'].'images/'.$create_path, 0777)) {
-                $result['errors'] .= 'Could not create directory '.$create_path.'!';
-                return $result;
-        };
-
-        // cannot use move_uploaded_file here, because plog-import uses the same function and 
-        // and doesn't deal with uploaded files
-        //if (!move_uploaded_file($tmpname,$final_fqfn)) {
-
-        if (is_uploaded_file($tmpname)) {
-                if (!move_uploaded_file($tmpname,$final_fqfn)) {
-                        $result['errors'] .= 'Could not move uploaded file! ' . $tmpname .' to '.$final_fqfn;
-                        return $result;
-                } 
-        }
-        else
-        if (!rename($tmpname,$final_fqfn)) {
-                $result['errors'] .= 'Could not move file! ' . $tmpname .' to '.$final_fqfn;
-                return $result;
-        };
-
-        @unlink($tmpname);
-        $res = chmod($final_fqfn, 0755);
-
-        // Get the EXIF data.
-        $exif_raw = read_exif_data_raw($final_fqfn);
-        $exif = array();
-
-        $exif["date_taken"] = (isset($exif_raw["IFD0"]["DateTime"])) ? trim($exif_raw["IFD0"]["DateTime"]) : '';
-        $exif["camera"] = (isset($exif_raw["IFD0"]["Make"]) && isset($exif_raw["IFD0"]["Model"])) ? trim($exif_raw["IFD0"]["Make"]) . " " . trim($exif_raw["IFD0"]["Model"]) : '';
-        $exif["shutter_speed"] = (isset($exif_raw["SubIFD"]["ExposureTime"])) ? $exif_raw["SubIFD"]["ExposureTime"] : '';
-        $exif["focal_length"] = (isset($exif_raw["SubIFD"]["FocalLength"])) ? $exif_raw["SubIFD"]["FocalLength"] : '';
-        $exif["flash"] = (isset($exif_raw["SubIFD"]["Flash"])) ? $exif_raw["SubIFD"]["Flash"] : '';
-        $exif["aperture"] = (isset($exif_raw["SubIFD"]["FNumber"])) ? $exif_raw["SubIFD"]["FNumber"] : '';
-
-        $picture_path = $create_path . "/" . $final_filename;
-
-        $query = "INSERT INTO `".$TABLE_PREFIX."pictures`
-                (`parent_collection`,
-                `parent_album`,
-                `path`,
-                `date_modified`,
-                `date_submitted`,
-                `allow_comments`,
-                `EXIF_date_taken`,
-                `EXIF_camera`,
-                `EXIF_shutterspeed`,
-                `EXIF_focallength`,
-                `EXIF_flash`,
-                `EXIF_aperture`,
-                `caption`,
-                `description`)
-                VALUES
-          ('".$albumdata['collection_id']."',
-           '".$albumdata['album_id']."','".mysql_escape_string($picture_path)."',
+   global $TABLE_PREFIX;
+   global $config;
+
+   $filename_parts = explode(".",strrev($filename),2);
+   $filename_base = strrev($filename_parts[1]);
+   $filename_ext = strrev($filename_parts[0]);
+
+   $result = array(
+      'output' => '',
+      'picture_id' => false,
+   );
+
+   $i = 0;
+
+   $unique_filename_base = strtolower(sanitize_filename($filename_base));
+
+   // now get the name of the collection
+
+   $sql = "SELECT c.path AS collection_path, c.id AS collection_id,
+           a.path AS album_path, a.id AS album_id
+           FROM ".$TABLE_PREFIX."albums a, ".$TABLE_PREFIX."collections c
+           WHERE c.id = a.parent_id AND a.id = '$album_id'";
+
+   $sql_result = run_query($sql);
+   $albumdata = mysql_fetch_assoc($sql_result);
+
+   // this shouldn't happen in normal cases
+   if (empty($albumdata)) {
+      $result['errors'] .= 'No such album!';
+      return $result;
+   }
+
+   $dest_album_name = SmartStripSlashes($albumdata["album_path"]);
+   $dest_collection_name = SmartStripSlashes($albumdata["collection_path"]);
+
+   $create_path = $dest_collection_name."/".$dest_album_name;
+
+   while (is_file('images/'.$create_path."/".$unique_filename_base . "." . $filename_ext)){
+      $unique_filename_base = $filename_base . " (" . ++$i .")";
+   }
+
+   $final_filename = $unique_filename_base . "." . $filename_ext;
+
+   // final fully qualified file name
+   $final_fqfn = $config["basedir"].'images/'.$create_path.'/'.$final_filename;
+
+   if (!makeDirs($config['basedir'].'images/'.$create_path, 0777)) {
+      $result['errors'] .= 'Could not create directory '.$create_path.'!';
+      return $result;
+   };
+
+   // cannot use move_uploaded_file here, because plog-import uses the same function and 
+   // and doesn't deal with uploaded files
+   //if (!move_uploaded_file($tmpname,$final_fqfn)) {
+
+   if (is_uploaded_file($tmpname)) {
+      if (!move_uploaded_file($tmpname,$final_fqfn)) {
+         $result['errors'] .= 'Could not move uploaded file! ' . $tmpname .' to '.$final_fqfn;
+         return $result;
+      } 
+   }
+   else
+   if (!rename($tmpname,$final_fqfn)) {
+      $result['errors'] .= 'Could not move file! ' . $tmpname .' to '.$final_fqfn;
+      return $result;
+   };
+
+   @unlink($tmpname);
+   $res = chmod($final_fqfn, 0755);
+
+   // Get the EXIF data.
+   $exif_raw = read_exif_data_raw($final_fqfn,false);
+   $exif = array();
+
+   $exif["date_taken"] = (isset($exif_raw["IFD0"]["DateTime"])) ? trim($exif_raw["IFD0"]["DateTime"]) : '';
+   $exif["camera"] = (isset($exif_raw["IFD0"]["Make"]) && isset($exif_raw["IFD0"]["Model"])) ? trim($exif_raw["IFD0"]["Make"]) . " " . trim($exif_raw["IFD0"]["Model"]) : '';
+   $exif["shutter_speed"] = (isset($exif_raw["SubIFD"]["ExposureTime"])) ? $exif_raw["SubIFD"]["ExposureTime"] : '';
+   $exif["focal_length"] = (isset($exif_raw["SubIFD"]["FocalLength"])) ? $exif_raw["SubIFD"]["FocalLength"] : '';
+   $exif["flash"] = (isset($exif_raw["SubIFD"]["Flash"])) ? $exif_raw["SubIFD"]["Flash"] : '';
+   $exif["aperture"] = (isset($exif_raw["SubIFD"]["FNumber"])) ? $exif_raw["SubIFD"]["FNumber"] : '';
+
+   $picture_path = $create_path . "/" . $final_filename;
+
+   $result = insert_picture($albumdata['collection_id'],$albumdata['album_id'],$picture_path,$exif,$caption,$desc,$filename);
+
+   // let's generate the thumbnail and the large thumbnail right away.
+   // this way, the user won't see any latency from the thumbnail generation
+   // when viewing the gallery for the first time
+   // this also helps with the image pre-loading problem introduced
+   // by a javascript slideshow.
+
+   $thumbpath = generate_thumb($picture_path, $result['picture_id'],THUMB_SMALL);
+   #$thumbpath = generate_thumb($picture_path, $result['picture_id'],THUMB_LARGE);
+
+   return $result;
+};
+
+function insert_picture($collection_id,$album_id,$picture_path,$exif,$caption,$desc,$filename) {
+   global $TABLE_PREFIX;
+
+   $query = "INSERT INTO `".$TABLE_PREFIX."pictures`
+      (`parent_collection`,
+      `parent_album`,
+      `path`,
+      `date_modified`,
+      `date_submitted`,
+      `allow_comments`,
+      `EXIF_date_taken`,
+      `EXIF_camera`,
+      `EXIF_shutterspeed`,
+      `EXIF_focallength`,
+      `EXIF_flash`,
+      `EXIF_aperture`,
+      `caption`,
+      `description`)
+      VALUES
+          ('".$collection_id."',
+           '".$album_id."','".mysql_escape_string($picture_path)."',
            NOW(),
            NOW(),
            1,
-           '".mysql_escape_string($exif["date_taken"])."',
-           '".mysql_escape_string($exif["camera"])."',
-           '".mysql_escape_string($exif["shutter_speed"])."',
-           '".mysql_escape_string($exif["focal_length"])."',
-           '".mysql_escape_string($exif["flash"])."',
-           '".mysql_escape_string($exif["aperture"])."',
+           '".mysql_escape_string(isset($exif) ? $exif["date_taken"] : "")."',
+           '".mysql_escape_string(isset($exif) ? $exif["camera"] : "")."',
+           '".mysql_escape_string(isset($exif) ? $exif["shutter_speed"] : "")."',
+           '".mysql_escape_string(isset($exif) ? $exif["focal_length"] : "")."',
+           '".mysql_escape_string(isset($exif) ? $exif["flash"] : "")."',
+           '".mysql_escape_string(isset($exif) ? $exif["aperture"] : "")."',
            '".mysql_escape_string($caption)."',
            '".mysql_escape_string($desc)."')";
-           
-        $sql_result = run_query($query);
-
-        $result['output'] .= 'Your photo ('.$filename.') was uploaded successfully.';
-        $result['picture_id'] = mysql_insert_id();
-        
-        // let's generate the thumbnail and the large thumbnail right away.
-        // this way, the user won't see any latency from the thumbnail generation
-        // when viewing the gallery for the first time
-        // this also helps with the image pre-loading problem introduced
-        // by a javascript slideshow.
-        
-        $thumbpath = generate_thumb($picture_path, $result['picture_id'],THUMB_SMALL);
-        #$thumbpath = generate_thumb($picture_path, $result['picture_id'],THUMB_LARGE);
-        
-        return $result;
+
+   $sql_result = run_query($query);
+
+   $result['output'] .= 'Your photo ('.$filename.') was uploaded successfully.';
+   $result['picture_id'] = mysql_insert_id();
+   return $result;
+}
+
+function update_picture($id,$caption,$allow_comments,$description) {
+   global $TABLE_PREFIX;
+   $id = intval($id);
+   $caption = mysql_real_escape_string($caption);
+   $description = mysql_real_escape_string($description);
+   $allow_comments = intval($allow_comments);
+   $query = "UPDATE ".$TABLE_PREFIX."pictures SET
+         caption = '$caption',
+         description = '$description',
+         allow_comments = '$allow_comments'
+      WHERE id='$id'";
+   $result = mysql_query($query);
+   if ($result) 
+      return array('output' => 'You have successfully modified the selected picture.');
+   else
+      return array('errors' => mysql_error());
+}
+
+function move_picture($pic_id,$to_album) {
+   global $TABLE_PREFIX;
+   global $config;
+   // we need the parent_id from the album we're changing to
+   $to_album = intval($to_album);
+   $pic_id = intval($pic_id);
+
+   $query = "SELECT * FROM ".$TABLE_PREFIX."albums WHERE `id` = '$to_album'";
+   $result = run_query($query);
+   $row = mysql_fetch_assoc($result);
+
+   if (!is_array($row)) {
+      return array('errors' => 'There is no album with id ' . $to_album);
+   };
+
+   $new_collection = $row['parent_id'];
+
+   // move picture to new location
+   // we need to query to get collection names and album names to find new directory path
+
+   $picture = get_picture_by_id($pic_id);
+   $album = get_album_by_id($to_album);
+
+   $filename = SmartStripSlashes(basename($picture['path']));
+   $directory = SmartStripSlashes($album['collection_path'])."/".SmartStripSlashes($album['album_path'])."/";
+   $new_path = $directory.$filename;
+
+   if (!rename($config['basedir']."images/".SmartStripSlashes($picture['path']), $config['basedir']."images/".$new_path)) {
+      return array('errors' => "Error moving file! ($picture[path] to $new_path)");
+   };
+
+   $new_path = mysql_real_escape_string($new_path);
+
+   // update database
+   $sql = "UPDATE ".$TABLE_PREFIX."pictures SET
+         path = '$new_path',
+         parent_album = '$to_album',
+         parent_collection = '$new_collection'
+      WHERE id = '$pic_id'";
+   if (!mysql_query($sql)) {
+      return array('errors' => mysql_error());
+   };
+   return array('output' => 'Success');
+}
+
+function delete_picture($del_id) {
+   global $TABLE_PREFIX;
+   global $config;
+   $del_id = intval($del_id);
+   global $thumbnail_config;
+   $picture = get_picture_by_id($del_id);
+   if ($picture) {
+      $query = "DELETE FROM ".$TABLE_PREFIX."pictures WHERE `id`= '" . $picture['id'] . "'";
+      run_query($query);
+
+      // delete all comments for the picture
+      $query = "DELETE FROM ".$TABLE_PREFIX."comments WHERE `parent_id`= '" . $picture['id'] . "'";
+      run_query($query);
+
+      // make sure that the file is actually located inside our images directory
+      $full_path = realpath($config['basedir'] . 'images/' . $picture['path']);
+      // also check whether this image is in the correct folder
+      $relative_path = substr($full_path,0,strlen($config['basedir']));
+      $basename = basename($picture['path']);
+      if ($relative_path == $config['basedir']) {
+         foreach($thumbnail_config as $tkey => $tval) {
+            $thumbpath = $config['basedir'].'thumbs/'.$tval['filename_prefix'].$picture['id'].'-'.$basename;
+            if (file_exists($thumbpath) && is_writable($thumbpath)) {
+               //print "deleting $thumbpath<br/>";
+               @chmod($thumbpath, 0777);
+               unlink($thumbpath);
+            };
+         };
+         if (is_file($full_path)) {
+            // print "deleting $full_path<br/>";
+            @chmod($full_path, 0777);
+
+            if (!unlink($full_path))
+                return array('errors' => 'Could not physically delete file from disk!');
+         };
+      } else {
+         return array('errors' => 'Picture has invalid path, ignoring delete request');
+      };
+   } else {
+      return array('errors' => 'There is no picture with id ' . $del_id);
+   };
 };
 
-function update_picture($id,$caption,$allow_comments,$description) {
-        global $TABLE_PREFIX;
-        $id = intval($id);
-        $caption = mysql_real_escape_string($caption);
-        $description = mysql_real_escape_string($description);
-        $allow_comments = intval($allow_comments);
-        $query = "UPDATE ".$TABLE_PREFIX."pictures SET
-                        caption = '$caption',
-                        description = '$description',
-                        allow_comments = '$allow_comments'
-                WHERE id='$id'";
-        $result = mysql_query($query);
-        if ($result) 
-                return array('output' => 'You have successfully modified the selected picture.');
-        else
-                return array('errors' => mysql_error());
-}
-
-function move_picture($pic_id,$to_album) {
-        global $TABLE_PREFIX;
-        global $config;
-        // we need the parent_id from the album we're changing to
-        $to_album = intval($to_album);
-        $pic_id = intval($pic_id);
-
-        $query = "SELECT * FROM ".$TABLE_PREFIX."albums WHERE `id` = '$to_album'";
-        $result = run_query($query);
-        $row = mysql_fetch_assoc($result);
-
-        if (!is_array($row)) {
-                return array('errors' => 'There is no album with id ' . $to_album);
-        };
-                
-        $new_collection = $row['parent_id'];
-        
-
-        // move picture to new location
-        // we need to query to get collection names and album names to find new directory path
-
-        $picture = get_picture_by_id($pic_id);
-        $album = get_album_by_id($to_album);
-
-        $filename = SmartStripSlashes(basename($picture['path']));
-        $directory = SmartStripSlashes($album['collection_path'])."/".SmartStripSlashes($album['album_path'])."/";
-        $new_path = $directory.$filename;
-
-        if (!rename($config['basedir']."images/".SmartStripSlashes($picture['path']), $config['basedir']."images/".$new_path)) {
-                return array('errors' => "Error moving file! ($picture[path] to $new_path)");
-        };
-
-        $new_path = mysql_real_escape_string($new_path);
-        
-        // update database
-        $sql = "UPDATE ".$TABLE_PREFIX."pictures SET
-                        path = '$new_path',
-                        parent_album = '$to_album',
-                        parent_collection = '$new_collection'
-                WHERE id = '$pic_id'";
-        if (!mysql_query($sql)) {
-                return array('errors' => mysql_error());
-        };
-        return array('output' => 'Success');
-}
-                
-function delete_picture($del_id) {
-        global $TABLE_PREFIX;
-        global $config;
-        $del_id = intval($del_id);
-        global $thumbnail_config;
-        $picture = get_picture_by_id($del_id);
-        if ($picture) {
-                
-                $query = "DELETE FROM ".$TABLE_PREFIX."pictures WHERE `id`= '" . $picture['id'] . "'";
-                run_query($query);
-                
-                // delete all comments for the picture
-                $query = "DELETE FROM ".$TABLE_PREFIX."comments WHERE `parent_id`= '" . $picture['id'] . "'";
-                run_query($query);
-
-                // make sure that the file is actually located inside our images directory
-                $full_path = realpath($config['basedir'] . 'images/' . $picture['path']);
-                // also check whether this image is in the correct folder
-                $relative_path = substr($full_path,0,strlen($config['basedir']));
-                $basename = basename($picture['path']);
-                if ($relative_path == $config['basedir']) {
-                        foreach($thumbnail_config as $tkey => $tval) {
-                                $thumbpath = $config['basedir'].'thumbs/'.$tval['filename_prefix'].$picture['id'].'-'.$basename;
-                                if (file_exists($thumbpath) && is_writable($thumbpath)) {
-                                        //print "deleting $thumbpath<br/>";
-                                        @chmod($thumbpath, 0777);
-                                        unlink($thumbpath);
-                                };
-                        };
-                        if (is_file($full_path)) {
-                                // print "deleting $full_path<br/>";
-                                @chmod($full_path, 0777);
-                                
-                                if (!unlink($full_path))
-                                         return array('errors' => 'Could not physically delete file from disk!');
-                        };
-                } else {
-                        return array('errors' => 'Picture has invalid path, ignoring delete request');
-                };
-        } else {
-                return array('errors' => 'There is no picture with id ' . $del_id);
-        };
-};
-
 function add_collection($collection_name, $description) {
-        global $config;
-        global $TABLE_PREFIX;
-        $output = $errors = "";
-        $id = 0;
-        $collection_name = trim(SmartStripSlashes($collection_name));
-        if (empty($collection_name)) {
-                return array("errors" => "Please enter a valid name for the collection");
-        };
-
-        // 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
-        // a new row into collections table, otherwise the collection will not be usable
-        // anyway
-        $create_path = $config["basedir"] . "/images/".$collection_folder;
-
-        // create directory
-        if (!makeDirs($create_path, 0777)) {
-                $errors .= "Could not create directory $create_path!</p>";
-        } else {
-                $sql_name = mysql_real_escape_string($collection_name);
-                $description = mysql_real_escape_string($description);
-                $collection_folder = mysql_real_escape_string($collection_folder);
-                $query = "INSERT INTO ".$TABLE_PREFIX."collections  (`name`,`description`,`path`) VALUES ('$sql_name', '$description', '$collection_folder')";
-                $result = run_query($query);
-                $id = mysql_insert_id();
-
-                $output .= 'You have successfully created the collection <strong>'.$collection_name.'.</strong>';    
-        };
-
-        // caller can check the value of id, if it is zero, then collection creation failed
-        // errors and output are separate, because this way the caller can format the return value
-        // as it needs
-        $result = array(
-                "output" => $output,
-                "errors" => $errors,
-                "id" => $id,
-        );
-        return $result;
+   global $config;
+   global $TABLE_PREFIX;
+   $output = $errors = "";
+   $id = 0;
+   $collection_name = trim(SmartStripSlashes($collection_name));
+   if (empty($collection_name)) {
+      return array("errors" => "Please enter a valid name for the collection");
+   };
+
+   // 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
+   // a new row into collections table, otherwise the collection will not be usable
+   // anyway
+   $create_path = $config["basedir"] . "/images/".$collection_folder;
+
+   // create directory
+   if (!makeDirs($create_path, 0777)) {
+      $errors .= "Could not create directory $create_path!</p>";
+   } else {
+      $sql_name = mysql_real_escape_string($collection_name);
+      $description = mysql_real_escape_string($description);
+      $collection_folder = mysql_real_escape_string($collection_folder);
+      $query = "INSERT INTO ".$TABLE_PREFIX."collections  (`name`,`description`,`path`) VALUES ('$sql_name', '$description', '$collection_folder')";
+      $result = run_query($query);
+      $id = mysql_insert_id();
+
+      $output .= 'You have successfully created the collection <strong>'.$collection_name.'.</strong>';    
+   };
+
+   // caller can check the value of id, if it is zero, then collection creation failed
+   // errors and output are separate, because this way the caller can format the return value
+   // as it needs
+   $result = array(
+      "output" => $output,
+      "errors" => $errors,
+      "id" => $id,
+   );
+   return $result;
 
 }
 
 function update_collection($collection_id,$name,$description,$thumbnail_id = 0) {
-        global $TABLE_PREFIX;
-        global $config;
-
-        $errors = $output = "";
-        
-        $name = trim(SmartStripSlashes($name));
-        if (empty($name)) {
-                return array("errors" => "Please enter a valid name for the collection");
-        };
-