From a87acdf1e2aa6e7f02a47b7a310a2abe2a4d966f Mon Sep 17 00:00:00 2001
From: saxmatt
Date: Thu, 5 Feb 2004 14:28:02 +0000
Subject: [PATCH] New upload functionality.
git-svn-id: http://svn.automattic.com/wordpress/trunk@831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/admin-functions.php | 87 +++++++
wp-admin/admin-header.php | 15 +-
wp-admin/edit-form-advanced.php | 8 -
wp-admin/edit-form.php | 6 +-
wp-admin/menu.php | 13 +-
wp-admin/menu.txt | 1 +
wp-admin/upload.php | 397 +++++++++++++++-----------------
7 files changed, 286 insertions(+), 241 deletions(-)
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index dd6fa4e9a..37f28e2b7 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -47,4 +47,91 @@ function wp_dropdown_cats($currentcat, $currentparent = 0, $parent = 0, $level =
}
}
+function wp_create_thumbnail($file, $max_side, $effect = '') {
+
+ // 1 = GIF, 2 = JPEG, 3 = PNG
+
+ if(file_exists($file)) {
+ $type = getimagesize($file);
+
+ // if the associated function doesn't exist - then it's not
+ // handle. duh. i hope.
+
+ if(!function_exists('imagegif') && $type[2] == 1) {
+ $error = 'Filetype not supported. Thumbnail not created.';
+ }elseif(!function_exists('imagejpeg') && $type[2] == 2) {
+ $error = 'Filetype not supported. Thumbnail not created.';
+ }elseif(!function_exists('imagepng') && $type[2] == 3) {
+ $error = 'Filetype not supported. Thumbnail not created.';
+ } else {
+
+ // create the initial copy from the original file
+ if($type[2] == 1) {
+ $image = imagecreatefromgif($file);
+ } elseif($type[2] == 2) {
+ $image = imagecreatefromjpeg($file);
+ } elseif($type[2] == 3) {
+ $image = imagecreatefrompng($file);
+ }
+
+ if (function_exists('imageantialias'))
+ imageantialias($image, TRUE);
+
+ $image_attr = getimagesize($file);
+
+ // figure out the longest side
+
+ if($image_attr[0] > $image_attr[1]) {
+ $image_width = $image_attr[0];
+ $image_height = $image_attr[1];
+ $image_new_width = $max_side;
+
+ $image_ratio = $image_width/$image_new_width;
+ $image_new_height = $image_height/$image_ratio;
+ //width is > height
+ } else {
+ $image_width = $image_attr[0];
+ $image_height = $image_attr[1];
+ $image_new_height = $max_side;
+
+ $image_ratio = $image_height/$image_new_height;
+ $image_new_width = $image_width/$image_ratio;
+ //height > width
+ }
+
+ $thumbnail = imagecreatetruecolor($image_new_width, $image_new_height);
+ @imagecopyresized($thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1]);
+
+ // move the thumbnail to it's final destination
+
+ $path = explode('/', $file);
+ $thumbpath = substr($file, 0, strrpos($file, '/')) . '/thumb-' . $path[count($path)-1];
+
+ if($type[2] == 1) {
+ if(!imagegif($thumbnail, $thumbpath)) {
+ $error = "Thumbnail path invalid";
+ }
+ } elseif($type[2] == 2) {
+ if(!imagejpeg($thumbnail, $thumbpath)) {
+ $error = "Thumbnail path invalid";
+ }
+ } elseif($type[2] == 3) {
+ if(!imagepng($thumbnail, $thumbpath)) {
+ $error = "Thumbnail path invalid";
+ }
+ }
+
+ }
+ }
+
+ if(!empty($error))
+ {
+ return $error;
+ }
+ else
+ {
+ return 1;
+ }
+}
+
?>
\ No newline at end of file
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 27beb721b..96a4e229a 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -78,14 +78,6 @@ setTimeout("redirect();", 600);
-
+
+
+
\ No newline at end of file
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 5f2b62d57..83d8213b0 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -153,14 +153,6 @@ if ($action != 'editcomment') {
?>
= $fileupload_minlevel)
- && (in_array($user_login, $allowed_users) || (trim($fileupload_allowedusers)=="")) ) { ?>
-
- 4) && ($action != "post"))
diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index 982ff6bb3..c3751f5d8 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -119,11 +119,7 @@ edCanvas = document.getElementById('content');
} ?>
-= $fileupload_minlevel)
- && (in_array($user_login, $allowed_users) || (trim($fileupload_allowedusers)=="")) ) { ?>
-
-
+
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 4d43f7ab6..8bb7b2c3a 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -1,4 +1,3 @@
-
-
-
\ No newline at end of file
diff --git a/wp-admin/menu.txt b/wp-admin/menu.txt
index 0070e4fd3..7d5ee5584 100644
--- a/wp-admin/menu.txt
+++ b/wp-admin/menu.txt
@@ -5,6 +5,7 @@
3 users.php Users
4 options.php Options
4 templates.php Templates
+5 upload.php Upload
0 profile.php My Profile
***
(Everything after the '***' is a comment.)
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 2402c1f8d..03e041fd1 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -1,254 +1,227 @@
-
-WordPress » Upload images/files
-
-
-
-
-
-
-
-
-
-
- File upload
- You can upload files of type:
- The maximum size of the file should be: KB
-
-
-
-
-
-
-You can upload files with the extension as long as they are no larger than KB . If you’re an admin your can configure these values under options .
+
+
-
-
-
- Duplicate File?
- The filename '' already exists!
- filename '' moved to ''
- Confirm or rename:
-
-
-
-
-
-
-