Changeset 47 for trunk/expressoAdmin1_2/inc

Timestamp:

08/10/07 14:10:38 (17 years ago)

Author:

niltonneto

Message:

Scripts novos e outras atualizações.

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.functions.inc.php (modified) (1 diff)
• class.imap_functions.inc.php (modified) (3 diffs)
• class.user.inc.php (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.functions.inc.php

@@ -230 +230 @@
                                 
                                 $justthese = array("uidnumber", "uid", "cn", "mail");
-                                $filter="(&(phpgwAccountType=u)(|(uid~=".$query.")(sn~=".$query.")(cn~=".$query.")(givenName~=".$query.")(mail~=$query)(mailAlternateAddress~=$query)))";
+                                $filter="(&(phpgwAccountType=u)(|(uid=*".$query."*)(sn=*".$query."*)(cn=*".$query."*)(givenName=*".$query."*)(mail=$query*)(mailAlternateAddress=$query*)))";
                                 $search=ldap_search($ldap_conn, $context, $filter, $justthese);
                                 ldap_sort($ldap_conn, $search, "uid");

trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php

@@ -28 +28 @@
                         return $result;
                 }
-                if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Sent"))
+                if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Enviados"))
                 {
                         $error = imap_errors();
@@ -35 +35 @@
                         return $result;
                 }
-                if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Drafts"))
+                if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Rascunhos"))
                 {
                         $error = imap_errors();
@@ -42 +42 @@
                         return $result;
                 }
-                if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Trash"))
+                if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Lixeira"))
                 {
                         $error = imap_errors();

trunk/expressoAdmin1_2/inc/class.user.inc.php

@@ -548 +548 @@
                                                 $ldap_add['objectClass'][]                      = 'sambaSamAccount';
                                                 $ldap_mod_replace['loginShell']         = '/bin/bash';
-                                                $ldap_add['sambaSID']                           = $this->current_config['expressoAdmin_sambaSID'] . '-' . ((2 * $new_values['uidnumber'])+1000);
-                                                $ldap_add['sambaPrimaryGroupSID']       = $this->current_config['expressoAdmin_sambaSID'] . '-' . ((2 * $new_values['gidnumber'])+1001);
+                                                $ldap_add['sambaSID']                           = $new_values['sambadomain'] . '-' . ((2 * $new_values['uidnumber'])+1000);
+                                                $ldap_add['sambaPrimaryGroupSID']       = $new_values['sambadomain'] . '-' . ((2 * $new_values['gidnumber'])+1001);
                                                 $ldap_add['sambaAcctFlags']                     = $new_values['sambaacctflags'];
                                                 $ldap_add['sambaLogonScript']           = $new_values['sambalogonscript'];