diff --git a/mcc.module b/mcc.module index 366dcec..59ea7a0 100644 --- a/mcc.module +++ b/mcc.module @@ -55,7 +55,7 @@ function mcc_menu() { $items['mailchimp-campaign/%mcc/send-test/%'] = array( 'title' => 'Send campaign test', 'page callback' => 'drupal_get_form', - 'page arguments' => array('mcc_send_campaign_test_form', 1), + 'page arguments' => array('mcc_send_test_campaign_form', 1), 'access callback' => 'mcc_menu_operations_access', 'access arguments' => array(3, 'send mailchimp campaign'), 'type' => MENU_CALLBACK, @@ -114,7 +114,7 @@ function mcc_menu_operations($campaign, $op) { mcc_update_campaign($campaign->cid); break; case 'send-test': - mcc_send_campaign_test($campaign); + mcc_send_test_campaign($campaign); break; case 'send': mcc_send($campaign->cid); @@ -312,7 +312,7 @@ function theme_mcc_actions($variables) { $items[] = l(t('Delete'), 'mailchimp-campaign/' . $cid . '/delete/' . drupal_get_token('mcc'), $destination); } $items[] = l(t('Update'), 'mailchimp-campaign/' . $cid . '/update/' . drupal_get_token('mcc', $destination)); - $items[] = l(t('Send campaign test'), 'mailchimp-campaign/' . $cid . '/send-test/' . drupal_get_token('mcc', $destination)); + $items[] = l(t('Send test campaign'), 'mailchimp-campaign/' . $cid . '/send-test/' . drupal_get_token('mcc', $destination)); if ($data['status'] == 'save') { $items[] = l(t('Send'), 'mailchimp-campaign/' . $cid . '/send/' . drupal_get_token('mcc', $destination)); } @@ -361,7 +361,7 @@ function mcc_create_form($form, &$form_state) { ); if (user_access('administer mailchimp')) { mcc_settings_form($form, $defaults); - // no need test email for _this_ campaign. you have to add it on the node type page. + // Can't set up test recipient for a campaign. $form['mcc']['test_recipient_email']['#access'] = 0; } $form['mcc']['create'] = array( @@ -555,7 +555,7 @@ function mcc_send($cid) { /** * Send MailChimp campaign test email - confirm form */ -function mcc_send_campaign_test_form($form, &$form_state) { +function mcc_send_test_campaign_form($form, &$form_state) { $campaign = $form_state['build_info']['args'][0]; $form['info'] = array( @@ -575,7 +575,7 @@ function mcc_send_campaign_test_form($form, &$form_state) { /** * Send test campaign */ -function mcc_send_campaign_test_form_submit($form, &$form_state) { +function mcc_send_test_campaign_form_submit($form, &$form_state) { $campaign = $form_state['build_info']['args'][0]; $campaign_node = node_load($campaign->nid); @@ -589,16 +589,15 @@ function mcc_send_campaign_test_form_submit($form, &$form_state) { } if (!empty($campaign_settings['test_recipient_email'])) { - // sending test campaign mail $mcapi = mailchimp_get_api_object(); $emails = array($campaign_settings['test_recipient_email']); - // Send test campaign. + // Sends test campaign. $sent = $mcapi->campaignSendTest($campaign->cid, $emails); if ($mcapi->errorCode) { // Display and log error, if any. - $message = 'MailChimp error. The campaign test was not sent.'; + $message = 'MailChimp error. The test campaign was not sent.'; _mcc_mcapi_error_message($mcapi, $message); } else {