This commit is contained in:
ceb 2003-01-04 00:54:55 +00:00
parent c5526be9e4
commit bf0e5e2d90
3 changed files with 20 additions and 15 deletions

View File

@ -8,10 +8,9 @@
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
/* $Id$ */
$phpgw_info = array();
$GLOBALS['phpgw_info'] = array();
$GLOBALS['sessionid'] = @$GLOBALS['HTTP_GET_VARS']['sessionid'] ? @$GLOBALS['HTTP_GET_VARS']['sessionid'] : @$GLOBALS['HTTP_COOKIE_VARS']['sessionid'];
if (! $GLOBALS['sessionid'])
{
@ -47,11 +46,23 @@
$api_requested = True;
}
$GLOBALS['phpgw_info']['flags'] = array(
'noheader' => True,
'nonavbar' => True,
$GLOBALS['phpgw_info']['flags'] = array
(
//'noheader' => True,
'currentapp' => $app
);
/* dont call the xslt_app_tpl if app isnt ported to xslt yet.
this is only temporarily. when more apps use xslt we should change it to ask for non xslt apps*/
switch($app)
{
case 'notes':
case 'property':
$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
break;
}
include('./header.inc.php');
if ($app == 'home' && ! $api_requested)

View File

@ -1320,8 +1320,10 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
if ($menuaction && $GLOBALS['phpgw_info']['flags']['xslt_app'])
{
$app_function = strrchr($menuaction,'.');
$var['app_tpl'] = substr($app_function,1,strlen($app_function));
list($app,$class,$method) = explode('.',$menuaction);
$var['app_tpl'] = $method;
//$app_function = strrchr($menuaction,'.');
//$var['app_tpl'] = substr($app_function,1,strlen($app_function));
}
$var['lang_powered_by'] = lang('powered by');

View File

@ -386,14 +386,6 @@
}
}
/* dont call the xslt_app_tpl if app isnt ported to xslt */
switch($GLOBALS['phpgw_info']['flags']['currentapp'])
{
case 'notes':
$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
break;
}
if($continue_app_data)
{
/* Make sure user is keeping his password in order */