Completed
Push — staging ( a7e230...946768 )
by Evan
08:27
created
includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -51,19 +51,19 @@  discard block
 block discarded – undo
51 51
 	*	@returned_error 
52 52
 	*	@error_type - what was running when the error occured ie (new user subscription, remove user etc)
53 53
 	*/
54
-	public function yikes_easy_mailchimp_write_to_error_log( $returned_error , $error_type , $page='' ) {
54
+	public function yikes_easy_mailchimp_write_to_error_log( $returned_error, $error_type, $page = '' ) {
55 55
 		
56 56
 		// confirm error logging is toggled on, else lets exit
57
-		if( get_option( 'yikes-mailchimp-debug-status' , '' )  != '1' ) {
57
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) != '1' ) {
58 58
 			return;
59 59
 		}
60 60
 		
61
-		$contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' , true );
61
+		$contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php', true );
62 62
 		
63 63
 		// if we pass in a custom page, don't set things up
64
-		if( empty( $page ) ) {
64
+		if ( empty( $page ) ) {
65 65
 			// get the current page, admin or front end?
66
-			if( is_admin() ) {
66
+			if ( is_admin() ) {
67 67
 				$page = __( 'Admin', 'yikes-inc-easy-mailchimp-extender' );
68 68
 			} else {
69 69
 				$page = __( 'Front End', 'yikes-inc-easy-mailchimp-extender' );
@@ -79,14 +79,14 @@  discard block
 block discarded – undo
79 79
 					</label>
80 80
 				</td>
81 81
 				<td>
82
-					<?php _e( 'Page:' , 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . $page; ?> || <?php _e( 'Type:' , 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . $error_type; ?> || <?php _e( 'Time:' , 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) , current_time('timestamp') ); ?>
82
+					<?php _e( 'Page:', 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . $page; ?> || <?php _e( 'Type:', 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . $error_type; ?> || <?php _e( 'Time:', 'yikes-inc-easy-mailchimp-extender' ); echo ' ' . date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), current_time( 'timestamp' ) ); ?>
83 83
 				</td>
84 84
 			</tr>
85 85
 		<?php
86 86
 		$new_contents = ob_get_clean() . $contents;
87 87
 		
88 88
 		// file put contents $returned error + other data
89
-		if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
89
+		if ( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
90 90
 			file_put_contents( 
91 91
 				YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php',
92 92
 				$new_contents
@@ -102,12 +102,12 @@  discard block
 block discarded – undo
102 102
 	*/	
103 103
 	public function yikes_easy_mailchimp_generate_error_log_table() {		
104 104
 		// ensure file_get_contents exists
105
-		if( function_exists( 'file_get_contents' ) ) {	
105
+		if ( function_exists( 'file_get_contents' ) ) {	
106 106
 			// confirm that our file exists
107
-			if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
108
-				$error_log_contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' , true );							
109
-				if( $error_log_contents === FALSE ) {
110
-					return _e( 'File get contents not available' , 'yikes-inc-easy-mailchimp-extender' );
107
+			if ( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
108
+				$error_log_contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php', true );							
109
+				if ( $error_log_contents === FALSE ) {
110
+					return _e( 'File get contents not available', 'yikes-inc-easy-mailchimp-extender' );
111 111
 				}
112 112
 				if ( $error_log_contents != '' ) {
113 113
 					// return $error_log_contents;
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 						<tr class="error-log-tr">
119 119
 							<td class="row-title colspanchange" colspan="2">
120 120
 								<strong><span class='dashicons dashicons-no-alt'></span> <?php _e( 'No errors logged.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
121
-								<?php if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '' ) { ?>
121
+								<?php if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '' ) { ?>
122 122
 									<br />
123 123
 									<p class="to-start-logging-errors-notice"><em><?php _e( "To start logging errors toggle on the 'Enable Debugging' option above.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
124 124
 								<?php } ?>
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 									);
147 147
 									?>
148 148
 									<form id="create-error-log" method="POST" action="<?php echo $url; ?>">
149
-										<?php submit_button( __( 'Attempt to Create Error Log' , 'yikes-inc-easy-mailchimp-extender' ) , 'secondary' , '' , '' , array() ); ?>
149
+										<?php submit_button( __( 'Attempt to Create Error Log', 'yikes-inc-easy-mailchimp-extender' ), 'secondary', '', '', array() ); ?>
150 150
 									</form>
151 151
 									
152 152
 								</p>
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -100,9 +100,9 @@  discard block
 block discarded – undo
100 100
 	*
101 101
 	*  @since 5.6
102 102
 	*/	
103
-	public function yikes_easy_mailchimp_generate_error_log_table() {		
103
+	public function yikes_easy_mailchimp_generate_error_log_table() {
104 104
 		// ensure file_get_contents exists
105
-		if( function_exists( 'file_get_contents' ) ) {	
105
+		if( function_exists( 'file_get_contents' ) ) {
106 106
 			// confirm that our file exists
107 107
 			if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
108 108
 				$error_log_contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' , true );							
@@ -154,7 +154,8 @@  discard block
 block discarded – undo
154 154
 						</tr>
155 155
 					<?php
156 156
 			}
157
-		} else { // if file_get_contents is disabled server side
157
+		} else {
158
+// if file_get_contents is disabled server side
158 159
 			?>
159 160
 				<!-- table body -->
160 161
 				<tr>
Please login to merge, or discard this patch.
includes/class-yikes-inc-easy-mailchimp-extender-activator.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 			if ( $network_wide ) {
36 36
 				$old_blog = $wpdb->blogid;
37 37
 				// Get all blog ids
38
-				$blogids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
38
+				$blogids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
39 39
 				foreach ( $blogids as $blog_id ) {
40 40
 					switch_to_blog( $blog_id );
41 41
 					self::_activate_yikes_easy_mailchimp( $wpdb );
@@ -91,13 +91,13 @@  discard block
 block discarded – undo
91 91
 		custom_fields LONGTEXT NOT NULL,
92 92
 		UNIQUE KEY id (id)
93 93
 		) $charset_collate;";
94
-		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
95
-		dbDelta($sql);
94
+		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
95
+		dbDelta( $sql );
96 96
 		
97 97
 		// create an option for the date that the user initially activated the plugin
98 98
 		// used to display a two week notice, asking for a review or to upgrade
99
-		if( !get_option( 'yikes_easy_mailchimp_activation_date' ) || get_option( 'yikes_easy_mailchimp_activation_date' ) == '' ) {
100
-			update_option( 'yikes_easy_mailchimp_activation_date' , strtotime( 'now' ) );
99
+		if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) || get_option( 'yikes_easy_mailchimp_activation_date' ) == '' ) {
100
+			update_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) );
101 101
 		}
102 102
 		
103 103
 	}
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,8 @@
 block discarded – undo
45 45
 				return;
46 46
 			}   
47 47
 			self::_activate_yikes_easy_mailchimp( $wpdb );
48
-		} else { /* end network activate */
48
+		} else {
49
+/* end network activate */
49 50
 			self::_activate_yikes_easy_mailchimp( $wpdb );
50 51
 		}
51 52
 	}
Please login to merge, or discard this patch.
includes/third-party-integrations/visual-composer/visual-composer.php 3 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -6,26 +6,26 @@  discard block
 block discarded – undo
6 6
 class YIKES_MailChimp_Visual_Composer_Extension {
7 7
 	
8 8
 	/**
9
-	*	Constructor
10
-	*	@since 6.0.3
11
-	*/
9
+	 *	Constructor
10
+	 *	@since 6.0.3
11
+	 */
12 12
 	function __construct() {
13 13
 		add_action( 'admin_init', array( $this, 'extend_visual_composer' ) );
14 14
 		add_shortcode_param( 'yikes_mailchimp_logo', array( $this, 'yikes_mailchimp_logo_vc_section' ) );
15 15
 	}
16 16
 	
17 17
 	/**
18
-	*	Extend Visual Composer with custom button
19
-	*	@since 6.0.3
20
-	*/
18
+	 *	Extend Visual Composer with custom button
19
+	 *	@since 6.0.3
20
+	 */
21 21
 	public function extend_visual_composer() {
22 22
 		vc_map( array(
23
-		   "name" => __( "Easy Forms for MailChimp", "yikes-inc-easy-mailchimp-extender" ),
24
-		   "base" => "yikes-mailchimp",
25
-   		   "icon" => YIKES_MC_URL . "includes/images/Welcome_Page/yikes-mailchimp-welcome-logo.png", // Simply pass url to your icon here
26
-		   "category" => 'Content', // where is this buutton being displayed
27
-		   "description" => __( "Display a MailChimp Opt-In form", "yikes-inc-easy-mailchimp-extender" ), // add a description
28
-		   "params" => array(
23
+			"name" => __( "Easy Forms for MailChimp", "yikes-inc-easy-mailchimp-extender" ),
24
+			"base" => "yikes-mailchimp",
25
+				"icon" => YIKES_MC_URL . "includes/images/Welcome_Page/yikes-mailchimp-welcome-logo.png", // Simply pass url to your icon here
26
+			"category" => 'Content', // where is this buutton being displayed
27
+			"description" => __( "Display a MailChimp Opt-In form", "yikes-inc-easy-mailchimp-extender" ), // add a description
28
+			"params" => array(
29 29
 				array(
30 30
 					"type" => "yikes_mailchimp_logo",
31 31
 					"holder" => "div",
@@ -75,22 +75,22 @@  discard block
 block discarded – undo
75 75
 					"value" => __( "Submit", "yikes-inc-easy-mailchimp-extender" ),
76 76
 					"description" => __( "Enter a title to display", "yikes-inc-easy-mailchimp-extender" )
77 77
 				)
78
-		   )
78
+			)
79 79
 		) );
80 80
 	}
81 81
 	
82 82
 	/**
83
-	*	Custom Callback Section
84
-	*	@since 6.0.3
85
-	*/
83
+	 *	Custom Callback Section
84
+	 *	@since 6.0.3
85
+	 */
86 86
 	public function yikes_mailchimp_logo_vc_section( $settings, $value ) {
87 87
 		return '<img style="width:250px;display:block;margin:0 auto;" src="' . YIKES_MC_URL . 'includes/images/Welcome_Page/mailchimp-logo.png" title="' . __( 'Easy Forms for MailChimp by YIKES', 'yikes-inc-easy-mailchimp-extender' ) . '" />';
88 88
 	}
89 89
 	
90 90
 	/**
91
-	*	Retreive a list of forms created by the user that they can select from in the dropdown
92
-	*	@since 6.0.3
93
-	*/
91
+	 *	Retreive a list of forms created by the user that they can select from in the dropdown
92
+	 *	@since 6.0.3
93
+	 */
94 94
 	public function yikes_mailchimp_retreive_user_created_forms() {
95 95
 		global $wpdb;
96 96
 		$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -95,13 +95,13 @@
 block discarded – undo
95 95
 		global $wpdb;
96 96
 		$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
97 97
 		$lists = array();
98
-		if( !empty( $list_data ) ) {	
98
+		if ( ! empty( $list_data ) ) {	
99 99
 			// build an array to pass to our javascript
100
-			foreach( $list_data as $form ) {
101
-				$lists[$form['form_name']] = $form['id'];
100
+			foreach ( $list_data as $form ) {
101
+				$lists[ $form[ 'form_name' ] ] = $form[ 'id' ];
102 102
 			}
103 103
 		} else {
104
-			$lists[__( 'Please Import Some MailChimp Lists' , 'yikes-inc-easy-mailchimp-extender' )] = '-';
104
+			$lists[ __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';
105 105
 		}
106 106
 		return $lists;
107 107
 	}
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
 		global $wpdb;
96 96
 		$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
97 97
 		$lists = array();
98
-		if( !empty( $list_data ) ) {	
98
+		if( !empty( $list_data ) ) {
99 99
 			// build an array to pass to our javascript
100 100
 			foreach( $list_data as $form ) {
101 101
 				$lists[$form['form_name']] = $form['id'];
Please login to merge, or discard this patch.
includes/third-party-integrations/third-party-init.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 		// required..*
18 18
 		include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
19 19
 		/* Visual Composer */
20
-		if( is_plugin_active( 'js_composer/js_composer.php' ) ) {
20
+		if ( is_plugin_active( 'js_composer/js_composer.php' ) ) {
21 21
 			include_once( YIKES_MC_PATH . 'includes/third-party-integrations/visual-composer/visual-composer.php' );
22 22
 		}
23 23
 	}
Please login to merge, or discard this patch.
includes/add_ons/popups.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 
33 33
 	<div class="addon-footer-wrap give-clearfix">
34 34
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
35
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
35
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
36 36
 		<span class="dashicons dashicons-external"></span></a>
37 37
 	</div>
38 38
 
Please login to merge, or discard this patch.
includes/add_ons/eu-compliance.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 
33 33
 	<div class="addon-footer-wrap give-clearfix">
34 34
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
35
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
35
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
36 36
 		<span class="dashicons dashicons-external"></span></a>
37 37
 	</div>
38 38
 
Please login to merge, or discard this patch.
includes/add_ons/customizer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 
33 33
 	<div class="addon-footer-wrap give-clearfix">
34 34
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
35
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
35
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
36 36
 		<span class="dashicons dashicons-external"></span></a>
37 37
 	</div>
38 38
 
Please login to merge, or discard this patch.
includes/add_ons/incentives.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 
33 33
 	<div class="addon-footer-wrap give-clearfix">
34 34
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
35
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
35
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
36 36
 		<span class="dashicons dashicons-external"></span></a>
37 37
 	</div>
38 38
 
Please login to merge, or discard this patch.
includes/add_ons/reverse-zip-lookup.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 
33 33
 	<div class="addon-footer-wrap give-clearfix">
34 34
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
35
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
35
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
36 36
 		<span class="dashicons dashicons-external"></span></a>
37 37
 	</div>
38 38
 
Please login to merge, or discard this patch.