Changeset 30

Timestamp:

05/29/07 15:55:18 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk

Files:

• expressoAdmin1_2/docs/change_log.txt (modified) (1 diff)
• expressoAdmin1_2/inc/class.user.inc.php (modified) (2 diffs)
• expressoAdmin1_2/inc/sieve-php.lib.php (added)
• phpgwapi/inc/class.sector_search_ldap.inc.php (modified) (2 diffs)

trunk/expressoAdmin1_2/docs/change_log.txt

@@ -59 +59 @@
 22/05/2007 - [1.240]
 - Criado possibilidade de administrar diversos domínios samba
+
+29/05/2007
+- Ao renomear um usuário, seu sieve script também é renomeado.

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

@@ -835 +835 @@
                                         $this->ldap_functions->remove_user_attributes($new_dn, $user_info_mod_remove);
                         
-                                //Renomeia mailbox e sieve
+                                //Renomeia mailbox
                         $result = $this->imap_functions->rename_mailbox($uid, $new_uid);
                                         if (!$result['status'])
@@ -843 +843 @@
                                                 $return['msg'] .= "\nErro ao renomear usuário no Cyrus. Processo abortado.";
                                         }
-                        
+                                
+                                // Renomeia sieve script
+                                include_once('sieve-php.lib.php');
+                                $sieve=new sieve($sieve_server, $sieve_port, $new_uid, $defaultUserPassword_plain);
+                                
+                                        if ($sieve->sieve_login())
+                                        {
+                                                $sieve->sieve_listscripts();
+                                                $myactivescript=$sieve->response["ACTIVE"];
+                                                $sieve->sieve_getscript($myactivescript);
+
+                                                $script = '';
+                                                foreach($sieve->response as $result)
+                                                {
+                                                        $script .= $result;
+                                                }
+
+                                        $scriptname = $new_uid;
+                                                if($sieve->sieve_sendscript($new_uid,$script))
+                                                {
+                                                        if ($sieve->sieve_setactivescript($new_uid))
+                                                        {
+                                                                $sieve->sieve_deletescript($myactivescript);
+                                                        }
+                                                }
+                                                else 
+                                                {
+                                                        $return['status'] = false;
+                                                        $return['msg'] .= $result['msg'] . "\nErro ao renomear script sieve, falha no envio do novo script.";
+                                                }
+                                                $sieve->sieve_logout();
+                                        }
+                                        else
+                                        {
+                                                        $return['status'] = false;
+                                                        $return['msg'] .= $result['msg'] . "\nErro ao renomear script sieve, falha no Login.";
+                                        }
+
                                         // Retorna senha do usuário
                                         $this->ldap_functions->set_user_password($new_uid, $user_password);

trunk/phpgwapi/inc/class.sector_search_ldap.inc.php

@@ -138 +138 @@
                                 array_pop ( $array_dn_reverse );
 
-                                $inverted_dn[$dn] = implode ( ".", $array_dn_reverse );
+                                $inverted_dn[$dn] = implode ( ";", $array_dn_reverse );
                         }
 
@@ -150 +150 @@
                 $display = '';
 
-                $array_dn_reverse = explode ( ".", $invert_ufn );
+                $array_dn_reverse = explode ( ";", $invert_ufn );
                 $array_dn  = array_reverse ( $array_dn_reverse, true );
 
-                $level = count( $array_dn ) - 4;
+                $level = count( $array_dn ) - (int)(count(explode(",", $GLOBALS['phpgw_info']['server']['ldap_context'])) + 1);
 
                 if ($level == 0)