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

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.common.inc.php functions.inc.php 
Log Message:
fixed for login: dont call framework for login

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -r1.199 -r1.200
*** class.common.inc.php        21 Apr 2003 00:49:42 -0000      1.199
--- class.common.inc.php        21 Apr 2003 08:32:53 -0000      1.200
***************
*** 1066,1070 ****
                        
                        $cur_app        = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
!                       $app_title      = isset($cur_app) ? ' [' . 
$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title']
 . ']' : '';
                        $css = $this->get_css_url();
                        $var = array
--- 1066,1073 ----
                        
                        $cur_app        = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
!                       $app_title      = empty($cur_app) ? '' : ' ['.
!                               
(isset($GLOBALS['phpgw_info']['apps'][$cur_app]) ? 
$GLOBALS['phpgw_info']['apps'][$cur_app]['title'] : 
!                               
(isset($GLOBALS['phpgw_info']['navbar'][$cur_app]) ? 
$GLOBALS['phpgw_info']['navbar'][$cur_app]['title'] : 
!                               lang($cur_app))).']';
                        $css = $this->get_css_url();
                        $var = array
***************
*** 1237,1241 ****
                        $var['help_statustext']         = 
$GLOBALS['phpgw_info']['navbar']['help']['title'];
  
!                       if (isset($GLOBALS['phpgw_ifo']['navbar']['admin']) && 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
                        {
                                $var['current_users']           = lang('Current 
users') . ': ' . $GLOBALS['phpgw']->session->total();
--- 1240,1244 ----
                        $var['help_statustext']         = 
$GLOBALS['phpgw_info']['navbar']['help']['title'];
  
!                       if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
                        {
                                $var['current_users']           = lang('Current 
users') . ': ' . $GLOBALS['phpgw']->session->total();
***************
*** 1320,1324 ****
  
                        $menuaction     = get_var('menuaction',Array('GET'));
- 
                        if ($menuaction && 
$GLOBALS['phpgw_info']['flags']['xslt_app'])
                        {
--- 1323,1326 ----
***************
*** 1336,1339 ****
--- 1338,1368 ----
                        $var['navbar_format']                   = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'];
  
+                       if 
(isset($GLOBALS['phpgw_info']['flags']['app_header']))
+                       {
+                               $var['app_header'] = 
$GLOBALS['phpgw_info']['flags']['app_header'];
+                       }
+                       $var['java_script'] = $var['app_css'] = '';
+                       if (isset($_GET['menuaction']))
+                       {
+                               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']))
+                               {
+                                       $var['java_script'] = 
$class->java_script();
+                               }
+                               unset($class);
+                       }
+                       if (isset($GLOBALS['phpgw_info']['flags']['css']))
+                       {
+                               $var['app_css'] .= 
$GLOBALS['phpgw_info']['flags']['css'];
+                       }
+                       if 
(isset($GLOBALS['phpgw_info']['flags']['java_script']))
+                       {
+                               $var['java_script'] .= 
$GLOBALS['phpgw_info']['flags']['java_script'];
+                       }
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
                }
***************
*** 1428,1432 ****
  
                        /* We handle this here becuase its special */
!                       $GLOBALS['phpgw_info']['navbar']['about']['title']      
        = lang('about %1',$GLOBALS['phpgw_info']['apps'][$app]['title']);
                        $GLOBALS['phpgw_info']['navbar']['about']['url']        
        = $GLOBALS['phpgw']->link('/about.php','app='.$app);
                        $GLOBALS['phpgw_info']['navbar']['about']['icon']       
        = $this->image('phpgwapi',Array('about','nonav'));
--- 1457,1463 ----
  
                        /* We handle this here becuase its special */
!                       $app_title = 
isset($GLOBALS['phpgw_info']['apps'][$app]) ? 
!                               $GLOBALS['phpgw_info']['apps'][$app]['title'] : 
'phpGroupWare';
!                       $GLOBALS['phpgw_info']['navbar']['about']['title']      
        = lang('about %1',$app_title);
                        $GLOBALS['phpgw_info']['navbar']['about']['url']        
        = $GLOBALS['phpgw']->link('/about.php','app='.$app);
                        $GLOBALS['phpgw_info']['navbar']['about']['icon']       
        = $this->image('phpgwapi',Array('about','nonav'));
***************
*** 1604,1612 ****
                }
  
                function phpgw_footer()
                {
!                       if(!defined('PHPGW_FOOTER_RAN'))
                        {
!                               define('PHPGW_FOOTER_RAN',True);
  
                                
if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
--- 1635,1649 ----
                }
  
+               /* Note: does nothing any more under XSLT
+                */
                function phpgw_footer()
                {
!               }
!               
!               function phpgw_final()
!               {
!                       if(!defined('PHPGW_FINAL'))
                        {
!                               define('PHPGW_FINAL',True);
  
                                
if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
***************
*** 1627,1630 ****
--- 1664,1672 ----
                                }
  
+                               if 
($GLOBALS['phpgw_info']['flags']['currentapp'] != 'login'&&
+                                       
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout')
+                               {
+                                       $this->framework();
+                               }
                                $GLOBALS['phpgw']->xslttpl->pp();
                                $GLOBALS['phpgw']->db->disconnect();

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -r1.169 -r1.170
*** functions.inc.php   21 Apr 2003 00:49:42 -0000      1.169
--- functions.inc.php   21 Apr 2003 08:32:53 -0000      1.170
***************
*** 281,285 ****
        * Forcing the footer to run when the rest of the script is done.        
     *
        
\****************************************************************************/
!       register_shutdown_function(array($GLOBALS['phpgw']->common, 
'phpgw_footer'));
  
        
/****************************************************************************\
--- 281,285 ----
        * Forcing the footer to run when the rest of the script is done.        
     *
        
\****************************************************************************/
!       register_shutdown_function(array($GLOBALS['phpgw']->common, 
'phpgw_final'));
  
        
/****************************************************************************\
***************
*** 404,409 ****
                                
$GLOBALS['phpgw_info']['flags']['msgbox_data'][$message]=False;
                        }
- 
-                       $GLOBALS['phpgw']->common->framework();
  
                        $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
--- 404,407 ----