Fixes activation issue

Fixes "Fatal error: Using $this when not in object context"

Author: nekorjira

ChangeLog.md

@@ -1,8 +1,11 @@
 # Changelog
 
+### 1.3.2 (03 mar 2015)
+* Fixes "Fatal error: Using $this when not in object context" upon activation in some installations.
+
 ### 1.3.1 (09 feb 2015)
 * Enhancement: earlier PC initialisation - props @Polfo
-* Updated readme files
+* Updated readme files.
 
 ### 1.3.0 (05 feb 2015)
 * Enhancement: added configuration options - props @Polfo

README.txt

@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: development, debug, debugging
 Requires at least: 3.6.0
 Tested up to: 4.1
-Stable tag: 1.3.1
+Stable tag: 1.3.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -119,37 +119,40 @@ None yet.
 
 == Changelog ==
 
-= 1.3.1 (09 feb 2015) =
+= 1.3.2 =
+* Fixes "Fatal error: Using $this when not in object context" upon activation in some installations.
+
+= 1.3.1 =
 * Enhancement: earlier PC initialisation - props @Polfo
 * Updated readme files
 
-= 1.3.0 (05 feb 2015) =
+= 1.3.0 =
 * Enhancement: added configuration options - props @Polfo
   - Register PC class
   - Show Call Stack
   - Short Path Names
 * Fix: IP mask
 
-= 1.2.3 (21 jan 2015) =
+= 1.2.3 =
 
 * Fixes "Wrong PHP Console eval request signature" error when executing WordPress code from terminal, props @Polfo @barbushin
 
-= 1.2.2 (15 jan 2015) =
+= 1.2.2 =
 * Bugfixes
 * Submission to WordPress.org plugins repository.
 
-= 1.2.1 (12 dec 2014) =
+= 1.2.1 =
 * Fixed allowed IPs bug.
 
-= 1.2.0 (11 dec 2014) =
+= 1.2.0 =
 * Updated dependencies and got rid of git submodules.
 
-= 1.1.0 (07 nov 2014) =
+= 1.1.0 =
 * Added donation link/button.
 * PHP Console server is now instantiated later, allowing to catch all your theme functions too.
 * Included PHP Console server library as git submodule rather than a composer dependency.
 
-= 1.0.0 (06 nov 2014) =
+= 1.0.0 =
 * Added three options to set a custom password, enable on SSL only, authorized IP ranges.
 * First public release.
 

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "nekojira/wp-php-console",
 	"description": "A WordPress implementation of PHP Console.",
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"keywords": [
 		"wordpress",
 		"debug",

lib/class-wp-php-console.php

@@ -54,11 +54,10 @@ class WP_PHP_Console {
 	public function __construct() {
 
 		$this->plugin_name = 'wp-php-console';
-		$this->version = '1.3.1';
+		$this->version = '1.3.2';
 		$this->options = get_option( 'wp_php_console' );
 
 		// Perform PHP Console initialisation required asap for other code to be able to output to the JavaScript console
-
 		$connector = PhpConsole\Connector::getInstance();
 
 		// Apply 'register' option to PHP Console
@@ -87,6 +86,7 @@ public function __construct() {
 		add_action( 'admin_menu',       array( $this, 'register_settings_page' ) );
 		// Delay further PHP Console initialisation to have more context during Remote PHP execution
 		add_action( 'wp_loaded',   array( $this, 'init' ) );
+
 	}
 
 	/**
@@ -117,6 +117,7 @@ public function register_settings_page() {
 		);
 
 		add_action( 'admin_init', array( $this, 'register_settings'  ) );
+
 	}
 
 	/**
@@ -203,6 +204,7 @@ public function password_field() {
 		echo '<label for="wp-php-console-ip">' . __( 'Required', $this->plugin_name ) . '</label>';
 		echo '<br />';
 		echo '<small class="description">' . __( 'The password for eval terminal. If empty, the plugin will not work.', $this->plugin_name ) . '</small>';
+
 	}
 
 	/**
@@ -221,6 +223,7 @@ public function ssl_field() {
 		echo '<label for="wp-php-console-ssl">' . __( 'Yes (optional)', $this->plugin_name ) . '</label>';
 		echo '<br />';
 		echo '<small class="description">' . __( 'Choose if you want the eval terminal to work only on a SSL connection.', $this->plugin_name ) . '</small>';
+
 	}
 
 	/**
@@ -237,6 +240,7 @@ public function ip_field() {
 		echo '<label for="wp-php-console-ip">' . __( 'IP addresses (optional)', $this->plugin_name ) . '</label>';
 		echo '<br />';
 		echo '<small class="description">' . __( 'You may specify an IP address (e.g. 192.169.1.50), a range of addresses (192.168.*.*) or multiple addresses, comma separated (192.168.10.25,192.168.10.28) to grant access to eval terminal.', $this->plugin_name ) . '</small>';
+
 	}
 
 	/**
@@ -255,6 +259,7 @@ public function register_field() {
 		echo '<label for="wp-php-console-register">' . __( 'Yes (optional)', $this->plugin_name ) . '</label>';
 		echo '<br />';
 		echo '<small class="description">' . __( 'Choose to register PC in the global namespace. Allows to write PC::debug($var, $tag) or PC::magic_tag($var) instructions in PHP to inspect $var in the JavaScript-console.', $this->plugin_name ) . '</small>';
+
 	}
 
 	/**
@@ -273,6 +278,7 @@ public function stack_field() {
 		echo '<label for="wp-php-console-stack">' . __( 'Yes (optional)', $this->plugin_name ) . '</label>';
 		echo '<br />';
 		echo '<small class="description">' . __( 'Choose to also see the call stack when PHP Console writes to the browser\'s JavaScript-console.', $this->plugin_name ) . '</small>';
+
 	}
 
 	/**
@@ -291,6 +297,7 @@ public function short_field() {
 		echo '<label for="wp-php-console-short">' . __( 'Yes (optional)', $this->plugin_name ) . '</label>';
 		echo '<br />';
 		echo '<small class="description">' . __( 'Choose to shorten PHP Console error sources and traces paths in browser\'s JavaScript-console. Paths like /server/path/to/document/root/WP/wp-admin/admin.php:31 will be displayed as /W/wp-admin/admin.php:31', $this->plugin_name ) . '</small>';
+
 	}
 
 	/**
@@ -386,20 +393,13 @@ public function init() {
 
 		// Display admin notice and abort if no password
 		if ( ! $password ) {
-			add_action('admin_notices', function() {
-				?>
-				<div class="update-nag">
-					<?php _e( 'WP PHP Console plugin: Please enter a password in Settings / WP PHP Console for it to work.', $this->plugin_name ); ?>
-				</div>
-				<?php
-			});
+			add_action( 'admin_notices', array( $this, 'password_notice' ) );
 			return; // abort
 		}
 
 		// Selectively remove slashes added by WordPress as expected by PhpConsole
-		if(isset($_POST[PhpConsole\Connector::POST_VAR_NAME])) {
-			$_POST[PhpConsole\Connector::POST_VAR_NAME] = stripslashes_deep($_POST[PhpConsole\Connector::POST_VAR_NAME]);
-		}
+		if ( isset( $_POST[PhpConsole\Connector::POST_VAR_NAME] ) )
+			$_POST[PhpConsole\Connector::POST_VAR_NAME] = stripslashes_deep( $_POST[PhpConsole\Connector::POST_VAR_NAME] );
 
 		$connector = PhpConsole\Connector::getInstance();
 		$connector->setPassword( $password );
@@ -430,4 +430,22 @@ public function init() {
 
 	}
 
-}
+	/**
+	 * Admin password notice.
+	 * Prompts user to set a password for PHP Console upon plugin activation.
+	 *
+	 * @since   1.3.2
+	 */
+	public function password_notice() {
+
+		$link = admin_url( 'options-general.php?page=wp-php-console' );
+
+		?>
+		<div class="update-nag">
+			<?php printf( __( 'WP PHP Console: remember to %1$s set a password %2$s if you want to enable terminal.', $this->plugin_name ), '<a href="' . $link .'">', '</a>' ); ?>
+		</div>
+		<?php
+
+	}
+
+}

wp-php-console.php

@@ -9,7 +9,7 @@
  * Plugin Name:       WP PHP Console
  * Plugin URI:        https://github.com/nekojira/wp-php-console/
  * Description:       An implementation of PHP Console for WordPress. Easily debug and trace PHP errors and warnings from your Chrome dev tools console using a Google Chrome extension.
- * Version:           1.3.1
+ * Version:           1.3.2
  * Author:            nekojira
  * Author URI:        https://github.com/nekojira/
  * License:           GPL-2.0+