WordPress.org
Get WordPress

Plugin Directory

Changeset 770429


Ignore:
Timestamp:
09/11/2013 09:47:31 PM (13 years ago)
Author:
mailermailer
Message:

sync changes from github repo, specifically update to MM PHP API 1.0.4

Location:
mailermailer/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • mailermailer/trunk/class-mailermailer.php

    r760804 r770429  
    2626
    2727  // Plugin version, used for cache-busting of style and script file references.
    28   protected $version = '1.0.0';
     28  protected $version = '1.0.1';
    2929
    3030  // Unique identifier for your plugin.
    … …  
    208208
    209209  /**
    210   * Signup a subscriber based on the $_POST arguments recieved.
     210  * Signup a member based on the $_POST arguments recieved.
    211211  * Display success or error message based on the result.
    212212  *
    … …  
    218218  {
    219219    $formfields = get_option('mm_formfields_struct');
    220     $subscriber = array();
     220    $member = array();
    221221    $missing = array();
    222222    $message = '';
    … …  
    253253        $missing[ $name ] = $field['description'];
    254254      }
    255       $subscriber[ $field['fieldname'] ] = $user_input;
     255      $member[ $field['fieldname'] ] = $user_input;
    256256    }
    257257
    … …  
    262262      $mailapi = new MAILAPI_Client($opts_api['mm_apikey']);
    263263
    264       $added = $mailapi->addSubscriber($subscriber);
     264      $added = $mailapi->addMember($member);
    265265
    266266      if (MAILAPI_Error::isError($added)) {
    … …  
    274274      'message' => $message,
    275275      'missing' => $missing,
    276       'subscriber' => $subscriber,
     276      'member' => $member,
    277277    );
    278278  }

  • mailermailer/trunk/includes/mailermailer-api-php/MAILAPI_Client.php

    r760804 r770429  
    3535
    3636    /**
    37      * Returns the fields needed to populate an add subscriber form.
     37     * Returns the fields needed to create a list member or to create/populate a signup form.
    3838     *
    3939     * @return formfields_struct | MAILAPI_Error
    … …  
    4747
    4848    /**
    49      * Add the specified subscriber record to the account email list.
     49     * Add the specified member record to the account email list.
    5050     *
    51      * @param array   $subscriber a subscriber struct
     51     * @param array   $member a member struct
    5252     * @param boolean $send_invite flag to send double opt-in confirmation message, defaults to true
    5353     * @param boolean $send_welcome flag to send welcome message, defaults to false
    5454     * @return true | MAILAPI_Error
    5555     */
    56     public function addSubscriber($subscriber, $send_invite = true, $send_welcome = false)
     56    public function addMember($member, $send_invite = true, $send_welcome = false)
    5757    {
    58         $params                     = array();
    59         $params['subscriber']       = php_xmlrpc_encode($subscriber);
    60         $params['send_invite']      = php_xmlrpc_encode($send_invite);
    61         $params['send_welcome']     = php_xmlrpc_encode($send_welcome);
    62         $response = $this->mailapi_call->executeMethod('addSubscriber', $params);
     58        $params                   = array();
     59        $params['member']         = php_xmlrpc_encode($member);
     60        $params['send_invite']    = php_xmlrpc_encode($send_invite);
     61        $params['send_welcome']   = php_xmlrpc_encode($send_welcome);
     62        $response = $this->mailapi_call->executeMethod('addMember', $params);
    6363        return MAILAPI_Client::getResult($response);
    6464    }
    6565
    6666    /**
    67      * Unsubscribe the subscriber email address from the account email list.
     67     * Unsubscribe the email address from the account email list.
    6868     *
    69      * @param string $subscriber_email email of the subscriber to unsubscribe
     69     * @param string $user_email email of the member to unsubscribe
    7070     * @return true | MAILAPI_Error
    7171     */
    72     public function unsubSubscriber($subscriber_email)
     72    public function unsubMember($user_email)
    7373    {
    74         $params                       = array();
    75         $params['subscriber_email']   = php_xmlrpc_encode($subscriber_email);
    76         $response = $this->mailapi_call->executeMethod('unsubSubscriber', $params);
     74        $params                 = array();
     75        $params['user_email']   = php_xmlrpc_encode($user_email);
     76        $response = $this->mailapi_call->executeMethod('unsubMember', $params);
    7777        return MAILAPI_Client::getResult($response);
    7878    }
    79    
     79
    8080    /**
    8181     * Formats the response as necessary.

  • mailermailer/trunk/includes/mailermailer-api-php/config.php

    r760804 r770429  
    66define('MAILAPI_ENDPOINT', 'https://api.mailermailer.com/1.0/');
    77
    8 define('MAILAPI_VERSION', '1.0.3');
     8define('MAILAPI_VERSION', '1.0.4');
    99
    1010define ('MAILAPI_PARTNER', 'MM');

  • mailermailer/trunk/js/public.js

    r760804 r770429  
    2828    var missing = data.missing;
    2929    var message = data.message;
    30     var subscriber = data.subscriber;
     30    var member = data.member;
    3131    var check_message = new RegExp('class="mm_display_success"', 'i');
    3232   
    … …  
    3535
    3636    // highlight missing fields
    37     for (var field in subscriber) {
    38       if (subscriber.hasOwnProperty(field)) {
     37    for (var field in member) {
     38      if (member.hasOwnProperty(field)) {
    3939        var fieldname = 'mm_'+field;
    4040        var checkboxes = $('#'+fieldname+'_chbx');

  • mailermailer/trunk/mailermailer.php

    r760804 r770429  
    44Plugin URI: http://wordpress.org/extend/plugins/mailermailer/
    55Description: The mailermailer plugin allows you to add your own signup form to your site.
    6 Version: 1.0.0
     6Version: 1.0.1
    77Author: mailermailer
    88Author URI: http://www.mailermailer.com/api/

  • mailermailer/trunk/readme.txt

    r760866 r770429  
    11=== MailerMailer ===
    22Contributors: mailermailer
    3 Tags: mailermailer, email, newsletter, signup, marketing, plugin, widget, newsletter, forms, email marketing
     3Tags: mailermailer, email, newsletter, signup, marketing, plugin, widget, forms, email marketing
    44Requires at least: 3.5
    55Tested up to: 3.6
    6 Stable tag: 1.0.0
     6Stable tag: 1.0.1
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    68683. Add the signup form to your site!
    6969
     70== Upgrade Notice ==
     71
     72= 1.0.1 =
     73* Update mailermailer-api-php wrapper to version 1.0.4
     74
    7075== Changelog ==
     76
     77= 1.0.1 =
     78* Update mailermailer-api-php wrapper to version 1.0.4
    7179
    7280= 1.0.0 =
Note: See TracChangeset for help on using the changeset viewer.