Merge latest master into our fork

admin/class-addon.php

@@ -0,0 +1,173 @@
+<?php
+/**
+ * Class for handling an add-on object.
+ *
+ * @package    Members
+ * @subpackage Admin
+ * @author     Justin Tadlock <justintadlock@gmail.com>
+ * @copyright  Copyright (c) 2009 - 2018, Justin Tadlock
+ * @link       https://themehybrid.com/plugins/members
+ * @license    http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ */
+
+namespace Members;
+
+/**
+ * Add-on object class.
+ *
+ * @since  2.0.0
+ * @access public
+ */
+final class Addon {
+
+	/**
+	 * Name/ID for the addon.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $name = '';
+
+	/**
+	 * Title of the add-on.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $title = '';
+
+	/**
+	 * Short description of the add-on.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $excerpt = '';
+
+	/**
+	 * URL where the add-on can be found.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $url = 'https://themehybrid.com/plugins/members';
+
+	/**
+	 * Add-on ZIP file URL.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $download_url = '';
+
+	/**
+	 * Alternate purchase URL.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $purchase_url = '';
+
+	/**
+	 * URL for a 128x128 (size used by WordPress.org) icon image.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $icon_url = '';
+
+	/**
+	 * Add-on plugin's author URL.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $author_url = '';
+
+	/**
+	 * Add-on plugin's author display name.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $author_name = '';
+
+	/**
+	 * Rating for the add-on.  This is the total rating based on a 5-star rating system.
+	 * It will be divided by the rating count, so both must be supplied.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    int
+	 */
+	public $rating = '';
+
+	/**
+	 * Number of ratings.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    int
+	 */
+	public $rating_count = 0;
+
+	/**
+	 * Number of active installs.  Note that this will be displayed with a `+` at
+	 * the end, such as `100,000+`.  Exact counts are necessary.  Just a round number.
+	 *
+	 * @since  2.0.0
+	 * @access protected
+	 * @var    string
+	 */
+	public $install_count = 0;
+
+	/**
+	 * Magic method to use in case someone tries to output the object as a string.
+	 * We'll just return the name.
+	 *
+	 * @since  2.0.0
+	 * @access public
+	 * @return string
+	 */
+	public function __toString() {
+		return $this->name;
+	}
+
+	/**
+	 * Register a new object.
+	 *
+	 * @since  2.0.0
+	 * @access public
+	 * @param  string  $name
+	 * @param  array   $args  {
+	 *     @type string  $label        Internationalized text label.
+	 *     @type string  $icon         Dashicon icon in the form of `dashicons-icon-name`.
+	 *     @type array   $caps         Array of capabilities in the addon.
+	 *     @type bool    $merge_added  Whether to merge this caps into the added caps array.
+	 *     @type bool    $diff_added   Whether to remove previously-added caps from this addon.
+	 * }
+	 * @return void
+	 */
+	public function __construct( $name, $args = array() ) {
+
+		foreach ( array_keys( get_object_vars( $this ) ) as $key ) {
+
+			if ( isset( $args[ $key ] ) )
+				$this->$key = $args[ $key ];
+		}
+
+		$this->name = sanitize_key( $name );
+
+		if ( ! $this->icon_url )
+			$this->icon_url = members_plugin()->uri . 'img/icon-addon.png';
+	}
+}

admin/class-cap-control.php

@@ -4,25 +4,27 @@
  *
  * @package    Members
  * @subpackage Admin
- * @author     Justin Tadlock <justin@justintadlock.com>
- * @copyright  Copyright (c) 2009 - 2016, Justin Tadlock
- * @link       http://themehybrid.com/plugins/members
+ * @author     Justin Tadlock <justintadlock@gmail.com>
+ * @copyright  Copyright (c) 2009 - 2018, Justin Tadlock
+ * @link       https://themehybrid.com/plugins/members
  * @license    http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  */
 
+namespace Members\Admin;
+
 /**
  * Cap control class.
  *
- * @since  1.0.0
+ * @since  2.0.0
  * @access public
  */
-final class Members_Cap_Control {
+final class Cap_Control {
 
 	/**
 	 * Stores the cap tabs object.
 	 *
 	 * @see    Members_Cap_Tabs
-	 * @since  1.0.0
+	 * @since  2.0.0
 	 * @access public
 	 * @var    object
 	 */
@@ -31,7 +33,7 @@ final class Members_Cap_Control {
 	/**
 	 * Name of the capability the control is for.
 	 *
-	 * @since  1.0.0
+	 * @since  2.0.0
 	 * @access public
 	 * @var    string
 	 */
@@ -40,7 +42,7 @@ final class Members_Cap_Control {
 	/**
 	 * ID of the section the control is for.
 	 *
-	 * @since  1.0.0
+	 * @since  2.0.0
 	 * @access public
 	 * @var    string
 	 */
@@ -49,7 +51,7 @@ final class Members_Cap_Control {
 	/**
 	 * Array of data to pass as a json object to the Underscore template.
 	 *
-	 * @since  1.0.0
+	 * @since  2.0.0
 	 * @access public
 	 * @var    array
 	 */
@@ -58,7 +60,7 @@ final class Members_Cap_Control {
 	/**
 	 * Creates a new control object.
 	 *
-	 * @since  1.0.0
+	 * @since  2.0.0
 	 * @access public
 	 * @param  object  $manager
 	 * @param  string  $cap
@@ -80,7 +82,7 @@ public function __construct( $manager, $cap, $args = array() ) {
 	/**
 	 * Returns the json array.
 	 *
-	 * @since  1.0.0
+	 * @since  2.0.0
 	 * @access public
 	 * @return array
 	 */
@@ -92,7 +94,7 @@ public function json() {
 	/**
 	 * Adds custom data to the json array. This data is passed to the Underscore template.
 	 *
-	 * @since  1.0.0
+	 * @since  2.0.0
 	 * @access public
 	 * @return void
 	 */
@@ -112,6 +114,7 @@ public function to_json() {
 
 		// Set up the input labels.
 		$this->json['label'] = array(
+			'cap'   => members_show_human_caps() && members_cap_exists( $this->cap ) ? members_get_cap( $this->cap )->label : $this->cap,
 			'grant' => sprintf( esc_html__( 'Grant %s capability', 'members' ), "<code>{$this->cap}</code>" ),
 			'deny'  => sprintf( esc_html__( 'Deny %s capability',  'members' ), "<code>{$this->cap}</code>" )
 		);