holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update xslt

Browse Source
This commit is contained in:
ceb 2002-10-25 22:34:04 +00:00
parent 3e7875e1c6
commit b9f2dba2b3
4 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
home.php
View File

@ -212,5 +212,4 @@
}
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output,True);
$GLOBALS['phpgw']->xslttpl->pp();
?>

2
login.php
View File

@ -18,7 +18,6 @@
'login' => True,
'currentapp' => 'login',
'noheader' => True,
'nodisplay' => True
);
if(file_exists('./header.inc.php'))
@ -278,5 +277,4 @@
//_debug_array($data);
$GLOBALS['phpgw']->xslttpl->set_var('login',$data);
$GLOBALS['phpgw']->xslttpl->pp();
?>

56
phpgwapi/inc/class.common.inc.php
View File

@ -1084,9 +1084,8 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
'phpgw_body' => $phpgw_body
);
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi') . SEP . 'phpgw');
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = 'idsociety';
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi') . SEP . 'phpgw');
switch ($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'])
{
@ -1468,19 +1467,15 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
if(!defined('PHPGW_FOOTER_RAN'))
{
define('PHPGW_FOOTER_RAN',True);
if (!isset($GLOBALS['phpgw_info']['flags']['nodisplay']) || !$GLOBALS['phpgw_info']['flags']['nodisplay'])
if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
{
if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
{
$this->phpgw_appfooter();
}
$this->phpgw_header();
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
$this->phpgw_appfooter();
}
$GLOBALS['phpgw']->xslttpl->pp();
$GLOBALS['phpgw']->db->disconnect();
/* Clean up mcrypt */
@ -1498,6 +1493,41 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
}
}
/*function phpgw_footer()
{
if(!defined('PHPGW_FOOTER_RAN'))
{
define('PHPGW_FOOTER_RAN',True);
if (!isset($GLOBALS['phpgw_info']['flags']['nodisplay']) || !$GLOBALS['phpgw_info']['flags']['nodisplay'])
{
if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
{
$this->phpgw_appfooter();
}
$this->phpgw_header();
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
}
$GLOBALS['phpgw']->db->disconnect();
//Clean up mcrypt
if (@is_object($GLOBALS['phpgw']->crypto))
{
$GLOBALS['phpgw']->crypto->cleanup();
unset($GLOBALS['phpgw']->crypto);
}
if (DEBUG_TIMER)
{
$GLOBALS['debug_timer_stop'] = perfgetmicrotime();
echo 'Page loaded in ' . ($GLOBALS['debug_timer_stop'] - $GLOBALS['debug_timer_start']) . ' seconds.';
}
}
}*/
function hex2bin($data)
{
$len = strlen($data);

12
phpgwapi/inc/functions.inc.php
View File

@ -270,8 +270,8 @@
/****************************************************************************\
* Forcing the footer to run when the rest of the script is done. *
\****************************************************************************/
//$footer_common = &$GLOBALS['phpgw']->common;
//register_shutdown_function(array(&$footer_common, 'phpgw_footer'));
$footer_common = &$GLOBALS['phpgw']->common;
register_shutdown_function(array(&$footer_common, 'phpgw_footer'));
/****************************************************************************\
* Stuff to use if logging in or logging out *
@ -356,8 +356,6 @@
unset($enable_class);
reset($GLOBALS['phpgw_info']['flags']);
//$GLOBALS['phpgw']->common->navbar();
$GLOBALS['phpgw']->common->framework();
/* Verify that user has rights to the currentapp */
$continue_app_data = True;
@ -395,11 +393,7 @@
$GLOBALS['phpgw_info']['flags']['msgbox_data'][$message]=False;
}
/* I want to phase this out over time. App apps should put their data into the templates phpgw_body var*/
if (!@$GLOBALS['phpgw_info']['flags']['noheader'])
{
//$GLOBALS['phpgw']->common->framework();
}
$GLOBALS['phpgw']->common->framework();
$GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);