yikesinc /
yikes-inc-easy-mailchimp-extender
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | wp_send_json_error( '1' ); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - $form_id = isset( $_POST['form_id'] ) ? filter_var( wp_unslash( $_POST['form_id'] ), FILTER_SANITIZE_NUMBER_INT ) : ''; |
|
| 43 | + $form_id = isset( $_POST[ 'form_id' ] ) ? filter_var( wp_unslash( $_POST[ 'form_id' ] ), FILTER_SANITIZE_NUMBER_INT ) : ''; |
|
| 44 | 44 | |
| 45 | 45 | if ( empty( $form_id ) ) { |
| 46 | 46 | wp_send_json_error( '1' ); |
@@ -75,12 +75,12 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | $locale = get_locale(); |
| 77 | 77 | $locale_a = explode( '_', $locale ); |
| 78 | - $locale = isset( $locale_a[0] ) ? $locale_a[0] : $locale; |
|
| 78 | + $locale = isset( $locale_a[ 0 ] ) ? $locale_a[ 0 ] : $locale; |
|
| 79 | 79 | $return = apply_filters( 'yikes_mailchimp_recaptcha_data', array( |
| 80 | 80 | 'site_key' => $site_key, |
| 81 | 81 | 'secret_key' => $secret_key, |
| 82 | 82 | 'locale' => $locale, |
| 83 | - )); |
|
| 83 | + ) ); |
|
| 84 | 84 | |
| 85 | 85 | wp_send_json_success( $return ); |
| 86 | 86 | } |
@@ -46,11 +46,11 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | // Convert the integration type to a list ID. |
| 48 | 48 | $checkbox_options = get_option( 'optin-checkbox-init', '' ); |
| 49 | - if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
|
|
| 49 | + if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ][ 'associated-list' ] ) ) {
|
|
| 50 | 50 | return false; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - $list_ids = $checkbox_options[ $type ]['associated-list']; |
|
| 53 | + $list_ids = $checkbox_options[ $type ][ 'associated-list' ]; |
|
| 54 | 54 | $list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids ); |
| 55 | 55 | |
| 56 | 56 | // Go through each list... |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | $data = $response->get_error_data(); |
| 85 | 85 | |
| 86 | 86 | // If the error response is a 404, they are not subscribed. |
| 87 | - if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
|
|
| 87 | + if ( isset( $data[ 'status' ] ) && 404 === (int) $data[ 'status' ] ) {
|
|
| 88 | 88 | return false; |
| 89 | 89 | } else {
|
| 90 | 90 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | // Look at the status from the API. |
| 103 | - $subscribed = 'subscribed' === $response['status']; |
|
| 103 | + $subscribed = 'subscribed' === $response[ 'status' ]; |
|
| 104 | 104 | |
| 105 | 105 | return apply_filters( 'yikes-mailchimp-integration-is-user-subscribed', $subscribed, $type ); |
| 106 | 106 | } |
@@ -114,12 +114,12 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | // Get our options. |
| 116 | 116 | $checkbox_options = get_option( 'optin-checkbox-init', array() ); |
| 117 | - $has_list_ids = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list']; |
|
| 118 | - $has_list_ids = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true ); |
|
| 117 | + $has_list_ids = isset( $checkbox_options[ $this->type ][ 'associated-list' ] ) && '-' !== $checkbox_options[ $this->type ][ 'associated-list' ]; |
|
| 118 | + $has_list_ids = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ][ 'associated-list' ], true ); |
|
| 119 | 119 | |
| 120 | 120 | if ( $has_list_ids ) {
|
| 121 | - $label = isset( $checkbox_options[ $this->type ]['label'] ) && ! empty( $checkbox_options[ $this->type ]['label'] ) ? trim( $checkbox_options[ $this->type ]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 122 | - $checked = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : ''; |
|
| 121 | + $label = isset( $checkbox_options[ $this->type ][ 'label' ] ) && ! empty( $checkbox_options[ $this->type ][ 'label' ] ) ? trim( $checkbox_options[ $this->type ][ 'label' ] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 122 | + $checked = 'true' === $checkbox_options[ $this->type ][ 'precheck' ] ? 'checked="checked"' : ''; |
|
| 123 | 123 | $before = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' ); |
| 124 | 124 | $content = '<p id="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox" class="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox">'; |
| 125 | 125 | $content .= '<label>'; |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $options = get_option( 'optin-checkbox-init', '' ); |
| 149 | 149 | |
| 150 | 150 | // Make sure we have a list ID. |
| 151 | - if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {
|
|
| 151 | + if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ][ 'associated-list' ] ) ) {
|
|
| 152 | 152 | // @todo: Throw some kind of error? |
| 153 | 153 | return; |
| 154 | 154 | } |
@@ -156,14 +156,14 @@ discard block |
||
| 156 | 156 | $email = sanitize_email( $email ); |
| 157 | 157 | |
| 158 | 158 | // Check for an IP address. |
| 159 | - $user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] ); |
|
| 160 | - if ( isset( $merge_vars['OPTIN_IP'] ) ) {
|
|
| 161 | - $user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] ); |
|
| 159 | + $user_ip = sanitize_text_field( $_SERVER[ 'REMOTE_ADDR' ] ); |
|
| 160 | + if ( isset( $merge_vars[ 'OPTIN_IP' ] ) ) {
|
|
| 161 | + $user_ip = sanitize_text_field( $merge_vars[ 'OPTIN_IP' ] ); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | // Build our request data. |
| 165 | - $list_ids = $options[ $type ]['associated-list']; |
|
| 166 | - $list_ids = is_array( $options[ $type ]['associated-list'] ) ? $options[ $type ]['associated-list'] : array( $options[ $type ]['associated-list'] ); |
|
| 165 | + $list_ids = $options[ $type ][ 'associated-list' ]; |
|
| 166 | + $list_ids = is_array( $options[ $type ][ 'associated-list' ] ) ? $options[ $type ][ 'associated-list' ] : array( $options[ $type ][ 'associated-list' ] ); |
|
| 167 | 167 | $id = md5( $email ); |
| 168 | 168 | $data = array( |
| 169 | 169 | 'email_address' => $email, |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | |
| 176 | 176 | foreach ( $list_ids as $list_id ) {
|
| 177 | 177 | |
| 178 | - $interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array(); |
|
| 178 | + $interests = isset( $options[ $type ][ 'interest-groups' ] ) ? $options[ $type ][ 'interest-groups' ] : array(); |
|
| 179 | 179 | $interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests; |
| 180 | 180 | |
| 181 | 181 | // Only re-format and add interest groups if not empty. |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | - $data['interests'] = $groups; |
|
| 194 | + $data[ 'interests' ] = $groups; |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | /** |
@@ -217,8 +217,8 @@ discard block |
||
| 217 | 217 | $list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type ); |
| 218 | 218 | |
| 219 | 219 | // Don't send an empty merge fields array. |
| 220 | - if ( empty( $data['merge_fields'] ) ) {
|
|
| 221 | - unset( $data['merge_fields'] ); |
|
| 220 | + if ( empty( $data[ 'merge_fields' ] ) ) {
|
|
| 221 | + unset( $data[ 'merge_fields' ] ); |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | // Subscribe the user to the list via the API. |
@@ -248,10 +248,10 @@ discard block |
||
| 248 | 248 | $merge_vars = array(); |
| 249 | 249 | |
| 250 | 250 | if ( ! empty( $user->first_name ) ) {
|
| 251 | - $merge_vars['FNAME'] = $user->first_name; |
|
| 251 | + $merge_vars[ 'FNAME' ] = $user->first_name; |
|
| 252 | 252 | } |
| 253 | 253 | if ( ! empty( $user->last_name ) ) {
|
| 254 | - $merge_vars['LNAME'] = $user->last_name; |
|
| 254 | + $merge_vars[ 'LNAME' ] = $user->last_name; |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | /** |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | /** |
| 10 | 10 | * Main Checkbox Integration class. |
| 11 | 11 | */ |
| 12 | -class Yikes_Easy_MC_Checkbox_Integration_Class {
|
|
| 12 | +class Yikes_Easy_MC_Checkbox_Integration_Class { |
|
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * The integration type. |
@@ -28,10 +28,10 @@ discard block |
||
| 28 | 28 | * |
| 29 | 29 | * @return bool Whether the current user is subscribed to a list. |
| 30 | 30 | */ |
| 31 | - public function is_user_already_subscribed( $type, $email = '' ) {
|
|
| 31 | + public function is_user_already_subscribed( $type, $email = '' ) { |
|
| 32 | 32 | // Make sure we have an email address to use. |
| 33 | - if ( empty( $email ) ) {
|
|
| 34 | - if ( ! is_user_logged_in() ) {
|
|
| 33 | + if ( empty( $email ) ) { |
|
| 34 | + if ( ! is_user_logged_in() ) { |
|
| 35 | 35 | return false; |
| 36 | 36 | } |
| 37 | 37 | |
@@ -40,13 +40,13 @@ discard block |
||
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | // Ensure we have a valid email. |
| 43 | - if ( ! is_email( $email ) ) {
|
|
| 43 | + if ( ! is_email( $email ) ) { |
|
| 44 | 44 | return false; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | // Convert the integration type to a list ID. |
| 48 | 48 | $checkbox_options = get_option( 'optin-checkbox-init', '' ); |
| 49 | - if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
|
|
| 49 | + if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) { |
|
| 50 | 50 | return false; |
| 51 | 51 | } |
| 52 | 52 | |
@@ -54,8 +54,8 @@ discard block |
||
| 54 | 54 | $list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids ); |
| 55 | 55 | |
| 56 | 56 | // Go through each list... |
| 57 | - foreach ( $list_ids as $list_id ) {
|
|
| 58 | - if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {
|
|
| 57 | + foreach ( $list_ids as $list_id ) { |
|
| 58 | + if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) { |
|
| 59 | 59 | return false; |
| 60 | 60 | } |
| 61 | 61 | } |
@@ -74,19 +74,19 @@ discard block |
||
| 74 | 74 | * |
| 75 | 75 | * @return bool Whether the email is subscribed to the list. |
| 76 | 76 | */ |
| 77 | - public function is_user_subscribed( $email, $list_id, $type ) {
|
|
| 77 | + public function is_user_subscribed( $email, $list_id, $type ) { |
|
| 78 | 78 | $email = sanitize_email( $email ); |
| 79 | 79 | $email_hash = md5( $email ); |
| 80 | 80 | |
| 81 | 81 | // Check the API to see the status. |
| 82 | 82 | $response = yikes_get_mc_api_manager()->get_list_handler()->get_member( $list_id, $email_hash, false ); |
| 83 | - if ( is_wp_error( $response ) ) {
|
|
| 83 | + if ( is_wp_error( $response ) ) { |
|
| 84 | 84 | $data = $response->get_error_data(); |
| 85 | 85 | |
| 86 | 86 | // If the error response is a 404, they are not subscribed. |
| 87 | - if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
|
|
| 87 | + if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) { |
|
| 88 | 88 | return false; |
| 89 | - } else {
|
|
| 89 | + } else { |
|
| 90 | 90 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 91 | 91 | $error_logging->maybe_write_to_log( |
| 92 | 92 | $response->get_error_code(), |
@@ -110,14 +110,14 @@ discard block |
||
| 110 | 110 | * |
| 111 | 111 | * @return string The HTML for the checkbox. |
| 112 | 112 | */ |
| 113 | - public function yikes_get_checkbox() {
|
|
| 113 | + public function yikes_get_checkbox() { |
|
| 114 | 114 | |
| 115 | 115 | // Get our options. |
| 116 | 116 | $checkbox_options = get_option( 'optin-checkbox-init', array() ); |
| 117 | 117 | $has_list_ids = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list']; |
| 118 | 118 | $has_list_ids = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true ); |
| 119 | 119 | |
| 120 | - if ( $has_list_ids ) {
|
|
| 120 | + if ( $has_list_ids ) { |
|
| 121 | 121 | $label = isset( $checkbox_options[ $this->type ]['label'] ) && ! empty( $checkbox_options[ $this->type ]['label'] ) ? trim( $checkbox_options[ $this->type ]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' ); |
| 122 | 122 | $checked = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : ''; |
| 123 | 123 | $before = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' ); |
@@ -144,11 +144,11 @@ discard block |
||
| 144 | 144 | * @param string $type The integration type. |
| 145 | 145 | * @param array $merge_vars The array of form data to send. |
| 146 | 146 | */ |
| 147 | - public function subscribe_user_integration( $email, $type, $merge_vars ) {
|
|
| 147 | + public function subscribe_user_integration( $email, $type, $merge_vars ) { |
|
| 148 | 148 | $options = get_option( 'optin-checkbox-init', '' ); |
| 149 | 149 | |
| 150 | 150 | // Make sure we have a list ID. |
| 151 | - if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {
|
|
| 151 | + if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) { |
|
| 152 | 152 | // @todo: Throw some kind of error? |
| 153 | 153 | return; |
| 154 | 154 | } |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | // Check for an IP address. |
| 159 | 159 | $user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] ); |
| 160 | - if ( isset( $merge_vars['OPTIN_IP'] ) ) {
|
|
| 160 | + if ( isset( $merge_vars['OPTIN_IP'] ) ) { |
|
| 161 | 161 | $user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] ); |
| 162 | 162 | } |
| 163 | 163 | |
@@ -173,19 +173,19 @@ discard block |
||
| 173 | 173 | 'ip_signup' => $user_ip, |
| 174 | 174 | ); |
| 175 | 175 | |
| 176 | - foreach ( $list_ids as $list_id ) {
|
|
| 176 | + foreach ( $list_ids as $list_id ) { |
|
| 177 | 177 | |
| 178 | 178 | $interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array(); |
| 179 | 179 | $interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests; |
| 180 | 180 | |
| 181 | 181 | // Only re-format and add interest groups if not empty. |
| 182 | - if ( ! empty( $interests ) ) {
|
|
| 182 | + if ( ! empty( $interests ) ) { |
|
| 183 | 183 | $groups = array(); |
| 184 | 184 | |
| 185 | 185 | // Need to reformat interest groups array as $interest_group_ID => true. |
| 186 | - foreach ( $interests as $interest ) {
|
|
| 187 | - if ( is_array( $interest ) ) {
|
|
| 188 | - foreach ( $interest as $group_id ) {
|
|
| 186 | + foreach ( $interests as $interest ) { |
|
| 187 | + if ( is_array( $interest ) ) { |
|
| 188 | + foreach ( $interest as $group_id ) { |
|
| 189 | 189 | $groups[ $group_id ] = true; |
| 190 | 190 | } |
| 191 | 191 | } |
@@ -217,14 +217,14 @@ discard block |
||
| 217 | 217 | $list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type ); |
| 218 | 218 | |
| 219 | 219 | // Don't send an empty merge fields array. |
| 220 | - if ( empty( $data['merge_fields'] ) ) {
|
|
| 220 | + if ( empty( $data['merge_fields'] ) ) { |
|
| 221 | 221 | unset( $data['merge_fields'] ); |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | // Subscribe the user to the list via the API. |
| 225 | 225 | $response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, $id, $data ); |
| 226 | 226 | |
| 227 | - if ( is_wp_error( $response ) ) {
|
|
| 227 | + if ( is_wp_error( $response ) ) { |
|
| 228 | 228 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 229 | 229 | $error_logging->maybe_write_to_log( |
| 230 | 230 | $response->get_error_code(), |
@@ -242,15 +242,15 @@ discard block |
||
| 242 | 242 | * |
| 243 | 243 | * @param WP_User $user A WP User. |
| 244 | 244 | */ |
| 245 | - public function user_merge_vars( WP_User $user ) {
|
|
| 245 | + public function user_merge_vars( WP_User $user ) { |
|
| 246 | 246 | |
| 247 | 247 | // Setup our array. |
| 248 | 248 | $merge_vars = array(); |
| 249 | 249 | |
| 250 | - if ( ! empty( $user->first_name ) ) {
|
|
| 250 | + if ( ! empty( $user->first_name ) ) { |
|
| 251 | 251 | $merge_vars['FNAME'] = $user->first_name; |
| 252 | 252 | } |
| 253 | - if ( ! empty( $user->last_name ) ) {
|
|
| 253 | + if ( ! empty( $user->last_name ) ) { |
|
| 254 | 254 | $merge_vars['LNAME'] = $user->last_name; |
| 255 | 255 | } |
| 256 | 256 | |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | * |
| 275 | 275 | * @return bool True if the checkbox was checked. |
| 276 | 276 | */ |
| 277 | - public function was_checkbox_checked( $type ) {
|
|
| 277 | + public function was_checkbox_checked( $type ) { |
|
| 278 | 278 | return isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && '1' === filter_var( $_POST[ 'yikes_mailchimp_checkbox_' . $type ], FILTER_SANITIZE_STRING ); |
| 279 | 279 | } |
| 280 | 280 | } |
@@ -11,16 +11,16 @@ discard block |
||
| 11 | 11 | */ |
| 12 | 12 | public function __construct() { |
| 13 | 13 | // ajax process form submission |
| 14 | - add_action( 'wp_ajax_nopriv_process_form_submission', array( $this , 'process_form_submission' ), 10 ); |
|
| 15 | - add_action( 'wp_ajax_process_form_submission', array( $this , 'process_form_submission' ), 10 ); |
|
| 14 | + add_action( 'wp_ajax_nopriv_process_form_submission', array( $this, 'process_form_submission' ), 10 ); |
|
| 15 | + add_action( 'wp_ajax_process_form_submission', array( $this, 'process_form_submission' ), 10 ); |
|
| 16 | 16 | |
| 17 | 17 | // ajax send update emails |
| 18 | - add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 ); |
|
| 19 | - add_action( 'wp_ajax_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 ); |
|
| 18 | + add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 ); |
|
| 19 | + add_action( 'wp_ajax_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 ); |
|
| 20 | 20 | |
| 21 | 21 | // increase submission count for a given form on successful submit |
| 22 | - add_action( 'wp_ajax_nopriv_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 ); |
|
| 23 | - add_action( 'wp_ajax_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 ); |
|
| 22 | + add_action( 'wp_ajax_nopriv_increase_submission_count', array( $this, 'increase_submission_count' ), 10 ); |
|
| 23 | + add_action( 'wp_ajax_increase_submission_count', array( $this, 'increase_submission_count' ), 10 ); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /* |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * Increase the submission count for a given form. |
| 38 | 38 | */ |
| 39 | 39 | public function increase_submission_count() { |
| 40 | - $form_id = intval( $_POST['form_id'] ); |
|
| 40 | + $form_id = intval( $_POST[ 'form_id' ] ); |
|
| 41 | 41 | $interface = yikes_easy_mailchimp_extender_get_form_interface(); |
| 42 | 42 | $form = $interface->get_form( $form_id ); |
| 43 | 43 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | // Update the form. |
| 50 | - $submission_count = isset( $form['submissions'] ) ? $form['submissions'] + 1 : 1; |
|
| 50 | + $submission_count = isset( $form[ 'submissions' ] ) ? $form[ 'submissions' ] + 1 : 1; |
|
| 51 | 51 | $interface->update_form_field( $form_id, 'submissions', $submission_count ); |
| 52 | 52 | |
| 53 | 53 | exit(); |
@@ -58,11 +58,11 @@ discard block |
||
| 58 | 58 | @since v6.0.4.1 |
| 59 | 59 | */ |
| 60 | 60 | public function sendUpdateProfileEmail() { |
| 61 | - $user_email = filter_var( $_POST['user_email'], FILTER_SANITIZE_STRING ); |
|
| 61 | + $user_email = filter_var( $_POST[ 'user_email' ], FILTER_SANITIZE_STRING ); |
|
| 62 | 62 | $user_id = md5( $user_email ); |
| 63 | - $list_id = filter_var( $_POST['list_id'], FILTER_SANITIZE_STRING ); |
|
| 64 | - $form_id = filter_var( $_POST['form_id'], FILTER_SANITIZE_NUMBER_INT ); |
|
| 65 | - $page_id = filter_var( $_POST['page_id'], FILTER_SANITIZE_NUMBER_INT ); |
|
| 63 | + $list_id = filter_var( $_POST[ 'list_id' ], FILTER_SANITIZE_STRING ); |
|
| 64 | + $form_id = filter_var( $_POST[ 'form_id' ], FILTER_SANITIZE_NUMBER_INT ); |
|
| 65 | + $page_id = filter_var( $_POST[ 'page_id' ], FILTER_SANITIZE_NUMBER_INT ); |
|
| 66 | 66 | $full_site_url = get_bloginfo( 'url' ); |
| 67 | 67 | $manager = yikes_get_mc_api_manager(); |
| 68 | 68 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | 'class.public_ajax.php' |
| 80 | 80 | ); |
| 81 | 81 | $is_error = true; |
| 82 | - $errors[] = $list_details->get_error_message(); |
|
| 82 | + $errors[ ] = $list_details->get_error_message(); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | // Subscriber details API call. |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 89 | 89 | $error_logging->maybe_write_to_log( $subscriber_account_details->get_error_code(), __( 'Send Update Profile Email - Get Member Info.', 'yikes-inc-easy-mailchimp-extender' ), 'class.public_ajax.php' ); |
| 90 | 90 | $is_error = true; |
| 91 | - $errors[] = $subscriber_account_details->get_error_message(); |
|
| 91 | + $errors[ ] = $subscriber_account_details->get_error_message(); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // Form details API call. |
@@ -96,22 +96,22 @@ discard block |
||
| 96 | 96 | if ( ! empty( $interface ) && method_exists( $interface, 'get_form' ) && ! empty( $form_id ) ) { |
| 97 | 97 | $form_data = $interface->get_form( $form_id ); |
| 98 | 98 | if ( ! empty( $form_data ) ) { |
| 99 | - if ( isset( $form_data['error_messages'] ) ) { |
|
| 99 | + if ( isset( $form_data[ 'error_messages' ] ) ) { |
|
| 100 | 100 | |
| 101 | - if ( isset( $form_data['error_messages']['email-body'] ) && ! empty( $form_data['error_messages']['email-body'] ) ) { |
|
| 102 | - $email_body = apply_filters( 'the_content', $form_data['error_messages']['email-body'] ); |
|
| 101 | + if ( isset( $form_data[ 'error_messages' ][ 'email-body' ] ) && ! empty( $form_data[ 'error_messages' ][ 'email-body' ] ) ) { |
|
| 102 | + $email_body = apply_filters( 'the_content', $form_data[ 'error_messages' ][ 'email-body' ] ); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - if ( isset( $form_data['error_messages']['email-subject'] ) && ! empty( $form_data['error_messages']['email-subject'] ) ) { |
|
| 106 | - $email_subject = $form_data['error_messages']['email-subject']; |
|
| 105 | + if ( isset( $form_data[ 'error_messages' ][ 'email-subject' ] ) && ! empty( $form_data[ 'error_messages' ][ 'email-subject' ] ) ) { |
|
| 106 | + $email_subject = $form_data[ 'error_messages' ][ 'email-subject' ]; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - if ( isset( $form_data['error_messages']['update-email-success'] ) && ! empty( $form_data['error_messages']['update-email-success'] ) ) { |
|
| 110 | - $update_email_success_message = $form_data['error_messages']['update-email-success']; |
|
| 109 | + if ( isset( $form_data[ 'error_messages' ][ 'update-email-success' ] ) && ! empty( $form_data[ 'error_messages' ][ 'update-email-success' ] ) ) { |
|
| 110 | + $update_email_success_message = $form_data[ 'error_messages' ][ 'update-email-success' ]; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - if ( isset( $form_data['error_messages']['update-email-failure'] ) && ! empty( $form_data['error_messages']['update-email-failure'] ) ) { |
|
| 114 | - $update_email_failed_message = $form_data['error_messages']['update-email-failure']; |
|
| 113 | + if ( isset( $form_data[ 'error_messages' ][ 'update-email-failure' ] ) && ! empty( $form_data[ 'error_messages' ][ 'update-email-failure' ] ) ) { |
|
| 114 | + $update_email_failed_message = $form_data[ 'error_messages' ][ 'update-email-failure' ]; |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -132,11 +132,11 @@ discard block |
||
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | // Construct the headers & email message content. |
| 135 | - $subscriber_id = $subscriber_account_details['unique_email_id']; |
|
| 136 | - $update_link_href = str_replace( '/subscribe', '/profile', $list_details['subscribe_url_long'] ); |
|
| 135 | + $subscriber_id = $subscriber_account_details[ 'unique_email_id' ]; |
|
| 136 | + $update_link_href = str_replace( '/subscribe', '/profile', $list_details[ 'subscribe_url_long' ] ); |
|
| 137 | 137 | $update_link_href = add_query_arg( 'e', $subscriber_id, $update_link_href ); |
| 138 | 138 | $update_link_tag = '<a href="' . $update_link_href . '">'; |
| 139 | - $headers = 'From: ' . $list_details['campaign_defaults']['from_name'] . ' <' . $list_details['campaign_defaults']['from_email'] . '>' . "\r\n"; |
|
| 139 | + $headers = 'From: ' . $list_details[ 'campaign_defaults' ][ 'from_name' ] . ' <' . $list_details[ 'campaign_defaults' ][ 'from_email' ] . '>' . "\r\n"; |
|
| 140 | 140 | $headers .= 'Content-type: text/html'; |
| 141 | 141 | |
| 142 | 142 | if ( ! isset( $email_subject ) ) { |
@@ -178,26 +178,26 @@ discard block |
||
| 178 | 178 | $email_body = str_replace( array( '[subscriber_id]', '[SUBSCRIBER_ID]' ), $subscriber_id, $email_body ); |
| 179 | 179 | |
| 180 | 180 | // We let the user use [form_name] for the form's name so replace [form_name] with the form's name. |
| 181 | - $email_body = str_replace( array( '[form_name]', '[FORM_NAME]' ), $form_data['form_name'], $email_body ); |
|
| 181 | + $email_body = str_replace( array( '[form_name]', '[FORM_NAME]' ), $form_data[ 'form_name' ], $email_body ); |
|
| 182 | 182 | |
| 183 | 183 | // We let the user use [fname] and [lname] so replace those. |
| 184 | - $email_body = str_replace( array( '[fname]', '[FNAME]' ), isset( $subscriber_account_details['merge_fields']['FNAME'] ) ? $subscriber_account_details['merge_fields']['FNAME'] : '', $email_body ); |
|
| 185 | - $email_body = str_replace( array( '[lname]', '[LNAME]' ), isset( $subscriber_account_details['merge_fields']['LNAME'] ) ? $subscriber_account_details['merge_fields']['LNAME'] : '', $email_body ); |
|
| 184 | + $email_body = str_replace( array( '[fname]', '[FNAME]' ), isset( $subscriber_account_details[ 'merge_fields' ][ 'FNAME' ] ) ? $subscriber_account_details[ 'merge_fields' ][ 'FNAME' ] : '', $email_body ); |
|
| 185 | + $email_body = str_replace( array( '[lname]', '[LNAME]' ), isset( $subscriber_account_details[ 'merge_fields' ][ 'LNAME' ] ) ? $subscriber_account_details[ 'merge_fields' ][ 'LNAME' ] : '', $email_body ); |
|
| 186 | 186 | |
| 187 | 187 | /* Confirm that the email was sent */ |
| 188 | 188 | if ( wp_mail( $user_email, apply_filters( 'yikes-mailchimp-update-email-subject', $email_subject ), apply_filters( 'yikes-mailchimp-update-email-content', $email_body, $update_link_href ), $headers ) ) { |
| 189 | 189 | |
| 190 | 190 | $update_email_success_message = apply_filters( 'yikes-mailchimp-update-email-success-message', $update_email_success_message, $form_id, $user_email ); |
| 191 | - $submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null; |
|
| 191 | + $submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null; |
|
| 192 | 192 | $redirect_settings = Yikes_Inc_Easy_MailChimp_Extender_Process_Submission_Handler::handle_submission_response_success_redirect( $form_id, $submission_settings, $page_id ); |
| 193 | 193 | |
| 194 | 194 | wp_send_json_success( |
| 195 | 195 | array( |
| 196 | 196 | 'response_text' => '<div class="yikes-easy-mc-success-message">' . $update_email_success_message . '</div>', |
| 197 | - 'redirection' => $redirect_settings['redirection'], |
|
| 198 | - 'redirect' => $redirect_settings['redirect'], |
|
| 199 | - 'redirect_timer' => $redirect_settings['redirect_timer'], |
|
| 200 | - 'new_window' => $redirect_settings['new_window'], |
|
| 197 | + 'redirection' => $redirect_settings[ 'redirection' ], |
|
| 198 | + 'redirect' => $redirect_settings[ 'redirect' ], |
|
| 199 | + 'redirect_timer' => $redirect_settings[ 'redirect_timer' ], |
|
| 200 | + 'new_window' => $redirect_settings[ 'new_window' ], |
|
| 201 | 201 | ) |
| 202 | 202 | ); |
| 203 | 203 | } else { |
@@ -3,8 +3,8 @@ discard block |
||
| 3 | 3 | * Get and store our variables |
| 4 | 4 | * @since 6.0 |
| 5 | 5 | */ |
| 6 | -$list_id = $_GET['mailchimp-list']; |
|
| 7 | -$email_id = esc_attr( $_GET['email-id'] ); |
|
| 6 | +$list_id = $_GET[ 'mailchimp-list' ]; |
|
| 7 | +$email_id = esc_attr( $_GET[ 'email-id' ] ); |
|
| 8 | 8 | $list_helper = yikes_get_mc_api_manager()->get_list_handler(); |
| 9 | 9 | |
| 10 | 10 | /* |
@@ -36,14 +36,14 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | $other_lists = $list_helper->get_members_lists( $email_id ); |
| 39 | -$merge_data_array = $user_data['merge_fields']; |
|
| 39 | +$merge_data_array = $user_data[ 'merge_fields' ]; |
|
| 40 | 40 | |
| 41 | 41 | $additional_lists = array(); |
| 42 | 42 | $merge_variable_fields = array(); |
| 43 | 43 | |
| 44 | 44 | /* Build the array of mailing lists the user is subscribed to */ |
| 45 | 45 | foreach ( $other_lists as $id => $value ) { |
| 46 | - if ( 'subscribed' !== $value['status'] ) { |
|
| 46 | + if ( 'subscribed' !== $value[ 'status' ] ) { |
|
| 47 | 47 | continue; |
| 48 | 48 | } |
| 49 | 49 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | continue; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - $additional_lists[ $list_data['id'] ] = $list_data['name']; |
|
| 61 | + $additional_lists[ $list_data[ 'id' ] ] = $list_data[ 'name' ]; |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | /* Build the array of merge variables => value */ |
@@ -74,21 +74,21 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | // loop and display |
| 76 | 76 | if ( $merge_variables ) { |
| 77 | - foreach ( $merge_variables['merge_fields'] as $merge_variable ) { |
|
| 78 | - if ( $merge_variable['tag'] != 'EMAIL' ) { |
|
| 79 | - $merge_variable_fields[ $merge_variable['name'] ] = ( isset( $merge_data_array[ $merge_variable['tag'] ] ) ) ? $merge_data_array[ $merge_variable['tag'] ] : ''; |
|
| 77 | + foreach ( $merge_variables[ 'merge_fields' ] as $merge_variable ) { |
|
| 78 | + if ( $merge_variable[ 'tag' ] != 'EMAIL' ) { |
|
| 79 | + $merge_variable_fields[ $merge_variable[ 'name' ] ] = ( isset( $merge_data_array[ $merge_variable[ 'tag' ] ] ) ) ? $merge_data_array[ $merge_variable[ 'tag' ] ] : ''; |
|
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | |
| 85 | 85 | // store usable data |
| 86 | -$user_email = sanitize_email( $user_data['email_address'] ); |
|
| 86 | +$user_email = sanitize_email( $user_data[ 'email_address' ] ); |
|
| 87 | 87 | // prepend our email address to the beginning |
| 88 | 88 | $merge_variable_fields = array( 'Email Address' => $user_email ) + $merge_variable_fields; |
| 89 | 89 | $gravatar_image = get_avatar( $user_email, 120 ); |
| 90 | -$email_type = $user_data['email_type']; |
|
| 91 | -$member_rating = ( ! empty( $user_data['member_rating'] ) ) ? (int) $user_data['member_rating'] : 0; |
|
| 90 | +$email_type = $user_data[ 'email_type' ]; |
|
| 91 | +$member_rating = ( ! empty( $user_data[ 'member_rating' ] ) ) ? (int) $user_data[ 'member_rating' ] : 0; |
|
| 92 | 92 | $member_rating_stars = ''; |
| 93 | 93 | |
| 94 | 94 | // Create member rating stars |
@@ -100,8 +100,8 @@ discard block |
||
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | -$last_changed = strtotime( $user_data['last_changed'] ); |
|
| 104 | -$user_language = ( ! empty( $user_data['language'] ) ) ? $user_data['language'] : ''; |
|
| 103 | +$last_changed = strtotime( $user_data[ 'last_changed' ] ); |
|
| 104 | +$user_language = ( ! empty( $user_data[ 'language' ] ) ) ? $user_data[ 'language' ] : ''; |
|
| 105 | 105 | $list_name = $additional_lists[ $list_id ]; |
| 106 | 106 | |
| 107 | 107 | // Generate our display page |
@@ -144,11 +144,11 @@ discard block |
||
| 144 | 144 | echo sprintf( esc_html__( 'Subscribed: %1$1s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( gmdate( 'F jS, Y h:i a', $last_changed ) ) ); |
| 145 | 145 | ?> |
| 146 | 146 | </span> |
| 147 | - <?php if ( isset( $user_data['location'] ) && isset( $user_data['location']['timezone'] ) && ! empty( $user_data['location']['timezone'] ) && isset( $user_data['location']['country_code'] ) && ! empty( $user_data['location']['country_code'] ) ) { ?> |
|
| 147 | + <?php if ( isset( $user_data[ 'location' ] ) && isset( $user_data[ 'location' ][ 'timezone' ] ) && ! empty( $user_data[ 'location' ][ 'timezone' ] ) && isset( $user_data[ 'location' ][ 'country_code' ] ) && ! empty( $user_data[ 'location' ][ 'country_code' ] ) ) { ?> |
|
| 148 | 148 | <span class="member-location-data"> |
| 149 | 149 | <?php |
| 150 | 150 | /* translators: the placeholders are a timezone and a country code */ |
| 151 | - echo sprintf( esc_html__( 'Location: %1$1s, %2$2s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( $user_data['location']['timezone'] ), esc_html( $user_data['location']['country_code'] ) ); |
|
| 151 | + echo sprintf( esc_html__( 'Location: %1$1s, %2$2s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( $user_data[ 'location' ][ 'timezone' ] ), esc_html( $user_data[ 'location' ][ 'country_code' ] ) ); |
|
| 152 | 152 | ?> |
| 153 | 153 | </span> |
| 154 | 154 | <?php } ?> |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | <hr class="yikes-mc-subscriber-hr" /> |
| 158 | 158 | |
| 159 | 159 | <?php |
| 160 | - if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && filter_var( wp_unslash( $_GET['section'] ), FILTER_SANITIZE_STRING ) === 'subscriber-data' ) ) { |
|
| 160 | + if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && filter_var( wp_unslash( $_GET[ 'section' ] ), FILTER_SANITIZE_STRING ) === 'subscriber-data' ) ) { |
|
| 161 | 161 | ?> |
| 162 | 162 | <section class="yikes-mc-card-body merge-variable-section"> |
| 163 | 163 | <h3><?php esc_html_e( 'Fields:', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
@@ -177,12 +177,12 @@ discard block |
||
| 177 | 177 | <strong><?php esc_html_e( 'No Subscriber Data Found', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
| 178 | 178 | <?php |
| 179 | 179 | } |
| 180 | - if ( isset( $user_data['ip_signup'] ) && ! empty( $user_data['ip_signup'] ) ) { |
|
| 180 | + if ( isset( $user_data[ 'ip_signup' ] ) && ! empty( $user_data[ 'ip_signup' ] ) ) { |
|
| 181 | 181 | ?> |
| 182 | 182 | <li> |
| 183 | 183 | <label> |
| 184 | 184 | <strong class="section-label"><?php esc_html_e( 'Signup IP', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
| 185 | - <p class="section-value"><em><?php esc_html_e( $user_data['ip_signup'] ); ?></em></p> |
|
| 185 | + <p class="section-value"><em><?php esc_html_e( $user_data[ 'ip_signup' ] ); ?></em></p> |
|
| 186 | 186 | </label> |
| 187 | 187 | </li> |
| 188 | 188 | <?php |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | <?php |
| 194 | 194 | |
| 195 | 195 | |
| 196 | - if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { |
|
| 196 | + if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) { |
|
| 197 | 197 | ?> |
| 198 | 198 | <section class="yikes-mc-card-body"> |
| 199 | 199 | <?php |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | ?> |
| 223 | 223 | |
| 224 | 224 | <?php |
| 225 | - if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { |
|
| 225 | + if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) { |
|
| 226 | 226 | $unsubscribe_subscriber_url = esc_url_raw( add_query_arg( array( |
| 227 | 227 | 'action' => 'yikes-easy-mc-unsubscribe-user', |
| 228 | 228 | 'mailchimp-list' => $list_id, |
@@ -277,36 +277,36 @@ discard block |
||
| 277 | 277 | <div id="customer-tab-wrapper"> |
| 278 | 278 | <ul id="customer-tab-wrapper-list"> |
| 279 | 279 | |
| 280 | - <?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?> |
|
| 280 | + <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?> |
|
| 281 | 281 | <a title="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $subscriber_details; ?>"> |
| 282 | 282 | <?php } ?> |
| 283 | 283 | |
| 284 | - <li <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
| 284 | + <li <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
| 285 | 285 | <span class="dashicons dashicons-id"></span></li> |
| 286 | 286 | |
| 287 | - <?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?> |
|
| 287 | + <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?> |
|
| 288 | 288 | </a> |
| 289 | 289 | <?php } ?> |
| 290 | 290 | |
| 291 | - <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] != 'additional-subscriptions' ) ) { ?> |
|
| 291 | + <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'additional-subscriptions' ) ) { ?> |
|
| 292 | 292 | <a title="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $additional_subscription_url; ?>"> |
| 293 | 293 | <?php } ?> |
| 294 | 294 | |
| 295 | - <li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
| 295 | + <li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
| 296 | 296 | <span class="dashicons dashicons-portfolio"></span></li> |
| 297 | 297 | |
| 298 | - <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) ) { ?> |
|
| 298 | + <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) ) { ?> |
|
| 299 | 299 | </a> |
| 300 | 300 | <?php } ?> |
| 301 | 301 | |
| 302 | - <?php if ( ! isset( $_GET['section'] ) || isset( $_GET['section'] ) && $_GET['section'] != 'delete-subscriber' ) { ?> |
|
| 302 | + <?php if ( ! isset( $_GET[ 'section' ] ) || isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'delete-subscriber' ) { ?> |
|
| 303 | 303 | <a title="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $delete_subscriber_url; ?>"> |
| 304 | 304 | <?php } ?> |
| 305 | 305 | |
| 306 | - <li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
| 306 | + <li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
| 307 | 307 | <span class="dashicons dashicons-trash"></span></li> |
| 308 | 308 | |
| 309 | - <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) ) { ?> |
|
| 309 | + <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) ) { ?> |
|
| 310 | 310 | </a> |
| 311 | 311 | <?php } ?> |
| 312 | 312 | |
@@ -5,8 +5,8 @@ discard block |
||
| 5 | 5 | $error = 0; |
| 6 | 6 | |
| 7 | 7 | // Get our $_POST variables |
| 8 | -$list_id = isset( $_POST['list_id'] ) ? $_POST['list_id'] : ''; |
|
| 9 | -$interest_groups = isset( $_POST['interest_groups'] ) ? $_POST['interest_groups'] : array(); |
|
| 8 | +$list_id = isset( $_POST[ 'list_id' ] ) ? $_POST[ 'list_id' ] : ''; |
|
| 9 | +$interest_groups = isset( $_POST[ 'interest_groups' ] ) ? $_POST[ 'interest_groups' ] : array(); |
|
| 10 | 10 | |
| 11 | 11 | // Make sure our $_POST variables aren't empty |
| 12 | 12 | if ( empty( $list_id ) ) { |
@@ -49,20 +49,20 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | |
| 51 | 51 | // Loop through the interest groups data (group_id, field_name, field_type) and add the fields to the form |
| 52 | -foreach( $interest_groups as $group ) { |
|
| 52 | +foreach ( $interest_groups as $group ) { |
|
| 53 | 53 | |
| 54 | 54 | // find and return the location of this merge field in the array |
| 55 | - $index = $this->findMCListIndex( $group['group_id'], $interest_groupings, 'id' ); |
|
| 55 | + $index = $this->findMCListIndex( $group[ 'group_id' ], $interest_groupings, 'id' ); |
|
| 56 | 56 | $field_data = $interest_groupings[ $index ]; |
| 57 | - $groups = wp_list_pluck( $field_data['items'], 'name' ); |
|
| 57 | + $groups = wp_list_pluck( $field_data[ 'items' ], 'name' ); |
|
| 58 | 58 | |
| 59 | 59 | ?> |
| 60 | - <section class="draggable" id="<?php echo $group['group_id']; ?>"> |
|
| 60 | + <section class="draggable" id="<?php echo $group[ 'group_id' ]; ?>"> |
|
| 61 | 61 | <!-- top --> |
| 62 | 62 | <a href="#" class="expansion-section-title settings-sidebar"> |
| 63 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
|
| 64 | - <?php echo stripslashes( $group['field_name'] ); ?> |
|
| 65 | - <span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $group['field_type']; ?></small></span> |
|
| 63 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
|
| 64 | + <?php echo stripslashes( $group[ 'field_name' ] ); ?> |
|
| 65 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $group[ 'field_type' ]; ?></small></span> |
|
| 66 | 66 | </a> |
| 67 | 67 | <!-- expansion section --> |
| 68 | 68 | <div class="yikes-mc-settings-expansion-section"> |
@@ -70,37 +70,37 @@ discard block |
||
| 70 | 70 | <!-- Single or Double Opt-in --> |
| 71 | 71 | <p class="type-container"><!-- necessary to prevent skipping on slideToggle(); --> |
| 72 | 72 | <!-- store the label --> |
| 73 | - <input type="hidden" name="field[<?php echo $group['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $group['field_name'] ); ?>" /> |
|
| 74 | - <input type="hidden" name="field[<?php echo $group['group_id']; ?>][type]" value="<?php echo $group['field_type']; ?>" /> |
|
| 75 | - <input type="hidden" name="field[<?php echo $group['group_id']; ?>][group_id]" value="<?php echo $group['group_id']; ?>" /> |
|
| 76 | - <input type="hidden" name="field[<?php echo $group['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( $groups, true ) ); ?>' /> |
|
| 73 | + <input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $group[ 'field_name' ] ); ?>" /> |
|
| 74 | + <input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][type]" value="<?php echo $group[ 'field_type' ]; ?>" /> |
|
| 75 | + <input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][group_id]" value="<?php echo $group[ 'group_id' ]; ?>" /> |
|
| 76 | + <input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( $groups, true ) ); ?>' /> |
|
| 77 | 77 | |
| 78 | 78 | |
| 79 | 79 | <table class="form-table form-field-container"> |
| 80 | 80 | |
| 81 | 81 | <!-- Default Value --> |
| 82 | - <?php switch( $group['field_type'] ) { |
|
| 82 | + <?php switch ( $group[ 'field_type' ] ) { |
|
| 83 | 83 | |
| 84 | 84 | case 'radio': |
| 85 | 85 | ?> |
| 86 | 86 | <tr valign="top"> |
| 87 | 87 | <td scope="row"> |
| 88 | 88 | <label for="placeholder"> |
| 89 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 89 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 90 | 90 | </label> |
| 91 | 91 | </td> |
| 92 | 92 | <td> |
| 93 | 93 | |
| 94 | - <?php $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : 'no-default'; ?> |
|
| 94 | + <?php $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : 'no-default'; ?> |
|
| 95 | 95 | |
| 96 | 96 | <!-- No Default option for radio buttons --> |
| 97 | - <input type="radio" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>>No Default |
|
| 97 | + <input type="radio" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>>No Default |
|
| 98 | 98 | |
| 99 | - <?php foreach ( $field_data['items'] as $id => $interest_group ) { ?> |
|
| 100 | - <input type="radio" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group['name'] ); |
|
| 99 | + <?php foreach ( $field_data[ 'items' ] as $id => $interest_group ) { ?> |
|
| 100 | + <input type="radio" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group[ 'name' ] ); |
|
| 101 | 101 | } ?> |
| 102 | 102 | |
| 103 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 103 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 104 | 104 | </td> |
| 105 | 105 | </tr> |
| 106 | 106 | |
@@ -114,19 +114,19 @@ discard block |
||
| 114 | 114 | <tr valign="top" class="yikes-checkbox-container"> |
| 115 | 115 | <td scope="row"> |
| 116 | 116 | <label for="placeholder"> |
| 117 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 117 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 118 | 118 | </label> |
| 119 | 119 | </td> |
| 120 | 120 | <td> |
| 121 | 121 | <?php |
| 122 | - foreach ( $field_data['items'] as $id => $interest_group ) { |
|
| 123 | - $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : '0'; |
|
| 122 | + foreach ( $field_data[ 'items' ] as $id => $interest_group ) { |
|
| 123 | + $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : '0'; |
|
| 124 | 124 | ?> |
| 125 | - <input type="checkbox" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="<?php echo $id; ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group['name'] ); ?> |
|
| 125 | + <input type="checkbox" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="<?php echo $id; ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group[ 'name' ] ); ?> |
|
| 126 | 126 | <?php |
| 127 | 127 | } |
| 128 | 128 | ?> |
| 129 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 129 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 130 | 130 | </td> |
| 131 | 131 | </tr> |
| 132 | 132 | |
@@ -138,18 +138,18 @@ discard block |
||
| 138 | 138 | <tr valign="top"> |
| 139 | 139 | <td scope="row"> |
| 140 | 140 | <label for="placeholder"> |
| 141 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 141 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 142 | 142 | </label> |
| 143 | 143 | </td> |
| 144 | 144 | <td> |
| 145 | - <select type="default" name="field[<?php echo $group['group_id']; ?>][default_choice]"> |
|
| 146 | - <?php $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : 'no-default'; ?> |
|
| 145 | + <select type="default" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice]"> |
|
| 146 | + <?php $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : 'no-default'; ?> |
|
| 147 | 147 | <option value="no-default">No Default</option> |
| 148 | - <?php foreach ( $field_data['items'] as $id => $interest_group ) { ?> |
|
| 149 | - <option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group['name']; ?></option> |
|
| 148 | + <?php foreach ( $field_data[ 'items' ] as $id => $interest_group ) { ?> |
|
| 149 | + <option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group[ 'name' ]; ?></option> |
|
| 150 | 150 | <?php } ?> |
| 151 | 151 | </select> |
| 152 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 152 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 153 | 153 | </td> |
| 154 | 154 | </tr> |
| 155 | 155 | |
@@ -161,25 +161,25 @@ discard block |
||
| 161 | 161 | <tr valign="top"> |
| 162 | 162 | <td scope="row"> |
| 163 | 163 | <label for="placeholder"> |
| 164 | - <?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 164 | + <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 165 | 165 | </label> |
| 166 | 166 | </td> |
| 167 | 167 | <td> |
| 168 | - <textarea class="widefat field-description-input" name="field[<?php echo $group['group_id']; ?>][description]"></textarea> |
|
| 169 | - <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 168 | + <textarea class="widefat field-description-input" name="field[<?php echo $group[ 'group_id' ]; ?>][description]"></textarea> |
|
| 169 | + <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 170 | 170 | </td> |
| 171 | 171 | </tr> |
| 172 | 172 | |
| 173 | 173 | <!-- Description Above Field --> |
| 174 | 174 | <tr valign="top" class="yikes-checkbox-container"> |
| 175 | 175 | <td scope="row"> |
| 176 | - <label for="description_above_<?php echo esc_attr( $group['group_id'] ); ?>"> |
|
| 177 | - <?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 176 | + <label for="description_above_<?php echo esc_attr( $group[ 'group_id' ] ); ?>"> |
|
| 177 | + <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 178 | 178 | </label> |
| 179 | 179 | </td> |
| 180 | 180 | <td> |
| 181 | - <input type="checkbox" id="description_above_<?php echo esc_attr( $group['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $group['group_id']; ?>][description_above]" value="1" /> |
|
| 182 | - <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 181 | + <input type="checkbox" id="description_above_<?php echo esc_attr( $group[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $group[ 'group_id' ]; ?>][description_above]" value="1" /> |
|
| 182 | + <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 183 | 183 | </td> |
| 184 | 184 | </tr> |
| 185 | 185 | |
@@ -187,48 +187,48 @@ discard block |
||
| 187 | 187 | <tr valign="top"> |
| 188 | 188 | <td scope="row"> |
| 189 | 189 | <label for="placeholder"> |
| 190 | - <?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 190 | + <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 191 | 191 | </label> |
| 192 | 192 | </td> |
| 193 | 193 | <td> |
| 194 | - <input type="text" class="widefat" name="field[<?php echo $group['group_id']; ?>][additional-classes]" value="<?php echo isset( $group['classes'] ) ? stripslashes( wp_strip_all_tags( $group['classes'] ) ) : '' ; ?>" /> |
|
| 195 | - <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p> |
|
| 194 | + <input type="text" class="widefat" name="field[<?php echo $group[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $group[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $group[ 'classes' ] ) ) : ''; ?>" /> |
|
| 195 | + <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p> |
|
| 196 | 196 | </td> |
| 197 | 197 | </tr> |
| 198 | 198 | <!-- Required Toggle --> |
| 199 | 199 | <tr valign="top" class="yikes-checkbox-container"> |
| 200 | 200 | <td scope="row"> |
| 201 | 201 | <label for="field-required"> |
| 202 | - <?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 202 | + <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 203 | 203 | </label> |
| 204 | 204 | </td> |
| 205 | 205 | <td> |
| 206 | - <input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][require]"> |
|
| 207 | - <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 206 | + <input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][require]"> |
|
| 207 | + <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 208 | 208 | </td> |
| 209 | 209 | </tr> |
| 210 | 210 | <!-- Visible Toggle --> |
| 211 | 211 | <tr valign="top" class="yikes-checkbox-container"> |
| 212 | 212 | <td scope="row"> |
| 213 | 213 | <label for="hide-field"> |
| 214 | - <?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 214 | + <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 215 | 215 | </label> |
| 216 | 216 | </td> |
| 217 | 217 | <td> |
| 218 | - <input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][hide]"> |
|
| 219 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 218 | + <input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][hide]"> |
|
| 219 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 220 | 220 | </td> |
| 221 | 221 | </tr> |
| 222 | 222 | <!-- Toggle Field Label Visibility --> |
| 223 | 223 | <tr valign="top" class="yikes-checkbox-container"> |
| 224 | 224 | <td scope="row"> |
| 225 | 225 | <label for="placeholder"> |
| 226 | - <?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 226 | + <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 227 | 227 | </label> |
| 228 | 228 | </td> |
| 229 | 229 | <td> |
| 230 | - <input type="checkbox" name="field[<?php echo $group['group_id']; ?>][hide-label]" value="1" /> |
|
| 231 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 230 | + <input type="checkbox" name="field[<?php echo $group[ 'group_id' ]; ?>][hide-label]" value="1" /> |
|
| 231 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 232 | 232 | </td> |
| 233 | 233 | </tr> |
| 234 | 234 | <!-- Toggle Buttons --> |
@@ -238,8 +238,8 @@ discard block |
||
| 238 | 238 | </td> |
| 239 | 239 | <td> |
| 240 | 240 | <span class="toggle-container"> |
| 241 | - <a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 242 | - <a href="#" class="remove-field" alt="<?php echo $group['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 241 | + <a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 242 | + <a href="#" class="remove-field" alt="<?php echo $group[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 243 | 243 | </span> |
| 244 | 244 | </td> |
| 245 | 245 | </tr> |
@@ -66,46 +66,46 @@ |
||
| 66 | 66 | */ |
| 67 | 67 | public function render_block( $attributes, $content ) { |
| 68 | 68 | |
| 69 | - if ( ! isset( $attributes['form_id'] ) ) { |
|
| 69 | + if ( ! isset( $attributes[ 'form_id' ] ) ) { |
|
| 70 | 70 | return; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | $shortcode_attributes = array( |
| 74 | - 'form' => $attributes['form_id'], |
|
| 75 | - 'submit' => isset( $attributes['submit_button_text'] ) && ! empty( $attributes['submit_button_text'] ) ? $attributes['submit_button_text'] : '', |
|
| 76 | - 'title' => isset( $attributes['show_title'] ) && true === $attributes['show_title'] ? '1' : '0', |
|
| 77 | - 'custom_title' => isset( $attributes['form_title'] ) ? $attributes['form_title'] : '', |
|
| 78 | - 'description' => isset( $attributes['show_description'] ) && true === $attributes['show_description'] ? '1' : '0', |
|
| 79 | - 'custom_description' => isset( $attributes['form_description'] ) ? $attributes['form_description'] : '', |
|
| 80 | - 'ajax' => isset( $attributes['is_ajax'] ) && true === $attributes['is_ajax'] ? '1' : '0', |
|
| 81 | - 'recaptcha' => ! isset( $attributes['recaptcha'] ) || isset( $attributes['recaptcha'] ) && false === $attributes['recaptcha'] ? '0' : '', |
|
| 82 | - 'recaptcha_lang' => isset( $attributes['recaptcha_lang'] ) ? $attributes['recaptcha_lang'] : '', |
|
| 83 | - 'recaptcha_type' => isset( $attributes['recaptcha_type'] ) ? $attributes['recaptcha_type'] : '', |
|
| 84 | - 'recaptcha_theme' => isset( $attributes['recaptcha_theme'] ) ? $attributes['recaptcha_theme'] : '', |
|
| 85 | - 'recaptcha_size' => isset( $attributes['recaptcha_size'] ) ? $attributes['recaptcha_size'] : '', |
|
| 86 | - 'recaptcha_data_callback' => isset( $attributes['recaptcha_verify_callback'] ) ? $attributes['recaptcha_verify_callback'] : '', |
|
| 87 | - 'recaptcha_expired_callback' => isset( $attributes['recaptcha_expired_callback'] ) ? $attributes['recaptcha_expired_callback'] : '', |
|
| 88 | - 'inline' => isset( $attributes['inline'] ) && true === $attributes['inline'] ? '1' : '0', |
|
| 74 | + 'form' => $attributes[ 'form_id' ], |
|
| 75 | + 'submit' => isset( $attributes[ 'submit_button_text' ] ) && ! empty( $attributes[ 'submit_button_text' ] ) ? $attributes[ 'submit_button_text' ] : '', |
|
| 76 | + 'title' => isset( $attributes[ 'show_title' ] ) && true === $attributes[ 'show_title' ] ? '1' : '0', |
|
| 77 | + 'custom_title' => isset( $attributes[ 'form_title' ] ) ? $attributes[ 'form_title' ] : '', |
|
| 78 | + 'description' => isset( $attributes[ 'show_description' ] ) && true === $attributes[ 'show_description' ] ? '1' : '0', |
|
| 79 | + 'custom_description' => isset( $attributes[ 'form_description' ] ) ? $attributes[ 'form_description' ] : '', |
|
| 80 | + 'ajax' => isset( $attributes[ 'is_ajax' ] ) && true === $attributes[ 'is_ajax' ] ? '1' : '0', |
|
| 81 | + 'recaptcha' => ! isset( $attributes[ 'recaptcha' ] ) || isset( $attributes[ 'recaptcha' ] ) && false === $attributes[ 'recaptcha' ] ? '0' : '', |
|
| 82 | + 'recaptcha_lang' => isset( $attributes[ 'recaptcha_lang' ] ) ? $attributes[ 'recaptcha_lang' ] : '', |
|
| 83 | + 'recaptcha_type' => isset( $attributes[ 'recaptcha_type' ] ) ? $attributes[ 'recaptcha_type' ] : '', |
|
| 84 | + 'recaptcha_theme' => isset( $attributes[ 'recaptcha_theme' ] ) ? $attributes[ 'recaptcha_theme' ] : '', |
|
| 85 | + 'recaptcha_size' => isset( $attributes[ 'recaptcha_size' ] ) ? $attributes[ 'recaptcha_size' ] : '', |
|
| 86 | + 'recaptcha_data_callback' => isset( $attributes[ 'recaptcha_verify_callback' ] ) ? $attributes[ 'recaptcha_verify_callback' ] : '', |
|
| 87 | + 'recaptcha_expired_callback' => isset( $attributes[ 'recaptcha_expired_callback' ] ) ? $attributes[ 'recaptcha_expired_callback' ] : '', |
|
| 88 | + 'inline' => isset( $attributes[ 'inline' ] ) && true === $attributes[ 'inline' ] ? '1' : '0', |
|
| 89 | 89 | ); |
| 90 | 90 | |
| 91 | 91 | // We want to run process_mailchimp_shortcode() but we need to return the plaintext shortcode or Gutenberg will autop() the shortcode content. |
| 92 | 92 | return sprintf( |
| 93 | 93 | '[yikes-mailchimp form="%s" submit="%s" title="%s" custom_title="%s" description="%s" custom_description="%s" ajax="%s" recaptcha="%s" recaptcha_lang="%s" recaptcha_type="%s" recaptcha_theme="%s" recaptcha_size="%s" recaptcha_data_callback="%s" recaptcha_expired_callback="%s" inline="%s"]', |
| 94 | - $shortcode_attributes['form'], |
|
| 95 | - $shortcode_attributes['submit'], |
|
| 96 | - $shortcode_attributes['title'], |
|
| 97 | - $shortcode_attributes['custom_title'], |
|
| 98 | - $shortcode_attributes['description'], |
|
| 99 | - $shortcode_attributes['custom_description'], |
|
| 100 | - $shortcode_attributes['ajax'], |
|
| 101 | - $shortcode_attributes['recaptcha'], |
|
| 102 | - $shortcode_attributes['recaptcha_lang'], |
|
| 103 | - $shortcode_attributes['recaptcha_type'], |
|
| 104 | - $shortcode_attributes['recaptcha_theme'], |
|
| 105 | - $shortcode_attributes['recaptcha_size'], |
|
| 106 | - $shortcode_attributes['recaptcha_data_callback'], |
|
| 107 | - $shortcode_attributes['recaptcha_expired_callback'], |
|
| 108 | - $shortcode_attributes['inline'] |
|
| 94 | + $shortcode_attributes[ 'form' ], |
|
| 95 | + $shortcode_attributes[ 'submit' ], |
|
| 96 | + $shortcode_attributes[ 'title' ], |
|
| 97 | + $shortcode_attributes[ 'custom_title' ], |
|
| 98 | + $shortcode_attributes[ 'description' ], |
|
| 99 | + $shortcode_attributes[ 'custom_description' ], |
|
| 100 | + $shortcode_attributes[ 'ajax' ], |
|
| 101 | + $shortcode_attributes[ 'recaptcha' ], |
|
| 102 | + $shortcode_attributes[ 'recaptcha_lang' ], |
|
| 103 | + $shortcode_attributes[ 'recaptcha_type' ], |
|
| 104 | + $shortcode_attributes[ 'recaptcha_theme' ], |
|
| 105 | + $shortcode_attributes[ 'recaptcha_size' ], |
|
| 106 | + $shortcode_attributes[ 'recaptcha_data_callback' ], |
|
| 107 | + $shortcode_attributes[ 'recaptcha_expired_callback' ], |
|
| 108 | + $shortcode_attributes[ 'inline' ] |
|
| 109 | 109 | ); |
| 110 | 110 | } |
| 111 | 111 | } |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | * @since 6.1.3 |
| 44 | 44 | */ |
| 45 | 45 | if ( ! defined( 'YIKES_MC_VERSION' ) ) { |
| 46 | - define( 'YIKES_MC_VERSION' , '6.5.1' ); |
|
| 46 | + define( 'YIKES_MC_VERSION', '6.5.1' ); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -1,15 +1,15 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | $form_data = array( |
| 3 | - 'field_name' => $_POST['field_name'], |
|
| 4 | - 'merge_tag' => $_POST['merge_tag'], |
|
| 5 | - 'field_type' => $_POST['field_type'], |
|
| 6 | - 'list_id' => $_POST['list_id'], |
|
| 3 | + 'field_name' => $_POST[ 'field_name' ], |
|
| 4 | + 'merge_tag' => $_POST[ 'merge_tag' ], |
|
| 5 | + 'field_type' => $_POST[ 'field_type' ], |
|
| 6 | + 'list_id' => $_POST[ 'list_id' ], |
|
| 7 | 7 | ); |
| 8 | 8 | |
| 9 | 9 | // Grab our list handler. |
| 10 | 10 | $list_handler = yikes_get_mc_api_manager()->get_list_handler(); |
| 11 | 11 | |
| 12 | -$available_merge_variables = $list_handler->get_merge_fields( $form_data['list_id'] ); |
|
| 12 | +$available_merge_variables = $list_handler->get_merge_fields( $form_data[ 'list_id' ] ); |
|
| 13 | 13 | if ( is_wp_error( $available_merge_variables ) ) { |
| 14 | 14 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 15 | 15 | $error_logging->maybe_write_to_log( |
@@ -28,17 +28,17 @@ discard block |
||
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | // find and return the location of this merge field in the array |
| 31 | -$index = $this->findMCListIndex( $form_data['merge_tag'], $available_merge_variables['merge_fields'], 'tag' ); |
|
| 31 | +$index = $this->findMCListIndex( $form_data[ 'merge_tag' ], $available_merge_variables[ 'merge_fields' ], 'tag' ); |
|
| 32 | 32 | |
| 33 | 33 | // store it and use it to pre-populate field data (only on initial add to form) |
| 34 | -$merge_field_data = $available_merge_variables['merge_fields'][ $index ]; |
|
| 34 | +$merge_field_data = $available_merge_variables[ 'merge_fields' ][ $index ]; |
|
| 35 | 35 | ?> |
| 36 | -<section class="draggable" id="<?php echo $form_data['field_name']; ?>"> |
|
| 36 | +<section class="draggable" id="<?php echo $form_data[ 'field_name' ]; ?>"> |
|
| 37 | 37 | <!-- top --> |
| 38 | 38 | <a href="#" class="expansion-section-title settings-sidebar"> |
| 39 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
|
| 40 | - <?php echo stripslashes( $form_data['field_name'] ); ?> |
|
| 41 | - <span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data['field_type']; ?></small></span> |
|
| 39 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
|
| 40 | + <?php echo stripslashes( $form_data[ 'field_name' ] ); ?> |
|
| 41 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data[ 'field_type' ]; ?></small></span> |
|
| 42 | 42 | </a> |
| 43 | 43 | <!-- expansion section --> |
| 44 | 44 | <div class="yikes-mc-settings-expansion-section"> |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | <!-- Single or Double Opt-in --> |
| 47 | 47 | <p class="type-container form-field-container"><!-- necessary to prevent skipping on slideToggle(); --> |
| 48 | 48 | <!-- store the label --> |
| 49 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][label]" value="<?php echo htmlspecialchars( $form_data['field_name'] ); ?>" /> |
|
| 50 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][type]" value="<?php echo $form_data['field_type']; ?>" /> |
|
| 51 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][merge]" value="<?php echo $merge_field_data['tag']; ?>" /> |
|
| 52 | - <input type="hidden" class="field-<?php echo $merge_field_data['tag']; ?>-position position-input" name="field[<?php echo $merge_field_data['tag']; ?>][position]" value="" /> |
|
| 49 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][label]" value="<?php echo htmlspecialchars( $form_data[ 'field_name' ] ); ?>" /> |
|
| 50 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][type]" value="<?php echo $form_data[ 'field_type' ]; ?>" /> |
|
| 51 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][merge]" value="<?php echo $merge_field_data[ 'tag' ]; ?>" /> |
|
| 52 | + <input type="hidden" class="field-<?php echo $merge_field_data[ 'tag' ]; ?>-position position-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][position]" value="" /> |
|
| 53 | 53 | |
| 54 | - <?php if ( $form_data['field_type'] == 'radio' || $form_data['field_type'] == 'dropdown' ) { ?> |
|
| 55 | - <?php $choices = ( isset( $merge_field_data['options']['choices'] ) ) ? esc_attr( json_encode( $merge_field_data['options']['choices'] ) ) : ''; ?> |
|
| 56 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][choices]" value='<?php echo $choices; ?>' /> |
|
| 54 | + <?php if ( $form_data[ 'field_type' ] == 'radio' || $form_data[ 'field_type' ] == 'dropdown' ) { ?> |
|
| 55 | + <?php $choices = ( isset( $merge_field_data[ 'options' ][ 'choices' ] ) ) ? esc_attr( json_encode( $merge_field_data[ 'options' ][ 'choices' ] ) ) : ''; ?> |
|
| 56 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][choices]" value='<?php echo $choices; ?>' /> |
|
| 57 | 57 | <?php } ?> |
| 58 | 58 | |
| 59 | 59 | <table class="form-table form-field-container"> |
@@ -62,15 +62,15 @@ discard block |
||
| 62 | 62 | <tr valign="top"> |
| 63 | 63 | <td scope="row"> |
| 64 | 64 | <label for="merge-tag"> |
| 65 | - <?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 65 | + <?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 66 | 66 | </label> |
| 67 | 67 | </td> |
| 68 | 68 | <td> |
| 69 | - <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data['tag']; ?>"> |
|
| 69 | + <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data[ 'tag' ]; ?>"> |
|
| 70 | 70 | </td> |
| 71 | 71 | </tr> |
| 72 | 72 | |
| 73 | - <?php switch( $form_data['field_type'] ) { |
|
| 73 | + <?php switch ( $form_data[ 'field_type' ] ) { |
|
| 74 | 74 | |
| 75 | 75 | default: |
| 76 | 76 | break; |
@@ -87,12 +87,12 @@ discard block |
||
| 87 | 87 | <tr valign="top"> |
| 88 | 88 | <td scope="row"> |
| 89 | 89 | <label for="placeholder"> |
| 90 | - <?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 90 | + <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 91 | 91 | </label> |
| 92 | 92 | </td> |
| 93 | 93 | <td> |
| 94 | - <input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="<?php echo isset( $merge_field_data['placeholder'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['placeholder'] ) ): '' ; ?>" /> |
|
| 95 | - <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 94 | + <input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="<?php echo isset( $merge_field_data[ 'placeholder' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'placeholder' ] ) ) : ''; ?>" /> |
|
| 95 | + <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 96 | 96 | </td> |
| 97 | 97 | </tr> |
| 98 | 98 | |
@@ -101,27 +101,27 @@ discard block |
||
| 101 | 101 | * Loop over field types and store necessary formats |
| 102 | 102 | * ( date, birthday - dateformat ; phone - phoneformat ) |
| 103 | 103 | */ |
| 104 | - switch( $form_data['field_type'] ) { |
|
| 104 | + switch ( $form_data[ 'field_type' ] ) { |
|
| 105 | 105 | |
| 106 | 106 | /* Store the date format, for properly rendering dates on the front end */ |
| 107 | 107 | case 'date': |
| 108 | - $date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD/YYYY'; |
|
| 108 | + $date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD/YYYY'; |
|
| 109 | 109 | ?> |
| 110 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" /> |
|
| 110 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" /> |
|
| 111 | 111 | <?php |
| 112 | 112 | break; |
| 113 | 113 | |
| 114 | 114 | case 'birthday': |
| 115 | - $date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD'; |
|
| 115 | + $date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD'; |
|
| 116 | 116 | ?> |
| 117 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" /> |
|
| 117 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" /> |
|
| 118 | 118 | <?php |
| 119 | 119 | break; |
| 120 | 120 | |
| 121 | 121 | /* Store the phone format, for properly regex pattern */ |
| 122 | 122 | case 'phone': |
| 123 | 123 | ?> |
| 124 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][phone_format]" value="<?php echo $merge_field_data['options']['phone_format']; ?>" /> |
|
| 124 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][phone_format]" value="<?php echo $merge_field_data[ 'options' ][ 'phone_format' ]; ?>" /> |
|
| 125 | 125 | <?php |
| 126 | 126 | break; |
| 127 | 127 | } |
@@ -132,13 +132,13 @@ discard block |
||
| 132 | 132 | ?> |
| 133 | 133 | <tr valign="top"> |
| 134 | 134 | <td scope="row"> |
| 135 | - <label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 136 | - <?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 135 | + <label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 136 | + <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 137 | 137 | </label> |
| 138 | 138 | </td> |
| 139 | 139 | <td> |
| 140 | - <input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="1" /> |
|
| 141 | - <span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span> |
|
| 140 | + <input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="1" /> |
|
| 141 | + <span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span> |
|
| 142 | 142 | </td> |
| 143 | 143 | </tr> |
| 144 | 144 | <?php |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | ?> |
| 149 | 149 | |
| 150 | 150 | <!-- Default Value --> |
| 151 | - <?php switch( $form_data['field_type'] ) { |
|
| 151 | + <?php switch ( $form_data[ 'field_type' ] ) { |
|
| 152 | 152 | |
| 153 | 153 | default: |
| 154 | 154 | case 'text': |
@@ -156,17 +156,17 @@ discard block |
||
| 156 | 156 | <tr valign="top"> |
| 157 | 157 | <td scope="row"> |
| 158 | 158 | <label for="placeholder"> |
| 159 | - <?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 159 | + <?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 160 | 160 | </label> |
| 161 | 161 | </td> |
| 162 | 162 | <td> |
| 163 | - <input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][default]" <?php if( $form_data['field_type'] != 'url' ) { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['default_value'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data['default_value'] ) ) ) : ''; } ?>" /> |
|
| 164 | - <p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 163 | + <input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default]" <?php if ( $form_data[ 'field_type' ] != 'url' ) { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'default_value' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data[ 'default_value' ] ) ) ) : ''; } ?>" /> |
|
| 164 | + <p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 165 | 165 | <?php |
| 166 | - switch ( $form_data['field_type'] ) { |
|
| 166 | + switch ( $form_data[ 'field_type' ] ) { |
|
| 167 | 167 | case 'text': |
| 168 | 168 | ?> |
| 169 | - <p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p> |
|
| 169 | + <p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p> |
|
| 170 | 170 | <?php |
| 171 | 171 | break; |
| 172 | 172 | } ?> |
@@ -180,28 +180,28 @@ discard block |
||
| 180 | 180 | <tr valign="top"> |
| 181 | 181 | <td scope="row"> |
| 182 | 182 | <label for="placeholder"> |
| 183 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 183 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 184 | 184 | </label> |
| 185 | 185 | </td> |
| 186 | 186 | <td> |
| 187 | - <?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?> |
|
| 188 | - <label for="<?php echo $merge_field_data['tag'] . '-no-default'; ?>"> |
|
| 189 | - <input id="<?php echo $merge_field_data['tag'] . '-no-default'; ?>" |
|
| 187 | + <?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?> |
|
| 188 | + <label for="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>"> |
|
| 189 | + <input id="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>" |
|
| 190 | 190 | type="radio" |
| 191 | - name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" |
|
| 191 | + name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" |
|
| 192 | 192 | value="no-default" <?php checked( $pre_selected, 'no-default' ); ?> |
| 193 | 193 | > |
| 194 | 194 | No Default |
| 195 | 195 | </label> |
| 196 | 196 | <?php |
| 197 | 197 | $x = 0; |
| 198 | - foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?> |
|
| 198 | + foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?> |
|
| 199 | 199 | <label> |
| 200 | - <input type="radio" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?> |
|
| 200 | + <input type="radio" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?> |
|
| 201 | 201 | </label> |
| 202 | 202 | <?php $x++; |
| 203 | 203 | } ?> |
| 204 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 204 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 205 | 205 | </td> |
| 206 | 206 | </tr> |
| 207 | 207 | |
@@ -213,18 +213,18 @@ discard block |
||
| 213 | 213 | <tr valign="top"> |
| 214 | 214 | <td scope="row"> |
| 215 | 215 | <label for="placeholder"> |
| 216 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 216 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 217 | 217 | </label> |
| 218 | 218 | </td> |
| 219 | 219 | <td> |
| 220 | - <select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]"> |
|
| 221 | - <?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?> |
|
| 220 | + <select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]"> |
|
| 221 | + <?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?> |
|
| 222 | 222 | <option value="no-default" <?php selected( $pre_selected, $choice ); ?>>No Default</option> |
| 223 | - <?php foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?> |
|
| 223 | + <?php foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?> |
|
| 224 | 224 | <option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option> |
| 225 | 225 | <?php } ?> |
| 226 | 226 | </select> |
| 227 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 227 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 228 | 228 | </td> |
| 229 | 229 | </tr> |
| 230 | 230 | |
@@ -237,77 +237,77 @@ discard block |
||
| 237 | 237 | <tr valign="top"> |
| 238 | 238 | <td scope="row"> |
| 239 | 239 | <label for="placeholder"> |
| 240 | - <?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 240 | + <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 241 | 241 | </label> |
| 242 | 242 | </td> |
| 243 | 243 | <td> |
| 244 | - <textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description]"></textarea> |
|
| 245 | - <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 244 | + <textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description]"></textarea> |
|
| 245 | + <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 246 | 246 | </td> |
| 247 | 247 | </tr> |
| 248 | 248 | <!-- Description Above Field --> |
| 249 | 249 | <tr valign="top" class="yikes-checkbox-container"> |
| 250 | 250 | <td scope="row"> |
| 251 | - <label for="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>"> |
|
| 252 | - <?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 251 | + <label for="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>"> |
|
| 252 | + <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 253 | 253 | </label> |
| 254 | 254 | </td> |
| 255 | 255 | <td> |
| 256 | - <input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description_above]" value="1" /> |
|
| 257 | - <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 256 | + <input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description_above]" value="1" /> |
|
| 257 | + <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 258 | 258 | </td> |
| 259 | 259 | </tr> |
| 260 | 260 | <!-- Additional Classes --> |
| 261 | 261 | <tr valign="top"> |
| 262 | 262 | <td scope="row"> |
| 263 | 263 | <label for="placeholder"> |
| 264 | - <?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 264 | + <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 265 | 265 | </label> |
| 266 | 266 | </td> |
| 267 | 267 | <td> |
| 268 | - <input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][additional-classes]" value="<?php echo isset( $form_data['classes'] ) ? stripslashes( wp_strip_all_tags( $form_data['classes'] ) ) : '' ; ?>" /> |
|
| 269 | - <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p> |
|
| 268 | + <input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][additional-classes]" value="<?php echo isset( $form_data[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $form_data[ 'classes' ] ) ) : ''; ?>" /> |
|
| 269 | + <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p> |
|
| 270 | 270 | </td> |
| 271 | 271 | </tr> |
| 272 | 272 | <!-- Required Toggle --> |
| 273 | 273 | <tr valign="top" class="yikes-checkbox-container"> |
| 274 | 274 | <td scope="row"> |
| 275 | 275 | <label for="field-required"> |
| 276 | - <?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 276 | + <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 277 | 277 | </label> |
| 278 | 278 | </td> |
| 279 | 279 | <td> |
| 280 | - <input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][require]" <?php checked( $merge_field_data['required'], 1 ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) { ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
| 281 | - <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 280 | + <input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][require]" <?php checked( $merge_field_data[ 'required' ], 1 ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) { ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
| 281 | + <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 282 | 282 | </td> |
| 283 | 283 | </tr> |
| 284 | 284 | <!-- Visible Toggle --> |
| 285 | 285 | <tr valign="top" class="yikes-checkbox-container"> |
| 286 | 286 | <td scope="row"> |
| 287 | 287 | <label for="hide-field"> |
| 288 | - <?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 288 | + <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 289 | 289 | </label> |
| 290 | 290 | </td> |
| 291 | 291 | <td> |
| 292 | - <input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][hide]" <?php checked( $merge_field_data['public'], '' ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) { ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
| 293 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 292 | + <input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide]" <?php checked( $merge_field_data[ 'public' ], '' ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) { ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
| 293 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 294 | 294 | </td> |
| 295 | 295 | </tr> |
| 296 | 296 | <!-- Toggle Field Label Visibility --> |
| 297 | 297 | <tr valign="top" class="yikes-checkbox-container"> |
| 298 | 298 | <td scope="row"> |
| 299 | 299 | <label for="placeholder"> |
| 300 | - <?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 300 | + <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 301 | 301 | </label> |
| 302 | 302 | </td> |
| 303 | 303 | <td> |
| 304 | - <input type="checkbox" name="field[<?php echo $merge_field_data['tag']; ?>][hide-label]" value="1" /> |
|
| 305 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 304 | + <input type="checkbox" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide-label]" value="1" /> |
|
| 305 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 306 | 306 | </td> |
| 307 | 307 | </tr> |
| 308 | 308 | <!-- Display Phone/Date Formats back to the user --> |
| 309 | 309 | <?php |
| 310 | - switch( $form_data['field_type'] ) { |
|
| 310 | + switch ( $form_data[ 'field_type' ] ) { |
|
| 311 | 311 | |
| 312 | 312 | /* Store the phone format, for properly regex pattern */ |
| 313 | 313 | case 'phone': |
@@ -318,23 +318,23 @@ discard block |
||
| 318 | 318 | <td scope="row"> |
| 319 | 319 | <label for="placeholder"> |
| 320 | 320 | <?php |
| 321 | - switch( $form_data['field_type'] ) { |
|
| 321 | + switch ( $form_data[ 'field_type' ] ) { |
|
| 322 | 322 | default: |
| 323 | 323 | case 'birthday': |
| 324 | - $type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' ); |
|
| 325 | - $format = $merge_field_data['options']['date_format']; |
|
| 324 | + $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 325 | + $format = $merge_field_data[ 'options' ][ 'date_format' ]; |
|
| 326 | 326 | $format_name = 'date_format'; |
| 327 | 327 | break; |
| 328 | 328 | |
| 329 | 329 | case 'date': |
| 330 | - $type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' ); |
|
| 331 | - $format = $merge_field_data['options']['date_format']; |
|
| 330 | + $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 331 | + $format = $merge_field_data[ 'options' ][ 'date_format' ]; |
|
| 332 | 332 | $format_name = 'date_format'; |
| 333 | 333 | break; |
| 334 | 334 | |
| 335 | 335 | case 'phone': |
| 336 | - $type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' ); |
|
| 337 | - $format = ( ( $merge_field_data['options']['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data['options']['phone_format'] ); |
|
| 336 | + $type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 337 | + $format = ( ( $merge_field_data[ 'options' ][ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data[ 'options' ][ 'phone_format' ] ); |
|
| 338 | 338 | $format_name = 'phone_format'; |
| 339 | 339 | break; |
| 340 | 340 | } |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | </td> |
| 345 | 345 | <td> |
| 346 | 346 | <strong><?php echo $format; ?></strong> |
| 347 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
| 347 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
| 348 | 348 | <p class="description"><small> |
| 349 | 349 | <?php printf( __( 'To change the %s please head over to <a href="%s" title="Mailchimp" target="_blank">Mailchimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?> |
| 350 | 350 | </small></p> |
@@ -365,8 +365,8 @@ discard block |
||
| 365 | 365 | </td> |
| 366 | 366 | <td> |
| 367 | 367 | <span class="toggle-container"> |
| 368 | - <a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 369 | - <a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 368 | + <a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 369 | + <a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 370 | 370 | </span> |
| 371 | 371 | </td> |
| 372 | 372 | </tr> |
@@ -6,13 +6,13 @@ discard block |
||
| 6 | 6 | $all_forms = $form_interface->get_all_forms(); |
| 7 | 7 | |
| 8 | 8 | /* Store Data if User is Authorized */ |
| 9 | -if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) { |
|
| 9 | +if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) { |
|
| 10 | 10 | $list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists(); |
| 11 | 11 | if ( is_wp_error( $list_data ) ) { |
| 12 | 12 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 13 | 13 | $error_logging->maybe_write_to_log( |
| 14 | 14 | $list_data->get_error_code(), |
| 15 | - __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), |
|
| 15 | + __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), |
|
| 16 | 16 | "Manage Forms Page" |
| 17 | 17 | ); |
| 18 | 18 | $list_data = array(); |
@@ -23,24 +23,24 @@ discard block |
||
| 23 | 23 | ?> |
| 24 | 24 | <div class="wrap"> |
| 25 | 25 | <!-- Freddie Logo --> |
| 26 | - <img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 26 | + <img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 27 | 27 | |
| 28 | - <h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ) ?></h1> |
|
| 28 | + <h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ) ?></h1> |
|
| 29 | 29 | |
| 30 | 30 | <!-- Settings Page Description --> |
| 31 | - <p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 31 | + <p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 32 | 32 | |
| 33 | 33 | <!-- Action Notices --> |
| 34 | 34 | <?php |
| 35 | 35 | |
| 36 | 36 | /* If the user hasn't authenticated yet, lets kill off */ |
| 37 | - if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) { |
|
| 38 | - wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>' , 500 ); |
|
| 37 | + if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) { |
|
| 38 | + wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>', 500 ); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /* Display our admin notices here */ |
| 42 | 42 | // delete form success |
| 43 | - if( isset( $_REQUEST['deleted-form'] ) && $_REQUEST['deleted-form'] == 'true' ) { |
|
| 43 | + if ( isset( $_REQUEST[ 'deleted-form' ] ) && $_REQUEST[ 'deleted-form' ] == 'true' ) { |
|
| 44 | 44 | ?> |
| 45 | 45 | <div class="updated manage-form-admin-notice"> |
| 46 | 46 | <p><?php _e( 'Opt-in form successfully deleted.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | <?php |
| 49 | 49 | } |
| 50 | 50 | // duplicate form success |
| 51 | - if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'true' ) { |
|
| 51 | + if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'true' ) { |
|
| 52 | 52 | ?> |
| 53 | 53 | <div class="updated manage-form-admin-notice"> |
| 54 | 54 | <p><?php _e( 'Mailchimp Form successfully cloned.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | <?php |
| 57 | 57 | } |
| 58 | 58 | // duplicate form error |
| 59 | - if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'false' ) { |
|
| 59 | + if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'false' ) { |
|
| 60 | 60 | ?> |
| 61 | 61 | <div class="error manage-form-admin-notice"> |
| 62 | 62 | <p><?php _e( 'There was an error trying to clone your form. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | <?php |
| 65 | 65 | } |
| 66 | 66 | // reset form submission stats success |
| 67 | - if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'true' ) { |
|
| 67 | + if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'true' ) { |
|
| 68 | 68 | ?> |
| 69 | 69 | <div class="updated manage-form-admin-notice"> |
| 70 | 70 | <p><?php _e( 'Form submission stats/rates successfully reset.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | <?php |
| 73 | 73 | } |
| 74 | 74 | // reset form submission stats error |
| 75 | - if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'false' ) { |
|
| 75 | + if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'false' ) { |
|
| 76 | 76 | ?> |
| 77 | 77 | <div class="error manage-form-admin-notice"> |
| 78 | 78 | <p><?php _e( 'There was an error trying to reset the form submission stats/rates. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -99,13 +99,13 @@ discard block |
||
| 99 | 99 | <thead> |
| 100 | 100 | <tr> |
| 101 | 101 | <th id="cb" class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th> |
| 102 | - <th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 103 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 104 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 105 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 106 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 107 | - <th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 108 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 102 | + <th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 103 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 104 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 105 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 106 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 107 | + <th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 108 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 109 | 109 | </tr> |
| 110 | 110 | </thead> |
| 111 | 111 | <!-- end header --> |
@@ -114,13 +114,13 @@ discard block |
||
| 114 | 114 | <tfoot> |
| 115 | 115 | <tr> |
| 116 | 116 | <th class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th> |
| 117 | - <th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 118 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 119 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 120 | - <th class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 121 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 122 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 123 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 117 | + <th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 118 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 119 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 120 | + <th class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 121 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 122 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 123 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 124 | 124 | </tr> |
| 125 | 125 | </tfoot> |
| 126 | 126 | <!-- end footer --> |
@@ -130,40 +130,40 @@ discard block |
||
| 130 | 130 | <?php |
| 131 | 131 | if ( count( $all_forms ) > 0 ) { |
| 132 | 132 | $i = 1; |
| 133 | - foreach( $all_forms as $id => $form ) { |
|
| 133 | + foreach ( $all_forms as $id => $form ) { |
|
| 134 | 134 | ?> |
| 135 | - <tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>"> |
|
| 135 | + <tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>"> |
|
| 136 | 136 | <th class="check-column num" scope="row"><input type="checkbox" /></th> |
| 137 | 137 | <td class="column-columnname num"><span class="form-id-container"><?php echo intval( $id ); ?></span></td> |
| 138 | 138 | <td class="column-columnname"> |
| 139 | 139 | <!-- row title/link --> |
| 140 | - <a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title"> |
|
| 141 | - <?php echo stripslashes( $form['form_name'] ); ?> |
|
| 140 | + <a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title"> |
|
| 141 | + <?php echo stripslashes( $form[ 'form_name' ] ); ?> |
|
| 142 | 142 | </a> |
| 143 | 143 | <div class="row-actions"> |
| 144 | - <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 145 | - <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 146 | - <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 147 | - <span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 144 | + <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 145 | + <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 146 | + <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 147 | + <span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 148 | 148 | <?php |
| 149 | 149 | /* |
| 150 | 150 | * Custom action to allow users to add additional action links |
| 151 | 151 | * to each form. We use this in our add-ons. |
| 152 | 152 | * - Delete should remain last |
| 153 | 153 | */ |
| 154 | - do_action( 'yikes-mailchimp-custom-form-actions' , $id ); |
|
| 154 | + do_action( 'yikes-mailchimp-custom-form-actions', $id ); |
|
| 155 | 155 | ?> |
| 156 | - <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.' , 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form['form_name'] ) ); ?>');"><?php _e( "Delete" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span> |
|
| 156 | + <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.', 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form[ 'form_name' ] ) ); ?>');"><?php _e( "Delete", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span> |
|
| 157 | 157 | </div> |
| 158 | 158 | </td> |
| 159 | 159 | |
| 160 | - <td class="column-columnname"><?php echo isset( $form['form_description'] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form['form_description'] ) : ''; ?></td> |
|
| 160 | + <td class="column-columnname"><?php echo isset( $form[ 'form_description' ] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form[ 'form_description' ] ) : ''; ?></td> |
|
| 161 | 161 | <td class="column-columnname"> |
| 162 | 162 | <?php |
| 163 | 163 | if ( $list_data && count( $list_data ) > 0 ) { |
| 164 | 164 | $parsed = wp_list_pluck( $list_data, 'name', 'id' ); |
| 165 | - if ( isset( $parsed[ $form['list_id'] ] ) ) { |
|
| 166 | - echo esc_textarea( $parsed[ $form['list_id'] ] ); |
|
| 165 | + if ( isset( $parsed[ $form[ 'list_id' ] ] ) ) { |
|
| 166 | + echo esc_textarea( $parsed[ $form[ 'list_id' ] ] ); |
|
| 167 | 167 | } else { |
| 168 | 168 | echo '<strong>' . __( 'List Not Found', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>'; |
| 169 | 169 | } |
@@ -172,25 +172,25 @@ discard block |
||
| 172 | 172 | |
| 173 | 173 | <td class="column-columnname num stat-container"> |
| 174 | 174 | <?php |
| 175 | - $impressions = number_format( $form['impressions'] ); |
|
| 176 | - echo '<span title="' . __( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>'; |
|
| 175 | + $impressions = number_format( $form[ 'impressions' ] ); |
|
| 176 | + echo '<span title="' . __( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>'; |
|
| 177 | 177 | ?> |
| 178 | 178 | </td> |
| 179 | 179 | <td class="column-columnname num stat-container"> |
| 180 | 180 | <?php |
| 181 | - $submissions = number_format( $form['submissions'] ); |
|
| 182 | - echo '<span title="' . __( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>'; |
|
| 181 | + $submissions = number_format( $form[ 'submissions' ] ); |
|
| 182 | + echo '<span title="' . __( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>'; |
|
| 183 | 183 | ?> |
| 184 | 184 | </td> |
| 185 | 185 | <td class="column-columnname num stat-container"> |
| 186 | 186 | <?php |
| 187 | - if( $impressions != 0 ) { |
|
| 188 | - $conversion_rate = ( round( 100 * $form['submissions'] / $form['impressions'] , 3 ) ); |
|
| 189 | - if( $conversion_rate >= '15' ) { |
|
| 187 | + if ( $impressions != 0 ) { |
|
| 188 | + $conversion_rate = ( round( 100 * $form[ 'submissions' ] / $form[ 'impressions' ], 3 ) ); |
|
| 189 | + if ( $conversion_rate >= '15' ) { |
|
| 190 | 190 | $conversion_color = '#00cc00'; // green (unicorn!) |
| 191 | - } else if( $conversion_rate < '15' && $conversion_rate >= '10' ) { |
|
| 191 | + } else if ( $conversion_rate < '15' && $conversion_rate >= '10' ) { |
|
| 192 | 192 | $conversion_color = '#0080FF'; // light blue (good) |
| 193 | - } else if( $conversion_rate < '10' && $conversion_rate >= '5' ) { |
|
| 193 | + } else if ( $conversion_rate < '10' && $conversion_rate >= '5' ) { |
|
| 194 | 194 | $conversion_color = '#FFFF32'; // yellow (ok) |
| 195 | 195 | } else { |
| 196 | 196 | $conversion_color = '#FF0000'; // red (no bueno) |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | $conversion_rate = '0'; |
| 200 | 200 | $conversion_color = '#333333'; |
| 201 | 201 | } |
| 202 | - echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>'; |
|
| 202 | + echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>'; |
|
| 203 | 203 | ?> |
| 204 | 204 | </td> |
| 205 | 205 | <!-- shortcode --> |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | } |
| 213 | 213 | } else { ?> |
| 214 | 214 | <tr class="no-items"> |
| 215 | - <td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td> |
|
| 215 | + <td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td> |
|
| 216 | 216 | </tr> |
| 217 | 217 | <?php } ?> |
| 218 | 218 | </tbody> |
