Merge branch 'xwp:develop' into meta-field-display

Author: akirk

.travis.yml

@@ -74,8 +74,6 @@ before_install:
   - docker-compose pull
   - nvm install
   - nvm use
-  # Lock to Composer version 1 for now.
-  - composer self-update --1
 
 install:
   - npm install

classes/class-admin.php

@@ -220,6 +220,12 @@ public function init() {
 		$this->network     = new Network( $this->plugin );
 		$this->live_update = new Live_Update( $this->plugin );
 		$this->export      = new Export( $this->plugin );
+
+		// Check if the host has configured the `REMOTE_ADDR` correctly.
+		$client_ip = $this->plugin->get_client_ip_address();
+		if ( empty( $client_ip ) && $this->is_stream_screen() ) {
+			$this->notice( __( 'Stream plugin can\'t determine a reliable client IP address! Please update the hosting environment to set the $_SERVER[\'REMOTE_ADDR\'] variable or use the wp_stream_client_ip_address filter to specify the verified client IP address!', 'stream' ) );
+		}
 	}
 
 	/**
@@ -541,9 +547,10 @@ public function is_stream_screen() {
 			return true;
 		}
 
-		$screen = get_current_screen();
-		if ( Alerts::POST_TYPE === $screen->post_type ) {
-			return true;
+		if ( is_admin() && function_exists( 'get_current_screen' ) ) {
+			$screen = get_current_screen();
+
+			return ( Alerts::POST_TYPE === $screen->post_type );
 		}
 
 		return false;

classes/class-alert.php

@@ -186,7 +186,7 @@ public function update_meta( $meta_key, $meta_value, $prev_value = '' ) {
 	/**
 	 * Determine the title of the alert.
 	 *
-	 * @todo enhance human readibility
+	 * @todo enhance human readability
 	 * @return string The title of the alert
 	 */
 	public function get_title() {
@@ -207,7 +207,7 @@ public function get_title() {
 	}
 
 	/**
-	 * Retreive current alert type object
+	 * Retrieve current alert type object
 	 *
 	 * @return Alert_Type
 	 */

classes/class-live-update.php

@@ -170,7 +170,7 @@ public function gather_updated_items( $last_time, $args = array() ) {
 	/**
 	 * Handles live updates for Stream Post List
 	 *
-	 * @action heartbeat_recieved
+	 * @action heartbeat_received
 	 *
 	 * @param array $response Response to be sent to heartbeat tick.
 	 * @param array $data     Data from heartbeat send.

classes/class-log.php

@@ -19,14 +19,6 @@ class Log {
 	 */
 	public $plugin;
 
-	/**
-	 * Hold Current visitors IP Address.
-	 *
-	 * @var string
-	 */
-	private $ip_address;
-
-
 	/**
 	 * Previous Stream record ID, used for chaining same-session records
 	 *
@@ -42,12 +34,6 @@ class Log {
 	public function __construct( $plugin ) {
 		$this->plugin = $plugin;
 
-		// Support proxy mode by checking the `X-Forwarded-For` header first.
-		$ip_address = wp_stream_filter_input( INPUT_SERVER, 'HTTP_X_FORWARDED_FOR', FILTER_VALIDATE_IP );
-		$ip_address = $ip_address ? $ip_address : wp_stream_filter_input( INPUT_SERVER, 'REMOTE_ADDR', FILTER_VALIDATE_IP );
-
-		$this->ip_address = $ip_address;
-
 		// Ensure function used in various methods is pre-loaded.
 		if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
 			require_once ABSPATH . '/wp-admin/includes/plugin.php';
@@ -87,9 +73,11 @@ public function log( $connector, $message, $args, $object_id, $context, $action,
 			return false;
 		}
 
+		$ip_address = $this->plugin->get_client_ip_address();
+
 		$user = new \WP_User( $user_id );
 
-		if ( $this->is_record_excluded( $connector, $context, $action, $user ) ) {
+		if ( $this->is_record_excluded( $connector, $context, $action, $user, $ip_address ) ) {
 			return false;
 		}
 
@@ -140,7 +128,7 @@ function ( $var ) {
 			'connector' => (string) $connector,
 			'context'   => (string) $context,
 			'action'    => (string) $action,
-			'ip'        => (string) $this->ip_address,
+			'ip'        => (string) $ip_address,
 			'meta'      => (array) $stream_meta,
 		);
 
@@ -174,12 +162,6 @@ public function is_record_excluded( $connector, $context, $action, $user = null,
 			$user = wp_get_current_user();
 		}
 
-		if ( is_null( $ip ) ) {
-			$ip = $this->ip_address;
-		} else {
-			$ip = wp_stream_filter_var( $ip, FILTER_VALIDATE_IP );
-		}
-
 		if ( ! empty( $user->roles ) ) {
 			$roles = array_values( $user->roles );
 			$role  = $roles[0];

classes/class-network.php

@@ -351,13 +351,13 @@ public function get_settings_translations( $labels ) {
 	 * Wrapper for the settings API to work on the network settings page
 	 */
 	public function network_options_action() {
-		$allowed_referers = array(
+		$allowed_referrers = array(
 			$this->network_settings_page_slug,
 			$this->default_settings_page_slug,
 		);
 
 		// @codingStandardsIgnoreLine
-		if ( ! isset( $_GET['action'] ) || ! in_array( $_GET['action'], $allowed_referers, true ) ) {
+		if ( ! isset( $_GET['action'] ) || ! in_array( $_GET['action'], $allowed_referrers, true ) ) {
 			return;
 		}
 

classes/class-plugin.php

@@ -18,7 +18,7 @@ class Plugin {
 	 *
 	 * @const string
 	 */
-	const VERSION = '3.10.0';
+	const VERSION = '4.0.0';
 
 	/**
 	 * WP-CLI command
@@ -90,6 +90,13 @@ class Plugin {
 	 */
 	public $locations = array();
 
+	/**
+	 * IP address for the current request to be associated with the log entry.
+	 *
+	 * @var null|false|string Valid IP address, null if not set, false if invalid.
+	 */
+	protected $client_ip_address;
+
 	/**
 	 * Class constructor
 	 */
@@ -138,6 +145,9 @@ public function __construct() {
 		// Load logger class.
 		$this->log = apply_filters( 'wp_stream_log_handler', new Log( $this ) );
 
+		// Set the IP address for the current request.
+		$this->client_ip_address = wp_stream_filter_input( INPUT_SERVER, 'REMOTE_ADDR', FILTER_VALIDATE_IP );
+
 		// Load settings and connectors after widgets_init and before the default init priority.
 		add_action( 'init', array( $this, 'init' ), 9 );
 
@@ -315,4 +325,13 @@ public function is_mustuse() {
 
 		return false;
 	}
+
+	/**
+	 * Get the IP address for the current request.
+	 *
+	 * @return false|null|string Valid IP address, null if not set, false if invalid.
+	 */
+	public function get_client_ip_address() {
+		return apply_filters( 'wp_stream_client_ip_address', $this->client_ip_address );
+	}
 }

connectors/class-connector-posts.php

@@ -110,7 +110,7 @@ public function action_links( $links, $record ) {
 				/* translators: %s: a post type singular name (e.g. "Post") */
 				$links[ sprintf( esc_html_x( 'Restore %s', 'Post type singular name', 'stream' ), $post_type_name ) ] = $untrash;
 				/* translators: %s: a post type singular name (e.g. "Post") */
-				$links[ sprintf( esc_html_x( 'Delete %s Permenantly', 'Post type singular name', 'stream' ), $post_type_name ) ] = $delete;
+				$links[ sprintf( esc_html_x( 'Delete %s Permanently', 'Post type singular name', 'stream' ), $post_type_name ) ] = $delete;
 			} else {
 				/* translators: %s a post type singular name (e.g. "Post") */
 				$links[ sprintf( esc_html_x( 'Edit %s', 'Post type singular name', 'stream' ), $post_type_name ) ] = get_edit_post_link( $post->ID );

connectors/class-connector-settings.php

@@ -459,7 +459,7 @@ public function get_serialized_field_label( $option_name, $field_key ) {
 		/**
 		 * Filter allows for insertion of serialized labels
 		 *
-		 * @param  array  $lables  Serialized labels
+		 * @param  array  $labels  Serialized labels
 		 * @return array  Updated array of serialzed labels
 		 */
 		$labels = apply_filters( 'wp_stream_serialized_labels', $labels );

connectors/class-connector-taxonomies.php

@@ -124,7 +124,7 @@ public function action_links( $links, $record ) {
 	}
 
 	/**
-	 * Catch registration of taxonomies after inital loading, so we can cache its labels
+	 * Catch registration of taxonomies after initial loading, so we can cache its labels
 	 *
 	 * @action registered_taxonomy
 	 *