[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.105,1.106 class.common.inc.php,1.198,1.199 functions.inc.php,1.168,1.169

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.categories.inc.php class.common.inc.php 
        functions.inc.php 
Log Message:
it was impossible to login/logout after change of framework call

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -r1.105 -r1.106
*** class.categories.inc.php    20 Apr 2003 14:14:47 -0000      1.105
--- class.categories.inc.php    21 Apr 2003 00:49:42 -0000      1.106
***************
*** 258,262 ****
                                $parent_select = " AND cat_parent='$parent_id'";
                        }
!                       else
                        {
                                $parent_select = " AND cat_parent='0'";
--- 258,262 ----
                                $parent_select = " AND cat_parent='$parent_id'";
                        }
!                       else 
                        {
                                $parent_select = " AND cat_parent='0'";

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.198
retrieving revision 1.199
diff -C2 -r1.198 -r1.199
*** class.common.inc.php        20 Apr 2003 20:41:06 -0000      1.198
--- class.common.inc.php        21 Apr 2003 00:49:42 -0000      1.199
***************
*** 7,11 ****
        * and Bettina Gille address@hidden                                 * 
        * Commononly used functions by phpGroupWare developers                  
   *
!       * Copyright (C) 2000 - 2002 Dan Kuykendall                              
   *
        * 
------------------------------------------------------------------------ *
        * This library is part of the phpGroupWare API                          
   *
--- 7,11 ----
        * and Bettina Gille address@hidden                                 * 
        * Commononly used functions by phpGroupWare developers                  
   *
!       * Copyright (C) 2000 - 2003 Dan Kuykendall                              
   *
        * 
------------------------------------------------------------------------ *
        * This library is part of the phpGroupWare API                          
   *
***************
*** 1237,1241 ****
                        $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();
--- 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();
***************
*** 1320,1323 ****
--- 1320,1324 ----
  
                        $menuaction     = get_var('menuaction',Array('GET'));
+ 
                        if ($menuaction && 
$GLOBALS['phpgw_info']['flags']['xslt_app'])
                        {
***************
*** 1335,1365 ****
                        $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);
                }
--- 1336,1339 ----
***************
*** 1653,1657 ****
                                }
  
-                               $this->framework();
                                $GLOBALS['phpgw']->xslttpl->pp();
                                $GLOBALS['phpgw']->db->disconnect();
--- 1627,1630 ----

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -r1.168 -r1.169
*** functions.inc.php   20 Apr 2003 20:41:06 -0000      1.168
--- functions.inc.php   21 Apr 2003 00:49:42 -0000      1.169
***************
*** 405,408 ****
--- 405,410 ----
                        }
  
+                       $GLOBALS['phpgw']->common->framework();
+ 
                        $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);