Changeset 68 for trunk/expressoAdmin1_2

Timestamp:

09/14/07 17:43:09 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.ldap_functions.inc.php (modified) (3 diffs)
• setup/tables_current.inc.php (modified) (1 diff)
• setup/tables_update.inc.php (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -801 +801 @@
                                 // MailLists
                                 $result['maillists_info'] = $this->get_user_maillists($result['mail']);
-                                foreach ($result['maillists_info'] as $maillist)
-                                {
-                                        $result['maillists'][] = $maillist['uidnumber'];
-                                }
+                                if($result['maillists_info'])
+                                        foreach ($result['maillists_info'] as $maillist)
+                                        {
+                                                $result['maillists'][] = $maillist['uidnumber'];
+                                        }
                                 
                                 // Groups
@@ -845 +846 @@
                 }
         
-        natcasesort($a_tmp);
+        if($a_tmp) {
+                natcasesort($a_tmp);
         
-        foreach ($a_tmp as $uid)
-        {
-                $return[$uid]['uidnumber']      = $result[$uid]['uidnumber'];
-                        $return[$uid]['uid']            = $result[$uid]['uid'];
-                        $return[$uid]['mail']           = $result[$uid]['mail'];
-        }
+                foreach ($a_tmp as $uid)
+                {
+                        $return[$uid]['uidnumber']      = $result[$uid]['uidnumber'];
+                                $return[$uid]['uid']            = $result[$uid]['uid'];
+                                $return[$uid]['mail']           = $result[$uid]['mail'];
+                }
+        }       
                 return $return;
         }
@@ -907 +910 @@
                                 }
                 
-                                // Retira o count do array
-                                array_shift($entry[0]['memberuid']);
-                
                                 // Checamos e-mails que não fazem parte do expresso.
                                 // Criamos um array temporario
                                 $tmp_array = array();
-                                foreach ($result['memberuid_info'] as $uid => $user_data)
-                                {
-                                        $tmp_array[] = $uid;
-                                }
-
-                                // Vemos a diferença
-                                $array_diff = array_diff($entry[0]['memberuid'], $tmp_array);
-                
-                                // Incluimos no resultado
-                                foreach ($array_diff as $index=>$uid)
-                                {
-                                        $result['memberuid_info'][$uid]['cn'] = $uid;
+                                if($result['memberuid_info'])
+                                        foreach ($result['memberuid_info'] as $uid => $user_data)
+                                        {
+                                                $tmp_array[] = $uid;
+                                        }
+                
+                                if($entry[0]['memberuid']) {
+                                        // Retira o count do array
+                                        array_shift($entry[0]['memberuid']);                                    
+                                        // Vemos a diferença
+                                        $array_diff = array_diff($entry[0]['memberuid'], $tmp_array);
+                                        // Incluimos no resultado                       
+                                        foreach ($array_diff as $index=>$uid)
+                                        {
+                                                $result['memberuid_info'][$uid]['cn'] = $uid;
+                                        }
                                 }
                 

trunk/expressoAdmin1_2/setup/tables_current.inc.php

@@ -62 +62 @@
                 ),
                 
-                'phpgw_expressoadmin_samba',array(
+                'phpgw_expressoadmin_samba' => array(
                         'fd' => array(
                                 'samba_domain_name' => array( 'type' => 'varchar', 'precision' => 50),

trunk/expressoAdmin1_2/setup/tables_update.inc.php

@@ -9 +9 @@
         * option) any later version.                                               *
         \**************************************************************************/    
-        $test[] = '1.221';
-        function expressoAdmin1_2_upgrade1_221()
+        $test[] = '1.21';
+        function expressoAdmin1_2_upgrade1_21()
         {
                 $oProc = $GLOBALS['phpgw_setup']->oProc;
 
                 $oProc->CreateTable(
-                        'phpgw_expressoadmin_samba',array(
+                        'phpgw_expressoadmin_samba', array(
                                 'fd' => array(
                                         'samba_domain_name' => array( 'type' => 'varchar', 'precision' => 50),