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

fixed design to allow for backwards compatibility

Browse Source
This commit is contained in:
seek3r 2002-05-31 18:13:07 +00:00
parent 161047f121
commit 0e2e0f5446
5 changed files with 55 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.uifields.inc.php
View File

@ -24,8 +24,8 @@
function uifields() function uifields()
{ {
$GLOBALS['phpgw']->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); // $GLOBALS['phpgw']->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs'); // $GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
$this->config = CreateObject('phpgwapi.config','addressbook'); $this->config = CreateObject('phpgwapi.config','addressbook');
} }

12
login.php
View File

@ -40,12 +40,14 @@
// This is used for system downtime, to prevent new logins. // This is used for system downtime, to prevent new logins.
if ($GLOBALS['phpgw_info']['server']['deny_all_logins']) if ($GLOBALS['phpgw_info']['server']['deny_all_logins'])
{ {
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic','phpgw_main'); $GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic_start','phpgw_main_start');
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic_end','phpgw_main_end');
$GLOBALS['phpgw']->template->set_block('login','login_form_deny','login_form'); $GLOBALS['phpgw']->template->set_block('login','login_form_deny','login_form');
$GLOBALS['phpgw']->template->set_var('template_set','default'); $GLOBALS['phpgw']->template->set_var('template_set','default');
$GLOBALS['phpgw']->template->set_var('phpgw_head_tags','<script><!-- if (window!= top) top.location.href=location.href// --></script>'); $GLOBALS['phpgw']->template->set_var('phpgw_head_tags','<script><!-- if (window!= top) top.location.href=location.href// --></script>');
$GLOBALS['phpgw']->template->fp('phpgw_body','login_form'); $GLOBALS['phpgw']->template->fp('phpgw_body','login_form');
$GLOBALS['phpgw']->template->pfp('out','phpgw_main'); $GLOBALS['phpgw']->template->pfp('out','phpgw_main_start');
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
exit; exit;
} }
@ -232,7 +234,8 @@
check_logoutcode(); check_logoutcode();
$GLOBALS['phpgw']->common->msgbox('', False,'phpgw_login_msgbox'); $GLOBALS['phpgw']->common->msgbox('', False,'phpgw_login_msgbox');
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic','phpgw_main'); $GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic_start','phpgw_main_start');
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic_end','phpgw_main_end');
$GLOBALS['phpgw']->template->set_var('phpgw_head_charset',lang('charset')); $GLOBALS['phpgw']->template->set_var('phpgw_head_charset',lang('charset'));
$GLOBALS['phpgw']->template->set_var('phpgw_head_description','phpGroupWare - Login Page'); $GLOBALS['phpgw']->template->set_var('phpgw_head_description','phpGroupWare - Login Page');
$GLOBALS['phpgw']->template->set_var('phpgw_head_keywords','phpGroupWare'); $GLOBALS['phpgw']->template->set_var('phpgw_head_keywords','phpGroupWare');
@ -251,5 +254,6 @@
$GLOBALS['phpgw']->template->set_var('lang_login',lang('login')); $GLOBALS['phpgw']->template->set_var('lang_login',lang('login'));
$GLOBALS['phpgw']->template->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']); $GLOBALS['phpgw']->template->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
$GLOBALS['phpgw']->template->fp('phpgw_body','login_form'); $GLOBALS['phpgw']->template->fp('phpgw_body','login_form');
$GLOBALS['phpgw']->template->pfp('out','phpgw_main'); $GLOBALS['phpgw']->template->pfp('out','phpgw_main_start');
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
?> ?>

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

@ -1330,7 +1330,17 @@
*/ */
function phpgw_header($forceheader = True, $forcenavbar = True) function phpgw_header($forceheader = True, $forcenavbar = True)
{ {
/* This is no longer used */ /* So far I dont have use for $forceheader and $forcenavbar */
/* I only allow this to be run once by using the constant */
if(!defined('PHPGW_HEADER_RAN'))
{
define('PHPGW_HEADER_RAN',True);
$this->msgbox('',False,'phpgw_msgbox');
$this->load_css_data();
$this->load_phpgw_body_tags();
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_head_javascript');
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_start');
}
} }
/*! /*!
@ -1388,11 +1398,8 @@
$this->phpgw_appfooter(); $this->phpgw_appfooter();
} }
$GLOBALS['phpgw']->db->disconnect(); $GLOBALS['phpgw']->db->disconnect();
$this->msgbox('',False,'phpgw_msgbox'); $this->phpgw_header();
$this->load_css_data(); $GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
$this->load_phpgw_body_tags();
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_head_javascript');
$GLOBALS['phpgw']->template->pfp('out','phpgw_main');
/* /*
$GLOBALS['phpgw']->template->p('phpgw_head'); $GLOBALS['phpgw']->template->p('phpgw_head');

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

@ -396,7 +396,7 @@
{ {
define('PHPGW_FRAME_PART','start'); define('PHPGW_FRAME_PART','start');
} }
//$GLOBALS['phpgw_info']['server']['useframes'] = 'always'; $GLOBALS['phpgw_info']['server']['useframes'] = 'always';
if(((isset($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes']) && if(((isset($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'] && $GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'] &&
$GLOBALS['phpgw_info']['server']['useframes'] == 'allowed') || $GLOBALS['phpgw_info']['server']['useframes'] == 'allowed') ||
@ -414,12 +414,14 @@
$GLOBALS['phpgw']->template->set_var('phpgw_left_link',$GLOBALS['phpgw']->session->link('home.php','framepart=left')); $GLOBALS['phpgw']->template->set_var('phpgw_left_link',$GLOBALS['phpgw']->session->link('home.php','framepart=left'));
$GLOBALS['phpgw']->template->set_var('phpgw_bottom_link',$GLOBALS['phpgw']->session->link('home.php','framepart=bottom')); $GLOBALS['phpgw']->template->set_var('phpgw_bottom_link',$GLOBALS['phpgw']->session->link('home.php','framepart=bottom'));
$GLOBALS['phpgw']->template->set_var('phpgw_unupported_link',$GLOBALS['phpgw']->session->link($GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME'],'framepart=unsupported')); $GLOBALS['phpgw']->template->set_var('phpgw_unupported_link',$GLOBALS['phpgw']->session->link($GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME'],'framepart=unsupported'));
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_frames','phpgw_main'); $GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_frames_start','phpgw_main_start');
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_frames_end','phpgw_main_end');
} }
else else
{ {
/* if we are using frames and not starting then we use the basic block to keep each part in a nice clean html format */ /* if we are using frames and not starting then we use the basic block to keep each part in a nice clean html format */
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic','phpgw_main'); $GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic_start','phpgw_main_start');
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_basic_end','phpgw_main_end');
} }
} }
else else
@ -427,7 +429,8 @@
/* Not using frames, so we default to tables */ /* Not using frames, so we default to tables */
define('PHPGW_USE_FRAMES',False); define('PHPGW_USE_FRAMES',False);
define('PHPGW_NAVBAR_TARGET','_self'); define('PHPGW_NAVBAR_TARGET','_self');
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_tables','phpgw_main'); $GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_tables_start','phpgw_main_start');
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_main_tables_end','phpgw_main_end');
} }
$GLOBALS['phpgw']->template->set_var('phpgw_head_target',PHPGW_NAVBAR_TARGET); $GLOBALS['phpgw']->template->set_var('phpgw_head_target',PHPGW_NAVBAR_TARGET);
@ -580,6 +583,12 @@
} }
if($continue_app_data) if($continue_app_data)
{ {
/* 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->phpgw_header();
}
$GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL); $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
$GLOBALS['phpgw']->template->halt_on_error = 'report'; $GLOBALS['phpgw']->template->halt_on_error = 'report';
if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && file_exists(PHPGW_APP_INC . '/functions.inc.php') && !MENUACTION) if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && file_exists(PHPGW_APP_INC . '/functions.inc.php') && !MENUACTION)

26
phpgwapi/templates/default/phpgw.tpl
View File

@ -1,4 +1,4 @@
<!-- BEGIN phpgw_main_tables --> <!-- BEGIN phpgw_main_tables_start -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML> <HTML>
<HEAD> <HEAD>
@ -22,7 +22,13 @@
</TR> </TR>
<TR> <TR>
<TD width="{phpgw_left_table_width}" height="100%" align="left" valign="top">{phpgw_left}</TD> <TD width="{phpgw_left_table_width}" height="100%" align="left" valign="top">{phpgw_left}</TD>
<TD width="100%" height="100%" align="left" valign="top">{phpgw_msgbox}{phpgw_body}</TD> <TD width="100%" height="100%" align="left" valign="top">
{phpgw_msgbox}
<!-- END phpgw_main_tables_start -->
<!-- BEGIN phpgw_main_tables_end -->
{phpgw_body}
</TD>
<TD width="{phpgw_right_table_width}" height="100%" align="right" valign="top">{phpgw_right}</TD> <TD width="{phpgw_right_table_width}" height="100%" align="right" valign="top">{phpgw_right}</TD>
</TR> </TR>
<TR> <TR>
@ -31,9 +37,9 @@
</TABLE> </TABLE>
</BODY> </BODY>
</HTML> </HTML>
<!-- END phpgw_main_tables --> <!-- END phpgw_main_tables_end -->
<!-- BEGIN phpgw_main_basic --> <!-- BEGIN phpgw_main_basic_start -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML> <HTML>
<HEAD> <HEAD>
@ -52,12 +58,15 @@
</HEAD> </HEAD>
<BODY{phpgw_body_tags}> <BODY{phpgw_body_tags}>
{phpgw_msgbox} {phpgw_msgbox}
<!-- END phpgw_main_basic_start -->
<!-- BEGIN phpgw_main_basic_end -->
{phpgw_body} {phpgw_body}
</BODY> </BODY>
</HTML> </HTML>
<!-- END phpgw_main_basic --> <!-- END phpgw_main_basic_end -->
<!-- BEGIN phpgw_main_frames --> <!-- BEGIN phpgw_main_frames_start -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML> <HTML>
<HEAD> <HEAD>
@ -84,8 +93,11 @@
</NOFRAMES> </NOFRAMES>
</FRAMESET> </FRAMESET>
</HEAD> </HEAD>
<!-- END phpgw_main_frames_start -->
<!-- BEGIN phpgw_main_frames_end -->
</HTML> </HTML>
<!-- END phpgw_main_frames --> <!-- END phpgw_main_frames_end -->
<!-- BEGIN phpgw_head_javascript --> <!-- BEGIN phpgw_head_javascript -->
<SCRIPT language="JavaScript" type="text/javascript"> <SCRIPT language="JavaScript" type="text/javascript">