[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.169,1.170 functions.inc.php,1.158,1.159

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv5216/inc

Modified Files:
        class.common.inc.php functions.inc.php 
Log Message:
update xslt

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -r1.169 -r1.170
*** class.common.inc.php        25 Oct 2002 03:04:28 -0000      1.169
--- class.common.inc.php        25 Oct 2002 22:33:39 -0000      1.170
***************
*** 1085,1091 ****
                        );
  
-                       
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi') . SEP . 
'phpgw');
- 
                        
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = 
'idsociety';
  
                        switch 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'])
--- 1085,1090 ----
                        );
  
                        
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = 
'idsociety';
+                       
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi') . SEP . 
'phpgw');
  
                        switch 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'])
***************
*** 1469,1472 ****
--- 1468,1502 ----
                        {
                                define('PHPGW_FOOTER_RAN',True);
+ 
+                               
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'])
+                               {
+                                       $this->phpgw_appfooter();
+                               }
+                               $GLOBALS['phpgw']->xslttpl->pp();
+                               $GLOBALS['phpgw']->db->disconnect();
+ 
+                               /* Clean up mcrypt */
+                               if (@is_object($GLOBALS['phpgw']->crypto))
+                               {
+                                       $GLOBALS['phpgw']->crypto->cleanup();
+                                       unset($GLOBALS['phpgw']->crypto);
+                               }
+                               
+                               if (DEBUG_TIMER)
+                               {
+                                       $GLOBALS['debug_timer_stop'] = 
perfgetmicrotime();
+                                       echo 'Page loaded in ' . 
($GLOBALS['debug_timer_stop'] - $GLOBALS['debug_timer_start']) . ' seconds.';
+                               }
+                       }
+               }
+ 
+               /*function phpgw_footer()
+               {
+                       if(!defined('PHPGW_FOOTER_RAN'))
+                       {
+                               define('PHPGW_FOOTER_RAN',True);
                                if 
(!isset($GLOBALS['phpgw_info']['flags']['nodisplay']) || 
!$GLOBALS['phpgw_info']['flags']['nodisplay'])
                                {
***************
*** 1484,1488 ****
                                $GLOBALS['phpgw']->db->disconnect();
  
!                               /* Clean up mcrypt */
                                if (@is_object($GLOBALS['phpgw']->crypto))
                                {
--- 1514,1518 ----
                                $GLOBALS['phpgw']->db->disconnect();
  
!                               //Clean up mcrypt
                                if (@is_object($GLOBALS['phpgw']->crypto))
                                {
***************
*** 1497,1501 ****
                                }
                        }
!               }
  
                function hex2bin($data)
--- 1527,1531 ----
                                }
                        }
!               }*/
  
                function hex2bin($data)

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -r1.158 -r1.159
*** functions.inc.php   25 Oct 2002 03:04:28 -0000      1.158
--- functions.inc.php   25 Oct 2002 22:33:39 -0000      1.159
***************
*** 271,276 ****
        * Forcing the footer to run when the rest of the script is done.        
     *
        
\****************************************************************************/
!       //$footer_common = &$GLOBALS['phpgw']->common;
!       //register_shutdown_function(array(&$footer_common, 'phpgw_footer'));
        
        
/****************************************************************************\
--- 271,276 ----
        * Forcing the footer to run when the rest of the script is done.        
     *
        
\****************************************************************************/
!       $footer_common = &$GLOBALS['phpgw']->common;
!       register_shutdown_function(array(&$footer_common, 'phpgw_footer'));
        
        
/****************************************************************************\
***************
*** 357,362 ****
                reset($GLOBALS['phpgw_info']['flags']);
  
-               //$GLOBALS['phpgw']->common->navbar();
-               $GLOBALS['phpgw']->common->framework();
                /* Verify that user has rights to the currentapp */
  
--- 357,360 ----
***************
*** 396,404 ****
                        }
  
!                       /* I want to phase this out over time. App apps should 
put their data into the templates phpgw_body var*/
!                       if (address@hidden'phpgw_info']['flags']['noheader'])
!                       {
!                               //$GLOBALS['phpgw']->common->framework();
!                       }
  
                        $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
--- 394,398 ----
                        }
  
!                       $GLOBALS['phpgw']->common->framework();
  
                        $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);