- add dp_ prefix to the shared functions

Labs64 · Aug 16, 2014 · 35a1b9e · 35a1b9e
1 parent 95af302
commit 35a1b9e
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 43 deletions.
diff --git a/digipass-class.php b/digipass-class.php
@@ -140,15 +140,15 @@ private static function get_blog_ids()
      */
     private static function single_activate()
     {
-        // TODO: Define activation functionality here
+        // Activation functionality
     }
 
     /**
      * Fired for each blog when the plugin is deactivated.
      */
     private static function single_deactivate()
     {
-        // TODO: Define deactivation functionality here
+        // Deactivation functionality
     }
 
     /**

diff --git a/options.php b/options.php
@@ -11,7 +11,7 @@
 
 
 define('DP_OPTIONS', 'DP_OPTIONS');
-define('API_KEY', '31c7bc4e-90ff-44fb-9f07-b88eb06ed9dc');
+define('DP_API_KEY', '31c7bc4e-90ff-44fb-9f07-b88eb06ed9dc');
 
 
 if (is_admin()) {
@@ -186,7 +186,7 @@ function dp_page_init()
     register_setting(
         'DP_OPTIONS_GROUP', // Option group
         DP_OPTIONS, // Option name
-        'dp_sanitize' // dp_sanitize
+        'dp_sanitize' // Sanitize
     );
 
     add_settings_section(
@@ -216,7 +216,7 @@ function dp_page_init()
  */
 function dp_sanitize($input)
 {
-    $input['dp_netlicensing_apikey'] = dp_sanitize_text_field($input['dp_netlicensing_apikey']);
+    $input['dp_netlicensing_apikey'] = sanitize_text_field($input['dp_netlicensing_apikey']);
 
     return $input;
 }

diff --git a/php/curl/curl.php b/php/curl/curl.php
@@ -8,6 +8,8 @@
  * @package curl
  * @author Sean Huber <[email protected]>
 **/
+if (!class_exists('Curl')) {
+
 class Curl {
 
     /**
@@ -253,4 +255,6 @@ protected function set_request_options($url, $vars) {
         }
     }
 
-}
+}
+
+}
diff --git a/php/curl/curl_response.php b/php/curl/curl_response.php
@@ -7,6 +7,8 @@
  * @package curl
  * @author Sean Huber <[email protected]>
 **/
+if (!class_exists('CurlResponse')) {
+
 class CurlResponse {
 
     /**
@@ -75,4 +77,6 @@ function __toString() {
         return $this->body;
     }
 
-}
+}
+
+}
diff --git a/php/netlicensing/netlicensing.php b/php/netlicensing/netlicensing.php
@@ -6,50 +6,54 @@
  * @package netlicensing
  * @author Labs64 <[email protected]>
  **/
-class NetLicensing
-{
+if (!class_exists('NetLicensing')) {
 
-    const NLIC_BASE_URL = 'https://netlicensing.labs64.com/core/v2/rest';
+    class NetLicensing
+    {
 
-    private $curl = null;
+        const NLIC_BASE_URL = 'https://netlicensing.labs64.com/core/v2/rest';
 
-    /**
-     * Initializes a NetLicensing object
-     **/
-    function __construct($apiKey)
-    {
-        $user_agent = 'NetLicensing/PHP ' . PHP_VERSION . ' (http://netlicensing.labs64.com)' . '; ' . $_SERVER['HTTP_USER_AGENT'];
+        private $curl = null;
 
-        $this->curl = new Curl();
-        $this->curl->headers['Authorization'] = 'Basic ' . base64_encode("apiKey:" . $apiKey);
-        $this->curl->headers['Accept'] = 'application/json';
-        $this->curl->user_agent = $user_agent;
-    }
+        /**
+         * Initializes a NetLicensing object
+         **/
+        function __construct($apiKey)
+        {
+            $user_agent = 'NetLicensing/PHP ' . PHP_VERSION . ' (http://netlicensing.labs64.com)' . '; ' . $_SERVER['HTTP_USER_AGENT'];
 
-    /**
-     * Validates active licenses of the licensee
-     *
-     * Returns a object containing licensee validation result
-     *
-     * @param string $productNumber
-     * @param string $licenseeNumber
-     * @param string $licenseeName
-     * @return licensee validation result
-     **/
-    function validate($productNumber, $licenseeNumber, $licenseeName = '')
-    {
-        if (empty($licenseeName)) {
-            $licenseeName = $licenseeNumber;
+            $this->curl = new Curl();
+            $this->curl->headers['Authorization'] = 'Basic ' . base64_encode("apiKey:" . $apiKey);
+            $this->curl->headers['Accept'] = 'application/json';
+            $this->curl->user_agent = $user_agent;
         }
-        $params = array(
-            'productNumber' => $productNumber,
-            'name' => $licenseeName,
-        );
-        $url = self::NLIC_BASE_URL . '/licensee/' . $licenseeNumber . '/validate';
 
-        $response = $this->curl->get($url, $params);
+        /**
+         * Validates active licenses of the licensee
+         *
+         * Returns a object containing licensee validation result
+         *
+         * @param string $productNumber
+         * @param string $licenseeNumber
+         * @param string $licenseeName
+         * @return licensee validation result
+         **/
+        function validate($productNumber, $licenseeNumber, $licenseeName = '')
+        {
+            if (empty($licenseeName)) {
+                $licenseeName = $licenseeNumber;
+            }
+            $params = array(
+                'productNumber' => $productNumber,
+                'name' => $licenseeName,
+            );
+            $url = self::NLIC_BASE_URL . '/licensee/' . $licenseeNumber . '/validate';
+
+            $response = $this->curl->get($url, $params);
+
+            return $response->body;
+        }
 
-        return $response->body;
     }
 
 }