julien731 / WP-Dismissible-Notices-Handler

handler.php

Spacing +87 added lines, -87 removed lines

@@ -20,11 +20,11 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
-if ( ! class_exists( 'Dismissible_Notices_Handler' ) ) {
+if ( ! class_exists('Dismissible_Notices_Handler')) {
 
 	final class Dismissible_Notices_Handler {
 
@@ -72,7 +72,7 @@ 
 		 */
 		public static function instance() {
 
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof Dismissible_Notices_Handler ) ) {
+			if ( ! isset(self::$instance) && ! (self::$instance instanceof Dismissible_Notices_Handler)) {
 				self::$instance = new Dismissible_Notices_Handler;
 				self::$instance->init();
 			}
@@ -90,24 +90,24 @@ 
 		private function init() {
 
 			// Make sure WordPress is compatible
-			if ( ! self::$instance->is_wp_compatible() ) {
-				self::$instance->spit_error( sprintf( 'The library can not be used because your version of WordPress is too old. You need version %s at least.', self::$instance->wordpress_version_required ) );
+			if ( ! self::$instance->is_wp_compatible()) {
+				self::$instance->spit_error(sprintf('The library can not be used because your version of WordPress is too old. You need version %s at least.', self::$instance->wordpress_version_required));
 
 				return;
 			}
 
 			// Make sure PHP is compatible
-			if ( ! self::$instance->is_php_compatible() ) {
-				self::$instance->spit_error( sprintf( 'The library can not be used because your version of PHP is too old. You need version %s at least.', self::$instance->php_version_required ) );
+			if ( ! self::$instance->is_php_compatible()) {
+				self::$instance->spit_error(sprintf('The library can not be used because your version of PHP is too old. You need version %s at least.', self::$instance->php_version_required));
 
 				return;
 			}
 
 			self::$instance->includes();
 
-			add_action( 'admin_notices', array( self::$instance, 'display' ) );
-			add_action( 'admin_print_scripts', array( self::$instance, 'load_script' ) );
-			add_action( 'wp_ajax_dnh_dismiss_notice', array( self::$instance, 'dismiss_notice_ajax' ) );
+			add_action('admin_notices', array(self::$instance, 'display'));
+			add_action('admin_print_scripts', array(self::$instance, 'load_script'));
+			add_action('wp_ajax_dnh_dismiss_notice', array(self::$instance, 'dismiss_notice_ajax'));
 
 		}
 
@@ -119,7 +119,7 @@ 
 		 */
 		private function is_wp_compatible() {
 
-			if ( version_compare( get_bloginfo( 'version' ), self::$instance->wordpress_version_required, '<' ) ) {
+			if (version_compare(get_bloginfo('version'), self::$instance->wordpress_version_required, '<')) {
 				return false;
 			}
 
@@ -135,7 +135,7 @@ 
 		 */
 		private function is_php_compatible() {
 
-			if ( version_compare( phpversion(), self::$instance->php_version_required, '<' ) ) {
+			if (version_compare(phpversion(), self::$instance->php_version_required, '<')) {
 				return false;
 			}
 
@@ -150,7 +150,7 @@ 
 		 * @return void
 		 */
 		private function includes() {
-			require( trailingslashit( plugin_dir_path( __FILE__ ) ) . 'includes/helper-functions.php' );
+			require(trailingslashit(plugin_dir_path(__FILE__)).'includes/helper-functions.php');
 		}
 
 		/**
@@ -160,8 +160,8 @@ 
 		 * @return void
 		 */
 		public function load_script() {
-			wp_register_script( 'dnh', trailingslashit( plugin_dir_url( __FILE__ ) ) . 'assets/js/main.js', array( 'jquery' ), self::$instance->version, true );
-			wp_enqueue_script( 'dnh' );
+			wp_register_script('dnh', trailingslashit(plugin_dir_url(__FILE__)).'assets/js/main.js', array('jquery'), self::$instance->version, true);
+			wp_enqueue_script('dnh');
 		}
 
 		/**
@@ -172,21 +172,21 @@ 
 		 */
 		public function display() {
 
-			if ( is_null( self::$instance->notices ) || empty( self::$instance->notices ) ) {
+			if (is_null(self::$instance->notices) || empty(self::$instance->notices)) {
 				return;
 			}
 
-			foreach ( self::$instance->notices as $id => $notice ) {
+			foreach (self::$instance->notices as $id => $notice) {
 
-				$id = self::$instance->get_id( $id );
+				$id = self::$instance->get_id($id);
 
 				// Check if the notice was dismissed
-				if ( self::$instance->is_dismissed( $id ) ) {
+				if (self::$instance->is_dismissed($id)) {
 					continue;
 				}
 
 				// Check if the current user has required capability
-				if ( ! empty( $notice['cap'] ) && ! current_user_can( $notice['cap'] ) ) {
+				if ( ! empty($notice['cap']) && ! current_user_can($notice['cap'])) {
 					continue;
 				}
 
@@ -197,7 +197,7 @@ 
 					$notice['class'],
 				);
 
-				printf( '<div id="%3$s" class="%1$s"><p>%2$s</p></div>', trim( implode( ' ', $class ) ), $notice['content'], "dnh-$id" );
+				printf('<div id="%3$s" class="%1$s"><p>%2$s</p></div>', trim(implode(' ', $class)), $notice['content'], "dnh-$id");
 
 			}
 
@@ -212,8 +212,8 @@ 
 		 *
 		 * @return void
 		 */
-		protected function spit_error( $error ) {
-			printf( '<div style="margin: 20px; text-align: center;"><strong>%1$s</strong> %2$s</pre></div>', 'Dismissible Notices Handler Error:', wp_kses_post( $error ) );
+		protected function spit_error($error) {
+			printf('<div style="margin: 20px; text-align: center;"><strong>%1$s</strong> %2$s</pre></div>', 'Dismissible Notices Handler Error:', wp_kses_post($error));
 		}
 
 		/**
@@ -225,8 +225,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_id( $id ) {
-			return sanitize_key( $id );
+		public function get_id($id) {
+			return sanitize_key($id);
 		}
 
 		/**
@@ -242,7 +242,7 @@ 
 				'updated',
 			);
 
-			return apply_filters( 'dnh_notice_types', $types );
+			return apply_filters('dnh_notice_types', $types);
 
 		}
 
@@ -261,7 +261,7 @@ 
 				'class'  => '', // Additional class to add to the notice
 			);
 
-			return apply_filters( 'dnh_default_args', $args );
+			return apply_filters('dnh_default_args', $args);
 
 		}
 
@@ -277,20 +277,20 @@ 
 		 *
 		 * @return bool
 		 */
-		public function register_notice( $id, $type, $content, $args = array() ) {
+		public function register_notice($id, $type, $content, $args = array()) {
 
-			if ( is_null( self::$instance->notices ) ) {
+			if (is_null(self::$instance->notices)) {
 				self::$instance->notices = array();
 			}
 
-			$id      = self::$instance->get_id( $id );
-			$type    = in_array( $t = sanitize_text_field( $type ), self::$instance->get_types() ) ? $t : 'updated';
-			$content = wp_kses_post( $content );
-			$args    = wp_parse_args( $args, self::$instance->default_args() );
+			$id      = self::$instance->get_id($id);
+			$type    = in_array($t = sanitize_text_field($type), self::$instance->get_types()) ? $t : 'updated';
+			$content = wp_kses_post($content);
+			$args    = wp_parse_args($args, self::$instance->default_args());
 
-			if ( array_key_exists( $id, self::$instance->notices ) ) {
+			if (array_key_exists($id, self::$instance->notices)) {
 
-				self::$instance->spit_error( sprintf( 'A notice with the ID %s has already been registered.', "<code>$id</code>" ) );
+				self::$instance->spit_error(sprintf('A notice with the ID %s has already been registered.', "<code>$id</code>"));
 
 				return false;
 			}
@@ -300,9 +300,9 @@ 
 				'content' => $content,
 			);
 
-			$notice = array_merge( $notice, $args );
+			$notice = array_merge($notice, $args);
 
-			self::$instance->notices[ $id ] = $notice;
+			self::$instance->notices[$id] = $notice;
 
 			return true;
 
@@ -316,19 +316,19 @@ 
 		 */
 		public function dismiss_notice_ajax() {
 
-			if ( ! isset( $_POST['id'] ) ) {
+			if ( ! isset($_POST['id'])) {
 				echo 0;
 				exit;
 			}
 
-			if ( empty( $_POST['id'] ) || false === strpos( $_POST['id'], 'dnh-' ) ) {
+			if (empty($_POST['id']) || false === strpos($_POST['id'], 'dnh-')) {
 				echo 0;
 				exit;
 			}
 
-			$id = self::$instance->get_id( str_replace( 'dnh-', '', $_POST['id'] ) );
+			$id = self::$instance->get_id(str_replace('dnh-', '', $_POST['id']));
 
-			echo self::$instance->dismiss_notice( $id );
+			echo self::$instance->dismiss_notice($id);
 			exit;
 
 		}
@@ -342,19 +342,19 @@ 
 		 *
 		 * @return bool
 		 */
-		public function dismiss_notice( $id ) {
+		public function dismiss_notice($id) {
 
-			$notice = self::$instance->get_notice( self::$instance->get_id( $id ) );
+			$notice = self::$instance->get_notice(self::$instance->get_id($id));
 
-			if ( false === $notice ) {
+			if (false === $notice) {
 				return false;
 			}
 
-			if ( self::$instance->is_dismissed( $id ) ) {
+			if (self::$instance->is_dismissed($id)) {
 				return false;
 			}
 
-			return 'user' === $notice['scope'] ? self::$instance->dismiss_user( $id ) : self::$instance->dismiss_global( $id );
+			return 'user' === $notice['scope'] ? self::$instance->dismiss_user($id) : self::$instance->dismiss_global($id);
 
 		}
 
@@ -367,17 +367,17 @@ 
 		 *
 		 * @return int|bool
 		 */
-		private function dismiss_user( $id ) {
+		private function dismiss_user($id) {
 
 			$dismissed = self::$instance->dismissed_user();
 
-			if ( in_array( $id, $dismissed ) ) {
+			if (in_array($id, $dismissed)) {
 				return false;
 			}
 
-			array_push( $dismissed, $id );
+			array_push($dismissed, $id);
 
-			return update_user_meta( get_current_user_id(), 'dnh_dismissed_notices', $dismissed );
+			return update_user_meta(get_current_user_id(), 'dnh_dismissed_notices', $dismissed);
 
 		}
 
@@ -390,17 +390,17 @@ 
 		 *
 		 * @return bool
 		 */
-		private function dismiss_global( $id ) {
+		private function dismiss_global($id) {
 
 			$dismissed = self::$instance->dismissed_global();
 
-			if ( in_array( $id, $dismissed ) ) {
+			if (in_array($id, $dismissed)) {
 				return false;
 			}
 
-			array_push( $dismissed, $id );
+			array_push($dismissed, $id);
 
-			return update_option( 'dnh_dismissed_notices', $dismissed );
+			return update_option('dnh_dismissed_notices', $dismissed);
 
 		}
 
@@ -413,16 +413,16 @@ 
 		 *
 		 * @return bool
 		 */
-		public function restore_notice( $id ) {
+		public function restore_notice($id) {
 
-			$id     = self::$instance->get_id( $id );
-			$notice = self::$instance->get_notice( $id );
+			$id     = self::$instance->get_id($id);
+			$notice = self::$instance->get_notice($id);
 
-			if ( false === $notice ) {
+			if (false === $notice) {
 				return false;
 			}
 
-			return 'user' === $notice['scope'] ? self::$instance->restore_user( $id ) : self::$instance->restore_global( $id );
+			return 'user' === $notice['scope'] ? self::$instance->restore_user($id) : self::$instance->restore_global($id);
 
 		}
 
@@ -435,27 +435,27 @@ 
 		 *
 		 * @return bool
 		 */
-		private function restore_user( $id ) {
+		private function restore_user($id) {
 
-			$id     = self::$instance->get_id( $id );
-			$notice = self::$instance->get_notice( $id );
+			$id     = self::$instance->get_id($id);
+			$notice = self::$instance->get_notice($id);
 
-			if ( false === $notice ) {
+			if (false === $notice) {
 				return false;
 			}
 
 			$dismissed = self::$instance->dismissed_user();
 
-			if ( ! in_array( $id, $dismissed ) ) {
+			if ( ! in_array($id, $dismissed)) {
 				return false;
 			}
 
-			$flip = array_flip( $dismissed );
-			$key  = $flip[ $id ];
+			$flip = array_flip($dismissed);
+			$key  = $flip[$id];
 
-			unset( $dismissed[ $key ] );
+			unset($dismissed[$key]);
 
-			return update_user_meta( get_current_user_id(), 'dnh_dismissed_notices', $dismissed );
+			return update_user_meta(get_current_user_id(), 'dnh_dismissed_notices', $dismissed);
 
 		}
 
@@ -468,27 +468,27 @@ 
 		 *
 		 * @return bool
 		 */
-		private function restore_global( $id ) {
+		private function restore_global($id) {
 
-			$id     = self::$instance->get_id( $id );
-			$notice = self::$instance->get_notice( $id );
+			$id     = self::$instance->get_id($id);
+			$notice = self::$instance->get_notice($id);
 
-			if ( false === $notice ) {
+			if (false === $notice) {
 				return false;
 			}
 
 			$dismissed = self::$instance->dismissed_global();
 
-			if ( ! in_array( $id, $dismissed ) ) {
+			if ( ! in_array($id, $dismissed)) {
 				return false;
 			}
 
-			$flip = array_flip( $dismissed );
-			$key  = $flip[ $id ];
+			$flip = array_flip($dismissed);
+			$key  = $flip[$id];
 
-			unset( $dismissed[ $key ] );
+			unset($dismissed[$key]);
 
-			return update_option( 'dnh_dismissed_notices', $dismissed );
+			return update_option('dnh_dismissed_notices', $dismissed);
 
 		}
 
@@ -505,7 +505,7 @@ 
 			$user   = self::$instance->dismissed_user();
 			$global = self::$instance->dismissed_global();
 
-			return array_merge( $user, $global );
+			return array_merge($user, $global);
 
 		}
 
@@ -517,9 +517,9 @@ 
 		 */
 		private function dismissed_user() {
 
-			$dismissed = get_user_meta( get_current_user_id(), 'dnh_dismissed_notices', true );
+			$dismissed = get_user_meta(get_current_user_id(), 'dnh_dismissed_notices', true);
 
-			if ( '' === $dismissed ) {
+			if ('' === $dismissed) {
 				$dismissed = array();
 			}
 
@@ -534,7 +534,7 @@ 
 		 * @return array
 		 */
 		private function dismissed_global() {
-			return get_option( 'dnh_dismissed_notices', array() );
+			return get_option('dnh_dismissed_notices', array());
 		}
 
 		/**
@@ -546,11 +546,11 @@ 
 		 *
 		 * @return bool
 		 */
-		public function is_dismissed( $id ) {
+		public function is_dismissed($id) {
 
 			$dismissed = self::$instance->dismissed_notices();
 
-			if ( ! in_array( self::$instance->get_id( $id ), $dismissed ) ) {
+			if ( ! in_array(self::$instance->get_id($id), $dismissed)) {
 				return false;
 			}
 
@@ -577,15 +577,15 @@ 
 		 *
 		 * @return array|false
 		 */
-		public function get_notice( $id ) {
+		public function get_notice($id) {
 
-			$id = self::$instance->get_id( $id );
+			$id = self::$instance->get_id($id);
 
-			if ( ! is_array( self::$instance->notices ) || ! array_key_exists( $id, self::$instance->notices ) ) {
+			if ( ! is_array(self::$instance->notices) || ! array_key_exists($id, self::$instance->notices)) {
 				return false;
 			}
 
-			return self::$instance->notices[ $id ];
+			return self::$instance->notices[$id];
 
 		}
 

includes/helper-functions.php

Spacing +10 added lines, -10 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
@@ -34,13 +34,13 @@ 
  *
  * @return bool
  */
-function dnh_register_notice( $id, $type, $content, $args = array() ) {
+function dnh_register_notice($id, $type, $content, $args = array()) {
 
-	if ( ! function_exists( 'DNH' ) ) {
+	if ( ! function_exists('DNH')) {
 		return false;
 	}
 
-	return DNH()->register_notice( $id, $type, $content, $args );
+	return DNH()->register_notice($id, $type, $content, $args);
 
 }
 
@@ -53,13 +53,13 @@ 
  *
  * @return bool
  */
-function dnh_restore_notice( $id ) {
+function dnh_restore_notice($id) {
 
-	if ( ! function_exists( 'DNH' ) ) {
+	if ( ! function_exists('DNH')) {
 		return false;
 	}
 
-	return DNH()->restore_notice( $id );
+	return DNH()->restore_notice($id);
 
 }
 
@@ -72,12 +72,12 @@ 
  *
  * @return bool
  */
-function dnh_is_dismissed( $id ) {
+function dnh_is_dismissed($id) {
 
-	if ( ! function_exists( 'DNH' ) ) {
+	if ( ! function_exists('DNH')) {
 		return false;
 	}
 
-	return DNH()->is_dismissed( $id );
+	return DNH()->is_dismissed($id);
 
 }
\ No newline at end of file