Changeset 1929 for sandbox/filemanager/inc

Timestamp:

01/08/10 16:23:27 (15 years ago)

Author:

amuller

Message:

Ticket #597 - Correçao de caracteres especiais em nomes de arquivos

Location:

sandbox/filemanager/inc

Files:

• class.uifilemanager.inc.php (modified) (2 diffs)
• class.vfs_functions.inc.php (modified) (7 diffs)

sandbox/filemanager/inc/class.uifilemanager.inc.php

@@ -137 +137 @@
                                         if(isset($$condvar) && ($condvar == $var || $$condvar == $condvalue))
                                         {
-                                                if(is_array($$var))
-                                                {
-                                                        $temp = array();
-                                                        while(list($varkey, $varvalue) = each($$var))
-                                                        {
-                                                                if(is_int($varkey))
-                                                                {
-                                                                        $temp[$varkey] = stripslashes(base64_decode(urldecode(($varvalue))));
-                                                                }
-                                                                else
-                                                                {
-                                                                        $temp[stripslashes(base64_decode(urldecode(($varkey))))] = $varvalue;
-                                                                }
-                                                        }
-                                                        $this->$var = $temp;
-                                                }
-                                                elseif(isset($$var))
-                                                {
-                                                        $this->$var = stripslashes(base64_decode(urldecode($$var)));
-                                                }
+                                                $this->$var = stripslashes(base64_decode($$var));
                                         }
                                 }
@@ -1006 +987 @@
                                 $vars[file_content]=$content;
 
-                                $vars[buttonPreview]=$this->inputButton('edit_preview','edit_preview',lang('Preview %1', $this->bo->html_encode($this->fileman[$j], 1)));
+                                $vars[buttonPreview]=$this->inputButton('edit_preview','edit_preview',lang('Preview %1', $this->bo->html_encode($this->fileman[0], 1)));
                                 $vars[buttonSave]=$this->inputButton('edit_save','save',lang('Save %1', $this->bo->html_encode($this->filename, 1)));
                                 $vars[buttonDone]=$this->inputButton('edit_save_done','ok',lang('Save %1, and go back to file listing ', $this->bo->html_encode($this->filename, 1)));

sandbox/filemanager/inc/class.vfs_functions.inc.php

@@ -87 +87 @@
                                 'messages'      => array('messages'     => ''),
                                 'comment'       => array('comment' => ''),
+                                'from'  => array('from' => ''),
+                                'fileman' => array('fileman' => ''),
                                 'to'    => array('to' => '')
                         );
@@ -104 +106 @@
                                                                 if(is_int($varkey))
                                                                 {
-                                                                        $temp[$varkey] = stripslashes(base64_decode(urldecode(($varvalue))));
+                                                                        $temp[$varkey] = stripslashes(base64_decode($varvalue));
                                                                 }
                                                                 else
                                                                 {
-                                                                        $temp[stripslashes(base64_decode(urldecode(($varkey))))] = $varvalue;
+                                                                        $temp[stripslashes(base64_decode($varkey))] = $varvalue;
                                                                 }
                                                         }
@@ -115 +117 @@
                                                 elseif(isset($$var))
                                                 {
-                                                        $this->$var = stripslashes(base64_decode(urldecode($$var)));
+                                                        $this->$var = stripslashes(base64_decode($$var));
                                                 }
                                         }
@@ -244 +246 @@
         
                 function delete(){
-                        foreach($this->fileman as $filecode)
-                        {
-                                $filename = base64_decode($filecode);
+                        foreach($this->fileman as $filename)
+                        {
                                 if($this->verifyLock($filename,RELATIVE_ALL) && $this->bo->vfs->rm(array(
                                         'string' => $this->path.'/'.$filename,
@@ -262 +263 @@
                 }
                 function archive(){
-                        foreach($this->fileman as $filecode)
-                        {
-                                $filename = base64_decode($filecode);
+                        foreach($this->fileman as $filename)
+                        {
                                 if(!$this->verifyLock($filename,RELATIVE_ALL))
                                 {
@@ -355 +355 @@
                         else
                         {
-                                $this->from = base64_decode($this->from);
                                 while(list($num, $file) = each($this->fileman))
                                 {
@@ -386 +385 @@
                         else
                         {
-                                $this->from = base64_decode($this->from);
                                 while(list($num, $file) = each($this->fileman))
                                 {