Merge pull request #111 from pluginkollektiv/settingsPage

Introduce settings page and more options

Author: Zodiac1978

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+* Introduced separate settinge page and reduced widget backview to widget settings only
+* Add options to track logged in users, feeds and search requests
+
 ## 1.6.3
 * Fix compatibility issue with some PHP implementations not populating `INPUT_SERVER`
 * Fix failing blacklist check for empty referrers

inc/class-statify-backend.php

@@ -58,7 +58,7 @@ public static function add_meta_link( $input, $file ) {
 	public static function add_action_link( $input ) {
 
 		// Rights?
-		if ( ! current_user_can( 'edit_dashboard' ) ) {
+		if ( ! current_user_can( 'manage_options' ) ) {
 			return $input;
 		}
 
@@ -70,8 +70,8 @@ public static function add_action_link( $input ) {
 					/* @lang  Disable language injection for Url query argument. */
 					'<a href="%s">%s</a>',
 					add_query_arg(
-						array( 'edit' => 'statify_dashboard#statify_dashboard' ),
-						admin_url( '/' )
+						array( 'page' => 'statify-settings' ),
+						admin_url( '/options-general.php' )
 					),
 					esc_html__( 'Settings', 'statify' )
 				),

inc/class-statify-dashboard.php

@@ -42,6 +42,9 @@ public static function init() {
 			return;
 		}
 
+		// Check if user can edit the widget.
+		$can_edit = apply_filters( 'statify__user_can_see_stats', current_user_can( 'edit_dashboard' ) );
+
 		// Load textdomain.
 		load_plugin_textdomain(
 			'statify',
@@ -57,7 +60,7 @@ public static function init() {
 			'statify_dashboard',
 			'Statify',
 			array( __CLASS__, 'print_frontview' ),
-			array( __CLASS__, 'print_backview' )
+			$can_edit ? array( __CLASS__, 'print_backview' ) : null
 		);
 
 		// Init CSS.
@@ -183,7 +186,7 @@ public static function print_backview() {
 		if ( ! empty( $_POST['statify'] ) ) {
 			check_admin_referer( 'statify-dashboard' );
 
-			self::_save_options();
+			self::_save_widget_options();
 		}
 
 		// Load view.
@@ -194,36 +197,35 @@ public static function print_backview() {
 
 
 	/**
-	 * Save plugin options
+	 * Save dashboard widget options.
 	 *
 	 * @since    1.4.0
-	 * @version  2017-01-10
+	 * @sicnce   1.7.0 Renamed to _save_widget_options()
+	 *
+	 * @return void
 	 */
-	private static function _save_options() {
+	private static function _save_widget_options() {
 		// Check the nonce field from the dashboard form.
 		if ( ! check_admin_referer( 'statify-dashboard' ) ) {
 			return;
 		}
 
-		// Get numeric values from POST variables.
-		$options = array();
-		foreach ( array( 'days', 'limit' ) as $option_name ) {
-			$options[ $option_name ] = Statify::$_options[ $option_name ];
-			if ( isset( $_POST['statify'][ $option_name ] ) && (int) $_POST['statify'][ $option_name ] > 0 ) {
-				$options[ $option_name ] = (int) $_POST['statify'][ $option_name ];
-			}
+		// We only do a partial update, so initialize with current values.
+		$options = Statify::$_options;
+
+		// Parse numeric "limit" value.
+		if ( isset( $_POST['statify']['limit'] ) && (int) $_POST['statify']['limit'] > 0 ) {
+			$options['limit'] = (int) $_POST['statify']['limit'];
 		}
-		if ( (int) $options['limit'] > 100 ) {
+		if ( $options['limit'] > 100 ) {
 			$options['limit'] = 100;
 		}
 
-		// Get checkbox values from POST variables.
-		foreach ( array( 'today', 'snippet', 'blacklist' ) as $option_name ) {
-			if ( isset( $_POST['statify'][ $option_name ] ) && 1 === (int) $_POST['statify'][ $option_name ] ) {
-				$options[ $option_name ] = 1;
-			} else {
-				$options[ $option_name ] = 0;
-			}
+		// Parse "today" checkbox.
+		if ( isset( $_POST['statify']['today'] ) && 1 === (int) $_POST['statify']['today'] ) {
+			$options['today'] = 1;
+		} else {
+			$options['today'] = 0;
 		}
 
 		// Update values.

inc/class-statify-frontend.php

@@ -169,10 +169,23 @@ private static function _skip_tracking() {
 			return true;
 		}
 
-		// Skip tracking via Referrer check and Conditional_Tags.
-		return ( self::check_referrer() || is_trackback() || is_robots() || is_user_logged_in()
-			|| self::_is_internal()
-		);
+		// Skip tracking via Referrer check.
+		if ( self::check_referrer() ) {
+			return true;
+		}
+
+		// Skip for trackbacks and robots.
+		if ( is_trackback() || is_robots() ) {
+			return true;
+		}
+
+		// Skip logged in users, if enabled.
+		if ( self::$_options['skip']['logged_in'] && is_user_logged_in() ) {
+			return true;
+		}
+
+		// Skip for "internal" requests.
+		return self::_is_internal();
 	}
 
 	/**
@@ -183,7 +196,18 @@ private static function _skip_tracking() {
 	 * @return   boolean  $skip_hook  TRUE if NO tracking is desired
 	 */
 	private static function _is_internal() {
-		return is_feed() || is_preview() || is_404() || is_search();
+		// Skip for feed access, if enabled.
+		if ( self::$_options['skip']['feed'] && is_feed() ) {
+			return true;
+		}
+
+		// Skip for preview and 404 calls.
+		if ( is_preview() || is_404() ) {
+			return true;
+		}
+
+		// Skip for seach requests, if enabled.
+		return self::$_options['skip']['search'] && is_search();
 	}
 
 	/**