From 18c6018b2429fdb6186a8f8c114547cd4f7131dc Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 29 Jun 2010 18:39:48 +0000
Subject: 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)

git-svn-id: http://piwigo.org/svn/branches/2.1@6624 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/uploadify/uploadify.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'admin/include/uploadify/uploadify.php')

diff --git a/admin/include/uploadify/uploadify.php b/admin/include/uploadify/uploadify.php
index 44db5a15b..8b3f49bb5 100644
--- a/admin/include/uploadify/uploadify.php
+++ b/admin/include/uploadify/uploadify.php
@@ -11,13 +11,35 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
 check_pwg_token();
 
 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(
   $_FILES['Filedata']['tmp_name'],
   $_FILES['Filedata']['name'],
@@ -40,5 +62,12 @@ array_push(
   $image_id
   );
 
+$output = ob_get_contents(); 
+ob_end_clean();
+if (!empty($output))
+{
+  add_upload_error($_POST['upload_id'], $output);
+}
+
 echo "1";
 ?>
\ No newline at end of file
-- 
cgit v1.2.3