mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
update
This commit is contained in:
parent
c5526be9e4
commit
bf0e5e2d90
21
index.php
21
index.php
@ -8,10 +8,9 @@
|
|||||||
* Free Software Foundation; either version 2 of the License, or (at your *
|
* Free Software Foundation; either version 2 of the License, or (at your *
|
||||||
* option) any later version. *
|
* option) any later version. *
|
||||||
\**************************************************************************/
|
\**************************************************************************/
|
||||||
|
|
||||||
/* $Id$ */
|
/* $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'];
|
$GLOBALS['sessionid'] = @$GLOBALS['HTTP_GET_VARS']['sessionid'] ? @$GLOBALS['HTTP_GET_VARS']['sessionid'] : @$GLOBALS['HTTP_COOKIE_VARS']['sessionid'];
|
||||||
if (! $GLOBALS['sessionid'])
|
if (! $GLOBALS['sessionid'])
|
||||||
{
|
{
|
||||||
@ -47,11 +46,23 @@
|
|||||||
$api_requested = True;
|
$api_requested = True;
|
||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags'] = array(
|
$GLOBALS['phpgw_info']['flags'] = array
|
||||||
'noheader' => True,
|
(
|
||||||
'nonavbar' => True,
|
//'noheader' => True,
|
||||||
'currentapp' => $app
|
'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');
|
include('./header.inc.php');
|
||||||
|
|
||||||
if ($app == 'home' && ! $api_requested)
|
if ($app == 'home' && ! $api_requested)
|
||||||
|
@ -1320,8 +1320,10 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
|
|||||||
|
|
||||||
if ($menuaction && $GLOBALS['phpgw_info']['flags']['xslt_app'])
|
if ($menuaction && $GLOBALS['phpgw_info']['flags']['xslt_app'])
|
||||||
{
|
{
|
||||||
$app_function = strrchr($menuaction,'.');
|
list($app,$class,$method) = explode('.',$menuaction);
|
||||||
$var['app_tpl'] = substr($app_function,1,strlen($app_function));
|
$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');
|
$var['lang_powered_by'] = lang('powered by');
|
||||||
|
@ -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)
|
if($continue_app_data)
|
||||||
{
|
{
|
||||||
/* Make sure user is keeping his password in order */
|
/* Make sure user is keeping his password in order */
|
||||||
|
Loading…
Reference in New Issue
Block a user