From 2c9cc412ae6cc366978728f8c0eaf9a71bed99e9 Mon Sep 17 00:00:00 2001 From: sim Date: Thu, 6 Mar 2003 22:15:58 +0000 Subject: [PATCH] Fixes a few xslt output related bugs. --- filemanager/inc/class.bofilemanager.inc.php | 4 ++-- filemanager/inc/class.uifilemanager.inc.php | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/filemanager/inc/class.bofilemanager.inc.php b/filemanager/inc/class.bofilemanager.inc.php index beacc860c9..c1b6f4fd8f 100755 --- a/filemanager/inc/class.bofilemanager.inc.php +++ b/filemanager/inc/class.bofilemanager.inc.php @@ -666,7 +666,7 @@ function f_newfile() { $result = Array(); - echo "newfile: ".$this->newfile ." createfile: ".$this->createfile; + //echo "newfile: ".$this->newfile ." createfile: ".$this->createfile; //die(); if ($this->newfile && $this->createfile) { @@ -717,7 +717,7 @@ $ls_array = $this->vfs->ls (array ( 'string' => $this->upload_file['name'][$i], - 'relatives' => array (RELATIVE_ALL, + 'relatives' => array (RELATIVE_ALL), 'checksubdirs' => False, 'nofiles' => True ) diff --git a/filemanager/inc/class.uifilemanager.inc.php b/filemanager/inc/class.uifilemanager.inc.php index c900b020a1..1fdd7e2fd4 100755 --- a/filemanager/inc/class.uifilemanager.inc.php +++ b/filemanager/inc/class.uifilemanager.inc.php @@ -88,6 +88,8 @@ unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 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')); } function no_header() @@ -171,7 +173,7 @@ 'relatives' => Array(RELATIVE_NONE) ))) { - echo lang('failed to create directory') . ' :'. $this->bo->homedir . "\n"; +//TODO: xsltise echo lang('failed to create directory') . ' :'. $this->bo->homedir . "\n"; } $this->bo->vfs->override_acl = 0; } @@ -188,7 +190,7 @@ 'relatives' => Array(RELATIVE_NONE) ))) { - echo lang('failed to create directory') . ' '. $this->bo->homedir . '

'; +//TODO: xsltise echo lang('failed to create directory') . ' '. $this->bo->homedir . '

'; } //$this->bo->vfs->override_acl = 0; @@ -318,14 +320,14 @@ //If the action is provided by this class, this'l do it if (in_array($function, $local_functions)) { - echo " uifunction $function "; + //echo " uifunction $function "; //Header('Location: '.$GLOBALS['phpgw']->link('/index.php',$var)); $this->$function(); exit(); } //For actions provided by the back-end, with no gui elseif (in_array($function, $bo_functions)) { - echo " bofunction $function "; + //echo " bofunction $function "; $f_function = 'f_'.$function; $errors = implode("\n", $this->bo->$f_function()); $var = Array( @@ -374,8 +376,8 @@ $help_array[1] = preg_replace("/\[(.*)\|(.*)\]/Ue","\$this->build_help('\\1','\\2')",$help_array[1]); $help_array[1] = preg_replace("/\[(.*)\]/Ue","\$this->build_help('\\1','\\1')",$help_array[1]); - echo ''."\n".ucwords(str_replace('_',' ',$help_array[0]))."\n".'
'."\n"; - echo ''."\n".$help_array[1].''; +// echo ''."\n".ucwords(str_replace('_',' ',$help_array[0]))."\n".'
'."\n"; +// echo ''."\n".$help_array[1].''; } exit(); }