[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.9.2.9,1.123.2.9.2.10 footer.inc.php,1.17.2.2.2.2,1.17.2.2.2.3 functions.inc.php,1.121.2.13.2.10,1.121.2.13.2.11

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.common.inc.php footer.inc.php functions.inc.php 
Log Message:
added fallback mode to the new async-services


Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.123.2.9.2.9
retrieving revision 1.123.2.9.2.10
diff -C2 -r1.123.2.9.2.9 -r1.123.2.9.2.10
*** class.common.inc.php        30 May 2003 02:34:25 -0000      1.123.2.9.2.9
--- class.common.inc.php        1 Jun 2003 09:18:07 -0000       1.123.2.9.2.10
***************
*** 288,299 ****
                function phpgw_exit($call_footer = False)
                {
!                       if ($call_footer)
                        {
!                               $this->phpgw_footer();
                        }
-                       $GLOBALS['phpgw']->db->disconnect();
                        exit;
                }
  
                /*!
                @function randomstring
--- 288,330 ----
                function phpgw_exit($call_footer = False)
                {
!                       if (!defined('PHPGW_EXIT'))
                        {
!                               define('PHPGW_EXIT',True);
! 
!                               if ($call_footer)
!                               {
!                                       $this->phpgw_footer();
!                               }
                        }
                        exit;
                }
  
+               function phpgw_final()
+               {
+                       if (!defined('PHPGW_FINAL'))
+                       {
+                               define('PHPGW_FINAL',True);
+ 
+                               if (DEBUG_TIMER)
+                               {
+                                       $GLOBALS['debug_timer_stop'] = 
perfgetmicrotime();
+                                       echo 'Page loaded in ' . 
($GLOBALS['debug_timer_stop'] - $GLOBALS['debug_timer_start']) . ' seconds.';
+                               }
+                               // call the asyncservice check_run function if 
it is not explicitly set to cron-only
+                               //
+                               if 
(!$GLOBALS['phpgw_info']['server']['asyncservice'])  // is default
+                               {
+                                       
ExecMethod('phpgwapi.asyncservice.check_run','fallback');
+                               }
+                               /* Clean up mcrypt */
+                               if (@is_object($GLOBALS['phpgw']->crypto))
+                               {
+                                       $GLOBALS['phpgw']->crypto->cleanup();
+                                       unset($GLOBALS['phpgw']->crypto);
+                               }
+                               $GLOBALS['phpgw']->db->disconnect();
+                       }
+               }
+ 
                /*!
                @function randomstring
***************
*** 1087,1100 ****
                function phpgw_footer()
                {
!                       if (!isset($GLOBALS['phpgw_info']['flags']['nofooter']) 
|| !$GLOBALS['phpgw_info']['flags']['nofooter'])
                        {
!                               include(PHPGW_API_INC . '/footer.inc.php');
!                       }
!  
!                       /* Clean up mcrypt */
!                       if (@is_object($GLOBALS['phpgw']->crypto))
!                       {
!                               $GLOBALS['phpgw']->crypto->cleanup();
!                               unset($GLOBALS['phpgw']->crypto);
                        }
                }
--- 1118,1128 ----
                function phpgw_footer()
                {
!                       if (!defined('PHPGW_FOOTER'))
                        {
!                               define('PHPGW_FOOTER',True);
!                               if 
(!isset($GLOBALS['phpgw_info']['flags']['nofooter']) || 
!$GLOBALS['phpgw_info']['flags']['nofooter'])
!                               {
!                                       include(PHPGW_API_INC . 
'/footer.inc.php');
!                               }
                        }
                }

Index: footer.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/footer.inc.php,v
retrieving revision 1.17.2.2.2.2
retrieving revision 1.17.2.2.2.3
diff -C2 -r1.17.2.2.2.2 -r1.17.2.2.2.3
*** footer.inc.php      4 Apr 2003 09:56:07 -0000       1.17.2.2.2.2
--- footer.inc.php      1 Jun 2003 09:18:07 -0000       1.17.2.2.2.3
***************
*** 65,75 ****
                parse_navbar_end();
        }
-       $GLOBALS['phpgw']->db->disconnect();
- 
-       if (DEBUG_TIMER)
-       {
-               $GLOBALS['debug_timer_stop'] = perfgetmicrotime();
-               echo 'Page loaded in ' . ($GLOBALS['debug_timer_stop'] - 
$GLOBALS['debug_timer_start']) . ' seconds.';
-       }
  ?>
  </BODY>
--- 65,68 ----

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.10
retrieving revision 1.121.2.13.2.11
diff -C2 -r1.121.2.13.2.10 -r1.121.2.13.2.11
*** functions.inc.php   22 May 2003 21:33:16 -0000      1.121.2.13.2.10
--- functions.inc.php   1 Jun 2003 09:18:07 -0000       1.121.2.13.2.11
***************
*** 245,248 ****
--- 245,254 ----
        define('PHPGW_ACL_CUSTOM_3',256);
  
+       
+       
/****************************************************************************\
+       * Forcing the footer to run when the rest of the script is done.        
     *
+       
\****************************************************************************/
+       register_shutdown_function(array($GLOBALS['phpgw']->common, 
'phpgw_final'));
+ 
        
/****************************************************************************\
        * Stuff to use if logging in or logging out                             
     *