Changeset 91 for img

Timestamp:

05/22/10 12:28:43 (4 months ago)

Author:

daniel

Message:

- Added: Upload multiple images at once

Location:

img/trunk

Files:

• browse.php (modified) (2 diffs)
• images/add.png (added)
• index.php (modified) (2 diffs)
• lib/functions.php (modified) (1 diff)
• upload.php (modified) (1 diff)

img/trunk/browse.php

@@ -91 +91 @@
 
 } elseif(isset($_GET['user'])) {
-
         // Calculate page offset
         $page = (isset($_GET['p']) && is_numeric($_GET['p'])) ? (int)$_GET['p'] : 1;
@@ -137 +136 @@
         outputHTML('<h2>' . htmlentities(one_wordwrap(urldecode($_GET['user']), 5, '&shy;'), ENT_QUOTES, 'UTF-8', false) . '</h2>' . $images . '<br style="clear: both;" />' . $pages, array('title' => 'Tag: ' . htmlentities($_GET['user'], ENT_QUOTES, 'UTF-8'), 'lightbox' => true));
         
+} elseif(isset($_GET['ip']) && isset($_GET['time'])) {
+        $sql = "SELECT
+ ROWID as id,
+ location as name,
+ original_name
+FROM
+ images
+WHERE
+ ip = '" . $db->escape($_GET['ip']) . "' and
+ time = '" . $db->escape($_GET['time']) . "';";
+
+        $res = $db->query($sql);
+        $images = '';
+        // Generate HTML output
+        while ($row = $db->fetch($res)) {
+                $preview = dirname($row['name']) . '/preview/' . basename($row['name']);
+                $images .= '<div class="previewimage"><a href="' . $row['name'] . '" class="lightbox" rel="lightbox"><img src="' . $preview . '" alt="' . htmlentities($row['original_name'], ENT_QUOTES, 'UTF-8') . '" /></a><br />' . "\n";
+                $images .= '<a href="image.php?i=' . urlnumber_encode($row['id']) . '">Show</a></div>' . "\n";
+        }
+        
+        outputHTML('<h2>' . htmlentities(one_wordwrap(urldecode($_GET['ip'] . ' - ' . $_GET['time']), 5, '&shy;'), ENT_QUOTES, 'UTF-8', false) . '</h2>' . $images . '<br style="clear: both;" />', array('title' => 'Upload: ' . htmlentities($_GET['ip'] . ' - ' . $_GET['time'], ENT_QUOTES, 'UTF-8'), 'lightbox' => true));
 } else {
 

img/trunk/index.php

@@ -44 +44 @@
         });
 });
+
+$(document).ready(function () {
+        $('#addimage').click(function() {
+                $('#addimage').remove();
+                $('#inputimagecontainer').append('<span class=\"text\">&nbsp;</span><input type=\"file\" size=\"39\" name=\"image[]\" />&nbsp;' +
+                        '<img src=\"images/add.png\" id=\"addimage\" alt=\"Add another image\" title=\"Add another image\" /><br /><br />');
+                $('#addimage').click(arguments.callee);
+        });
+});
 </script>";
 
@@ -49 +58 @@
                         <div>
                         <input type="hidden" name="MAX_FILE_SIZE" value="' . $maxsize.'" />
-                        <span class="text">File:</span><input type="file" size="40" name="image" /><br /><br />
-                        <span class="text">Tags:</span><input id="inputtags" type="text" size="40" name="tags" />
+                        <div id="inputimagecontainer">
+                        <span class="text">File:</span><input type="file" size="39" name="image[]" />&nbsp;
+                        <img src="images/add.png" id="addimage" alt="Add another image" title="Add another image" /><br /><br />
+                        </div>
+                        <span class="text">Tags:</span><input id="inputtags" type="text" size="39" name="tags" />
                         <span class="text">&nbsp;</span><input id="submit" type="submit" name="submit" value="Upload" />
                         <p id="info">

img/trunk/lib/functions.php

@@ -338 +338 @@
 }
 
-?>
+/**
+ * Fixes the odd indexing of multiple file uploads from the format:
+ *
+ * $_FILES['field']['key']['index']
+ *
+ * To the more standard and appropriate:
+ *
+ * $_FILES['field']['index']['key']
+ *
+ * @param array $files
+ * @author Corey Ballou
+ * @link http://www.jqueryin.com
+ */
+function fixFilesArray(&$files)
+{
+        $names = array( 'name' => 1, 'type' => 1, 'tmp_name' => 1, 'error' => 1, 'size' => 1);
+
+        foreach ($files as $key => $part) {
+                // only deal with valid keys and multiple files
+                $key = (string) $key;
+                if (isset($names[$key]) && is_array($part)) {
+                        foreach ($part as $position => $value) {
+                                $files[$position][$key] = $value;
+                        }
+                        // remove old key reference
+                        unset($files[$key]);
+                }
+        }
+}
+
+?>

img/trunk/upload.php

@@ -38 +38 @@
  * ["size"]             - Size in bytes
  */
-$img = $_FILES['image'];
+header('Content-type: text/plain');
+fixFilesArray($_FILES['image']);
+$time = time();
+$uploadcount = 0;
 
-// Upload failed
-if ($img['error']) {
-        unlink_safe($img['tmp_name']);
-        errorMsg('Image uplaod error.');
+foreach ($_FILES['image'] as $img) {
+        // Upload failed
+        if ($img['error']) {
+                unlink_safe($img['tmp_name']);
+                continue;
+                //errorMsg('Image uplaod error.');
+        }
+
+        // The image is to big
+        if ($img['size'] > $maxsize) {
+                unlink_safe($img['tmp_name']);
+                continue;
+                //errorMsg('Image too big.');
+        }
+
+        /*
+         * [0]                  - width
+         * [1]                  - geight
+         * [2]                  - IMAGETYPE_XXX
+         + [3]                  - Text string with width and height
+         * ["bits"]
+         * ["channels"]
+         * ["mime"]             - Mime type
+         */
+        $info = getimagesize($img['tmp_name']);
+
+        // Check if this type of immage is allowed
+        if (!isset($mime[$info['mime']])) {
+                unlink_safe($img['tmp_name']);
+                continue;
+                //errorMsg('Imagetype not allowed.');
+        }
+
+        // Assign the correct extension for this image
+        $name = (get_magic_quotes_gpc()) ? stripslashes($img['name']) : $img['name'];
+        $name = str_replace('\'', '', $name);
+        $name = explode('.', $name);
+
+        if(count($name) < 2) {
+                $name = $name[0] . '.' . $mime[$info['mime']];
+        } else {
+                $name[count($name) - 1] = $mime[$info['mime']];
+                $name = implode('.', $name);
+        }
+
+        // Choose the location for the file
+        $name = trim(str_replace('//', '/', checkExists($imgdir . '/' . $name)));
+        
+        // Generate a URL save string to send to the browser
+        $location = explode('/', $name);
+        for ($i = 0; $i < count($location); $i++) {
+                $location[$i] = rawurlencode($location[$i]);
+        }
+        $location = implode('/', $location);
+        
+        // Move the file to it's new location
+        if (!move_uploaded_file_save($img['tmp_name'], $name)) {
+                unlink_safe($img['tmp_name']);
+                errorMsg('Can\'t move uploaded file.');
+        }
+
+        /*
+         * Create preview
+         * 
+         * We use imagemagick because it suports a broad range of file
+         * types
+         * 
+         * Also, we call it directly with exec
+         * 
+         * See http://www.imagemagick.org/Usage/thumbnails/ for more
+         * information about the commands used
+         */
+        $preview = dirname($name) . '/preview/' . basename($name);
+        if (!file_exists(dirname($preview))) mkdir(dirname($preview));
+        exec('convert -define jpeg:size=' . $preview_width * 2 . 'x' . $preview_height * 2 . ' \\
+          \'' . $name . '\'[0] -thumbnail ' . $preview_width . 'x' . $preview_height . ' \\
+         -unsharp 0x.5 \'' . $preview . '\'');
+
+        $user = (isset($_SESSION['openid_identity'])) ? $_SESSION['openid_identity'] : '';
+        
+        // Save image info
+        $db->exec("INSERT INTO images (
+         location,
+         path,
+         ip,
+         time,
+         original_name,
+         user
+        ) VALUES (
+         '" . $db->escape($location) . "',
+         '" . $db->escape($name) . "',
+         '" . ip2long($_SERVER['REMOTE_ADDR']) . "',
+         '" . $time . "',
+         '" . $db->escape($img['name']) . "',
+         '" . $db->escape($user) . "'
+        );" );
+        $res = $db->query("SELECT last_insert_rowid() as id;");
+        $row = $db->fetch($res);
+        $id = $row['id'];
+
+        /*
+         * Tags
+         */
+        if (isset($_POST['tags'])) {
+                $tags = explode(',', $_POST['tags']);
+                for ($i = 0; $i < count($tags); $i++) {
+                        $tags[$i] = trim($tags[$i]);
+                }
+                $tags = array_unique($tags);
+                $sql = "BEGIN;\n";
+                foreach ($tags as $tag) {
+                        if (empty($tag)) continue;
+                        // check if the taga already exists
+                        $row = $db->fetch($db->query("SELECT ROWID as id FROM tags WHERE tag = '" . $db->escape(strtolower($tag)) . "'"));
+                        if (!$row) {
+                                $db->exec("INSERT INTO tags (tag, text) VALUES ('" . $db->escape(strtolower($tag)) . "', '" . $db->escape($tag) . "');");
+                                $row = $db->fetch($db->query("SELECT last_insert_rowid() as id;"));
+                        }
+                        // Save the tag for this image and update tag counter
+                        $sql .= "INSERT INTO imagetags (image, tag) VALUES('" . $id . "', '" . $row['id'] . "');\n";
+                        $sql .= "UPDATE tags SET count = count + 1 WHERE ROWID = '" . $row['id'] . "';\n";
+                }
+                $sql .= "COMMIT;";
+                // Commit all changes
+                $db->exec($sql);
+        }
+        $uploadcount++;
 }
 
-// The image is to big
-if ($img['size'] > $maxsize) {
-        unlink_safe($img['tmp_name']);
-        errorMsg('Image too big.');
+if ($uploadcount > 0) {
+        // Redirect to image
+        header('Location: ' . url() . 'browse.php?ip=' . ip2long($_SERVER['REMOTE_ADDR']) . '&time=' . $time);
+        errorMsg('Image saved.<br /><br /><a href="' . url() . 'browse.php?ip=' . ip2long($_SERVER['REMOTE_ADDR']) . '&time=' . $time . '">Continue</a>');
+} else {
+        errorMsg('No images uploaded.');
 }
 
-/*
- * [0]                  - width
- * [1]                  - geight
- * [2]                  - IMAGETYPE_XXX
- + [3]                  - Text string with width and height
- * ["bits"]
- * ["channels"]
- * ["mime"]             - Mime type
- */
-$info = getimagesize($img['tmp_name']);
-
-// Check if this type of immage is allowed
-if (!isset($mime[$info['mime']])) {
-        unlink_safe($img['tmp_name']);
-        errorMsg('Imagetype not allowed.');
-}
-
-// Assign the correct extension for this image
-$name = (get_magic_quotes_gpc()) ? stripslashes($img['name']) : $img['name'];
-$name = str_replace('\'', '', $name);
-$name = explode('.', $name);
-
-if(count($name) < 2) {
-        $name = $name[0] . '.' . $mime[$info['mime']];
-} else {
-        $name[count($name) - 1] = $mime[$info['mime']];
-        $name = implode('.', $name);
-}
-
-// Choose the location for the file
-$name = trim(str_replace('//', '/', checkExists($imgdir . '/' . $name)));
-
-// Generate a URL save string to send to the browser
-$location = explode('/', $name);
-for ($i = 0; $i < count($location); $i++) {
-        $location[$i] = rawurlencode($location[$i]);
-}
-$location = implode('/', $location);
-
-// Move the file to it's new location
-if (!move_uploaded_file_save($img['tmp_name'], $name)) {
-        unlink_safe($img['tmp_name']);
-        errorMsg('Can\'t move uploaded file.');
-}
-
-/*
- * Create preview
- * 
- * We use imagemagick because it suports a broad range of file
- * types
- * 
- * Also, we call it directly with exec
- * 
- * See http://www.imagemagick.org/Usage/thumbnails/ for more
- * information about the commands used
- */
-$preview = dirname($name) . '/preview/' . basename($name);
-if (!file_exists(dirname($preview))) mkdir(dirname($preview));
-exec('convert -define jpeg:size=' . $preview_width * 2 . 'x' . $preview_height * 2 . ' \\
-  \'' . $name . '\'[0] -thumbnail ' . $preview_width . 'x' . $preview_height . ' \\
- -unsharp 0x.5 \'' . $preview . '\'');
-
-// Open database
-$db = new sqlite('lib/db.sqlite');
-
-$user = (isset($_SESSION['openid_identity'])) ? $_SESSION['openid_identity'] : '';
-
-// Save image info
-$db->exec("INSERT INTO images (
- location,
- path,
- ip,
- time,
- original_name,
- user
-) VALUES (
- '" . $db->escape($location) . "',
- '" . $db->escape($name) . "',
- '" . ip2long($_SERVER['REMOTE_ADDR']) . "',
- '" . time() . "',
- '" . $db->escape($img['name']) . "',
- '" . $db->escape($user) . "'
-);" );
-$res = $db->query("SELECT last_insert_rowid() as id;");
-$row = $db->fetch($res);
-$id = $row['id'];
-
-/*
- * Tags
- */
-if (isset($_POST['tags'])) {
-        $tags = explode(',', $_POST['tags']);
-        for ($i = 0; $i < count($tags); $i++) {
-                $tags[$i] = trim($tags[$i]);
-        }
-        $tags = array_unique($tags);
-        $sql = "BEGIN;\n";
-        foreach ($tags as $tag) {
-                if (empty($tag)) continue;
-                // check if the taga already exists
-                $row = $db->fetch($db->query("SELECT ROWID as id FROM tags WHERE tag = '" . $db->escape(strtolower($tag)) . "'"));
-                if (!$row) {
-                        $db->exec("INSERT INTO tags (tag, text) VALUES ('" . $db->escape(strtolower($tag)) . "', '" . $db->escape($tag) . "');");
-                        $row = $db->fetch($db->query("SELECT last_insert_rowid() as id;"));
-                }
-                // Save the tag for this image and update tag counter
-                $sql .= "INSERT INTO imagetags (image, tag) VALUES('" . $id . "', '" . $row['id'] . "');\n";
-                $sql .= "UPDATE tags SET count = count + 1 WHERE ROWID = '" . $row['id'] . "';\n";
-        }
-        $sql .= "COMMIT;";
-        // Commit all changes
-        $db->exec($sql);
-}
-
-// Redirect to image
-header('Location: ' . url() . 'image.php?i=' . urlnumber_encode($id));
-errorMsg('Image saved.<br /><br /><a href="' . url() . 'image.php?i=' . urlnumber_encode($id) . '">Continue</a>');
-
 ?>