yikesinc / yikes-inc-easy-mailchimp-extender

includes/import-export/yikes-easy-mailchimp-import.class.php

Spacing +53 added lines, -53 removed lines

@@ -10,54 +10,54 @@ 
 	*/	
 	public static function yikes_mailchimp_import_forms( $csv_file ) {
 	
-		if( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
-			$name = $csv_file['csv']['name'];
-			$ext_array = explode('.', $name);
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
+			$name = $csv_file[ 'csv' ][ 'name' ];
+			$ext_array = explode( '.', $name );
 			$ext = end( $ext_array );
-			$tmpName = $csv_file['csv']['tmp_name'];
-			if($ext === 'csv') {
-				if(($handle = fopen($tmpName, 'r')) !== FALSE) {
-					$num = count($handle);
-					$file = fopen( $tmpName, 'r');
+			$tmpName = $csv_file[ 'csv' ][ 'tmp_name' ];
+			if ( $ext === 'csv' ) {
+				if ( ( $handle = fopen( $tmpName, 'r' ) ) !== FALSE ) {
+					$num = count( $handle );
+					$file = fopen( $tmpName, 'r' );
 					$row = 1;
-					while (($line = fgetcsv($file, 10000, ',')) !== FALSE) {
-						if( count( $line ) > 1 ) {
+					while ( ( $line = fgetcsv( $file, 10000, ',' ) ) !== FALSE ) {
+						if ( count( $line ) > 1 ) {
 							// Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'
-							if( $line[0] == 'yikes-mc-api-key' ) {	
-								$options = fgetcsv($file, 10000, ',');
+							if ( $line[ 0 ] == 'yikes-mc-api-key' ) {	
+								$options = fgetcsv( $file, 10000, ',' );
 								$new_settings = array();
 								$x = 0;
 								// build our new array $key => $value pair
-								foreach( $line as $option_name ) {
-									$new_settings[$option_name] = $options[$x]; 
+								foreach ( $line as $option_name ) {
+									$new_settings[ $option_name ] = $options[ $x ]; 
 									$x++;
 								}
 								// update the options in the databse
-								foreach( $new_settings as $option_name => $option_value ) {
+								foreach ( $new_settings as $option_name => $option_value ) {
 									update_option( $option_name, $option_value );
 								}
 							} else { // if it's not, then it's an opt-in forms import
 								global $wpdb;		
-								if( $row != 1 ) {
+								if ( $row != 1 ) {
 									$wpdb->insert(
 										$wpdb->prefix . 'yikes_easy_mc_forms',
 										array(
-											'list_id' => $line[1],
-											'form_name' => stripslashes( $line[2] ),
-											'form_description' => stripslashes( $line[3] ),
-											'fields' => $line[4],
-											'custom_styles' => $line[5],
-											'custom_template' => $line[6],
-											'send_welcome_email' => $line[7],
-											'redirect_user_on_submit' => $line[8],
-											'redirect_page' => $line[9],
-											'submission_settings' => $line[10],
-											'optin_settings' => $line[11],
-											'error_messages' => $line[12],
-											'custom_notifications' => $line[13],
-											'impressions' => $line[14],
-											'submissions' => $line[15],
-											'custom_fields' => $line[16],
+											'list_id' => $line[ 1 ],
+											'form_name' => stripslashes( $line[ 2 ] ),
+											'form_description' => stripslashes( $line[ 3 ] ),
+											'fields' => $line[ 4 ],
+											'custom_styles' => $line[ 5 ],
+											'custom_template' => $line[ 6 ],
+											'send_welcome_email' => $line[ 7 ],
+											'redirect_user_on_submit' => $line[ 8 ],
+											'redirect_page' => $line[ 9 ],
+											'submission_settings' => $line[ 10 ],
+											'optin_settings' => $line[ 11 ],
+											'error_messages' => $line[ 12 ],
+											'custom_notifications' => $line[ 13 ],
+											'impressions' => $line[ 14 ],
+											'submissions' => $line[ 15 ],
+											'custom_fields' => $line[ 16 ],
 										),
 										array(
 											'%s', // list id
@@ -65,16 +65,16 @@ 
 											'%s', // form description
 											'%s', // fields
 											'%s', // custom styles
-											'%d',	// custom template
-											'%d',	// send welcome email
-											'%s',	// redirect user
-											'%s',	// redirect page
-											'%s',	// submission
-											'%s',	// opt-in
+											'%d', // custom template
+											'%d', // send welcome email
+											'%s', // redirect user
+											'%s', // redirect page
+											'%s', // submission
+											'%s', // opt-in
 											'%s', // error
 											'%s', // custom notifications
-											'%d',	// impressions #
-											'%d',	// submissions #
+											'%d', // impressions #
+											'%d', // submissions #
 											'%s', // custom fields
 										)
 									);
@@ -83,9 +83,9 @@ 
 						}	
 						$row++;
 					}
-					fclose($file);
+					fclose( $file );
 				} else {
-					wp_die( __( 'There was an error during import. If you continue to run into issues, please reach out to the Yikes Inc. support team.' , 'yikes-inc-easy-mailchimp-extender' ) );
+					wp_die( __( 'There was an error during import. If you continue to run into issues, please reach out to the Yikes Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ) );
 				}
 			}
 			
@@ -101,20 +101,20 @@ 
 	*/	
 	public static function yikes_mailchimp_import_type( $csv_file ) {
 		// confirm
-		if( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
-			$name = $csv_file['csv']['name'];
-			$ext_array = explode('.', $name);
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
+			$name = $csv_file[ 'csv' ][ 'name' ];
+			$ext_array = explode( '.', $name );
 			$ext = end( $ext_array );
-			$tmpName = $csv_file['csv']['tmp_name'];
-			if($ext === 'csv') {
-				if(($handle = fopen($tmpName, 'r')) !== FALSE) {
-					$num = count($handle);
-					$file = fopen( $tmpName, 'r');
+			$tmpName = $csv_file[ 'csv' ][ 'tmp_name' ];
+			if ( $ext === 'csv' ) {
+				if ( ( $handle = fopen( $tmpName, 'r' ) ) !== FALSE ) {
+					$num = count( $handle );
+					$file = fopen( $tmpName, 'r' );
 					$row = 1;
-					$first_line_data = fgetcsv($file, 10000, ',');
-					if( count( $first_line_data ) > 1 ) {
+					$first_line_data = fgetcsv( $file, 10000, ',' );
+					if ( count( $first_line_data ) > 1 ) {
 						// Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'
-						if( $first_line_data[0] == 'yikes-mc-api-key' ) {
+						if ( $first_line_data[ 0 ] == 'yikes-mc-api-key' ) {
 							$import_type = 'import-settings';
 						} else {
 							$import_type = 'import-forms';

Braces +3 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 					while (($line = fgetcsv($file, 10000, ',')) !== FALSE) {
 						if( count( $line ) > 1 ) {
 							// Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'
-							if( $line[0] == 'yikes-mc-api-key' ) {	
+							if( $line[0] == 'yikes-mc-api-key' ) {
 								$options = fgetcsv($file, 10000, ',');
 								$new_settings = array();
 								$x = 0;
@@ -36,7 +36,8 @@ 
 								foreach( $new_settings as $option_name => $option_value ) {
 									update_option( $option_name, $option_value );
 								}
-							} else { // if it's not, then it's an opt-in forms import
+							} else {
+// if it's not, then it's an opt-in forms import
 								global $wpdb;		
 								if( $row != 1 ) {
 									$wpdb->insert(

includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php

Spacing +14 added lines, -14 removed lines

@@ -51,19 +51,19 @@ 
 	*	@returned_error 
 	*	@error_type - what was running when the error occured ie (new user subscription, remove user etc)
 	*/
-	public function yikes_easy_mailchimp_write_to_error_log( $returned_error , $error_type , $page='' ) {
+	public function yikes_easy_mailchimp_write_to_error_log( $returned_error, $error_type, $page = '' ) {
 		
 		// confirm error logging is toggled on, else lets exit
-		if( get_option( 'yikes-mailchimp-debug-status' , '' )  != '1' ) {
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) != '1' ) {
 			return;
 		}
 		
-		$contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' , true );
+		$contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php', true );
 		
 		// if we pass in a custom page, don't set things up
-		if( empty( $page ) ) {
+		if ( empty( $page ) ) {
 			// get the current page, admin or front end?
-			if( is_admin() ) {
+			if ( is_admin() ) {
 				$page = __( 'Admin', 'yikes-inc-easy-mailchimp-extender' );
 			} else {
 				$page = __( 'Front End', 'yikes-inc-easy-mailchimp-extender' );
@@ -79,14 +79,14 @@ 
 					</label>
 				</td>
 				<td>
-					<?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') ); ?>
+					<?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' ) ); ?>
 				</td>
 			</tr>
 		<?php
 		$new_contents = ob_get_clean() . $contents;
 		
 		// file put contents $returned error + other data
-		if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
+		if ( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
 			file_put_contents( 
 				YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php',
 				$new_contents
@@ -102,12 +102,12 @@ 
 	*/	
 	public function yikes_easy_mailchimp_generate_error_log_table() {		
 		// ensure file_get_contents exists
-		if( function_exists( 'file_get_contents' ) ) {	
+		if ( function_exists( 'file_get_contents' ) ) {	
 			// confirm that our file exists
-			if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
-				$error_log_contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' , true );							
-				if( $error_log_contents === FALSE ) {
-					return _e( 'File get contents not available' , 'yikes-inc-easy-mailchimp-extender' );
+			if ( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
+				$error_log_contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php', true );							
+				if ( $error_log_contents === FALSE ) {
+					return _e( 'File get contents not available', 'yikes-inc-easy-mailchimp-extender' );
 				}
 				if ( $error_log_contents != '' ) {
 					// return $error_log_contents;
@@ -118,7 +118,7 @@ 
 						<tr class="error-log-tr">
 							<td class="row-title colspanchange" colspan="2">
 								<strong><span class='dashicons dashicons-no-alt'></span> <?php _e( 'No errors logged.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-								<?php if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '' ) { ?>
+								<?php if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '' ) { ?>
 									<br />
 									<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>
 								<?php } ?>
@@ -146,7 +146,7 @@ 
 									);
 									?>
 									<form id="create-error-log" method="POST" action="<?php echo $url; ?>">
-										<?php submit_button( __( 'Attempt to Create Error Log' , 'yikes-inc-easy-mailchimp-extender' ) , 'secondary' , '' , '' , array() ); ?>
+										<?php submit_button( __( 'Attempt to Create Error Log', 'yikes-inc-easy-mailchimp-extender' ), 'secondary', '', '', array() ); ?>
 									</form>
 									
 								</p>

Braces +4 added lines, -3 removed lines

@@ -100,9 +100,9 @@ 
 	*
 	*  @since 5.6
 	*/	
-	public function yikes_easy_mailchimp_generate_error_log_table() {		
+	public function yikes_easy_mailchimp_generate_error_log_table() {
 		// ensure file_get_contents exists
-		if( function_exists( 'file_get_contents' ) ) {	
+		if( function_exists( 'file_get_contents' ) ) {
 			// confirm that our file exists
 			if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
 				$error_log_contents = file_get_contents( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' , true );							
@@ -154,7 +154,8 @@ 
 						</tr>
 					<?php
 			}
-		} else { // if file_get_contents is disabled server side
+		} else {
+// if file_get_contents is disabled server side
 			?>
 				<!-- table body -->
 				<tr>

includes/class-yikes-inc-easy-mailchimp-extender-activator.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 			if ( $network_wide ) {
 				$old_blog = $wpdb->blogid;
 				// Get all blog ids
-				$blogids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
+				$blogids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
 				foreach ( $blogids as $blog_id ) {
 					switch_to_blog( $blog_id );
 					self::_activate_yikes_easy_mailchimp( $wpdb );
@@ -91,13 +91,13 @@ 
 		custom_fields LONGTEXT NOT NULL,
 		UNIQUE KEY id (id)
 		) $charset_collate;";
-		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-		dbDelta($sql);
+		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		dbDelta( $sql );
 		
 		// create an option for the date that the user initially activated the plugin
 		// used to display a two week notice, asking for a review or to upgrade
-		if( !get_option( 'yikes_easy_mailchimp_activation_date' ) || get_option( 'yikes_easy_mailchimp_activation_date' ) == '' ) {
-			update_option( 'yikes_easy_mailchimp_activation_date' , strtotime( 'now' ) );
+		if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) || get_option( 'yikes_easy_mailchimp_activation_date' ) == '' ) {
+			update_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) );
 		}
 		
 	}

Braces +2 added lines, -1 removed lines

@@ -45,7 +45,8 @@
 				return;
 			}   
 			self::_activate_yikes_easy_mailchimp( $wpdb );
-		} else { /* end network activate */
+		} else {
+/* end network activate */
 			self::_activate_yikes_easy_mailchimp( $wpdb );
 		}
 	}

includes/third-party-integrations/visual-composer/visual-composer.php

Indentation +19 added lines, -19 removed lines

@@ -6,26 +6,26 @@ 
 class YIKES_MailChimp_Visual_Composer_Extension {
 	
 	/**
-	*	Constructor
-	*	@since 6.0.3
-	*/
+	 *	Constructor
+	 *	@since 6.0.3
+	 */
 	function __construct() {
 		add_action( 'admin_init', array( $this, 'extend_visual_composer' ) );
 		add_shortcode_param( 'yikes_mailchimp_logo', array( $this, 'yikes_mailchimp_logo_vc_section' ) );
 	}
 	
 	/**
-	*	Extend Visual Composer with custom button
-	*	@since 6.0.3
-	*/
+	 *	Extend Visual Composer with custom button
+	 *	@since 6.0.3
+	 */
 	public function extend_visual_composer() {
 		vc_map( array(
-		   "name" => __( "Easy Forms for MailChimp", "yikes-inc-easy-mailchimp-extender" ),
-		   "base" => "yikes-mailchimp",
-   		   "icon" => YIKES_MC_URL . "includes/images/Welcome_Page/yikes-mailchimp-welcome-logo.png", // Simply pass url to your icon here
-		   "category" => 'Content', // where is this buutton being displayed
-		   "description" => __( "Display a MailChimp Opt-In form", "yikes-inc-easy-mailchimp-extender" ), // add a description
-		   "params" => array(
+			"name" => __( "Easy Forms for MailChimp", "yikes-inc-easy-mailchimp-extender" ),
+			"base" => "yikes-mailchimp",
+				"icon" => YIKES_MC_URL . "includes/images/Welcome_Page/yikes-mailchimp-welcome-logo.png", // Simply pass url to your icon here
+			"category" => 'Content', // where is this buutton being displayed
+			"description" => __( "Display a MailChimp Opt-In form", "yikes-inc-easy-mailchimp-extender" ), // add a description
+			"params" => array(
 				array(
 					"type" => "yikes_mailchimp_logo",
 					"holder" => "div",
@@ -75,22 +75,22 @@ 
 					"value" => __( "Submit", "yikes-inc-easy-mailchimp-extender" ),
 					"description" => __( "Enter a title to display", "yikes-inc-easy-mailchimp-extender" )
 				)
-		   )
+			)
 		) );
 	}
 	
 	/**
-	*	Custom Callback Section
-	*	@since 6.0.3
-	*/
+	 *	Custom Callback Section
+	 *	@since 6.0.3
+	 */
 	public function yikes_mailchimp_logo_vc_section( $settings, $value ) {
 		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' ) . '" />';
 	}
 	
 	/**
-	*	Retreive a list of forms created by the user that they can select from in the dropdown
-	*	@since 6.0.3
-	*/
+	 *	Retreive a list of forms created by the user that they can select from in the dropdown
+	 *	@since 6.0.3
+	 */
 	public function yikes_mailchimp_retreive_user_created_forms() {
 		global $wpdb;
 		$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );

Spacing +4 added lines, -4 removed lines

@@ -95,13 +95,13 @@
 		global $wpdb;
 		$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 		$lists = array();
-		if( !empty( $list_data ) ) {	
+		if ( ! empty( $list_data ) ) {	
 			// build an array to pass to our javascript
-			foreach( $list_data as $form ) {
-				$lists[$form['form_name']] = $form['id'];
+			foreach ( $list_data as $form ) {
+				$lists[ $form[ 'form_name' ] ] = $form[ 'id' ];
 			}
 		} else {
-			$lists[__( 'Please Import Some MailChimp Lists' , 'yikes-inc-easy-mailchimp-extender' )] = '-';
+			$lists[ __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';
 		}
 		return $lists;
 	}

Braces +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 		global $wpdb;
 		$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 		$lists = array();
-		if( !empty( $list_data ) ) {	
+		if( !empty( $list_data ) ) {
 			// build an array to pass to our javascript
 			foreach( $list_data as $form ) {
 				$lists[$form['form_name']] = $form['id'];

includes/third-party-integrations/third-party-init.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		// required..*
 		include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 		/* Visual Composer */
-		if( is_plugin_active( 'js_composer/js_composer.php' ) ) {
+		if ( is_plugin_active( 'js_composer/js_composer.php' ) ) {
 			include_once( YIKES_MC_PATH . 'includes/third-party-integrations/visual-composer/visual-composer.php' );
 		}
 	}