Completed
Push — master ( ea40a4...a4569a )
by
unknown
02:51
created
admin/includes/menus/license.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -6,28 +6,28 @@  discard block
 block discarded – undo
6 6
 
7 7
 	function __construct() {
8 8
 
9
-		define( 'LASSO_STORE_ITEM_NAME', 'lasso' );
10
-		define( 'LASSO_STORE_URL', 'https://edituswp.com' );
11
-
12
-		add_action( 'admin_init',  array( $this, 'plugin_updater' ), 0 );
13
-		add_action( 'admin_menu',  array( $this, 'license_menu' ) );
14
-		add_action( 'network_admin_menu',  array( $this, 'license_menu' ) ); // CHANGED Added hook.
15
-		add_action( 'admin_init',  array( $this, 'register_option' ) );
16
-		add_action( 'admin_init',  array( $this, 'activate_license' ) );
17
-		add_action( 'admin_init',  array( $this, 'deactivate_license' ) );
9
+		define('LASSO_STORE_ITEM_NAME', 'lasso');
10
+		define('LASSO_STORE_URL', 'https://edituswp.com');
11
+
12
+		add_action('admin_init', array($this, 'plugin_updater'), 0);
13
+		add_action('admin_menu', array($this, 'license_menu'));
14
+		add_action('network_admin_menu', array($this, 'license_menu')); // CHANGED Added hook.
15
+		add_action('admin_init', array($this, 'register_option'));
16
+		add_action('admin_init', array($this, 'activate_license'));
17
+		add_action('admin_init', array($this, 'deactivate_license'));
18 18
 	}
19 19
 
20 20
 	function plugin_updater() {
21 21
 
22 22
 		// retrieve our license key from the DB
23
-		$license_key = trim( get_option( 'lasso_license_key' ) );
23
+		$license_key = trim(get_option('lasso_license_key'));
24 24
 
25 25
 		// setup the updater
26
-		$edd_updater = new \EDD_SL_Plugin_Updater( LASSO_STORE_URL , LASSO_FILE, array(
26
+		$edd_updater = new \EDD_SL_Plugin_Updater(LASSO_STORE_URL, LASSO_FILE, array(
27 27
 				'version'  => LASSO_VERSION,
28 28
 				'license'  => $license_key,
29 29
 				'item_name' => LASSO_STORE_ITEM_NAME,
30
-				'author'  => __( 'Aesopinteractive LLC', 'lasso' )
30
+				'author'  => __('Aesopinteractive LLC', 'lasso')
31 31
 			)
32 32
 		);
33 33
 
@@ -35,51 +35,51 @@  discard block
 block discarded – undo
35 35
 	function license_menu() {
36 36
 
37 37
 		// CHANGED Removed condition.
38
-		add_submenu_page( 'lasso-editor', __( 'License Key', 'lasso' ), __( 'License', 'lasso' ), 'manage_options', 'lasso-license', array( $this, 'license_page' ) );
38
+		add_submenu_page('lasso-editor', __('License Key', 'lasso'), __('License', 'lasso'), 'manage_options', 'lasso-license', array($this, 'license_page'));
39 39
 
40 40
 	}
41 41
 	function license_page() {
42
-		$license  = get_option( 'lasso_license_key' );
43
-		$status  = get_option( 'lasso_license_status' );
42
+		$license = get_option('lasso_license_key');
43
+		$status = get_option('lasso_license_status');
44 44
 
45 45
 ?>
46 46
 		<div class="wrap">
47
-			<h2><?php _e( 'Editus License', 'lasso' ); ?></h2>
48
-			<p><?php _e( 'Input the license key you recieved with your purchase to ensure your version of Editus stays updated.', 'lasso' );?></p>
47
+			<h2><?php _e('Editus License', 'lasso'); ?></h2>
48
+			<p><?php _e('Input the license key you recieved with your purchase to ensure your version of Editus stays updated.', 'lasso'); ?></p>
49 49
 			<form class="lasso--form-settings" method="post" action="options.php">
50 50
 
51
-				<?php settings_fields( 'lasso_license' ); ?>
51
+				<?php settings_fields('lasso_license'); ?>
52 52
 
53 53
 				<table class="form-table">
54 54
 					<tbody>
55 55
 						<tr valign="top">
56 56
 							<th scope="row" valign="top">
57
-								<?php _e( 'License Key', 'lasso' ); ?>
57
+								<?php _e('License Key', 'lasso'); ?>
58 58
 							</th>
59 59
 							<td>
60
-								<input id="lasso_license_key" name="lasso_license_key" type="text" class="regular-text" value="<?php esc_attr_e( $license ); ?>" />
60
+								<input id="lasso_license_key" name="lasso_license_key" type="text" class="regular-text" value="<?php esc_attr_e($license); ?>" />
61 61
 							</td>
62 62
 						</tr>
63
-						<?php if ( false !== $license ) { ?>
63
+						<?php if (false !== $license) { ?>
64 64
 							<tr valign="top">
65 65
 								<th scope="row" valign="top">
66
-									<?php _e( 'Activate License', 'lasso' ); ?>
66
+									<?php _e('Activate License', 'lasso'); ?>
67 67
 								</th>
68 68
 								<td>
69
-									<?php if ( $status !== false && $status == 'valid' ) { ?>
70
-										<span style="color:green;"><?php _e( 'active' ); ?></span>
71
-										<?php wp_nonce_field( 'lasso_license_nonce', 'lasso_license_nonce' ); ?>
72
-										<input type="submit" class="button-secondary" name="edd_license_deactivate" value="<?php esc_attr_e( 'Deactivate License', 'lasso' ); ?>"/>
69
+									<?php if ($status !== false && $status == 'valid') { ?>
70
+										<span style="color:green;"><?php _e('active'); ?></span>
71
+										<?php wp_nonce_field('lasso_license_nonce', 'lasso_license_nonce'); ?>
72
+										<input type="submit" class="button-secondary" name="edd_license_deactivate" value="<?php esc_attr_e('Deactivate License', 'lasso'); ?>"/>
73 73
 									<?php } else {
74
-				wp_nonce_field( 'lasso_license_nonce', 'lasso_license_nonce' ); ?>
75
-										<input type="submit" class="button-secondary" name="edd_license_activate" value="<?php esc_attr_e( 'Activate License', 'lasso' ); ?>"/>
74
+				wp_nonce_field('lasso_license_nonce', 'lasso_license_nonce'); ?>
75
+										<input type="submit" class="button-secondary" name="edd_license_activate" value="<?php esc_attr_e('Activate License', 'lasso'); ?>"/>
76 76
 									<?php } ?>
77 77
 								</td>
78 78
 							</tr>
79 79
 						<?php } ?>
80 80
 					</tbody>
81 81
 				</table>
82
-				<?php submit_button( 'Save License' ); ?>
82
+				<?php submit_button('Save License'); ?>
83 83
 
84 84
 			</form>
85 85
 		<?php
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
 	// register option
89 89
 	function register_option() {
90 90
 
91
-		register_setting( 'lasso_license', 'lasso_license_key', array( $this, 'sanitize_license' ) );
91
+		register_setting('lasso_license', 'lasso_license_key', array($this, 'sanitize_license'));
92 92
 	}
93 93
 
94 94
 	// santize
95
-	function sanitize_license( $new ) {
96
-		$old = get_option( 'lasso_license_key' );
97
-		if ( $old && $old != $new ) {
98
-			delete_option( 'lasso_license_status' ); // new license has been entered, so must reactivate
95
+	function sanitize_license($new) {
96
+		$old = get_option('lasso_license_key');
97
+		if ($old && $old != $new) {
98
+			delete_option('lasso_license_status'); // new license has been entered, so must reactivate
99 99
 		}
100 100
 		return $new;
101 101
 	}
@@ -104,36 +104,36 @@  discard block
 block discarded – undo
104 104
 	function activate_license() {
105 105
 
106 106
 		// listen for our activate button to be clicked
107
-		if ( isset( $_POST['edd_license_activate'] ) ) {
107
+		if (isset($_POST['edd_license_activate'])) {
108 108
 
109 109
 			// run a quick security check
110
-			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) )
110
+			if (!check_admin_referer('lasso_license_nonce', 'lasso_license_nonce'))
111 111
 				return; // get out if we didn't click the Activate button
112 112
 
113 113
 			// retrieve the license from the database
114
-			$license = trim( get_option( 'lasso_license_key' ) );
114
+			$license = trim(get_option('lasso_license_key'));
115 115
 
116 116
 			// data to send in our API request
117 117
 			$api_params = array(
118 118
 				'edd_action'=> 'activate_license',
119 119
 				'license'  => $license,
120
-				'item_name' => urlencode( LASSO_STORE_ITEM_NAME ), // the name of our product in EDD
120
+				'item_name' => urlencode(LASSO_STORE_ITEM_NAME), // the name of our product in EDD
121 121
 				'url'       => home_url()
122 122
 			);
123 123
 
124 124
 			// Call the custom API.
125
-			$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
125
+			$response = wp_remote_post(LASSO_STORE_URL, array('body' => $api_params, 'timeout' => 15, 'sslverify' => false));
126 126
 
127 127
 			// make sure the response came back okay
128
-			if ( is_wp_error( $response ) )
128
+			if (is_wp_error($response))
129 129
 				return false;
130 130
 
131 131
 			// decode the license data
132
-			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
132
+			$license_data = json_decode(wp_remote_retrieve_body($response));
133 133
 
134 134
 			// $license_data->license will be either "valid" or "invalid"
135 135
 
136
-			update_option( 'lasso_license_status', $license_data->license );
136
+			update_option('lasso_license_status', $license_data->license);
137 137
 
138 138
 		}
139 139
 	}
@@ -141,37 +141,37 @@  discard block
 block discarded – undo
141 141
 	function deactivate_license() {
142 142
 
143 143
 		// listen for our activate button to be clicked
144
-		if ( isset( $_POST['edd_license_deactivate'] ) ) {
144
+		if (isset($_POST['edd_license_deactivate'])) {
145 145
 
146 146
 			// run a quick security check
147
-			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) )
147
+			if (!check_admin_referer('lasso_license_nonce', 'lasso_license_nonce'))
148 148
 				return; // get out if we didn't click the Activate button
149 149
 
150 150
 			// retrieve the license from the database
151
-			$license = trim( get_option( 'lasso_license_key' ) );
151
+			$license = trim(get_option('lasso_license_key'));
152 152
 
153 153
 
154 154
 			// data to send in our API request
155 155
 			$api_params = array(
156 156
 				'edd_action'=> 'deactivate_license',
157 157
 				'license'  => $license,
158
-				'item_name' => urlencode( LASSO_STORE_ITEM_NAME ), // the name of our product in EDD
158
+				'item_name' => urlencode(LASSO_STORE_ITEM_NAME), // the name of our product in EDD
159 159
 				'url'       => home_url()
160 160
 			);
161 161
 
162 162
 			// Call the custom API.
163
-			$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
163
+			$response = wp_remote_post(LASSO_STORE_URL, array('body' => $api_params, 'timeout' => 15, 'sslverify' => false));
164 164
 
165 165
 			// make sure the response came back okay
166
-			if ( is_wp_error( $response ) )
166
+			if (is_wp_error($response))
167 167
 				return false;
168 168
 
169 169
 			// decode the license data
170
-			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
170
+			$license_data = json_decode(wp_remote_retrieve_body($response));
171 171
 
172 172
 			// $license_data->license will be either "deactivated" or "failed"
173
-			if ( $license_data->license == 'deactivated' )
174
-				delete_option( 'lasso_license_status' );
173
+			if ($license_data->license == 'deactivated')
174
+				delete_option('lasso_license_status');
175 175
 
176 176
 		}
177 177
 	}
@@ -181,24 +181,24 @@  discard block
 block discarded – undo
181 181
 
182 182
 		global $wp_version;
183 183
 
184
-		$license = trim( get_option( 'lasso_license_key' ) );
184
+		$license = trim(get_option('lasso_license_key'));
185 185
 
186 186
 		$api_params = array(
187 187
 			'edd_action' => 'check_license',
188 188
 			'license' => $license,
189
-			'item_name' => urlencode( LASSO_STORE_ITEM_NAME ),
189
+			'item_name' => urlencode(LASSO_STORE_ITEM_NAME),
190 190
 			'url'       => home_url()
191 191
 		);
192 192
 
193 193
 		// Call the custom API.
194
-		$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
194
+		$response = wp_remote_post(LASSO_STORE_URL, array('body' => $api_params, 'timeout' => 15, 'sslverify' => false));
195 195
 
196
-		if ( is_wp_error( $response ) )
196
+		if (is_wp_error($response))
197 197
 			return false;
198 198
 
199
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
199
+		$license_data = json_decode(wp_remote_retrieve_body($response));
200 200
 
201
-		if ( $license_data->license == 'valid' ) {
201
+		if ($license_data->license == 'valid') {
202 202
 			echo 'valid'; exit;
203 203
 			// this license is still valid
204 204
 		} else {
Please login to merge, or discard this patch.
admin/includes/menus/settings.php 1 patch
Spacing   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 
10 10
 	function __construct() {
11 11
 
12
-		add_action( 'admin_menu',     array( $this, 'menu' ) );
13
-		add_action( 'network_admin_menu',   array( $this, 'menu' ) );
14
-		add_action( 'wp_ajax_lasso-editor-settings', array( $this, 'process_settings' ) );
12
+		add_action('admin_menu', array($this, 'menu'));
13
+		add_action('network_admin_menu', array($this, 'menu'));
14
+		add_action('wp_ajax_lasso-editor-settings', array($this, 'process_settings'));
15 15
 
16 16
 	}
17 17
 
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	function menu() {
24 24
 
25 25
 		// CHANGED Removed condition.
26
-		add_submenu_page( 'lasso-editor', __( 'Settings', 'lasso' ), __( 'Settings', 'lasso' ), 'manage_options', 'lasso-editor-settings', array( $this, 'settings' ) );
26
+		add_submenu_page('lasso-editor', __('Settings', 'lasso'), __('Settings', 'lasso'), 'manage_options', 'lasso-editor-settings', array($this, 'settings'));
27 27
 
28 28
 	}
29 29
 
@@ -45,22 +45,22 @@  discard block
 block discarded – undo
45 45
 	function process_settings() {
46 46
 
47 47
 		// bail out if current user isn't and administrator and they are not logged in
48
-		if ( !current_user_can( 'manage_options' ) || !is_user_logged_in() )
48
+		if (!current_user_can('manage_options') || !is_user_logged_in())
49 49
 			return;
50 50
 
51
-		if ( isset( $_POST['action'] ) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer( 'nonce', 'lasso_editor_settings' ) ) {
51
+		if (isset($_POST['action']) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer('nonce', 'lasso_editor_settings')) {
52 52
 
53
-			$options = isset( $_POST['lasso_editor'] ) ? $_POST['lasso_editor'] : false;
53
+			$options = isset($_POST['lasso_editor']) ? $_POST['lasso_editor'] : false;
54 54
 
55
-			$options = array_map( 'sanitize_text_field', $options );
55
+			$options = array_map('sanitize_text_field', $options);
56 56
 
57
-			if ( function_exists( 'is_multisite' ) && is_multisite() ) {
57
+			if (function_exists('is_multisite') && is_multisite()) {
58 58
 
59
-				update_site_option( 'lasso_editor', $options );
59
+				update_site_option('lasso_editor', $options);
60 60
 
61 61
 			} else {
62 62
 
63
-				update_option( 'lasso_editor', $options );
63
+				update_option('lasso_editor', $options);
64 64
 			}
65 65
 
66 66
 			wp_send_json_success();
@@ -82,111 +82,111 @@  discard block
 block discarded – undo
82 82
 	 */
83 83
 	function lasso_editor_settings_form() {
84 84
 
85
-		if ( !is_user_logged_in() )
85
+		if (!is_user_logged_in())
86 86
 			return;
87 87
 
88
-		$article_object   = lasso_editor_get_option( 'article_class', 'lasso_editor' );
89
-		$featImgClass    = lasso_editor_get_option( 'featimg_class', 'lasso_editor' );
90
-		$titleClass    = lasso_editor_get_option( 'title_class', 'lasso_editor' );
88
+		$article_object = lasso_editor_get_option('article_class', 'lasso_editor');
89
+		$featImgClass = lasso_editor_get_option('featimg_class', 'lasso_editor');
90
+		$titleClass = lasso_editor_get_option('title_class', 'lasso_editor');
91 91
 
92
-		$post_new_disabled   = lasso_editor_get_option( 'post_adding_disabled', 'lasso_editor' );
93
-		$save_to_post_disabled  = lasso_editor_get_option( 'post_save_disabled', 'lasso_editor' );
94
-		$post_settings_disabled = lasso_editor_get_option( 'post_settings_disabled', 'lasso_editor' );
95
-		$shortcodify_disabled  = lasso_editor_get_option( 'shortcodify_disabled', 'lasso_editor' );
92
+		$post_new_disabled = lasso_editor_get_option('post_adding_disabled', 'lasso_editor');
93
+		$save_to_post_disabled  = lasso_editor_get_option('post_save_disabled', 'lasso_editor');
94
+		$post_settings_disabled = lasso_editor_get_option('post_settings_disabled', 'lasso_editor');
95
+		$shortcodify_disabled  = lasso_editor_get_option('shortcodify_disabled', 'lasso_editor');
96 96
 
97
-		$toolbar_headings      = lasso_editor_get_option( 'toolbar_headings', 'lasso_editor' );
98
-		$objectsNoSave  	= lasso_editor_get_option('dont_save', 'lasso_editor');
97
+		$toolbar_headings      = lasso_editor_get_option('toolbar_headings', 'lasso_editor');
98
+		$objectsNoSave = lasso_editor_get_option('dont_save', 'lasso_editor');
99 99
 
100 100
 ?>
101 101
 		<div class="wrap">
102 102
 
103
-	    	<h2><?php _e( 'Editus Settings', 'lasso' );?></h2>
103
+	    	<h2><?php _e('Editus Settings', 'lasso'); ?></h2>
104 104
 
105 105
 			<form id="lasso-editor-settings-form" class="lasso--form-settings" method="post" enctype="multipart/form-data">
106 106
 
107
-				<?php do_action('lasso_settings_before');?>
107
+				<?php do_action('lasso_settings_before'); ?>
108 108
 
109 109
 				<div class="lasso-editor-settings--option-wrap">
110 110
 					<div class="lasso-editor-settings--option-inner">
111
-						<label><?php _e( 'Article Class', 'lasso' );?></label>
112
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class (including the preceding dot) of container that holds the post. This should be the first parent container class that holds the_content.', 'lasso' );?></span>
113
-						<input required type="text" name="lasso_editor[article_class]" id="lasso_editor[article_class]" value="<?php echo esc_attr( $article_object );?>" placeholder=".entry-content">
111
+						<label><?php _e('Article Class', 'lasso'); ?></label>
112
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class (including the preceding dot) of container that holds the post. This should be the first parent container class that holds the_content.', 'lasso'); ?></span>
113
+						<input required type="text" name="lasso_editor[article_class]" id="lasso_editor[article_class]" value="<?php echo esc_attr($article_object); ?>" placeholder=".entry-content">
114 114
 					</div>
115 115
 				</div>
116 116
 
117 117
 				<div class="lasso-editor-settings--option-wrap">
118 118
 					<div class="lasso-editor-settings--option-inner">
119
-						<label><?php _e( 'Featured Image Class', 'lasso' );?></label>
120
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class that uses a featured image as a background image. This currently only supports themes that have the featured image set as background image.', 'lasso' );?></span>
121
-						<input type="text" name="lasso_editor[featimg_class]" id="lasso_editor[featimg_class]" value="<?php echo esc_attr( $featImgClass );?>" placeholder=".entry-content">
119
+						<label><?php _e('Featured Image Class', 'lasso'); ?></label>
120
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class that uses a featured image as a background image. This currently only supports themes that have the featured image set as background image.', 'lasso'); ?></span>
121
+						<input type="text" name="lasso_editor[featimg_class]" id="lasso_editor[featimg_class]" value="<?php echo esc_attr($featImgClass); ?>" placeholder=".entry-content">
122 122
 					</div>
123 123
 				</div>
124 124
 
125 125
 				<div class="lasso-editor-settings--option-wrap">
126 126
 					<div class="lasso-editor-settings--option-inner">
127
-						<label><?php _e( 'Article Title Class', 'lasso' );?></label>
128
-						<span class="lasso--setting-description"><?php _e( 'Provide the CSS class for the post title. This will enable you to update the title of the post by clicking and typing.', 'lasso' );?></span>
129
-						<input type="text" name="lasso_editor[title_class]" id="lasso_editor[title_class]" value="<?php echo esc_attr( $titleClass );?>" placeholder=".entry-content">
127
+						<label><?php _e('Article Title Class', 'lasso'); ?></label>
128
+						<span class="lasso--setting-description"><?php _e('Provide the CSS class for the post title. This will enable you to update the title of the post by clicking and typing.', 'lasso'); ?></span>
129
+						<input type="text" name="lasso_editor[title_class]" id="lasso_editor[title_class]" value="<?php echo esc_attr($titleClass); ?>" placeholder=".entry-content">
130 130
 					</div>
131 131
 				</div>
132 132
 
133 133
 				<!-- Advanced -->
134 134
 				<div class="lasso-editor-settings--option-wrap">
135 135
 					<div class="lasso-editor-settings--option-inner">
136
-						<label><?php _e( 'Ignored Items to Save', 'lasso' );?></label>
137
-						<span class="lasso--setting-description"><?php _e( 'If your post container holds additional markup, list the css class names (comma separated, including the dot) of those items. When you enter the editor, Editus will remove (NOT delete) these items so that it does not save them as HTML.', 'lasso' );?></span>
138
-						<textarea name="lasso_editor[dont_save]" id="lasso_editor[dont_save]" placeholder=".classname, .another-class"><?php echo esc_attr( $objectsNoSave );?></textarea>
136
+						<label><?php _e('Ignored Items to Save', 'lasso'); ?></label>
137
+						<span class="lasso--setting-description"><?php _e('If your post container holds additional markup, list the css class names (comma separated, including the dot) of those items. When you enter the editor, Editus will remove (NOT delete) these items so that it does not save them as HTML.', 'lasso'); ?></span>
138
+						<textarea name="lasso_editor[dont_save]" id="lasso_editor[dont_save]" placeholder=".classname, .another-class"><?php echo esc_attr($objectsNoSave); ?></textarea>
139 139
 					</div>
140 140
 				</div>
141 141
 
142 142
 				<div class="lasso-editor-settings--option-wrap">
143 143
 					<div class="lasso-editor-settings--option-inner">
144
-						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings]" id="lasso_editor[toolbar_headings]" <?php echo checked( $toolbar_headings, 'on' );?> >
145
-						<label for="lasso_editor[toolbar_headings]"><?php _e( 'Enable Toolbar Headings', 'lasso' );?></label>
146
-						<span class="lasso--setting-description"><?php _e( 'By default the H2 and H3 options for headings are in the insert HTML area. You may prefer those headings to act just like the underline, and strikethrough, so toggling this will add them to the toolbar.', 'lasso' );?></span>
144
+						<input type="checkbox" class="checkbox" name="lasso_editor[toolbar_headings]" id="lasso_editor[toolbar_headings]" <?php echo checked($toolbar_headings, 'on'); ?> >
145
+						<label for="lasso_editor[toolbar_headings]"><?php _e('Enable Toolbar Headings', 'lasso'); ?></label>
146
+						<span class="lasso--setting-description"><?php _e('By default the H2 and H3 options for headings are in the insert HTML area. You may prefer those headings to act just like the underline, and strikethrough, so toggling this will add them to the toolbar.', 'lasso'); ?></span>
147 147
 
148 148
 					</div>
149 149
 				</div>
150 150
 
151 151
 				<div class="lasso-editor-settings--option-wrap">
152 152
 					<div class="lasso-editor-settings--option-inner">
153
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_save_disabled]" id="lasso_editor[post_save_disabled]" <?php echo checked( $save_to_post_disabled, 'on' );?> >
154
-						<label for="lasso_editor[post_save_disabled]"><?php _e( 'Disable Post Saving', 'lasso' );?></label>
155
-						<span class="lasso--setting-description"><?php _e( 'By default the editor will update the database with the post or page it is being used on. Check this box to disable this. If you check this box, it is assumed that you will be using the provided filters to save your own content.', 'lasso' );?></span>
153
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_save_disabled]" id="lasso_editor[post_save_disabled]" <?php echo checked($save_to_post_disabled, 'on'); ?> >
154
+						<label for="lasso_editor[post_save_disabled]"><?php _e('Disable Post Saving', 'lasso'); ?></label>
155
+						<span class="lasso--setting-description"><?php _e('By default the editor will update the database with the post or page it is being used on. Check this box to disable this. If you check this box, it is assumed that you will be using the provided filters to save your own content.', 'lasso'); ?></span>
156 156
 
157 157
 					</div>
158 158
 				</div>
159 159
 
160 160
 				<div class="lasso-editor-settings--option-wrap">
161 161
 					<div class="lasso-editor-settings--option-inner">
162
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_settings_disabled]" id="lasso_editor[post_settings_disabled]" <?php echo checked( $post_settings_disabled, 'on' );?> >
163
-						<label for="lasso_editor[post_settings_disabled]"> <?php _e( 'Disable Post Settings', 'lasso' );?></label>
164
-						<span class="lasso--setting-description"><?php _e( 'Check this to disable users from being able to edit post settings from the front-end.', 'lasso' );?></span>
162
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_settings_disabled]" id="lasso_editor[post_settings_disabled]" <?php echo checked($post_settings_disabled, 'on'); ?> >
163
+						<label for="lasso_editor[post_settings_disabled]"> <?php _e('Disable Post Settings', 'lasso'); ?></label>
164
+						<span class="lasso--setting-description"><?php _e('Check this to disable users from being able to edit post settings from the front-end.', 'lasso'); ?></span>
165 165
 					</div>
166 166
 				</div>
167 167
 
168 168
 				<div class="lasso-editor-settings--option-wrap">
169 169
 					<div class="lasso-editor-settings--option-inner">
170
-						<input type="checkbox" class="checkbox" name="lasso_editor[post_adding_disabled]" id="lasso_editor[post_adding_disabled]" <?php echo checked( $post_new_disabled, 'on' );?> >
171
-						<label for="lasso_editor[post_adding_disabled]"><?php _e( 'Disable Post Adding', 'lasso' );?></label>
172
-						<span class="lasso--setting-description"><?php _e( 'Check this box to disable users from being able to add new posts from the front-end.', 'lasso' );?></span>
170
+						<input type="checkbox" class="checkbox" name="lasso_editor[post_adding_disabled]" id="lasso_editor[post_adding_disabled]" <?php echo checked($post_new_disabled, 'on'); ?> >
171
+						<label for="lasso_editor[post_adding_disabled]"><?php _e('Disable Post Adding', 'lasso'); ?></label>
172
+						<span class="lasso--setting-description"><?php _e('Check this box to disable users from being able to add new posts from the front-end.', 'lasso'); ?></span>
173 173
 					</div>
174 174
 				</div>
175 175
 
176 176
 				<div class="lasso-editor-settings--option-wrap last">
177 177
 					<div class="lasso-editor-settings--option-inner">
178
-						<input type="checkbox" class="checkbox" name="lasso_editor[shortcodify_disabled]" id="lasso_editor[shortcodify_disabled]" <?php echo checked( $shortcodify_disabled, 'on' );?> >
179
-						<label for="lasso_editor[shortcodify_disabled]"><?php _e( 'Disable Aesop Component Conversion', 'lasso' );?></label>
180
-						<span class="lasso--setting-description"><?php _e( 'Check this box to disable the conversion process used on Aesop Story Engine components.', 'lasso' );?></span>
178
+						<input type="checkbox" class="checkbox" name="lasso_editor[shortcodify_disabled]" id="lasso_editor[shortcodify_disabled]" <?php echo checked($shortcodify_disabled, 'on'); ?> >
179
+						<label for="lasso_editor[shortcodify_disabled]"><?php _e('Disable Aesop Component Conversion', 'lasso'); ?></label>
180
+						<span class="lasso--setting-description"><?php _e('Check this box to disable the conversion process used on Aesop Story Engine components.', 'lasso'); ?></span>
181 181
 					</div>
182 182
 				</div>
183 183
 
184
-				<?php do_action('lasso_settings_after');?>
184
+				<?php do_action('lasso_settings_after'); ?>
185 185
 
186 186
 				<div class="lasso-editor-settings--submit">
187 187
 				    <input type="hidden" name="action" value="lasso-editor-settings" />
188
-				    <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Save Settings', 'lasso' );?>" />
189
-					<?php wp_nonce_field( 'nonce', 'lasso_editor_settings' ); ?>
188
+				    <input type="submit" class="button-primary" value="<?php esc_attr_e('Save Settings', 'lasso'); ?>" />
189
+					<?php wp_nonce_field('nonce', 'lasso_editor_settings'); ?>
190 190
 				</div>
191 191
 			</form>
192 192
 
Please login to merge, or discard this patch.
admin/includes/menus/welcome.php 2 patches
Spacing   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -10,30 +10,30 @@  discard block
 block discarded – undo
10 10
 
11 11
 	function __construct() {
12 12
 
13
-		add_action( 'admin_init',   array( $this, 'redirect' ) );
14
-		add_action( 'admin_menu',   array( $this, 'lasso_welcome' ) );
15
-		add_action( 'network_admin_menu',   array( $this, 'lasso_welcome' ) );  // CHANGED Added hook.
13
+		add_action('admin_init', array($this, 'redirect'));
14
+		add_action('admin_menu', array($this, 'lasso_welcome'));
15
+		add_action('network_admin_menu', array($this, 'lasso_welcome')); // CHANGED Added hook.
16 16
 
17
-		add_action( 'tgmpa_register',  array( $this,'required_plugins' ));
17
+		add_action('tgmpa_register', array($this, 'required_plugins'));
18 18
 
19 19
 	}
20 20
 
21 21
 	function redirect() {
22 22
 
23 23
 		// Bail if no activation redirect
24
-		if ( !get_transient( '_lasso_welcome_redirect' ) ) {
24
+		if (!get_transient('_lasso_welcome_redirect')) {
25 25
 			return;
26 26
 		}
27 27
 
28 28
 		// Delete the redirect transient
29
-		delete_transient( '_lasso_welcome_redirect' );
29
+		delete_transient('_lasso_welcome_redirect');
30 30
 
31 31
 		// Bail if activating from network, or bulk
32
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
32
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
33 33
 			return;
34 34
 		}
35 35
 
36
-		wp_safe_redirect( esc_url_raw( add_query_arg( array( 'page' => 'lasso-editor' ), admin_url( 'admin.php' ) ) ) );
36
+		wp_safe_redirect(esc_url_raw(add_query_arg(array('page' => 'lasso-editor'), admin_url('admin.php'))));
37 37
 
38 38
 	}
39 39
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 	function lasso_welcome() {
46 46
 
47 47
 		// CHANGED Removed condition.
48
-		add_menu_page( __( 'Editus', 'lasso' ), __( 'Editus', 'lasso' ), 'manage_options', 'lasso-editor', '', LASSO_URL.'/admin/assets/img/menu-icon.png' );
49
-		add_submenu_page( 'lasso-editor', __( 'Welcome', 'lasso' ), __( 'Status', 'lasso' ), 'manage_options', 'lasso-editor', array( $this, 'welcome' ) );
48
+		add_menu_page(__('Editus', 'lasso'), __('Editus', 'lasso'), 'manage_options', 'lasso-editor', '', LASSO_URL.'/admin/assets/img/menu-icon.png');
49
+		add_submenu_page('lasso-editor', __('Welcome', 'lasso'), __('Status', 'lasso'), 'manage_options', 'lasso-editor', array($this, 'welcome'));
50 50
 
51 51
 	}
52 52
 
@@ -60,24 +60,24 @@  discard block
 block discarded – undo
60 60
 		?>
61 61
 		  <div class="wrap lasso--welcome">
62 62
 
63
-		  		<?php self::header();?>
63
+		  		<?php self::header(); ?>
64 64
 
65 65
 		  		<ul class="lasso--welcome__steps">
66 66
 
67 67
 		  		<?php // CHANGED Added the is_network_admin condition. ?>
68
-			  		<?php if ( is_network_admin() ) : ?>
68
+			  		<?php if (is_network_admin()) : ?>
69 69
 
70 70
 			  			<li>
71
-			  				<p><?php _e( 'We will check the current theme on every site in your network and give you a quick status feedback here. You can see the status by visiting the Editus menu on each site.', 'lasso' );?></p>
71
+			  				<p><?php _e('We will check the current theme on every site in your network and give you a quick status feedback here. You can see the status by visiting the Editus menu on each site.', 'lasso'); ?></p>
72 72
 			  			</li>
73 73
 
74 74
 			  		<?php else :
75 75
 
76 76
 					$checks = self::lasso_preflight_check();
77 77
 
78
-					if ( $checks && !defined( 'LASSO_AGENCY_MODE' ) ):
78
+					if ($checks && !defined('LASSO_AGENCY_MODE')):
79 79
 
80
-						foreach ( (array) $checks as $key => $check ) {
80
+						foreach ((array) $checks as $key => $check) {
81 81
 
82 82
 							echo $check;
83 83
 						}
@@ -87,11 +87,11 @@  discard block
 block discarded – undo
87 87
 							// pre-flight is go for flight
88 88
 						?>
89 89
 						<li class="success">
90
-							<h3><?php _e( 'You\'re Ready to Rock!', 'lasso' );?></h3>
91
-							<?php if ( lasso_get_supported_theme_class() ) { ?>
92
-							<p><?php _e( 'Your theme is automatically supported. No additional setup is needed.', 'lasso' );?></p>
90
+							<h3><?php _e('You\'re Ready to Rock!', 'lasso'); ?></h3>
91
+							<?php if (lasso_get_supported_theme_class()) { ?>
92
+							<p><?php _e('Your theme is automatically supported. No additional setup is needed.', 'lasso'); ?></p>
93 93
 							<?php } ?>
94
-			  				<p><?php _e( 'Editus will place a small menu on the bottom of your site. While on a single post or page, click the "pen" icon to go into edit mode. Press escape to get out of edit mode.', 'lasso' );?></p>
94
+			  				<p><?php _e('Editus will place a small menu on the bottom of your site. While on a single post or page, click the "pen" icon to go into edit mode. Press escape to get out of edit mode.', 'lasso'); ?></p>
95 95
 			  			</li>
96 96
 			  			<?php
97 97
 			  			endif;
@@ -113,16 +113,16 @@  discard block
 block discarded – undo
113 113
 
114 114
 	  		<div class="lasso--welcome__top">
115 115
 
116
-	  			<img style="width:125px;" src="<?php echo LASSO_URL.'/admin/assets/img/logo.png';?>">
117
-	    		<h1><?php _e( 'Welcome to Editus', 'lasso' );?></h1>
118
-	    		<p><?php _e( 'Version', 'lasso' );echo '<span> '.LASSO_VERSION.'</span>';?></p>
116
+	  			<img style="width:125px;" src="<?php echo LASSO_URL.'/admin/assets/img/logo.png'; ?>">
117
+	    		<h1><?php _e('Welcome to Editus', 'lasso'); ?></h1>
118
+	    		<p><?php _e('Version', 'lasso'); echo '<span> '.LASSO_VERSION.'</span>'; ?></p>
119 119
 
120
-	    		<?php if ( !defined( 'LASSO_AGENCY_MODE' ) ): ?>
120
+	    		<?php if (!defined('LASSO_AGENCY_MODE')): ?>
121 121
 
122 122
 			    	<ul class="lasso--welcome__social">
123
-			    		<li><a href="https://edituswp.com/help" target="_blank"><i class="dashicons dashicons-sos"></i> <?php _e( 'Help', 'lasso' );?></a></li>
124
-			    		<li><a href="http://twitter.com/aesopinteractiv" target="_blank"><i class="dashicons dashicons-twitter"></i> <?php _e( 'Twitter', 'lasso' );?></a></li>
125
-			    		<li><a href="http://facebook.com/aesopinteractive" target="_blank"><i class="dashicons dashicons-facebook"></i> <?php _e( 'Facebook', 'lasso' );?></a></li>
123
+			    		<li><a href="https://edituswp.com/help" target="_blank"><i class="dashicons dashicons-sos"></i> <?php _e('Help', 'lasso'); ?></a></li>
124
+			    		<li><a href="http://twitter.com/aesopinteractiv" target="_blank"><i class="dashicons dashicons-twitter"></i> <?php _e('Twitter', 'lasso'); ?></a></li>
125
+			    		<li><a href="http://facebook.com/aesopinteractive" target="_blank"><i class="dashicons dashicons-facebook"></i> <?php _e('Facebook', 'lasso'); ?></a></li>
126 126
 			    	</ul>
127 127
 
128 128
 			    <?php endif; ?>
@@ -139,61 +139,61 @@  discard block
 block discarded – undo
139 139
 	 */
140 140
 	function lasso_preflight_check() {
141 141
 
142
-		$notices 		= array();
142
+		$notices = array();
143 143
 
144
-		$article_object = lasso_editor_get_option( 'article_class', 'lasso_editor' );
144
+		$article_object = lasso_editor_get_option('article_class', 'lasso_editor');
145 145
 
146
-		$theme_name  	= wp_get_theme()->get('Name');
147
-		$theme_class  	= lasso_get_supported_theme_class();
146
+		$theme_name = wp_get_theme()->get('Name');
147
+		$theme_class = lasso_get_supported_theme_class();
148 148
 
149
-		$license   		= get_option( 'lasso_license_key' );
150
-		$status   		= get_option( 'lasso_license_status' );
149
+		$license = get_option('lasso_license_key');
150
+		$status = get_option('lasso_license_status');
151 151
 
152 152
 		// if the required CSS class has not been saved and we're not a supported theme
153
-		if ( empty( $article_object ) && false == $theme_class ) {
153
+		if (empty($article_object) && false == $theme_class) {
154 154
 
155 155
 			// we dont automatically support this theme so show them otherwise
156 156
 			$notices[] = sprintf('<li class="error">
157
-							<h3>'.__( 'Article CSS Class Needed!', 'lasso' ).'</h3>
158
-							<p>'.__( 'Before using Editus,', 'lasso' ).' <a href="%s">'.__( 'enter and save', 'lasso' ).'</a> '.__( 'the CSS class of the container that holds your post and page content. You can <a href="https://dl.dropboxusercontent.com/u/5594632/lasso-media/doc-movies/using-inspector-lasso.gif" target="_blank">use a tool like inspector</a> in Chrome or Firefox to find this CSS class, or ', 'lasso' ).' <a href="mailto:[email protected]">'.__( 'email us.', 'lasso' ).'</a> '.__( 'with a link to a public URL with the theme and we\'ll find it for you.', 'lasso' ).'</p>
159
-							</li>', admin_url( 'admin.php?page=lasso-editor-settings' ) );
157
+							<h3>'.__('Article CSS Class Needed!', 'lasso').'</h3>
158
+							<p>'.__('Before using Editus,', 'lasso').' <a href="%s">'.__('enter and save', 'lasso').'</a> '.__('the CSS class of the container that holds your post and page content. You can <a href="https://dl.dropboxusercontent.com/u/5594632/lasso-media/doc-movies/using-inspector-lasso.gif" target="_blank">use a tool like inspector</a> in Chrome or Firefox to find this CSS class, or ', 'lasso').' <a href="mailto:[email protected]">'.__('email us.', 'lasso').'</a> '.__('with a link to a public URL with the theme and we\'ll find it for you.', 'lasso').'</p>
159
+							</li>', admin_url('admin.php?page=lasso-editor-settings'));
160 160
 		}
161 161
 
162 162
 		// WP REST API not active
163
-		if ( !function_exists( 'json_get_url_prefix' ) ) {
163
+		if (!function_exists('json_get_url_prefix')) {
164 164
 			$notices[] = '<li class="info"><h3>WP REST API not Activated!</h3>
165
-							<p>'.__( 'Just a heads up that the WP REST API isn\'t activated. This is required to list the posts and pages on the front-end. It is required until WordPress officially merges the REST API into core sometime during 2015.', 'lasso' ).'</p>
165
+							<p>'.__('Just a heads up that the WP REST API isn\'t activated. This is required to list the posts and pages on the front-end. It is required until WordPress officially merges the REST API into core sometime during 2015.', 'lasso').'</p>
166 166
 							</li>';
167 167
 		}
168 168
 
169 169
 		// aesop story engine isnt active
170
-		if ( !class_exists( 'Aesop_Core' ) ) {
171
-			$notices[] = sprintf( '<li class="info"><h3>Aesop Story Engine not Activated!</h3>
172
-							<p>'.__( 'Just a heads up that ', 'lasso' ).'<a href="%s" target="_blank
173
-							">'.__( 'Aesop Story Engine', 'lasso' ).'</a> '.__( 'isn\'t activated. It\'s not required to use Editus, but you won\'t get the cool drag and drop components without it activated. It\'s free!', 'lasso' ).'</p>
174
-							</li>', admin_url('plugin-install.php?tab=search&s=aesop+story+engine') );
170
+		if (!class_exists('Aesop_Core')) {
171
+			$notices[] = sprintf('<li class="info"><h3>Aesop Story Engine not Activated!</h3>
172
+							<p>'.__('Just a heads up that ', 'lasso').'<a href="%s" target="_blank
173
+							">'.__('Aesop Story Engine', 'lasso').'</a> '.__('isn\'t activated. It\'s not required to use Editus, but you won\'t get the cool drag and drop components without it activated. It\'s free!', 'lasso').'</p>
174
+							</li>', admin_url('plugin-install.php?tab=search&s=aesop+story+engine'));
175 175
 		}
176 176
 
177 177
 		// we dont really get along with wp side comments because of the section ids that get applied dynamically. since we save our html, it'll get saved along with the post as HTML
178
-		if ( class_exists( 'WP_Side_Comments' ) ) {
179
-			$notices[] = '<li class="error"><h3>'.__( 'WP Side Comments Compatibility Warning!', 'lasso' ).'</h3>
180
-							<p>'.__( 'Since Editus saves the HTML of a post, this may cause undesired issues. We\'re working to resolve incompatibilities faster than a jack rabbit in a hot greasy griddle in the middle of August.', 'lasso' ).'</p>
178
+		if (class_exists('WP_Side_Comments')) {
179
+			$notices[] = '<li class="error"><h3>'.__('WP Side Comments Compatibility Warning!', 'lasso').'</h3>
180
+							<p>'.__('Since Editus saves the HTML of a post, this may cause undesired issues. We\'re working to resolve incompatibilities faster than a jack rabbit in a hot greasy griddle in the middle of August.', 'lasso').'</p>
181 181
 							</li>';
182 182
 		}
183 183
 
184 184
 		// if the license key isnt activated
185
-		if ( empty( $license ) ) {
186
-			$notices[] = '<li class="info"><h3>'.__( 'License Key Not Activated', 'lasso' ).'</h3>
187
-							<p>'.__( 'Just a heads up, your license key isn\'t activated. Enter your license key into the License tab on the left in order to receive plugin update notifications.', 'lasso' ).'</p>
185
+		if (empty($license)) {
186
+			$notices[] = '<li class="info"><h3>'.__('License Key Not Activated', 'lasso').'</h3>
187
+							<p>'.__('Just a heads up, your license key isn\'t activated. Enter your license key into the License tab on the left in order to receive plugin update notifications.', 'lasso').'</p>
188 188
 							</li>';
189 189
 		}
190
-		if ( !empty( $license ) && 'invalid' == $status ) {
191
-			$notices[] = '<li class="error"><h3>'.__( 'License Key Invalid', 'lasso' ).'</h3>
192
-							<p>'.__( 'The license key that you entered is ', 'lasso' ).'<strong>'.__( 'invalid', 'lasso' ).'</strong>'.__( '. It may have been entered incorreclty, or may have expired.', 'lasso' ).'</p>
190
+		if (!empty($license) && 'invalid' == $status) {
191
+			$notices[] = '<li class="error"><h3>'.__('License Key Invalid', 'lasso').'</h3>
192
+							<p>'.__('The license key that you entered is ', 'lasso').'<strong>'.__('invalid', 'lasso').'</strong>'.__('. It may have been entered incorreclty, or may have expired.', 'lasso').'</p>
193 193
 							</li>';
194 194
 		}
195 195
 
196
-		return apply_filters( 'lasso_preflight_notices', $notices );
196
+		return apply_filters('lasso_preflight_notices', $notices);
197 197
 
198 198
 	}
199 199
 
@@ -207,13 +207,13 @@  discard block
 block discarded – undo
207 207
 	    $plugins = array(
208 208
 
209 209
 	        array(
210
-	            'name'      => __('WP REST API','lasso'),
210
+	            'name'      => __('WP REST API', 'lasso'),
211 211
 	            'slug'      => 'json-rest-api',
212 212
 	            'required'  => true,
213 213
 	        ),
214 214
 
215 215
 	        array(
216
-	            'name'      => __('Aesop Story Engine','lasso'),
216
+	            'name'      => __('Aesop Story Engine', 'lasso'),
217 217
 	            'slug'      => 'aesop-story-engine',
218 218
 	            'required'  => false,
219 219
 	        ),
@@ -221,36 +221,36 @@  discard block
 block discarded – undo
221 221
 	    );
222 222
 
223 223
 	    $config = array(
224
-	        'default_path' => '',                      // Default absolute path to pre-packaged plugins.
224
+	        'default_path' => '', // Default absolute path to pre-packaged plugins.
225 225
 	        'menu'         => 'lasso-install-plugins', // Menu slug.
226
-	        'has_notices'  => true,                    // Show admin notices or not.
227
-	        'dismissable'  => true,                    // If false, a user cannot dismiss the nag message.
228
-	        'dismiss_msg'  => '',                      // If 'dismissable' is false, this message will be output at top of nag.
229
-	        'is_automatic' => false,                   // Automatically activate plugins after installation or not.
230
-	        'message'      => '',                      // Message to output right before the plugins table.
226
+	        'has_notices'  => true, // Show admin notices or not.
227
+	        'dismissable'  => true, // If false, a user cannot dismiss the nag message.
228
+	        'dismiss_msg'  => '', // If 'dismissable' is false, this message will be output at top of nag.
229
+	        'is_automatic' => false, // Automatically activate plugins after installation or not.
230
+	        'message'      => '', // Message to output right before the plugins table.
231 231
 	        'strings'      => array(
232
-	            'page_title'                      => __( 'Install Required Plugins', 'lasso' ),
233
-	            'menu_title'                      => __( 'Install Plugins', 'lasso' ),
234
-	            'installing'                      => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name.
235
-	            'oops'                            => __( 'Something went wrong with the plugin API.', 'lasso' ),
236
-	            'notice_can_install_required'     => _n_noop( 'This plugin requires the following plugin: %1$s.', 'This plugin requires the following plugins: %1$s.' ), // %1$s = plugin name(s).
237
-	            'notice_can_install_recommended'  => _n_noop( 'This plugin recommends the following plugin: %1$s.', 'This plugin recommends the following plugins: %1$s.' ), // %1$s = plugin name(s).
238
-	            'notice_cannot_install'           => _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.' ), // %1$s = plugin name(s).
239
-	            'notice_can_activate_required'    => _n_noop( 'The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s).
240
-	            'notice_can_activate_recommended' => _n_noop( 'The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s).
241
-	            'notice_cannot_activate'          => _n_noop( 'Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.' ), // %1$s = plugin name(s).
242
-	            'notice_ask_to_update'            => _n_noop( 'The following plugin needs to be updated to its latest version to ensure maximum compatibility with this plugin: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this plugin: %1$s.' ), // %1$s = plugin name(s).
243
-	            'notice_cannot_update'            => _n_noop( 'Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.' ), // %1$s = plugin name(s).
244
-	            'install_link'                    => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
245
-	            'activate_link'                   => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ),
246
-	            'return'                          => __( 'Return to Required Plugins Installer', 'lasso' ),
247
-	            'plugin_activated'                => __( 'Plugin activated successfully.', 'lasso' ),
248
-	            'complete'                        => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link.
232
+	            'page_title'                      => __('Install Required Plugins', 'lasso'),
233
+	            'menu_title'                      => __('Install Plugins', 'lasso'),
234
+	            'installing'                      => __('Installing Plugin: %s', 'lasso'), // %s = plugin name.
235
+	            'oops'                            => __('Something went wrong with the plugin API.', 'lasso'),
236
+	            'notice_can_install_required'     => _n_noop('This plugin requires the following plugin: %1$s.', 'This plugin requires the following plugins: %1$s.'), // %1$s = plugin name(s).
237
+	            'notice_can_install_recommended'  => _n_noop('This plugin recommends the following plugin: %1$s.', 'This plugin recommends the following plugins: %1$s.'), // %1$s = plugin name(s).
238
+	            'notice_cannot_install'           => _n_noop('Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.'), // %1$s = plugin name(s).
239
+	            'notice_can_activate_required'    => _n_noop('The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.'), // %1$s = plugin name(s).
240
+	            'notice_can_activate_recommended' => _n_noop('The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.'), // %1$s = plugin name(s).
241
+	            'notice_cannot_activate'          => _n_noop('Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.'), // %1$s = plugin name(s).
242
+	            'notice_ask_to_update'            => _n_noop('The following plugin needs to be updated to its latest version to ensure maximum compatibility with this plugin: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this plugin: %1$s.'), // %1$s = plugin name(s).
243
+	            'notice_cannot_update'            => _n_noop('Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.'), // %1$s = plugin name(s).
244
+	            'install_link'                    => _n_noop('Begin installing plugin', 'Begin installing plugins'),
245
+	            'activate_link'                   => _n_noop('Begin activating plugin', 'Begin activating plugins'),
246
+	            'return'                          => __('Return to Required Plugins Installer', 'lasso'),
247
+	            'plugin_activated'                => __('Plugin activated successfully.', 'lasso'),
248
+	            'complete'                        => __('All plugins installed and activated successfully. %s', 'lasso'), // %s = dashboard link.
249 249
 	            'nag_type'                        => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'.
250 250
 	        )
251 251
 	    );
252 252
 
253
-	    tgmpa( $plugins, $config );
253
+	    tgmpa($plugins, $config);
254 254
 
255 255
 	}
256 256
 }
Please login to merge, or discard this patch.
Braces   +8 added lines, -5 removed lines patch added patch discarded remove patch
@@ -71,23 +71,26 @@
 block discarded – undo
71 71
 			  				<p><?php _e( 'We will check the current theme on every site in your network and give you a quick status feedback here. You can see the status by visiting the Editus menu on each site.', 'lasso' );?></p>
72 72
 			  			</li>
73 73
 
74
-			  		<?php else :
74
+			  		<?php else {
75
+	:
75 76
 
76 77
 					$checks = self::lasso_preflight_check();
78
+}
77 79
 
78 80
 					if ( $checks && !defined( 'LASSO_AGENCY_MODE' ) ):
79 81
 
80 82
 						foreach ( (array) $checks as $key => $check ) {
81 83
 
82 84
 							echo $check;
83
-						}
84
-
85
-						else:
85
+						} else {
86
+							:
86 87
 
87 88
 							// pre-flight is go for flight
88 89
 						?>
89 90
 						<li class="success">
90
-							<h3><?php _e( 'You\'re Ready to Rock!', 'lasso' );?></h3>
91
+							<h3><?php _e( 'You\'re Ready to Rock!', 'lasso' );
92
+						}
93
+						?></h3>
91 94
 							<?php if ( lasso_get_supported_theme_class() ) { ?>
92 95
 							<p><?php _e( 'Your theme is automatically supported. No additional setup is needed.', 'lasso' );?></p>
93 96
 							<?php } ?>
Please login to merge, or discard this patch.