Skip to content

Commit

Permalink
Remove CAN-SPAM section. See: wpsharks/comment-mail#122.
Browse files Browse the repository at this point in the history
  • Loading branch information
kristineds committed Jul 23, 2015
1 parent 5ea032e commit d182a2f
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions comment-mail-pro/includes/classes/menu-page.php
Expand Up @@ -260,8 +260,6 @@ protected function options_()

/* ----------------------------------------------------------------------------------------- */

$_panel_body = '<p>'.sprintf(__('The %1$s, is a law that sets the rules for commercial email, establishes requirements for commercial messages, gives recipients the right to have you stop emailing them, and spells out tough penalties for violations. Among other things, the CAN-SPAM Act says that each message must include your valid physical postal address. This can be your current street address, a post office box you’ve registered with the U.S. Postal Service, or a private mailbox you\'ve registered with a commercial mail receiving agency established under Postal Service regulations. For further details, please see: %2$s.', $this->plugin->text_domain), $this->plugin->utils_markup->x_anchor('http://comment-mail.com/r/can-spam-act/', __('CAN-SPAM Act', $this->plugin->text_domain)), $this->plugin->utils_markup->x_anchor('http://comment-mail.com/kb-article/can-spam-compliance/', __('CAN-SPAM Compliance', $this->plugin->text_domain))).'</p>';

$_panel_body .= '<table>'.
' <tbody>'.
$form_fields->input_row(
Expand All @@ -280,12 +278,12 @@ protected function options_()
' <tbody>'.
$form_fields->textarea_row(
array(
'label' => sprintf(__('Mailing Address (Required for %1$s)', $this->plugin->text_domain), $this->plugin->utils_markup->x_anchor('http://comment-mail.com/kb-article/can-spam-compliance/', __('CAN-SPAM Compliance', $this->plugin->text_domain))),
'label' => sprintf(__('Mailing Address', $this->plugin->text_domain), $this->plugin->utils_markup->x_anchor('http://comment-mail.com/kb-article/can-spam-compliance/', __('CAN-SPAM Compliance', $this->plugin->text_domain))),
'placeholder' => __('e.g., 123 Somewhere Street; Somewhere, USA 99999', $this->plugin->text_domain),
'cm_mode' => 'text/html', 'cm_height' => 150,
'name' => 'can_spam_mailing_address',
'current_value' => $current_value_for('can_spam_mailing_address'),
'notes_before' => '<p class="pmp-note pmp-notice">'.sprintf(__('Please be sure to provide a mailing address that %1$s can include at the bottom of every email that it sends. This is required for %2$s.', $this->plugin->text_domain), esc_html($this->plugin->name), $this->plugin->utils_markup->x_anchor('http://comment-mail.com/kb-article/can-spam-compliance/', __('CAN-SPAM Compliance', $this->plugin->text_domain))).'</p>',
'notes_before' => '<p class="pmp-note pmp-notice">'.sprintf(__('Please be sure to provide a mailing address that %1$s can include at the bottom of every email that it sends', $this->plugin->text_domain), esc_html($this->plugin->name), $this->plugin->utils_markup->x_anchor('http://comment-mail.com/kb-article/can-spam-compliance/', __('CAN-SPAM Compliance', $this->plugin->text_domain))).'</p>',
'notes_after' => '<p class="pmp-note pmp-info">'.__('<strong>Note:</strong> this needs to be provided in HTML format please. For line breaks please use: <code>&lt;br /&gt;</code>', $this->plugin->text_domain).'</p>',
)).
' </tbody>'.
Expand All @@ -305,7 +303,7 @@ protected function options_()
' </tbody>'.
'</table>';

echo $this->panel(__('CAN-SPAM Compliance', $this->plugin->text_domain), $_panel_body, array());
echo $this->panel(__('Postmaster / Contact Info', $this->plugin->text_domain), $_panel_body, array());

unset($_panel_body); // Housekeeping.

Expand Down

0 comments on commit d182a2f

Please sign in to comment.