Changeset 6625 for trunk/admin/include/uploadify

Timestamp:

Jun 29, 2010, 8:42:11 PM (14 years ago)

Author:

plg

Message:

merge r6624 from branch 2.1 to trunk

bug 1747 fixed: some checks were added to verify the upload will fail for a
too big size or if the upload has failed for a too big size (test on
upload_max_filesize and post_max_size)

File:

• trunk/admin/include/uploadify/uploadify.php (modified) (2 diffs)

trunk/admin/include/uploadify/uploadify.php

@@ -12 +12 @@
 
 ob_start();
+echo '$_FILES'."\n";
 print_r($_FILES);
+echo '$_POST'."\n";
 print_r($_POST);
+echo '$user'."\n";
 print_r($user);
 $tmp = ob_get_contents(); 
 ob_end_clean();
 // error_log($tmp, 3, "/tmp/php-".date('YmdHis').'-'.sprintf('%020u', rand()).".log");
+
+if ($_FILES['Filedata']['error'] !== UPLOAD_ERR_OK)
+{
+  $error_message = file_upload_error_message($_FILES['Filedata']['error']);
+  
+  add_upload_error(
+    $_POST['upload_id'],
+    sprintf(
+      l10n('Error on file "%s" : %s'),
+      $_FILES['Filedata']['name'],
+      $error_message
+      )
+    );
+
+  echo "File Size Error";
+  exit();
+}
+
+ob_start();
 
 $image_id = add_uploaded_file(
@@ -41 +63 @@
   );
 
+$output = ob_get_contents(); 
+ob_end_clean();
+if (!empty($output))
+{
+  add_upload_error($_POST['upload_id'], $output);
+}
+
 echo "1";
 ?>