[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php,1.213,1.214

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.common.inc.php 
Log Message:
accounts_popup port to head

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -d -r1.213 -r1.214
*** class.common.inc.php        21 Jul 2003 18:20:45 -0000      1.213
--- class.common.inc.php        6 Nov 2003 17:46:54 -0000       1.214
***************
*** 7,15 ****
        *        and Bettina Gille address@hidden                          *
        * Commononly used functions by phpGroupWare developers                  
   *
!       * Copyright (C) 2000, 2001 Dan Kuykendall                               
   *
!       * Copyright (C) 2002, 2003 Dan Kuykendall, Bettina Gille                
   *
        * 
------------------------------------------------------------------------ *
        * This library is part of the phpGroupWare API                          
   *
        * http://www.phpgroupware.org                                           
   * 
        * 
------------------------------------------------------------------------ *
        * This library is free software; you can redistribute it and/or modify 
it  *
--- 7,15 ----
        *        and Bettina Gille address@hidden                          *
        * Commononly used functions by phpGroupWare developers                  
   *
!       * Copyright 2000 - 2003 Free Software Foundation, Inc                   
   *
        * 
------------------------------------------------------------------------ *
        * This library is part of the phpGroupWare API                          
   *
        * http://www.phpgroupware.org                                           
   * 
+       * This program is part of the GNU project, see http://www.gnu.org/      
   *
        * 
------------------------------------------------------------------------ *
        * This library is free software; you can redistribute it and/or modify 
it  *
***************
*** 1110,1114 ****
                {
                        $this->navbar();
!                       
                        $cur_app        = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $app_title      = empty($cur_app) ? '' : ' ['.
--- 1110,1114 ----
                {
                        $this->navbar();
! 
                        $cur_app        = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $app_title      = empty($cur_app) ? '' : ' ['.
***************
*** 1365,1377 ****
                        }
  
-                       $var['app_tpl'] = '';
- 
-                       $menuaction     = get_var('menuaction',Array('GET'));
-                       if ($menuaction && 
isset($GLOBALS['phpgw_info']['flags']['xslt_app']))
-                       {
-                               list($app,$class,$method) = 
explode('.',$menuaction);
-                               $var['app_tpl'] = $method;
-                       }
- 
                        $var['lang_powered_by']                 = lang('powered 
by');
                        $var['lang_version']                    = 
lang('version');
--- 1365,1368 ----
***************
*** 1386,1390 ****
                        }
  
!                       $var['app_java_script'] = $var['app_css'] = 
$var['app_java_script_url'] = $var['app_css_url'] = '';
  
                        if (isset($_GET['menuaction']))
--- 1377,1381 ----
                        }
  
!                       $var['app_tpl'] = $var['app_java_script'] = 
$var['app_css'] = $var['app_java_script_url'] = $var['app_css_url'] = '';
  
                        if (isset($_GET['menuaction']))
***************
*** 1392,1395 ****
--- 1383,1391 ----
                                list($app,$class,$method) = 
explode('.',$_GET['menuaction']);
  
+                               if($method == 'accounts_popup' || 
isset($GLOBALS['phpgw_info']['flags']['xslt_app']))
+                               {
+                                       $var['app_tpl'] = $method;
+                               }
+ 
                                if 
(is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['css'])
                                {
***************
*** 1397,1405 ****
                                }
  
!                               /*$class = CreateObject("$app.$class");
                                if (isset($class->public_functions['css']))
                                {
                                        $var['app_css'] = $class->css();
!                               }*/
                                if 
(isset($class->public_functions['java_script']))
                                {
--- 1393,1401 ----
                                }
  
!                               $class = CreateObject("$app.$class");
                                if (isset($class->public_functions['css']))
                                {
                                        $var['app_css'] = $class->css();
!                               }
                                if 
(isset($class->public_functions['java_script']))
                                {