FEATURE: make SubscriptionPage notification email UnsubscribeLink usi…

…ng AutoLoginHash ENHANCEMENT: if case no Member found, we still return an generic UnsubscibeLink for NewletterEmail (manually merged from r114346, not merged automatically during git migration)
sebastiand · Mar 9, 2011 · dd2e5a0 · dd2e5a0
1 parent efab19f
commit dd2e5a0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/code/email/NewsletterEmail.php b/code/email/NewsletterEmail.php
@@ -54,6 +54,8 @@ function UnsubscribeLink(){
 			} 
 			$nlTypeID = $this->nlType->ID; 
 			return Director::absoluteBaseURL() . "unsubscribe/index/".$member->AutoLoginHash."/$nlTypeID"; 
+		}else{
+			return Director::absoluteBaseURL() . "unsubscribe/index/";
 		}
 	}
 

diff --git a/code/pages/SubscriptionPage.php b/code/pages/SubscriptionPage.php
@@ -253,8 +253,15 @@ function doSubscribe($data, $form, $request){
 
 		if(!$member) {
 			$member = new Member();
-			$form->saveInto($member);
-			$member->write();
+		}
+		$form->saveInto($member);
+		$member->write();
+
+		if($member->AutoLoginHash){ 
+			$member->AutoLoginExpired = date('Y-m-d', time() + (86400 * 2)); 
+			$member->write(); 
+		}else{ 
+			$member->generateAutologinHash(); 
 		}
 
 		$newsletters = array();
@@ -307,7 +314,7 @@ function doSubscribe($data, $form, $request){
 			'FirstName' => $member->FirstName,
             'MemberInfoSection' => $emailableFields,
             'Newsletters' => new DataObjectSet( $newsletters ),
-            'UnsubscribeLink' => Director::baseURL() . 'unsubscribe/index/' . $member->Email
+            'UnsubscribeLink' => Director::baseURL() . 'unsubscribe/index/' . $member->AutoLoginHash
         );
 
 		if($this->SendNotification){
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,8 @@ function UnsubscribeLink(){ @@
     			}
     			$nlTypeID = $this->nlType->ID;
     			return Director::absoluteBaseURL() . "unsubscribe/index/".$member->AutoLoginHash."/$nlTypeID";
+    		}else{
+    			return Director::absoluteBaseURL() . "unsubscribe/index/";
     		}
     	}
@@ Expand Down @@