Merge branch 'develop' into 'master'

Utility methods for supported post types and statuses



See merge request !2

eth-simple-shortlinks.php

@@ -4,7 +4,7 @@ Plugin Name: ETH Simple Shortlinks
 Plugin URI: https://ethitter.com/plugins/
 Description: Simple non-GET shortlinks using post IDs
 Author: Erick Hitter
-Version: 0.3
+Version: 0.4
 Author URI: https://ethitter.com/
 
 This program is free software; you can redistribute it and/or modify
@@ -134,11 +134,11 @@ class ETH_Simple_Shortlinks {
 			return $shortlink;
 		}
 
-		if ( ! in_array( get_post_status( $id ), $this->supported_post_statuses ) ) {
+		if ( ! $this->is_supported_post_status( get_post_status( $id ) ) ) {
 			return $shortlink;
 		}
 
-		if ( ! in_array( get_post_type( $id ), $this->supported_post_types ) ) {
+		if ( ! $this->is_supported_post_type( get_post_type( $id ) ) ) {
 			return $shortlink;
 		}
 
@@ -150,7 +150,7 @@ class ETH_Simple_Shortlinks {
 	 */
 	public function add_admin_header_assets() {
 		global $typenow;
-		if ( ! in_array( $typenow, $this->supported_post_types ) ) {
+		if ( ! $this->is_supported_post_type( $typenow ) ) {
 			return;
 		}
 
@@ -172,7 +172,7 @@ class ETH_Simple_Shortlinks {
 	 * Provide the shortlink in row actions for easy access
 	 */
 	public function filter_row_actions( $actions, $post ) {
-		if ( ! in_array( get_post_type( $post ), $this->supported_post_types ) ) {
+		if ( ! $this->is_supported_post_type( get_post_type( $post ) ) || ! $this->is_supported_post_status( get_post_status( $post ) ) ) {
 			return $actions;
 		}
 
@@ -181,6 +181,20 @@ class ETH_Simple_Shortlinks {
 		return $actions;
 	}
 
+	/**
+	 * Check if given post type is supported
+	 */
+	private function is_supported_post_type( $type ) {
+		return in_array( $type, $this->supported_post_types );
+	}
+
+	/**
+	 * Check if given post status is supported
+	 */
+	private function is_supported_post_status( $status ) {
+		return in_array( $status, $this->supported_post_statuses );
+	}
+
 	/**
 	 * Utility method for building permlink
 	 */