Changeset 3585

Timestamp:

12/13/10 16:19:19 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1395 - Padronizacao das janelas do filemanager com as do Expresso ( Editar pastas ).

Location:

branches/2.2/filemanager

Files:

• inc/class.uifilemanager.inc.php (modified) (4 diffs)
• js/draw_api.js (modified) (6 diffs)
• js/handler.js (modified) (3 diffs)
• tp/expressowindow/xsl/edit_folders.xsl (added)

branches/2.2/filemanager/inc/class.uifilemanager.inc.php

@@ -767 +767 @@
                         // end file count
                 }
+                
                 function removedir()
                 {
-                        $toRemove = $this->path ^ $_SESSION['phpgw_info']['filemanager']['user']['sec_key'];
-                        if ( $this->bo->vfs->rm(array( 'string' => $toRemove,
-                                'relatives' => array (RELATIVE_NONE)
-                        )) )
+                        //$toRemove = $this->path ^ $_SESSION['phpgw_info']['filemanager']['user']['sec_key'];
+                        $toRemove = $this->path;
+                        
+                        if ( $this->bo->vfs->rm(array( 'string' => $toRemove, 'relatives' => array (RELATIVE_NONE) )) )
                                 echo "True";
                         else
                                 echo "False";
                 }
+                
                 function createdir()
                 {
-                        if($this->bo->badchar = $this->bo->bad_chars($this->filename, True, True))
+                        error_log( "Create DIR \n" . var_export( $this->filename, true ) . "\n" , 3, "/tmp/log");
+                        
+                        if( $this->bo->badchar = $this->bo->bad_chars($this->filename, True, True) )
                         {
                                 echo lang('Error:').$this->bo->html_encode(lang('Directory names cannot contain "%1"', $badchar), 1);
@@ -789 +793 @@
                                 echo lang('Error:').lang('Cannot create directory because it begins or ends in a space');
                         }
+                        
                         $ls_array = $this->bo->vfs->ls(array(
                                 'string'        => $this->path . '/' . $this->filename,
@@ -822 +827 @@
                         echo lang('Directory created');
                 }
-                function getReturnExecuteForm(){
+                
+                function getReturnExecuteForm()
+                {
                         $response = $_SESSION['response'];
                         $_SESSION['response'] = null;
@@ -828 +835 @@
                         return;
                 }
+                
                 function showUploadboxes()
                 {

branches/2.2/filemanager/js/draw_api.js

@@ -2 +2 @@
 var offset;
 var showHidden  = null;
-var Xtools              = null;
+var Xtools              = null; 
 var zIndex              = 1000;
 
@@ -19 +19 @@
 }
 
-function loadPermissions(data){
+function loadXtools()
+{
+        if( Xtools == null )
+                Xtools = new xtools( path_filemanager + "tp/expressowindow/" );
+}
+
+function loadPermissions(data)
+{
         var permission = parseInt(data);
         var ACL_READ = 1;
@@ -34 +41 @@
         toolbar.load();
 }
-function close_window(){
-        _winBuild('dwindow'+(zIndex-1), 'hidden')
+
+function close_window()
+{
+        _winBuild( 'dwindow' + (zIndex-1) , "remove" );
 }
 
@@ -562 +571 @@
                                 var action = ( ( arg == 'move_to') ? get_lang('move to:') : get_lang('copy to:') );
                                 
-                                if( Xtools == null )
-                                        Xtools = new xtools( path_filemanager + "tp/expressowindow/" );
+                                loadXtools();
                                 
                                 var _xml        = Xtools.xml('files');
@@ -662 +670 @@
 
 }
-function editFolders(operation)
-{
-        if (operation == 'new')
+function editFolders( operation )
+{
+        if( operation == 'new' || operation == 'remove')
+        {
+                var _selectFolders      = document.getElementById('folders_box');
+                var Dfolder             = "";
+                var parentDir   = "";
+                
+                for( var i = 0 ; i < _selectFolders.options.length; i++ )
+                {
+                        if( _selectFolders.options[i].selected )
+                        {
+                                Dfolder         = _selectFolders.options[i].value;
+                                parentDir       = _selectFolders.options[i].value;
+                        }
+                }
+        }
+        
+        if ( operation == 'new' )
         {
                 var name = prompt(get_lang('Enter with the name of new file/directory'), '');
-                if (name != null && name != '')
+                
+                if ( name != null && name != '' )
                 {
-                        var parentDir = document.getElementById('folders_box').value;
                         cExecute_('./index.php?menuaction=filemanager.uifilemanager.createdir&path='+base64_encode(parentDir)+'&filename='+base64_encode(name),handler.refreshDir);
-                        currentPath = parentDir+'/'+name;
+                        currentPath = ( parentDir != "" ) ? parentDir + '/' + name : my_home_filemanager + '/' + name;
                         close_window();
                 }
@@ -677 +701 @@
         else
         {
-                if (operation == 'remove')
+                if ( operation == 'remove' )
                 {
-                        var Dfolder = document.getElementById('folders_box').value;
-                        
-                        if (confirm(get_lang('Do you really want to remove folder: %1?',Dfolder.replace(my_home_filemanager, get_lang("My folder"))), ''))
-                        {
-                                cExecute_('./index.php?menuaction=filemanager.uifilemanager.removedir&path='+base64_encode(crypt.encode(Dfolder)),handler.refreshDir);
-                                var lastIndex = Dfolder.lastIndexOf('/');
-                                currentPath = Dfolder.substr(0,lastIndex);
-                                close_window();
-                        }
+                        if( Dfolder != "" )
+                        {       
+                                if ( confirm(get_lang('Do you really want to remove folder: %1?',
+                                                Dfolder.replace(my_home_filemanager, get_lang("My folder"))), '') )
+                                {
+                                        //var Dfolder_en = base64_encode( crypt.encode(Dfolder) );
+                                        var Dfolder_en = base64_encode( Dfolder );
+                                        
+                                        cExecute_('./index.php?menuaction=filemanager.uifilemanager.removedir&path=' + Dfolder_en,handler.refreshDir );
+                                        var lastIndex = Dfolder.lastIndexOf('/');
+                                        currentPath = Dfolder.substr(0,lastIndex);
+                                        close_window();
+                                }
+                        }
+                        else
+                                alert("É necessário escolher uma pasta !");
                 }
                 else
                 {
-                        var buf = "<select id='folders_box'>";
-                        
-                        for (var i=0; i < folders.length; i++)
+                        loadXtools();
+                        
+                        var _xml                = Xtools.xml("root");
+                        var _doc                = _xml.documentElement;
+                        var _folders    = _xml.createElement("folders") 
+                        
+                        for( var i = 0; i < folders.length; i++ )
                         {
-                                buf += "<option value='"+folders[i]+"'>"+folders[i].replace(my_home_filemanager, get_lang("My folder") );
-                                buf += "</option>";
-                        }
-                        buf += "</select>";
-                        
-                        code =  "<table><tbody><tr><td colspan='2'>"+buf+"</td></tr>" +
-                                        "<tr><td><input type='button' onclick='editFolders(\"new\")' value='"+get_lang('new folder')+"'></td>" +
-                                        "<td><input type='button' onclick='editFolders(\"remove\")' value='"+get_lang('remove folder')+"'></td>" +
-                                        "</tr></tbody></table>";
-                        
-                        draw_window( code, 350, 210 );
+                                var fd = _xml.createElement('name');
+                                        fd.setAttribute('value', folders[i]);
+                                        fd.appendChild( _xml.createTextNode(folders[i].replace(my_home_filemanager, get_lang("My folder"))) );
+                                        _folders.appendChild(fd);
+                        }
+                        
+                        _doc.appendChild( _folders );
+                        
+                        var pArgs =
+                        {
+                                'lang_new_folder'               : get_lang('new folder'),
+                                'lang_remove_folder'    : get_lang('remove folder'),
+                                'path_filemanager'              : path_filemanager,
+                                'onclick_new_folder'            : 'editFolders("new")',
+                                'onclick_remove_folder'         : 'editFolders("remove")'
+                        };
+                        
+                        var code = Xtools.parse( _doc, "edit_folders.xsl", pArgs );
+                        
+                        draw_window( code, 310, 230 );
                 }
         }

branches/2.2/filemanager/js/handler.js

@@ -123 +123 @@
 
 }
-handler.prototype.draw_folders_list = function (data) {
+
+handler.prototype.draw_folders_list = function (data)
+{
+        
         toolbar.control('reload');
         folders_tree = new dFTree({name: 'main'});
+        
         folders = unserialize(data);
+        
         var rootFold = new dNode({id:'root', caption:get_lang("filemanager")});
         folders_tree.add(rootFold,'root');
-        for (var i=0;i<folders.length;i++)
+        
+        for ( var i = 0 ; i < folders.length; i++ )
         {
                 var lastIndex = folders[i].lastIndexOf('/');
@@ -137 +143 @@
                         var name = get_lang("My Folder");
                 var parentDir = folders[i].substr(0,lastIndex);
+        
                 if (parentDir == '/home')
                         parentDir = 'root';
-                var search_child = function(afolders,name){
+                
+                var search_child = function(afolders,name)
+                {
                         for (j=0; j < afolders.length; j++)
                                 if (afolders[j].indexOf(name+'/') == 0)
@@ -145 +154 @@
                         return false;
                 }
+                
                 folder = new dNode({id:folders[i], caption:name, plusSign:search_child(folders,folders[i]), onClick:'load(\''+folders[i]+'\',this)'});
+                
                 if (i == 0)
                         folders_tree.add(folder,'root');
                 else
-                        folders_tree.add(folder,parentDir);
-        }
+                        folders_tree.add(folder,parentDir);
+        }
+        
         document.getElementById('content_folders').innerHTML = "";
+        
         folders_tree.draw(document.getElementById('content_folders'));
-        folders_tree.openTo(currentPath);
+    
+        folders_tree.openTo(currentPath);
+        
         folders_tree.getNodeById(currentPath)._select();
 }
+
 handler.prototype.copyto = function (data) {
         returnVal = data.split('|');