[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.203,1.204
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.203,1.204 |
Date: |
Sat, 26 Apr 2003 16:53:01 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv6969
Modified Files:
class.common.inc.php
Log Message:
update
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.203
retrieving revision 1.204
diff -C2 -r1.203 -r1.204
*** class.common.inc.php 24 Apr 2003 21:04:22 -0000 1.203
--- class.common.inc.php 26 Apr 2003 20:52:59 -0000 1.204
***************
*** 1342,1353 ****
$var['app_java_script'] = $var['app_css'] =
$var['app_java_script_url'] = $var['app_css_url'] = '';
! if (isset($_GET['menuaction']) &&
isset($GLOBALS['phpgw_info']['flags']['etemplate_app']))
{
list($app,$class,$method) =
explode('.',$_GET['menuaction']);
! $class = CreateObject("$app.$class");
if (isset($class->public_functions['css']))
{
$var['app_css'] = $class->css();
! }
if
(isset($class->public_functions['java_script']))
{
--- 1342,1359 ----
$var['app_java_script'] = $var['app_css'] =
$var['app_java_script_url'] = $var['app_css_url'] = '';
! if (isset($_GET['menuaction']))
{
list($app,$class,$method) =
explode('.',$_GET['menuaction']);
!
! if
(is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['css'])
! {
! $var['app_css'] =
$GLOBALS[$class]->css();
! }
!
! /*$class = CreateObject("$app.$class");
if (isset($class->public_functions['css']))
{
$var['app_css'] = $class->css();
! }*/
if
(isset($class->public_functions['java_script']))
{
***************
*** 1558,1622 ****
}
- /*!
- @function phpgw_header
- @abstract load the phpgw header
- */
- function phpgw_header($forceheader = True, $forcenavbar = True)
- {
- /* So far I dont have use for $forceheader and
$forcenavbar */
- /* I only allow this to be run once by using the
constant */
-
- /* not longer needed für xslttpl and would require to
load the phpgw template
- if(!defined('PHPGW_HEADER_RAN'))
- {
- define('PHPGW_HEADER_RAN',True);
- $this->get_css_url();
- $this->load_phpgw_body_tags();
-
$GLOBALS['phpgw']->template->set_var('phpgw_msgbox',$this->msgbox());
-
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_head_javascript');
-
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_start');
- }
- */
- }
-
- /*!
- @function phpgw_appheader
- @abstract load header.inc.php for an application
- */
- function phpgw_appheader()
- {
- if (!is_array(MENUACTION))
- {
- list($app,$class,$method) =
explode('.',MENUACTION);
- if
(is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['header'])
- {
- $GLOBALS[$class]->header();
- }
- }
- elseif (file_exists(PHPGW_APP_INC . '/header.inc.php'))
- {
- include(PHPGW_APP_INC . '/header.inc.php');
- }
- }
- /*!
- @function phpgw_appfooter
- @abstract load footer.inc.php for an application
- */
- function phpgw_appfooter()
- {
- if (!is_array(MENUACTION))
- {
- list($app,$class,$method) =
explode('.',MENUACTION);
- if
(is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['footer'])
- {
- $GLOBALS[$class]->footer();
- }
- }
- elseif (file_exists(PHPGW_APP_INC . '/footer.inc.php'))
- {
- include(PHPGW_APP_INC . '/footer.inc.php');
- }
- }
-
function start_xslt_capture()
{
--- 1564,1567 ----
***************
*** 1644,1653 ****
}
}
-
- /* Note: does nothing any more under XSLT
- */
- function phpgw_footer()
- {
- }
function phpgw_final()
--- 1589,1592 ----
***************
*** 1659,1666 ****
if
(!$GLOBALS['phpgw_info']['flags']['noframework'])
{
!
if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
!
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
!
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!
address@hidden'phpgw_info']['flags']['noappfooter'])
{
if($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
--- 1598,1604 ----
if
(!$GLOBALS['phpgw_info']['flags']['noframework'])
{
! $cur_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
!
! if($cur_app != 'home' && $cur_app !=
'login' && $cur_app != 'logout')
{
if($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
***************
*** 1668,1672 ****
$this->start_xslt_capture(); // if index already turned it off
}
- $this->phpgw_appfooter();
}
--- 1606,1609 ----
***************
*** 1676,1681 ****
}
! if
($GLOBALS['phpgw_info']['flags']['currentapp'] != 'login'&&
!
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout')
{
$this->framework();
--- 1613,1617 ----
}
! if ($cur_app != 'login'&& $cur_app !=
'logout')
{
$this->framework();
***************
*** 2475,2478 ****
--- 2411,2461 ----
}
}
+
+ /* THIS FUNCTION IS NOT LONGER USED! */
+ function phpgw_header($forceheader = True, $forcenavbar = True)
+ {
+ /* not longer needed für xslttpl and would require to
load the phpgw template */
+ }
+
+ /* THIS FUNCTION IS NOT LONGER USED! */
+ function phpgw_appheader()
+ {
+ /*if (!is_array(MENUACTION))
+ {
+ list($app,$class,$method) =
explode('.',MENUACTION);
+ if
(is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['header'])
+ {
+ $GLOBALS[$class]->header();
+ }
+ }
+ elseif (file_exists(PHPGW_APP_INC . '/header.inc.php'))
+ {
+ include(PHPGW_APP_INC . '/header.inc.php');
+ }*/
+ }
+
+ /* THIS FUNCTION IS NOT LONGER USED! */
+ function phpgw_appfooter()
+ {
+ /*if (!is_array(MENUACTION))
+ {
+ list($app,$class,$method) =
explode('.',MENUACTION);
+ if
(is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['footer'])
+ {
+ $GLOBALS[$class]->footer();
+ }
+ }
+ elseif (file_exists(PHPGW_APP_INC . '/footer.inc.php'))
+ {
+ include(PHPGW_APP_INC . '/footer.inc.php');
+ }*/
+ }
+
+ /* Note: does nothing any more under XSLT
+ */
+ function phpgw_footer()
+ {
+ }
+
}//end common class
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.203,1.204,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: stocks index.php,1.9,1.10
- Next by Date:
[Phpgroupware-cvs] CVS: stocks/templates/default header.tpl,1.1,1.2 list.tpl,1.2,1.3 preferences.tpl,1.6,1.7 preferences_edit.tpl,1.8,1.9
- Previous by thread:
[Phpgroupware-cvs] CVS: stocks index.php,1.9,1.10
- Next by thread:
[Phpgroupware-cvs] CVS: stocks/templates/default header.tpl,1.1,1.2 list.tpl,1.2,1.3 preferences.tpl,1.6,1.7 preferences_edit.tpl,1.8,1.9
- Index(es):