Changeset 1469692

Timestamp:

08/08/2016 01:14:27 AM (8 years ago)

Author:

jbrinley

Message:

Version 1.1.1 - subscription management

Location:

mailgun-subscriptions/trunk

Files:

• Mailgun_Subscriptions/API.php (modified) (2 diffs)
• Mailgun_Subscriptions/Account_Management_Hash.php (added)
• Mailgun_Subscriptions/Account_Management_Page.php (added)
• Mailgun_Subscriptions/Account_Management_Page_Authenticator.php (added)
• Mailgun_Subscriptions/Account_Management_Subscription_Request_Handler.php (added)
• Mailgun_Subscriptions/Account_Management_Token_Email.php (added)
• Mailgun_Subscriptions/Account_Management_Token_Request_Handler.php (added)
• Mailgun_Subscriptions/Admin_Page.php (modified) (5 diffs)
• Mailgun_Subscriptions/Confirmation_Handler.php (modified) (2 diffs)
• Mailgun_Subscriptions/Plugin.php (modified) (6 diffs)
• Mailgun_Subscriptions/Shortcode_Handler.php (modified) (2 diffs)
• Mailgun_Subscriptions/Submission_Handler.php (modified) (1 diff)
• Mailgun_Subscriptions/Subscription_Form.php (modified) (1 diff)
• Mailgun_Subscriptions/Suppressions.php (added)
• Mailgun_Subscriptions/Template.php (modified) (2 diffs)
• Mailgun_Subscriptions/Widget.php (modified) (1 diff)
• assets/mailgun-subscriptions.css (modified) (1 diff)
• languages/mailgun-subscriptions-it.mo (added)
• languages/mailgun-subscriptions-it.po (added)
• mailgun-subscriptions.php (modified) (1 diff)
• readme.md (modified) (4 diffs)
• readme.txt (modified) (2 diffs)

mailgun-subscriptions/trunk/Mailgun_Subscriptions/API.php

@@ -8 +8 @@
     private $key = '';
     private $url = '';
-    public function __construct( $apiKey, $apiEndpoint = "api.mailgun.net", $apiVersion = "v2", $ssl = true ) {
+    public function __construct( $apiKey, $apiEndpoint = "api.mailgun.net", $apiVersion = "v", $ssl = true ) {
         $this->key = $apiKey;
         $this->url = $this->build_base_url( $apiEndpoint, $apiVersion, $ssl );
@@ -45 +45 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     public function validate_email( $address ) {
         $response = $this->get( 'address/validate', array(

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Admin_Page.php

@@ -8 +8 @@
 class Admin_Page {
     const MENU_SLUG = 'mailgun_subscriptions';
+
 
     public function refresh_caches() {
@@ -150 +151 @@
         );
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         register_setting(
             self::MENU_SLUG,
@@ -159 +178 @@
             'mailgun_new_list',
             array( $this, 'save_new_list' )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         );
     }
@@ -199 +238 @@
         $value = get_option( $args['option'], $args['default'] );
         printf( '<textarea rows="%s" cols="%s" name="%s" class="widefat">%s</textarea>', intval($args['rows']), intval($args['cols']), esc_attr($args['option']), esc_textarea($value) );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         if ( !empty($args['description']) ) {
             printf( '<p class="description">%s</p>', $args['description'] );
@@ -359 +414 @@
         $description = __("This email will be sent to users after they confirm their subscription. Leave blank to disable this email. Your template can contain the following shortcodes:<br />
             <code>[email]</code> &ndash; This is the user's email address.<br />
-            <code>[lists]</code> &ndash; This is a list of the lists the user opted to subscribe to.", 'mailgun-subscriptions' );
+            <code>[lists]</code> &ndash; This is a list of the lists the user opted to subscribe to.<br />
+            <code>[link]</code> &ndash; This is the URL to the user's account management page.", 'mailgun-subscriptions' );
         return $description;
+
+
+
+
+
+
+
+
+
+
     }
 }

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Confirmation_Handler.php

@@ -99 +99 @@
         $message = str_replace( '[email]', $this->confirmation->get_address(), $message );
         $message = str_replace( '[lists]', $this->get_formatted_lists(), $message );
+
         return $message;
     }
@@ -117 +118 @@
         }
         return apply_filters( 'mailgun_welcome_email_lists', implode("\n", $formatted), $requested_lists );
+
+
+
+
+
     }
 

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Plugin.php

@@ -6 +6 @@
 
 class Plugin {
-    const VERSION = '1.0';
+    const VERSION = '1.';
 
     /** @var Plugin */
@@ -24 +24 @@
     /** @var Shortcode_Handler */
     private $shortcode_handler = NULL;
+
+
+
+
+
+
+
+
+
 
     public function api( $public = FALSE ) {
@@ -49 +58 @@
     }
 
+
+
+
+
+
+
+
+
     private function setup( $plugin_file ) {
         self::$plugin_file = $plugin_file;
@@ -60 +77 @@
 
         if ( !is_admin() ) {
-            if ( !empty($_POST['mailgun-action']) && $_POST['mailgun-action'] == 'subscribe' ) {
-                $this->setup_submission_handler();
+            if ( !empty( $_REQUEST[ 'mailgun-action' ] ) ) {
+                switch( $_REQUEST[ 'mailgun-action' ] ) {
+                    case 'subscribe':
+                        $this->setup_submission_handler();
+                        break;
+                    case 'confirm':
+                        $this->setup_confirmation_handler();
+                        break;
+                    case 'request-token':
+                        $this->setup_token_request_handler();
+                        break;
+                    case 'account-subscribe':
+                    case 'account-resubscribe':
+                    case 'account-unsubscribe':
+                        $this->setup_account_management_handler();
+                        break;
+                }
             }
-            if ( !empty($_GET['mailgun-action']) && $_GET['mailgun-action'] == 'confirm' ) {
-                $this->setup_confirmation_handler();
-            }
-
             add_action( 'wp', array( $this, 'setup_confirmation_page' ), 10, 0 );
         }
@@ -76 +104 @@
         $this->setup_widget();
         $this->setup_shortcodes();
+
         add_action( 'mailgun_enqueue_assets', array( $this, 'enqueue_assets' ), 10, 0 );
     }
@@ -127 +156 @@
         $this->shortcode_handler = new Shortcode_Handler();
         $this->shortcode_handler->register_shortcodes();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Shortcode_Handler.php

@@ -10 +10 @@
         add_shortcode( 'mailgun_lists', array( $this, 'lists_shortcode' ) );
         add_shortcode( 'mailgun_subscription_form', array( $this, 'form_shortcode' ) );
+
     }
 
@@ -85 +86 @@
         return array_keys($lists);
     }
+
+
+
+
+
 } 

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Submission_Handler.php

@@ -186 +186 @@
     protected function get_redirect_base_url() {
         $url = $_SERVER['REQUEST_URI'];
-        foreach ( array('mailgun-message', 'mailgun-error', 'mailgun-action', 'ref') as $key ) {
-            $url = remove_query_arg('key', $url);
+        foreach ( array('mailgun-message', 'mailgun-error', 'mailgun-action', 'ref') as $key ) {
+            $url = remove_query_arg();
         }
         return $url;

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Subscription_Form.php

@@ -71 +71 @@
                 break;
             default:
-                $message = $code;
+                $message = ;
                 break;
         }

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Template.php

@@ -11 +11 @@
 
     public static function welcome_email() {
-        return __("Your email address, [email], has been confirmed. You are now subscribed to the following lists:\n\n[lists]", 'mailgun-subscriptions');
+        return __("Your email address, [email], has been confirmed. You are now subscribed to the following lists:\n\n[lists]", 'mailgun-subscriptions');
     }
 
@@ -17 +17 @@
         return __("<p>Thank you for confirming your subscription. <strong>[mailgun_email]</strong> is now subscribed to:</p>[mailgun_lists]", 'mailgun-subscriptions');
     }
+
+
+
+
 }

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Widget.php

@@ -38 +38 @@
             'lists' => $instance['lists'],
         ));
+
+
+
+
+
+
+
+
 
         echo $args['after_widget'];

mailgun-subscriptions/trunk/assets/mailgun-subscriptions.css

@@ -23 +23 @@
     color: #CC0000;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

mailgun-subscriptions/trunk/mailgun-subscriptions.php

@@ -6 +6 @@
 Author: Flightless
 Author URI: http://flightless.us/
-Version: 1.0
+Version: 1.
 Text Domain: mailgun-subscriptions
 Domain Path: /languages

mailgun-subscriptions/trunk/readme.md

@@ -8 +8 @@
 
 You'll find the "Mailgun Lists" settings page in the Settings admin menu. Here, you can setup your API keys, control which lists you're making available, and create custom descriptions for your lists.
+
+
 
 ## Subscription Form Widget
@@ -36 +38 @@
 ### Confirmation Email
 
-You can set up templates for two emails the plugin will send.
+You can set up templates for t emails the plugin will send.
 
 When a user first submits the subscription form, the "Confirmation Email" is sent. Your template should contain the following shortcodes:
@@ -58 +60 @@
 * `[email]` - This is the user's email address.
 * `[lists]` - This is a list of the lists the user opted to subscribe to.
+
 
 #### Filters
@@ -66 +69 @@
 
 `mailgun_welcome_email_lists` - Edit the list of mailing lists in the email template.
+
+
+
+
+
+
+
+
+
+
+
+
 
 ## Confirmation Page

mailgun-subscriptions/trunk/readme.txt

@@ -3 +3 @@
 Tags: mailing lists, subscriptions, widget, email
 Requires at least: 3.9
-Tested up to: 3.9
-Stable tag: 1.0
+Tested up to: 
+Stable tag: 1.
 License: BSD 3-Clause
 License URI: http://opensource.org/licenses/BSD-3-Clause
@@ -21 +21 @@
 == Changelog ==
 
+
+
+
+
 = 1.0 =
 * Initial version