Changeset 6071 for trunk/prototype

Timestamp:

05/02/12 16:30:34 (12 years ago)

Author:

gustavo

Message:

Ticket #2676 - Falha ao anexar arquivo no expresso mail

Location:

trunk/prototype

Files:

• modules/mail/interceptors/Attachments.php (modified) (1 diff)
• modules/mail/templates/attachment.ejs (modified) (2 diffs)
• post.php (modified) (4 diffs)

trunk/prototype/modules/mail/interceptors/Attachments.php

@@ -5 +5 @@
         public function encodeCreateAttachment( &$uri , &$params , &$criteria , $original ){            
             if(!isset($params['source'])) return false;
+                        
 
             if(isset($_FILES[$params['source']]))
                 $params =  $_FILES[$params['source']];
-
+                                
+                                if($params['error'] !== 0){
+                                        switch ($params['error']){
+                                                case 1:
+                                                        throw  new Exception('Tamanho de arquivo nao permitido!!! (php.ini)'); 
+                                                case 2:
+                                                        throw  new Exception('Tamanho de arquivo nao permitido!!!'); 
+                                                case 3:
+                                                        throw  new Exception('Ocorreu um erro durante o upload'); 
+                                                case 4:
+                                                        throw  new Exception('Nao e um arquivo valido'); 
+                                        }
+                                }
+                                
                 $params['owner'] = Config::me('uidNumber'); 
 

trunk/prototype/modules/mail/templates/attachment.ejs

@@ -1 @@
-<form id="fileupload_msg<%=data.ID%>" class="fileupload" action="mailAttachment:detail" method="POST">
+<div id="fileupload_msg<%=data.ID%>" class="fileupload" style="margin : 15px 0px -15px -10px;">
   <div class="row fileupload-buttonbar">
       <div class="button-files-upload">
@@ -17 +17 @@
          </div>
         <br />
-</form>
+</div>

trunk/prototype/post.php

@@ -3 +3 @@
  * com o source em base64 melhoria na performace.
  */
+
 $data = $_POST;
+        
 if( count($_FILES) )
 {
@@ -14 +16 @@
                                 $counter = count($files);
                                 $files[$name.$counter] = array('name' => $file['name'][$counter], 
-                                                                                                'type' => $file['type'][$counter],
-                                                                                                'source' => base64_encode(file_get_contents( $file['tmp_name'][$counter], $file['size'][$counter])),
-                                                                                                'size' => $file['size'][$counter]);
+                                        'type' => $file['type'][$counter],
+                                        'source' => base64_encode(file_get_contents( $file['tmp_name'][$counter], $file['size'][$counter])),
+                                        'size' => $file['size'][$counter],
+                                        'error' => $file['error'][$counter]
+                                );
                         }
                 }else
@@ -25 +29 @@
 }
 
+if(isset($data['MAX_FILE_SIZE']))
+        unset($data['MAX_FILE_SIZE']);
+        
 require_once "api/controller.php";
+
+Controller::addFallbackHandler( 0, function($e){ throw $e; } );
 
 $result = array();
@@ -33 +42 @@
                 $content = array($content);
                 
-        foreach($content as $key => $value)
-                $result[$concept][] =  isset($data['criteria']) ?  Controller::put( array( 'concept' => $concept ), $value, isset($data['criteria'])) : Controller::put( array( 'concept' => $concept ), $value);
+        foreach($content as $key => $value){
+                try{
+                        $result[$concept][] = Controller::put( array( 'concept' => $concept ), $value );
+                }catch(Exception $e){
+                        $result[$concept]['error'] = $e->getMessage();                  
+                } 
+        }
 }       
 echo json_encode( $result );