Changeset 1308

Timestamp:

09/25/08 20:53:57 (4 years ago)

Author:

roberto

Message:

resolved issue with unsubscribe key

Files:

• Trunk/TurtolCMS/Newsletter/__init__.py (modified) (6 diffs)

Trunk/TurtolCMS/Newsletter/__init__.py

@@ -107 +107 @@
       self._email = self.RetrieveEmail(ctx, confirmkey, fields)
       self._subscriber = self.RetrieveSubscriber(ctx, fields)
-
     self.curs.close()
 
@@ -303 +302 @@
 
   def LoadNlDataFromCtx (self, ctx):
-    self.SetHdfValue ('subscriber', ctx.GetReqData('subscriber'))
+    EmailAcct = ctx.GetReqData('EmailAcct')
+    self.SetHdfValue ('EmailAcct', EmailAcct)
+    self.SetHdfValue ('Email', EmailAcct.Email())
+    self.SetHdfValue ('key', EmailAcct._email.get('confirmkey'))
     self.SetHdfValue ('newsletter', ctx.GetReqData('newsletter'))
     self.SetHdfValue ('ctx.baseurl', ctx.BaseURL())
     self.SetHdfValue ('ctx.page', ctx.Uri())
 
-  def LoadSubscriberData (self, s):
-    self.SetHdfValue ('subscriber', s)
-    self.SetHdfValue ('newsletter', s.newsletter)
+  def LoadSubscriberData (self, EmailAcct):
+    self.SetHdfValue ('Email', EmailAcct.Email())
+    self.SetHdfValue ('EmailAcct', EmailAcct)
+    self.SetHdfValue ('key', EmailAcct._email.get('confirmkey'))
+    self.SetHdfValue ('newsletter', EmailAcct.newsletter)
   
   def UpdateAttr (self, context, fields, passedParams=None):
@@ -370 +374 @@
     <h2 class="tcms_nl_h2">Error sending confirmation Newsletter</h2>
     <p class="tcms_nl_p">We're sorry, but we couldn't send an e-mail to the address
-    you provided, <em><?cs var:subscriber.email ?></em>.  Either we're experiencing
+    you provided, <em><?cs var:EmailAcct ?></em>.  Either we're experiencing
     some temporary technical difficulties, or you may have mistyped your e-mail 
     address.  Please try again.
@@ -383 +387 @@
     self.data = '''<div class="tcms_application">
     <h2 class="tcms_nl_h2">Confirmation Sent</h2>
-    <p class="tcms_nl_p">Thank you for your interest in the <?cs var:newsletter.title ?> list.
+    <p class="tcms_nl_p">Thank you for your interest in the <span class="tcms_nl_title">
+    <?cs var:newsletter.title ?></span> list.
     In order to confirm that your e-mail address is correct (and to prevent others from 
     subscribing you to this list without your consent), we have sent an e-mail to
-    <em><?cs var: subscriber._email.email ?></em> with a confirmation code in it.  When you get 
+    <em><?cs var: Email ?></em> with a confirmation code in it.  When you get 
     that e-mail, please click on the link indicated (or, to be even more secure, copy 
     and paste it into your browser's address bar).
@@ -405 +410 @@
     <h2 class="tcms_nl_h2"></h2>
     <p class="tcms_nl_p">Thank you for your interest in the <?cs var:newsletter.title ?> list.
-    However, It seems that the e-mail address <em><?cs var: subscriber._email.email ?></em> is already
+    However, It seems that the e-mail address <em><?cs var: Email ?></em> is already
     singed up for the <?cs var:newsletter.title ?> list.
     </p><p class="tcms_nl_p">
@@ -485 +490 @@
       by <a href="<?cs var:ctx.baseurl ?><?cs 
         var:newsletter_manager_page?>/<?cs var:newsletter.name ?>/unsubscribe/<?cs 
-        var:subscriber._email.confirmkey ?>">Clicking Here</a> or by replying to this email 
+        var:key ?>">Clicking Here</a> or by replying to this email 
         with the word UNSUBSCRIBE in the subject line.
       </p>