Completed
Push — staging ( 69b5b7...e62b8b )
by Evan
06:26
created
admin/partials/welcome-page/welcome-sections/whats-new-section.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 	
3 3
 	<div class="feature-section">
4 4
 		
5
-		<h2><?php _e( 'All New Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
5
+		<h2><?php _e( 'All New Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
6 6
 		
7 7
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/form-layout-option.jpg'; ?>" alt="<?php _e( 'New Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
8 8
 		
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
26 26
 	
27 27
 	<div class="feature-section">
28 28
 		
29
-		<h2><?php _e( 'Translated & Localized' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
29
+		<h2><?php _e( 'Translated & Localized', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
30 30
 		
31
-		<p style="float:left;width:55%;max-width:55%;"><?php _e( "YIKES Easy Forms for MailChimp was developed with our international users in mind. Not only will you find the plugin to be i18n ready, but you'll also find our datepickers to be localized for mm/dd/yyyy or dd/mm/yyyy formats. Everything is automatic and gets localized based on the language of your site. It's like magic!",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
31
+		<p style="float:left;width:55%;max-width:55%;"><?php _e( "YIKES Easy Forms for MailChimp was developed with our international users in mind. Not only will you find the plugin to be i18n ready, but you'll also find our datepickers to be localized for mm/dd/yyyy or dd/mm/yyyy formats. Everything is automatic and gets localized based on the language of your site. It's like magic!", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
32 32
 		
33 33
 		<img style="width:40%;max-width:400px;display:block;" src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/arabic-calendar.png'; ?>" alt="<?php _e( 'Localized Arabic Calendar', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
34 34
 
@@ -38,19 +38,19 @@  discard block
 block discarded – undo
38 38
 	
39 39
 	<div class="feature-section">
40 40
 		
41
-		<h2><?php _e( 'Knowledge Base & GlotPress Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
41
+		<h2><?php _e( 'Knowledge Base & GlotPress Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
42 42
 				
43 43
 		<img style="float:left;max-width:300px;margin-right:20px;margin-left:0 !important;" src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/glotpress-translation-percentage.png'; ?>" alt="<?php _e( 'GlotPress Localized Precentage', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
44 44
 
45
-		<p><?php _e( "Since the initial release of this Easy Forms for MailChimp by YIKES we've been tirelessly working on putting together a collection of help articles ranging from troubleshooting tips to customization options. We've also included a collection of code snippets from some of our most widely asked questions. Now you can access some of our most popular articles right from within the plugin.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
45
+		<p><?php _e( "Since the initial release of this Easy Forms for MailChimp by YIKES we've been tirelessly working on putting together a collection of help articles ranging from troubleshooting tips to customization options. We've also included a collection of code snippets from some of our most widely asked questions. Now you can access some of our most popular articles right from within the plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
46 46
 				
47
-		<p><h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#knowledge-base-articles' ) ); ?>" title="<?php _e( 'Support | Knowledge Base' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Support → Knowledge Base Articles', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
47
+		<p><h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#knowledge-base-articles' ) ); ?>" title="<?php _e( 'Support | Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Support → Knowledge Base Articles', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
48 48
 		
49 49
 		<p>&nbsp;</p>
50 50
 		
51 51
 		<p><?php _e( "With a ton of help from the WordPress community, we've been able to support 7 international languages. We're always looking for additional translators, so if you are multi-lingual and can help translate things - hop into glotpress and help contribute to future development of this plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
52 52
 		
53
-		<p><h4><a href="<?php echo esc_url_raw( 'https://translate.wordpress.org/projects/wp-plugins/yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank"title="<?php _e( 'Easy Forms for MailChimp | GlotPress' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GlotPress', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
53
+		<p><h4><a href="<?php echo esc_url_raw( 'https://translate.wordpress.org/projects/wp-plugins/yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank"title="<?php _e( 'Easy Forms for MailChimp | GlotPress', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GlotPress', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
54 54
 
55 55
 		
56 56
 	</div>
@@ -59,11 +59,11 @@  discard block
 block discarded – undo
59 59
 	
60 60
 	<div class="feature-section">
61 61
 		
62
-		<h2><?php _e( 'Intuitive Settings Page' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
62
+		<h2><?php _e( 'Intuitive Settings Page', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
63 63
 		
64 64
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/settings-page.png'; ?>" alt="<?php _e( 'Settings Page', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
65 65
 
66
-		<p style="float:left; padding-left:15px;margin-top:5px;"><?php _e( "We've re-laid out the settings page to allow for a more intuitive workflow. All of your settings are neatly tucked away in their respective setting tab.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
66
+		<p style="float:left; padding-left:15px;margin-top:5px;"><?php _e( "We've re-laid out the settings page to allow for a more intuitive workflow. All of your settings are neatly tucked away in their respective setting tab.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
67 67
 		
68 68
 	</div>
69 69
 	
Please login to merge, or discard this patch.
admin/partials/welcome-page/welcome-sections/credits-section.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@  discard block
 block discarded – undo
3 3
 	if ( false === ( $contributors = get_transient( 'yikes-mailchimp-contributor-transient' ) ) ) {
4 4
 		// It wasn't there, so regenerate the data and save the transient
5 5
 		$contributors = wp_remote_get( 'https://api.github.com/repos/yikesinc/yikes-inc-easy-mailchimp-extender/contributors?per_page=100', array( 'timeout' => 120 ) );
6
-		$contributors = json_decode( $contributors['body'] , true );
7
-		set_transient( 'yikes-mailchimp-contributor-transient', $contributors, 60*60*12 );
6
+		$contributors = json_decode( $contributors[ 'body' ], true );
7
+		set_transient( 'yikes-mailchimp-contributor-transient', $contributors, 60 * 60 * 12 );
8 8
 	}
9 9
 	// get the YIKES Inc. MailChimp translators via the Github API
10 10
 	if ( false === ( $translators = get_transient( 'yikes-mailchimp-translators-transient' ) ) ) {
@@ -19,20 +19,20 @@  discard block
 block discarded – undo
19 19
 		);	
20 20
 		// create an empty array to store with translator data to loop over
21 21
 		$translators = array();
22
-		foreach( $translator_usernames as $username => $language ) {
22
+		foreach ( $translator_usernames as $username => $language ) {
23 23
 			$translator_data = wp_remote_get( 'https://api.github.com/users/' . $username, array( 'timeout' => 120 ) );
24 24
 			// if( $translator_data['status'] == 200 ) {
25
-				$translators_data_decoded = json_decode( $translator_data['body'] , true );
26
-				$translators[] = array(
27
-					'login' => $translators_data_decoded['login'],
28
-					'avatar_url' => $translators_data_decoded['avatar_url'],
29
-					'html_url' => $translators_data_decoded['html_url'],
30
-					'name' => $translators_data_decoded['name'],
25
+				$translators_data_decoded = json_decode( $translator_data[ 'body' ], true );
26
+				$translators[ ] = array(
27
+					'login' => $translators_data_decoded[ 'login' ],
28
+					'avatar_url' => $translators_data_decoded[ 'avatar_url' ],
29
+					'html_url' => $translators_data_decoded[ 'html_url' ],
30
+					'name' => $translators_data_decoded[ 'name' ],
31 31
 					'translation_language' => $language,
32 32
 				);
33 33
 			// }
34 34
 		}		
35
-		set_transient( 'yikes-mailchimp-translators-transient', $translators, 60*60*12 );
35
+		set_transient( 'yikes-mailchimp-translators-transient', $translators, 60 * 60 * 12 );
36 36
 	}
37 37
 ?>
38 38
 <div class="wrap about-wrap">
@@ -46,17 +46,17 @@  discard block
 block discarded – undo
46 46
 		<div id="credit-container">
47 47
 			<h2><?php _e( 'Developers', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
48 48
 			<?php
49
-				if( ! empty( $contributors ) ) {
50
-					$old_contributors = array( 'seriouslysean' , 'Apfelbiss', 'hiwhatsup', 'mialevesque' );
51
-						foreach( $contributors as $contributor ) {
49
+				if ( ! empty( $contributors ) ) {
50
+					$old_contributors = array( 'seriouslysean', 'Apfelbiss', 'hiwhatsup', 'mialevesque' );
51
+						foreach ( $contributors as $contributor ) {
52 52
 							// skip contributors from our old plugin (this is a new re-write)
53
-							if( ! in_array( $contributor['login'] , $old_contributors ) ) {
53
+							if ( ! in_array( $contributor[ 'login' ], $old_contributors ) ) {
54 54
 								?>
55
-								<a href="<?php echo esc_url_raw( $contributor['html_url'] ); ?>" title="<?php echo $contributor['login']; ?>" target="_blank" class="github-avatar-url">
55
+								<a href="<?php echo esc_url_raw( $contributor[ 'html_url' ] ); ?>" title="<?php echo $contributor[ 'login' ]; ?>" target="_blank" class="github-avatar-url">
56 56
 									<div class="team-member">
57
-										<img src="<?php echo esc_url_raw( $contributor['avatar_url'] ); ?>" class="github-avatar-image">
57
+										<img src="<?php echo esc_url_raw( $contributor[ 'avatar_url' ] ); ?>" class="github-avatar-image">
58 58
 										<p class="member-blurb">
59
-											<p><strong><?php echo $contributor['login']; ?></strong></p>
59
+											<p><strong><?php echo $contributor[ 'login' ]; ?></strong></p>
60 60
 										</p>
61 61
 									</div>
62 62
 								</a>
@@ -65,24 +65,24 @@  discard block
 block discarded – undo
65 65
 						}
66 66
 				} else {
67 67
 					?>
68
-						<h4><?php _e( 'There was an error retrieving the contributors list. Please try again later.' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
68
+						<h4><?php _e( 'There was an error retrieving the contributors list. Please try again later.', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
69 69
 					<?php
70 70
 				}
71 71
 			?>
72 72
 		</div>
73 73
 		
74
-		<?php if( ! empty( $translators ) ) { ?>
74
+		<?php if ( ! empty( $translators ) ) { ?>
75 75
 			<div id="translators-container">
76 76
 				<h2><?php _e( 'Translators', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
77 77
 				<?php
78
-					foreach( $translators as $translator ) {
78
+					foreach ( $translators as $translator ) {
79 79
 						?>
80
-							<a href="<?php echo esc_url_raw( $translator['html_url'] ); ?>" title="<?php echo $translator['name']; ?>" target="_blank" class="github-avatar-url">
80
+							<a href="<?php echo esc_url_raw( $translator[ 'html_url' ] ); ?>" title="<?php echo $translator[ 'name' ]; ?>" target="_blank" class="github-avatar-url">
81 81
 								<div class="translator">
82
-									<img src="<?php echo esc_url_raw( $translator['avatar_url'] ); ?>" class="github-avatar-image">
82
+									<img src="<?php echo esc_url_raw( $translator[ 'avatar_url' ] ); ?>" class="github-avatar-image">
83 83
 									<p class="member-blurb">
84
-										<p><strong><?php echo $translator['login']; ?></strong></p>
85
-										<em class="translation-language"><?php echo $translator['translation_language']; ?></em>
84
+										<p><strong><?php echo $translator[ 'login' ]; ?></strong></p>
85
+										<em class="translation-language"><?php echo $translator[ 'translation_language' ]; ?></em>
86 86
 									</p>
87 87
 								</div>
88 88
 							</a>
Please login to merge, or discard this patch.
admin/partials/welcome-page/welcome-sections/getting-started-section.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,24 +1,24 @@  discard block
 block discarded – undo
1
-<?php if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) { ?>
1
+<?php if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) { ?>
2 2
 	<div class="about-description">
3
-		<?php printf( __( "Before you can create any opt-in forms, you'll first need to enter your MailChimp API key into the <a href='%s' title='Yikes Easy MailChimp Settings'>settings page</a>" , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>
3
+		<?php printf( __( "Before you can create any opt-in forms, you'll first need to enter your MailChimp API key into the <a href='%s' title='Yikes Easy MailChimp Settings'>settings page</a>", 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>
4 4
 	</div>
5 5
 <?php } ?>
6 6
 
7 7
 <div class="changelog">
8 8
 		
9
-	<h3><?php _e( 'Creating Your First Opt-In Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
9
+	<h3><?php _e( 'Creating Your First Opt-In Form', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
10 10
 	
11 11
 	<div class="feature-section">
12 12
 		
13 13
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/create-first-optin-form.jpg'; ?>" alt="<?php _e( 'Create first optin form screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image">
14 14
 					
15
-		<h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ); ?>" title="<?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?>">Easy MailChimp → <?php _e( 'Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4>
16
-		<p><?php _e( "Before you can start collecting users email addresses and building your mailing list, you'll need to create your first form. You can create as many forms as you'd like and assign each form to the same or different mailing lists.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
15
+		<h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ); ?>" title="<?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ); ?>">Easy MailChimp → <?php _e( 'Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4>
16
+		<p><?php _e( "Before you can start collecting users email addresses and building your mailing list, you'll need to create your first form. You can create as many forms as you'd like and assign each form to the same or different mailing lists.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
17 17
 	
18 18
 		<p>&nbsp;</p>
19 19
 		
20
-		<h4><?php _e( 'Additional Options' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
21
-		<p><?php _e( "Once you create a form, you can choose which fields you want to add to it and customize the success and error messages returned by MailChimp.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
20
+		<h4><?php _e( 'Additional Options', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
21
+		<p><?php _e( "Once you create a form, you can choose which fields you want to add to it and customize the success and error messages returned by MailChimp.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
22 22
 		
23 23
 	</div>
24 24
 	
@@ -26,41 +26,41 @@  discard block
 block discarded – undo
26 26
 		
27 27
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/optin-settings.png'; ?>" alt="<?php _e( 'Optin settings screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-feature-image-left">
28 28
 					
29
-		<h4><?php _e( 'Customize the Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
30
-		<p><?php _e( "Once created, you can customize the form. This includes editing the success and error messages displayed to the user, choosing which fields or interest groups are displayed, adding CSS classes to fields, assigning default values amp; placeholders and tons more!",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
29
+		<h4><?php _e( 'Customize the Form', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
30
+		<p><?php _e( "Once created, you can customize the form. This includes editing the success and error messages displayed to the user, choosing which fields or interest groups are displayed, adding CSS classes to fields, assigning default values amp; placeholders and tons more!", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
31 31
 		
32 32
 		<p>&nbsp;</p>
33 33
 		
34
-		<p><?php _e( "Quickly and easily switch which list the form is associated with, toggle single or double optin, whether the welcome email should be sent, toggle AJAX form submissions and more. Get customizing!",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
34
+		<p><?php _e( "Quickly and easily switch which list the form is associated with, toggle single or double optin, whether the welcome email should be sent, toggle AJAX form submissions and more. Get customizing!", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
35 35
 	</div>
36 36
 	<div class="feature-section">
37 37
 		
38 38
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/add-field-to-page.png'; ?>" alt="<?php _e( 'Add field to form screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image">
39 39
 					
40
-		<h4><?php _e( 'Add Form to Page/Post' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
41
-		<p><?php _e( "When you're ready to add your MailChimp opt-in form to a page or post, you can click on the small MailChimp button in the content editor toolbar.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
40
+		<h4><?php _e( 'Add Form to Page/Post', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
41
+		<p><?php _e( "When you're ready to add your MailChimp opt-in form to a page or post, you can click on the small MailChimp button in the content editor toolbar.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
42 42
 		
43 43
 		<p>&nbsp;</p>
44 44
 		
45
-		<h4><?php _e( 'Add Form to Widget' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
46
-		<p><?php _e( "We've created a MailChimp widget to easily add forms to any sidebar or widgetized area on your site. The widget allows you to select from any created forms.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
45
+		<h4><?php _e( 'Add Form to Widget', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
46
+		<p><?php _e( "We've created a MailChimp widget to easily add forms to any sidebar or widgetized area on your site. The widget allows you to select from any created forms.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
47 47
 	</div>
48 48
 	
49 49
 	<div class="feature-section">
50
-		<h3><span class="dashicons dashicons-format-status need-support-icon"></span> <?php _e( "Need Support?" , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>		
50
+		<h3><span class="dashicons dashicons-format-status need-support-icon"></span> <?php _e( "Need Support?", 'yikes-inc-easy-mailchimp-extender' ); ?></h3>		
51 51
 		
52
-		<h4><?php _e( 'Free Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
53
-		<p><?php _e( "If you need help using the free version of the plugin, you can post support inquiries to one of two locations.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
52
+		<h4><?php _e( 'Free Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
53
+		<p><?php _e( "If you need help using the free version of the plugin, you can post support inquiries to one of two locations.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
54 54
 		<ul class="support-option-list">
55
-			<li class="support-option support-option-first"><a href="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" title="<?php esc_attr_e( 'WordPress Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'WordPress Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
56
-			<li class="support-option support-option-second"><a href="https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues" target="_blank" title="<?php esc_attr_e( 'GitHub Issue Tracker' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GitHub Issue Tracker' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
55
+			<li class="support-option support-option-first"><a href="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" title="<?php esc_attr_e( 'WordPress Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'WordPress Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
56
+			<li class="support-option support-option-second"><a href="https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues" target="_blank" title="<?php esc_attr_e( 'GitHub Issue Tracker', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GitHub Issue Tracker', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
57 57
 		</ul>
58 58
 		
59
-		<h4><?php _e( 'Priority Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
60
-		<p><?php _e( "If you want immediate support, please consider purchasing an add-on or developer License. Not only will you get 1 full year of automatic updates and priority support, you will enjoy the tons of features packed into our add-ons that are not available in the free version." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
59
+		<h4><?php _e( 'Priority Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
60
+		<p><?php _e( "If you want immediate support, please consider purchasing an add-on or developer License. Not only will you get 1 full year of automatic updates and priority support, you will enjoy the tons of features packed into our add-ons that are not available in the free version.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
61 61
 
62
-		<h4><?php _e( 'Knowledge Base' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
63
-		<p><?php printf( __( 'For plugin documentation, visit our <a href="%s" title="Knowledge Base" target="_blank">knowledge base</a>.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) ); ?>
62
+		<h4><?php _e( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
63
+		<p><?php printf( __( 'For plugin documentation, visit our <a href="%s" title="Knowledge Base" target="_blank">knowledge base</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) ); ?>
64 64
 		
65 65
 	</div>
66 66
 	
Please login to merge, or discard this patch.
admin/partials/welcome-page/welcome.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,22 +7,22 @@  discard block
 block discarded – undo
7 7
 	 * @return void
8 8
 	 */
9 9
 	function yikes_easy_mc_welcome_tabs() {
10
-		$section = isset( $_GET['section'] ) ? $_GET['section'] : 'getting-started';
10
+		$section = isset( $_GET[ 'section' ] ) ? $_GET[ 'section' ] : 'getting-started';
11 11
 		?>
12 12
 		<h2 class="nav-tab-wrapper welcome-page-tabs">
13
-			<a class="nav-tab <?php echo $section == 'getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'getting-started' ), 'admin.php' ) ) ); ?>">
13
+			<a class="nav-tab <?php echo $section == 'getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'getting-started' ), 'admin.php' ) ) ); ?>">
14 14
 				<span class="dashicons dashicons-admin-home"></span> <?php _e( 'Getting Started', 'yikes-inc-easy-mailchimp-extender' ); ?>
15 15
 			</a>
16
-			<a class="nav-tab <?php echo $section == 'whats-new' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'whats-new' ), 'admin.php' ) ) ); ?>">
16
+			<a class="nav-tab <?php echo $section == 'whats-new' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'whats-new' ), 'admin.php' ) ) ); ?>">
17 17
 				<span class="dashicons dashicons-warning"></span> <?php _e( "What's New", 'yikes-inc-easy-mailchimp-extender' ); ?>
18 18
 			</a>
19
-			<a class="nav-tab <?php echo $section == 'add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'add-ons' ), 'admin.php' ) ) ); ?>">
19
+			<a class="nav-tab <?php echo $section == 'add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'add-ons' ), 'admin.php' ) ) ); ?>">
20 20
 				<span class="dashicons dashicons-admin-plugins"></span> <?php _e( "Add-Ons", 'yikes-inc-easy-mailchimp-extender' ); ?>
21 21
 			</a>
22
-			<a class="nav-tab <?php echo $section == 'knowledge-base' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'knowledge-base' ), 'admin.php' ) ) ); ?>">
22
+			<a class="nav-tab <?php echo $section == 'knowledge-base' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'knowledge-base' ), 'admin.php' ) ) ); ?>">
23 23
 				<span class="dashicons dashicons-welcome-learn-more"></span> <?php _e( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ); ?>
24 24
 			</a>
25
-			<a class="nav-tab <?php echo $section == 'credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'credits' ), 'admin.php' ) ) ); ?>">
25
+			<a class="nav-tab <?php echo $section == 'credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'credits' ), 'admin.php' ) ) ); ?>">
26 26
 				<span class="dashicons dashicons-arrow-left-alt2"></span><?php _e( 'Credits', 'yikes-inc-easy-mailchimp-extender' ); ?><span class="dashicons dashicons-arrow-right-alt2"></span>
27 27
 			</a>
28 28
 		</h2>
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
 	}
31 31
 	
32 32
 	function yikes_easy_mc_welcome_body() {
33
-		$section = isset( $_GET['section'] ) ? $_GET['section'] : 'getting-started';
34
-		if( isset( $section ) ) {
33
+		$section = isset( $_GET[ 'section' ] ) ? $_GET[ 'section' ] : 'getting-started';
34
+		if ( isset( $section ) ) {
35 35
 			include_once( plugin_dir_path( dirname( __FILE__ ) ) . '/welcome-page/welcome-sections/' . $section . '-section.php' );
36 36
 		}
37 37
 	}
@@ -44,17 +44,17 @@  discard block
 block discarded – undo
44 44
 		<div id="yikes-mailchimp-logo"></div>
45 45
 		
46 46
 		<h2 class="welcome-title">
47
-			Easy Forms for MailChimp by YIKES | <?php echo __( 'MailChimp Done Right' , 'yikes-inc-easy-mailchimp-extender' ); ?>
47
+			Easy Forms for MailChimp by YIKES | <?php echo __( 'MailChimp Done Right', 'yikes-inc-easy-mailchimp-extender' ); ?>
48 48
 		</h2>		
49 49
 		
50 50
 		<p class="about-text">
51 51
 			<?php 
52 52
 				// check if this is a fresh install
53
-				if( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
54
-					echo sprintf( __( 'Welcome to the most powerful MailChimp integration for WordPress. Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!' , 'yikes-inc-easy-mailchimp-extender' ) , $this->version ); 
53
+				if ( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
54
+					echo sprintf( __( 'Welcome to the most powerful MailChimp integration for WordPress. Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!', 'yikes-inc-easy-mailchimp-extender' ), $this->version ); 
55 55
 				} else {
56 56
 					// else thank you for updating :)
57
-					echo sprintf( __( 'Thank you for updating to the latest version! Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!' , 'yikes-inc-easy-mailchimp-extender' ) , $this->version ); 
57
+					echo sprintf( __( 'Thank you for updating to the latest version! Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!', 'yikes-inc-easy-mailchimp-extender' ), $this->version ); 
58 58
 				}
59 59
 			?>
60 60
 		</p>
Please login to merge, or discard this patch.
admin/partials/ajax/class.ajax.php 3 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -154,17 +154,17 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -12,15 +12,15 @@  discard block
 block discarded – undo
12 12
 
13 13
 		public function __construct() {
14 14
 			// ajax send merge variable to form builder
15
-			add_action( 'wp_ajax_add_field_to_form', array( $this , 'send_field_to_form' ), 10 );
15
+			add_action( 'wp_ajax_add_field_to_form', array( $this, 'send_field_to_form' ), 10 );
16 16
 			// ajax send interest group to form builder
17
-			add_action( 'wp_ajax_add_interest_group_to_form', array( $this , 'send_interest_group_to_form' ), 10 );
17
+			add_action( 'wp_ajax_add_interest_group_to_form', array( $this, 'send_interest_group_to_form' ), 10 );
18 18
 			// return new list data + activity (for dashboard widget )
19
-			add_action( 'wp_ajax_get_new_list_data', array( $this , 'get_new_list_data' ), 10 );
19
+			add_action( 'wp_ajax_get_new_list_data', array( $this, 'get_new_list_data' ), 10 );
20 20
 			// return new list data + activity (for dashboard widget )
21
-			add_action( 'wp_ajax_check_list_for_interest_groups', array( $this , 'check_list_for_interest_groups' ), 10 );
21
+			add_action( 'wp_ajax_check_list_for_interest_groups', array( $this, 'check_list_for_interest_groups' ), 10 );
22 22
 			// Add a new notification to a form
23
-			add_action( 'wp_ajax_add_notification_to_form', array( $this , 'add_notification_to_form' ), 10 , 1 );
23
+			add_action( 'wp_ajax_add_notification_to_form', array( $this, 'add_notification_to_form' ), 10, 1 );
24 24
 		}
25 25
 
26 26
 		/*
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 		*	- return a single container
29 29
 		*/
30 30
 		public function add_notification_to_form() {
31
-			if( $_POST['notification_name'] ) {
31
+			if ( $_POST[ 'notification_name' ] ) {
32 32
 				include_once( YIKES_MC_PATH . 'admin/partials/ajax/add_notification_to_form.php' );
33 33
 			}
34 34
 			exit();
@@ -39,10 +39,10 @@  discard block
 block discarded – undo
39 39
 		// when the user wants to switch which form data
40 40
 		// is displayed on the dashboard
41 41
 		public function get_new_list_data() {
42
-			$list_id = $_POST['list_id'];
42
+			$list_id = $_POST[ 'list_id' ];
43 43
 			$api_key = yikes_get_mc_api_key();
44 44
 			$dash_position = strpos( $api_key, '-' );
45
-			if( $dash_position !== false ) {
45
+			if ( $dash_position !== false ) {
46 46
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
47 47
 			}
48 48
 			$list_data = wp_remote_post( $api_endpoint, array(
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
55 55
 			) );
56 56
 			$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
57
-			if( isset( $list_data['error'] ) ) {
58
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
57
+			if ( isset( $list_data[ 'error' ] ) ) {
58
+				if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
59 59
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
60 60
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
61
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ) , __( "MailChimp Widget" , 'yikes-inc-easy-mailchimp-extender' ) );
61
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), __( "MailChimp Widget", 'yikes-inc-easy-mailchimp-extender' ) );
62 62
 				}
63 63
 			}
64
-			if( ! empty( $list_data['data'][0] ) ) {
64
+			if ( ! empty( $list_data[ 'data' ][ 0 ] ) ) {
65 65
 				include_once( YIKES_MC_PATH . 'admin/partials/dashboard-widgets/templates/stats-list-template.php' );
66 66
 			}
67 67
 			exit();
@@ -73,19 +73,19 @@  discard block
 block discarded – undo
73 73
 		// we want to return the interest groups associated with this list,
74 74
 		// to allow users to pre-check anything they want to assign users appropriately
75 75
 		/* note: this function is called statically from the integration settings page */
76
-		public static function check_list_for_interest_groups( $list_id='', $integration_type='', $load=false ) {
77
-			if( ! $list_id ) {
78
-				$list_id = $_POST['list_id'];
76
+		public static function check_list_for_interest_groups( $list_id = '', $integration_type = '', $load = false ) {
77
+			if ( ! $list_id ) {
78
+				$list_id = $_POST[ 'list_id' ];
79 79
 			}
80
-			if( ! $integration_type ) {
81
-				$integration_type = $_POST['integration'];
80
+			if ( ! $integration_type ) {
81
+				$integration_type = $_POST[ 'integration' ];
82 82
 			}
83 83
 			$api_key = yikes_get_mc_api_key();
84 84
 			// setup/check our transients
85
-			if ( WP_DEBUG ||  false === ( $interest_groupings = get_transient( $list_id . '_interest_group' ) ) ) {
85
+			if ( WP_DEBUG || false === ( $interest_groupings = get_transient( $list_id . '_interest_group' ) ) ) {
86 86
 			  // It wasn't there, so regenerate the data and save the transient
87 87
 				$dash_position = strpos( $api_key, '-' );
88
-				if( $dash_position !== false ) {
88
+				if ( $dash_position !== false ) {
89 89
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/interest-groupings.json';
90 90
 				}
91 91
 				$interest_groupings = wp_remote_post( $api_endpoint, array(
@@ -98,22 +98,22 @@  discard block
 block discarded – undo
98 98
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
99 99
 				) );
100 100
 				$interest_groupings = json_decode( wp_remote_retrieve_body( $interest_groupings ), true );
101
-				if( isset( $interest_groupings['error'] ) ) {
102
-					if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
101
+				if ( isset( $interest_groupings[ 'error' ] ) ) {
102
+					if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
103 103
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
104 104
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
105
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings['error'], __( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ), "class.ajax.php" );
105
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings[ 'error' ], __( "Get Interest Groups", 'yikes-inc-easy-mailchimp-extender' ), "class.ajax.php" );
106 106
 					}
107 107
 				} else {
108 108
 					// set the transient for 2 hours
109 109
 					set_transient( $list_id . '_interest_group', $interest_groupings, 2 * HOUR_IN_SECONDS );
110 110
 				}
111 111
 			}
112
-			if( isset( $interest_groupings ) && ! empty( $interest_groupings ) ) {
112
+			if ( isset( $interest_groupings ) && ! empty( $interest_groupings ) ) {
113 113
 				require( YIKES_MC_PATH . 'admin/partials/menu/options-sections/templates/integration-interest-groups.php' );
114 114
 			}
115 115
 			// do not kill off execution on load, only on an ajax request
116
-			if( ! $load ) {
116
+			if ( ! $load ) {
117 117
 				exit();
118 118
 				wp_die();
119 119
 			}
@@ -123,10 +123,10 @@  discard block
 block discarded – undo
123 123
 		// send a field to our form
124 124
 		public function send_field_to_form() {
125 125
 			$form_data_array = array(
126
-				'field_name' => $_POST['field_name'],
127
-				'merge_tag' => $_POST['merge_tag'],
128
-				'field_type' => $_POST['field_type'],
129
-				'list_id' => $_POST['list_id'],
126
+				'field_name' => $_POST[ 'field_name' ],
127
+				'merge_tag' => $_POST[ 'merge_tag' ],
128
+				'field_type' => $_POST[ 'field_type' ],
129
+				'list_id' => $_POST[ 'list_id' ],
130 130
 			);
131 131
 			include YIKES_MC_PATH . 'admin/partials/ajax/add_field_to_form.php';
132 132
 			exit();
@@ -136,10 +136,10 @@  discard block
 block discarded – undo
136 136
 		// send interest group to our form
137 137
 		public function send_interest_group_to_form() {
138 138
 			$form_data_array = array(
139
-				'field_name' => $_POST['field_name'],
140
-				'group_id' => $_POST['group_id'],
141
-				'field_type' => $_POST['field_type'],
142
-				'list_id' => $_POST['list_id'],
139
+				'field_name' => $_POST[ 'field_name' ],
140
+				'group_id' => $_POST[ 'group_id' ],
141
+				'field_type' => $_POST[ 'field_type' ],
142
+				'list_id' => $_POST[ 'list_id' ],
143 143
 			);
144 144
 			include YIKES_MC_PATH . 'admin/partials/ajax/add_interest_group_to_form.php';
145 145
 			exit();
@@ -152,16 +152,16 @@  discard block
 block discarded – undo
152 152
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
153 153
 		*/
154 154
 		public function findMCListIndex( $id, $array, $tag ) {
155
-			if( $tag == 'tag' ) {
156
-				foreach( $array as $key => $val ) {
157
-					   if ( $val['tag'] === $id ) {
155
+			if ( $tag == 'tag' ) {
156
+				foreach ( $array as $key => $val ) {
157
+					   if ( $val[ 'tag' ] === $id ) {
158 158
 						   return $key;
159 159
 					   }
160 160
 				   }
161 161
 			   return null;
162 162
 			} else {
163 163
 				foreach ( $array as $key => $val ) {
164
-				   if ( $val['id'] == $id ) {
164
+				   if ( $val[ 'id' ] == $id ) {
165 165
 					   return $key;
166 166
 				   }
167 167
 			   }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
admin/partials/menu/options-sections/api-cache-settings.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,18 +3,18 @@
 block discarded – undo
3 3
 	-	Clear MailChimp transient data such as forms, form fields, list data, subscribers etc.
4 4
 		*	transient cache is stored for 60 minutes.
5 5
 -->
6
-<h3><span><?php _e( 'API Cache Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
6
+<h3><span><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
7 7
 <div class="inside">
8 8
 									
9 9
 	<!-- Settings Form -->
10
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data' , 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">							
10
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">							
11 11
 									
12
-		<p><?php _e( "Delete all MailChimp data stored in your sites cache. Most data is stored in the cache for 1 hour." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
12
+		<p><?php _e( "Delete all MailChimp data stored in your sites cache. Most data is stored in the cache for 1 hour.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
13 13
 			<!-- check if any of our transients contain data -->							
14 14
 			<?php if ( false === get_transient( 'yikes-easy-mailchimp-list-data' ) && false === get_transient( 'yikes-easy-mailchimp-profile-data' ) && false === get_transient( 'yikes-easy-mailchimp-account-data' ) ) { ?>
15
-				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
15
+				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
16 16
 			<?php } else { ?>
17
-				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
17
+				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
18 18
 			<?php } ?>
19 19
 									
20 20
 	</form>
Please login to merge, or discard this patch.
admin/partials/menu/options-sections/import-export-forms.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -5,65 +5,65 @@
 block discarded – undo
5 5
 	// return it as an array, so we can work with it to build our form below
6 6
 	$all_forms = $wpdb->get_results( 'SELECT id, form_name FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
7 7
 ?>
8
-<h3><span><?php _e( 'Import/Export Forms & Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
8
+<h3><span><?php _e( 'Import/Export Forms & Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
9 9
 
10 10
 <div class="inside">	
11 11
 					
12 12
 	<!-- Export Form -->
13
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms' , 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">							
13
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms', 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">							
14 14
 									
15
-		<p><strong><?php _e( "Export Forms" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
15
+		<p><strong><?php _e( "Export Forms", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
16 16
 		<p class="description">
17
-			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for MailChimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site." , "yikes-inc-easy-mailchimp-extender" ); ?>
17
+			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for MailChimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site.", "yikes-inc-easy-mailchimp-extender" ); ?>
18 18
 		</p>
19 19
 	
20
-			<?php if( !empty( $all_forms ) ) { ?>	
20
+			<?php if ( ! empty( $all_forms ) ) { ?>	
21 21
 				<!-- custom list so users can export specific forms -->
22
-				<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
22
+				<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
23 23
 				<ul class="export-custom-forms-list">
24
-					<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
25
-					<?php foreach( $all_forms as $form ) { ?>
26
-						<li><label><input type="checkbox" name="export_forms[]" value="<?php echo (int) $form['id']; ?>"><?php echo esc_html( $form['form_name'] ); ?></label></li>
24
+					<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
25
+					<?php foreach ( $all_forms as $form ) { ?>
26
+						<li><label><input type="checkbox" name="export_forms[]" value="<?php echo (int) $form[ 'id' ]; ?>"><?php echo esc_html( $form[ 'form_name' ] ); ?></label></li>
27 27
 					<?php } ?>
28 28
 				</ul>
29 29
 			<?php } else { ?>
30
-				<p><em><?php _e( "It looks like you haven't created any forms yet." , "yikes-inc-easy-mailchimp-extender" ); ?></em></p>
30
+				<p><em><?php _e( "It looks like you haven't created any forms yet.", "yikes-inc-easy-mailchimp-extender" ); ?></em></p>
31 31
 			<?php } ?>
32 32
 		<!-- check if any of our transients contain data -->							
33
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
33
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
34 34
 					
35 35
 	</form>
36 36
 	
37 37
 	<hr />
38 38
 	
39 39
 	<!-- Export Form -->
40
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings' , 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">							
40
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings', 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">							
41 41
 									
42
-		<p><strong><?php _e( "Export Settings" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
42
+		<p><strong><?php _e( "Export Settings", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
43 43
 		<p class="description">
44
-			<?php _e( "Export YIKES Easy Forms for MailChimp plugin settings." , "yikes-inc-easy-mailchimp-extender" ); ?>
44
+			<?php _e( "Export YIKES Easy Forms for MailChimp plugin settings.", "yikes-inc-easy-mailchimp-extender" ); ?>
45 45
 		</p>
46 46
 
47 47
 		<!-- check if any of our transients contain data -->							
48
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
48
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
49 49
 					
50 50
 	</form>
51 51
 	
52 52
 	<hr />
53 53
 	
54 54
 	<!-- Import Form -->	
55
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms' , 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">							
55
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms', 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">							
56 56
 									
57
-		<p><strong><?php _e( "Import" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
57
+		<p><strong><?php _e( "Import", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
58 58
 		<p class="description">
59
-			<?php _e( "Select the Easy Forms for MailChimp export file you would like to import. You can use this field to import your opt-in forms or settings. " , "yikes-inc-easy-mailchimp-extender" ); ?>
59
+			<?php _e( "Select the Easy Forms for MailChimp export file you would like to import. You can use this field to import your opt-in forms or settings. ", "yikes-inc-easy-mailchimp-extender" ); ?>
60 60
 		</p>
61 61
 		
62 62
 		<label>
63 63
 			<input type="file" name="csv" id="forms_to_import">
64 64
 		</label>
65 65
 		<!-- check if any of our transients contain data -->							
66
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Import' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
66
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Import', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
67 67
 					
68 68
 	</form>
69 69
 	
Please login to merge, or discard this patch.
admin/partials/menu/options-sections/debug-settings.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 	- php version, wp version, plugin version and debug log
5 5
 -->
6 6
 
7
-<h3><span><?php _e( 'Debug Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
7
+<h3><span><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
8 8
 
9 9
 <div class="inside">
10 10
 	
@@ -13,10 +13,10 @@  discard block
 block discarded – undo
13 13
 	
14 14
 		<?php settings_fields( 'yikes_inc_easy_mc_debug_settings_page' ); ?>
15 15
 	
16
-		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
17
-			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status' , '' ) , '1' ); ?>>
16
+		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
17
+			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status', '' ), '1' ); ?>>
18 18
 		</label>
19
-		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
19
+		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
20 20
 		
21 21
 		<?php submit_button(); ?>
22 22
 									
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 				)
36 36
 			);
37 37
 		?>
38
-		<h2><?php _e( "Debug Log" , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
38
+		<h2><?php _e( "Debug Log", 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
39 39
 		
40 40
 		<table class="widefat" id="yikes-mailchimp-error-log">
41 41
 			<!-- table header -->
Please login to merge, or discard this patch.
admin/partials/menu/options-sections/recaptcha-settings.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -12,16 +12,16 @@  discard block
 block discarded – undo
12 12
 
13 13
 ?>
14 14
 
15
-<h3><span><?php _e( 'reCAPTCHA Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
15
+<h3><span><?php _e( 'reCAPTCHA Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
16 16
 
17 17
 <div class="inside">
18 18
 	
19 19
 	<p>
20
-		<?php _e( 'reCAPTCHA is a free CAPTCHA service, from Google, that helps protect your site against spam, malicious registrations and other forms of attacks where computers try to disguise themselves as a human. reCAPTCHA will help prevent spammers and bots from submitting data through your MailChimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?>
20
+		<?php _e( 'reCAPTCHA is a free CAPTCHA service, from Google, that helps protect your site against spam, malicious registrations and other forms of attacks where computers try to disguise themselves as a human. reCAPTCHA will help prevent spammers and bots from submitting data through your MailChimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?>
21 21
 	</p>
22 22
 	
23 23
 	<p>
24
-		<?php echo '<a href="https://www.google.com/recaptcha/admin" target="_blank" title="' . __( 'Get your reCAPTCHA API Key' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Get Your reCAPTCHA API Key' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; ?>
24
+		<?php echo '<a href="https://www.google.com/recaptcha/admin" target="_blank" title="' . __( 'Get your reCAPTCHA API Key', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Get Your reCAPTCHA API Key', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; ?>
25 25
 	</p>
26 26
 	
27 27
 	<!-- Settings Form -->
@@ -29,21 +29,21 @@  discard block
 block discarded – undo
29 29
 		
30 30
 		<?php settings_fields( 'yikes_inc_easy_mc_recaptcha_settings_page' ); ?>
31 31
 		
32
-			<label for="yikes-mc-recaptcha-setting"><strong><?php _e( 'Enable reCAPTCHA Protection' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
33
-				<input type="checkbox" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status' , '' ) , '1' ); ?>>
32
+			<label for="yikes-mc-recaptcha-setting"><strong><?php _e( 'Enable reCAPTCHA Protection', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
33
+				<input type="checkbox" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ), '1' ); ?>>
34 34
 			</label>
35 35
 			
36
-			<label for="yikes-mc-recaptcha-api-key"><strong><?php _e( 'reCAPTCHA Site Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
37
-				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-site-key" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-site-key' , '' ) ); ?>">
36
+			<label for="yikes-mc-recaptcha-api-key"><strong><?php _e( 'reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
37
+				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-site-key" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-site-key', '' ) ); ?>">
38 38
 			</label>
39 39
 			
40
-			<label for="yikes-mc-recaptcha-private-api-key"><strong><?php _e( 'reCAPTCHA Secret Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
41
-				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-secret-key" id="" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) ); ?>">
40
+			<label for="yikes-mc-recaptcha-private-api-key"><strong><?php _e( 'reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
41
+				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-secret-key" id="" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-secret-key', '' ) ); ?>">
42 42
 			</label>
43 43
 			
44
-			<a href="#" onclick="jQuery(this).next().slideToggle();return false;" class="recaptcha-preview-link"><?php _e( 'View reCAPTCHA Preview' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
44
+			<a href="#" onclick="jQuery(this).next().slideToggle();return false;" class="recaptcha-preview-link"><?php _e( 'View reCAPTCHA Preview', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
45 45
 				<span class="recaptcha-preview-container">
46
-					<img src="<?php echo YIKES_MC_URL . 'includes/images/recaptcha/recaptcha-demo.gif'; ?>" alt="<?php _e( 'reCAPTCHA Preview' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="recaptcha-demo-gif">
46
+					<img src="<?php echo YIKES_MC_URL . 'includes/images/recaptcha/recaptcha-demo.gif'; ?>" alt="<?php _e( 'reCAPTCHA Preview', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="recaptcha-demo-gif">
47 47
 				</span>
48 48
 			
49 49
 			
Please login to merge, or discard this patch.