Changeset 1068

Timestamp:

12/10/09 20:29:47 (2 years ago)

Author:

savin.tiberiu@…

Message:

Fixed: Large files could be uploaded by zipping them.
Reviewed: ​http://reviewboard.infoarena.ro/r/104/

Location:

trunk/www/controllers

Files:

• attachment.php (modified) (2 diffs)
• zip_attachment.php (modified) (3 diffs)

trunk/www/controllers/attachment.php

@@ -109 +109 @@
     if (!$form_errors) {
         if ($autoextract) {
-            $attachments = get_zipped_attachments($_FILES['file_name']['tmp_name']);
-
-            if (false === $attachments) {
+            $zip_files = get_zipped_attachments($_FILES['file_name']['tmp_name']);
+
+            if (false === $zip_files) {
                 $form_errors['file_name'] = 'Arhiva ZIP este invalida sau nu poate fi recunoscuta';
+            } else {
+                $attachments = $zip_files['attachments'];
+                $skipped_files = $zip_files['total_files'] - count($attachments);
             }
         }
@@ -232 +235 @@
     if (!$form_errors) {
         if ($autoextract) {
-            $msg = "Am extras si incarcat {$attach_okcount} fisiere.";
-            if ($rewrite_count) {
-                $msg .= " {$rewrite_count} fisiere vechi au fost rescrise.";
+            if ($attach_okcount == 1) {
+                $msg = "Am extras si incarcat un fisier.";
+            } else {
+                $msg = "Am extras si incarcat {$attach_okcount} fisiere.";
+            }
+
+            if ($rewrite_count == 1) {
+                $msg .= " Un fisier mai vechi a fost rescris.";
+            } else if ($rewrite_count > 1) {
+                $msg .= " {$rewrite_count} fisiere mai vechi au fost rescrise.";
+            }
+
+            if ($skipped_files == 1) {
+                $msg .= " Un fisier nu a fost dezarhivat deoarece era prea mare sau era invalid.";
+            } else if ($skipped_files > 1) {
+                $msg .= " {$skipped_files} fisiere nu au fost dezarhivate deoarece erau prea mari sau erau invalide.";
             }
         }

trunk/www/controllers/zip_attachment.php

@@ -7 +7 @@
     $attachments = array();
     $namehash = array();
+    $total_files = 0;
 
     log_print('Exploring ZIP archive '.$filename);
@@ -24 +25 @@
             }
 
+            $total_files++;
+            // Skip big files
+            if ($stat['size'] > IA_ATTACH_MAXSIZE) {
+                continue;
+            }
+
             // validate file name and make sure there are no duplicates
             $aname = basename($stat['name']);
@@ -37 +44 @@
         $zip->close();
     }
-    return $attachments;
+    return array('total_files' => $total_files, 'attachments' => $attachments);
 }