yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/menu/manage-lists.php

Spacing +28 added lines, -28 removed lines

@@ -27,16 +27,16 @@ 
 ?>
 <div class="wrap">
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Mailing Lists' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Mailing Lists', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your Mailchimp lists.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your Mailchimp lists.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<?php
 		/* If the user hasn't authenticated yet, lets kill off */
-		if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
+		if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
 
 			$error_string = sprintf(
 				esc_html__( 'You need to connect to Mailchimp before you can start creating forms. Head over to the %s and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ),
@@ -72,8 +72,8 @@ 
 									<!-- TABLE HEAD -->
 									<thead>
 										<tr>
-											<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</thead>
 									<!-- end header -->
@@ -81,25 +81,25 @@ 
 									<!-- FOOTER -->
 									<tfoot>
 										<tr>
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</tfoot>
 									<!-- end footer -->
 
 									<!-- TABLE BODY -->
 									<tbody>
-										<?php if( count( $list_data ) > 0 ) {
+										<?php if ( count( $list_data ) > 0 ) {
 											$i = 1;
-											foreach( $list_data as $list ) {
+											foreach ( $list_data as $list ) {
 												?>
-												<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
+												<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 													<td class="column-columnname">
-														<a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list['id'] ) , admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>" class="row-title">
-															<?php echo stripslashes( $list['name'] ); ?>
+														<a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list[ 'id' ] ), admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>" class="row-title">
+															<?php echo stripslashes( $list[ 'name' ] ); ?>
 														</a>
 														<div class="row-actions">
-															<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list['id'] ) , admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>"><?php _e( "View" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
+															<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list[ 'id' ] ), admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>"><?php _e( "View", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
 															<?php
 																/*
 																*	Custom action to allow users to add additional action links
@@ -109,7 +109,7 @@ 
 															?>
 														</div>
 													</td>
-													<td class="column-columnname num"><?php echo $list['stats']['member_count']; ?></td>
+													<td class="column-columnname num"><?php echo $list[ 'stats' ][ 'member_count' ]; ?></td>
 												</tr>
 												<?php
 												$i++;
@@ -117,7 +117,7 @@ 
 											} else {
 											?>
 											<tr class="no-items">
-												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php printf( __( 'No Mailchimp lists found. Head over to <a href="%s" title="Mailchimp.com">Mailchimp.com</a> to setup your first mailing list. Once thats done you can head back here to customize it!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'http://mailchimp.com/' ) ); ?></em></td>
+												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php printf( __( 'No Mailchimp lists found. Head over to <a href="%s" title="Mailchimp.com">Mailchimp.com</a> to setup your first mailing list. Once thats done you can head back here to customize it!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'http://mailchimp.com/' ) ); ?></em></td>
 											</tr>
 										<?php } ?>
 									</tbody>
@@ -137,8 +137,8 @@ 
 					<div class="postbox yikes-easy-mc-postbox">
 						<div class="inside">
 
-							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'Mailchimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
-								<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/mailchimp-logo.png'; ?>" title="<?php _e( 'Mailchimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="list-page-mailchimp-logo">
+							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'Mailchimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
+								<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/mailchimp-logo.png'; ?>" title="<?php _e( 'Mailchimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="list-page-mailchimp-logo">
 							</a>
 
 						</div>
@@ -148,42 +148,42 @@ 
 					<div class="postbox yikes-easy-mc-postbox list-page-sidebar">
 						<div class="inside">
 
-							<h2 class="account-status"><?php echo $account_details['username']; ?> <small>(<?php echo $account_details['role']; ?>)</small></h2>
+							<h2 class="account-status"><?php echo $account_details[ 'username' ]; ?> <small>(<?php echo $account_details[ 'role' ]; ?>)</small></h2>
 
-							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $account_details['avatar_url'] ); ?>" title="<?php echo $account_details['username'] . ' ' . __( "Mailchimp avatar" , 'yikes-inc-easy-mailchimp-extender' ); ?>">
+							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $account_details[ 'avatar_url' ] ); ?>" title="<?php echo $account_details[ 'username' ] . ' ' . __( "Mailchimp avatar", 'yikes-inc-easy-mailchimp-extender' ); ?>">
 
 							<table class="form-table" id="account-details-table">
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Company' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Company', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo $account_details['contact']['company']; ?><br /><?php echo $account_details['contact']['city'] . ', ' . $account_details['contact']['state']; ?></td>
+									<td><?php echo $account_details[ 'contact' ][ 'company' ]; ?><br /><?php echo $account_details[ 'contact' ][ 'city' ] . ', ' . $account_details[ 'contact' ][ 'state' ]; ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Industry' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Industry', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo $account_details['account_industry']; ?></td>
+									<td><?php echo $account_details[ 'account_industry' ]; ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Member Since' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Member Since', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo date( get_option('date_format') , strtotime( $account_details['member_since'] ) ); ?></td>
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $account_details[ 'member_since' ] ) ); ?></td>
 								</tr>
 								<tr valign="top">
 									<td scope="row">
 										<label for="tablecell">
-											<strong><?php _e( 'Plan Type' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+											<strong><?php _e( 'Plan Type', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										</label>
 									</td>
-									<td><?php echo ucwords( $account_details['pricing_plan_type'] ); ?></td>
+									<td><?php echo ucwords( $account_details[ 'pricing_plan_type' ] ); ?></td>
 								</tr>
 							</table>
 

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

Braces +10 added lines, -10 removed lines

@@ -5,18 +5,18 @@ 
 *	@since 6.0.3

 */

 

-class YIKES_MailChimp_Visual_Composer_Extension {

+class YIKES_MailChimp_Visual_Composer_Extension {
 

 	/**

 	 * Constructor

 	 *

 	 * @since 6.0.3

 	 */

-	function __construct() {

+	function __construct() {
 		

 		add_action( 'admin_init', array( $this, 'extend_visual_composer' ) );

 

-		if ( function_exists( 'vc_add_shortcode_param' ) ) {

+		if ( function_exists( 'vc_add_shortcode_param' ) ) {
 			vc_add_shortcode_param( 'yikes_mailchimp_logo', array( $this, 'yikes_mailchimp_logo_vc_section' ) );

 		}

 	}

@@ -26,9 +26,9 @@ 
 	 *

 	 * @since 6.0.3

 	 */

-	public function extend_visual_composer() {

+	public function extend_visual_composer() {
 

-		if ( ! function_exists( 'vc_map' ) ) {

+		if ( ! function_exists( 'vc_map' ) ) {
 			return;

 		}

 

@@ -98,7 +98,7 @@ 
 	 *

 	 * @since 6.0.3

 	 */

-	public function yikes_mailchimp_logo_vc_section() {

+	public function yikes_mailchimp_logo_vc_section() {
 		return '<img style="width:250px;display:block;margin:0 auto;" src="' . YIKES_MC_URL . 'includes/images/MailChimp_Assets/mailchimp-logo.png" title="' . __( 'Easy Forms for Mailchimp', 'yikes-inc-easy-mailchimp-extender' ) . '" />';

 	}

 

@@ -107,17 +107,17 @@ 
 	 *

 	 * @since 6.0.3

 	 */

-	public function yikes_mailchimp_retreive_user_created_forms() {

+	public function yikes_mailchimp_retreive_user_created_forms() {
 		$interface = yikes_easy_mailchimp_extender_get_form_interface();

 		$all_forms = $interface->get_all_forms();

 

 		$lists = array();

-		if ( ! empty( $all_forms ) ) {

+		if ( ! empty( $all_forms ) ) {
 			// build an array to pass to our javascript

-			foreach ( $all_forms as $id => $form ) {

+			foreach ( $all_forms as $id => $form ) {
 				$lists[ $form['form_name'] ] = $id;

 			}

-		} else {

+		} else {
 			$lists[ __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';

 		}