AesopInteractive / lasso

admin/includes/EDD_SL_Plugin_Updater.php

Braces +6 added lines, -4 removed lines

@@ -270,11 +270,13 @@
 
 		$data = array_merge( $this->api_data, $_data );
 
-		if ( $data['slug'] != $this->slug )
-			return;
+		if ( $data['slug'] != $this->slug ) {
+					return;
+		}
 
-		if ( empty( $data['license'] ) )
-			return;
+		if ( empty( $data['license'] ) ) {
+					return;
+		}
 
 		if ( $this->api_url == home_url() ) {
 			return false; // Don't allow a plugin to ping itself

admin/includes/load_admin.php

Indentation +13 added lines, -13 removed lines

@@ -127,11 +127,11 @@ 
 	}
 
 	/**
-	*	Adds an admin notice reminding the user if their license key has not been saved
-	*
-	*	@since 0.9.7
-	*	@todo make dismissible
-	*/
+	 *	Adds an admin notice reminding the user if their license key has not been saved
+	 *
+	 *	@since 0.9.7
+	 *	@todo make dismissible
+	 */
 	public function license_nag(){
 
 		$screen 	= get_current_screen();
@@ -152,26 +152,26 @@ 
 
 			if ( empty( $license ) ) {
 
-        		printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
+				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
 
-        	} else if ( 'invalid' == $status ){ // license key entered wrong or something
+			} else if ( 'invalid' == $status ){ // license key entered wrong or something
 
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_invalid, $license_link , $dismiss_link );
 
-        	} else if ( empty( $status ) ){ // license key saved but not activated
+			} else if ( empty( $status ) ){ // license key saved but not activated
 
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_inactive, $license_link, $dismiss_link );
 
-        	}
+			}
 		}
 
 	}
 
 	/**
-	*  Process hiding the dimiss
-	*
-	* @since 0.9.7
-	*/
+	 *  Process hiding the dimiss
+	 *
+	 * @since 0.9.7
+	 */
 	public function dismiss_nag() {
 
 		if ( isset( $_GET['lasso-notice'] ) && 'dismiss' == $_GET['lasso-notice'] && current_user_can('manage_options') ) {

admin/includes/menus/license.php

Braces +20 added lines, -12 removed lines

@@ -106,8 +106,10 @@ 
 		if ( isset( $_POST['edd_license_activate'] ) ) {
 
 			// run a quick security check
-			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) )
-				return; // get out if we didn't click the Activate button
+			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) ) {
+							return;
+			}
+			// get out if we didn't click the Activate button
 
 			// retrieve the license from the database
 			$license = trim( get_option( 'lasso_license_key' ) );
@@ -124,8 +126,9 @@ 
 			$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
 
 			// make sure the response came back okay
-			if ( is_wp_error( $response ) )
-				return false;
+			if ( is_wp_error( $response ) ) {
+							return false;
+			}
 
 			// decode the license data
 			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
@@ -143,8 +146,10 @@ 
 		if ( isset( $_POST['edd_license_deactivate'] ) ) {
 
 			// run a quick security check
-			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) )
-				return; // get out if we didn't click the Activate button
+			if ( ! check_admin_referer( 'lasso_license_nonce', 'lasso_license_nonce' ) ) {
+							return;
+			}
+			// get out if we didn't click the Activate button
 
 			// retrieve the license from the database
 			$license = trim( get_option( 'lasso_license_key' ) );
@@ -162,15 +167,17 @@ 
 			$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
 
 			// make sure the response came back okay
-			if ( is_wp_error( $response ) )
-				return false;
+			if ( is_wp_error( $response ) ) {
+							return false;
+			}
 
 			// decode the license data
 			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
 
 			// $license_data->license will be either "deactivated" or "failed"
-			if ( $license_data->license == 'deactivated' )
-				delete_option( 'lasso_license_status' );
+			if ( $license_data->license == 'deactivated' ) {
+							delete_option( 'lasso_license_status' );
+			}
 
 		}
 	}
@@ -192,8 +199,9 @@ 
 		// Call the custom API.
 		$response = wp_remote_post( LASSO_STORE_URL, array( 'body' => $api_params, 'timeout' => 15, 'sslverify' => false ) );
 
-		if ( is_wp_error( $response ) )
-			return false;
+		if ( is_wp_error( $response ) ) {
+					return false;
+		}
 
 		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
 

admin/includes/menus/settings.php

Braces +6 added lines, -4 removed lines

@@ -51,8 +51,9 @@ 
 	function process_settings() {
 
 		// bail out if current user isn't and administrator and they are not logged in
-		if ( !current_user_can( 'manage_options' ) || !is_user_logged_in() )
-			return;
+		if ( !current_user_can( 'manage_options' ) || !is_user_logged_in() ) {
+					return;
+		}
 
 		if ( isset( $_POST['action'] ) && 'lasso-editor-settings' == $_POST['action'] && check_admin_referer( 'nonce', 'lasso_editor_settings' ) ) {
 
@@ -88,8 +89,9 @@ 
 	 */
 	function lasso_editor_settings_form() {
 
-		if ( !is_user_logged_in() )
-			return;
+		if ( !is_user_logged_in() ) {
+					return;
+		}
 
 		$article_object   = lasso_editor_get_option( 'article_class', 'lasso_editor' );
 		$featImgClass    = lasso_editor_get_option( 'featimg_class', 'lasso_editor' );

admin/includes/menus/welcome.php

Indentation +47 added lines, -47 removed lines

@@ -197,53 +197,53 @@
 	 */
 	function required_plugins() {
 
-	    $plugins = array(
-
-	        array(
-	            'name'      => __('WP REST API','lasso'),
-	            'slug'      => 'json-rest-api',
-	            'required'  => true,
-	        ),
-
-	        array(
-	            'name'      => __('Aesop Story Engine','lasso'),
-	            'slug'      => 'aesop-story-engine',
-	            'required'  => false,
-	        ),
-
-	    );
-
-	    $config = array(
-	        'default_path' => '',                      // Default absolute path to pre-packaged plugins.
-	        'menu'         => 'lasso-install-plugins', // Menu slug.
-	        'has_notices'  => true,                    // Show admin notices or not.
-	        'dismissable'  => true,                    // If false, a user cannot dismiss the nag message.
-	        'dismiss_msg'  => '',                      // If 'dismissable' is false, this message will be output at top of nag.
-	        'is_automatic' => false,                   // Automatically activate plugins after installation or not.
-	        'message'      => '',                      // Message to output right before the plugins table.
-	        'strings'      => array(
-	            'page_title'                      => __( 'Install Required Plugins', 'lasso' ),
-	            'menu_title'                      => __( 'Install Plugins', 'lasso' ),
-	            'installing'                      => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name.
-	            'oops'                            => __( 'Something went wrong with the plugin API.', 'lasso' ),
-	            '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).
-	            '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).
-	            '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).
-	            '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).
-	            '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).
-	            '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).
-	            '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).
-	            '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).
-	            'install_link'                    => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
-	            'activate_link'                   => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ),
-	            'return'                          => __( 'Return to Required Plugins Installer', 'lasso' ),
-	            'plugin_activated'                => __( 'Plugin activated successfully.', 'lasso' ),
-	            'complete'                        => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link.
-	            'nag_type'                        => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'.
-	        )
-	    );
-
-	    tgmpa( $plugins, $config );
+		$plugins = array(
+
+			array(
+				'name'      => __('WP REST API','lasso'),
+				'slug'      => 'json-rest-api',
+				'required'  => true,
+			),
+
+			array(
+				'name'      => __('Aesop Story Engine','lasso'),
+				'slug'      => 'aesop-story-engine',
+				'required'  => false,
+			),
+
+		);
+
+		$config = array(
+			'default_path' => '',                      // Default absolute path to pre-packaged plugins.
+			'menu'         => 'lasso-install-plugins', // Menu slug.
+			'has_notices'  => true,                    // Show admin notices or not.
+			'dismissable'  => true,                    // If false, a user cannot dismiss the nag message.
+			'dismiss_msg'  => '',                      // If 'dismissable' is false, this message will be output at top of nag.
+			'is_automatic' => false,                   // Automatically activate plugins after installation or not.
+			'message'      => '',                      // Message to output right before the plugins table.
+			'strings'      => array(
+				'page_title'                      => __( 'Install Required Plugins', 'lasso' ),
+				'menu_title'                      => __( 'Install Plugins', 'lasso' ),
+				'installing'                      => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name.
+				'oops'                            => __( 'Something went wrong with the plugin API.', 'lasso' ),
+				'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).
+				'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).
+				'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).
+				'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).
+				'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).
+				'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).
+				'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).
+				'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).
+				'install_link'                    => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
+				'activate_link'                   => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ),
+				'return'                          => __( 'Return to Required Plugins Installer', 'lasso' ),
+				'plugin_activated'                => __( 'Plugin activated successfully.', 'lasso' ),
+				'complete'                        => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link.
+				'nag_type'                        => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'.
+			)
+		);
+
+		tgmpa( $plugins, $config );
 
 	}
 }

Braces +8 added lines, -5 removed lines

@@ -71,23 +71,26 @@
 			  				<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>
 			  			</li>
 
-			  		<?php else :
+			  		<?php else {
+	:
 
 					$checks = self::lasso_preflight_check();
+}
 
 					if ( $checks && !defined( 'LASSO_AGENCY_MODE' ) ):
 
 						foreach ( (array) $checks as $key => $check ) {
 
 							echo $check;
-						}
-
-						else:
+						} else {
+							:
 
 							// pre-flight is go for flight
 						?>
 						<li class="success">
-							<h3><?php _e( 'You\'re Ready to Rock!', 'lasso' );?></h3>
+							<h3><?php _e( 'You\'re Ready to Rock!', 'lasso' );
+						}
+						?></h3>
 							<?php if ( lasso_get_supported_theme_class() ) { ?>
 							<p><?php _e( 'Your theme is automatically supported. No additional setup is needed.', 'lasso' );?></p>
 							<?php } ?>

includes/lasso_autoloader.php

Indentation +2 added lines, -2 removed lines

@@ -115,8 +115,8 @@
 			// replace namespace separators with directory separators
 			// in the relative class name, append with .php
 			$file = $base_dir
-			        . str_replace('\\', '/', $relative_class)
-			        . '.php';
+					. str_replace('\\', '/', $relative_class)
+					. '.php';
 
 			// if the mapped file exists, require it
 			if ($this->requireFile($file)) {

includes/process/delete.php

Braces +3 added lines, -2 removed lines

@@ -30,8 +30,9 @@
 		$postid = isset( $data['postid'] ) ? $data['postid'] : false;
 
 		// bail out if teh current user can't publish posts
-		if ( !lasso_user_can( 'delete_post', $postid ) )
-			return;
+		if ( !lasso_user_can( 'delete_post', $postid ) ) {
+					return;
+		}
 
 		$args = array(
 			'ID'   			=> (int) $postid,

includes/process/gallery.php

Braces +5 added lines, -4 removed lines

@@ -119,9 +119,9 @@ 
 		$gallery_ids  = isset( $data['gallery_ids'] ) ? $data['gallery_ids'] : false;
 		if ( ! empty( $data ) && $data[ 'gallery_type' ] ) {
 			$type = $data[ 'gallery_type' ];
-		}elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) {
+		} elseif ( ! empty( $options ) && $options[ 'galleryType' ] ) {
 			$type = $options[ 'galleryType' ];
-		}else{
+		} else{
 			$type = false;
 		}
 
@@ -173,8 +173,9 @@ 
 	 */
 	private function get_the_images( $image_ids = '' ) {
 
-		if ( empty( $image_ids ) )
-			return;
+		if ( empty( $image_ids ) ) {
+					return;
+		}
 
 		$image_ids  = array_map( 'intval', explode( ',', $image_ids ) );
 

includes/process/revision.php

Braces +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 		$args = array();
 		if ( isset( $data[ 'limit' ] ) ) {
 			$args[ 'posts_per_page' ] = $data[ 'limit' ];
-		}else{
+		} else{
 			$args[ 'posts_per_page' ] = 6; // we start at revision 0
 		}