Changeset 2149744

Timestamp:

09/02/2019 06:55:20 PM (7 years ago)

Author:

labs64

Message:

Preparing for 0.9.6 release

Location:

pluginpass-pro-plugintheme-licensing/trunk

Files:

• README.txt (modified) (2 diffs)
• constants.php (modified) (1 diff)
• docs/PluginPass-overview.graphml (deleted)
• docs/pluginpass-overview.graphml (added)
• docs/pluginpass-overview.png (added)
• inc/admin/class-pluginpass-table.php (modified) (2 diffs)
• inc/common/class-pluginpass-guard.php (modified) (7 diffs)
• inc/common/traits/class-pluginpass-validatable.php (modified) (2 diffs)
• pluginpass.php (modified) (1 diff)
• screenshot-1.png (modified) (previous)

pluginpass-pro-plugintheme-licensing/trunk/README.txt

@@ -8 +8 @@
 Tested up to: 5.2.2
 Requires PHP: 5.6
-Stable tag: 0.9.5
+Stable tag: 0.9.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -129 +129 @@
 == Changelog ==
 
+= 0.9.6 =
+* TODO
+
 = 0.9.5 =
 * Update: plugin documentation

pluginpass-pro-plugintheme-licensing/trunk/constants.php

@@ -8 +8 @@
 define( __NAMESPACE__ . '\NS', __NAMESPACE__ . '\\' );
 
-define( NS . 'PLUGIN_VERSION', '0.9.5' );
+define( NS . 'PLUGIN_VERSION', '0.9.6' );
 
 define( NS . 'PLUGIN_NAME', 'pluginpass' );

pluginpass-pro-plugintheme-licensing/trunk/inc/admin/class-pluginpass-table.php

@@ -13 +13 @@
 use Exception;
 use DateTime;
+use PluginPass as NS;
 
 /**
@@ -53 +54 @@
             'ajax'     => false,        // If true, the parent class will call the _js_vars() method in the footer
         ) );
+
+        NetLicensingService::getInstance()->curl()->setUserAgent( 'NetLicensing/PHP/' . NS\PLUGIN_NAME . ' ' . PHP_VERSION . '/' . NS\PLUGIN_VERSION . ' (https://netlicensing.io)' . '; ' . $_SERVER['HTTP_USER_AGENT'] );
+
     }
 

pluginpass-pro-plugintheme-licensing/trunk/inc/common/class-pluginpass-guard.php

@@ -4 +4 @@
 
 use NetLicensing\Constants;
+use NetLicensing\NetLicensingService;
 use NetLicensing\Token;
 use NetLicensing\TokenService;
@@ -9 +10 @@
 use PluginPass\Inc\Common\Traits\PluginPass_Plugable;
 use PluginPass\Inc\Common\Traits\PluginPass_Validatable;
+use PluginPass as NS;
 
 class PluginPass_Guard {
@@ -47 +49 @@
             ? $this->create_plugin( $data )
             : $this->update_plugin( $data, [ 'product_number' => $product_number ] );
+
+        NetLicensingService::getInstance()->curl()->setUserAgent( 'NetLicensing/PHP/' . NS\PLUGIN_NAME . ' ' . PHP_VERSION . '/' . NS\PLUGIN_VERSION . ' (https://netlicensing.io)' . '; ' . $_SERVER['HTTP_USER_AGENT'] );
     }
 
@@ -73 +77 @@
      * Validate plugin feature for the current wordpress instance.
      *
-     * @param string $feature The plugin feature to be checked.
+     * @param string $module The plugin module to be checked.
      *
      * @return   boolean The status, whether this feature is available.
@@ -80 +84 @@
      * @access   public
      */
-    public function validate( $feature ) {
+    public function validate( $module ) {
 
         if ( ! $this->has_consent() ) {
@@ -108 +112 @@
         }
 
-        if ( ! $this->plugin->validation_result || ! PluginPass_Dot::has( $this->plugin->validation_result, $feature ) ) {
+        if ( ! $this->plugin->validation_result || ! PluginPass_Dot::has( $this->plugin->validation_result, $module ) ) {
             return false;
         }
 
-        $feature_parsed = explode( '.', $feature );
-        $product_module = reset( $feature_parsed );
+        $module_parsed = explode( '.', $module );
+        $product_module = reset( $module_parsed );
         $licensingModel = PluginPass_Dot::get( $this->plugin->validation_result, "$product_module.licensingModel" );
 
@@ -120 +124 @@
         }
 
-        $feature .= ( $licensingModel === Constants::LICENSING_MODEL_MULTI_FEATURE )
+        $module .= ( $licensingModel === Constants::LICENSING_MODEL_MULTI_FEATURE )
             ? '.0.valid' : '.valid';
 
-        return PluginPass_Dot::get( $this->plugin->validation_result, $feature ) === 'true';
-    }
-
-    /**
-     * Get validation result for feature
-     *
-     * @param null $feature
+        return PluginPass_Dot::get( $this->plugin->validation_result, $module ) === 'true';
+    }
+
+    /**
+     * Get validation result for module
+     *
+     * @param null $module
      *
      * @return mixed
      */
-    public function validation_result( $feature = null ) {
-        if ( ! $feature ) {
+    public function validation_result( $module = null ) {
+        if ( ! $module ) {
             return $this->plugin->validation_result;
         }
 
-        return PluginPass_Dot::get( $this->plugin->validation_result, $feature );
+        return PluginPass_Dot::get( $this->plugin->validation_result, $module );
     }
 

pluginpass-pro-plugintheme-licensing/trunk/inc/common/traits/class-pluginpass-validatable.php

@@ -6 +6 @@
 use NetLicensing\Context;
 use NetLicensing\LicenseeService;
-use NetLicensing\NetLicensingService;
 use NetLicensing\ValidationParameters;
-use PluginPass as NS;
 
 trait PluginPass_Validatable {
@@ -27 +25 @@
         $validation_parameters->setLicenseeName( get_bloginfo( 'name' ) );
 
-
-        NetLicensingService::getInstance()->curl()->setUserAgent( 'NetLicensing/PHP/' . NS\PLUGIN_NAME . ' ' . PHP_VERSION . '/' . NS\PLUGIN_VERSION . ' (https://netlicensing.io)' . '; ' . $_SERVER['HTTP_USER_AGENT'] );
-
         return LicenseeService::validate( $context, self::get_licensee_number(), $validation_parameters );
     }

pluginpass-pro-plugintheme-licensing/trunk/pluginpass.php

@@ -16 +16 @@
  * Plugin URI:        https://github.com/Labs64/PluginPass
  * Description:       WordPress Plugin/Theme Licensing powered by Labs64 NetLicensing
- * Version:           0.9.5
+ * Version:           0.9.6
  * Author:            Labs64
  * Author URI:        https://netlicensing.io