Changeset 478590

Timestamp:

12/21/2011 02:51:31 PM (14 years ago)

Author:

john ackers

Message:

add option to disable duplicate action check, tweak email templates

Location:

ecampaign/trunk

Files:

• EcampaignPetition.class.php (modified) (2 diffs)
• ecampaign-admin.php (modified) (9 diffs)

ecampaign/trunk/EcampaignPetition.class.php

@@ -150 +150 @@
     $fieldSet = $this->fieldSet;
 
-    $mailer = self::getPhpMailer();
-    $post = get_post($fieldSet->postID);
-    $mailer->Subject = !empty($post->post_title) ? $post->post_title : "Petition signed" ;
-    $mailer->From = $fieldSet->campaignEmail ;
-    $mailer->FromName = get_bloginfo("name");
-    $mailer->AddAddress($fieldSet->visitorEmail, $fieldSet->visitorName);
-
-
-    if ($this->log->recordExists(EcampaignLog::tSign, $fieldSet->visitorEmail, '', $fieldSet->postID))
+    if (get_option('ec_preventDuplicateActions'))
+      if ($this->log->recordExists(EcampaignLog::tSign, $fieldSet->visitorEmail, '', $fieldSet->postID))
     {
       $response = array("success" => false,
@@ -197 +190 @@
         $fieldSet->target = $recipient;
     }
-    if ($this->log->recordExists(EcampaignLog::tSend, $fieldSet->visitorEmail, $fieldSet->target, $fieldSet->postID))
+    if (get_option('ec_preventDuplicateActions'))
+      if ($this->log->recordExists(EcampaignLog::tSend, $fieldSet->visitorEmail, $fieldSet->target, $fieldSet->postID))
     {
       $response = array("success" => false,

ecampaign/trunk/ecampaign-admin.php

@@ -80 +80 @@
   __("This feature prevents emails being sent to the target organisation accidentally.
      Emails normally sent to campaign mailbox and friends are still sent."), '');
+
+  $adminFields[] = array('ec_preventDuplicateActions',
+  __("Prevent site visitor from sending an email or signing a petition more than once.
+  It is useful to disable when testing. "), 1);
 
   // copies of emails are sent here
@@ -140 +144 @@
 {friendSend}');
 
+  $tokenHelp = "Use %fieldname to include the value of a captured field. $fieldsHelp";
 
   $adminFields[] = array('ec_verificationEmailSubject',
-  __("Subject of email sent to site visitor with verification code."),
+  __("Subject of email sent to site visitor with verification code. $tokenHelp"),
   __("Verification code for ecampaign action."));
 
 
   $adminFields[] = array('ec_verificationEmailBody',
-  __("Body of email sent to site visitor with verification code."),
+  __("Body of email sent to site visitor with verification code. You should include %code and can include %permalink
+      (but the %permalink cannot be used to complete verification). $tokenHelp"),
   __("Dear %visitorName,
 
 Thank you for verifying your email address. Please enter %code in the original web page in order to send your email.
 
-You have received this email from the website at
-
+You have received this email from this webpage
+
+%subject at
 %permalink
 
@@ -159 +166 @@
 
   $adminFields[] = array('ec_confirmationEmailSubject',
-  __("Subject of email sent to site visitor to confirm name has been added to petition."),
-  __("Confirmation, your name has been added to a petition"));
+  __("Subject of email sent to site visitor to confirm name has been added to petition. $tokenHelp"),
+  __("Your name has been added to the petition"));
 
 
   $adminFields[] = array('ec_confirmationEmailBody',
-  __("Text of email sent to site visitor to confirm name has been added to petition."),
+  __("Text of email sent to site visitor to confirm name has been added to petition. You can include %permalink. $tokenHelp"),
   __("Dear %visitorName,
 
@@ -180 +187 @@
 
   $adminFields[] = array('ec_checkdnsrr',
-  __("Enable checking DNS records for the domain name when checking for a valid E-mail address. "), 'yes');
+  __("Enable checking DNS records for the domain name when checking for a valid E-mail address. "), 1);
 
   $captchaPresent = file_exists(WP_PLUGIN_DIR . get_option('ec_captchadir') . '/securimage.php') ;
@@ -196 +203 @@
   $adminFields[] = array('ec_subscriptionParams',
   __("Parameters passed to instance of class above. ") .
-  Ecampaign::help('#subscription'),'');
+  Ecampaign::help('#subscription'),'optin=checkbox1');
 
   $adminFields[] = array('ec_thirdPartyKey', __("Optional third party API Key used to lookup elected representatives. ") .
@@ -247 +254 @@
         </td>
         </tr>
-
-        <?php _renderInputField($prompt, $default, 'ec_campaignEmail') ?>
-
-        <?php _renderDualTextArea($prompt, $default, 'ec_layout', 26, 4) ?>
-        <?php _renderDualTextArea($prompt, $default, 'ec_petitionLayout', 20, 4) ?>
-        <?php _renderDualTextArea($prompt, $default, 'ec_friendsLayout', 6, 2) ?>
-
-        <?php _renderDualTextArea($prompt, $default, 'ec_verificationEmailSubject', 1) ?>
-        <?php _renderDualTextArea($prompt, $default, 'ec_verificationEmailBody', 4) ?>
-
-        <?php _renderDualTextArea($prompt, $default, 'ec_confirmationEmailSubject', 1) ?>
-        <?php _renderDualTextArea($prompt, $default, 'ec_confirmationEmailBody', 4) ?>
-
-        <?php _renderInputField($prompt, $default, 'ec_mailer') ?>
-
-        <tr valign="top">
-        <th scope="row"><?php echo $prompt["ec_checkdnsrr"] ?> </th>
-        <td><input type="checkbox" name="ec_checkdnsrr" value=1 <?php checked(get_option('ec_checkdnsrr'), 1); ?> /></td>
-        </tr>
-
-        <?php _renderInputField($prompt, $default, 'ec_captchadir') ?>
-
         <?php
+        _renderCheckbox($prompt, $default, 'ec_preventDuplicateActions');
+
+        _renderInputField($prompt, $default, 'ec_campaignEmail');
+
+        _renderDualTextArea($prompt, $default, 'ec_layout', 26, 4);
+        _renderDualTextArea($prompt, $default, 'ec_petitionLayout', 20, 4);
+        _renderDualTextArea($prompt, $default, 'ec_friendsLayout', 6, 2);
+
+        _renderDualTextArea($prompt, $default, 'ec_verificationEmailSubject', 1);
+        _renderDualTextArea($prompt, $default, 'ec_verificationEmailBody', 6);
+
+        _renderDualTextArea($prompt, $default, 'ec_confirmationEmailSubject', 1);
+        _renderDualTextArea($prompt, $default, 'ec_confirmationEmailBody', 6);
+
+        _renderInputField($prompt, $default, 'ec_mailer');
+        _renderCheckbox($prompt, $default, 'ec_checkdnsrr');
+
+        _renderInputField($prompt, $default, 'ec_captchadir');
 
         $listClassPath = get_option('ec_subscriptionClass');
@@ -320 +323 @@
   <tr valign="top">
   <th scope="row"><?php echo $prompt[$tname] ?> </th>
-  <td><input type="text" name="<?php echo $tname?>" size='35' value="<?php echo get_option($tname); ?>" />
+  <td><input type="text" name="<?php echo $tname?>" size='35' value="<?php echo get_option($tname,$default[$tname]); ?>" />
   <?php echo $msg ?></td>
   </tr>
@@ -326 +329 @@
 }
 
-
+function _renderCheckbox($prompt, $default, $tname)
+{
+  ?>
+  <tr valign="top">
+  <th scope="row"><?php echo $prompt[$tname] ?> </th>
+  <td><input type="checkbox" name="<?php echo $tname?>" value="1" <?php checked(get_option($tname,$default[$tname]), 1); ?> /></td>
+  </tr>
+  <?php
+}
 
 function _renderDualTextArea($prompt, $default, $tname, $rows, $other="")
@@ -337 +348 @@
   <tr valign="top">
   <td>default:<br/><textarea name="<?php echo $tname?>-d" rows=<?php echo "'$rows'" ?> cols='40' readonly='readonly'><?php echo  $default[$tname]; ?></textarea></td>
-  <td>current:<br/><textarea name="<?php echo $tname?>" rows=<?php echo "'$rows'" ?> cols='40'><?php echo get_option($tname); ?></textarea>
+  <td>current:<br/><textarea name="<?php echo $tname?>" rows=<?php echo "'$rows'" ?> cols='40'><?php echo get_option($tname, $default[$tname]); ?></textarea>
   <?php echo is_numeric($other) ? _analyzeTemplate(get_option($tname), $other) : $other ?></td>
   </tr>