feature 2410 added: uploadify upgraded from version 2.1.0 to 3.0.0 (s…

…till beta, but said as stable by users on uploadify forums) bug 2411 fixed: thanks to uploadify 3.0.0, the "Browse" button is now localized (text in any language) bug 1653 fixed: if the selected file exceeds the upload_max_size (as defined in the php.ini), an alert is shown and the file is not added to the queue. bug 2412 fixed: ability to select GIF files with the Flash Uploader. git-svn-id: http://piwigo.org/svn/trunk@11975 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Aug 19, 2011 · 24ab1e2 · 24ab1e2
1 parent 50cb55c
commit 24ab1e2
Show file tree

Hide file tree

Showing 9 changed files with 195 additions and 131 deletions.
diff --git a/admin/include/photos_add_direct_prepare.inc.php b/admin/include/photos_add_direct_prepare.inc.php
@@ -85,7 +85,12 @@
   $available_memory = get_ini_size('memory_limit') - memory_get_usage();
   $max_upload_width = round(sqrt($available_memory/(2 * $fudge_factor)));
   $max_upload_height = round(2 * $max_upload_width / 3);
-  $max_upload_resolution = floor($max_upload_width * $max_upload_height / (1024 * 1024));
+
+  // we don't want dimensions like 2995x1992 but 3000x2000
+  $max_upload_width = round($max_upload_width/100)*100;
+  $max_upload_height = round($max_upload_height/100)*100;
+
+  $max_upload_resolution = floor($max_upload_width * $max_upload_height / (1000000));
 
   // no need to display a limitation warning if the limitation is huge like 20MP
   if ($max_upload_resolution < 25)

diff --git a/admin/include/photos_add_direct_process.inc.php b/admin/include/photos_add_direct_process.inc.php
@@ -42,9 +42,19 @@
         )
       );
   }
-
-  $category_id = $_POST['category'];
+  else
+  {
+    $category_id = $_POST['category'];
+  }
 
+  if (isset($_POST['onUploadError']) and is_array($_POST['onUploadError']) and count($_POST['onUploadError']) > 0)
+  {
+    foreach ($_POST['onUploadError'] as $error)
+    {
+      array_push($page['errors'], $error);
+    }
+  }
+
   $image_ids = array();
 
   if (isset($_FILES) and !empty($_FILES['image_upload']))

diff --git a/admin/include/uploadify/jquery.uploadify.v2.1.0.min.js b/admin/include/uploadify/jquery.uploadify.v2.1.0.min.js
diff --git a/admin/include/uploadify/jquery.uploadify.v3.0.0.min.js b/admin/include/uploadify/jquery.uploadify.v3.0.0.min.js
diff --git a/admin/include/uploadify/swfobject.js b/admin/include/uploadify/swfobject.js