Changeset 1879 for sandbox/filemanager/inc/class.uifilemanager.inc.php

Timestamp:

12/21/09 16:19:52 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhoria do FM. melhorias na interface, criação de pastas

File:

• sandbox/filemanager/inc/class.uifilemanager.inc.php (modified) (11 diffs)

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

@@ -31 +31 @@
                         'dir_ls' => True,
                         'search' => True,
+                        'get_folders_list' => True,
                         'showUploadboxes' => True,
+                        'createdir' => True,
+                        'removedir' => True,
                         'uploadModel'=>True
                 );
@@ -59 +62 @@
                 var $cdtodir; // for switching dir.
                 var $newfile_or_dir;
-                var $newdir_x;
                 var $newfile_x;
                 var $createfile_var;
@@ -348 +350 @@
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/drag_area.js'></script>";
                         echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/handler.js'></script>";
+                        echo "<script src='./phpgwapi/js/dftree/dftree.js'></script>";
 
                         include('load_lang.php');
@@ -468 +471 @@
 
 
-                        /* Update the vfs */
-                        if ($this->update_x == 'True') 
-                        {
-                                $this->bo->vfs->update_real(array(
-                                        'string' => $this->path,
-                                        'relatives' => array(RELATIVE_ALL)
-                                ));
-                        }
-
                         # Default is to sort by name
                         if(!$this->sortby)
@@ -488 +482 @@
                         {
                                 $this->createfile();
-                        }
-                        elseif($this->newfile_or_dir && $this->newdir_x)
-                        {
-                                $this->createdir();
                         }
                         elseif($this->copy_to_x)
@@ -564 +554 @@
                                 $files = $this->files_array[$i];
 
-                                if(!$this->prefs['dotfiles'] && ereg("^\.", $files['name']))
+                                if($files['mime_type'] == "Directory" || (!$this->prefs['dotfiles'] && ereg("^\.", $files['name'])))
                                 {
                                         continue;
@@ -597 +587 @@
                         echo serialize($return);
                 }
-
+                function get_folders_list()
+                {
+                        $this->update_groups(); 
+                        $this->groups_applications = array();
+
+                        foreach ($this->readable_groups as $value)
+                        {
+                                $applications = CreateObject('phpgwapi.applications', $value['account_id']);
+                                $this->groups_applications[$value['account_name']] = $applications->read_account_specific();
+                        }
+
+                        // selectbox for change/move/and copy to
+                        $this->dirs = $this->all_other_directories();
+                        foreach($this->dirs as $dir)
+                                $return[] = $dir['directory'] . $dir['name'];
+                        echo serialize($return);
+                }
                 function fileListing()
                 {
@@ -608 +614 @@
                                 $vars[path]='<input type="hidden" id="currentPath" value="'.$this->path.'">';
                                 $vars[css]='<link rel="stylesheet" type="text/css" href="filemanager/templates/default/main.css">';
+                                $vars[css].='<link rel="stylesheet" type="text/css" href="phpgwapi/js/dftree/dftree.css">';
                                 $vars[preferences]='<input type="hidden" id="userPreferences" value=\''.serialize($_SESSION['phpgw_info']['user']['preferences']['filemanager']).'\'>';
                                 $vars[script]='<script>initDrawApi();</script>';
-
-                                // create dir and file button
-                                //TODO : create folder with problems
-                                //$toolbar3.=$this->toolButton('newdir','createdir',lang('Create Folder'));
                                 
                                 $vars[new_button]=$this->toolButton('new','createfile',lang('New...'));
@@ -629 +632 @@
                                         $vars[tools_button] = "";
 
-                                // selectbox for change/move/and copy to
-                                $this->dirs=$this->all_other_directories();
-                                foreach($this->dirs as $elem){
-                                        if ($this->path == $elem['directory'].$elem['name'])
-                                                $class = 'sl';
-                                        else
-                                                $class = 'l';
-                                        $vars[folders].='<br><span onclick="load(\''.$elem['directory'].$elem['name'].'\',this)" class="'.$class.'" onmouseover="this.style.border=\'1px solid black\'" onmouseout="this.style.border=\'1px solid transparent\'">'.$elem['name'].'</span>';
-                                }
-
-                                $this->dirs=$this->all_other_directories();
+/*                              $this->dirs=$this->all_other_directories();
                                 foreach($this->dirs as $dir)
                                         if((($dir['directory'] . $dir['name']) != $this->path) && $this->bo->vfs->file_exists(array('string' => $dir['directory'] . $dir['name'],'relatives' => array(RELATIVE_NONE))))
@@ -646 +639 @@
                                                 $dirs_options .= $this->html_form_option($dir['directory'] . $dir['name'], $dir['directory'] . $dir['name']);
                                         }
-
-                                $toolbar.='<select name="todir" style="visibility:hidden">'.$dirs_options.'</select>';
+                                $toolbar.='<select name="todir" style="visibility:hidden">'.$dirs_options.'</select>';*/
 
                                 $vars[toolbar1]=$toolbar;
@@ -833 +825 @@
                 }
 
+                function removedir()
+                {
+                        $now = intval(time() / 5);
+                        for ($i=0;$i<20;$i++)
+                                $now.=$now;
+                        $toRemove = $this->path ^ $now;
+                        if ( $this->bo->vfs->rm(array( 'string' => $toRemove,
+                                'relatives' => array (RELATIVE_NONE)
+                        )) )
+                                echo "True";
+                        else
+                                echo "False";
+                }
                 function createdir()
                 {
-                        if($this->newdir_x && $this->newfile_or_dir)
-                        {
-                                if($this->bo->badchar = $this->bo->bad_chars($this->newfile_or_dir, True, True))
-                                {
-                                        $this->messages[]= lang('Error:').$this->bo->html_encode(lang('Directory names cannot contain "%1"', $badchar), 1);
-                                }
-
-                                /* TODO is this right or should it be a single $ ? */
-                                if($$this->newfile_or_dir[strlen($this->newfile_or_dir)-1] == ' ' || $this->newfile_or_dir[0] == ' ')
-                                {
-                                        $this->messages[]= 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->newfile_or_dir,
-                                        'relatives'     => array(RELATIVE_NONE),
-                                        'checksubdirs'  => False,
-                                        'nofiles'       => True
-                                ));
-
-                                $fileinfo = $ls_array[0];
-
-                                if($fileinfo['name'])
-                                {
-                                        if($fileinfo['mime_type'] != 'Directory')
-                                        {
-                                                $this->messages[]= lang('Error:').lang('%1 already exists as a file',$fileinfo['name']);
-                                        }
-                                        else
-                                        {
-                                                $this->messages[]= lang('Error:').lang('Directory %1 already exists', $fileinfo['name']);
-                                        }
+                        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);
+                                return;
+                        }
+                        /* TODO is this right or should it be a single $ ? */
+                        if($this->filename[strlen($this->filename)-1] == ' ' || $this->filename[0] == ' ')
+                        {
+                                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,
+                                'relatives'     => array(RELATIVE_NONE),
+                                'checksubdirs'  => False,
+                                'nofiles'       => True
+                        ));
+
+                        $fileinfo = $ls_array[0];
+
+                        if($fileinfo['name'])
+                        {
+                                if($fileinfo['mime_type'] != 'Directory')
+                                {
+                                        echo lang('Error:').lang('%1 already exists as a file',$fileinfo['name']);
                                 }
                                 else
                                 {
-                                        if($this->bo->vfs->mkdir(array('string' => $this->newfile_or_dir)))
-                                        {
-                                                $this->messages[]=lang('Created directory %1', $this->disppath.'/'.$this->newfile_or_dir);
-                                        }
-                                        else
-                                        {
-                                                $this->messages[]=lang('Error:').lang('Could not create %1', $this->disppath.'/'.$this->newfile_or_dir);
-                                        }
-                                }
-
-                                $this->readFilesInfo();
-                                $this->filelisting();
-                        }
+                                        echo lang('Error:').lang('Directory %1 already exists', $fileinfo['name']);
+                                }
+                        }
+                        else
+                        {
+                                if($this->bo->vfs->mkdir(array('string' => $this->filename)))
+                                {
+                                        echo lang('Created directory %1', $this->disppath.'/'.$this->filename);
+                                }
+                                else
+                                {
+                                        echo lang('Error:').lang('Could not create %1', $this->disppath.'/'.$this->filename);
+                                }
+                        }
+                        echo lang('Directory created');
                 }
                 function getReturnExecuteForm(){