Changeset 1865

Timestamp:

12/17/09 10:56:50 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhoria do FM, Implementação do arquivamento

Location:

sandbox/filemanager

Files:

• inc/class.vfs_functions.inc.php (modified) (2 diffs)
• js/common_functions.js (modified) (1 diff)
• js/draw_api.js (modified) (6 diffs)
• js/handler.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)

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

@@ -27 +27 @@
                         'delete'=>True,
                         'archive'=>True,
+                        'unarchive'=>True,
                         'summary' => True
                 );
@@ -294 +295 @@
                         $this->delete();
                 }
+                function unarchive(){
+                        $command = escapeshellarg($this->file);
+                        if (strlen($this->pswd) > 0){
+                                $command = " -P ".(base64_decode($this->pswd) ^ $this->path)." ".$command;
+                        }
+
+                        exec("cd ".escapeshellarg($this->bo->vfs->basedir.$this->path).";".escapeshellcmd("nice -n19 unzip ".$command),$output, $return_var);
+                        exec("history -c"); // privacy is good, we dont want get passwords!
+
+                        if ($return_var == 9 || $return_var == 5 || $return_var == 82){
+                                echo "wpasswd:$command";
+                                return false;
+                        }else if($return_var > 1){
+                                echo "False:";
+                        }
+
+                        $this->fileman[] = $this->file;
+                        $this->delete();
+                        $this->bo->vfs->update_real(array(
+                                        'string'        => $this->path,
+                                        'relatives'     => array(RELATIVE_NONE)
+                                ));
+                }
                 function editComment()
                 {

sandbox/filemanager/js/common_functions.js

@@ -79 +79 @@
         }
 }
-
+function crypt(data1,data2){
+        ret = "";
+        for (var i=0;i < data1.length; i++)
+        {
+                ret += String.fromCharCode(data1.charCodeAt(i) ^ data2.charCodeAt(i));
+        }
+        return ret;
+}
 /*
  * base64.js - Base64 encoding and decoding functions

sandbox/filemanager/js/draw_api.js

@@ -236 +236 @@
                         retBuff += '<td></td>';
 
-                if (file.mime == 'text/html')
-                        retBuff += '<td><a href="./index.php?menuaction=filemanager.uifilemanager.export&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'"><img alt="'+get_lang('export')+'" title="'+get_lang('export')+'" src="'+templatePath+'images/button_export.png"></a></td>';
-                else
-                        retBuff += '<td></td>';
+                switch (file.mime)
+                {
+                        case 'text/html':
+                                retBuff += '<td><a href="./index.php?menuaction=filemanager.uifilemanager.export&file='+base64_encode(file.name)+'&path='+base64_encode(currentPath)+'"><img alt="'+get_lang('export')+'" title="'+get_lang('export')+'" src="'+templatePath+'images/button_export.png"></a></td>';
+                                break;
+                        case 'application/zip':
+                                retBuff += '<td><a href="javascript:unarchive(\''+file.name+'\')"><img alt="'+get_lang('unarchive')+'" title="'+get_lang('unarchive')+'" src="'+templatePath+'images/button_export.png"></a></td>'
+                                break;
+                        default:
+                                retBuff += '<td></td>';
+                }
                 retBuff += fl.td+'<img src="'+(file.icon)+'">';
                 if((file.mime).toUpperCase().indexOf('IMAGE') == 0)
@@ -481 +488 @@
                         }
                         password = prompt(get_lang('Please, type a strong password (suggestion: at least 8 characters, letters and numbers) or leave it empty to archive only'));
+                        if (password == null)
+                                return;
                         if (password.length > 0)
                         {
@@ -491 +500 @@
                         }
                         // TODO use DES, or something strong
-                        pswd = "";
-                        for (var i=0;i < password.length; i++)
-                        {
-                                pswd += String.fromCharCode(password.charCodeAt(i) ^ currentPath.charCodeAt(i));
-                        }
+                        var pswd = crypt(password,currentPath);
                         cExecute('./index.php?menuaction=filemanager.vfs_functions.archive&pswd='+base64_encode(pswd.toString())+'&path='+base64_encode(currentPath)+filesUrl,handler.archive);
                         break;
@@ -575 +580 @@
 var toolbar = new toolbar();
 
+function unarchive(filename){
+        password = prompt(get_lang('Please, type archive password or leave it empty if it is not encrypted'));
+        if (password == null)
+                return;
+        var pswd = crypt(password,currentPath);
+        cExecute('./index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='+base64_encode(pswd)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename),handler.archive);
+}
 
 function draw_card(filename){
@@ -590 +602 @@
                 menu.width = "100%";
                 menu.innerHTML = '<img src="'+url+'">';
-                menu.onmouseout = function () { menuTimeout = setTimeout("document.getElementById('menu_newFile"+id+"').style.visibility = 'hidden'",50);}
+                menu.onmouseout = function () { menuTimeout = setTimeout("var e=document.getElementById('menu_newFile"+id+"');if(e!=null) e.style.visibility = 'hidden'",50);}
                 menu.onmouseover = function () { clearTimeout(menuTimeout); };
                 menu.style.zIndex='1';
@@ -603 +615 @@
         menu.style.visibility = 'visible';
         clearTimeout(menuTimeout);
-        menuTimeout = setTimeout("document.getElementById('menu_newFile"+id+"').style.visibility = 'hidden'",3000);
-}
-
+        menuTimeout = setTimeout("var e=document.getElementById('menu_newFile"+id+"'); if (e!=null) e.style.visibility = 'hidden'",2000);
+}
+

sandbox/filemanager/js/handler.js

@@ -86 +86 @@
 }
 handler.prototype.archive = function(data) {
+        returnVal = data.split(':');
+        if (returnVal[0] == 'False')
+        {
+                write_error(get_lang('It was not possible to execute it'));
+        }
+        else
+        if (returnVal[0] == 'wpasswd')
+        {
+                write_error(get_lang('Wrong password'));
+                return;
+        }
+        else
+                 write_msg(get_lang('Your operation was successfully executed'));
         toolbar.control('reload');
+
 }
 

sandbox/filemanager/setup/phpgw_pt-br.lang

@@ -95 +95 @@
 Files moved to %1 successfuly   filemanager     pt-br   Arquivos movidos para %1 com sucesso
 Archive filemanager     pt-br   Arquivar
+Your operation was successfully executed        filemanager     pt-br   Sua operação foi executada com sucesso
+Wrong password  filemanager     pt-br   Senha errada
+It was not possible to execute it       filemanager     pt-br   Pelo menos um erro houve na operação
+Please, type archive password or leave it empty if it is not encrypted  filemanager     pt-br   Por favor digite a senha, ou deixe em branco caso o arquivo não seja protegido por senha
 no files in this directory.     filemanager     pt-br   Nenhum arquivo nesse diretório
 no version history for this file/directory      filemanager     pt-br   Sem histórico de versão para este arquivo/pasta