[Phpgroupware-cvs] phpgwapi/inc class.applications.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/07/08 06:51:27

Modified files:
        inc            : class.applications.inc.php 

Log message:
        fix account ACLs being lost

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.applications.inc.php?cvsroot=phpgwapi&r1=1.53&r2=1.54

Patches:
Index: class.applications.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.applications.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- class.applications.inc.php  11 Jan 2005 14:42:53 -0000      1.53
+++ class.applications.inc.php  8 Jul 2006 06:51:27 -0000       1.54
@@ -7,7 +7,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.applications.inc.php,v 1.53 2005/01/11 14:42:53 
fipsfuchs Exp $
+       * @version $Id: class.applications.inc.php,v 1.54 2006/07/08 06:51:27 
skwashd Exp $
        */
 
        /**
@@ -19,7 +19,7 @@
        class applications
        {
                var $account_id;
-               var $data = Array();
+               var $data = array();
                var $db;
                var $public_functions = array(
                        'list_methods' => True,
@@ -248,27 +248,25 @@
                        {
                                $this->read_installed_apps();
                        }
-                       $app_list = 
$GLOBALS['phpgw']->acl->get_app_list_for_id('run',1,$this->account_id);
-                       if(!$app_list)
+                       $app_list = 
$GLOBALS['phpgw']->acl->get_app_list_for_id('run', 1, $this->account_id);
+
+                       if ( !count($app_list) )
                        {
-                               reset($this->data);
                                return $this->data;
                        }
-                       @reset($app_list);
-                       while ($app = each($app_list))
+                       foreach ( $app_list as $app )
                        {
-                               if ($this->is_system_enabled($app[1]))
+                               if ($this->is_system_enabled($app))
                                {
-                                       $this->data[$app[1]] = array(
-                                               'title'   => 
$GLOBALS['phpgw_info']['apps'][$app[1]]['title'],
-                                               'name'    => $app[1],
-                                               'enabled' => True,
-                                               'status'  => 
$GLOBALS['phpgw_info']['apps'][$app[1]]['status'],
-                                               'id'      => 
$GLOBALS['phpgw_info']['apps'][$app[1]]['id']
+                                       $this->data[$app] = array(
+                                               'title'   => 
$GLOBALS['phpgw_info']['apps'][$app]['title'],
+                                               'name'    => $app,
+                                               'enabled' => true,
+                                               'status'  => 
$GLOBALS['phpgw_info']['apps'][$app]['status'],
+                                               'id'      => 
$GLOBALS['phpgw_info']['apps'][$app]['id']
                                        );
                                }
                        }
-                       reset($this->data);
                        return $this->data;
                }
 
@@ -318,14 +316,7 @@
                        {
                                $this->read_installed_apps();
                        }
-                       if ($GLOBALS['phpgw_info']['apps'][$appname]['enabled'])
-                       {
-                               return True;
-                       }
-                       else
-                       {
-                               return False;
-                       }
+                       return isset($GLOBALS['phpgw_info']['apps'][$appname]) 
&& $GLOBALS['phpgw_info']['apps'][$appname]['enabled'];
                }
 
                function id2name($id)