Changeset 4019 in subversion

Timestamp:

Sep 30, 2010 3:02:52 AM (3 years ago)

Author:

alec

Message:

• Added password_ldap_lchattr option (#1486927)

Location:

trunk/plugins/password

Files:

• config.inc.php.dist (modified) (1 diff)
• drivers/ldap.php (modified) (3 diffs)
• drivers/ldap_simple.php (modified) (4 diffs)
• package.xml (modified) (3 diffs)

trunk/plugins/password/config.inc.php.dist

@@ -188 +188 @@
 $rcmail_config['password_ldap_force_replace'] = true;
 
+// LDAP Password Last Change Date
+// Some places use an attribute to store the date of the last password change
+// The date is meassured in "days since epoch" (an integer value)
+// Whenever the password is changed, the attribute will be updated if set (e.g. shadowLastChange)
+$rcmail_config['password_ldap_lchattr'] = '';
+
 
 // DirectAdmin Driver options

trunk/plugins/password/drivers/ldap.php

@@ -81 +81 @@
         return PASSWORD_CONNECT_ERROR;
     }
+
+    // Updating PasswordLastChange Attribute if desired
+    if ($lchattr = $rcmail->config->get('password_ldap_lchattr')) {
+       $current_day = (int)(time() / 86400);
+       if (!$userEntry->replace(array($lchattr => $current_day), $force)) {
+           return PASSWORD_CONNECT_ERROR;
+       }
+    }
+
     if (Net_LDAP2::isError($userEntry->update())) {
         return PASSWORD_CONNECT_ERROR;
@@ -86 +95 @@
     
     // All done, no error
-    return PASSWORD_SUCCESS;    
+    return PASSWORD_SUCCESS;
 }
 
@@ -270 +279 @@
     return $str;
 }
-
-?>

trunk/plugins/password/drivers/ldap_simple.php

@@ -1 +1 @@
 <?php
+
 /**
  * Simple LDAP Password Driver
@@ -13 +14 @@
 {
         $rcmail = rcmail::get_instance();
-        
+
         /* Connect */
         if (!$ds = ldap_connect($rcmail->config->get('password_ldap_host'), $rcmail->config->get('password_ldap_port'))) {
@@ -25 +26 @@
                 return PASSWORD_CONNECT_ERROR;
         }
-        
+
         /* Start TLS */
         if ($rcmail->config->get('password_ldap_starttls')) {
@@ -73 +74 @@
         
         $entree[$rcmail->config->get('password_ldap_pwattr')] = $passwd;
+
+        /* Updating PasswordLastChange Attribute if desired */
+        if ($lchattr = $rcmail->config->get('password_ldap_lchattr')) {
+                $entree[$lchattr] = (int)(time() / 86400)
+        }
+
         
         if (!ldap_modify($ds, $user_dn, $entree)) {

trunk/plugins/password/package.xml

@@ -16 +16 @@
                 <active>yes</active>
         </lead>
-        <date>2010-09-29</date>
-        <time>19:00:00</time>
+        <date>2010-09-30</date>
+        <time>09:00:00</time>
         <version>
-                <release>1.8</release>
+                <release>1.9</release>
                 <api>1.6</api>
         </version>
@@ -28 +28 @@
         <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
         <notes>
-- Added possibility to display extended error messages (#1486704)
-- Added extended error messages in Poppassd driver (#1486704)
+- Added password_ldap_lchattr option (#1486927)
     </notes>
         <contents>
@@ -171 +170 @@
             </notes>
             </release>
+        <release>
+                <date>2010-09-29</date>
+                <time>19:00:00</time>
+                <version>
+                        <release>1.8</release>
+                        <api>1.6</api>
+                </version>
+                <stability>
+                        <release>stable</release>
+                        <api>stable</api>
+                </stability>
+                <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+                <notes>
+- Added possibility to display extended error messages (#1486704)
+- Added extended error messages in Poppassd driver (#1486704)
+            </notes>
+        </release>
     </changelog>
 </package>