Completed
Push — master ( 205fac...3601f2 )
by Michael
03:55
created
admin/includes/load_admin.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 	}
128 128
 
129 129
 	/**
130
-	*	Adds an admin notice reminding the user if their license key has not been saved
131
-	*
132
-	*	@since 0.9.7
133
-	*	@todo make dismissible
134
-	*/
130
+	 *	Adds an admin notice reminding the user if their license key has not been saved
131
+	 *
132
+	 *	@since 0.9.7
133
+	 *	@todo make dismissible
134
+	 */
135 135
 	public function license_nag(){
136 136
 
137 137
 		$screen 	= get_current_screen();
@@ -152,26 +152,26 @@  discard block
 block discarded – undo
152 152
 
153 153
 			if ( empty( $license ) ) {
154 154
 
155
-        		printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
155
+				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
156 156
 
157
-        	} else if ( 'invalid' == $status ){ // license key entered wrong or something
157
+			} else if ( 'invalid' == $status ){ // license key entered wrong or something
158 158
 
159 159
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_invalid, $license_link , $dismiss_link );
160 160
 
161
-        	} else if ( empty( $status ) ){ // license key saved but not activated
161
+			} else if ( empty( $status ) ){ // license key saved but not activated
162 162
 
163 163
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_inactive, $license_link, $dismiss_link );
164 164
 
165
-        	}
165
+			}
166 166
 		}
167 167
 
168 168
 	}
169 169
 
170 170
 	/**
171
-	*  Process hiding the dimiss
172
-	*
173
-	* @since 0.9.7
174
-	*/
171
+	 *  Process hiding the dimiss
172
+	 *
173
+	 * @since 0.9.7
174
+	 */
175 175
 	public function dismiss_nag() {
176 176
 
177 177
 		if ( isset( $_GET['lasso-notice'] ) && 'dismiss' == $_GET['lasso-notice'] && current_user_can('manage_options') ) {
Please login to merge, or discard this patch.
admin/includes/menus/settings.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Class responsible for adding a settings submenu
4
- *
5
- */
3
+	 * Class responsible for adding a settings submenu
4
+	 *
5
+	 */
6 6
 namespace lasso_admin\menus;
7 7
 
8 8
 class settings {
Please login to merge, or discard this patch.
admin/includes/menus/welcome.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -197,53 +197,53 @@
 block discarded – undo
197 197
 	 */
198 198
 	function required_plugins() {
199 199
 
200
-	    $plugins = array(
201
-
202
-	        array(
203
-	            'name'      => __('WP REST API','lasso'),
204
-	            'slug'      => 'json-rest-api',
205
-	            'required'  => true,
206
-	        ),
207
-
208
-	        array(
209
-	            'name'      => __('Aesop Story Engine','lasso'),
210
-	            'slug'      => 'aesop-story-engine',
211
-	            'required'  => false,
212
-	        ),
213
-
214
-	    );
215
-
216
-	    $config = array(
217
-	        'default_path' => '',                      // Default absolute path to pre-packaged plugins.
218
-	        'menu'         => 'lasso-install-plugins', // Menu slug.
219
-	        'has_notices'  => true,                    // Show admin notices or not.
220
-	        'dismissable'  => true,                    // If false, a user cannot dismiss the nag message.
221
-	        'dismiss_msg'  => '',                      // If 'dismissable' is false, this message will be output at top of nag.
222
-	        'is_automatic' => false,                   // Automatically activate plugins after installation or not.
223
-	        'message'      => '',                      // Message to output right before the plugins table.
224
-	        'strings'      => array(
225
-	            'page_title'                      => __( 'Install Required Plugins', 'lasso' ),
226
-	            'menu_title'                      => __( 'Install Plugins', 'lasso' ),
227
-	            'installing'                      => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name.
228
-	            'oops'                            => __( 'Something went wrong with the plugin API.', 'lasso' ),
229
-	            '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).
230
-	            '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).
231
-	            '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).
232
-	            '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).
233
-	            '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).
234
-	            '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).
235
-	            '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).
236
-	            '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).
237
-	            'install_link'                    => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
238
-	            'activate_link'                   => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ),
239
-	            'return'                          => __( 'Return to Required Plugins Installer', 'lasso' ),
240
-	            'plugin_activated'                => __( 'Plugin activated successfully.', 'lasso' ),
241
-	            'complete'                        => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link.
242
-	            'nag_type'                        => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'.
243
-	        )
244
-	    );
245
-
246
-	    tgmpa( $plugins, $config );
200
+		$plugins = array(
201
+
202
+			array(
203
+				'name'      => __('WP REST API','lasso'),
204
+				'slug'      => 'json-rest-api',
205
+				'required'  => true,
206
+			),
207
+
208
+			array(
209
+				'name'      => __('Aesop Story Engine','lasso'),
210
+				'slug'      => 'aesop-story-engine',
211
+				'required'  => false,
212
+			),
213
+
214
+		);
215
+
216
+		$config = array(
217
+			'default_path' => '',                      // Default absolute path to pre-packaged plugins.
218
+			'menu'         => 'lasso-install-plugins', // Menu slug.
219
+			'has_notices'  => true,                    // Show admin notices or not.
220
+			'dismissable'  => true,                    // If false, a user cannot dismiss the nag message.
221
+			'dismiss_msg'  => '',                      // If 'dismissable' is false, this message will be output at top of nag.
222
+			'is_automatic' => false,                   // Automatically activate plugins after installation or not.
223
+			'message'      => '',                      // Message to output right before the plugins table.
224
+			'strings'      => array(
225
+				'page_title'                      => __( 'Install Required Plugins', 'lasso' ),
226
+				'menu_title'                      => __( 'Install Plugins', 'lasso' ),
227
+				'installing'                      => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name.
228
+				'oops'                            => __( 'Something went wrong with the plugin API.', 'lasso' ),
229
+				'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).
230
+				'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).
231
+				'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).
232
+				'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).
233
+				'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).
234
+				'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).
235
+				'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).
236
+				'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).
237
+				'install_link'                    => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
238
+				'activate_link'                   => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ),
239
+				'return'                          => __( 'Return to Required Plugins Installer', 'lasso' ),
240
+				'plugin_activated'                => __( 'Plugin activated successfully.', 'lasso' ),
241
+				'complete'                        => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link.
242
+				'nag_type'                        => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'.
243
+			)
244
+		);
245
+
246
+		tgmpa( $plugins, $config );
247 247
 
248 248
 	}
249 249
 }
Please login to merge, or discard this patch.
includes/lasso_autoloader.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -115,8 +115,8 @@
 block discarded – undo
115 115
 			// replace namespace separators with directory separators
116 116
 			// in the relative class name, append with .php
117 117
 			$file = $base_dir
118
-			        . str_replace('\\', '/', $relative_class)
119
-			        . '.php';
118
+					. str_replace('\\', '/', $relative_class)
119
+					. '.php';
120 120
 
121 121
 			// if the mapped file exists, require it
122 122
 			if ($this->requireFile($file)) {
Please login to merge, or discard this patch.
includes/process/update_object.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@
 block discarded – undo
118 118
 	 *  @since    0.9.3
119 119
 	 *
120 120
 	 *  @param    int    	$postid       	The current postid
121
-     *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
121
+	 *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
122 122
 	 *  @param    string     $taxonomy    	The name of the taxonomy to which the term belongs.
123 123
 	 *
124 124
 	 *  @return bool True if update was successful, false if not.
Please login to merge, or discard this patch.
internal-api/route.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,6 @@
 block discarded – undo
81 81
 	 *
82 82
 	 * @param string $action The AJAX action we are processing.
83 83
 	 * @param string|object $callback The class to use for the callback. Either the name of the class or an instance of that class.
84
-
85 84
 	 *
86 85
 	 * @return \lasso\internal_api\auth
87 86
 	 */
Please login to merge, or discard this patch.
public/includes/helpers.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -200,7 +200,7 @@
 block discarded – undo
200 200
 		'public' => true,
201 201
 	), 'objects' );
202 202
 	$post_types = array_combine( array_keys( $post_types ), wp_list_pluck( $post_types, 'label' ) );
203
-    unset( $post_types[ 'attachment' ] );
203
+	unset( $post_types[ 'attachment' ] );
204 204
 
205 205
 	/**
206 206
 	 * Set which post types are allowed
Please login to merge, or discard this patch.
public/includes/tour.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
 	}
17 17
 
18 18
 	/**
19
-	*	Draw the modal used to house the walk through
20
-	*	@since 0.6
21
-	*/
19
+	 *	Draw the modal used to house the walk through
20
+	 *	@since 0.6
21
+	 */
22 22
 	public function draw_tour() {
23 23
 
24 24
 		$tour_hidden = get_user_meta( get_current_user_ID(), 'lasso_hide_tour', true );
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
 	}
77 77
 
78 78
 	/**
79
-	*	Draw the inner slides for the welcome walkthrough
80
-	*	@since 0.6
81
-	*/
79
+	 *	Draw the inner slides for the welcome walkthrough
80
+	 *	@since 0.6
81
+	 */
82 82
 	public function tour_slides() { ?>
83 83
 
84 84
 		<div id="lasso--loading" class="lasso--loading"><div class="lasso--loader"></div></div>
Please login to merge, or discard this patch.
public/includes/components.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * The functions in this file register the components that will be shown in the component drop-up menu
4
- * and are filterable and pluggable
5
- *
6
- */
3
+	 * The functions in this file register the components that will be shown in the component drop-up menu
4
+	 * and are filterable and pluggable
5
+	 *
6
+	 */
7 7
 
8 8
 /**
9 9
  * Build an array of components that will be shown in the
Please login to merge, or discard this patch.