@@ -27,13 +27,13 @@ discard block |
||
27 | 27 | */ |
28 | 28 | foreach ( $interest_groupings as $id => $interest_group ) { |
29 | 29 | |
30 | - $interest_group_type = isset( $interest_group['type'] ) ? $interest_group['type'] : ''; |
|
31 | - $interest_groups_fields = isset( $interest_group['items'] ) ? $interest_group['items'] : array(); |
|
32 | - $selected_interest_groups = isset( $integration_options[ $integration_type ]['interest-groups'] ) ? $integration_options[ $integration_type ]['interest-groups'] : array(); |
|
33 | - $selected_interest_groups = isset( $selected_interest_groups[$list_id] ) ? $selected_interest_groups[$list_id] : $selected_interest_groups; |
|
30 | + $interest_group_type = isset( $interest_group[ 'type' ] ) ? $interest_group[ 'type' ] : ''; |
|
31 | + $interest_groups_fields = isset( $interest_group[ 'items' ] ) ? $interest_group[ 'items' ] : array(); |
|
32 | + $selected_interest_groups = isset( $integration_options[ $integration_type ][ 'interest-groups' ] ) ? $integration_options[ $integration_type ][ 'interest-groups' ] : array(); |
|
33 | + $selected_interest_groups = isset( $selected_interest_groups[ $list_id ] ) ? $selected_interest_groups[ $list_id ] : $selected_interest_groups; |
|
34 | 34 | ?> |
35 | 35 | <section class="interest-group-section"> |
36 | - <strong class="interest-group-section-title"><?php echo ucwords( $interest_group['title'] ); ?></strong> |
|
36 | + <strong class="interest-group-section-title"><?php echo ucwords( $interest_group[ 'title' ] ); ?></strong> |
|
37 | 37 | <?php |
38 | 38 | |
39 | 39 | /* |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | <input type="checkbox" |
56 | 56 | name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $list_id; ?>][<?php echo $id; ?>][]" |
57 | 57 | value="<?php echo $field_id; ?>" <?php echo $checked; ?>> |
58 | - <?php echo $field['name']; ?> |
|
58 | + <?php echo $field[ 'name' ]; ?> |
|
59 | 59 | </label> |
60 | 60 | <?php |
61 | 61 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | <input type="radio" |
72 | 72 | name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $list_id; ?>][<?php echo $id; ?>][]" |
73 | 73 | value="<?php echo $field_id; ?>" <?php echo $checked; ?>> |
74 | - <?php echo $field['name']; ?> |
|
74 | + <?php echo $field[ 'name' ]; ?> |
|
75 | 75 | </label> |
76 | 76 | <?php |
77 | 77 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | } |
90 | 90 | ?> |
91 | 91 | <option value="<?php echo $field_id; ?>" <?php echo $selected; ?>> |
92 | - <?php echo $field['name']; ?> |
|
92 | + <?php echo $field[ 'name' ]; ?> |
|
93 | 93 | </option> |
94 | 94 | <?php |
95 | 95 | } |
@@ -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"> |
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 | - <span 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></span> |
|
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 | + <span 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></span> |
|
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"> |
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"> |
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"> |
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> |
@@ -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"> |
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"> |
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 | - <span 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></span> |
|
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 | + <span 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></span> |
|
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"> |
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"> |
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"> |
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> |
@@ -22,13 +22,13 @@ |
||
22 | 22 | } |
23 | 23 | |
24 | 24 | // Verify Honeypot |
25 | - if ( ! empty( $_POST['hp'] ) ) { |
|
25 | + if ( ! empty( $_POST[ 'hp' ] ) ) { |
|
26 | 26 | wp_send_json_error( '2' ); |
27 | 27 | } |
28 | 28 | |
29 | 29 | // Get email, list ID |
30 | - $email = isset( $_POST['email'] ) ? $_POST['email'] : ''; |
|
31 | - $list_id = isset( $_POST['list_id'] ) ? $_POST['list_id'] : ''; |
|
30 | + $email = isset( $_POST[ 'email' ] ) ? $_POST[ 'email' ] : ''; |
|
31 | + $list_id = isset( $_POST[ 'list_id' ] ) ? $_POST[ 'list_id' ] : ''; |
|
32 | 32 | |
33 | 33 | if ( empty( $email ) || empty( $list_id ) ) { |
34 | 34 | wp_send_json_error( '3' ); |
@@ -14,20 +14,20 @@ discard block |
||
14 | 14 | |
15 | 15 | $values = is_array( $args ) ? array_merge( $defaults, $args ) : $defaults; |
16 | 16 | |
17 | - if ( empty( $values['list'] ) && empty( $values['form'] ) ) { |
|
17 | + if ( empty( $values[ 'list' ] ) && empty( $values[ 'form' ] ) ) { |
|
18 | 18 | return '<!-- YIKES Easy Forms Error: no list ID / form ID -->'; |
19 | 19 | } |
20 | 20 | |
21 | - if ( ! empty( $values['form'] ) ) { |
|
21 | + if ( ! empty( $values[ 'form' ] ) ) { |
|
22 | 22 | |
23 | 23 | // Get the list ID from the form ID |
24 | 24 | $interface = yikes_easy_mailchimp_extender_get_form_interface(); |
25 | - $form_data = $interface->get_form( $values['form'] ); |
|
26 | - $list_id = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null; |
|
25 | + $form_data = $interface->get_form( $values[ 'form' ] ); |
|
26 | + $list_id = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null; |
|
27 | 27 | |
28 | - } else if ( ! empty( $values['list'] ) ) { |
|
28 | + } else if ( ! empty( $values[ 'list' ] ) ) { |
|
29 | 29 | |
30 | - $list_id = $values['list']; |
|
30 | + $list_id = $values[ 'list' ]; |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | if ( empty( $list_id ) ) { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | 'loader' => apply_filters( 'yikes-mailchimp-unsubscribe-loader', YIKES_MC_URL . 'includes/images/ripple.svg' ), |
46 | 46 | ) |
47 | 47 | ); |
48 | - wp_enqueue_script ( 'yikes-mailchimp-unsubscribe-script' ); |
|
48 | + wp_enqueue_script( 'yikes-mailchimp-unsubscribe-script' ); |
|
49 | 49 | |
50 | 50 | // Include our styles |
51 | 51 | wp_enqueue_style( 'yikes-mailchimp-unsubscribe-styles', plugin_dir_url( __FILE__ ) . '/unsubscribe.css', array(), YIKES_MC_VERSION, 'all' ); |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | <section id="yikes-mailchimp-unsubscribe-container-<?php echo $list_id; ?>" class="yikes-mailchimp-unsubscribe-container"> |
56 | 56 | |
57 | 57 | <div id="yikes-mailchimp-unsubscribe-title-<?php echo $list_id; ?>" class="yikes-mailchimp-unsubscribe-title"> |
58 | - <h2><?php echo apply_filters( 'yikes-mailchimp-unsubscribe-title', $values['title'] ); ?></h2> |
|
58 | + <h2><?php echo apply_filters( 'yikes-mailchimp-unsubscribe-title', $values[ 'title' ] ); ?></h2> |
|
59 | 59 | </div> |
60 | 60 | |
61 | 61 | <div id="yikes-mailchimp-unsubscribe-description-<?php echo $list_id; ?>" class="yikes-mailchimp-unsubscribe-description"> |
62 | - <?php echo apply_filters( 'yikes-mailchimp-unsubscribe-description', $values['description'] ); ?> |
|
62 | + <?php echo apply_filters( 'yikes-mailchimp-unsubscribe-description', $values[ 'description' ] ); ?> |
|
63 | 63 | </div> |
64 | 64 | |
65 | 65 | <?php do_action( 'yikes-mailchimp-unsubscribe-before-form' ); ?> |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | <!-- Email --> |
72 | 72 | <?php do_action( 'yikes-mailchimp-unsubscribe-before-email' ); ?> |
73 | 73 | <label for="yikes-mailchimp-unsubscribe-email" class="EMAIL-label"> |
74 | - <span class="EMAIL-label"><?php echo $values['email_label']; ?></span> |
|
75 | - <input name="EMAIL" placeholder="<?php echo $values['email_placeholder']; ?>" class="yikes-mailchimp-unsubscribe-email" id="yikes-mailchimp-unsubscribe-email" required="required" type="email" value="<?php echo esc_attr( apply_filters( 'yikes-mailchimp-unsubscribe-email-default', '' ) ); ?>"> |
|
74 | + <span class="EMAIL-label"><?php echo $values[ 'email_label' ]; ?></span> |
|
75 | + <input name="EMAIL" placeholder="<?php echo $values[ 'email_placeholder' ]; ?>" class="yikes-mailchimp-unsubscribe-email" id="yikes-mailchimp-unsubscribe-email" required="required" type="email" value="<?php echo esc_attr( apply_filters( 'yikes-mailchimp-unsubscribe-email-default', '' ) ); ?>"> |
|
76 | 76 | </label> |
77 | 77 | <?php do_action( 'yikes-mailchimp-unsubscribe-after-email' ); ?> |
78 | 78 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | <!-- Submit Button --> |
86 | 86 | <button type="submit" class="yikes-mailchimp-unsubscribe-submit-button"> |
87 | - <span class="yikes-mailchimp-submit-button-span-text"><?php echo $values['submit_label']; ?></span> |
|
87 | + <span class="yikes-mailchimp-submit-button-span-text"><?php echo $values[ 'submit_label' ]; ?></span> |
|
88 | 88 | </button> |
89 | 89 | |
90 | 90 | <input type="hidden" class="yikes-mailchimp-unsubscribe-nonce" name="yikes-mailchimp-unsubscribe-nonce" value="<?php echo wp_create_nonce( 'yikes-mailchimp-unsubscribe' ); ?>"> |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | $data = $_POST; |
15 | 15 | |
16 | 16 | // Confirm we have a form id to work with |
17 | -$form_id = ( isset( $data['yikes-mailchimp-submitted-form'] ) ) ? absint( $data['yikes-mailchimp-submitted-form'] ) : false; |
|
17 | +$form_id = ( isset( $data[ 'yikes-mailchimp-submitted-form' ] ) ) ? absint( $data[ 'yikes-mailchimp-submitted-form' ] ) : false; |
|
18 | 18 | |
19 | 19 | // Set the form id in our class |
20 | 20 | $submission_handler->set_form_id( $form_id ); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | // Check our nonce |
31 | -if ( $submission_handler->handle_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) === false ) { |
|
31 | +if ( $submission_handler->handle_nonce( $_POST[ 'yikes_easy_mc_new_subscriber' ], 'yikes_easy_mc_form_submit' ) === false ) { |
|
32 | 32 | $process_submission_response = $submission_handler->wrap_form_submission_response( $submission_handler->handle_nonce_message, $is_success = false ); |
33 | 33 | return; |
34 | 34 | } |
@@ -44,10 +44,10 @@ discard block |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | // Set up some variables from the form data -- these are required |
47 | -$list_id = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null; |
|
48 | -$submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null; |
|
49 | -$optin_settings = isset( $form_data['optin_settings'] ) ? $form_data['optin_settings'] : null; |
|
50 | -$form_fields = isset( $form_data['fields'] ) ? $form_data['fields'] : null; |
|
47 | +$list_id = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null; |
|
48 | +$submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null; |
|
49 | +$optin_settings = isset( $form_data[ 'optin_settings' ] ) ? $form_data[ 'optin_settings' ] : null; |
|
50 | +$form_fields = isset( $form_data[ 'fields' ] ) ? $form_data[ 'fields' ] : null; |
|
51 | 51 | |
52 | 52 | // Send an error if for some reason we can't find the required form data |
53 | 53 | if ( $submission_handler->handle_empty_fields_generic( array( $list_id, $submission_settings, $optin_settings, $form_fields ) ) === false ) { |
@@ -70,8 +70,8 @@ discard block |
||
70 | 70 | $submission_handler->set_list_id( $list_id ); |
71 | 71 | |
72 | 72 | // Set up some variables from the form data -- these are not required |
73 | -$error_messages = isset( $form_data['error_messages'] ) ? $form_data['error_messages'] : array(); |
|
74 | -$notifications = isset( $form_data['custom_notifications'] ) ? $form_data['custom_notifications'] : array(); // Do we need this? |
|
73 | +$error_messages = isset( $form_data[ 'error_messages' ] ) ? $form_data[ 'error_messages' ] : array(); |
|
74 | +$notifications = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array(); // Do we need this? |
|
75 | 75 | |
76 | 76 | // Set the error messages in our class |
77 | 77 | $submission_handler->set_error_messages( $error_messages ); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | // Get, sanitize, and lowercasify the email |
90 | -$submitted_email = isset( $data['EMAIL'] ) ? $data['EMAIL'] : ''; |
|
90 | +$submitted_email = isset( $data[ 'EMAIL' ] ) ? $data[ 'EMAIL' ] : ''; |
|
91 | 91 | $sanitized_email = $submission_handler->get_sanitized_email( $submitted_email ); |
92 | 92 | $submission_handler->set_email( $sanitized_email ); |
93 | 93 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | // Check for Honeypot filled |
101 | -$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && '' !== $data['yikes-mailchimp-honeypot'] ) ? true : false; |
|
101 | +$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && '' !== $data[ 'yikes-mailchimp-honeypot' ] ) ? true : false; |
|
102 | 102 | |
103 | 103 | // Send an error if honey pot is not empty |
104 | 104 | if ( $submission_handler->handle_non_empty_honeypot( $honey_pot_filled ) === false ) { |
@@ -107,11 +107,11 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | // Check if reCAPTCHA Response was submitted with the form data, and handle it if needed |
110 | -if ( isset( $data['g-recaptcha-response'] ) ) { |
|
111 | - $recaptcha_response = $data['g-recaptcha-response']; |
|
110 | +if ( isset( $data[ 'g-recaptcha-response' ] ) ) { |
|
111 | + $recaptcha_response = $data[ 'g-recaptcha-response' ]; |
|
112 | 112 | $recaptcha_handle = $submission_handler->handle_recaptcha( $recaptcha_response ); |
113 | - if ( isset( $recaptcha_handle['success'] ) && $recaptcha_handle['success'] === false ) { |
|
114 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $recaptcha_handle['message'], $is_success = false ); |
|
113 | + if ( isset( $recaptcha_handle[ 'success' ] ) && $recaptcha_handle[ 'success' ] === false ) { |
|
114 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $recaptcha_handle[ 'message' ], $is_success = false ); |
|
115 | 115 | return; |
116 | 116 | } |
117 | 117 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $merge_variables = $submission_handler->get_submitted_merge_values( $data, $form_fields ); |
121 | 121 | |
122 | 122 | // Submission Setting: Replace interest groups or update interest groups |
123 | -$replace_interests = isset( $submission_settings['replace_interests'] ) ? (bool) $submission_settings['replace_interests'] : true; |
|
123 | +$replace_interests = isset( $submission_settings[ 'replace_interests' ] ) ? (bool) $submission_settings[ 'replace_interests' ] : true; |
|
124 | 124 | |
125 | 125 | // Get the default groups |
126 | 126 | $groups = $submission_handler->get_default_interest_groups( $replace_interests, $list_handler ); |
@@ -135,17 +135,17 @@ discard block |
||
135 | 135 | * |
136 | 136 | * @param $merge_variables array Array of merge variable to use |
137 | 137 | */ |
138 | -do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
138 | +do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
139 | 139 | do_action( "yikes-mailchimp-before-submission-{$form_id}", $merge_variables ); |
140 | 140 | |
141 | 141 | // Allow users to check for form values (using the `yikes-mailchimp-filter-before-submission` filter hook in function `get_submitted_merge_values`) |
142 | 142 | // and pass back an error and message to the user |
143 | 143 | // If error is set and no message, default to our class variable's default error message |
144 | -if ( isset( $merge_variables['error'] ) ) { |
|
145 | - $merge_error_message = isset( $merge_variables['message'] ) ? $merge_variables['message'] : $submission_handler->default_error_response_message; |
|
146 | - $merge_vars_error_array = $submission_handler->handle_merge_variables_error( $merge_variables['error'], $merge_error_message ); |
|
147 | - if ( $merge_vars_error_array['success'] === false ) { |
|
148 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $merge_vars_error_array['message'], $is_success = false ); |
|
144 | +if ( isset( $merge_variables[ 'error' ] ) ) { |
|
145 | + $merge_error_message = isset( $merge_variables[ 'message' ] ) ? $merge_variables[ 'message' ] : $submission_handler->default_error_response_message; |
|
146 | + $merge_vars_error_array = $submission_handler->handle_merge_variables_error( $merge_variables[ 'error' ], $merge_error_message ); |
|
147 | + if ( $merge_vars_error_array[ 'success' ] === false ) { |
|
148 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $merge_vars_error_array[ 'message' ], $is_success = false ); |
|
149 | 149 | return; |
150 | 150 | } |
151 | 151 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | |
160 | 160 | // Only add groups if they exist |
161 | 161 | if ( ! empty( $groups ) ) { |
162 | - $member_data['interests'] = $groups; |
|
162 | + $member_data[ 'interests' ] = $groups; |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | // Check if this member already exists |
@@ -169,30 +169,30 @@ discard block |
||
169 | 169 | // Likewise, if this member exists but their status is 'pending' it means we're dealing with a double opt-in list and they never confirmed |
170 | 170 | // Or, if this member but their status is 'unsubscribed' it means we're dealing with someone who unsubscribed and they need to re-subscribe |
171 | 171 | // Continue as if they're a new member to force another double opt-in email |
172 | -$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists['status'] ) && ( $member_exists['status'] === 'pending' || $member_exists['status'] === 'unsubscribed' ); |
|
172 | +$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && ( $member_exists[ 'status' ] === 'pending' || $member_exists[ 'status' ] === 'unsubscribed' ); |
|
173 | 173 | |
174 | 174 | if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) { |
175 | 175 | $new_subscriber = true; |
176 | 176 | |
177 | 177 | // Check the opt-in value - is it double or single? |
178 | 178 | // Double opt-in means 'status_if_new' => 'pending' |
179 | - $double_optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0; |
|
179 | + $double_optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0; |
|
180 | 180 | |
181 | 181 | // If the user was unsubscribed and is re-subscribing, we set the status to 'pending', which |
182 | 182 | // causes Mailchimp to send them a confirmation email. This is the only way Mailchimp will |
183 | 183 | // allow us to re-subscribe the user. |
184 | - $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists['status'] ) && $member_exists['status'] === 'unsubscribed'; |
|
184 | + $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && $member_exists[ 'status' ] === 'unsubscribed'; |
|
185 | 185 | |
186 | 186 | if ( $double_optin === 1 || $was_unsubscribed === true ) { |
187 | 187 | |
188 | 188 | // Double opt-in |
189 | - $member_data['status_if_new'] = 'pending'; |
|
190 | - $member_data['status'] = 'pending'; |
|
189 | + $member_data[ 'status_if_new' ] = 'pending'; |
|
190 | + $member_data[ 'status' ] = 'pending'; |
|
191 | 191 | } else { |
192 | 192 | |
193 | 193 | // Single opt-in |
194 | - $member_data['status_if_new'] = 'subscribed'; |
|
195 | - $member_data['status'] = 'subscribed'; |
|
194 | + $member_data[ 'status_if_new' ] = 'subscribed'; |
|
195 | + $member_data[ 'status' ] = 'subscribed'; |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | } else { |
@@ -201,28 +201,28 @@ discard block |
||
201 | 201 | |
202 | 202 | // But first let's set our flag, and set the MailChimp status flag |
203 | 203 | $new_subscriber = false; |
204 | - $member_data['status'] = 'subscribed'; |
|
204 | + $member_data[ 'status' ] = 'subscribed'; |
|
205 | 205 | |
206 | 206 | // Check our update_existing_user optin setting |
207 | - $update_existing_user = ( $optin_settings['update_existing_user'] === '1' ) ? true : false; |
|
207 | + $update_existing_user = ( $optin_settings[ 'update_existing_user' ] === '1' ) ? true : false; |
|
208 | 208 | |
209 | 209 | // If update_existing_user is false (not allowed) then simply fail and return a response message |
210 | 210 | if ( $update_existing_user === false ) { |
211 | 211 | $disallow_update_array = $submission_handler->handle_disallowed_existing_user_update(); |
212 | - if ( $disallow_update_array['success'] === false ) { |
|
213 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array['message'], $is_success = false ); |
|
212 | + if ( $disallow_update_array[ 'success' ] === false ) { |
|
213 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array[ 'message' ], $is_success = false ); |
|
214 | 214 | return; |
215 | 215 | } |
216 | 216 | } |
217 | 217 | |
218 | 218 | // If update_existing_user is true, we need to check our 'send_update_email' option |
219 | - $send_update_email = ( $optin_settings['send_update_email'] === '1' ) ? true : false; |
|
219 | + $send_update_email = ( $optin_settings[ 'send_update_email' ] === '1' ) ? true : false; |
|
220 | 220 | |
221 | 221 | // If $send_update_email is true (we send the email) then we need to fire off the 'send update email' logic |
222 | 222 | if ( $send_update_email === true ) { |
223 | 223 | $update_existing_user_array = $submission_handler->handle_updating_existing_user(); |
224 | - if ( $update_existing_user_array['success'] === false ) { |
|
225 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array['message'], $is_success = false ); |
|
224 | + if ( $update_existing_user_array[ 'success' ] === false ) { |
|
225 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array[ 'message' ], $is_success = false ); |
|
226 | 226 | return; |
227 | 227 | } |
228 | 228 | } |
@@ -254,9 +254,9 @@ discard block |
||
254 | 254 | } |
255 | 255 | |
256 | 256 | // Handle errors in the response |
257 | -if ( isset( $success_array ) && isset( $success_array['success'] ) && $success_array['success'] === false ) { |
|
258 | - $process_submission_response = isset( $success_array['message'] ) ? $success_array['message'] : ''; |
|
259 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $success_array['message'], $is_success = false ); |
|
257 | +if ( isset( $success_array ) && isset( $success_array[ 'success' ] ) && $success_array[ 'success' ] === false ) { |
|
258 | + $process_submission_response = isset( $success_array[ 'message' ] ) ? $success_array[ 'message' ] : ''; |
|
259 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $success_array[ 'message' ], $is_success = false ); |
|
260 | 260 | return; |
261 | 261 | } |
262 | 262 | |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | // For non-AJAX submissions, if we have a new subscriber we need to increment our submissions count by 1 |
267 | 267 | // For AJAX, this is an AJAX call that gets fired off after form submission |
268 | 268 | if ( $new_subscriber === true ) { |
269 | - $submissions = (int) $form_settings['submissions'] + 1; |
|
269 | + $submissions = (int) $form_settings[ 'submissions' ] + 1; |
|
270 | 270 | $interface->update_form_field( $form_id, 'submissions', $submissions ); |
271 | 271 | } |
272 | 272 |
@@ -8,10 +8,10 @@ discard block |
||
8 | 8 | $submission_handler = new Yikes_Inc_Easy_MailChimp_Extender_Process_Submission_Handler( $is_ajax = true ); |
9 | 9 | |
10 | 10 | // parse our form data |
11 | -parse_str( $_POST['form_data'], $data ); |
|
11 | +parse_str( $_POST[ 'form_data' ], $data ); |
|
12 | 12 | |
13 | 13 | // Get the form_id |
14 | -$form_id = absint( $_POST['form_id'] ); |
|
14 | +$form_id = absint( $_POST[ 'form_id' ] ); |
|
15 | 15 | |
16 | 16 | // Send an error if for some reason we can't find the $form_id |
17 | 17 | $submission_handler->handle_empty_form_id( $form_id ); |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $submission_handler->set_form_id( $form_id ); |
21 | 21 | |
22 | 22 | // Check our nonce |
23 | -$submission_handler->handle_nonce( $_POST['ajax_security_nonce'], 'yikes_mc_form_submission_security_nonce' ); |
|
23 | +$submission_handler->handle_nonce( $_POST[ 'ajax_security_nonce' ], 'yikes_mc_form_submission_security_nonce' ); |
|
24 | 24 | |
25 | 25 | // Get the form data |
26 | 26 | $interface = yikes_easy_mailchimp_extender_get_form_interface(); |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | $submission_handler->handle_empty_form( $form_data ); |
31 | 31 | |
32 | 32 | // Set up some variables from the form data -- these are required |
33 | -$list_id = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null; |
|
34 | -$submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null; |
|
35 | -$optin_settings = isset( $form_data['optin_settings'] ) ? $form_data['optin_settings'] : null; |
|
36 | -$form_fields = isset( $form_data['fields'] ) ? $form_data['fields'] : null; |
|
33 | +$list_id = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null; |
|
34 | +$submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null; |
|
35 | +$optin_settings = isset( $form_data[ 'optin_settings' ] ) ? $form_data[ 'optin_settings' ] : null; |
|
36 | +$form_fields = isset( $form_data[ 'fields' ] ) ? $form_data[ 'fields' ] : null; |
|
37 | 37 | |
38 | 38 | // Send an error if for some reason we can't find the required form data |
39 | 39 | $submission_handler->handle_empty_fields_generic( array( $list_id, $submission_settings, $optin_settings, $form_fields ) ); |
@@ -47,14 +47,14 @@ discard block |
||
47 | 47 | $submission_handler->check_for_required_interest_groups( $data, $form_fields ); |
48 | 48 | |
49 | 49 | // Set up some variables from the form data -- these are not required |
50 | -$error_messages = isset( $form_data['error_messages'] ) ? $form_data['error_messages'] : array(); |
|
51 | -$notifications = isset( $form_data['custom_notifications'] ) ? $form_data['custom_notifications'] : array(); |
|
50 | +$error_messages = isset( $form_data[ 'error_messages' ] ) ? $form_data[ 'error_messages' ] : array(); |
|
51 | +$notifications = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array(); |
|
52 | 52 | |
53 | 53 | // Set the error messages in our class |
54 | 54 | $submission_handler->set_error_messages( $error_messages ); |
55 | 55 | |
56 | 56 | // Some other variables we'll need. |
57 | -$page_data = isset( $_POST['page_data'] ) ? $_POST['page_data'] : ''; |
|
57 | +$page_data = isset( $_POST[ 'page_data' ] ) ? $_POST[ 'page_data' ] : ''; |
|
58 | 58 | $merge_variables = array(); |
59 | 59 | $error = 0; |
60 | 60 | $list_handler = yikes_get_mc_api_manager()->get_list_handler(); |
@@ -62,13 +62,13 @@ discard block |
||
62 | 62 | // As of 6.4 we no longer pass the post object, only the ID. |
63 | 63 | // For any users relying on the $post object for their `yikes-mailchimp-redirect-url` filter we'll grab the post object here. |
64 | 64 | // Eventually we should just pass the $post_id into the filter instead of the whole object. |
65 | -$page_data = ! empty( $page_data ) ? get_post( $page_data ) : ''; |
|
65 | +$page_data = ! empty( $page_data ) ? get_post( $page_data ) : ''; |
|
66 | 66 | |
67 | 67 | // Send an error if for some reason we can't find the list_handler |
68 | 68 | $submission_handler->handle_empty_list_handler( $list_handler ); |
69 | 69 | |
70 | 70 | // Get, sanitize and lowercasify the email |
71 | -$submitted_email = isset( $data['EMAIL'] ) ? $data['EMAIL'] : ''; |
|
71 | +$submitted_email = isset( $data[ 'EMAIL' ] ) ? $data[ 'EMAIL' ] : ''; |
|
72 | 72 | $sanitized_email = $submission_handler->get_sanitized_email( $submitted_email ); |
73 | 73 | $submission_handler->set_email( $sanitized_email ); |
74 | 74 | |
@@ -76,14 +76,14 @@ discard block |
||
76 | 76 | $submission_handler->handle_empty_email( $sanitized_email ); |
77 | 77 | |
78 | 78 | // Check for Honeypot filled |
79 | -$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && '' !== $data['yikes-mailchimp-honeypot'] ) ? true : false; |
|
79 | +$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && '' !== $data[ 'yikes-mailchimp-honeypot' ] ) ? true : false; |
|
80 | 80 | |
81 | 81 | // Send an error if honey pot is not empty |
82 | 82 | $submission_handler->handle_non_empty_honeypot( $honey_pot_filled ); |
83 | 83 | |
84 | 84 | // Check if reCAPTCHA Response was submitted with the form data, and handle it if needed |
85 | -if ( isset( $data['g-recaptcha-response'] ) ) { |
|
86 | - $recaptcha_response = $data['g-recaptcha-response']; |
|
85 | +if ( isset( $data[ 'g-recaptcha-response' ] ) ) { |
|
86 | + $recaptcha_response = $data[ 'g-recaptcha-response' ]; |
|
87 | 87 | $submission_handler->handle_recaptcha( $recaptcha_response ); |
88 | 88 | } |
89 | 89 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $merge_variables = $submission_handler->get_submitted_merge_values( $data, $form_fields ); |
92 | 92 | |
93 | 93 | // Submission Setting: Replace interest groups or update interest groups |
94 | -$replace_interests = isset( $submission_settings['replace_interests'] ) ? (bool) $submission_settings['replace_interests'] : true; |
|
94 | +$replace_interests = isset( $submission_settings[ 'replace_interests' ] ) ? (bool) $submission_settings[ 'replace_interests' ] : true; |
|
95 | 95 | |
96 | 96 | // Get the default groups |
97 | 97 | $groups = $submission_handler->get_default_interest_groups( $replace_interests, $list_handler ); |
@@ -106,15 +106,15 @@ discard block |
||
106 | 106 | * |
107 | 107 | * @param $merge_variables array Array of merge variable to use |
108 | 108 | */ |
109 | -do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
109 | +do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
110 | 110 | do_action( "yikes-mailchimp-before-submission-{$form_id}", $merge_variables ); |
111 | 111 | |
112 | 112 | // Allow users to check for form values (using the `yikes-mailchimp-filter-before-submission` filter hook in function `get_submitted_merge_values`) |
113 | 113 | // and pass back an error and message to the user |
114 | 114 | // If error is set and no message, default to our class variable's default error message |
115 | -if ( isset( $merge_variables['error'] ) ) { |
|
116 | - $merge_error_message = isset( $merge_variables['message'] ) ? $merge_variables['message'] : $submission_handler->default_error_response_message; |
|
117 | - $submission_handler->handle_merge_variables_error( $merge_variables['error'], $merge_error_message ); |
|
115 | +if ( isset( $merge_variables[ 'error' ] ) ) { |
|
116 | + $merge_error_message = isset( $merge_variables[ 'message' ] ) ? $merge_variables[ 'message' ] : $submission_handler->default_error_response_message; |
|
117 | + $submission_handler->handle_merge_variables_error( $merge_variables[ 'error' ], $merge_error_message ); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | // This is the array we're going to pass through to the MailChimp API |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | |
127 | 127 | // Only add groups if they exist |
128 | 128 | if ( ! empty( $groups ) ) { |
129 | - $member_data['interests'] = $groups; |
|
129 | + $member_data[ 'interests' ] = $groups; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | // Check if this member already exists |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | // Likewise, if this member exists but their status is 'pending' it means we're dealing with a double opt-in list and they never confirmed |
137 | 137 | // Or, if this member but their status is 'unsubscribed' it means we're dealing with someone who unsubscribed and they need to re-subscribe |
138 | 138 | // Continue as if they're a new member to force another double opt-in email |
139 | -$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists['status'] ) && ( $member_exists['status'] === 'pending' || $member_exists['status'] === 'unsubscribed' ); |
|
139 | +$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && ( $member_exists[ 'status' ] === 'pending' || $member_exists[ 'status' ] === 'unsubscribed' ); |
|
140 | 140 | |
141 | 141 | if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) { |
142 | 142 | |
@@ -144,23 +144,23 @@ discard block |
||
144 | 144 | |
145 | 145 | // Check the opt-in value - is it double or single? |
146 | 146 | // Double opt-in means 'status_if_new' => 'pending' |
147 | - $double_optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0; |
|
147 | + $double_optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0; |
|
148 | 148 | |
149 | 149 | // If the user was unsubscribed and is re-subscribing, we set the status to 'pending', which |
150 | 150 | // causes Mailchimp to send them a confirmation email. This is the only way Mailchimp will |
151 | 151 | // allow us to re-subscribe the user. |
152 | - $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists['status'] ) && $member_exists['status'] === 'unsubscribed'; |
|
152 | + $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && $member_exists[ 'status' ] === 'unsubscribed'; |
|
153 | 153 | |
154 | 154 | if ( $double_optin === 1 || $was_unsubscribed === true ) { |
155 | 155 | |
156 | 156 | // Double opt-in |
157 | - $member_data['status_if_new'] = 'pending'; |
|
158 | - $member_data['status'] = 'pending'; |
|
157 | + $member_data[ 'status_if_new' ] = 'pending'; |
|
158 | + $member_data[ 'status' ] = 'pending'; |
|
159 | 159 | } else { |
160 | 160 | |
161 | 161 | // Single opt-in |
162 | - $member_data['status_if_new'] = 'subscribed'; |
|
163 | - $member_data['status'] = 'subscribed'; |
|
162 | + $member_data[ 'status_if_new' ] = 'subscribed'; |
|
163 | + $member_data[ 'status' ] = 'subscribed'; |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | } else { |
@@ -169,10 +169,10 @@ discard block |
||
169 | 169 | |
170 | 170 | // But first let's set our flag, and set the MailChimp status flag |
171 | 171 | $new_subscriber = false; |
172 | - $member_data['status'] = 'subscribed'; |
|
172 | + $member_data[ 'status' ] = 'subscribed'; |
|
173 | 173 | |
174 | 174 | // Check our update_existing_user optin setting |
175 | - $update_existing_user = ( $optin_settings['update_existing_user'] === '1' ) ? true : false; |
|
175 | + $update_existing_user = ( $optin_settings[ 'update_existing_user' ] === '1' ) ? true : false; |
|
176 | 176 | |
177 | 177 | // If update_existing_user is false (not allowed) then simply fail and return a response message |
178 | 178 | if ( $update_existing_user === false ) { |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | } |
181 | 181 | |
182 | 182 | // If update_existing_user is true, we need to check our 'send_update_email' option |
183 | - $send_update_email = ( $optin_settings['send_update_email'] === '1' ) ? true : false; |
|
183 | + $send_update_email = ( $optin_settings[ 'send_update_email' ] === '1' ) ? true : false; |
|
184 | 184 | |
185 | 185 | // If $send_update_email is true (we send the email) then we need to fire off the 'send update email' logic |
186 | 186 | if ( $send_update_email === true ) { |
@@ -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> |
@@ -29,7 +29,7 @@ |
||
29 | 29 | <?php settings_fields( 'yikes_inc_easy_mc_recaptcha_settings_page' ); ?> |
30 | 30 | |
31 | 31 | <label for="yikes-mc-recaptcha-setting"> |
32 | - <input type="checkbox" id="yikes-mc-recaptcha-setting" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ) , '1' ); ?>> |
|
32 | + <input type="checkbox" id="yikes-mc-recaptcha-setting" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ), '1' ); ?>> |
|
33 | 33 | <strong><?php _e( 'Enable reCAPTCHA Protection', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
34 | 34 | </label> |
35 | 35 |