Changeset 3879

Timestamp:

03/18/11 18:18:12 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #1648 - Correcao( codigo ) e melhoria( laytou/informacao ) no upload de arquivos para o servidor.

Location:

branches/2.2/filemanager

Files:

• images/warning.gif (added)
• inc/.htaccess (deleted)
• inc/class.uifilemanager.inc.php (modified) (43 diffs)
• inc/upload.php (modified) (5 diffs)
• js/common_functions.js (modified) (9 diffs)
• js/config.js (modified) (1 diff)
• js/connector.js (modified) (1 diff)
• js/draw_api.js (modified) (8 diffs)
• js/handler.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (3 diffs)
• tp/expressowindow/xsl/upload.xsl (modified) (3 diffs)

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

@@ -1 +1 @@
 <?php
-        /**************************************************************************\
-        * -------------------------------------------------------------------------*
-        * This library is free software; you can redistribute it and/or modify it  *
-        * under the terms of the GNU Lesser General Public License as published by *
-        * the Free Software Foundation; either version 2.1 of the License,         *
-        * or any later version.                                                    *
-        * This library is distributed in the hope that it will be useful, but      *
-        * WITHOUT ANY WARRANTY; without even the implied warranty of               *
-        * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
-        * See the GNU Lesser General Public License for more details.              *
-        * You should have received a copy of the GNU Lesser General Public License *
-        * along with this library; if not, write to the Free Software Foundation,  *
-        * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
-        \**************************************************************************/
-
-        /* $Id: class.uifilemanager.inc.php 17511 2004-12-12 06:35:24Z dawnlinux $ */
-
-class uifilemanager
-{
+
+/* * ************************************************************************\
+ * -------------------------------------------------------------------------*
+ * This library is free software; you can redistribute it and/or modify it  *
+ * under the terms of the GNU Lesser General Public License as published by *
+ * the Free Software Foundation; either version 2.1 of the License,         *
+ * or any later version.                                                    *
+ * This library is distributed in the hope that it will be useful, but      *
+ * WITHOUT ANY WARRANTY; without even the implied warranty of               *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
+ * See the GNU Lesser General Public License for more details.              *
+ * You should have received a copy of the GNU Lesser General Public License *
+ * along with this library; if not, write to the Free Software Foundation,  *
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
+  \************************************************************************* */
+
+/* $Id: class.uifilemanager.inc.php 17511 2004-12-12 06:35:24Z dawnlinux $ */
+
+class uifilemanager {
+
         var $public_functions = array(
-                'index'                                 => True,
-                'help'                                  => True,
-                'view'                                  => True,
-                'export'                                => True,
-                'touch'                                 => True,
-                'history'                               => True,
-                'edit'                                  => True,
-                'fileModels'                    => True,
-                'getReturnExecuteForm'  => True,
-                'dir_ls'                                => True,
-                'search'                                => True,
-                'get_folders_list'              => True,
-                'showUploadboxes'               => True,
-                'createdir'                     => True,
-                'removedir'                     => True,
-                'uploadModel'                   => True
+                 'index' => True,
+                 'help' => True,
+                 'view' => True,
+                 'export' => True,
+                 'touch' => True,
+                 'history' => True,
+                 'edit' => True,
+                 'fileModels' => True,
+                 'getReturnExecuteForm' => True,
+                 'dir_ls' => True,
+                 'search' => True,
+                 'get_folders_list' => True,
+                 'showUploadboxes' => True,
+                 'createdir' => True,
+                 'removedir' => True,
+                 'uploadModel' => True
         );
-
         //keep
         var $bo;
@@ -49 +49 @@
         var $numoffiles;
         var $dispsep;
-
         var $target;
-
-        var $prefs;//array
-
+        var $prefs; //array
         var $groups_applications;
-
         var $current_config;
         var $dirs;
@@ -72 +68 @@
         var $edit_save_done_x;
         var $edit_cancel_x;
-
         // this ones must be checked thorougly;
         var $fileman = Array();
@@ -82 +77 @@
         var $limit; //for paging (paginacao)
         var $offset; //for paging (paginacao)
-
         var $now;
 
-        function uifilemanager()
-        {
+        function uifilemanager() {
                 $this->messages = &$_SESSION['phpgw_info']['filemanager']['user']['messages'];
 
@@ -98 +91 @@
 
                 $this->t = $GLOBALS['phpgw']->template;
-                $c = CreateObject('phpgwapi.config','filemanager');
+                $c = CreateObject('phpgwapi.config', 'filemanager');
                 $c->read_repository();
+
                 $this->current_config = $c->config_data;
-
 
                 // here local vars are created from the HTTP vars
                 @reset($GLOBALS['HTTP_POST_VARS']);
-                while(list($name,) = @each($GLOBALS['HTTP_POST_VARS']))
-                {
+                while (list($name, ) = @each($GLOBALS['HTTP_POST_VARS'])) {
                         $this->$name = $GLOBALS['HTTP_POST_VARS'][$name];
                 }
 
                 @reset($GLOBALS['HTTP_GET_VARS']);
-                while(list($name,) = @each($GLOBALS['HTTP_GET_VARS']))
-                {
+                while (list($name, ) = @each($GLOBALS['HTTP_GET_VARS'])) {
                         $$name = $GLOBALS['HTTP_GET_VARS'][$name];
                         $this->$name = $GLOBALS['HTTP_GET_VARS'][$name];
-
                 }
 
                 $to_decode = array
-                (
-                        'op'    => array('op' => ''),
-                        'path'  => array('path' => ''),
-                        'filename' => array('filename' => ''),
-                        'file'  => array('file' => ''),
-                        'sortby'        => array('sortby' => ''),
-                        'messages'      => array('messages'     => ''),
-                        'show_upload_boxes'     => array('show_upload_boxes' => ''),
-                        'from'  =>      array('from' => ''),
-                        'to' => array('to' => '')
-
+                         (
+                         'op' => array('op' => ''),
+                         'path' => array('path' => ''),
+                         'filename' => array('filename' => ''),
+                         'file' => array('file' => ''),
+                         'sortby' => array('sortby' => ''),
+                         'messages' => array('messages' => ''),
+                         'show_upload_boxes' => array('show_upload_boxes' => ''),
+                         'from' => array('from' => ''),
+                         'to' => array('to' => '')
                 );
 
                 reset($to_decode);
-                while(list($var, $conditions) = each($to_decode))
-                {
-                        while(list($condvar, $condvalue) = each($conditions))
-                        {
-                                if(isset($$condvar) && ($condvar == $var || $$condvar == $condvalue))
-                                {
+                while (list($var, $conditions) = each($to_decode)) {
+                        while (list($condvar, $condvalue) = each($conditions)) {
+                                if (isset($$condvar) && ($condvar == $var || $$condvar == $condvalue)) {
                                         $this->$var = stripslashes(base64_decode($$var));
                                 }
@@ -151 +137 @@
                 $pref_array = $pref->read_repository();
                 $this->prefs = $pref_array[$this->bo->appname]; //FIXME check appname var in _debug_array
-
                 //always show name
 
-                $this->prefs[name] =1;
-
-
-                if($this->prefs['viewinnewwin'])
-                {
+                $this->prefs[name] = 1;
+
+
+                if ($this->prefs['viewinnewwin']) {
                         $this->target = '_blank';
                 }
@@ -164 +148 @@
 
                 /*
-                        Check for essential directories
-                        admin must be able to disable these tests
-                */
-                
+                  Check for essential directories
+                  admin must be able to disable these tests
+                 */
+
                 // check if basedir exist 
-                $test=$this->bo->vfs->get_real_info(array('string' => $this->bo->basedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
-                if($test[mime_type]!='Directory')
-                {
+                $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
+                if ($test[mime_type] != 'Directory') {
                         die('Base directory does not exist, Ask adminstrator to check the global configuration.');
                 }
 
-                $test=$this->bo->vfs->get_real_info(array('string' => $this->bo->basedir.$this->bo->fakebase, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
-                if($test[mime_type]!='Directory')
-                {
+                $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->fakebase, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
+                if ($test[mime_type] != 'Directory') {
                         $this->bo->vfs->override_acl = 1;
 
                         $this->bo->vfs->mkdir(array(
-                                'string' => $this->bo->fakebase,
-                                'relatives' => array(RELATIVE_NONE)
+                                 'string' => $this->bo->fakebase,
+                                 'relatives' => array(RELATIVE_NONE)
                         ));
-                        
+
                         $this->bo->vfs->override_acl = 0;
 
                         //test one more time
-                        $test=$this->bo->vfs->get_real_info(array('string' => $this->bo->basedir.$this->bo->fakebase, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
-
-                        if($test[mime_type]!='Directory')
-                        {
+                        $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->fakebase, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
+
+                        if ($test[mime_type] != 'Directory') {
                                 die('Fake Base directory does not exist and could not be created, please ask the administrator to check the global configuration.');
-                        }
-                        else
-                        {
-                                $this->messages[]= lang('Fake Base Dir did not exist, created a new one.');
-                        }
-                }
-
-                $test=$this->bo->vfs->get_real_info(array('string' => $this->bo->basedir.$this->bo->homedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
-                if($test[mime_type]!='Directory')
-                {
+                        } else {
+                                $this->messages[] = lang('Fake Base Dir did not exist, created a new one.');
+                        }
+                }
+
+                $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->homedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
+                if ($test[mime_type] != 'Directory') {
                         $this->bo->vfs->override_acl = 1;
 
                         $this->bo->vfs->mkdir(array(
-                                'string' => $this->bo->homedir,
-                                'relatives' => array(RELATIVE_NONE)
+                                 'string' => $this->bo->homedir,
+                                 'relatives' => array(RELATIVE_NONE)
                         ));
                         $this->bo->vfs->set_quota(array(
-                                'string' => $this->bo->homedir,
-                                'relatives' => array(RELATIVE_NONE),
-                                'new_quota' => $this->current_config['filemanager_quota_size'] 
+                                 'string' => $this->bo->homedir,
+                                 'relatives' => array(RELATIVE_NONE),
+                                 'new_quota' => $this->current_config['filemanager_quota_size']
                         ));
 
@@ -218 +196 @@
 
                         //test one more time
-                        $test=$this->bo->vfs->get_real_info(array('string' => $this->bo->basedir.$this->bo->homedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
-
-                        if($test[mime_type]!='Directory')
-                        {
+                        $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->basedir . $this->bo->homedir, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
+
+                        if ($test[mime_type] != 'Directory') {
                                 die('Your Home Dir does not exist and could not be created, please ask the adminstrator to check the global configuration.');
-                        }
-                        else
-                        {
-                                $this->messages[]= lang('Your Home Dir did not exist, eGroupWare created a new one.');
+                        } else {
+                                $this->messages[] = lang('Your Home Dir did not exist, eGroupWare created a new one.');
                                 // FIXME we just created a fresh home dir so we know there nothing in it so we have to remove all existing content
                         }
-
-
-                }
-        }
-        function fileModels()
-        {
+                }
+        }
+
+        function fileModels() {
                 $GLOBALS['phpgw_info']['flags'] = array
-                        (
-                                'currentapp'    => 'filemanager',
-                                'noheader'      => False,
-                                'nonavbar' => False,
-                                'nofooter'      => False,
-                                'noappheader'   => False,
-                                'enable_browser_class'  => True
-                        );
+                         (
+                         'currentapp' => 'filemanager',
+                         'noheader' => False,
+                         'nonavbar' => False,
+                         'nofooter' => False,
+                         'noappheader' => False,
+                         'enable_browser_class' => True
+                );
 
                 $GLOBALS['phpgw']->common->phpgw_header();
                 $this->t->set_file(array('models' => 'fileModels.tpl'));
-                $this->t->set_block('models','header','header');
-                $this->t->set_block('models','body','body');
-                $this->t->set_block('models','footer','footer');
+                $this->t->set_block('models', 'header', 'header');
+                $this->t->set_block('models', 'body', 'body');
+                $this->t->set_block('models', 'footer', 'footer');
                 $this->t->set_var('url_1', './index.php?menuaction=filemanager.uifilemanager.uploadModel&model=article');
-                $this->t->set_var('model_1','article');
-                $this->t->set_var('lang_1',lang('article'));
-
-                $this->t->set_var('url_2','./index.php?menuaction=filemanager.uifilemanager.uploadModel&model=calendar');
-                $this->t->set_var('model_2','calendar');
-                $this->t->set_var('lang_2',lang('calendar'));
-
-                $this->t->set_var('url_3','./index.php?menuaction=filemanager.uifilemanager.uploadModel&model=todo');
-                $this->t->set_var('model_3','todo');
-                $this->t->set_var('lang_3',lang('todo'));
-
-                $this->t->set_var('url_4','./index.php?menuaction=filemanager.uifilemanager.uploadModel&model=slide');
-                $this->t->set_var('model_4','slide');
-                $this->t->set_var('lang_4',lang('slide'));
-
-                $this->t->set_var('url_5','./index.php?menuaction=filemanager.uifilemanager.uploadModel&model=cards');
-                $this->t->set_var('model_5','cards');
-                $this->t->set_var('lang_5',lang('cards'));
-
-                $this->t->set_var('url_6','./index.php?menuaction=filemanager.uifilemanager.uploadModel&model=resume');
-                $this->t->set_var('model_6','resume');
-                $this->t->set_var('lang_6',lang('resume'));
-
-
-                $this->t->pparse('out','models');
-
-
-        }
-        function uploadModel(){
+                $this->t->set_var('model_1', 'article');
+                $this->t->set_var('lang_1', lang('article'));
+
+                $this->t->set_var('url_2', './index.php?menuaction=filemanager.uifilemanager.uploadModel&model=calendar');
+                $this->t->set_var('model_2', 'calendar');
+                $this->t->set_var('lang_2', lang('calendar'));
+
+                $this->t->set_var('url_3', './index.php?menuaction=filemanager.uifilemanager.uploadModel&model=todo');
+                $this->t->set_var('model_3', 'todo');
+                $this->t->set_var('lang_3', lang('todo'));
+
+                $this->t->set_var('url_4', './index.php?menuaction=filemanager.uifilemanager.uploadModel&model=slide');
+                $this->t->set_var('model_4', 'slide');
+                $this->t->set_var('lang_4', lang('slide'));
+
+                $this->t->set_var('url_5', './index.php?menuaction=filemanager.uifilemanager.uploadModel&model=cards');
+                $this->t->set_var('model_5', 'cards');
+                $this->t->set_var('lang_5', lang('cards'));
+
+                $this->t->set_var('url_6', './index.php?menuaction=filemanager.uifilemanager.uploadModel&model=resume');
+                $this->t->set_var('model_6', 'resume');
+                $this->t->set_var('lang_6', lang('resume'));
+
+
+                $this->t->pparse('out', 'models');
+        }
+
+        function uploadModel() {
                 $GLOBALS['phpgw_info']['flags'] = array
-                        (
-                                'currentapp'    => 'filemanager',
-                                'noheader'      => False,
-                                'nonavbar' => False,
-                                'nofooter'      => False,
-                                'noappheader'   => False,
-                                'enable_browser_class'  => True
-                        );
+                         (
+                         'currentapp' => 'filemanager',
+                         'noheader' => False,
+                         'nonavbar' => False,
+                         'nofooter' => False,
+                         'noappheader' => False,
+                         'enable_browser_class' => True
+                );
 
                 $GLOBALS['phpgw']->common->phpgw_header();
 
-                $filename = lang('new')."_".lang($this->model).rand(0,1000).".html";
+                $filename = lang('new') . "_" . lang($this->model) . rand(0, 1000) . ".html";
                 $this->bo->vfs->cp(array(
-                        'from'=> PHPGW_SERVER_ROOT . '/filemanager/templates/default/'.$this->model.'.html',
-                        'to'=> $filename,
-                        'relatives'     => array(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL)
+                         'from' => PHPGW_SERVER_ROOT . '/filemanager/templates/default/' . $this->model . '.html',
+                         'to' => $filename,
+                         'relatives' => array(RELATIVE_NONE | VFS_REAL, RELATIVE_ALL)
                 ));
 
                 $this->bo->vfs->set_attributes(array(
-                        'string'=> $filename,
-                        'relatives'     => array(RELATIVE_ALL),
-                        'attributes'=> array(
-                                'mime_type' => "text/html",
-                                'comment' => ""
-                        )
+                         'string' => $filename,
+                         'relatives' => array(RELATIVE_ALL),
+                         'attributes' => array(
+                                  'mime_type' => "text/html",
+                                  'comment' => ""
+                         )
                 ));
                 $this->filename = $filename;
                 $this->edit();
-
-        }
-        function index()
-        {
+        }
+
+        function index() {
                 $GLOBALS['phpgw_info']['flags'] = array
-                (
-                        'currentapp'    => 'filemanager',
-                        'noheader'      => False,
-                        'nonavbar' => False,
-                        'nofooter'      => False,
-                        'noappheader'   => False,
-                        'enable_browser_class'  => True
+                         (
+                         'currentapp' => 'filemanager',
+                         'noheader' => False,
+                         'nonavbar' => False,
+                         'nofooter' => False,
+                         'noappheader' => False,
+                         'enable_browser_class' => True
                 );
 
                 $GLOBALS['phpgw']->common->phpgw_header();
+
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/inc/load_lang.php'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/global.js'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/main.js'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/common_functions.js'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/connector.js'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/draw_api.js'></script>";
+                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='".$GLOBALS['phpgw_info']['flags']['currentapp']."/inc/load_lang.php'></script>";
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/global.js'></script>";
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/main.js'></script>";
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/common_functions.js'></script>";
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/connector.js'></script>";
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/draw_api.js'></script>";
-                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='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/js/NewHandler.js'></script>";
 
 
@@ -338 +311 @@
                 $theme = "window_" . $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . ".css";
 
-                if( !file_exists('filemanager/tp/expressowindow/css/'.$theme) )
+                if (!file_exists('filemanager/tp/expressowindow/css/' . $theme))
                         $theme = "window_default.css";
 
                 // Path FileManager
                 $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
-                $webserver_url = ( !empty($webserver_url) ) ? $webserver_url : '/';
-        
-                if(strrpos($webserver_url,'/') === false || strrpos($webserver_url,'/') != (strlen($webserver_url)-1))
+                $webserver_url = (!empty($webserver_url) ) ? $webserver_url : '/';
+
+                if (strrpos($webserver_url, '/') === false || strrpos($webserver_url, '/') != (strlen($webserver_url) - 1))
                         $webserver_url .= '/';
-        
-                $webserver_url  = $webserver_url . 'filemanager/'; 
-                
-                $js   = "var path_filemanager   = '".$webserver_url."';";
-                $js      .= "var my_home_filemanager    = '".trim($GLOBALS['uifilemanager']->bo->vfs->my_home)."';";
-                
-                echo "<script type='text/javascript'>".$js."</script>";
+
+                $webserver_url = $webserver_url . 'filemanager/';
+
+                $js = "var path_filemanager     = '" . $webserver_url . "';";
+                $js .= "var my_home_filemanager = '" . trim($GLOBALS['uifilemanager']->bo->vfs->my_home) . "';";
+
+                echo "<script type='text/javascript'>" . $js . "</script>";
 
                 // Expresso Window - CSS
-                print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'tp/expressowindow/css/'.$theme.'" >';
+                print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'tp/expressowindow/css/' . $theme . '" >';
 
                 // Expresso Window - JS 
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/xtools.js'></script>";
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/jsloader.js'></script>";
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/makeW.js'></script>";
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/dragdrop.js'></script>";
-                echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/show_hidden.js'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/tp/expressowindow/js/xtools.js'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/tp/expressowindow/js/jsloader.js'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/tp/expressowindow/js/makeW.js'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/tp/expressowindow/js/dragdrop.js'></script>";
+                echo "<script src='" . $GLOBALS['phpgw_info']['flags']['currentapp'] . "/tp/expressowindow/js/show_hidden.js'></script>";
 
                 echo "<script src='./phpgwapi/js/dftree/dftree.js'></script>";
@@ -370 +343 @@
                 # Code is fairly hackish at the beginning, but it gets better
                 # Highly suggest turning wrapping off due to long SQL queries
-
                 ###
                 # Some hacks to set and display directory paths correctly
                 ###
                 // new method for switching to a new dir.
-                if($this->changedir=='true' && $this->cdtodir || $this->goto_x)
-                {
+                if ($this->changedir == 'true' && $this->cdtodir || $this->goto_x) {
                         $this->path = $this->cdtodir;
                 }
 
-                if(!$this->path)
-                {
+                if (!$this->path) {
                         $this->path = $this->bo->vfs->pwd();
 
-                        if(!$this->path || $this->bo->vfs->pwd(array('full' => False)) == '')
-                        {
-                                $this->path = $this->bo->homedir; 
+                        if (!$this->path || $this->bo->vfs->pwd(array('full' => False)) == '') {
+                                $this->path = $this->bo->homedir;
                         }
                 }
@@ -395 +364 @@
                 $pwd = $this->bo->vfs->pwd();
 
-                if(!$this->cwd = substr($this->path, strlen($this->bo->homedir) + 1))  
-                {
+                if (!$this->cwd = substr($this->path, strlen($this->bo->homedir) + 1)) {
                         $this->cwd = '/';
-                }
-                else
-                {
+                } else {
                         $this->cwd = substr($pwd, strrpos($pwd, '/') + 1);
                 }
@@ -407 +373 @@
 
                 /* This just prevents // in some cases */
-                if($this->path == '/')
-                {
+                if ($this->path == '/') {
                         $this->dispsep = '';
-                }
-                else
-                {
+                } else {
                         $this->dispsep = '/';
                 }
 
-                if(!($this->lesspath = substr($this->path, 0, strrpos($this->path, '/'))))
-                {
+                if (!($this->lesspath = substr($this->path, 0, strrpos($this->path, '/')))) {
                         $this->lesspath = '/';
                 }
 
-                /*Check permission*/
-                if($this->bo->vfs->acl_check(array(
-                        'string' => $this->path,
-                        'relatives' => array(RELATIVE_NONE),
-                        'operation' => PHPGW_ACL_READ
-                )))
-                {
+                /* Check permission */
+                if ($this->bo->vfs->acl_check(array(
+                                                'string' => $this->path,
+                                                'relatives' => array(RELATIVE_NONE),
+                                                'operation' => PHPGW_ACL_READ
+                                  ))) {
                         $this->can_read = True;
                 }
 
 
-                if ($_SESSION['phpgw_info']['user']['filemanager']['flush'] != 'flushed')
-                {
-                        /*Flush journal-deleted*/
+                if ($_SESSION['phpgw_info']['user']['filemanager']['flush'] != 'flushed') {
+                        /* Flush journal-deleted */
                         $this->bo->vfs->flush_journal(array(
-                                'string' => $this->path,
-                                'relatives' => array(RELATIVE_NONE),
-                                'deleteall' => True
+                                 'string' => $this->path,
+                                 'relatives' => array(RELATIVE_NONE),
+                                 'deleteall' => True
                         ));
                         $_SESSION['phpgw_info']['user']['filemanager']['flush'] = 'flushed';
@@ -446 +406 @@
 
                 # if is different path than home and no permission allowed
-                if($this->path != $this->bo->homedir && $this->path != $this->bo->fakebase && $this->path != '/' && !$this->can_read)
-                {
+                if ($this->path != $this->bo->homedir && $this->path != $this->bo->fakebase && $this->path != '/' && !$this->can_read) {
                         $this->messages[] = lang('You do not have access to %1', $this->path);
                         $this->path = $this->homedir;
@@ -459 +418 @@
 
                 # Verify path is real
-                if($this->path != $this->bo->homedir && $this->path != '/' && $this->path != $this->bo->fakebase)
-                {
-                        if(!$this->bo->vfs->file_exists(array(
-                                'string' => $this->path,
-                                'relatives' => array(RELATIVE_NONE)
-                        )))
-                        {
-                                $this->messages[] = lang('Error:').lang('Directory %1 does not exist', $this->path);
+                if ($this->path != $this->bo->homedir && $this->path != '/' && $this->path != $this->bo->fakebase) {
+                        if (!$this->bo->vfs->file_exists(array(
+                                                        'string' => $this->path,
+                                                        'relatives' => array(RELATIVE_NONE)
+                                          ))) {
+                                $this->messages[] = lang('Error:') . lang('Directory %1 does not exist', $this->path);
                                 $this->path = $this->homedir;
                                 $this->bo->vfs->cd(array('string' => $this->path, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
@@ -476 +433 @@
 
                 # Default is to sort by name
-                if(!$this->sortby)
-                {
+                if (!$this->sortby) {
                         $this->sortby = 'name';
                 }
-                if($this->update_x == 1){
+                if ($this->update_x == 1) {
                         $this->bo->vfs->update_real(array(
-                                'string'        => $this->path,
-                                'relatives'     => array(RELATIVE_NONE)
+                                 'string' => $this->path,
+                                 'relatives' => array(RELATIVE_NONE)
                         ));
-                        header('Location:'.$this->encode_href('index.php?menuaction=filemanager.uifilemanager.index','&path='.base64_encode($this->bo->homedir)));
-                }
-                elseif($this->newfile_x && $this->newfile_or_dir) // create new textfile
-                {
+                        header('Location:' . $this->encode_href('index.php?menuaction=filemanager.uifilemanager.index', '&path=' . base64_encode($this->bo->homedir)));
+                } elseif ($this->newfile_x && $this->newfile_or_dir) { // create new textfile
                         $this->createfile();
-                }
-                elseif($this->edit_cancel_x)
-                {
+                } elseif ($this->edit_cancel_x) {
                         $this->readFilesInfo();
                         $this->fileListing();
-                }
-                elseif($this->edit_x || $this->edit_preview_x || $this->edit_save_x || $this->edit_save_done_x)
-                {
+                } elseif ($this->edit_x || $this->edit_preview_x || $this->edit_save_x || $this->edit_save_done_x) {
                         $this->edit();
-                }
-                else
-                {
+                } else {
                         //$this->readFilesInfo();
                         $this->fileListing();
                 }
         }
-        function get_permissions(){
+
+        function get_permissions() {
                 /* get permissions */
-                if((preg_match('+^'.$this->bo->fakebase.'\/(.*)(\/|$)+U', $this->path, $matches)) && $matches[1] != $this->bo->userinfo['account_lid']) //FIXME matches not defined
-
-                {
-                        $this->bo->vfs->working_id = $GLOBALS['phpgw']->accounts->name2id($matches[1]);//FIXME matches not defined
-
-                }
-                else
-                {
+                if ((preg_match('+^' . $this->bo->fakebase . '\/(.*)(\/|$)+U', $this->path, $matches)) && $matches[1] != $this->bo->userinfo['account_lid']) { //FIXME matches not defined
+                        $this->bo->vfs->working_id = $GLOBALS['phpgw']->accounts->name2id($matches[1]); //FIXME matches not defined
+                } else {
                         $this->bo->vfs->working_id = $this->bo->userinfo['username'];
                 }
 
                 # Check available permissions for $this->path, so we can disable unusable operations in user interface
-                $path = explode('/',$this->path);
-                $owner_id = $this->bo->vfs->ownerOf($this->bo->fakebase,$path[2]);
+                $path = explode('/', $this->path);
+                $owner_id = $this->bo->vfs->ownerOf($this->bo->fakebase, $path[2]);
                 $user_id = $GLOBALS['phpgw_info']['user']['account_id'];
-                if ($owner_id == $user_id)
-                {
+                if ($owner_id == $user_id) {
                         $rights = 31;
-                }else
-                {
-                        $acl = CreateObject ('phpgwapi.acl', $owner_id);
+                } else {
+                        $acl = CreateObject('phpgwapi.acl', $owner_id);
                         $acl->account_id = $owner_id;
                         $acl->read_repository();
                         $rights = $acl->get_rights($user_id);
                 }
-                return $rights; 
-        }
-        function dir_ls()
-        {
+                return $rights;
+        }
+
+        function dir_ls() {
                 // change dir to this->path
                 $this->bo->vfs->cd(array('string' => $this->path, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
                 $return['permissions'] = $this->get_permissions();
                 $return['quota']['usedSpace'] = $this->bo->vfs->get_size(array(
-                                'string'        => $this->path,
-                                'relatives'     => array(RELATIVE_NONE)
-                ));
+                                                'string' => $this->path,
+                                                'relatives' => array(RELATIVE_NONE)
+                                  ));
                 $return['files_count'] = $this->bo->vfs->count_files(array(
-                                'string'        => $this->path,
-                ));
+                                                'string' => $this->path,
+                                  ));
                 $quota = $this->bo->vfs->get_quota(array(
-                        'string'        => $this->path
-                ));
+                                                'string' => $this->path
+                                  ));
                 reset($this->files_array);
                 $this->readFilesInfo();
 
-                for($i = 0; $i != $this->numoffiles; $i++)
-                {
+                for ($i = 0; $i != $this->numoffiles; $i++) {
                         $files = $this->files_array[$i];
 
-                        if($files['mime_type'] == "Directory")
-                        {
+                        if ($files['mime_type'] == "Directory") {
                                 continue;
                         }
                         /* small keys to safe bandwidth */
                         $tuple['name'] = htmlentities($files['name']);
-                        if ($_SESSION['phpgw_info']['user']['preferences']['filemanager']['viewIcons'] == 1){
-                                if ($files['mime_type'] == 'image/png' || 
-                                        $files['mime_type'] == 'image/gif' || 
-                                        $files['mime_type'] == 'image/jpg')
-                                {
-                                        $filename = str_replace('=','',base64_encode($tuple['name']));
-                                        $pathname = str_replace('=','',base64_encode($this->path));
-                                        $tuple['icon'] = './index.php?menuaction=filemanager.vfs_functions.summary&file='.$filename.'&path='.$pathname;
+                        if ($_SESSION['phpgw_info']['user']['preferences']['filemanager']['viewIcons'] == 1) {
+                                if ($files['mime_type'] == 'image/png' ||
+                                                  $files['mime_type'] == 'image/gif' ||
+                                                  $files['mime_type'] == 'image/jpg') {
+                                        $filename = str_replace('=', '', base64_encode($tuple['name']));
+                                        $pathname = str_replace('=', '', base64_encode($this->path));
+                                        $tuple['icon'] = './index.php?menuaction=filemanager.vfs_functions.summary&file=' . $filename . '&path=' . $pathname;
                                 }
                                 else
-                                        $tuple['icon'] =  $this->mime_icon($files['mime_type'],64);
+                                        $tuple['icon'] = $this->mime_icon($files['mime_type'], 64);
                         }
                         else
@@ -584 +523 @@
                         $tuple['pub'] = $files['type'];
                         $tuple['createdby_id'] = $GLOBALS['phpgw']->accounts->id2name($files['createdby_id']);
-                        $tuple['modifiedby_id'] = $files['modifiedby_id']?$GLOBALS['phpgw']->accounts->id2name($files['modifiedby_id']):'';
+                        $tuple['modifiedby_id'] = $files['modifiedby_id'] ? $GLOBALS['phpgw']->accounts->id2name($files['modifiedby_id']) : '';
                         $tuple['owner'] = $GLOBALS['phpgw']->accounts->id2name($files['owner_id']);
                         $tuple['comment'] = $files['comment'];
                         $tuple['version'] = $files['version'];
                         $output[] = $tuple;
-
                 }
                 $return['files'] = $output;
-                $return['quota']['quotaSize'] = ($quota*1024*1024);
+                $return['quota']['quotaSize'] = ($quota * 1024 * 1024);
                 echo serialize($return);
         }
-        function get_folders_list()
-        {
-                $this->update_groups(); 
+
+        function get_folders_list() {
+                $this->update_groups();
                 $this->groups_applications = array();
 
                 $user_groups = $GLOBALS['phpgw']->accounts->membership();
-                foreach($user_groups as $val){
+                foreach ($user_groups as $val) {
                         $account_name = $GLOBALS['phpgw']->accounts->id2name($val['account_id']);
                         $this->readable_groups[$account_name] = array(
-                                'account_id' => $val['account_id'],
-                                'account_name' => $account_name
+                                 'account_id' => $val['account_id'],
+                                 'account_name' => $account_name
                         );
                 }
 
-                foreach ($this->readable_groups as $value)
-                {
+                foreach ($this->readable_groups as $value) {
                         $applications = CreateObject('phpgwapi.applications', $value['account_id']);
                         $this->groups_applications[$value['account_name']] = $applications->read_account_specific();
@@ -618 +555 @@
                 // selectbox for change/move/and copy to
                 $this->dirs = $this->all_other_directories();
-                foreach($this->dirs as $dir)
+                foreach ($this->dirs as $dir)
                         $return[] = $dir['directory'] . $dir['name'];
                 sort(&$return, SORT_STRING);
                 echo serialize($return);
         }
-        function fileListing()
-        {
+
+        function fileListing() {
                 $this->t->set_file(array('filemanager_list_t' => 'main.tpl'));
-                $this->t->set_block('filemanager_list_t','filemanager_header','filemanager_header');
-                $this->t->set_block('filemanager_list_t','filemanager_footer','filemanager_footer');
-
-                if($this->numoffiles || $this->cwd)
-                {
-                        $vars[path]='<input type="hidden" id="currentPath" value="'.$this->path.'">';
-                        $vars[css]='<link rel="stylesheet" type="text/css" href="filemanager/templates/default/main.css">';
+                $this->t->set_block('filemanager_list_t', 'filemanager_header', 'filemanager_header');
+                $this->t->set_block('filemanager_list_t', 'filemanager_footer', 'filemanager_footer');
+
+                if ($this->numoffiles || $this->cwd) {
+                        $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">';
                         $_SESSION['phpgw_info']['user']['preferences']['filemanager']['lid'] = $GLOBALS['phpgw_info']['user']['account_lid'];
-                        $vars[preferences]='<input type="hidden" id="userPreferences" value=\''.serialize($_SESSION['phpgw_info']['user']['preferences']['filemanager']).'\'>';
+                        $vars[preferences] = '<input type="hidden" id="userPreferences" value=\'' . serialize($_SESSION['phpgw_info']['user']['preferences']['filemanager']) . '\'>';
                         // Used for important operations that needs security
-                        for ($key = ""; strlen($key) < 150; $key .= chr(rand(48,95)));
+                        for ($key = ""; strlen($key) < 150; $key .= chr(rand(48, 95)))
+                                ;
                         $_SESSION['phpgw_info']['filemanager']['user']['sec_key'] = $key;
-                        $vars[sec_key]='<input type="hidden" id="userKey" value=\''.$key.'\'>';
-                        $vars[script]='<script>initDrawApi();</script>';
-                        
-                        $vars[new_button]=$this->toolButton('new','createfile',lang('New...'));
+                        $vars[sec_key] = '<input type="hidden" id="userKey" value=\'' . $key . '\'>';
+                        $vars[script] = '<script>initDrawApi();</script>';
+
+                        $vars[new_button] = $this->toolButton('new', 'createfile', lang('New...'));
                         $vars[new_button].='<input type="hidden" id="newfile_or_dir" name="newfile_or_dir" value="" />';
-                        
+
                         // reload button with this url
-                        $vars[refresh_button]=$this->toolButton('reload','reload',lang('reload'));
+                        $vars[refresh_button] = $this->toolButton('reload', 'reload', lang('reload'));
 
                         // go up icon when we're not at the top, dont allow to go outside /home = fakebase
-                        if($this->path != '/' && $this->path != $this->bo->fakebase)
-                        {
-                                $vars[tools_button] = $this->toolButton('tools','tools',lang('tools'));
+                        if ($this->path != '/' && $this->path != $this->bo->fakebase) {
+                                $vars[tools_button] = $this->toolButton('tools', 'tools', lang('tools'));
                         }
                         else
                                 $vars[tools_button] = "";
 
-                        $vars[toolbar1]=$toolbar;
-
-                        if(count($this->messages)>0) 
-                        {
-                                foreach($this->messages as $msg)
-                                {
-                                        $messages.='<span>'.$msg.'</span>';
+                        $vars[toolbar1] = $toolbar;
+
+                        if (count($this->messages) > 0) {
+                                foreach ($this->messages as $msg) {
+                                        $messages.='<span>' . $msg . '</span>';
                                 }
                         }
                         $this->messages = NULL;
-                        
-                        $vars[messages]=$messages;
+
+                        $vars[messages] = $messages;
 
                         $this->t->set_var($vars);
-                        $this->t->pparse('out','filemanager_header');
+                        $this->t->pparse('out', 'filemanager_header');
                 }
 
                 $this->t->set_var($vars);
-                $this->t->pparse('out','filemanager_footer');
+                $this->t->pparse('out', 'filemanager_footer');
 
                 $GLOBALS['phpgw']->common->phpgw_footer();
@@ -680 +614 @@
         }
 
-        function readFilesInfo()
-        {
+        function readFilesInfo() {
                 // start files info
-
                 # Read in file info from database to use in the rest of the script
                 # $fakebase is a special directory.  In that directory, we list the user's
                 # home directory and the directories for the groups they're in
                 $this->numoffiles = 0;
-                if($this->path == $this->bo->fakebase)
-                {
+                if ($this->path == $this->bo->fakebase) {
                         // FIXME this test can be removed
-                        if(!$this->bo->vfs->file_exists(array('string' => $this->bo->homedir, 'relatives' => array(RELATIVE_NONE))))
-                        {
+                        if (!$this->bo->vfs->file_exists(array('string' => $this->bo->homedir, 'relatives' => array(RELATIVE_NONE)))) {
                                 $this->bo->vfs->mkdir(array('string' => $this->bo->homedir, 'relatives' => array(RELATIVE_NONE)));
                         }
 
                         $ls_array = $this->bo->vfs->ls(array(
-                                'string' => $this->bo->homedir,
-                                'relatives' => array(RELATIVE_NONE),
-                                'checksubdirs' => False,
-                                'nofiles' => True
-                        ));
+                                                        'string' => $this->bo->homedir,
+                                                        'relatives' => array(RELATIVE_NONE),
+                                                        'checksubdirs' => False,
+                                                        'nofiles' => True
+                                          ));
 
                         $this->files_array[] = $ls_array[0];
@@ -707 +637 @@
 
                         reset($this->readable_groups);
-                        while(list($num, $group_array) = each($this->readable_groups))
-                        {
+                        while (list($num, $group_array) = each($this->readable_groups)) {
                                 # If the group doesn't have access to this app, we don't show it
-                                /*if(!$this->groups_applications[$group_array['account_name']][$this->bo->appname]['enabled'])
-                                {
-                                        continue;
-                                }
-                                */
-
-
-                                if(!$this->bo->vfs->file_exists(array('string' => $this->bo->fakebase.'/'.$group_array['account_name'],'relatives'      => array(RELATIVE_NONE))))
-                                {
+                                /* if(!$this->groups_applications[$group_array['account_name']][$this->bo->appname]['enabled'])
+                                  {
+                                  continue;
+                                  }
+                                 */
+
+
+                                if (!$this->bo->vfs->file_exists(array('string' => $this->bo->fakebase . '/' . $group_array['account_name'], 'relatives' => array(RELATIVE_NONE)))) {
                                         $this->bo->vfs->override_acl = 1;
                                         $this->bo->vfs->mkdir(array(
-                                                'string' => $this->bo->fakebase.'/'.$group_array['account_name'],
-                                                'relatives' => array(RELATIVE_NONE)
+                                                 'string' => $this->bo->fakebase . '/' . $group_array['account_name'],
+                                                 'relatives' => array(RELATIVE_NONE)
                                         ));
 
                                         // FIXME we just created a fresh group dir so we know there nothing in it so we have to remove all existing content
-                                        
-                                        
+
+
                                         $this->bo->vfs->override_acl = 0;
 
-                                        $this->bo->vfs->set_attributes(array('string' => $this->bo->fakebase.'/'.$group_array['account_name'],'relatives'       => array(RELATIVE_NONE),'attributes' => array('owner_id' => $group_array['account_id'],'createdby_id' => $group_array['account_id'])));
+                                        $this->bo->vfs->set_attributes(array('string' => $this->bo->fakebase . '/' . $group_array['account_name'], 'relatives' => array(RELATIVE_NONE), 'attributes' => array('owner_id' => $group_array['account_id'], 'createdby_id' => $group_array['account_id'])));
                                 }
 
-                                $ls_array = $this->bo->vfs->ls(array('string' => $this->bo->fakebase.'/'.$group_array['account_name'],'relatives'       => array(RELATIVE_NONE),'checksubdirs' => False,'nofiles' => True));
+                                $ls_array = $this->bo->vfs->ls(array('string' => $this->bo->fakebase . '/' . $group_array['account_name'], 'relatives' => array(RELATIVE_NONE), 'checksubdirs' => False, 'nofiles' => True));
 
                                 $this->files_array[] = $ls_array[0];
@@ -739 +667 @@
                                 $this->numoffiles++;
                         }
-                }
-                else
-                {
+                } else {
                         $ls_array = $this->bo->vfs->ls(array(
-                                'string' => $this->path,
-                                'relatives'     => array(RELATIVE_NONE),
-                                'checksubdirs' => False,
-                                'nofiles'       => False,
-                                'orderby'       => $this->criteria,
-                                'otype'         => $this->otype,
-                                'limit'         => $this->limit,
-                                'offset'        => $this->offset
-                        ));
-
-                        while(list($num, $file_array) = each($ls_array))
-                        {
+                                                        'string' => $this->path,
+                                                        'relatives' => array(RELATIVE_NONE),
+                                                        'checksubdirs' => False,
+                                                        'nofiles' => False,
+                                                        'orderby' => $this->criteria,
+                                                        'otype' => $this->otype,
+                                                        'limit' => $this->limit,
+                                                        'offset' => $this->offset
+                                          ));
+
+                        while (list($num, $file_array) = each($ls_array)) {
                                 $this->numoffiles++;
                                 $this->files_array[] = $file_array;
@@ -760 +685 @@
                 }
 
-                if(!is_array($this->files_array))
-                {
+                if (!is_array($this->files_array)) {
                         $this->files_array = array();
                 }
                 // end file count
         }
-        
-        function removedir()
-        {
+
+        function removedir() {
                 //$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) )) )
+
+                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) )
-                {
-                        echo lang('Error:').$this->bo->html_encode(lang('Directory names cannot contain "%1"', $badchar), 1);
+
+        function createdir() {
+                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');
-                }
-                
+                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
-                ));
+                                                '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
-                        {
-                                echo lang('Error:').lang('Directory %1 already exists', $fileinfo['name']);
-                        }
-                }
-                else
-                {
+                if ($fileinfo['name']) {
+                        if ($fileinfo['mime_type'] != 'Directory') {
+                                echo lang('Error:') . lang('%1 already exists as a file', $fileinfo['name']);
+                        } else {
+                                echo lang('Error:') . lang('Directory %1 already exists', $fileinfo['name']);
+                        }
+                } else {
                         $this->bo->vfs->cd(array('string' => $this->path, 'relatives' => array(RELATIVE_NONE), 'relative' => False));
-                        
-                        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);
+
+                        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()
-        {
+
+        function getReturnExecuteForm() {
                 $response = $_SESSION['response'];
-                
+
                 unset($_SESSION['response']);
-                
+
                 echo $response;
         }
-        
+
         function showUploadboxes()
         {
                 $notify = CreateObject('filemanager.notifications');
-                
+
                 $var = array(
-                                        'change_upload_boxes'   => lang('Show'),                                
-                                        'form_action'                   => $GLOBALS[phpgw]->link('/filemanager/inc/upload.php'),
-                                        'emails_to'                             => $notify->EmailsToSend($GLOBALS['phpgw']->preferences->values['email']),
-                                        'lang_file'                             => lang('File'),
-                                        'lang_comment'                  => lang('Comment'),
-                                        'lang_advanced_upload'  => lang('Advanced Upload'),
-                                        'lang_upload'                   => lang('Upload files'),
-                                        'max_size'                              => lang('Note: Uploaded is limited to %1MB',( $this->current_config['filemanager_Max_file_size'])),                             
-                                        'path'                                  => $this->path
+                         'change_upload_boxes'  => lang('Show'),
+                         'form_action'                  => $GLOBALS[phpgw]->link('/filemanager/inc/upload.php'),
+                         'emails_to'                            => $notify->EmailsToSend($GLOBALS['phpgw']->preferences->values['email']),
+                         'lang_file'                            => lang('File(s)'),
+                         'lang_comment'                 => lang('Comment(s)'),
+                         'lang_advanced_upload' => lang('Advanced Upload'),
+                         'lang_upload'                  => lang('Upload files'),
+                         'max_size'                             => lang('The maximum size for each file is %1MB', ($this->current_config['filemanager_Max_file_size'])),
+                         'path'                                 => $this->path
                 );
-                
-                print( serialize($var) );
-                
+
+                print( serialize($var));
         }
 
         /* create textfile */
-        function createfile()
+        function createfile() 
         {
-                $this->filename=$this->newfile_or_dir;
-                if($this->filename)
-                {
-                        if($badchar = $this->bo->bad_chars($this->filename, True, True))
-                        {
-                                $this->messages[] = lang('Error:').lang('File names cannot contain "%1"',$badchar);
+                $this->filename = $this->newfile_or_dir;
+                if ($this->filename) {
+                        if ($badchar = $this->bo->bad_chars($this->filename, True, True)) {
+                                $this->messages[] = lang('Error:') . lang('File names cannot contain "%1"', $badchar);
 
                                 $this->fileListing();
                         }
 
-                        if($this->bo->vfs->file_exists(array(
-                                'string'=> $this->filename,
-                                'relatives'     => array(RELATIVE_ALL)
-                        )))
-                        {
-                                $this->messages[]= lang('Error:').lang('File %1 already exists. Please edit it or delete it first.', $this->filename);
+                        if ($this->bo->vfs->file_exists(array(
+                                                        'string' => $this->filename,
+                                                        'relatives' => array(RELATIVE_ALL)
+                                          ))) {
+                                $this->messages[] = lang('Error:') . lang('File %1 already exists. Please edit it or delete it first.', $this->filename);
                                 $this->fileListing();
                         }
 
-                        if($this->bo->vfs->touch(array(
-                                'string'        => $this->filename,
-                                'relatives'     => array(RELATIVE_ALL)
-                        )))
-                        {
+                        if ($this->bo->vfs->touch(array(
+                                                        'string' => $this->filename,
+                                                        'relatives' => array(RELATIVE_ALL)
+                                          ))) {
                                 $this->edit = 1;
                                 $this->numoffiles++;
                                 $this->edit();
-                        }
-                        else
-                        {
-                                $this->messages[]= lang('Error:').lang('File %1 could not be created.', $this->filename);
+                        } else {
+                                $this->messages[] = lang('Error:') . lang('File %1 could not be created.', $this->filename);
                                 $this->fileListing();
                         }
@@ -896 +799 @@
 
         # Handle Editing files
-        function edit()
-        {
-                if($this->filename)
-                {
-                        if (! $this->vfs_functions->verifyLock($this->path.'/'.$this->filename,RELATIVE_NONE)){
+
+        function edit() {
+                if ($this->filename) {
+                        if (!$this->vfs_functions->verifyLock($this->path . '/' . $this->filename, RELATIVE_NONE)) {
                                 $GLOBALS['phpgw']->redirect('/index.php');
                         }
                         $ls_array = $this->bo->vfs->ls(array(
-                                'string'        => $this->path.'/'.$this->filename,
-                                'relatives'     => array(RELATIVE_NONE),
-                                'checksubdirs'  => False,
-                                'nofiles'       => True
+                                                        'string' => $this->path . '/' . $this->filename,
+                                                        'relatives' => array(RELATIVE_NONE),
+                                                        'checksubdirs' => False,
+                                                        'nofiles' => True
+                                          ));
+                        $this->bo->vfs->touch(array(
+                                 'string' => $this->path . '/' . $this->filename,
+                                 'relatives' => array(RELATIVE_NONE)
                         ));
-                        $this->bo->vfs->touch(array(
-                                'string'=> $this->path.'/'.$this->filename,
-                                'relatives'     => array(RELATIVE_NONE)
-                        ));
-
-
-                        if($ls_array[0]['mime_type'])
-                        {
+
+
+                        if ($ls_array[0]['mime_type']) {
                                 $mime_type = $ls_array[0]['mime_type'];
-                        }
-                        elseif($this->prefs['viewtextplain'])
-                        {
+                        } elseif ($this->prefs['viewtextplain']) {
                                 $mime_type = 'text/plain';
                         }
-                        $editable = array('','text/plain','text/csv','text/html','text/text','message/rfc822');
-
-                        if(!in_array($mime_type,$editable)){
-                                $this->messages[] = lang('Error:').lang('Impossible to edit this file');
+                        $editable = array('', 'text/plain', 'text/csv', 'text/html', 'text/text', 'message/rfc822');
+
+                        if (!in_array($mime_type, $editable)) {
+                                $this->messages[] = lang('Error:') . lang('Impossible to edit this file');
                                 $this->readFilesInfo();
                                 $this->fileListing();
@@ -940 +839 @@
                         $this->t->set_file(array('filemanager_edit' => 'edit_file.tpl'));
 
-                $this->t->set_block('filemanager_edit','row','row');
+                $this->t->set_block('filemanager_edit', 'row', 'row');
 
 
                 $vars[refresh_script] = "<script src='filemanager/js/refresh.js'></script>";
 
-                $vars[preview_content]='';
-                if($this->edit_file)
-                {
+                $vars[preview_content] = '';
+                if ($this->edit_file) {
                         $this->edit_file_content = stripslashes($this->edit_file_content);
                 }
 
-                if($this->edit_preview_x)
-                {
+                if ($this->edit_preview_x) {
                         $content = $this->edit_file_content;
 
-                        $vars[lang_preview_of]=lang('Preview of %1', $this->path.'/'.$edit_file);
-
-                        $vars[preview_content]=nl2br($content);
-                }
-                elseif($this->edit_save_x || $this->edit_save_done_x)
-                {
+                        $vars[lang_preview_of] = lang('Preview of %1', $this->path . '/' . $edit_file);
+
+                        $vars[preview_content] = nl2br($content);
+                } elseif ($this->edit_save_x || $this->edit_save_done_x) {
                         $content = $this->edit_file_content;
                         //die( $content);
-                        if($this->bo->vfs->write(array(
-                                'string'        => $this->path.'/'.$this->edit_file,
-                                'relatives'     => array(RELATIVE_NONE),
-                                'content'       => $content
-                        )))
-                        {
-                                $this->messages[]=lang('Saved %1', $this->path.'/'.$this->edit_file);
-
-                                if($this->edit_save_done_x)
-                                {
+                        if ($this->bo->vfs->write(array(
+                                                        'string' => $this->path . '/' . $this->edit_file,
+                                                        'relatives' => array(RELATIVE_NONE),
+                                                        'content' => $content
+                                          ))) {
+                                $this->messages[] = lang('Saved %1', $this->path . '/' . $this->edit_file);
+
+                                if ($this->edit_save_done_x) {
                                         $this->readFilesInfo();
                                         $this->fileListing();
                                         exit;
                                 }
-                        }
-                        else
-                        {
-                                $this->messages[]=lang('Could not save %1', $this->path.'/'.$this->edit_file);
+                        } else {
+                                $this->messages[] = lang('Could not save %1', $this->path . '/' . $this->edit_file);
                         }
                 }
@@ -986 +877 @@
                 # If we're in preview or save mode, we only show the file
                 # being previewed or saved
-                if($this->edit_file &&($this->filename != $this->edit_file))
-                {
+                if ($this->edit_file && ($this->filename != $this->edit_file)) {
                         continue;
                 }
 
-                if($this->filename && $this->bo->vfs->file_exists(array(
-                        'string'        => $this->filename,
-                        'relatives'     => array(RELATIVE_ALL)
-                )))
-                {
-                        if($this->edit_file)
-                        {
+                if ($this->filename && $this->bo->vfs->file_exists(array(
+                                                'string' => $this->filename,
+                                                'relatives' => array(RELATIVE_ALL)
+                                  ))) {
+                        if ($this->edit_file) {
                                 $content = stripslashes($this->edit_file_content);
-                        }
-                        else
-                        {
+                        } else {
                                 $content = $this->bo->vfs->read(array('string' => $this->filename));
                         }
-                        $vars[form_action]= $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->path);
-                        $vars[edit_file]=$this->filename;
+                        $vars[form_action] = $GLOBALS['phpgw']->link('/index.php', 'menuaction=filemanager.uifilemanager.index', 'path=' . $this->path);
+                        $vars[edit_file] = $this->filename;
                         # We need to include all of the fileman entries for each file's form,
                         # so we loop through again
-                        for($i = 0; $i != $this->numoffiles; $i++)
-                        {
-                                if($this->filename) $value='value="'.$this->filename.'"';
-                                $vars[filemans_hidden]='<input type="hidden" name="filename" '.$value.' />';
-                        }
-                        $vars[file_content]=$content;
-
-                        $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)));
-                        $vars[buttonCancel]=$this->inputButton('edit_cancel','cancel',lang('Cancel editing %1 without saving', $this->bo->html_encode($this->filename, 1)));
-
-                        if ($mime_type == 'text/html'){
+                        for ($i = 0; $i != $this->numoffiles; $i++) {
+                                if ($this->filename)
+                                        $value = 'value="' . $this->filename . '"';
+                                $vars[filemans_hidden] = '<input type="hidden" name="filename" ' . $value . ' />';
+                        }
+                        $vars[file_content] = $content;
+
+                        $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)));
+                        $vars[buttonCancel] = $this->inputButton('edit_cancel', 'cancel', lang('Cancel editing %1 without saving', $this->bo->html_encode($this->filename, 1)));
+
+                        if ($mime_type == 'text/html') {
                                 $vars[fck_edit] = '<script type="text/javascript" src="filemanager/tp/ckeditor/ckeditor.js"></script>
-                                        <textarea cols="80" id="edit_file_content" name="edit_file_content" rows="10">'.$content.'</textarea>
+                                        <textarea cols="80" id="edit_file_content" name="edit_file_content" rows="10">' . $content . '</textarea>
                                                 <script type="text/javascript"> CKEDITOR.replace( \'edit_file_content\',{
 removePlugins : \'elementspath\',
@@ -1035 +921 @@
 ["Styles","Format","Font","FontSize"]]
                                 });</script>';
-
                         }
 
 
                         $this->t->set_var($vars);
-                        $this->t->parse('rows','row');
-                        $this->t->pparse('out','row');
-
-                }
-
-        }
-
-        function history()
-        {
-                if($this->file) // FIXME this-file is never defined
-                {
+                        $this->t->parse('rows', 'row');
+                        $this->t->pparse('out', 'row');
+                }
+        }
+
+        function history() {
+                if ($this->file) { // FIXME this-file is never defined
                         $journal_array = $this->bo->vfs->get_journal(array(
-                                'string'        => $this->file,//FIXME
-                                'relatives'     => array(RELATIVE_ALL)
-                        ));
-
-                        if(is_array($journal_array))
-                        {
+                                                        'string' => $this->file, //FIXME
+                                                        'relatives' => array(RELATIVE_ALL)
+                                          ));
+
+                        if (is_array($journal_array)) {
                                 $this->html_table_begin();
                                 $this->html_table_row_begin();
@@ -1074 +954 @@
                                 $this->html_table_row_end();
 
-                                while(list($num, $journal_entry) = each($journal_array))
-                                {
+                                while (list($num, $journal_entry) = each($journal_array)) {
                                         $this->html_table_row_begin();
                                         $this->html_table_col_begin();
@@ -1081 +960 @@
                                         $this->html_table_col_end();
                                         $this->html_table_col_begin();
-                                        $this->bo->html_text($journal_entry['version'] . '&nbsp;&nbsp;&nbsp;' );
+                                        $this->bo->html_text($journal_entry['version'] . '&nbsp;&nbsp;&nbsp;');
                                         $this->html_table_col_end();
                                         $this->html_table_col_begin();
@@ -1094 +973 @@
                                 $GLOBALS['phpgw']->common->phpgw_footer();
                                 $GLOBALS['phpgw']->common->phpgw_exit();
-                        }
-                        else
-                        {
+                        } else {
                                 echo lang('No version history for this file/directory');
                         }
                 }
         }
-        function view()
-        {
+
+        function view() {
                 if (!$this->bo->vfs->acl_check(array(
-                        'string'        => $this->path,
-                        'relatives'     => array(RELATIVE_NONE),
-                        'operation'     => PHPGW_ACL_READ
-                )))
-                {
+                                                'string' => $this->path,
+                                                'relatives' => array(RELATIVE_NONE),
+                                                'operation' => PHPGW_ACL_READ
+                                  ))) {
                         $this->messages[] = lang("You have no permission to access this file");
-                        header('Location:'.$this->encode_href('inc/index.php?menuaction=filemanager.uifilemanager.index','&path='.base64_encode($this->bo->homedir)));
+                        header('Location:' . $this->encode_href('inc/index.php?menuaction=filemanager.uifilemanager.index', '&path=' . base64_encode($this->bo->homedir)));
 
                         return;
                 }
-                if($this->file) //FIXME
-                {
+                if ($this->file) { //FIXME
                         $ls_array = $this->bo->vfs->ls(array(
-                                'string'        => $this->path.'/'.$this->file,//FIXME
-                                'relatives'     => array(RELATIVE_NONE),
-                                'checksubdirs'  => False,
-                                'nofiles'       => True
-                        ));
-                        if($ls_array[0]['mime_type'])
-                        {
+                                                        'string' => $this->path . '/' . $this->file, //FIXME
+                                                        'relatives' => array(RELATIVE_NONE),
+                                                        'checksubdirs' => False,
+                                                        'nofiles' => True
+                                          ));
+                        if ($ls_array[0]['mime_type']) {
                                 $mime_type = $ls_array[0]['mime_type'];
-                        }
-                        elseif($this->prefs['viewtextplain'])
-                        {
+                        } elseif ($this->prefs['viewtextplain']) {
                                 $mime_type = 'text/plain';
                         }
-                        $viewable = array('text/plain','text/csv','text/html',
-                                'text/text','image/jpeg','image/png','image/gif',
-                                'audio/mpeg','video/mpeg');
-
-                        if(in_array($mime_type,$viewable)) 
-                        {
-                                /*Note: if you put application/octet-stream you force download */
+                        $viewable = array('text/plain', 'text/csv', 'text/html',
+                                 'text/text', 'image/jpeg', 'image/png', 'image/gif',
+                                 'audio/mpeg', 'video/mpeg');
+
+                        if (in_array($mime_type, $viewable)) {
+                                /* Note: if you put application/octet-stream you force download */
                                 header('Content-type: ' . $mime_type);
                                 header('Content-disposition: filename="' . addslashes($this->file) . '"');
                                 Header("Pragma: public");
-                        }
-                        else
-                        {
-                                $GLOBALS['phpgw']->browser->content_header($this->file,$mime_type,$ls_array[0]['size']);
-                        }
-                        if ($ls_array[0]['size'] < 10240)
-                        {
+                        } else {
+                                $GLOBALS['phpgw']->browser->content_header($this->file, $mime_type, $ls_array[0]['size']);
+                        }
+                        if ($ls_array[0]['size'] < 10240) {
                                 echo $this->bo->vfs->read(array(
-                                        'string'    => $this->path.'/'.$this->file,//FIXME
-                                        'relatives'    => array(RELATIVE_NONE)
+                                         'string' => $this->path . '/' . $this->file, //FIXME
+                                         'relatives' => array(RELATIVE_NONE)
                                 ));
-                        }
-                        else
-                        {
+                        } else {
                                 $this->bo->vfs->print_content(array(
-                                        'string' => $this->path.'/'.$this->file,
-                                        'relatives' => array(RELATIVE_NONE)
-                                )
-                        );
+                                         'string' => $this->path . '/' . $this->file,
+                                         'relatives' => array(RELATIVE_NONE)
+                                                  )
+                                );
                         }
                         $GLOBALS['phpgw']->common->phpgw_exit();
@@ -1164 +1030 @@
         }
 
-        function export(){
-                if($this->file)
-                {
+        function export() {
+                if ($this->file) {
                         $ls_array = $this->bo->vfs->ls(array(
-                                'string'        => $this->path.'/'.$this->file,
-                                'relatives'     => array(RELATIVE_NONE),
-                                'checksubdirs'  => False,
-                                'nofiles'       => True
-                        ));
-                        /*$timestamp = $this->vfs_functions->dateString2timeStamp($ls_array[0]['modified']);
-                        if (time() - $timestamp < 60 && $ls_array[0]['modifiedby_id'] != $GLOBALS['phpgw_info']['user']['account_id']);
-                        {
-                                // recently than last minute: someone is editing
-                        }*/
+                                                        'string' => $this->path . '/' . $this->file,
+                                                        'relatives' => array(RELATIVE_NONE),
+                                                        'checksubdirs' => False,
+                                                        'nofiles' => True
+                                          ));
+                        /* $timestamp = $this->vfs_functions->dateString2timeStamp($ls_array[0]['modified']);
+                          if (time() - $timestamp < 60 && $ls_array[0]['modifiedby_id'] != $GLOBALS['phpgw_info']['user']['account_id']);
+                          {
+                          // recently than last minute: someone is editing
+                          } */
                         $mime_type = $ls_array[0]['mime_type'];
                         $formats = array('text/html');
-                        if(!in_array($mime_type,$formats)){
+                        if (!in_array($mime_type, $formats)) {
                                 echo lang('Impossible to export this file');
                                 return False;
                         }
-                        $content = $this->bo->vfs->read(array('string' => $this->path.'/'.$this->file,
-                                       'relatives'     => array(RELATIVE_NONE)
-                               ));
+                        $content = $this->bo->vfs->read(array('string' => $this->path . '/' . $this->file,
+                                                        'relatives' => array(RELATIVE_NONE)
+                                          ));
 
                         include_once('filemanager/tp/dompdf/dompdf_config.inc.php');
@@ -1192 +1057 @@
                         $dompdf->load_html($content);
                         $dompdf->set_paper($this->prefs['pdf_paper_type'], $this->prefs['pdf_type']);
-                        /* Would be nice to implement 'Title','Subject','Author','Creator','CreationDate'*/
+                        /* Would be nice to implement 'Title','Subject','Author','Creator','CreationDate' */
                         $dompdf->render();
-                        $dompdf->stream(strtok($this->file,'.').".pdf");
+                        $dompdf->stream(strtok($this->file, '.') . ".pdf");
                         $GLOBALS['phpgw']->common->phpgw_exit();
                 }
@@ -1200 +1065 @@
 
         //give back an array with all directories except current and dirs that are not accessable
-        function all_other_directories()
-        {
+        function all_other_directories() {
                 # First we get the directories in their home directory
                 $dirs = array();
                 $dirs[] = array('directory' => $this->bo->fakebase, 'name' => $this->bo->userinfo['account_lid']);
 
-                $tmp_arr=array(
-                        'string'        => $this->bo->homedir,
-                        'relatives'     => array(RELATIVE_NONE),
-                        'checksubdirs'  => True,
-                        'mime_type'     => 'Directory'
+                $tmp_arr = array(
+                         'string' => $this->bo->homedir,
+                         'relatives' => array(RELATIVE_NONE),
+                         'checksubdirs' => True,
+                         'mime_type' => 'Directory'
                 );
 
-                $ls_array = $this->bo->vfs->ls($tmp_arr,True);
-
-                while(list($num, $dir) = each($ls_array))
-                {
+                $ls_array = $this->bo->vfs->ls($tmp_arr, True);
+
+                while (list($num, $dir) = each($ls_array)) {
                         $dirs[] = $dir;
                 }
@@ -1223 +1086 @@
                 # Then we get the directories in their readable groups' home directories
                 reset($this->readable_groups);
-                while(list($num, $group_array) = each($this->readable_groups))
-                {
+                while (list($num, $group_array) = each($this->readable_groups)) {
                         // Don't list directories for groups that don't exists
-                        $test=$this->bo->vfs->get_real_info(array('string' => $this->bo->fakebase.'/'.$group_array['account_name'],
-                                'relatives' => array(RELATIVE_NONE), 'relative' => False));
-                        if($test[mime_type]!='Directory')
-                        {
+                        $test = $this->bo->vfs->get_real_info(array('string' => $this->bo->fakebase . '/' . $group_array['account_name'],
+                                                        'relatives' => array(RELATIVE_NONE), 'relative' => False));
+                        if ($test[mime_type] != 'Directory') {
                                 continue;
                         }
@@ -1235 +1096 @@
                         $dirs[] = array('directory' => $this->bo->fakebase, 'name' => $group_array['account_name']);
 
-                        $tmp_arr=array(
-                                'string'        => $this->bo->fakebase.'/'.$group_array['account_name'],
-                                'relatives'     => array(RELATIVE_NONE),
-                                'checksubdirs'  => True,
-                                'mime_type'     => 'Directory'
+                        $tmp_arr = array(
+                                 'string' => $this->bo->fakebase . '/' . $group_array['account_name'],
+                                 'relatives' => array(RELATIVE_NONE),
+                                 'checksubdirs' => True,
+                                 'mime_type' => 'Directory'
                         );
 
-                        $ls_array = $this->bo->vfs->ls($tmp_arr,True);
-                        while(list($num, $dir) = each($ls_array))
-                        {
+                        $ls_array = $this->bo->vfs->ls($tmp_arr, True);
+                        while (list($num, $dir) = each($ls_array)) {
                                 $dirs[] = $dir;
                         }
                 }
                 reset($dirs);
-                while(list($num, $dir) = each($dirs))
-                {
-                        if(!$dir['directory'])
-                        {
+                while (list($num, $dir) = each($dirs)) {
+                        if (!$dir['directory']) {
                                 continue;
                         }
 
                         # So we don't display //
-                        if($dir['directory'] != '/')
-                        {
+                        if ($dir['directory'] != '/') {
                                 $dir['directory'] .= '/';
                         }
@@ -1266 +1123 @@
         }
 
-        function update_groups()
-        {
+        function update_groups() {
                 # Get their readable groups to be used throughout the script
                 $acl = array();
                 $groups = array();
-                $acl = $GLOBALS['phpgw']->acl->get_ids_for_location($GLOBALS['phpgw_info']['user']['account_id'],1,'filemanager');
+                $acl = $GLOBALS['phpgw']->acl->get_ids_for_location($GLOBALS['phpgw_info']['user']['account_id'], 1, 'filemanager');
                 if (is_array($acl))
-                        foreach($acl as $key => $value){
+                        foreach ($acl as $key => $value) {
                                 $info = array();
                                 $info = $GLOBALS['phpgw']->accounts->get_account_data($value);
@@ -1283 +1139 @@
                         }
                 $this->readable_groups = array();
-                while(list($num, $account) = each($groups))
-                {
-                        if($this->bo->vfs->acl_check(array('owner_id' => $account['account_id'],'operation' => PHPGW_ACL_READ)))
-                        {
+                while (list($num, $account) = each($groups)) {
+                        if ($this->bo->vfs->acl_check(array('owner_id' => $account['account_id'], 'operation' => PHPGW_ACL_READ))) {
                                 $this->readable_groups[$account['account_lid']] = Array('account_id' => $account['account_id'], 'account_name' => $account['account_lid']);
                         }
                 }
-
-        }
-        function search()
-        {
+        }
+
+        function search() {
                 /* TODO this is a primitive search */
                 $this->update_groups();
-                        $this->dirs = $this->all_other_directories();
+                $this->dirs = $this->all_other_directories();
                 $path = $this->path;
-                if (strlen($this->text) > 3)
-                {                                                                
+                if (strlen($this->text) > 3) {
                         $this->text = strtoupper($this->text);
-                        foreach($this->dirs as $elem)
-                        {
-                                $this->path = $elem['directory'].$elem['name'];
+                        foreach ($this->dirs as $elem) {
+                                $this->path = $elem['directory'] . $elem['name'];
                                 reset($this->files_array);
-                                $this->readFilesInfo();
-                                for($i = 0; $i < count($this->files_array); $i++)
-                                {
+                                $this->readFilesInfo();
+                                for ($i = 0; $i < count($this->files_array); $i++) {
                                         $comment = strtoupper($this->files_array[$i]['comment']);
                                         $name = strtoupper($this->files_array[$i]['name']);
-                                        if (strstr($name,$this->text) ||
-                                        strstr($comment,$this->text) ){
-                                                $return[$this->files_array[$i]['directory'].$name] = $this->files_array[$i];
-                                                $return[$this->files_array[$i]['directory'].$name]['icon'] = $this->mime_icon($this->files_array[$i]['mime_type']);
+                                        if (strstr($name, $this->text) ||
+                                                          strstr($comment, $this->text)) {
+                                                $return[$this->files_array[$i]['directory'] . $name] = $this->files_array[$i];
+                                                $return[$this->files_array[$i]['directory'] . $name]['icon'] = $this->mime_icon($this->files_array[$i]['mime_type']);
                                         }
                                 }
-                                if (count($return) > 50)
-                                {
-                                        $return = array_slice($return,0,50);
+                                if (count($return) > 50) {
+                                        $return = array_slice($return, 0, 50);
                                         break;
                                 }
-                        }       
+                        }
                 }
                 echo serialize(array_values($return));
@@ -1327 +1176 @@
 
         /* seek icon for mimetype else return an unknown icon */
-        function mime_icon($mime_type, $size=16)
-        {
-                if(!$mime_type) $mime_type='unknown';
-
-                $mime_type=str_replace  ('/','_',$mime_type);
-
-                $img=$GLOBALS['phpgw']->common->image('filemanager','mime'.$size.'_'.strtolower($mime_type));
-                if(!$img) $img=$GLOBALS['phpgw']->common->image('filemanager','mime'.$size.'_unknown');
+
+        function mime_icon($mime_type, $size=16) {
+                if (!$mime_type)
+                        $mime_type = 'unknown';
+
+                $mime_type = str_replace('/', '_', $mime_type);
+
+                $img = $GLOBALS['phpgw']->common->image('filemanager', 'mime' . $size . '_' . strtolower($mime_type));
+                if (!$img)
+                        $img = $GLOBALS['phpgw']->common->image('filemanager', 'mime' . $size . '_unknown');
 
                 return $img;
         }
 
-        function toolButton($link,$img='',$description='')
-        {
-                $image=$GLOBALS['phpgw']->common->image('filemanager','button_'.strtolower($img));
-
-                if($img)
-                {
-                        return '<div name="'.$link.'" class="toolButton" onclick="toolbar.control(\''.$link.'\',this);" title="'.$description.'"><img src="'.$image.'" alt="'.$description.'"/><small>'.$description.'</small></div>';
-                }
-        }
-
-        function inputButton($name,$img='',$description='')
-        {
-                $image=$GLOBALS['phpgw']->common->image('filemanager','button_'.strtolower($img));
-
-                if($img)
-                {
+        function toolButton($link, $img='', $description='') {
+                $image = $GLOBALS['phpgw']->common->image('filemanager', 'button_' . strtolower($img));
+
+                if ($img) {
+                        return '<div name="' . $link . '" class="toolButton" onclick="toolbar.control(\'' . $link . '\',this);" title="' . $description . '"><img src="' . $image . '" alt="' . $description . '"/><small>' . $description . '</small></div>';
+                }
+        }
+
+        function inputButton($name, $img='', $description='') {
+                $image = $GLOBALS['phpgw']->common->image('filemanager', 'button_' . strtolower($img));
+
+                if ($img) {
                         return '<td class="" align="center" valign="middle" height="28" width="70">
-                        <input title="'.$description.'" name="'.$name.'" type="image" alt="'.$name.'" src="'.$image.'" value="clicked" /><br><small>'.$description.'</small>
+                        <input title="' . $description . '" name="' . $name . '" type="image" alt="' . $name . '" src="' . $image . '" value="clicked" /><br><small>' . $description . '</small>
                         </td>';
                 }
         }
 
-
-        function html_form_input($type = NULL, $name = NULL, $value = NULL, $maxlength = NULL, $size = NULL, $checked = NULL, $string = '', $return = 1)
-        {
+        function html_form_input($type = NULL, $name = NULL, $value = NULL, $maxlength = NULL, $size = NULL, $checked = NULL, $string = '', $return = 1) {
                 $text = ' ';
-                if($type != NULL && $type)
-                {
-                        if($type == 'checkbox')
-                        {
+                if ($type != NULL && $type) {
+                        if ($type == 'checkbox') {
                                 $value = $this->bo->string_encode($value, 1);
                         }
-                        $text .= 'type="'.$type.'" ';
-                }
-                if($name != NULL && $name)
-                {
-                        $text .= 'name="'.$name.'" ';
-                }
-                if($value != NULL && $value)
-                {
-                        $text .= 'value="'.$value.'" ';
-                }
-                if(is_int($maxlength) && $maxlength >= 0)
-                {
-                        $text .= 'maxlength="'.$maxlength.'" ';
-                }
-                if(is_int($size) && $size >= 0)
-                {
-                        $text .= 'size="'.$size.'" ';
-                }
-                if($checked != NULL && $checked)
-                {
+                        $text .= 'type="' . $type . '" ';
+                }
+                if ($name != NULL && $name) {
+                        $text .= 'name="' . $name . '" ';
+                }
+                if ($value != NULL && $value) {
+                        $text .= 'value="' . $value . '" ';
+                }
+                if (is_int($maxlength) && $maxlength >= 0) {
+                        $text .= 'maxlength="' . $maxlength . '" ';
+                }
+                if (is_int($size) && $size >= 0) {
+                        $text .= 'size="' . $size . '" ';
+                }
+                if ($checked != NULL && $checked) {
                         $text .= 'checked ';
                 }
 
-                return '<input'.$text.$string.'>';
-        }
-
-        function html_form_option($value = NULL, $displayed = NULL, $selected = NULL, $return = 0)
-        {
+                return '<input' . $text . $string . '>';
+        }
+
+        function html_form_option($value = NULL, $displayed = NULL, $selected = NULL, $return = 0) {
                 $text = ' ';
-                if($value != NULL && $value)
-                {
-                        $text .= ' value="'.$value.'" ';
-                }
-                if($selected != NULL && $selected)
-                {
+                if ($value != NULL && $value) {
+                        $text .= ' value="' . $value . '" ';
+                }
+                if ($selected != NULL && $selected) {
                         $text .= ' selected';
                 }
-                return  '<option'.$text.'>'.$displayed.'</option>';
-        }
-
-        function encode_href($href = NULL, $args = NULL , $extra_args)
-        {
+                return '<option' . $text . '>' . $displayed . '</option>';
+        }
+
+        function encode_href($href = NULL, $args = NULL, $extra_args) {
                 $href = $this->bo->string_encode($href, 1);
-                $all_args = $args.'&'.$this->bo->string_encode($extra_args, 1);
+                $all_args = $args . '&' . $this->bo->string_encode($extra_args, 1);
 
                 $address = $GLOBALS['phpgw']->link($href, $all_args);
@@ -1421 +1255 @@
         }
 
-        function html_link($href = NULL, $args = NULL , $extra_args, $text = NULL, $return = 1, $encode = 1, $linkonly = 0, $target = NULL)
-        {
+        function html_link($href = NULL, $args = NULL, $extra_args, $text = NULL, $return = 1, $encode = 1, $linkonly = 0, $target = NULL) {
                 //      unset($encode);
-                if($encode)
-                {
+                if ($encode) {
                         $href = $this->bo->string_encode($href, 1);
-                        $all_args = $args.'&'.$this->bo->string_encode($extra_args, 1);
-                }
-                else
-                {
+                        $all_args = $args . '&' . $this->bo->string_encode($extra_args, 1);
+                } else {
                         //                              $href = $this->bo->string_encode($href, 1);
-                        $all_args = $args.'&'.$extra_args;
+                        $all_args = $args . '&' . $extra_args;
                 }
                 ###
@@ -1441 +1271 @@
 
                 /* Auto-detect and don't disturb absolute links */
-                if(!preg_match("|^http(.{0,1})://|", $href))
-                {
+                if (!preg_match("|^http(.{0,1})://|", $href)) {
                         //Only add an extra / if there isn't already one there
-
                         // die(SEP);
-                        if(!($href[0] == SEP))
-                        {
+                        if (!($href[0] == SEP)) {
                                 $href = SEP . $href;
                         }
@@ -1455 +1282 @@
                         $address = $GLOBALS['phpgw']->link($href, $all_args);
                         //                              $address = $GLOBALS['phpgw']->link($href);
-                }
-                else
-                {
+                } else {
                         $address = $href;
                 }
 
                 /* If $linkonly is set, don't add any HTML */
-                if($linkonly)
-                {
+                if ($linkonly) {
                         $rstring = $address;
-                }
-                else
-                {
-                        if($target)
-                        {
-                                $target = 'target='.$target;
+                } else {
+                        if ($target) {
+                                $target = 'target=' . $target;
                         }
 
                         $text = trim($text);
-                        $rstring = '<a href="'.$address.'" '.$target.'>'.$text.'</a>';
+                        $rstring = '<a href="' . $address . '" ' . $target . '>' . $text . '</a>';
                 }
 
@@ -1480 +1301 @@
         }
 
-        function html_table_begin($width = NULL, $border = NULL, $cellspacing = NULL, $cellpadding = NULL, $rules = NULL, $string = '', $return = 0)
-        {
-                if($width != NULL && $width)
-                {
+        function html_table_begin($width = NULL, $border = NULL, $cellspacing = NULL, $cellpadding = NULL, $rules = NULL, $string = '', $return = 0) {
+                if ($width != NULL && $width) {
                         $width = "width=$width";
                 }
-                if(is_int($border) && $border >= 0)
-                {
+                if (is_int($border) && $border >= 0) {
                         $border = "border=$border";
                 }
-                if(is_int($cellspacing) && $cellspacing >= 0)
-                {
+                if (is_int($cellspacing) && $cellspacing >= 0) {
                         $cellspacing = "cellspacing=$cellspacing";
                 }
-                if(is_int($cellpadding) && $cellpadding >= 0)
-                {
+                if (is_int($cellpadding) && $cellpadding >= 0) {
                         $cellpadding = "cellpadding=$cellpadding";
                 }
-                if($rules != NULL && $rules)
-                {
+                if ($rules != NULL && $rules) {
                         $rules = "rules=$rules";
                 }
@@ -1507 +1322 @@
         }
 
-        function html_table_end($return = 0)
-        {
+        function html_table_end($return = 0) {
                 $rstring = "</table>";
                 return($this->bo->eor($rstring, $return));
         }
 
-        function html_table_row_begin($align = NULL, $halign = NULL, $valign = NULL, $bgcolor = NULL, $string = '', $return = 0)
-        {
-                if($align != NULL && $align)
-                {
+        function html_table_row_begin($align = NULL, $halign = NULL, $valign = NULL, $bgcolor = NULL, $string = '', $return = 0) {
+                if ($align != NULL && $align) {
                         $align = "align=$align";
                 }
-                if($halign != NULL && $halign)
-                {
+                if ($halign != NULL && $halign) {
                         $halign = "halign=$halign";
                 }
-                if($valign != NULL && $valign)
-                {
+                if ($valign != NULL && $valign) {
                         $valign = "valign=$valign";
                 }
-                if($bgcolor != NULL && $bgcolor)
-                {
+                if ($bgcolor != NULL && $bgcolor) {
                         $bgcolor = "bgcolor=$bgcolor";
                 }
@@ -1535 +1344 @@
         }
 
-        function html_table_row_end($return = 0)
-        {
+        function html_table_row_end($return = 0) {
                 $rstring = "</tr>";
                 return($this->bo->eor($rstring, $return));
         }
 
-        function html_table_col_begin($align = NULL, $halign = NULL, $valign = NULL, $rowspan = NULL, $colspan = NULL, $string = '', $return = 0)
-        {
-                if($align != NULL && $align)
-                {
+        function html_table_col_begin($align = NULL, $halign = NULL, $valign = NULL, $rowspan = NULL, $colspan = NULL, $string = '', $return = 0) {
+                if ($align != NULL && $align) {
                         $align = "align=$align";
                 }
-                if($halign != NULL && $halign)
-                {
+                if ($halign != NULL && $halign) {
                         $halign = "halign=$halign";
                 }
-                if($valign != NULL && $valign)
-                {
+                if ($valign != NULL && $valign) {
                         $valign = "valign=$valign";
                 }
-                if(is_int($rowspan) && $rowspan >= 0)
-                {
+                if (is_int($rowspan) && $rowspan >= 0) {
                         $rowspan = "rowspan=$rowspan";
                 }
-                if(is_int($colspan) && $colspan >= 0)
-                {
+                if (is_int($colspan) && $colspan >= 0) {
                         $colspan = "colspan=$colspan";
                 }
@@ -1568 +1370 @@
         }
 
-        function html_table_col_end($return = 0)
-        {
+        function html_table_col_end($return = 0) {
                 $rstring = "</td>";
                 return($this->bo->eor($rstring, $return));
         }
+
 }

branches/2.2/filemanager/inc/upload.php

@@ -14 +14 @@
 
 $bo = CreateObject('filemanager.bofilemanager');
-
-$c = CreateObject('phpgwapi.config','filemanager');
+$c      = CreateObject('phpgwapi.config','filemanager');
 $c->read_repository();
-$current_config = $c->config_data;
-$upload_max_size = $current_config['filemanager_Max_file_size'];
-$path = $_POST['path'];
-$notifUser = $_POST['notifTo'];
-$show_upload_boxes = count($_FILES['upload_file']['name']);
-$filesUpload = $_FILES['upload_file'];
+
+$current_config                 = $c->config_data;
+$upload_max_size                = $current_config['filemanager_Max_file_size'];
+$path                                   = $_POST['path'];
+$notifUser                              = $_POST['notifTo'];
+$show_upload_boxes      = count($_FILES['upload_file']['name']);
+$filesUpload                            = $_FILES['upload_file'];
+
+
+error_log( print_r($_FILES['upload_file'], true), 3, "/tmp/log" );
 
 function create_summaryImage($file)
@@ -84 +87 @@
 }
 
-if($path != '/')
-{
-        for($i = 0; $i != $show_upload_boxes; $i++)
-        {
-                if($badchar = $bo->bad_chars($_FILES['upload_file']['name'][$i], True, True))
-                {
-                        $return[] = lang('Error:').lang('File names cannot contain "%1"', $badchar);
+if( $path != '/' )
+{
+        for( $i = 0; $i != $show_upload_boxes; $i++)
+        {
+                if ( $_FILES['upload_file']['size'][$i] > ($upload_max_size*1024*1024) )
+                {
+                        $return[] = array( 
+                                                                "file"          => $_FILES['upload_file']['name'][$i] ,
+                                                                "size"          => $_FILES['upload_file']['size'][$i] ,
+                                                                "size_max"      => ($upload_max_size*1024*1024) 
+                         );
                         continue;
                 }
-
-                # Check to see if the file exists in the database, and get its info at the same time
-                $ls_array = $bo->vfs->ls(array(
-                        'string'=> $path . '/' . $_FILES['upload_file']['name'][$i],
-                        'relatives'     => array(RELATIVE_NONE),
-                        'checksubdirs'  => False,
-                        'nofiles'       => True
-                ));
-
-                $fileinfo = $ls_array[0];
-
-                if($fileinfo['name'])
-                {
-                        if($fileinfo['mime_type'] == 'Directory')
-                        {
-                                $return[] = lang('Error:').lang('Cannot replace %1 because it is a directory', $fileinfo['name']);
+                elseif( $_FILES['upload_file']['size'][$i] > 0 )
+                {
+                        if( $badchar = $bo->bad_chars($_FILES['upload_file']['name'][$i], True, True ))
+                        {
+                                $return[] = array(
+                                                                "file"          => $_FILES['upload_file']['name'][$i],
+                                                                "badchar"       => lang('File names cannot contain "%1"', $badchar)
+                                );                                      
                                 continue;
                         }
-                }
-
-                if ($_FILES['upload_file']['size'][$i] > ($upload_max_size*1024*1024))
-                {
-                        $return[] = lang('The size of %1 has exceded the limit: %2', $_FILES['upload_file']['name'][$i], $upload_max_size);
-                        continue;
-                }
-                elseif($_FILES['upload_file']['size'][$i] > 0)
-                {
+
+                        # Check to see if the file exists in the database, and get its info at the same time
+                        $ls_array = $bo->vfs->ls(array(
+                                                'string'=> $path . '/' . $_FILES['upload_file']['name'][$i],
+                                                'relatives'     => array(RELATIVE_NONE),
+                                                'checksubdirs'  => False,
+                                                'nofiles'       => True
+                        ));
+
+                        $fileinfo = $ls_array[0];
+
+                        if( $fileinfo['name'] )
+                        {
+                                if( $fileinfo['mime_type'] == 'Directory' )
+                                {
+                                        $return[] = array(
+                                                                                "file"          => $_FILES['upload_file']['name'][$i],
+                                                                                "directory"     => lang('Cannot replace %1 because it is a directory', $fileinfo['name'] )
+                                        );
+                                        continue;
+                                }
+                        }
+
                         if($fileinfo['name'] && $fileinfo['deleteable'] != 'N')
                         {
@@ -131 +144 @@
                                 $bo->vfs->cp($tmp_arr);
                                 $tmp_arr=array(
-                                        'string'=> $_FILES['upload_file']['name'][$i],
-                                        'relatives'     => array(RELATIVE_ALL),
-                                        'attributes'    => array(
-                                                'owner_id' => $bo->userinfo['username'],
-                                                'modifiedby_id' => $bo->userinfo['username'],
-                                                'size' => $_FILES['upload_file']['size'][$i],
-                                                'mime_type' => $_FILES['upload_file']['type'][$i],
-                                                'deleteable' => 'Y',
-                                                'comment' => stripslashes($_POST['upload_comment'][$i])
+                                                'string'=> $_FILES['upload_file']['name'][$i],
+                                                'relatives'     => array(RELATIVE_ALL),
+                                                'attributes'    => array(
+                                                        'owner_id' => $bo->userinfo['username'],
+                                                        'modifiedby_id' => $bo->userinfo['username'],
+                                                        'size' => $_FILES['upload_file']['size'][$i],
+                                                        'mime_type' => $_FILES['upload_file']['type'][$i],
+                                                        'deleteable' => 'Y',
+                                                        'comment' => stripslashes($_POST['upload_comment'][$i])
                                         )
                                 );
                                 $bo->vfs->set_attributes($tmp_arr);
 
-                                $return[] = lang("There is a file %1, that was not replaced",$_FILES['upload_file']['name'][$i]);
+                                $return[] = array(
+                                                                "file"          => $_FILES['upload_file']['name'][$i],                                                                  
+                                                                "undefined"     => lang( "There is a file %1, that was not replaced", $_FILES['upload_file']['name'][$i] )
+                                );
                         }
                         else
@@ -155 +171 @@
                                 {
                                         $bo->vfs->set_attributes(array(
-                                                'string'=> $_FILES['upload_file']['name'][$i],
-                                                'relatives'     => array(RELATIVE_ALL),
-                                                'attributes'=> array(
-                                                        'mime_type' => $_FILES['upload_file']['type'][$i],
-                                                        'comment' => stripslashes($_POST['upload_comment'][$i])
-                                                )
+                                                        'string'                => $_FILES['upload_file']['name'][$i],
+                                                        'relatives'     => array(RELATIVE_ALL),
+                                                        'attributes'    => array(
+                                                                'mime_type'     => $_FILES['upload_file']['type'][$i],
+                                                                'comment'       => stripslashes($_POST['upload_comment'][$i])
+                                                        )
                                         ));
                                 }
-                                else{
-                                        $return[] = lang('Error:').lang('It was not possible to send your file');
+                                else
+                                {
+                                        $return[] = array ( 
+                                                                                "file"          => $_FILES['upload_file']['name'][$i],
+                                                                                "sendFile"      => lang('It was not possible to send your file')
+                                        );
                                 }
-
-                        }
-                }
-                elseif($_FILES['upload_file']['name'][$i])
+                        }
+                }
+                elseif( $_FILES['upload_file']['name'][$i] )
                 {
                         $bo->vfs->touch(array(
@@ -177 +196 @@
 
                         $bo->vfs->set_attributes(array(
-                                'string'=> $_FILES['upload_file']['name'][$i],
-                                'relatives'     => array(RELATIVE_ALL),
-                                'attributes'=> array(
-                                        'mime_type' => $_FILES['upload_file']['type'][$i],
-                                        'comment' => stripslashes($_POST['upload_comment'][$i])
-                                )
+                                        'string'                => $_FILES['upload_file']['name'][$i],
+                                        'relatives'     => array(RELATIVE_ALL),
+                                        'attributes'    => array(
+                                                                                'mime_type'     => $_FILES['upload_file']['type'][$i],
+                                                                                'comment'       => stripslashes($_POST['upload_comment'][$i])
+                                        )
                         ));
-
-                }
-
-                if (!(strpos(strtoupper($_FILES['upload_file']['type'][$i]),'IMAGE') === FALSE))
+                }
+
+                if ( !(strpos(strtoupper($_FILES['upload_file']['type'][$i]),'IMAGE') === FALSE ) )
                 {
                         $content = create_summaryImage($_FILES['upload_file']['tmp_name'][$i]);
-                        if ($content){
+                        if ($content)
+                        {
                                 $bo->vfs->set_summary(array(
                                         'string'=> $_FILES['upload_file']['name'][$i],

branches/2.2/filemanager/js/common_functions.js

@@ -98 +98 @@
                         
                         var pArgs = unserialize(data);
-                                pArgs.lang_add_file             = get_lang("Add file");
                                 pArgs.lang_click_here   = get_lang("Click here");
                                 pArgs.lang_more_files   = get_lang("More files");
@@ -104 +103 @@
                                 pArgs.height                    = 210;
                                 pArgs.path_filemanager  = path_filemanager;
-                                pArgs.width                     = 450;
+                                pArgs.width                     = 500;
                 
                         var _html = Xtools.parse( Xtools.xml("upload_files"), "upload.xsl", pArgs );
@@ -233 +232 @@
 
 
-function setRestricted(name){
+function setRestricted(name)
+{
         var continue_set = confirm(get_lang('This property will change the visibility of all users that have access to this file, continue?'));
-        if (continue_set)
-                cExecute_('./index.php?menuaction=filemanager.vfs_functions.setRestricted&file='+base64_encode(name)+'&path='+base64_encode(currentPath),handler.restricted);
-}
-
-function presetComments(el){
+        
+        if ( continue_set )
+        {
+                cExecute_('./index.php?menuaction=filemanager.vfs_functions.setRestricted&file='
+                                + base64_encode(name)+'&path='+base64_encode(currentPath),handler.restricted);
+        }
+}
+
+function presetComments(el)
+{
         if (permissions['edit'] == 0){
                 el.blur();
@@ -247 +252 @@
 }
 
-function setComments(el){
-        if (el.value == oldValue) return;
+function setComments(el)
+{
+        if ( el.value == oldValue )
+                return;
+        
         var filename = base64_encode(el.id);
-        cExecute_('./index.php?menuaction=filemanager.vfs_functions.editComment&file='+filename+'&comment='+base64_encode(el.value),handler.updateComment);
+        
+        cExecute_('./index.php?menuaction=filemanager.vfs_functions.editComment&file='
+                                + filename+'&comment='+base64_encode(el.value), handler.updateComment);
 }
 
@@ -320 +330 @@
                          width                  : 250,
                          height                 : 290,
-                         top                    : 100,
-                         left                   : 400,
+                         top                            : 100,
+                         left                           : 400,
                          draggable              : true,
-                         visible                : "display",
+                         visible                        : "display",
                          resizable              : true,
                          zindex                 : zIndex++,
                          title                  : "Expresso FileManager - " + get_lang('View'),
-                         closeAction    : "remove",
+                         closeAction            : "remove",
                          content                : Xtools.parse(Xtools.xml("view_config"), "view.xsl", pTools)   
                 };
@@ -369 +379 @@
         if (size < kbyte)
         {
-                return size + 'B';
+                return size + ' B';
         }
         else if (size < mbyte)
         {
-                return parseInt(size/kbyte) + 'KB';
+                return parseInt(size/kbyte) + ' KB';
         }
         else if (size < gbyte)
         {
                 if ( size/mbyte > 100)
-                        return (size/mbyte).toFixed(0) + 'MB';
+                        return (size/mbyte).toFixed(0) + ' MB';
                 else
-                        return (size/mbyte).toFixed(1) + 'MB';
+                        return (size/mbyte).toFixed(1) + ' MB';
         }
         else
         {
-                return (size/gbyte).toFixed(1) + 'GB';
+                return (size/gbyte).toFixed(1) + ' GB';
         }
 }
@@ -391 +401 @@
 {
         var newElement = document.createElement('div');
-                newElement.innerHTML  = '<input maxlength="255" name="upload_file[]" type="file" style="margin-right:5px;" />' +
-                                                                '<input name="upload_comment[]" type="text" style="margin-right:2px;" />' +
-                                                                '<span style="color:red; cursor:pointer;" onclick="removeInput(this);">'+get_lang('delete')+'</span>';
+                newElement.innerHTML  = '<div></div>' +
+                                                                        '<input maxlength="255" name="upload_file[]" type="file" style="margin-right:5px;" />' +
+                                                                        '<input name="upload_comment[]" type="text" style="margin-right:2px;" />' +
+                                                                        '<span style="color:red; cursor:pointer;" onclick="removeInput(this);">'+get_lang('delete')+'</span>';
         
         document.getElementById('uploadOption').parentNode.appendChild(newElement);
@@ -447 +458 @@
 {
         var _formUp                     = document.getElementById('form_up');
-        var _uploadFiles        = document.getElementsByTagName('input');
+        var _uploadFiles                = document.getElementsByTagName('input');
         var _flagSend           = true;
         
@@ -463 +474 @@
         
         if( _flagSend )
-        {
-                cExecuteForm_( _formUp ,handler.upload);
-        }
+                cExecuteForm_( _formUp , handler.upload );
         else
                 write_msg(get_lang("No file(s) to send") + "!");
-
-        close_window();
-}
+}

branches/2.2/filemanager/js/config.js

@@ -162 +162 @@
 }
 
-function rename_folder(){
+function rename_folder()
+{
         var dirName = document.getElementById('search1').value;
         var toName = prompt(get_lang('enter the name you want to move %1 to',dirName),dirName);
-        if (toName.length > 1){
+        if (toName.length > 1)
+        {
                 cExecute_('index.php?menuaction=filemanager.uiconfig.renameFolder&dir='+base64_encode(dirName)+'&to='+base64_encode(toName),alert);
         }

branches/2.2/filemanager/js/connector.js

@@ -100 +100 @@
 function cExecuteForm_(form, handler){
         connector.showProgressBar();
-        if(! (divUpload = document.getElementById('divUpload'))) {
-                divUpload               = document.createElement('DIV');                
-                divUpload.id    = 'divUpload';
+        
+        if( ! ( divUpload = document.getElementById('divUpload') ) )
+        {
+                divUpload                = document.createElement('DIV');                
+                divUpload.id             = 'divUpload';
                 document.body.appendChild(divUpload);
         }
 
         handlerExecuteForm = handler;
-        var form_handler = function (data){
+        
+        var form_handler = function (data)
+        {
                 handlerExecuteForm(data);
                 handlerExecuteForm = null;
         }
+        
         divUpload.innerHTML= "<iframe onload=\"connector.hideProgressBar();cExecute_('./index.php/index.php?menuaction=filemanager.uifilemanager.getReturnExecuteForm',"+form_handler+");\"  style='display:none;width:0;height:0;' name='uploadFile'></iframe>";
+        
         form.target ="uploadFile";
-    form.submit();
+        form.submit();
 }
 

branches/2.2/filemanager/js/draw_api.js

@@ -169 +169 @@
 }
 
-function initDrawApi(){
-        SecEl = document.getElementById('userKey');
+function initDrawApi()
+{
+        var SecEl = document.getElementById('userKey');
         crypt = new crypt(SecEl.value);
+        
         SecEl.parentNode.removeChild(SecEl);
 
@@ -184 +186 @@
         window.onresize = resizeDiv;
         document.body.style.overflow = "hidden";
-        cExecute_('./index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
-}
-
-function folderList(){
+        cExecute_('./index.php?menuaction=filemanager.uifilemanager.get_folders_list', handler.draw_folders_list );
+}
+
+function folderList()
+{
         this.td = '<td style="padding-left: 2px; padding-right: 2px;" valign="middle">';
 }
-folderList.prototype.init = function(){
+
+folderList.prototype.init = function()
+{
         this.element = document.getElementById('fmFileWindow');
 }
-folderList.prototype.clear = function(){
+
+folderList.prototype.clear = function()
+{
         this.element.innerHTML = "";
 }
 
-folderList.prototype.drawSearch = function(data){
+folderList.prototype.drawSearch = function(data)
+{
         var fl = folderList;
         var files = unserialize(data);
@@ -555 +563 @@
                         }
                         var pswd = crypt.encode(password);
-                        cExecute_('./index.php?menuaction=filemanager.vfs_functions.archive&pswd='+base64_encode(pswd.toString())+'&path='+base64_encode(currentPath)+filesUrl,handler.archive);
+                        cExecute_('./index.php?menuaction=filemanager.vfs_functions.archive&pswd='
+                                        + base64_encode(pswd.toString())+'&path='+base64_encode(currentPath)+filesUrl,handler.archive);
                         break;
                 case 'move_to':
@@ -633 +642 @@
 function unarchive(filename)
 {
-        password = crypt.encode(prompt(get_lang('Please, type archive password or leave it empty if it is not encrypted')));
-        if (password == null)
+        var password = crypt.encode(prompt(get_lang('Please, type archive password or leave it empty if it is not encrypted')));
+
+        if (password != null )
+        {
+                cExecute_('./index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='
+                                + base64_encode(password)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename), handler.archive);
+        }
+        else
                 return;
-        cExecute_('./index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='+base64_encode(password)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename),handler.archive);
 }
 
 function move_to(to,filesUrl)
 {
-        cExecute_('./index.php?menuaction=filemanager.vfs_functions.moveto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.moveto);
+        cExecute_( './index.php?menuaction=filemanager.vfs_functions.moveto&from='
+                        + base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl, handler.moveto );
 }
 
 function copy_to(to,filesUrl)
 {
-        cExecute_('./index.php?menuaction=filemanager.vfs_functions.copyto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.copyto);
+        cExecute_('./index.php?menuaction=filemanager.vfs_functions.copyto&from='
+                                + base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl, handler.copyto );
 }
 
@@ -696 +712 @@
                                 
                         var parentDir_en = base64_encode( parentDir );
-                        cExecute_('./index.php?menuaction=filemanager.uifilemanager.createdir&path='+parentDir_en+'&filename='+base64_encode(name), handler.refreshDir);
+                        cExecute_('./index.php?menuaction=filemanager.uifilemanager.createdir&path='
+                                        + parentDir_en+'&filename='+base64_encode(name), handler.refreshDir);
+                                
                         currentPath = parentDir + '/' + name;
                         close_window();
@@ -744 +762 @@
                         var pArgs =
                         {
-                                'lang_new_folder'                       : get_lang('new folder'),
+                                'lang_new_folder'               : get_lang('new folder'),
                                 'lang_remove_folder'            : get_lang('remove folder'),
-                                'path_filemanager'                      : path_filemanager,
+                                'path_filemanager'              : path_filemanager,
                                 'onclick_new_folder'            : 'editFolders("new")',
-                                'onclick_remove_folder'         : 'editFolders("remove")'
+                                'onclick_remove_folder' : 'editFolders("remove")'
                         };
                         
@@ -758 +776 @@
 }
 
-function draw_window_card(content){
+function draw_window_card(content)
+{
         var menu = document.getElementById('menu_newFile');
-        if (menu == null){
+        if (menu == null)
+        {
                 menu = document.createElement('DIV');
                 menu.className = 'menubox';
@@ -783 +803 @@
         menuTimeout = setTimeout("hide_card()",4000);
 }
-function hide_card(){
-        var e=document.getElementById('menu_newFile');
-        if (e!=null)
-                e.style.visibility = 'hidden';
-}
-
-function draw_paging(num_files,data){
-        num_files = parseInt(num_files);
-        total_pages = 1;
-
-        if(last_folder != current_folder){
-                lastPage = 1;
-                current_page = 1;
-                last_folder = current_folder;
-        }
-
-        if(num_files > parseInt(preferences.files_per_page)) {
-                total_pages = parseInt(num_files/preferences.files_per_page);
-                if((num_files/preferences.files_per_page) > total_pages)
-                        total_pages++;
-        }
-
-        if(total_pages == 1) {
-                if(span_paging = document.getElementById("span_paging")) {
-                        span_paging.parentNode.removeChild(span_paging);
-                }
-                return;
-        }
-
-        span_paging = document.getElementById("span_paging");
-        if(!span_paging){
-                span_paging = document.createElement("DIV");
-                span_paging.id = "span_paging";
-                span_paging.className = "boxHeaderText";
-                span_paging.align="right";
-                document.getElementById("div_menu_c3").appendChild(span_paging);
-        }
-        span_paging.style.width="100%";
-        span_paging.innerHTML="";
-        files_range_begin = 1;
-        files_range_end = preferences.files_per_page;
-        if(current_page != 1) {
-                lnk_page = document.createElement("A");
-                lnk_page.setAttribute("href", "javascript:current_page=1;offset=0;toolbar.control('reload');");
-        }
-        else {
-                lnk_page = document.createElement("SPAN");
-        }
-        span_paging.appendChild(lnk_page);
-
-        lnk_page.innerHTML = "&lt;&lt;";
-        lnk_page.title = get_lang("First");
-        span_paging.innerHTML += "&nbsp;";
-
-        if(current_page == lastPage + numPages)
-                lastPage = current_page - 1;
-        else if((lastPage != 1 && lastPage == current_page) || current_page == total_pages)
-                lastPage = current_page - (numPages - 1);
-        else if(current_page == 1)
-                lastPage = 1;
-
-        if(lastPage < 1)
-                lastPage = 1;
-        else if(lastPage > 1 && (lastPage > (total_pages -(numPages - 1))))
-                lastPage = total_pages -(numPages - 1);
-
-        var     hasMarked = false;
-
-        for(i = lastPage; i <= total_pages; i++) {
-
-                if(current_page == i || (i == total_pages && !hasMarked)) {
-                        lnk_page = document.createElement("SPAN");
-                        span_paging.appendChild(lnk_page);
-                        lnk_page.innerHTML = "&nbsp;<b>"+i+"</b>&nbsp;";
-                        hasMarked = true;
-                        continue;
-                }
-                else{
-                        lnk_page = document.createElement("A");
-                        span_paging.appendChild(lnk_page);
-                        files_range_begin = ((i*preferences.files_per_page)-(preferences.files_per_page-1));
-                        files_range_end = (i*preferences.files_per_page);
-                        lnk_page.setAttribute("href", "javascript:current_page="+i+";offset=((current_page-1)*preferences.files_per_page);toolbar.control('reload');");
-               }
-
-                lnk_page.innerHTML = "&nbsp;...&nbsp;";
-
-                if(i == (lastPage + numPages))
-                                break;
-                else if(lastPage == 1 || i != lastPage)
-                        lnk_page.innerHTML = "&nbsp;"+i+"&nbsp;";
-
-                span_paging.innerHTML += "&nbsp;";                                                                            
-        }
-
-        if(current_page != total_pages) {
-                lnk_page = document.createElement("A");
-                files_range_begin = ((total_pages*preferences.files_per_page)-(preferences.files_per_page-1));
-                files_range_end = (total_pages*preferences.files_per_page);
-                lnk_page.setAttribute("href", "javascript:current_page="+total_pages+";offset=((current_page-1)*preferences.files_per_page);toolbar.control('reload');");
-        }
-        else {
-                lnk_page = document.createElement("SPAN");
-        }
-        span_paging.innerHTML += "&nbsp;";
-        span_paging.appendChild(lnk_page);
-
-        lnk_page.title = get_lang("Last");
-        lnk_page.innerHTML = "&gt;&gt;";
-}
-
+function hide_card()
+{
+        var menuNewFile = document.getElementById('menu_newFile');
+        
+        if ( menuNewFile != null )
+                menuNewFile.style.visibility = 'hidden';
+}
+
+function draw_paging( num_files, data)
+{
+        num_files = parseInt(num_files);
+        var total_pages = 1;
+
+        if( last_folder != current_folder )
+        {
+                lastPage = 1;
+                current_page = 1;
+                last_folder = current_folder;
+        }
+
+        if( num_files > parseInt(preferences.files_per_page) ) 
+        {
+                total_pages = parseInt(num_files/preferences.files_per_page);
+                
+                if( (num_files/preferences.files_per_page) > total_pages )
+                        total_pages++;
+        }
+
+        if( total_pages == 1) 
+        {
+                if( span_paging = document.getElementById("span_paging") )
+                {
+                        span_paging.parentNode.removeChild(span_paging);
+                }
+                
+                return;
+        }
+
+        span_paging = document.getElementById("span_paging");
+
+        if( !span_paging )
+        {
+                span_paging = document.createElement("DIV");
+                span_paging.id = "span_paging";
+                span_paging.className = "boxHeaderText";
+                span_paging.align="right";
+                document.getElementById("div_menu_c3").appendChild(span_paging);
+        }
+        span_paging.style.width="100%";
+        span_paging.innerHTML="";
+        files_range_begin = 1;
+        files_range_end = preferences.files_per_page;
+        
+        if ( current_page != 1) 
+        {
+                lnk_page = document.createElement("A");
+                lnk_page.setAttribute("href", "javascript:current_page=1;offset=0;toolbar.control('reload');");
+        }
+        else
+        {
+                lnk_page = document.createElement("SPAN");
+        }
+        
+        span_paging.appendChild(lnk_page);
+
+        lnk_page.innerHTML = "&lt;&lt;";
+        lnk_page.title = get_lang("First");
+        span_paging.innerHTML += "&nbsp;";
+
+        if( current_page == lastPage + numPages)
+                lastPage = current_page - 1;
+        else if( (lastPage != 1 && lastPage == current_page) || current_page == total_pages )
+                lastPage = current_page - (numPages - 1);
+        else if( current_page == 1 )
+                lastPage = 1;
+
+        if(lastPage < 1)
+                lastPage = 1;
+        else if( lastPage > 1 && (lastPage > (total_pages -(numPages - 1))) )
+                lastPage = total_pages -(numPages - 1);
+
+        var     hasMarked = false;
+
+        for( i = lastPage; i <= total_pages; i++) 
+        {
+                if( current_page == i || (i == total_pages && !hasMarked)) 
+                {
+                        lnk_page = document.createElement("SPAN");
+                        span_paging.appendChild(lnk_page);
+                        lnk_page.innerHTML = "&nbsp;<b>"+i+"</b>&nbsp;";
+                        hasMarked = true;
+                        continue;
+                }
+                else
+                {
+                        lnk_page = document.createElement("A");
+                        span_paging.appendChild(lnk_page);
+                        files_range_begin = ((i*preferences.files_per_page)-(preferences.files_per_page-1));
+                        files_range_end = (i*preferences.files_per_page);
+                        lnk_page.setAttribute("href", "javascript:current_page="+i+";offset=((current_page-1)*preferences.files_per_page);toolbar.control('reload');");
+                }
+
+                lnk_page.innerHTML = "&nbsp;...&nbsp;";
+
+                if( i == (lastPage + numPages) )
+                        break;
+                else if(lastPage == 1 || i != lastPage)
+                        lnk_page.innerHTML = "&nbsp;"+i+"&nbsp;";
+
+                span_paging.innerHTML += "&nbsp;";                                                                            
+        }
+
+        if( current_page != total_pages )  
+        {
+                lnk_page = document.createElement("A");
+                files_range_begin = ((total_pages*preferences.files_per_page)-(preferences.files_per_page-1));
+                files_range_end = (total_pages*preferences.files_per_page);
+                lnk_page.setAttribute("href", "javascript:current_page="+total_pages+";offset=((current_page-1)*preferences.files_per_page);toolbar.control('reload');");
+        }
+        else
+        {
+                lnk_page = document.createElement("SPAN");
+        }
+        
+        span_paging.innerHTML += "&nbsp;";
+        span_paging.appendChild(lnk_page);
+
+        lnk_page.title = get_lang("Last");
+        lnk_page.innerHTML = "&gt;&gt;";
+}

branches/2.2/filemanager/js/handler.js

@@ -1 @@
-function handler(){
-}
-
-handler.prototype.del = function(data)
+(function()
 {
-        var _return = data;
-        var deletedFiles = "";
+        function archive(data)
+        {
+                var 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');
+        }
+
+        function copyto(data)
+        {
+                var returnVal = data.split('|');
+                
+                if (returnVal[0] == 'NODIR')
+                        write_error(get_lang('Could not copy file because no destination directory is given'));
+                else if(returnVal[0] == 'SOMEERROR')
+                {
+                        write_error(get_lang('Could not copy %1 file(s)',returnVal[1]));
+                }
+                else  if(returnVal[0] == 'COPIED')
+                {
+                        if (returnVal[1] == 1)
+                                write_msg(get_lang('File copied successfuly'));
+                        else
+                                write_msg(get_lang('%1 files copied successfuly', returnVal[1]));
+                }
+        }
+
+        function del(data)
+        {
+                var _return = data;
+                var deletedFiles = "";
+
+                _return = _return.substring(0, ( _return.length - 1 ) );
+                _return = _return.split("|");
+
+
+                for (var i = 0 ; i < _return.length; i++)
+                {       
+                        if ( _return[i] == 'False')
+                        {
+                                write_error(get_lang('Could not delete %1', _return[i+1]) );
+                                return;
+                        }
+                        else
+                        {
+                                if ( _return[i] != "" )
+                                {
+                                        deletedFiles += ", " + _return[i];
+                                }
+
+                                if (i > 3) //to avoid big message
+                                {
+                                        deletedFiles = "  " + _return.length + " " +get_lang("files");
+                                        break;
+                                }
+                        }
+                }
+
+                write_msg(get_lang('Deleted %1',deletedFiles.substr(2)));
+
+                toolbar.control('reload');
+        }
+
+        function draw_folders_list(data)
+        {
+                toolbar.control('reload');
+                folders_tree = new dFTree({name: 'main'});
+
+                folders = unserialize(data);
+
+                var rootFold = new dNode({id:'root', caption: get_lang("Directories") });
+                folders_tree.add(rootFold,'root');
+
+                for ( var i = 0 ; i < folders.length; i++ )
+                {
+                        var lastIndex = folders[i].lastIndexOf('/');
+                        if (folders[i] != "/home/"+preferences.lid)
+                                var name = folders[i].substr(lastIndex+1,folders[i].length);
+                        else
+                                var name = get_lang("My Folder");
+                        var parentDir = folders[i].substr(0,lastIndex);
+
+                        if ( parentDir == '/home' )
+                                parentDir = 'root';
+
+                        var search_child = function( ListFolders, name )
+                        {
+                                for ( j = 0 ; j < ListFolders.length; j++ )
+                                {
+                                        if ( ListFolders[j].indexOf( name + '/') > -1 )
+                                                return true;
+                                }
+
+                                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);
+                }
+
+                document.getElementById('content_folders').innerHTML = "";
+
+                folders_tree.draw(document.getElementById('content_folders'));
+
+                folders_tree.openTo(currentPath);
+
+                folders_tree.getNodeById(currentPath)._select();
+        }
+
+        function moveto(data) 
+        {
+                returnVal = data.split('|');
+                if (returnVal[0] == 'NODIR')
+                        write_error(get_lang('Could not copy file because no destination directory is given'));
+                else if(returnVal[0] == 'SOMEERROR'){
+                        write_error(get_lang('Could not move %1 file(s)',returnVal[1]));
+                }
+                else  if(returnVal[0] == 'MOVED'){
+                        if (returnVal[1] == 1)
+                                write_msg(get_lang('File moved successfuly'));
+                        else
+                                write_msg(get_lang('%1 files moved successfuly', returnVal[1]));
+                }
+                handler.refreshDir();
+        }
+
+        function refreshDir(data) 
+        {
+                cExecute_('./index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
+        }
+
+        function rename(data) 
+        {
+                if ( data == null )
+                {
+                        var returnVal = new Array ("True",oldValue,oldValue);
+                }
+                else
+                        var returnVal = data.split('|');
+                
+                if ( returnVal[0] == "True" )
+                {
+                        if (returnVal[1] != returnVal[2]) write_msg(get_lang('Renamed %1 to %2',returnVal[1],returnVal[2]));
+                                var nameLink = document.createElement('A');
+                        
+                        var inputName = document.getElementById('input_'+returnVal[1]);
+                        var trFile = inputName.parentNode.parentNode.parentNode;
+
+                        nameLink.innerHTML = returnVal[2];
+                        nameLink.href="./index.php?menuaction=filemanager.uifilemanager.view&file="
+                                        + base64_encode(returnVal[2])+"&path="+base64_encode(currentPath);
+                        nameLink.target = "_blank";
+                        nameLink.id = "name_"+returnVal[2];
+
+                        inputName.parentNode.appendChild(nameLink);
+                        inputName.parentNode.removeChild(inputName);
+                        trFile.innerHTML = trFile.innerHTML.replace(returnVal[1],returnVal[2]);
+                        trFile.id = trFile.id.replace(returnVal[1],returnVal[2]);
+                }
+                else
+                {
+                        if ( returnVal[1] == "badchar" )
+                                write_error(get_lang('File names cannot contain "%1"',returnVal[2]));
+                        else if (returnVal[1] == "slashes")
+                                write_error(get_lang('File names cannot contain \\ or /'));
+                        else if (returnVal[1] == "editing")
+                                write_error(get_lang('This file is being edited right now'));
+                        else
+                                write_error(get_lang('Could not rename %1 to %2', returnVal[1], returnVal[2]));
+                }
+
+        }
         
-        _return = _return.substring(0, ( _return.length - 1 ) );
-        _return = _return.split("|");
+        function restricted(data)
+        {
+                if (data.indexOf("True") == 0)
+                {
+                                returnVal = data.split('|');
+                                var img_lock = document.getElementById('restrict_'+returnVal[1]);
+
+                        if (img_lock.style.backgroundImage.indexOf('button_unlock') > 0)
+                        {
+                                img_lock.style.backgroundImage = img_lock.style.backgroundImage.replace(/button_unlock/g,'button_lock');
+                                write_msg(get_lang('%1 marked as restricted',returnVal[1]));
+                        }
+                        else
+                        {
+                                img_lock.style.backgroundImage = img_lock.style.backgroundImage.replace(/button_lock/g,'button_unlock');
+                                write_msg(get_lang('%1 unmarked as restricted',returnVal[1]));
+                        }
+                }
+                else
+                        write_error("Could not mark as restricted");
+        }
+
+        function updateComment(data)
+        {
+                var returnVal = data.split('|');
+                if (data.indexOf("True") == 0)
+                {
+                        write_msg(get_lang('Updated comment for %1',returnVal[1]));
+                }
+                else
+                {
+                        if (returnVal[1] == "badchar")
+                                write_error(get_lang('Comments cannot contain "%1"',returnVal[2]));
+                        else
+                                write_error(get_lang('You have no permission to access this file'));
+                }
+
+        }
         
+        function upload(data)
+        {
+                var response = unserialize(data);
+
+                if ( response[0] == "Ok" )
+                {
+                        write_msg(get_lang('All files created sucessfuly'));
+                        _winBuild( "dwindownewUpload" , "remove" );     
+                }
+                else
+                {       
+                        var _inputs = document.getElementsByTagName('input');
+
+                        for( var i = 0; i < response.length; i++ )
+                        {
+                                for( var j = 0 ; j < _inputs.length ; j++ )
+                                {
+                                        if( _inputs[j].getAttribute('type') == 'file' )
+                                        {       
+                                                if( _inputs[j].value.indexOf( response[i]['file'] ) > -1 )
+                                                {
+                                                        var _parent     = _inputs[j].parentNode;
+                                                        var _div = _parent.firstChild;  
+                                                        _div.style.display              = "block";
+                                                        _div.style.color                        = "red";
+                                                        _div.style.height                       = "16px";
+                                                        _div.style.paddingLeft  = "17px";
+                                                        _div.style.background   = "url('"+path_filemanager+"images/warning.gif') no-repeat left top";
+                                                        _div.style.cursor                       = "pointer";
+                                                        _div.onclick    = function(){ this.style.display = 'none'; } ;
+                                                        
+                                                        if( response[i]['size_max'] )
+                                                        {
+                                                                _div.innerHTML = "<span style='font-weight:bold' >Erro </span>:: Tamanho do arquivo " 
+                                                                                          + borkb( response[i]['size'] ) + "  - Permitido  " + borkb( response[i]['size_max'] );
+                                                        }
+                                                        else    if( response[i]['badchar'] )
+                                                        {       
+                                                                _div.innerHTML = "<span style='font-weight:bold' >Erro </span>:: "  + response[i]['badchar'];   
+                                                        }
+                                                        else    if( response[i]['directory'] )
+                                                        {       
+                                                                _div.innerHTML = "<span style='font-weight:bold' >Erro </span>:: "  + response[i]['directory']; 
+                                                        }
+                                                        else    if( response[i]['sendFile'] )
+                                                        {       
+                                                                _div.innerHTML = "<span style='font-weight:bold' >Erro </span>:: "  + response[i]['sendFile'];  
+                                                        }
+                                                        else    if( response[i]['undefined'] )
+                                                        {
+                                                                _div.innerHTML = "<span style='font-weight:bold' >Erro </span>:: "  + response[i]['undefined']; 
+                                                        }
+                                                }       
+                                        }
+                                }       
+                        }       
+                }       
+
+                connector.hideProgressBar();            
+                toolbar.control('reload');
+        }
+
+        function handler(){}
+
+        handler.prototype.archive                       = archive;
+        handler.prototype.copyto                        = copyto;
+        handler.prototype.del                           = del;
+        handler.prototype.draw_folders_list     = draw_folders_list;
+        handler.prototype.moveto                        = moveto;
+        handler.prototype.refreshDir                    = refreshDir;
+        handler.prototype.rename                        = rename;
+        handler.prototype.restricted                    = restricted;
+        handler.prototype.updateComment = updateComment;
+        handler.prototype.upload                        = upload;
+
+        window.handler = new handler;
         
-        for (var i = 0 ; i < _return.length; i++)
-        {       
-                if ( _return[i] == 'False')
-                {
-                        write_error(get_lang('Could not delete %1', _return[i+1]) );
-                        return;
-                }
-                else
-                {
-                        if ( _return[i] != "" )
-                        {
-                                deletedFiles += ", " + _return[i];
-                        }
-        
-                        if (i > 3) //to avoid big message
-                        {
-                                deletedFiles = "  " + _return.length + " " +get_lang("files");
-                                break;
-                        }
-                }
-        }
-        
-        write_msg(get_lang('Deleted %1',deletedFiles.substr(2)));
-        
-        toolbar.control('reload');
-
-}
-
-handler.prototype.rename = function(data) {
-        if (data == null){
-                var returnVal = new Array ("True",oldValue,oldValue);
-        }
-        else
-                var returnVal = data.split('|');
-        if ( returnVal[0] == "True" ){
-                if (returnVal[1] != returnVal[2]) write_msg(get_lang('Renamed %1 to %2',returnVal[1],returnVal[2]));
-                var nameLink = document.createElement('A');
-                var inputName = document.getElementById('input_'+returnVal[1]);
-                var trFile = inputName.parentNode.parentNode.parentNode;
-
-                nameLink.innerHTML = returnVal[2];
-                nameLink.href="./index.php?menuaction=filemanager.uifilemanager.view&file="+base64_encode(returnVal[2])+"&path="+base64_encode(currentPath);
-                nameLink.target = "_blank";
-                nameLink.id = "name_"+returnVal[2];
-
-                inputName.parentNode.appendChild(nameLink);
-                inputName.parentNode.removeChild(inputName);
-                trFile.innerHTML = trFile.innerHTML.replace(returnVal[1],returnVal[2]);
-                trFile.id = trFile.id.replace(returnVal[1],returnVal[2]);
-        }
-        else
-        {
-                if (returnVal[1] == "badchar")
-                        write_error(get_lang('File names cannot contain "%1"',returnVal[2]));
-                else if (returnVal[1] == "slashes")
-                        write_error(get_lang('File names cannot contain \\ or /'));
-                else if (returnVal[1] == "editing")
-                        write_error(get_lang('This file is being edited right now'));
-                else
-                        write_error(get_lang('Could not rename %1 to %2', returnVal[1], returnVal[2]));
-        }
-
-}
-
-handler.prototype.upload = function(data)
-{
-        
-        connector.hideProgressBar();
-        var response = unserialize(data);
-        if (response[0] == "Ok")
-                write_msg(get_lang('All files created sucessfuly'));
-        else
-                for (var i=0;i < response.length; i++)
-                        write_error(response[i]);
-        toolbar.control('reload');
-}
-
-handler.prototype.restricted = function(data)
-{
-        if (data.indexOf("True") == 0){
-                returnVal = data.split('|');
-                var img_lock = document.getElementById('restrict_'+returnVal[1]);
-                if (img_lock.style.backgroundImage.indexOf('button_unlock') > 0)
-                {
-                        img_lock.style.backgroundImage = img_lock.style.backgroundImage.replace(/button_unlock/g,'button_lock');
-                        write_msg(get_lang('%1 marked as restricted',returnVal[1]));
-                }
-                else
-                {
-                        img_lock.style.backgroundImage = img_lock.style.backgroundImage.replace(/button_lock/g,'button_unlock');
-                        write_msg(get_lang('%1 unmarked as restricted',returnVal[1]));
-                }
-        }
-        else
-                write_error("Could not mark as restricted");
-}
-
-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');
-
-}
-
-handler.prototype.updateComment = function (data)
-{
-        var returnVal = data.split('|');
-        if (data.indexOf("True") == 0)
-        {
-                write_msg(get_lang('Updated comment for %1',returnVal[1]));
-        }
-        else
-        {
-                if (returnVal[1] == "badchar")
-                        write_error(get_lang('Comments cannot contain "%1"',returnVal[2]));
-                else
-                        write_error(get_lang('You have no permission to access this file'));
-        }
-
-}
-
-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("Directories") });
-        folders_tree.add(rootFold,'root');
-        
-        for ( var i = 0 ; i < folders.length; i++ )
-        {
-                var lastIndex = folders[i].lastIndexOf('/');
-                if (folders[i] != "/home/"+preferences.lid)
-                        var name = folders[i].substr(lastIndex+1,folders[i].length);
-                else
-                        var name = get_lang("My Folder");
-                var parentDir = folders[i].substr(0,lastIndex);
-        
-                if ( parentDir == '/home' )
-                        parentDir = 'root';
-                
-                var search_child = function( ListFolders, name )
-                {
-                        for ( j = 0 ; j < ListFolders.length; j++ )
-                        {
-                                if ( ListFolders[j].indexOf( name + '/') > -1 )
-                                        return true;
-                        }
-                        
-                        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);
-        }
-        
-        document.getElementById('content_folders').innerHTML = "";
-        
-        folders_tree.draw(document.getElementById('content_folders'));
-    
-        folders_tree.openTo(currentPath);
-        
-        folders_tree.getNodeById(currentPath)._select();
-}
-
-handler.prototype.copyto = function (data)
-{
-        returnVal = data.split('|');
-        if (returnVal[0] == 'NODIR')
-                write_error(get_lang('Could not copy file because no destination directory is given'));
-        else if(returnVal[0] == 'SOMEERROR'){
-                write_error(get_lang('Could not copy %1 file(s)',returnVal[1]));
-        }
-        else  if(returnVal[0] == 'COPIED'){
-                if (returnVal[1] == 1)
-                        write_msg(get_lang('File copied successfuly'));
-                else
-                        write_msg(get_lang('%1 files copied successfuly', returnVal[1]));
-        }
-}
-
-handler.prototype.moveto = function (data) {
-        returnVal = data.split('|');
-        if (returnVal[0] == 'NODIR')
-                write_error(get_lang('Could not copy file because no destination directory is given'));
-        else if(returnVal[0] == 'SOMEERROR'){
-                write_error(get_lang('Could not move %1 file(s)',returnVal[1]));
-        }
-        else  if(returnVal[0] == 'MOVED'){
-                if (returnVal[1] == 1)
-                        write_msg(get_lang('File moved successfuly'));
-                else
-                        write_msg(get_lang('%1 files moved successfuly', returnVal[1]));
-        }
-        handler.refreshDir();
-}
-handler.prototype.refreshDir = function (data) {
-        cExecute_('./index.php?menuaction=filemanager.uifilemanager.get_folders_list',handler.draw_folders_list);
-}
-
-var handler = new handler();
+})();

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

@@ -12 +12 @@
 comment filemanager     pt-br   Comentário
 comments cannot contain "%1"    filemanager     pt-br   Comentários não podem conter "%1"
+Comment(s)      filemanager     pt-br   Comentário(s)
 %1 files copied successfuly     filemanager     pt-br   %1 arquivos foram copiados com sucesso
 File copied successfuly filemanager     pt-br   O arquivo foi copiado com sucesso
@@ -39 +40 @@
 You have no permission to access this file      filemanager     pt-br   Você não tem permissão para acessar este arquivo
 One of the files sent was considered infected   filemanager     pt-bt   Um dos arquivos enviados foi considerado infectado por vírus
-Note: Uploaded is limited to %1MB       filemanager     pt-br   Nota: O tamanho máximo de envio é limitado a %1MB
+The maximum size for each file is %1MB  filemanager     pt-br   O tamanho máximo para cada arquivo é de %1MB
 This property will change the visibility of all users that have access to this file, continue?  filemanager     pt-br   Esta propriedade altera visibilidade dos usuários que estão compartilhados, deseja continuar?
 Click to change comments        filemanager     pt-br   Clique para alterar comentários
@@ -89 +90 @@
 filemanager preferences filemanager     pt-br   Preferências para Gerenciador de Arquivos
 files   filemanager     pt-br   Arquivos
+File(s) filemanager     pt-br   Arquivo(s)
 files in this directory filemanager     pt-br   Arquivos nesse diretório
 folder  filemanager     pt-br   Pasta

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

@@ -6 +6 @@
         <xsl:param name="form_action" />
         <xsl:param name="height"/>
-        <xsl:param name="lang_add_file" />
         <xsl:param name="lang_advanced_upload" />
         <xsl:param name="lang_click_here"/>
@@ -32 +31 @@
                                 </div>
                                 
-                                <div style="height:{$height}px; margin: 4px; overflow-y:auto;"> 
-                                        
+                                <div style="height:{$height}px; margin: 4px; overflow-y:auto; overflow-x:hidden;">      
                                         <div id="sendNotifcation" style="margin: 4px; overflow-y:auto;"/>
-                                        
-                                        <div id="uploadOption">
-                                                <span style="margin-right:{($width)-250}px;">
-                                                        <xsl:value-of select="$lang_file"/>
-                                                </span>
-                                                <span>
-                                                        <xsl:value-of select="$lang_comment"/>
-                                                </span>
-                                                <br/>
-                                                <input maxlength="255" name="upload_file[]" type="file" style="margin-right:5px" />
+                                        <span style="margin-right:{($width)-250}px;">
+                                                <label style="margin-left:1px;"><xsl:value-of select="$lang_file"/></label>
+                                                <label style="margin-left:200px;"><xsl:value-of select="$lang_comment"/></label>
+                                        </span>
+                                        <br/>
+                                        <div id="uploadOption" >
+                                                <div></div>
+                                                <input maxlength="255" name="upload_file[]" type="file" style="margin-right:5px" />
                                                 <input name="upload_comment[]" type="text"/>
                                                 <input type="hidden" name="uploadprocess" value="true"/>
@@ -65 +61 @@
                                         </div>                                          
                                         
-                                        <div style="font-weight:bold; margin-top: 15px;">
+                                        <div style="font-weight:bold; color: #f00; font-size:10pt; margin-top: 15px;">
                                                 <xsl:value-of select="$max_size"/>
                                         </div>