[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php, 1.23.2.9.2.35

[skwashd]

Update of admin/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.uiaccounts.inc.php lines: +8 -13

Log Message:
clean up and fix bug #3702

====================================================
Index: admin/inc/class.uiaccounts.inc.php
diff -u admin/inc/class.uiaccounts.inc.php:1.23.2.9.2.34 
admin/inc/class.uiaccounts.inc.php:1.23.2.9.2.35
--- admin/inc/class.uiaccounts.inc.php:1.23.2.9.2.34    Sun Nov 20 23:16:23 2005
+++ admin/inc/class.uiaccounts.inc.php  Sun Dec  4 05:39:33 2005
@@ -706,12 +706,10 @@
                        // create list of available app
                        $i = 0;

-                       $availableApps = $GLOBALS['phpgw_info']['apps'];
-                       @asort($availableApps);
-                       @reset($availableApps);
-                       foreach($availableApps as $app => $data)
+                       asort($GLOBALS['phpgw_info']['apps']);
+                       foreach($GLOBALS['phpgw_info']['apps'] as $app => $data)
                        {
-                               if ($data['enabled'] && $data['status'] != 2)
+                               if ($data['enabled'] )
                                {
                                        $perm_display[$i]['appName'] = $app;
                                        $perm_display[$i]['title']   = 
$data['title'];
@@ -1246,15 +1244,12 @@
                        $apps = 
CreateObject('phpgwapi.applications',$_account_id);
                        $db_perms = $apps->read_account_specific();

-                       @reset($GLOBALS['phpgw_info']['apps']);
-                       $availableApps = $GLOBALS['phpgw_info']['apps'];
-                       @asort($availableApps);
-                       @reset($availableApps);
-                       while (list($key,$application) = each($availableApps))
+                       asort($GLOBALS['phpgw_info']['apps']);
+                       foreach ( $GLOBALS['phpgw_info']['apps'] as $key => 
$application)
                        {
-                               if ($application['enabled'] && 
$application['status'] != 3)
+                               if ( $application['enabled'] )
                                {
-                                       $perm_display[$i]['appName']        = 
$key;
+                                       $perm_display[$i]['appName'] = $key;
                                        $perm_display[$i]['title'] = 
$application['title'];
                                        $i++;
                                }