@@ -54,8 +54,8 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
| 57 | - * Create the function to output our list stats dashboard widget |
|
| 58 | - */ |
|
| 57 | + * Create the function to output our list stats dashboard widget |
|
| 58 | + */ |
|
| 59 | 59 | function list_stats_dashboard_widget() { |
| 60 | 60 | // Get our list data! |
| 61 | 61 | // Check for a transient, if not - set one up for one hour |
@@ -115,8 +115,8 @@ discard block |
||
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
| 118 | - * Create the function to output our account activity dashboard widget |
|
| 119 | - */ |
|
| 118 | + * Create the function to output our account activity dashboard widget |
|
| 119 | + */ |
|
| 120 | 120 | function account_activity_dashboard_widget() { |
| 121 | 121 | // Get our list data! |
| 122 | 122 | // Check for a transient, if not - set one up for one hour |
@@ -2,8 +2,7 @@ discard block |
||
| 2 | 2 | /* |
| 3 | 3 | * Our ajax is processed inside of class.ajax.php |
| 4 | 4 | */ |
| 5 | - class YIKES_Inc_Easy_MailChimp_Dashboard_Widgets |
|
| 6 | - { |
|
| 5 | + class YIKES_Inc_Easy_MailChimp_Dashboard_Widgets { |
|
| 7 | 6 | |
| 8 | 7 | // Construction |
| 9 | 8 | public function __construct() { |
@@ -16,7 +15,8 @@ discard block |
||
| 16 | 15 | |
| 17 | 16 | // enqueue our JS file on the main dashboard page |
| 18 | 17 | function enqueue_dashboard_widget_script( $hook ) { |
| 19 | - if( 'index.php' == $hook ) { // default 'dashboard' page |
|
| 18 | + if( 'index.php' == $hook ) { |
|
| 19 | +// default 'dashboard' page |
|
| 20 | 20 | wp_register_script( 'yikes-easy-mc-dashboard-widget-script' , YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-dashboard-widget.min.js' , array( 'jquery' ) , 'all' , false ); |
| 21 | 21 | $data_array = array( |
| 22 | 22 | 'ajax_url' => esc_url_raw( admin_url( 'admin-ajax.php' ) ), |
@@ -154,17 +154,17 @@ |
||
| 154 | 154 | public function findMCListIndex( $id, $array, $tag ) { |
| 155 | 155 | if( $tag == 'tag' ) { |
| 156 | 156 | foreach( $array as $key => $val ) { |
| 157 | - if ( $val['tag'] === $id ) { |
|
| 158 | - return $key; |
|
| 159 | - } |
|
| 160 | - } |
|
| 161 | - return null; |
|
| 157 | + if ( $val['tag'] === $id ) { |
|
| 158 | + return $key; |
|
| 159 | + } |
|
| 160 | + } |
|
| 161 | + return null; |
|
| 162 | 162 | } else { |
| 163 | 163 | foreach ( $array as $key => $val ) { |
| 164 | - if ( $val['id'] == $id ) { |
|
| 165 | - return $key; |
|
| 166 | - } |
|
| 167 | - } |
|
| 164 | + if ( $val['id'] == $id ) { |
|
| 165 | + return $key; |
|
| 166 | + } |
|
| 167 | + } |
|
| 168 | 168 | return null; |
| 169 | 169 | } |
| 170 | 170 | } // end |
@@ -7,8 +7,7 @@ |
||
| 7 | 7 | * @since 6.0.0 |
| 8 | 8 | * Author: Yikes Inc. | https://www.yikesinc.com |
| 9 | 9 | */ |
| 10 | - class YIKES_Inc_Easy_MailChimp_Process_Ajax |
|
| 11 | - { |
|
| 10 | + class YIKES_Inc_Easy_MailChimp_Process_Ajax { |
|
| 12 | 11 | |
| 13 | 12 | public function __construct() { |
| 14 | 13 | // ajax send merge variable to form builder |
@@ -7,13 +7,13 @@ discard block |
||
| 7 | 7 | class Yikes_Inc_Easy_Mailchimp_Extender_Helper { |
| 8 | 8 | |
| 9 | 9 | /** |
| 10 | - * Helper functions to help out with extensions (still fleshing out) |
|
| 11 | - * @since 6.0 |
|
| 12 | - * @ Parameters (array of data) |
|
| 13 | - * - Section ID - id of the section, should be a slug style text ie: 'custom-section' |
|
| 14 | - * - Link Text - Visible text for this link ie: 'Custom Section' |
|
| 15 | - * - Dashicon - class of the icon you would like to use for this link |
|
| 16 | - **/ |
|
| 10 | + * Helper functions to help out with extensions (still fleshing out) |
|
| 11 | + * @since 6.0 |
|
| 12 | + * @ Parameters (array of data) |
|
| 13 | + * - Section ID - id of the section, should be a slug style text ie: 'custom-section' |
|
| 14 | + * - Link Text - Visible text for this link ie: 'Custom Section' |
|
| 15 | + * - Dashicon - class of the icon you would like to use for this link |
|
| 16 | + **/ |
|
| 17 | 17 | public static function add_edit_form_section_link( $link_array=array() ) { |
| 18 | 18 | if( !empty( $link_array ) ) { |
| 19 | 19 | $link_data = wp_parse_args( array() , $link_array ); |
@@ -36,17 +36,17 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | - * Helper functions to help out with extensions (still fleshing out) |
|
| 40 | - * @since 6.0 |
|
| 41 | - * @ Parameters: |
|
| 42 | - * - Section ID - id of the section, should be a slug style text ie: 'custom-section' |
|
| 43 | - * - Class - class file to call function from? |
|
| 44 | - * - Main Callback - call back for main section |
|
| 45 | - * - Main Section Title - main section title |
|
| 46 | - * - Sidebar Callback - callback for the sidebar section |
|
| 47 | - * - Sidebar Title - title of the sidebar section |
|
| 48 | - * - Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class)) |
|
| 49 | - **/ |
|
| 39 | + * Helper functions to help out with extensions (still fleshing out) |
|
| 40 | + * @since 6.0 |
|
| 41 | + * @ Parameters: |
|
| 42 | + * - Section ID - id of the section, should be a slug style text ie: 'custom-section' |
|
| 43 | + * - Class - class file to call function from? |
|
| 44 | + * - Main Callback - call back for main section |
|
| 45 | + * - Main Section Title - main section title |
|
| 46 | + * - Sidebar Callback - callback for the sidebar section |
|
| 47 | + * - Sidebar Title - title of the sidebar section |
|
| 48 | + * - Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class)) |
|
| 49 | + **/ |
|
| 50 | 50 | public static function add_edit_form_section( $section_array=array() ) { |
| 51 | 51 | if( !empty( $section_array ) ) { |
| 52 | 52 | $section_data = wp_parse_args( array() , $section_array ); |
@@ -59,11 +59,11 @@ discard block |
||
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | - * Check if the custom section is single or two columns (with sidebar) |
|
| 63 | - * @since 6.0 |
|
| 64 | - * @Parameters: |
|
| 65 | - * - Section Data - the array of data associated with the custom field you've set up |
|
| 66 | - */ |
|
| 62 | + * Check if the custom section is single or two columns (with sidebar) |
|
| 63 | + * @since 6.0 |
|
| 64 | + * @Parameters: |
|
| 65 | + * - Section Data - the array of data associated with the custom field you've set up |
|
| 66 | + */ |
|
| 67 | 67 | public static function is_custom_section_two_column( $custom_section_data ) { |
| 68 | 68 | // print_r( $custom_section_data ); |
| 69 | 69 | $value = ( isset( $custom_section_data['sidebar_title'] ) && isset( $custom_section_data['sidebar_fields'] ) && !empty( $custom_section_data['sidebar_fields'] ) ) ? true : false; |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | <?php |
| 24 | 24 | } |
| 25 | 25 | $main_field_data = $section_data['main_fields']; |
| 26 | - foreach( $main_field_data as $field ) { |
|
| 26 | + foreach( $main_field_data as $field ) { |
|
| 27 | 27 | if( $field['type'] == 'custom' ) { |
| 28 | 28 | // execute the custom callback |
| 29 | 29 | $field['callback'](); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | <?php |
| 54 | 54 | } |
| 55 | 55 | $sidebar_field_data = $section_data['sidebar_fields']; |
| 56 | - foreach( $sidebar_field_data as $field ) { |
|
| 56 | + foreach( $sidebar_field_data as $field ) { |
|
| 57 | 57 | if( $field['type'] == 'custom' ) { |
| 58 | 58 | // execute the custom callback |
| 59 | 59 | $field['callback'](); |
@@ -45,8 +45,9 @@ |
||
| 45 | 45 | // before and after widget arguments are defined by themes |
| 46 | 46 | echo $args['before_widget']; |
| 47 | 47 | |
| 48 | - if ( ! empty( $title ) ) |
|
| 49 | - echo $args['before_title'] . $title . $args['after_title']; |
|
| 48 | + if ( ! empty( $title ) ) { |
|
| 49 | + echo $args['before_title'] . $title . $args['after_title']; |
|
| 50 | + } |
|
| 50 | 51 | |
| 51 | 52 | // Custom action hooks to place content in the widget before the form |
| 52 | 53 | // See FAQ for examples on usage |
@@ -356,9 +356,9 @@ discard block |
||
| 356 | 356 | ?></ul><?php |
| 357 | 357 | } |
| 358 | 358 | /** |
| 359 | - * Custom action hook for our add-ons to hook into |
|
| 360 | - * @since 6.0.3.8 |
|
| 361 | - */ |
|
| 359 | + * Custom action hook for our add-ons to hook into |
|
| 360 | + * @since 6.0.3.8 |
|
| 361 | + */ |
|
| 362 | 362 | do_action( 'yikes-mailchimp-list-form-fields-metabox' ); |
| 363 | 363 | ?> |
| 364 | 364 | |
@@ -385,9 +385,9 @@ discard block |
||
| 385 | 385 | <?php |
| 386 | 386 | } |
| 387 | 387 | /** |
| 388 | - * Custom action hook for our add-ons to hook into |
|
| 389 | - * @since 6.0.3.8 |
|
| 390 | - */ |
|
| 388 | + * Custom action hook for our add-ons to hook into |
|
| 389 | + * @since 6.0.3.8 |
|
| 390 | + */ |
|
| 391 | 391 | do_action( 'yikes-mailchimp-list-interest-groups-metabox' ); |
| 392 | 392 | ?> |
| 393 | 393 | |
@@ -112,9 +112,11 @@ |
||
| 112 | 112 | |
| 113 | 113 | // update 'date_format' on 'birthday' and 'date' fields |
| 114 | 114 | if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'date', 'birthday' ) ) ) { |
| 115 | - if( $mailchimp_form['fields'][$new_parent_key]['type'] == 'date' ) { // date |
|
| 115 | + if( $mailchimp_form['fields'][$new_parent_key]['type'] == 'date' ) { |
|
| 116 | +// date |
|
| 116 | 117 | $mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD'; // mailchimp default (can be altered) |
| 117 | - } else { // birthday |
|
| 118 | + } else { |
|
| 119 | +// birthday |
|
| 118 | 120 | $mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD/YYYY'; // mailchimp default (can be altered) |
| 119 | 121 | } |
| 120 | 122 | } |
@@ -162,9 +162,9 @@ discard block |
||
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | /** |
| 165 | - * If login is required, abort |
|
| 166 | - * @since 6.0.3.8 |
|
| 167 | - */ |
|
| 165 | + * If login is required, abort |
|
| 166 | + * @since 6.0.3.8 |
|
| 167 | + */ |
|
| 168 | 168 | if( $form_login_required ) { |
| 169 | 169 | if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) { |
| 170 | 170 | ob_start(); |
@@ -179,9 +179,9 @@ discard block |
||
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | /** |
| 182 | - * Check if schedule is set for this form |
|
| 183 | - * @since 6.0.3.8 |
|
| 184 | - */ |
|
| 182 | + * Check if schedule is set for this form |
|
| 183 | + * @since 6.0.3.8 |
|
| 184 | + */ |
|
| 185 | 185 | if( $form_schedule_state ) { |
| 186 | 186 | // store current date |
| 187 | 187 | $current_date = strtotime( current_time( 'm/d/Y g:iA' ) ); |
@@ -234,8 +234,8 @@ discard block |
||
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | /** |
| 237 | - * Check for form inline parameter |
|
| 238 | - */ |
|
| 237 | + * Check for form inline parameter |
|
| 238 | + */ |
|
| 239 | 239 | $form_inline = ( isset( $atts['inline'] ) && ( $atts['inline'] == 1 || $atts['inline'] == 'true' ) ) ? true : false; |
| 240 | 240 | // recheck from our form options |
| 241 | 241 | if( ! $form_inline ) { |
@@ -943,7 +943,8 @@ |
||
| 943 | 943 | |
| 944 | 944 | } |
| 945 | 945 | |
| 946 | - } else { // loop over interest groups |
|
| 946 | + } else { |
|
| 947 | +// loop over interest groups |
|
| 947 | 948 | |
| 948 | 949 | |
| 949 | 950 | // store default choice |
@@ -96,9 +96,11 @@ |
||
| 96 | 96 | $value = date( 'Y-m-d', strtotime( $value ) ); |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | - if( is_numeric( $merge_tag ) ) { // this is is an interest group! |
|
| 99 | + if( is_numeric( $merge_tag ) ) { |
|
| 100 | +// this is is an interest group! |
|
| 100 | 101 | $merge_variables['groupings'][] = array( 'id' => $merge_tag , 'groups' => ( is_array( $value ) ) ? $value : array( $value ) ); |
| 101 | - } else { // or else it's just a standard merge variable |
|
| 102 | + } else { |
|
| 103 | +// or else it's just a standard merge variable |
|
| 102 | 104 | $merge_variables[$merge_tag] = $value; |
| 103 | 105 | } |
| 104 | 106 | } |