[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.156,1.157 class.xslttemplates.inc.php,1.3,1.4 common_functions.inc.php,1.12,1.13 functions.inc.php,1.153,1.154

[Dan Kuykendall <address@hidden>]

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

Modified Files:
        class.common.inc.php class.xslttemplates.inc.php 
        common_functions.inc.php functions.inc.php 
Log Message:
Switched to using the register_exit_function() and added scrolling divs to a 
couple places for examples

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -r1.156 -r1.157
*** class.common.inc.php        27 Sep 2002 17:39:49 -0000      1.156
--- class.common.inc.php        28 Sep 2002 15:20:19 -0000      1.157
***************
*** 1507,1511 ****
                function phpgw_footer()
                {
-                       global $HTMLCOMPLIANT;
                        if(!defined('PHPGW_FOOTER_RAN'))
                        {
--- 1507,1510 ----
***************
*** 1523,1542 ****
                                        $this->phpgw_header();
                                        
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
- /*
-                               
-                                       
$GLOBALS['phpgw']->template->p('phpgw_head');
-                                       
$GLOBALS['phpgw']->template->p('phpgw_navbar_start');
-                                       $this->msgbox('',False);
-                                       
$GLOBALS['phpgw']->template->fp('phpgw_msgbox');
-                                       
$GLOBALS['phpgw']->template->p('phpgw_appspace');
-                                       
$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
-                                       parse_navbar_end();
-                                       
$GLOBALS['phpgw']->template->reset_root();
-                                       
$GLOBALS['phpgw']->hooks->process('navbar_end');
-                                       
$GLOBALS['phpgw']->template->p('phpgw_navbar_end');
-                                       
$GLOBALS['phpgw']->template->p('phpgw_footer');
-                                       
$GLOBALS['phpgw']->template->parse('phpgw_main_body','login_form');
-                                       
$GLOBALS['phpgw']->template->pfp('out','phpgw_main');
- */    
                                }
  
--- 1522,1525 ----

Index: class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.xslttemplates.inc.php 23 Sep 2002 02:35:25 -0000      1.3
--- class.xslttemplates.inc.php 28 Sep 2002 15:20:19 -0000      1.4
***************
*** 1,3 ****
--- 1,16 ----
  <?php
+ 
+       if (!extension_loaded('xslt'))
+       {
+               if (PHP_OS == 'Windows' || PHP_OS == 'OS/2')
+               {
+                       dl('php_xslt.dll');     
+               }
+               else
+               {
+                       dl('xslt.so');
+               }
+       }
+ 
        require_once('class.xmltool.inc.php');
  

Index: common_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/common_functions.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** common_functions.inc.php    22 Aug 2002 03:05:58 -0000      1.12
--- common_functions.inc.php    28 Sep 2002 15:20:19 -0000      1.13
***************
*** 529,547 ****
                /* error_reporting(0); */
                list($appname,$classname) = explode('.', $class);
  
!               if 
(!isset($GLOBALS['phpgw_info']['flags']['included_classes'][$classname]) ||
!                       
!$GLOBALS['phpgw_info']['flags']['included_classes'][$classname])
                {
!                       
if(@file_exists(PHPGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
                        {
!                               
include(PHPGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
!                               
$GLOBALS['phpgw_info']['flags']['included_classes'][$classname] = True;
                        }
                        else
                        {
!                               
$GLOBALS['phpgw_info']['flags']['included_classes'][$classname] = False;
                        }
                }
!               
if($GLOBALS['phpgw_info']['flags']['included_classes'][$classname])
                {
                        if ($p1 == '_UNDEF_' && $p1 != 1)
--- 529,553 ----
                /* error_reporting(0); */
                list($appname,$classname) = explode('.', $class);
+               $filename = 
PHPGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php';
+               $included_files = get_included_files();
  
!               if (!isset($included_files[$filename]))
                {
!                       if(@file_exists($filename))
                        {
!                               include_once($filename);
!                               $is_included = True;
                        }
                        else
                        {
!                               $is_included = False;
                        }
                }
!               else
!               {
!                       $is_included = True;
!               }
!               
!               if($is_included)
                {
                        if ($p1 == '_UNDEF_' && $p1 != 1)

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -r1.153 -r1.154
*** functions.inc.php   28 Sep 2002 01:45:15 -0000      1.153
--- functions.inc.php   28 Sep 2002 15:20:19 -0000      1.154
***************
*** 270,273 ****
--- 270,279 ----
  
        
/****************************************************************************\
+       * 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'));
+       
+       
/****************************************************************************\
        * Stuff to use if logging in or logging out                             
     *
        
\****************************************************************************/
***************
*** 477,481 ****
                        if(PHPGW_USE_FRAMES)
                        {
!                               $GLOBALS['phpgw']->common->phpgw_footer();
                        }
                }
--- 483,487 ----
                        if(PHPGW_USE_FRAMES)
                        {
!                               exit;
                        }
                }
***************
*** 499,503 ****
                        if(PHPGW_USE_FRAMES)
                        {
!                               $GLOBALS['phpgw']->common->phpgw_footer();
                        }
                }
--- 505,509 ----
                        if(PHPGW_USE_FRAMES)
                        {
!                               exit;
                        }
                }
***************
*** 521,525 ****
                        if(PHPGW_USE_FRAMES)
                        {
!                               $GLOBALS['phpgw']->common->phpgw_footer();
                        }
                }
--- 527,531 ----
                        if(PHPGW_USE_FRAMES)
                        {
!                               exit;
                        }
                }
***************
*** 543,547 ****
                        if(PHPGW_USE_FRAMES)
                        {
!                               $GLOBALS['phpgw']->common->phpgw_footer();
                        }
                }
--- 549,553 ----
                        if(PHPGW_USE_FRAMES)
                        {
!                               exit;
                        }
                }
***************
*** 572,576 ****
                                        $continue_app_data = False;
                                        
$GLOBALS['phpgw']->template->set_var('phpgw_body',"user has no rights to this 
app!!!<br>\n");
-                                       
//$GLOBALS['phpgw']->common->phpgw_footer();
                                        
$GLOBALS['phpgw']->common->phpgw_exit(True);
                                }
--- 578,581 ----
***************
*** 582,585 ****
--- 587,595 ----
                                {
                                        
$GLOBALS['phpgw']->common->phpgw_header();
+                               }
+                               
+                               if(!PHPGW_USE_FRAMES)
+                               {
+ //                                    echo '<div style="width: 100%; height: 
100%; overflow: auto;">';
                                }