Changeset 44 for trunk/phpgwapi

Timestamp:

07/27/07 16:56:55 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/phpgwapi/inc

Files:

• class.auth_ldap.inc.php (modified) (1 diff)
• class.sector_search_ldap.inc.php (modified) (1 diff)

trunk/phpgwapi/inc/class.auth_ldap.inc.php

@@ -151 +151 @@
                         
                         $dn = $allValues[0]['dn'];
-                        if (!@ldap_modify($ds, $dn, $entry)) 
+                        
+                        /* userPasswordRFC2617 Begin's*/
+                        $c = CreateObject('phpgwapi.config','expressoAdmin1_2');
+                        $c->read_repository();
+                        $current_config = $c->config_data;
+                        if ($current_config['expressoAdmin_userPasswordRFC2617'] == 'true')
+                        {
+                                $realm          = $current_config['expressoAdmin_realm_userPasswordRFC2617'];
+                                $uid            = $allValues[0]['uid'][0];
+                                $password       = $new_passwd;
+                                $passUserRFC2617 = $realm . ':      ' . md5("$uid:$realm:$password");
+
+                                if ($allValues[0]['userpasswordrfc2617'][0] != '')
+                                        $entry['userPasswordRFC2617'] = $passUserRFC2617;
+                                else
+                                {
+                                        $ldap_add['userPasswordRFC2617'] = $passUserRFC2617;
+                                        if (!@ldap_mod_add($ds, $dn, $ldap_add)) 
+                                        {
+                                                return false;
+                                        }
+                                }
+                        }
+                        /* userPasswordRFC2617 End's*/
+                        
+                        if (!@ldap_modify($ds, $dn, $entry))
                         {
                                 return false;

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

@@ -218 +218 @@
                                         $select = '';
                                 $display = strtoupper($info[$i]['ou'][0]);
-                                $options .= "<option value='$dn'$select>$display </option>";
+                                $options .= "<option value='$dn'$select>$display</option>";
             }