Merge branch 'release/4.6.1'

Author: paulgoodchild

icwp-wpsf.php

@@ -3,7 +3,7 @@
  * Plugin Name: WordPress Simple Security Firewall
  * Plugin URI: http://icwp.io/2f
  * Description: Easy-To-Use WordPress Security System
- * Version: 4.6.0
+ * Version: 4.6.1
  * Text Domain: wp-simple-firewall
  * Author: iControlWP
  * Author URI: http://icwp.io/2e

languages/wp-simple-firewall-cs_CZ.mo

@@ -1,7 +1,7 @@
 <?php
 return "---
 properties:
-  version: '4.6.0'
+  version: '4.6.1'
   slug_parent: 'icwp'
   slug_plugin: 'wpsf'
   human_name: 'WordPress Simple Firewall'

languages/wp-simple-firewall-es_ES.mo

@@ -4,9 +4,9 @@ Donate link: http://icwp.io/q
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl.html
 Tags: security, firewall, audit trail, ithemes, better wp security, ddos, brute force, whitelist, blacklist, two-factor authentication, GASP, spam, automatic updates, lockdown, login, hack
-Requires at least: 3.2.0
+Requires at least: 3.5.0
 Tested up to: 4.2
-Stable tag: 4.6.0
+Stable tag: 4.6.1
 
 Complete and Easy-To-Use WordPress Security. Unrestricted Access. No Premium Features.
 
@@ -257,6 +257,9 @@ You can either manually upgrade, or WordPress will handle it in due course.
 = 4.6 Series =
 *Released: 10th April, 2015*
 
+* **(v.1)**  FIX:       XMLRPC compatibility logic was preventing other non-XMLRPC related code from running.
+* **(v.1)**  UPDATED:   Plugin Badge styling
+* **(v.1)**  UPDATED:   Updated Czech(41%) and Spanish (60%) translations
 * **(v.0)**  ADDED:     New feature that displays the last login time for all users on the users listing page (User Management feature must be enabled).
 * **(v.0)**  ADDED:     **Completely optional** promotional Plugin Badge option - help us promote the plugin and reassure your site visitors at the same time. [Learn More](http://icwp.io/5x)
 * **(v.0)**  UPDATED:   Updated Czech(38%) translations

languages/wp-simple-firewall-fi.mo

@@ -32,25 +32,33 @@ class ICWP_WPSF_Processor_UserManagement_V4 extends ICWP_WPSF_Processor_Base {
 	public function run() {
 		$oWp = $this->loadWpFunctionsProcessor();
 
+		// Adds last login indicator column to all plugins in plugin listing.
+		add_filter( 'manage_users_columns', array( $this, 'fAddUserListLastLoginColumn') );
+		add_filter( 'wpmu_users_columns', array( $this, 'fAddUserListLastLoginColumn') );
+
+		// Handles login notification emails and setting last user login
+		add_action( 'wp_login', array( $this, 'onWpLogin' ) );
+
 		// XML-RPC Compatibility
 		if ( $oWp->getIsXmlrpc() && $this->getIsOption( 'enable_xmlrpc_compatibility', 'Y' ) ) {
 			return true;
 		}
 
+		/** Everything from this point on must consider XMLRPC compatibility **/
+
 		if ( $this->getIsOption( 'enable_user_management', 'Y' ) ) {
 			$this->getProcessorSessions()->run();
 		}
 
-		// Adds automatic update indicator column to all plugins in plugin listing.
-		add_filter( 'manage_users_columns', array( $this, 'fAddUserListLastLoginColumn') );
-		add_filter( 'wpmu_users_columns', array( $this, 'fAddUserListLastLoginColumn') );
-
-		// Handles login notification emails and setting last user login
-		add_action( 'wp_login', array( $this, 'onWpLogin' ) );
-
 		return true;
 	}
 
+	/**
+	 * Hooked to action wp_login
+	 *
+	 * @param $sUsername
+	 * @return bool
+	 */
 	public function onWpLogin( $sUsername ) {
 		$oUser = $this->loadWpFunctionsProcessor()->getUserByUsername( $sUsername );
 		if ( !( $oUser instanceof WP_User ) ) {
@@ -114,7 +122,7 @@ public function aPrintUsersListLastLoginColumnContent( $sContent, $sColumnName,
 	 * @param WP_User $oUser
 	 * @return bool
 	 */
-	public function sendLoginEmailNotification( $oUser ) {
+	protected function sendLoginEmailNotification( $oUser ) {
 		if ( !( $oUser instanceof WP_User ) ) {
 			return false;
 		}

plugin-spec.php

@@ -3,50 +3,56 @@
 		background-color: rgba(255, 255, 255, 0.9);
 		border-radius: 3px 3px 0 0;
 		bottom: 0;
+		box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.47);
 		color: #000000;
+		height: 33px;
 		left: 20px;
 		padding: 7px 7px 4px;
 		position: fixed;
+		text-align: left;
 		width: 189px;
 		z-index: 100;
 	}
 	#icwpWpsfSiteBadge a {
+		border: 0 none;
 		color: inherit !important;
 		display: block;
 	}
+	#icwpWpsfSiteBadge a:hover {
+		text-decoration: none;
+	}
 	#icwpWpsfSiteBadge .badge-text {
-		font-size: 11px;
+		font-size: 10px;
 		line-height: 17px;
 		padding-left: 43px;
 	}
-	#icwpWpsfSiteBadge a:hover {
-		text-decoration: none;
-	}
 	#icwpWpsfSiteBadge img {
 		float: left;
 	}
 	#icwpWpsfCloseButton {
 		background-color: #ffffff;
 		border: 1px solid #aaaaaa;
 		border-radius: 5px;
-		box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.11);
+		1px 2px 4px rgba(0, 0, 0, 0.30);
 		color: #666666;
 		font-size: 9px;
-		height: 13px;
+		height: 10px;
 		left: -5px;
-		line-height: 2px;
+		line-height: 6px;
 		padding: 3px;
 		position: absolute;
+		text-align: center;
 		top: -5px;
-		width: 13px;
+		width: 10px;
+		z-index: 1001;
 	}
 	#icwpWpsfCloseButton:hover {
 		cursor: pointer;
 	}
 </style>
 <div id="icwpWpsfSiteBadge">
 	<a id="icwpWpsfCloseButton" onclick="getElementById('icwpWpsfSiteBadge').remove();">x</a>
-	<a href="http://icwp.io/wpsecurityfirewall" target="_blank" alt="WordPress Simple Security Firewall">
-		<img src="%s" /> <div class="badge-text">Site Protected By The Simple Security Firewall &rarr;</div>
+	<a href="http://icwp.io/wpsecurityfirewall" target="_blank" title="WordPress Security Firewall">
+		<img src="%s" alt="WordPress Security Firewall Logo"/> <div class="badge-text">This Site Is Protected By <span style="font-style: italic;">The</span><br/>WordPress Security Firewall &rarr;</div>
 	</a>
 </div>