Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr

Handle password expiry in user_ldap 

2 files changed, 64 insertions, 1 deletions

diff --git a/apps/user_ldap/js/renewPassword.js b/apps/user_ldap/js/renewPassword.js
new file mode 100644
index 00000000000..bea2c0409f7
--- /dev/null
+++ b/apps/user_ldap/js/renewPassword.js
@@ -0,0 +1,50 @@
+/**
+ *
+ * @copyright Copyright (c) 2016, Roger Szabo (roger.szabo@web.de)
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+OCA = OCA || {};
+OCA.LDAP = _.extend(OC.LDAP || {}, {
+	onRenewPassword: function () {
+		$('#submit')
+			.removeClass('icon-confirm-white')
+			.addClass('icon-loading-small')
+			.attr('value', t('core', 'Renewing …'));
+		return true;
+	},
+});
+
+$(document).ready(function() {
+	$('form[name=renewpassword]').submit(OCA.LDAP.onRenewPassword);
+	
+	if($('#newPassword').length) {
+		$('#newPassword').showPassword().keyup();
+	}
+	$('#newPassword').strengthify({
+		zxcvbn: OC.linkTo('core','vendor/zxcvbn/dist/zxcvbn.js'),
+		titles: [
+			t('core', 'Very weak password'),
+			t('core', 'Weak password'),
+			t('core', 'So-so password'),
+			t('core', 'Good password'),
+			t('core', 'Strong password')
+		],
+		drawTitles: true,
+	});
+});
diff --git a/apps/user_ldap/js/wizard/wizardTabAdvanced.js b/apps/user_ldap/js/wizard/wizardTabAdvanced.js
index 7d8d0b70269..9302104b1f6 100644
--- a/apps/user_ldap/js/wizard/wizardTabAdvanced.js
+++ b/apps/user_ldap/js/wizard/wizardTabAdvanced.js
@@ -99,6 +99,10 @@ OCA = OCA || {};
 					$element: $('#ldap_turn_on_pwd_change'),
 					setMethod: 'setPasswordChangeEnabled'
 				},
+				ldap_default_ppolicy_dn: {
+					$element: $('#ldap_default_ppolicy_dn'),
+					setMethod: 'setDefaultPPolicyDN'
+				},
 
 				//Special Attributes
 				ldap_quota_attr: {
@@ -292,7 +296,7 @@ OCA = OCA || {};
 		setPagingSize: function(size) {
 			this.setElementValue(this.managedItems.ldap_paging_size.$element, size);
 		},
-		
+
 		/**
 		 * sets whether the password changes per user should be enabled
 		 *
@@ -305,6 +309,15 @@ OCA = OCA || {};
 		},
 
 		/**
+		  * sets the default ppolicy attribute
+		  *
+		  * @param {string} attribute
+		  */
+		setDefaultPPolicyDN: function(attribute) {
+			this.setElementValue(this.managedItems.ldap_default_ppolicy_dn.$element, attribute);
+		},
+
+		/**
 		 * sets the email attribute
 		 *
 		 * @param {string} attribute