pryley / blackbar

activate.php

Spacing +30 added lines, -30 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-defined( 'WPINC' ) || die;
+defined('WPINC') || die;
 
 class GL_BlackBar_Activate
 {
@@ -26,7 +26,7 @@ 
 	 */
 	public static function isPhpValid()
 	{
-		return !version_compare( PHP_VERSION, static::MIN_PHP_VERSION, '<' );
+		return !version_compare(PHP_VERSION, static::MIN_PHP_VERSION, '<');
 	}
 
 	/**
@@ -35,7 +35,7 @@ 
 	public static function isWpValid()
 	{
 		global $wp_version;
-		return !version_compare( $wp_version, static::MIN_WORDPRESS_VERSION, '<' );
+		return !version_compare($wp_version, static::MIN_WORDPRESS_VERSION, '<');
 	}
 
 	/**
@@ -43,12 +43,12 @@ 
 	 */
 	public static function shouldDeactivate()
 	{
-		if( empty( static::$instance )) {
+		if (empty(static::$instance)) {
 			static::$instance = new static;
 		}
-		if( !static::isValid() ) {
-			add_action( 'activated_plugin', array( static::$instance, 'deactivate' ));
-			add_action( 'admin_notices', array( static::$instance, 'deactivate' ));
+		if (!static::isValid()) {
+			add_action('activated_plugin', array(static::$instance, 'deactivate'));
+			add_action('admin_notices', array(static::$instance, 'deactivate'));
 			return true;
 		}
 		return false;
@@ -57,14 +57,14 @@ 
 	/**
 	 * @return void
 	 */
-	public function deactivate( $plugin )
+	public function deactivate($plugin)
 	{
-		if( static::isValid() )return;
-		$pluginName = plugin_basename( dirname( realpath( __FILE__ )).'/'.static::BASENAME );
-		if( $plugin == $pluginName ) {
+		if (static::isValid())return;
+		$pluginName = plugin_basename(dirname(realpath(__FILE__)).'/'.static::BASENAME);
+		if ($plugin == $pluginName) {
 			$this->redirect(); //exit
 		}
-		deactivate_plugins( $pluginName );
+		deactivate_plugins($pluginName);
 		$this->printNotice();
 	}
 
@@ -73,10 +73,10 @@ 
 	 */
 	protected function redirect()
 	{
-		wp_safe_redirect( self_admin_url( sprintf( 'plugins.php?plugin_status=%s&paged=%s&s=%s',
-			filter_input( INPUT_GET, 'plugin_status' ),
-			filter_input( INPUT_GET, 'paged' ),
-			filter_input( INPUT_GET, 's' )
+		wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s',
+			filter_input(INPUT_GET, 'plugin_status'),
+			filter_input(INPUT_GET, 'paged'),
+			filter_input(INPUT_GET, 's')
 		)));
 		exit;
 	}
@@ -88,25 +88,25 @@ 
 	{
 		$noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>';
 		$messages = array(
-			__( 'The BlackBar plugin was deactivated.', 'blackbar' ),
-			__( 'Sorry, this plugin requires %s or greater in order to work properly.', 'blackbar' ),
-			__( 'Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'blackbar' ),
-			__( 'PHP version', 'blackbar' ).' '.static::MIN_PHP_VERSION,
-			__( 'WordPress version', 'blackbar' ).' '.static::MIN_WORDPRESS_VERSION,
-			__( 'Update WordPress', 'blackbar' ),
+			__('The BlackBar plugin was deactivated.', 'blackbar'),
+			__('Sorry, this plugin requires %s or greater in order to work properly.', 'blackbar'),
+			__('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'blackbar'),
+			__('PHP version', 'blackbar').' '.static::MIN_PHP_VERSION,
+			__('WordPress version', 'blackbar').' '.static::MIN_WORDPRESS_VERSION,
+			__('Update WordPress', 'blackbar'),
 		);
-		if( !static::isPhpValid() ) {
-			printf( $noticeTemplate,
+		if (!static::isPhpValid()) {
+			printf($noticeTemplate,
 				$messages[0],
-				sprintf( $messages[1], $messages[3] ),
-				sprintf( $messages[2], PHP_VERSION )
+				sprintf($messages[1], $messages[3]),
+				sprintf($messages[2], PHP_VERSION)
 			);
 		}
-		else if( !static::isWpValid() ) {
-			printf( $noticeTemplate,
+		else if (!static::isWpValid()) {
+			printf($noticeTemplate,
 				$messages[0],
-				sprintf( $messages[1], $messages[4] ),
-				sprintf( '<a href="%s">%s</a>', admin_url( 'update-core.php' ), $messages[5] )
+				sprintf($messages[1], $messages[4]),
+				sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages[5])
 			);
 		}
 	}

Braces +4 added lines, -3 removed lines

@@ -59,7 +59,9 @@ 
 	 */
 	public function deactivate( $plugin )
 	{
-		if( static::isValid() )return;
+		if( static::isValid() ) {
+			return;
+		}
 		$pluginName = plugin_basename( dirname( realpath( __FILE__ )).'/'.static::BASENAME );
 		if( $plugin == $pluginName ) {
 			$this->redirect(); //exit
@@ -101,8 +103,7 @@ 
 				sprintf( $messages[1], $messages[3] ),
 				sprintf( $messages[2], PHP_VERSION )
 			);
-		}
-		else if( !static::isWpValid() ) {
+		} else if( !static::isWpValid() ) {
 			printf( $noticeTemplate,
 				$messages[0],
 				sprintf( $messages[1], $messages[4] ),

blackbar.php

Spacing +2 added lines, -2 removed lines

@@ -16,10 +16,10 @@
  * Domain Path: languages
  */
 
-defined( 'WPINC' ) || die;
+defined('WPINC') || die;
 
 require_once __DIR__.'/activate.php';
-if( \GL_BlackBar_Activate::shouldDeactivate() )return;
+if (\GL_BlackBar_Activate::shouldDeactivate())return;
 
 require_once __DIR__.'/autoload.php';
 (new \GeminiLabs\Blackbar\Application)->init();

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 defined( 'WPINC' ) || die;
 
 require_once __DIR__.'/activate.php';
-if( \GL_BlackBar_Activate::shouldDeactivate() )return;
+if( \GL_BlackBar_Activate::shouldDeactivate() ) {
+	return;
+}
 
 require_once __DIR__.'/autoload.php';
 (new \GeminiLabs\Blackbar\Application)->init();