[Phpgroupware-cvs] CVS: filemanager/inc class.bofilemanager.inc.php,1.4,1.5 class.uifilemanager.inc.php,1.4,1.5

[Jonathon Sim <address@hidden>]

Update of /cvsroot/phpgroupware/filemanager/inc
In directory subversions:/tmp/cvs-serv30027

Modified Files:
        class.bofilemanager.inc.php class.uifilemanager.inc.php 
Log Message:
Fixes a few xslt output related bugs.

Index: class.bofilemanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/class.bofilemanager.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.bofilemanager.inc.php 6 Mar 2003 01:11:43 -0000       1.4
--- class.bofilemanager.inc.php 6 Mar 2003 22:15:58 -0000       1.5
***************
*** 667,671 ****
                {
                        $result = Array();
!                       echo "newfile: ".$this->newfile ." createfile: 
".$this->createfile;
                        //die();
                        if ($this->newfile && $this->createfile)
--- 667,671 ----
                {
                        $result = Array();
!                       //echo "newfile: ".$this->newfile ." createfile: 
".$this->createfile;
                        //die();
                        if ($this->newfile && $this->createfile)
***************
*** 718,722 ****
                                $ls_array = $this->vfs->ls (array (
                                                'string'        => 
$this->upload_file['name'][$i],
!                                               'relatives'     => array 
(RELATIVE_ALL,
                                                'checksubdirs'  => False,
                                                'nofiles'       => True
--- 718,722 ----
                                $ls_array = $this->vfs->ls (array (
                                                'string'        => 
$this->upload_file['name'][$i],
!                                               'relatives'     => array 
(RELATIVE_ALL),
                                                'checksubdirs'  => False,
                                                'nofiles'       => True

Index: class.uifilemanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/class.uifilemanager.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uifilemanager.inc.php 6 Mar 2003 01:11:43 -0000       1.4
--- class.uifilemanager.inc.php 6 Mar 2003 22:15:58 -0000       1.5
***************
*** 89,92 ****
--- 89,94 ----
                        unset($GLOBALS['phpgw_info']['flags']['noappheader']);
                        unset($GLOBALS['phpgw_info']['flags']['noappfooter']);
+                       unset($GLOBALS['phpgw_info']['flags']['noappfooter']);
+                       unset($GLOBALS['phpgw_info']['flags']['headonly']);
                        
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
                }
***************
*** 172,176 ****
                                        )))
                                {
!                                       echo lang('failed to create directory') 
. ' :'. $this->bo->homedir . "\n";
                                }
                                $this->bo->vfs->override_acl = 0;
--- 174,178 ----
                                        )))
                                {
! //TODO: xsltise                                       echo lang('failed to 
create directory') . ' :'. $this->bo->homedir . "\n";
                                }
                                $this->bo->vfs->override_acl = 0;
***************
*** 189,193 ****
                                                )))
                                        {
!                                               echo lang('failed to create 
directory') . ' <b>'. $this->bo->homedir . '</b><br><br>';
                                        }
                                        //$this->bo->vfs->override_acl = 0;
--- 191,195 ----
                                                )))
                                        {
! //TODO: xsltise                               echo lang('failed to create 
directory') . ' <b>'. $this->bo->homedir . '</b><br><br>';
                                        }
                                        //$this->bo->vfs->override_acl = 0;
***************
*** 319,323 ****
                                        if (in_array($function, 
$local_functions))
                                        {
!                                               echo " uifunction $function "; 
                                                //Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php',$var));
                                                $this->$function();
--- 321,325 ----
                                        if (in_array($function, 
$local_functions))
                                        {
!                                               //echo " uifunction $function 
"; 
                                                //Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php',$var));
                                                $this->$function();
***************
*** 326,330 ****
                                        elseif (in_array($function, 
$bo_functions))
                                        {
!                                               echo " bofunction $function ";
                                                $f_function = 'f_'.$function;
                                                $errors = implode("\n", 
$this->bo->$f_function());
--- 328,332 ----
                                        elseif (in_array($function, 
$bo_functions))
                                        {
!                                               //echo " bofunction $function ";
                                                $f_function = 'f_'.$function;
                                                $errors = implode("\n", 
$this->bo->$f_function());
***************
*** 375,380 ****
                                $help_array[1] = 
preg_replace("/\[(.*)\]/Ue","\$this->build_help('\\1','\\1')",$help_array[1]);
  
!                               echo '<font 
size="+4">'."\n".ucwords(str_replace('_',' 
',$help_array[0]))."\n".'</font></br>'."\n";
!                               echo '<font 
size="+2">'."\n".$help_array[1].'</font>';
                        }
                        exit();
--- 377,382 ----
                                $help_array[1] = 
preg_replace("/\[(.*)\]/Ue","\$this->build_help('\\1','\\1')",$help_array[1]);
  
! //                            echo '<font 
size="+4">'."\n".ucwords(str_replace('_',' 
',$help_array[0]))."\n".'</font></br>'."\n";
! //                            echo '<font 
size="+2">'."\n".$help_array[1].'</font>';
                        }
                        exit();