phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: phpgroupware header.inc.php.template,1.44,1.45 h


From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] CVS: phpgroupware header.inc.php.template,1.44,1.45 home.php,1.24,1.25 index.php,1.112,1.113
Date: Tue, 29 Oct 2002 17:15:33 -0500

Update of /cvsroot/phpgroupware/phpgroupware
In directory subversions:/tmp/cvs-serv30459

Modified Files:
        header.inc.php.template home.php index.php 
Log Message:
added option to enable/disable support for old_style apps, added css class for 
msgbox, fixed home screen if default_app

Index: header.inc.php.template
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/header.inc.php.template,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** header.inc.php.template     19 Oct 2002 20:22:38 -0000      1.44
--- header.inc.php.template     29 Oct 2002 22:15:31 -0000      1.45
***************
*** 10,14 ****
        *  option) any later version.                                           
   *
        
\**************************************************************************/
- 
        /* $Id$ */
  
--- 10,13 ----
***************
*** 49,52 ****
--- 48,54 ----
        $GLOBALS['phpgw_info']['login_theme'] = 'submarine';
  
+       /* Enables support for non xslt apps or apps which weren't already 
ported to the last version of class.Templates.inc.php */
+       $GLOBALS['phpgw_info']['server']['support_old_style_apps'] = True;
+ 
        /* This is used to control mcrypt's use */
        $GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = {ENABLE_MCRYPT};
***************
*** 97,101 ****
        $GLOBALS['phpgw_info']['server']['versions']['current_header'] = 
$setup_info['phpgwapi']['versions']['current_header'];
        unset($setup_info);
!       $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.22';
        /* This is a fix for NT */
        if(!isset($GLOBALS['phpgw_info']['flags']['noapi']) || 
!$GLOBALS['phpgw_info']['flags']['noapi'] == True)
--- 99,103 ----
        $GLOBALS['phpgw_info']['server']['versions']['current_header'] = 
$setup_info['phpgwapi']['versions']['current_header'];
        unset($setup_info);
!       $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.23';
        /* This is a fix for NT */
        if(!isset($GLOBALS['phpgw_info']['flags']['noapi']) || 
!$GLOBALS['phpgw_info']['flags']['noapi'] == True)

Index: home.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/home.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** home.php    26 Oct 2002 00:28:24 -0000      1.24
--- home.php    29 Oct 2002 22:15:31 -0000      1.25
***************
*** 212,215 ****
        }
  
!       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
  ?>
--- 212,218 ----
        }
  
!       if 
(!$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'])
!       {
!               
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
!       }
  ?>

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/index.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -r1.112 -r1.113
*** index.php   26 Oct 2002 20:33:04 -0000      1.112
--- index.php   29 Oct 2002 22:15:31 -0000      1.113
***************
*** 72,76 ****
                execmethod($GLOBALS['HTTP_GET_VARS']['menuaction']);
  
!               $GLOBALS['phpgw']->common->stop_xslt_capture(); // send 
captured output to the xslttpl
  
                unset($app);
--- 72,79 ----
                execmethod($GLOBALS['HTTP_GET_VARS']['menuaction']);
  
!               if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
!               {
!                       $GLOBALS['phpgw']->common->stop_xslt_capture(); // send 
captured output to the xslttpl
!               }
  
                unset($app);





reply via email to

[Prev in Thread] Current Thread [Next in Thread]