Changeset 537 for trunk

Timestamp:

05/09/08 14:32:35 (7 months ago)

Author:

sidtheduck

Message:

+ Fix for ticket #78 - uses the md5 file key of uploaded files as a unique id for import- thumb prefix.
(may be a little messy with the long filenames, but I couldn't think of an easier way at the moment to do unique names for import thumbs)

Location:

trunk/admin

Files:

• plog-import.php (modified) (1 diff)
• plog-thumb.php (modified) (3 diffs)

trunk/admin/plog-import.php

@@ -102 +102 @@
                                                         $imported++;
                                                         // delete thumbnail file if it exists
-                                                        $thumbpath = $config['basedir'] . 'thumbs/import-' . basename($file_name);
+                                                        $thumbpath = $config['basedir'] . 'thumbs/import-'.$file_key.'-'.basename($file_name);
                                                         if (is_file($thumbpath) && is_readable($thumbpath))
                                                         {

trunk/admin/plog-thumb.php

@@ -3 +3 @@
 // first it will be used for import only.
 
-if (empty($_GET["img"])) {
+if (empty($_GET['img'])) {
         return "No such image";
-};
+}
 
 require_once("../plog-functions.php");
@@ -13 +13 @@
 
 
-$files = get_files($config['basedir'] . 'uploads');
+$files = get_files($config['basedir'] . "uploads");
 
 
@@ -19 +19 @@
 $found = false;
 
-$up_dir = $config['basedir'] . 'uploads';
+$up_dir = $config['basedir'] . "uploads";
 
 foreach($files as $file) {
-        if (md5($file) == $_GET["img"]) {
+        if (md5($file) == $_GET['img']) {
                 $found = true;
                 $rname = substr($file,strlen($up_dir)+1);
 
-                $thumbpath = generate_thumb($up_dir.'/'.$rname,"import",THUMB_SMALL);
+                $thumbpath = generate_thumb($up_dir.'/'.$rname,"import-".md5($file),THUMB_SMALL);
                 print '<img src="'.$thumbpath.'" /></div>';
                 //print "found $relative_name!";
                 break;
-        };
-};
+        }
+}
 
 ?>