mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-10-05 17:52:03 +02:00
Fixes a few xslt output related bugs.
This commit is contained in:
parent
f8b81274c1
commit
2c9cc412ae
@ -666,7 +666,7 @@
|
|||||||
function f_newfile()
|
function f_newfile()
|
||||||
{
|
{
|
||||||
$result = Array();
|
$result = Array();
|
||||||
echo "newfile: ".$this->newfile ." createfile: ".$this->createfile;
|
//echo "newfile: ".$this->newfile ." createfile: ".$this->createfile;
|
||||||
//die();
|
//die();
|
||||||
if ($this->newfile && $this->createfile)
|
if ($this->newfile && $this->createfile)
|
||||||
{
|
{
|
||||||
@ -717,7 +717,7 @@
|
|||||||
|
|
||||||
$ls_array = $this->vfs->ls (array (
|
$ls_array = $this->vfs->ls (array (
|
||||||
'string' => $this->upload_file['name'][$i],
|
'string' => $this->upload_file['name'][$i],
|
||||||
'relatives' => array (RELATIVE_ALL,
|
'relatives' => array (RELATIVE_ALL),
|
||||||
'checksubdirs' => False,
|
'checksubdirs' => False,
|
||||||
'nofiles' => True
|
'nofiles' => True
|
||||||
)
|
)
|
||||||
|
@ -88,6 +88,8 @@
|
|||||||
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noappheader']);
|
unset($GLOBALS['phpgw_info']['flags']['noappheader']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noappfooter']);
|
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'));
|
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'app_header'));
|
||||||
}
|
}
|
||||||
function no_header()
|
function no_header()
|
||||||
@ -171,7 +173,7 @@
|
|||||||
'relatives' => Array(RELATIVE_NONE)
|
'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;
|
$this->bo->vfs->override_acl = 0;
|
||||||
}
|
}
|
||||||
@ -188,7 +190,7 @@
|
|||||||
'relatives' => Array(RELATIVE_NONE)
|
'relatives' => Array(RELATIVE_NONE)
|
||||||
)))
|
)))
|
||||||
{
|
{
|
||||||
echo lang('failed to create directory') . ' <b>'. $this->bo->homedir . '</b><br><br>';
|
//TODO: xsltise echo lang('failed to create directory') . ' <b>'. $this->bo->homedir . '</b><br><br>';
|
||||||
}
|
}
|
||||||
//$this->bo->vfs->override_acl = 0;
|
//$this->bo->vfs->override_acl = 0;
|
||||||
|
|
||||||
@ -318,14 +320,14 @@
|
|||||||
//If the action is provided by this class, this'l do it
|
//If the action is provided by this class, this'l do it
|
||||||
if (in_array($function, $local_functions))
|
if (in_array($function, $local_functions))
|
||||||
{
|
{
|
||||||
echo " uifunction $function ";
|
//echo " uifunction $function ";
|
||||||
//Header('Location: '.$GLOBALS['phpgw']->link('/index.php',$var));
|
//Header('Location: '.$GLOBALS['phpgw']->link('/index.php',$var));
|
||||||
$this->$function();
|
$this->$function();
|
||||||
exit();
|
exit();
|
||||||
} //For actions provided by the back-end, with no gui
|
} //For actions provided by the back-end, with no gui
|
||||||
elseif (in_array($function, $bo_functions))
|
elseif (in_array($function, $bo_functions))
|
||||||
{
|
{
|
||||||
echo " bofunction $function ";
|
//echo " bofunction $function ";
|
||||||
$f_function = 'f_'.$function;
|
$f_function = 'f_'.$function;
|
||||||
$errors = implode("\n", $this->bo->$f_function());
|
$errors = implode("\n", $this->bo->$f_function());
|
||||||
$var = Array(
|
$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','\\2')",$help_array[1]);
|
||||||
$help_array[1] = preg_replace("/\[(.*)\]/Ue","\$this->build_help('\\1','\\1')",$help_array[1]);
|
$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="+4">'."\n".ucwords(str_replace('_',' ',$help_array[0]))."\n".'</font></br>'."\n";
|
||||||
echo '<font size="+2">'."\n".$help_array[1].'</font>';
|
// echo '<font size="+2">'."\n".$help_array[1].'</font>';
|
||||||
}
|
}
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user