[Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.11 class.uiactions.inc.php, 1.2 class.bofilemanager.inc.php, 1.8 class.uiaction_base.inc.php, 1.3 functions.inc.php, 1.5

[ceb]

Update of filemanager/inc

Modified Files:
     Branch: MAIN
            class.uifilemanager.inc.php lines: +12 -8
            class.uiactions.inc.php lines: +1 -0
            class.bofilemanager.inc.php lines: +8 -4
            class.uiaction_base.inc.php lines: +1 -4
Removed Files:
     Branch: MAIN
            functions.inc.php

Log Message:
update

====================================================
Index: filemanager/inc/class.uifilemanager.inc.php
diff -u filemanager/inc/class.uifilemanager.inc.php:1.10 
filemanager/inc/class.uifilemanager.inc.php:1.11
--- filemanager/inc/class.uifilemanager.inc.php:1.10    Fri Jan 21 01:41:05 2005
+++ filemanager/inc/class.uifilemanager.inc.php Sat Jan 22 02:22:52 2005
@@ -68,10 +68,10 @@
                function uifilemanager()
                {
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
-                       $this->actions                  = 
CreateObject('filemanager.uiactions');
+                       //$this->actions                        = 
CreateObject('filemanager.uiactions');
                        $this->bofilemanager    = 
CreateObject('filemanager.bofilemanager');
-                       $this->nextmatchs               = 
CreateObject('phpgwapi.nextmatchs');
-                       $this->browser                  = 
CreateObject('phpgwapi.browser');
+                       //$this->nextmatchs             = 
CreateObject('phpgwapi.nextmatchs');
+                       //$this->browser                        = 
CreateObject('phpgwapi.browser');
                        //$this->template_dir = 
$GLOBALS['phpgw']->common->get_tpl_dir($GLOBALS['phpgw_info']['flags']['currentapp']);
                        $this->check_access();
                        $this->create_home_dir();
@@ -241,9 +241,12 @@
                function action()
                {
                        $params = get_var('params',array('POST','GET'));
-                       $createfile = get_var('createfile',array('POST','GET'));
+                       //echo 'createdir: ' . $_POST['createdir'];
+                       //echo 'newdir: ' . $_POST['params']['newdir'];
+                       //echo 'createfile: ' . $_POST['createfile'];
+                       //echo 'newfile: ' . $_POST['params']['newfile'];
+
                        //_debug_array($params);
-                       //echo 'createfile: '. $createfile;

                        if (UI_DEBUG)
                        {
@@ -648,11 +651,11 @@
                        return array_merge($dirs, $files);
                }

-               function index( $edit=array())
+               function index()
                {
                        $files_array = $this->bofilemanager->load_files();
-                       //echo 'createfile: ' . $_GET['createfile'];

+                       //_debug_array($files_array);
                        $usage = 0;
                        $files_array = $this->dirs_first($files_array);
                        if(count($files_array) || $this->bofilemanager->cwd)
@@ -913,6 +916,7 @@
                                $data['lang_file']                      = 
lang('file');
                                $data['lang_comment']           = 
lang('comment');

+                               $GLOBALS['phpgw']->xslttpl->add_file('widgets');
                                $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('index' => $data));
                        }
                }

====================================================
Index: filemanager/inc/class.uiactions.inc.php
diff -u filemanager/inc/class.uiactions.inc.php:1.1 
filemanager/inc/class.uiactions.inc.php:1.2
--- filemanager/inc/class.uiactions.inc.php:1.1 Tue Mar  4 00:04:06 2003
+++ filemanager/inc/class.uiactions.inc.php     Sat Jan 22 02:22:52 2005
@@ -27,6 +27,7 @@
                        $this->actions[$action]->$action($parent);
                        exit();
                }
+
                function dispatch($parent)
                {
                        //First, see if the action is specified in the url with 
a 'uiaction=' param

====================================================
Index: filemanager/inc/class.bofilemanager.inc.php
diff -u filemanager/inc/class.bofilemanager.inc.php:1.7 
filemanager/inc/class.bofilemanager.inc.php:1.8
--- filemanager/inc/class.bofilemanager.inc.php:1.7     Fri Jan 21 01:41:05 2005
+++ filemanager/inc/class.bofilemanager.inc.php Sat Jan 22 02:22:52 2005
@@ -11,7 +11,6 @@
                        'delete'        => True
                );

-               var $so;
                var $vfs;
                var $rootdir;
                var $fakebase;
@@ -116,7 +115,6 @@
                        $this->fakebase = $this->vfs->fakebase;
                        $this->appname = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->settings = 
$GLOBALS['phpgw_info']['user']['preferences'][$this->appname];
-                       $this->so       = 
CreateObject('filemanager.sofilemanager');

                        if(stristr($this->rootdir,PHPGW_SERVER_ROOT))
                        {
@@ -325,6 +323,9 @@

                        if ($this->path == $this->fakebase)
                        {
+                               //echo 'path: ' . $this->path . "\n";
+                               //echo 'fake: ' . $this->fakebase;
+
                                if (!$this->vfs->file_exists(array(
                                        'string' => $this->homedir,
                                        'relatives' =>Array(RELATIVE_NONE)
@@ -384,6 +385,9 @@
                        }
                        else
                        {
+                               //echo 'path: ' . $this->path . "\n";
+                               //echo 'fake: ' . $this->fakebase;
+
                                $ls_array = $this->vfs->ls(array(
                                        'string' => $this->path,
                                        'relatives' => Array(RELATIVE_NONE),
@@ -615,7 +619,7 @@
                function f_newdir()
                {
                        $result = Array();
-                       if ($this->newdir && $this->createdir)
+                       if ($this->params['newdir'] && $this->createdir)
                        {
                                if ($badchar = 
$this->bad_chars($this->createdir,True,True))
                                {
@@ -660,7 +664,7 @@
                                        }
                                        else
                                        {
-                                               $result[] = lang('could not 
create ', $this->path.SEP.$this->createdir);
+                                               $result[] = lang('could not 
create %1', $this->path.SEP.$this->createdir);
                                        }
                                }
                        }

====================================================
Index: filemanager/inc/class.uiaction_base.inc.php
diff -u filemanager/inc/class.uiaction_base.inc.php:1.2 
filemanager/inc/class.uiaction_base.inc.php:1.3
--- filemanager/inc/class.uiaction_base.inc.php:1.2     Fri Jan 21 01:41:05 2005
+++ filemanager/inc/class.uiaction_base.inc.php Sat Jan 22 02:22:52 2005
@@ -4,10 +4,7 @@
        {
                function load_header()
                {
-                       unset($GLOBALS['phpgw_info']['flags']['noheader']);
-                       unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-                       unset($GLOBALS['phpgw_info']['flags']['noappheader']);
-                       unset($GLOBALS['phpgw_info']['flags']['noappfooter']);
+                       $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
                }

                function action_link($action)