Changeset 86 for trunk/expressoAdmin1_2/inc

Timestamp:

10/19/07 10:23:42 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.group.inc.php (modified) (2 diffs)
• class.maillist.inc.php (modified) (4 diffs)

trunk/expressoAdmin1_2/inc/class.group.inc.php

@@ -332 +332 @@
                                 foreach($add_users as $uidnumber)
                                 {
-                                        if (is_numeric($uidnumber))
+                                        if (is_numeric($uidnumber) && ($uidnumber != -1))
                                         {
                                                 $this->db_functions->add_user2group($new_values['gidnumber'], $uidnumber);
@@ -352 +352 @@
                                 foreach($remove_users as $uidnumber)
                                 {
-                                        $this->db_functions->remove_user2group($new_values['gidnumber'], $uidnumber);
-                                        $user = $this->ldap_functions->uidnumber2uid($uidnumber);
-                                        $array_memberUids_remove[] = $user;
-                                        $this->db_functions->write_log("Removido usuário $user do grupo $dn.",$dn,'','','');
+                                        if ($uidnumber != -1)
+                                        {
+                                                $this->db_functions->remove_user2group($new_values['gidnumber'], $uidnumber);
+                                                $user = $this->ldap_functions->uidnumber2uid($uidnumber);
+                                                $array_memberUids_remove[] = $user;
+                                                $this->db_functions->write_log("Removido usuário $user do grupo $dn.",$dn,'','','');
+                                        }
                                 }
                                 $this->ldap_functions->remove_user2group($new_values['gidnumber'], $array_memberUids_remove);

trunk/expressoAdmin1_2/inc/class.maillist.inc.php

@@ -247 +247 @@
                                 foreach($add_users as $uidnumber)
                                 {
-                                        $mail = $this->ldap_functions->uidnumber2mail($uidnumber);
-                                        $array_emails_add[] = $mail;
-                                        $this->db_functions->write_log("Adicionado usuario $mail a lista",$dn,$uidnumber,'','');
+                                        if ($uidnumber != -1)
+                                        {
+                                                $mail = $this->ldap_functions->uidnumber2mail($uidnumber);
+                                                $array_emails_add[] = $mail;
+                                                $this->db_functions->write_log("Adicionado usuario $mail a lista",$dn,$uidnumber,'','');
+                                        }
                                 }
                                 $this->ldap_functions->add_user2maillist($new_values['uidnumber'], $array_emails_add);
@@ -258 +261 @@
                                 foreach($remove_users as $uidnumber)
                                 {
-                                        $mail = $this->ldap_functions->uidnumber2mail($uidnumber);
+                                        if ($uidnumber != -1)
+                                        {
+                                                $mail = $this->ldap_functions->uidnumber2mail($uidnumber);
                                         
-                                        // Não achei o email do usuário no ldap.
-                                        if (empty($mail))
-                                                $mail = $uidnumber;
+                                                // Não achei o email do usuário no ldap.
+                                                if (empty($mail))
+                                                        $mail = $uidnumber;
                                         
-                                        $array_emails_remove[] = $mail;
-                                        $this->db_functions->write_log("Removido usuario $mail da lista",$dn,$uidnumber,'','');
+                                                $array_emails_remove[] = $mail;
+                                                $this->db_functions->write_log("Removido usuario $mail da lista",$dn,$uidnumber,'','');
+                                        }
                                 }
                                 $this->ldap_functions->remove_user2maillist($new_values['uidnumber'], $array_emails_remove);
@@ -360 +366 @@
                                 foreach($add_users as $uidnumber)
                                 {
-                                        $mail = $this->ldap_functions->uidnumber2mail($uidnumber);
-                                        $array_emails_add[] = $mail;
-                                        $this->db_functions->write_log("Adicionado usuario $mail a SCL da lista $dn",'',$uidnumber,'','');
+                                        if ($uidnumber != -1)
+                                        {
+                                                $mail = $this->ldap_functions->uidnumber2mail($uidnumber);
+                                                $array_emails_add[] = $mail;
+                                                $this->db_functions->write_log("Adicionado usuario $mail a SCL da lista $dn",'',$uidnumber,'','');
+                                        }
                                 }
                                 $result = $this->ldap_functions->add_user2maillist_scl($dn, $array_emails_add);
@@ -378 +387 @@
                                 foreach($remove_users as $uidnumber)
                                 {
-                                        $mail = $this->ldap_functions->uidnumber2mail($uidnumber);
-                                        $array_emails_remove[] = $mail;
-                                        $this->db_functions->write_log("Removido usuario $mail da SCP da lista $dn",'',$uidnumber,'','');
+                                        if ($uidnumber != -1)
+                                        {
+                                                $mail = $this->ldap_functions->uidnumber2mail($uidnumber);
+                                                $array_emails_remove[] = $mail;
+                                                $this->db_functions->write_log("Removido usuario $mail da SCP da lista $dn",'',$uidnumber,'','');
+                                        }
                                 }
                                 $result = $this->ldap_functions->remove_user2maillist_scl($dn, $array_emails_remove);