Ripped out a bunch of unneeded stuff.

Author: roemerd

ModuleConfig.cfc

@@ -24,8 +24,6 @@ component {
 		settings = {
 			// default containers and classes for the html helper form elements
 			htmlHelper = { groupWrapper = "", groupWrapperClass = "", labelWrapper = "", labelWrapperClass = "", label = "", labelClass = "", helpWrapper = "", helpWrapperClass = "", wrapper = "" , wrapperClass = "" },
-			// get your keys at https://www.google.com/recaptcha/admin/create
-			reCAPTCHA = { publicKey = "", privateKey = "" }
 		};
 
 		// SES Routes

handlers/HTMLHelper.cfc

@@ -14,15 +14,9 @@ component{
 		// get module root
 		prc.moduleRoot = event.getModuleRoot( "contentbox-membersection" );
 
-		// if data isn't setup, redirect user
-		// if( !FormSubmissionService.isDataSetup() && event.getCurrentEvent() NEQ "contentbox-membersection:form.noDataSetup") {
-		// 	setNextEvent("cbMemberSection.form.noDataSetup");
-		// }
-
 		// exit points
 		prc.xehMembers = "cbMemberSection.member.index";
 		prc.xehMemberEditor = "cbMemberSection.member.editor";
-		//prc.xehMemberSettings = "cbMemberSection.settings.index";
 
 		//check login and redirect is needed.
 		if(!prc.oCurrentAuthor.isLoaded()){

handlers/base.cfc

@@ -13,34 +13,17 @@ component extends="base" {
 	}
 
 
-	// slugify remotely
-	// function slugify(event,rc,prc){
-	// 	event.renderData(data=getInstance("HTMLHelper@coldbox").slugify( rc.slug ),type="plain");
-	// }
-
-
 	// member editor
 	function editor(event,rc,prc){
 		// exit handlers
 		prc.xehMembersave 		= "cbMemberSection.member.save";
-		//prc.xehSlugify	  		= "cbMemberSection.member.slugify";
 
 		// get new or persisted member
 		prc.member  = memberService.get( event.getValue("memberID",0) );
 
 		//repopulate member form failed save
 		memberService.populate(prc.member,rc);
 
-		// viewlets
-		// prc.fieldsViewlet = "";
-		// if( prc.form.isLoaded() ){
-		// 	var args = {memberID=rc.memberID};
-		// 	prc.fieldsViewlet = runEvent(event="contentbox-membersection:form.fields",eventArguments=args);
-		// }
-
-		// Editor
-		//prc.tabForms_editor = true;
-
 		// view
 		event.setView("member/editor");
 	}
@@ -51,12 +34,25 @@ component extends="base" {
 
 		// get it and populate it
 		var oMember = populateModel( memberService.get(id=rc.memberID) );
-
+		if(!oMember.isLoaded()){
+			oMember.updatePassword();
+		}
 		// validate it
 		var errors = oMember.validate();
-		if( !arrayLen(errors) ){
+		// create criteria for uniqueness
+		var c = memberService.newCriteria()
+			.isEq( "email", rc.email );
+
+		// Existing user, don't include it in the check
+		if( oMember.isLoaded() ) {
+			c.ne( "memberID", javacast("int",rc.memberID) );
+		}
+		if(c.count() GT 0){
+			arrayAppend(errors,'Email must be unique.');
+		}
+		if( !arrayLen(errors) && c.count() EQ 0 ){
 			// save content
-			memberService.save( oMember );
+			memberService.save(oMember);
 			// Message
 			getInstance("messageBox@cbMessageBox").info("Member saved! Now you are happy!");
 			setNextEvent(event='cbMemberSection.member.index',queryString="memberID=#oMember.getMemberID()#");

handlers/member.cfc

@@ -9,9 +9,8 @@ component persistent="true" table="cb_member"{
 	// Properties
 	property name="firstName" notnull="true" length="200";
 	property name="lastName" notnull="true" length="200";
-	property name="email" notnull="true" length="255" index="idx_email";
-	property name="username" notnull="true" length="100" unique="true" index="idx_login";
-	property name="password" notnull="true" length="100" unique="true" index="idx_login";
+	property name="email" notnull="true" length="255" unique="true" index="idx_email,idx_login";
+	property name="password" notnull="true" length="100" index="idx_login";
 	property name="isActive" notnull="true" ormtype="boolean" default="false" dbdefault="0" index="idx_login,idx_active";
 	property name="lastLogin" notnull="false" ormtype="timestamp";
 	property name="createdDate" notnull="true" ormtype="timestamp" update="false";
@@ -29,7 +28,7 @@ component persistent="true" table="cb_member"{
 	* is loaded?
 	*/
 	boolean function isLoaded(){
-		return len( getMemberID() );
+		return len( this.getMemberID() );
 	}
 
 	/*
@@ -42,26 +41,22 @@ component persistent="true" table="cb_member"{
 		firstName			= left(firstName,200);
 		lastName			= left(lastName,200);
 		email				= left(email,255);
-		username			= left(username,100);
 		password			= left(password,100);
 
 		// Required
 		if( !len(firstName) ){ arrayAppend(errors, "First Name is required"); }
 		if( !len(lastName) ){ arrayAppend(errors, "Last Name is required"); }
 		if( !len(email) ){ arrayAppend(errors, "Email is required"); }
-		if( !len(username) ){ arrayAppend(errors, "Username is required"); }
 		if( !len(password) ){ arrayAppend(errors, "Password is required"); }
 		if( !len(isActive) ){ arrayAppend(errors, "Is Active is required"); }
 
 		return errors;
 	}
 
-	function saveMember(passwordChange=false){
+	function updatePassword(){
 		// hash password if new member
-		if( !this.isLoaded() OR arguments.passwordChange ){
-			this.setPassword( hash(this.getPassword(), "SHA-256") );
-		}
-		// save the member
-		save( member );
+		this.setPassword( hash(this.getPassword(), "SHA-256") );
+
 	}
+
 }

handlers/settings.cfc

@@ -26,7 +26,6 @@
 								#html.startForm(name="memberForm",action=prc.xehMembersave,novalidate="novalidate")#
 									#html.startFieldset(legend="Member Details")#
 										#html.hiddenField(name="memberID",bind=prc.member)#
-										<!--- #html.hiddenField(name="sluggerURL",value=event.buildLink(prc.xehSlugify))# --->
 										<!--- Fields --->
 										<div class="form-group">
 											#html.textField(name="firstName",bind=prc.member,label="*First Name:",required="required",class="form-control")#
@@ -36,17 +35,14 @@
 											#html.textField(name="lastName",bind=prc.member,label="*Last Name:",required="required",class="form-control")#
 										</div>
 
-										<div class="form-group">
-											#html.textField(name="username",bind=prc.member,label="*Username:",required="required",class="form-control")#
-										</div>
-
 										<div class="form-group">
 											#html.textField(name="email",bind=prc.member,label="*Email Address:",required="required",class="form-control")#
 										</div>
-
-										<div class="form-group">
-											#html.textField(name="password",bind=prc.member,label="*Password:",required="required",class="form-control")#
-										</div>
+										<cfif !len(prc.member.getMemberID())>
+											<div class="form-group">
+												#html.textField(name="password",bind=prc.member,label="*Password:",required="required",class="form-control")#
+											</div>
+										</cfif>
 
 										<div class="form-actions">
 											<button class="btn" onclick="return to('#event.buildLink(prc.xehMembers)#')">Cancel</button>