unfulvio / wp-php-console

uninstall.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
  * @package WP_PHP_Console
  */
 
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit; // If uninstall not called from WordPress, then exit.
 }
 
-delete_option( 'wp_php_console' );
+delete_option('wp_php_console');

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Fired when the plugin is uninstalled.
- *
- * @link    https://github.com/nekojira/wp-php-console
- * @since   1.0.0
- * @package WP_PHP_Console
- */
+	 * Fired when the plugin is uninstalled.
+	 *
+	 * @link    https://github.com/nekojira/wp-php-console
+	 * @since   1.0.0
+	 * @package WP_PHP_Console
+	 */
 
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
 	exit; // If uninstall not called from WordPress, then exit.

wp-php-console.php

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
  * Domain Path:       /languages
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	exit;
 }
 
@@ -44,7 +44,7 @@ 
  */
 
 // Composer fallback for PHP < 5.3.0.
-if ( version_compare( PHP_VERSION, '5.3.0' ) === -1 ) {
+if (version_compare(PHP_VERSION, '5.3.0') === -1) {
 	include_once 'vendor/autoload_52.php';
 } else {
 	include_once 'vendor/autoload.php';
@@ -57,13 +57,13 @@ 
  */
 $this_plugin_checks = new WP_Requirements(
 	'WP PHP Console',
-	plugin_basename( __FILE__ ),
+	plugin_basename(__FILE__),
 	array(
 		'PHP' => '5.4.0',
 	)
 );
 
-if ( $this_plugin_checks->pass() === false ) {
+if ($this_plugin_checks->pass() === false) {
 	// Stop.
 	$this_plugin_checks->halt();
 	return;

includes/class-wp-php-console.php

Spacing +117 added lines, -117 removed lines

@@ -10,7 +10,7 @@ 
 
 use PhpConsole;
 
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	exit; // Exit if accessed directly
 }
 
@@ -82,7 +82,7 @@ 
 		$this->options     = $this->get_options();
 
 		// Bail out if PHP Console can't be found
-		if ( ! class_exists( 'PhpConsole\Connector' ) ) {
+		if ( ! class_exists('PhpConsole\Connector')) {
 			return;
 		}
 
@@ -93,13 +93,13 @@ 
 		$this->apply_options();
 
 		// Translations
-		add_action( 'plugins_loaded', array( $this, 'set_locale' ) );
+		add_action('plugins_loaded', array($this, 'set_locale'));
 
 		// Admin menu
-		add_action( 'admin_menu', array( $this, 'register_settings_page' ) );
+		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' ) );
+		add_action('wp_loaded', array($this, 'init'));
 
 	}
 
@@ -114,7 +114,7 @@ 
 		load_plugin_textdomain(
 			$this->plugin_slug,
 			false,
-			dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+			dirname(plugin_basename(__FILE__)).'/languages/' );
 	}
 
 
@@ -129,15 +129,15 @@ 
 		// so all temporary data will be stored in $_SESSION.
 		// But there is some problem with frameworks like WordPress that override PHP session handler.
 		// PHP Console has alternative storage drivers for this - we will write to a temporary file:
-		$phpcdir  = dirname( __FILE__ ) . '/tmp';
-		$make_dir = wp_mkdir_p( $phpcdir );
+		$phpcdir  = dirname(__FILE__).'/tmp';
+		$make_dir = wp_mkdir_p($phpcdir);
 
-		if ( $make_dir === true ) {
+		if ($make_dir === true) {
 
 			try {
-				$storage = new PhpConsole\Storage\File( $phpcdir . '/' . md5( __FILE__ ) . '_pc.data' );
-				PhpConsole\Connector::setPostponeStorage( $storage );
-			} catch( \Exception $e ) {
+				$storage = new PhpConsole\Storage\File($phpcdir.'/'.md5(__FILE__).'_pc.data');
+				PhpConsole\Connector::setPostponeStorage($storage);
+			} catch (\Exception $e) {
 				// TODO $storage is under DOCUMENT_ROOT - it's insecure but did not find another solution in WP
 				// $this->print_notice_exception( $e );
 			}
@@ -157,7 +157,7 @@ 
 	 * @return array
 	 */
 	protected function get_options() {
-		return get_option( 'wp_php_console', array() );
+		return get_option('wp_php_console', array());
 	}
 
 
@@ -169,26 +169,26 @@ 
 	private function apply_options() {
 
 		// Apply 'register' option to PHP Console
-		if ( ! empty( $this->options['register'] ) && ! class_exists( 'PC', false ) ) {
+		if ( ! empty($this->options['register']) && ! class_exists('PC', false)) {
 			// Only if PC not registered yet
 			try {
 				PhpConsole\Helper::register();
-			} catch( \Exception $e ) {
-				$this->print_notice_exception( $e );
+			} catch (\Exception $e) {
+				$this->print_notice_exception($e);
 			}
 		}
 
 		// Apply 'stack' option to PHP Console
-		if ( ! empty( $this->options['stack'] ) ) {
+		if ( ! empty($this->options['stack'])) {
 			$this->connector->getDebugDispatcher()->detectTraceAndSource = true;
 		}
 
 		// Apply 'short' option to PHP Console
-		if ( ! empty( $this->options['short'] ) ) {
+		if ( ! empty($this->options['short'])) {
 			try {
-				$this->connector->setSourcesBasePath( $_SERVER['DOCUMENT_ROOT'] );
-			} catch ( \Exception $e ) {
-				$this->print_notice_exception( $e );
+				$this->connector->setSourcesBasePath($_SERVER['DOCUMENT_ROOT']);
+			} catch (\Exception $e) {
+				$this->print_notice_exception($e);
 			}
 		}
 
@@ -203,78 +203,78 @@ 
 	public function init() {
 
 		// Display admin notice and abort if no password has been set
-		$password = isset( $this->options['password'] ) ? $this->options['password'] : '';
-		if ( ! $password ) {
-			add_action( 'admin_notices', array( $this, 'password_notice' ) );
+		$password = isset($this->options['password']) ? $this->options['password'] : '';
+		if ( ! $password) {
+			add_action('admin_notices', array($this, 'password_notice'));
 			return;
 		}
 
 		// 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]);
 		}
 
 		$this->connector = PhpConsole\Connector::getInstance();
 
 		try {
-			$this->connector->setPassword( $password );
-		} catch ( \Exception $e ) {
-			$this->print_notice_exception( $e );
+			$this->connector->setPassword($password);
+		} catch (\Exception $e) {
+			$this->print_notice_exception($e);
 		}
 
 		// PhpConsole instance
 		$handler = PhpConsole\Handler::getInstance();
 
-		if ( PhpConsole\Handler::getInstance()->isStarted() !== true ) {
+		if (PhpConsole\Handler::getInstance()->isStarted() !== true) {
 			try {
 				$handler->start();
-			} catch( \Exception $e ) {
-				$this->print_notice_exception( $e );
+			} catch (\Exception $e) {
+				$this->print_notice_exception($e);
 			}
 		}
 
 		// Enable SSL-only mode
-		$enableSslOnlyMode = isset( $this->options['ssl'] ) ? ( ! empty( $this->options['ssl'] ) ? $this->options['ssl'] : '' ) : '';
+		$enableSslOnlyMode = isset($this->options['ssl']) ? ( ! empty($this->options['ssl']) ? $this->options['ssl'] : '') : '';
 
-		if ( $enableSslOnlyMode ) {
+		if ($enableSslOnlyMode) {
 			$this->connector->enableSslOnlyMode();
 		}
 
 		// Restrict IP addresses
-		$allowedIpMasks = isset( $this->options['ip'] ) ? ( ! empty( $this->options['ip'] ) ? explode( ',', $this->options['ip'] ) : '' ) : '';
+		$allowedIpMasks = isset($this->options['ip']) ? ( ! empty($this->options['ip']) ? explode(',', $this->options['ip']) : '') : '';
 
-		if ( is_array( $allowedIpMasks ) && ! empty( $allowedIpMasks ) ) {
-			$this->connector->setAllowedIpMasks( (array) $allowedIpMasks );
+		if (is_array($allowedIpMasks) && ! empty($allowedIpMasks)) {
+			$this->connector->setAllowedIpMasks((array) $allowedIpMasks);
 		}
 
 		$evalProvider = $this->connector->getEvalDispatcher()->getEvalProvider();
 
 		try {
-			$evalProvider->addSharedVar( 'uri', $_SERVER['REQUEST_URI'] );
-		} catch ( \Exception $e ) {
-			$this->print_notice_exception( $e );
+			$evalProvider->addSharedVar('uri', $_SERVER['REQUEST_URI']);
+		} catch (\Exception $e) {
+			$this->print_notice_exception($e);
 		}
 
 		try {
-			$evalProvider->addSharedVarReference( 'post', $_POST );
-		} catch ( \Exception $e ) {
-			$this->print_notice_exception( $e );
+			$evalProvider->addSharedVarReference('post', $_POST);
+		} catch (\Exception $e) {
+			$this->print_notice_exception($e);
 		}
 
-		$openBaseDirs = array( ABSPATH, get_template_directory() );
+		$openBaseDirs = array(ABSPATH, get_template_directory());
 
 		try {
-			$evalProvider->addSharedVarReference( 'dirs', $openBaseDirs );
-		} catch ( \Exception $e ) {
-			$this->print_notice_exception( $e );
+			$evalProvider->addSharedVarReference('dirs', $openBaseDirs);
+		} catch (\Exception $e) {
+			$this->print_notice_exception($e);
 		}
 
-		$evalProvider->setOpenBaseDirs( $openBaseDirs );
+		$evalProvider->setOpenBaseDirs($openBaseDirs);
 
 		try {
 			$this->connector->startEvalRequestsListener();
-		} catch ( \Exception $e ) {
-			$this->print_notice_exception( $e );
+		} catch (\Exception $e) {
+			$this->print_notice_exception($e);
 		}
 
 	}
@@ -287,13 +287,13 @@ 
 	 * @param \Exception $e Exception object
 	 * @return void
 	 */
-	public function print_notice_exception( \Exception $e ) {
+	public function print_notice_exception(\Exception $e) {
 
-		add_action( 'admin_notices', function() use ( $e ) {
+		add_action('admin_notices', function() use ($e) {
 
 			?>
 			<div class="error">
-				<p><?php printf( '%1$s: %2$s', $this->plugin_name, $e->getMessage() ); ?></p>
+				<p><?php printf('%1$s: %2$s', $this->plugin_name, $e->getMessage()); ?></p>
 			</div>
 			<?php
 
@@ -314,10 +314,10 @@ 
 		<div class="update-nag">
 			<?php
 
-			$settings_page = esc_url( admin_url( 'options-general.php?page=wp-php-console' ) );
+			$settings_page = esc_url(admin_url('options-general.php?page=wp-php-console'));
 
 			/* translators: Placeholders: %1$s - opening HTML <a> link tag; %2$s closing HTML </a> link tag */
-			printf( $this->plugin_name . ': ' . __( 'Please remember to %1$s set a password %2$s if you want to enable terminal.', 'wp-php-console' ), '<a href="' . $settings_page .'">', '</a>' );
+			printf($this->plugin_name.': '.__('Please remember to %1$s set a password %2$s if you want to enable terminal.', 'wp-php-console'), '<a href="'.$settings_page.'">', '</a>');
 
 			?>
 		</div>
@@ -334,14 +334,14 @@ 
 	public function register_settings_page() {
 
 		add_options_page(
-			__( 'WP PHP Console', 'wp-php-console' ),
-			__( 'WP PHP Console', 'wp-php-console' ),
+			__('WP PHP Console', 'wp-php-console'),
+			__('WP PHP Console', 'wp-php-console'),
 			'manage_options',
 			$this->plugin_slug,
-			array( $this, 'settings_page' )
+			array($this, 'settings_page')
 		);
 
-		add_action( 'admin_init', array( $this, 'register_settings'  ) );
+		add_action('admin_init', array($this, 'register_settings'));
 
 	}
 
@@ -356,60 +356,60 @@ 
 		register_setting(
 			'wp_php_console',
 			'wp_php_console',
-			array( $this, 'sanitize_field' )
+			array($this, 'sanitize_field')
 		);
 
 		add_settings_section(
 			'wp_php_console',
-			__( 'Settings', 'wp-php-console' ),
-			array( $this, 'settings_info' ),
+			__('Settings', 'wp-php-console'),
+			array($this, 'settings_info'),
 			$this->plugin_slug
 		);
 
 		add_settings_field(
 			'password',
-			__( 'Password', 'wp-php-console' ),
-			array( $this, 'password_field' ),
+			__('Password', 'wp-php-console'),
+			array($this, 'password_field'),
 			$this->plugin_slug,
 			'wp_php_console'
 		);
 
 		add_settings_field(
 			'ssl',
-			__( 'Allow only on SSL', 'wp-php-console' ),
-			array( $this, 'ssl_field' ),
+			__('Allow only on SSL', 'wp-php-console'),
+			array($this, 'ssl_field'),
 			$this->plugin_slug,
 			'wp_php_console'
 		);
 
 		add_settings_field(
 			'ip',
-			__( 'Allowed IP Masks', 'wp-php-console' ),
-			array( $this, 'ip_field' ),
+			__('Allowed IP Masks', 'wp-php-console'),
+			array($this, 'ip_field'),
 			$this->plugin_slug,
 			'wp_php_console'
 		);
 
 		add_settings_field(
 			'register',
-			__( 'Register PC Class ', 'wp-php-console' ),
-			array( $this, 'register_field' ),
+			__('Register PC Class ', 'wp-php-console'),
+			array($this, 'register_field'),
 			$this->plugin_slug,
 			'wp_php_console'
 		);
 
 		add_settings_field(
 			'stack',
-			__( 'Show Call Stack', 'wp-php-console' ),
-			array( $this, 'stack_field' ),
+			__('Show Call Stack', 'wp-php-console'),
+			array($this, 'stack_field'),
 			$this->plugin_slug,
 			'wp_php_console'
 		);
 
 		add_settings_field(
 			'short',
-			__( 'Short Path Names', 'wp-php-console' ),
-			array( $this, 'short_field' ),
+			__('Short Path Names', 'wp-php-console'),
+			array($this, 'short_field'),
 			$this->plugin_slug,
 			'wp_php_console'
 		);
@@ -424,13 +424,13 @@ 
 	 */
 	public function password_field() {
 
-		printf (
+		printf(
 			'<input type="password" id="wp-php-console-password" name="wp_php_console[password]" value="%s" />',
-			isset( $this->options['password'] ) ? esc_attr( $this->options['password'] ) : ''
+			isset($this->options['password']) ? esc_attr($this->options['password']) : ''
 		);
-		echo '<label for="wp-php-console-ip">' . esc_html__( 'Required', 'wp-php-console' ) . '</label>';
+		echo '<label for="wp-php-console-ip">'.esc_html__('Required', 'wp-php-console').'</label>';
 		echo '<br />';
-		echo '<small class="description">' . esc_html__( 'The password for the eval terminal. If empty, the plugin will not work.', 'wp-php-console' ) . '</small>';
+		echo '<small class="description">'.esc_html__('The password for the eval terminal. If empty, the plugin will not work.', 'wp-php-console').'</small>';
 
 	}
 
@@ -442,15 +442,15 @@ 
 	 */
 	public function ssl_field() {
 
-		$ssl = isset( $this->options['ssl'] ) ? esc_attr( $this->options['ssl']) : '';
+		$ssl = isset($this->options['ssl']) ? esc_attr($this->options['ssl']) : '';
 
-		printf (
+		printf(
 			'<input type="checkbox" id="wp-php-console-ssl" name="wp_php_console[ssl]" value="1" %s /> ',
 			$ssl ? 'checked="checked"' : ''
 		);
-		echo '<label for="wp-php-console-ssl">' . esc_html__( 'Yes', 'wp-php-console' ) . '</label>';
+		echo '<label for="wp-php-console-ssl">'.esc_html__('Yes', 'wp-php-console').'</label>';
 		echo '<br />';
-		echo '<small class="description">' . esc_html__( 'Tick this option if you want the eval terminal to work only on a SSL connection.', 'wp-php-console' ) . '</small>';
+		echo '<small class="description">'.esc_html__('Tick this option if you want the eval terminal to work only on a SSL connection.', 'wp-php-console').'</small>';
 
 	}
 
@@ -462,14 +462,14 @@ 
 	 */
 	public function ip_field() {
 
-		printf (
+		printf(
 			'<input type="text" class="regular-text" id="wp-php-console-ip" name="wp_php_console[ip]" value="%s" /> ',
-			isset( $this->options['ip'] ) ? esc_attr( $this->options['ip']) : ''
+			isset($this->options['ip']) ? esc_attr($this->options['ip']) : ''
 		);
-		echo '<label for="wp-php-console-ip">' . esc_html__( 'IP addresses (optional)', 'wp-php-console' ) . '</label>';
+		echo '<label for="wp-php-console-ip">'.esc_html__('IP addresses (optional)', 'wp-php-console').'</label>';
 		echo '<br />';
 		/* translators: VVV Varying Vagrant Vagrants default IP address */
-		printf ( __( '<small class="description">' . __( 'You may specify an IP address (e.g. <code>192.168.50.4</code>, %s default IP address), a range of addresses (<code>192.168.*.*</code>) or multiple addresses, comma separated (<code>192.168.10.25,192.168.10.28</code>) to grant access to the eval terminal.', 'wp-php-console' ) . '</small>' ), '<a href="https://github.com/Varying-Vagrant-Vagrants/VVV">Varying Vagrant Vagrants</a>' );
+		printf(__('<small class="description">'.__('You may specify an IP address (e.g. <code>192.168.50.4</code>, %s default IP address), a range of addresses (<code>192.168.*.*</code>) or multiple addresses, comma separated (<code>192.168.10.25,192.168.10.28</code>) to grant access to the eval terminal.', 'wp-php-console').'</small>'), '<a href="https://github.com/Varying-Vagrant-Vagrants/VVV">Varying Vagrant Vagrants</a>');
 
 	}
 
@@ -481,15 +481,15 @@ 
 	 */
 	public function register_field() {
 
-		$register = ! empty( $this->options['register'] );
+		$register = ! empty($this->options['register']);
 
-		printf (
+		printf(
 			'<input type="checkbox" id="wp-php-console-register" name="wp_php_console[register]" value="1" %s /> ',
 			$register ? 'checked="checked"' : ''
 		);
-		echo '<label for="wp-php-console-register">' . esc_html__( 'Yes', 'wp-php-console' ) . '</label>';
+		echo '<label for="wp-php-console-register">'.esc_html__('Yes', 'wp-php-console').'</label>';
 		echo '<br />';
-		echo '<small class="description">' . __( 'Choose to register PC in the global namespace. Allows to write <code>PC::debug(&#36;var, &#36;tag)</code> or <code>PC::magic_tag(&#36;var)</code> instructions in PHP to inspect <code>&#36;var</code> in the JavaScript console.', 'wp-php-console' ) . '</small>';
+		echo '<small class="description">'.__('Choose to register PC in the global namespace. Allows to write <code>PC::debug(&#36;var, &#36;tag)</code> or <code>PC::magic_tag(&#36;var)</code> instructions in PHP to inspect <code>&#36;var</code> in the JavaScript console.', 'wp-php-console').'</small>';
 
 	}
 
@@ -501,15 +501,15 @@ 
 	 */
 	public function stack_field() {
 
-		$stack = ! empty( $this->options['stack'] );
+		$stack = ! empty($this->options['stack']);
 
-		printf (
+		printf(
 			'<input type="checkbox" id="wp-php-console-stack" name="wp_php_console[stack]" value="1" %s /> ',
 			$stack ? 'checked="checked"' : ''
 		);
-		echo '<label for="wp-php-console-stack">' . esc_html__( 'Yes', 'wp-php-console' ) . '</label>';
+		echo '<label for="wp-php-console-stack">'.esc_html__('Yes', 'wp-php-console').'</label>';
 		echo '<br />';
-		echo '<small class="description">' . __( "Choose to also see the call stack when PHP Console writes to the browser's JavaScript-console.", 'wp-php-console' ) . '</small>';
+		echo '<small class="description">'.__("Choose to also see the call stack when PHP Console writes to the browser's JavaScript-console.", 'wp-php-console').'</small>';
 
 	}
 
@@ -521,15 +521,15 @@ 
 	 */
 	public function short_field() {
 
-		$short = ! empty( $this->options['short'] );
+		$short = ! empty($this->options['short']);
 
-		printf (
+		printf(
 			'<input type="checkbox" id="wp-php-console-short" name="wp_php_console[short]" value="1" %s /> ',
 			$short ? 'checked="checked"' : ''
 		);
-		echo '<label for="wp-php-console-short">' . esc_html__( 'Yes', 'wp-php-console' ) . '</label>';
+		echo '<label for="wp-php-console-short">'.esc_html__('Yes', 'wp-php-console').'</label>';
 		echo '<br />';
-		echo '<small class="description">' . __( "Choose to shorten PHP Console error sources and traces paths in browser's JavaScript-console. Paths like <code>/server/path/to/document/root/WP/wp-admin/admin.php:31</code> will be displayed as <code>/W/wp-admin/admin.php:31</code>", 'wp-php-console' ) . '</small>';
+		echo '<small class="description">'.__("Choose to shorten PHP Console error sources and traces paths in browser's JavaScript-console. Paths like <code>/server/path/to/document/root/WP/wp-admin/admin.php:31</code> will be displayed as <code>/W/wp-admin/admin.php:31</code>", 'wp-php-console').'</small>';
 
 	}
 
@@ -541,25 +541,25 @@ 
 	 * @param  string $input user input
 	 * @return array  sanitized inputs
 	 */
-	public function sanitize_field( $input ) {
+	public function sanitize_field($input) {
 
 			$sanitized_input = array();
 
-			if ( isset( $input['password'] ) ) {
-				$sanitized_input['password'] = sanitize_text_field( $input['password'] );
+			if (isset($input['password'])) {
+				$sanitized_input['password'] = sanitize_text_field($input['password']);
 			}
 
-			if ( isset( $input['ssl'] ) ) {
-				$sanitized_input['ssl'] = ! empty( $input['ssl'] ) ? 1 : '';
+			if (isset($input['ssl'])) {
+				$sanitized_input['ssl'] = ! empty($input['ssl']) ? 1 : '';
 			}
 
-			if ( isset( $input['ip'] ) ) {
-				$sanitized_input['ip']  = sanitize_text_field( $input['ip'] );
+			if (isset($input['ip'])) {
+				$sanitized_input['ip'] = sanitize_text_field($input['ip']);
 			}
 
-			$sanitized_input['register'] = empty( $input['register'] ) ? '' : 1;
-			$sanitized_input['stack']    = empty( $input['stack'] )    ? '' : 1;
-			$sanitized_input['short']    = empty( $input['short'] )    ? '' : 1;
+			$sanitized_input['register'] = empty($input['register']) ? '' : 1;
+			$sanitized_input['stack']    = empty($input['stack']) ? '' : 1;
+			$sanitized_input['short']    = empty($input['short']) ? '' : 1;
 
 			return $sanitized_input;
 	}
@@ -574,12 +574,12 @@ 
 
 		?>
 		<div class="wrap">
-			<h2><?php esc_html_e( 'WP PHP Console', 'wp-php-console' ); ?></h2>
+			<h2><?php esc_html_e('WP PHP Console', 'wp-php-console'); ?></h2>
 			<hr />
 			<form method="post" action="options.php">
 				<?php
-				settings_fields( 'wp_php_console' );
-				do_settings_sections( $this->plugin_slug );
+				settings_fields('wp_php_console');
+				do_settings_sections($this->plugin_slug);
 				submit_button();
 				?>
 			</form>
@@ -599,14 +599,14 @@ 
 
 		?>
 		<p><?php /* translators: %s refers to 'PHP Console' Chrome extension, will print download link for the Chrome extension */
-			printf( _x( 'This plugin allows you to use %s within your WordPress installation for testing, debugging and development purposes.<br/>Usage instructions:', 'PHP Console, the Chrome Extension', 'wp-php-console' ), '<a href="https://github.com/barbushin/php-console" target="_blank">PHP Console</a>' ); ?></p>
+			printf(_x('This plugin allows you to use %s within your WordPress installation for testing, debugging and development purposes.<br/>Usage instructions:', 'PHP Console, the Chrome Extension', 'wp-php-console'), '<a href="https://github.com/barbushin/php-console" target="_blank">PHP Console</a>'); ?></p>
 		<ol>
 			<li><?php /* translators: Install PHP Console extension for Google Chrome download link */
-				printf( _x( 'Make sure you have downloaded and installed %s.', 'PHP Console, the Chrome Extension', 'wp-php-console' ), '<a target="_blank" href="https://chrome.google.com/webstore/detail/php-console/nfhmhhlpfleoednkpnnnkolmclajemef">PHP Console extension for Google Chrome</a>' ); ?></li>
-			<li><?php _e( 'Set a password for the eval terminal in the options below and hit <code>save changes</code>.', 'wp-php-console' ); ?></li>
-			<li><?php _e( 'Reload any page of your installation and click on the key icon in your Chrome browser address bar, enter your password and access the terminal.', 'wp-php-console' ); ?></li>
-			<li><?php _e( 'From the eval terminal you can execute any PHP or WordPress specific function, including functions from your plugins and active theme.', 'wp-php-console' ); ?></li>
-			<li><?php _e( "In your PHP code, you can call PHP Console debug statements like <code>debug(&#36;var, &#36;tag)</code> to display PHP variables in the browser's JavaScript-console (<code>Ctrl Shift J </code>) and optionally filter selected tags through the browser's Remote PHP Eval Terminal screen's Ignore Debug options.", 'wp-php-console' ); ?></li>
+				printf(_x('Make sure you have downloaded and installed %s.', 'PHP Console, the Chrome Extension', 'wp-php-console'), '<a target="_blank" href="https://chrome.google.com/webstore/detail/php-console/nfhmhhlpfleoednkpnnnkolmclajemef">PHP Console extension for Google Chrome</a>'); ?></li>
+			<li><?php _e('Set a password for the eval terminal in the options below and hit <code>save changes</code>.', 'wp-php-console'); ?></li>
+			<li><?php _e('Reload any page of your installation and click on the key icon in your Chrome browser address bar, enter your password and access the terminal.', 'wp-php-console'); ?></li>
+			<li><?php _e('From the eval terminal you can execute any PHP or WordPress specific function, including functions from your plugins and active theme.', 'wp-php-console'); ?></li>
+			<li><?php _e("In your PHP code, you can call PHP Console debug statements like <code>debug(&#36;var, &#36;tag)</code> to display PHP variables in the browser's JavaScript-console (<code>Ctrl Shift J </code>) and optionally filter selected tags through the browser's Remote PHP Eval Terminal screen's Ignore Debug options.", 'wp-php-console'); ?></li>
 		</ol>
 		<?php