Changeset 3896

Timestamp:

03/23/11 17:29:14 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #1648 - Erro no upload do arquivo, caso ja exista um arquivo com o mesmo nome.

Location:

branches/2.2/filemanager

Files:

• inc (modified) (1 prop)
• inc/upload.php (modified) (4 diffs)
• js/handler.js (modified) (4 diffs)
• setup/phpgw_pt-br.lang (modified) (1 diff)
• tp/expressowindow/xsl/upload.xsl (modified) (1 diff)

branches/2.2/filemanager/inc/upload.php

@@ -11 +11 @@
                  'max_postsize' => ini_get( 'post_max_size' )
         ) );
+
         exit;
 }
@@ -154 +155 @@
                         if($fileinfo['name'] && $fileinfo['deleteable'] != 'N')
                         {
+                                $FILE_ORIGINAL = $_FILES['upload_file']['name'][$i];
                                 $_FILES['upload_file']['name'][$i] = date('Ymd-H:i')."-".$_FILES['upload_file']['name'][$i];
                                 $tmp_arr=array(
@@ -178 +180 @@
                                 $return[] = array(
                                                                 "file"          => $_FILES['upload_file']['name'][$i],                                                                  
-                                                                "undefined"     => lang( "There is a file %1, that was not replaced", $_FILES['upload_file']['name'][$i] )
+                                                                "undefined"     => lang( "There is a file %1, that was not replaced", $FILE_ORIGINAL )
                                 );
                         }
@@ -238 +240 @@
                 }
         }
-        
-        //error_log(print_r($return, true), 3, "/tmp/log");
 }
 

branches/2.2/filemanager/js/handler.js

@@ -240 +240 @@
                 {
                         /*
-                         * 
                          * response['postize'] = ERRO POST;
                          * response['max_postsize] = diretiva do PHP para POST_MAX_SIZE;
-                         * 
                          */ 
                         
@@ -262 +260 @@
                                                 if( response[i]['file'].toUpperCase() === _inputs[j].value.toUpperCase() && _indexOf > -1 )
                                                 {       
-                                                        _inputs[j].setAttribute("erroUpload", "true");
+                                                        _inputs[j].parentNode.setAttribute("erroUpload", "true");
                                                         
                                                         var _parent     = _inputs[j].parentNode;
@@ -300 +298 @@
                                                         }
                                                 }
+                                                else
+                                                {
+                                                        write_msg( response[i]['undefined'] );
+                                                        _winBuild( "dwindownewUpload" , "remove" );     
+                                                }
                                         }
                                 }       
@@ -306 +309 @@
                         for( var j = 0 ; j < _inputs.length ; j++ )
                         {       
-                                if ( !_inputs[j].getAttribute("erroUpload") && _inputs[j].getAttribute('type') == "file" )
+                                if ( !_inputs[j].parentNode.getAttribute("erroUpload") && _inputs[j].getAttribute('type') == "file" )
                                 {
                                         _inputs[j].parentNode.parentNode.removeChild( _inputs[j].parentNode );
+                                        j--;
                                 }
-                        }
+                        }                       
                 }
                 else

branches/2.2/filemanager/setup/phpgw_pt-br.lang

@@ -221 +221 @@
 The file can be accessed by: %1 filemanager     pt-br   O arquivo pode ser acessado pelo endereço: %1
 The following addresses will be notified        filemanager     pt-br   Os endereços abaixo serão notificados
+There is a file %1, that was not replaced       filemanager     pt-br   Há um arquivo %s1, que não foi substituído
 Users and groups        filemanager     pt-br   Usuários e grupos
 Send Notification email to:     filemanager     pt-br   Enviar email de notificação para:

branches/2.2/filemanager/tp/expressowindow/xsl/upload.xsl

@@ -38 +38 @@
                                         </span>
                                         <br/>
-                                        <div id="uploadOption" >
+                                        <div id="uploadOption" />
+                                        <div> 
                                                 <div></div>
                                                 <input maxlength="255" name="upload_file[]" type="file" style="margin-right:5px" />