Merge pull request #4 from udx/develop-alexey

v1.2.2 Remove dependancy from udx/lib-utility package

Author: balexey88

changes.md

@@ -0,0 +1,3 @@
+### 1.2.2
+
+* Remove dependency from `udx/lib-utility`.

gruntfile.js

@@ -2,7 +2,7 @@
  * Build Plugin.
  *
  * @author potanin@UD
- * @version 1.2.1
+ * @version 1.2.2
  * @param grunt
  */
 module.exports = function( grunt ) {

lib/classes/class-admin.php

@@ -283,7 +283,7 @@ public function process_request () {
           $status = 'true';
         }
 
-        $redirect_url = \UsabilityDynamics\Utility::current_url( array( 'type' => urlencode( $type ), 'status' => urlencode( $status ) ), array( 'action', 'filepath', '_wpnonce' ) );
+        $redirect_url = Utility::current_url( array( 'type' => urlencode( $type ), 'status' => urlencode( $status ) ), array( 'action', 'filepath', '_wpnonce' ) );
         wp_safe_redirect( $redirect_url );
         exit;
       }

lib/classes/class-bootstrap.php

@@ -18,7 +18,7 @@ class Bootstrap extends Scaffold {
       /**
        *
        */
-      public static $version = '1.2.1';
+      public static $version = '1.2.2';
 
       /**
        *

lib/classes/class-licenses-table.php

@@ -138,7 +138,7 @@ public function column_product_version ( $item ) {
       public function column_product_status ( $item ) {
         $response = '';
         if ( 'active' == $item['product_status'] ) {
-          $deactivate_url = wp_nonce_url(\UsabilityDynamics\Utility::current_url( array(
+          $deactivate_url = wp_nonce_url(Utility::current_url( array(
             'action' => 'deactivate-product',
             'filepath' => urlencode( $item['product_file_path'] ),
           ) ), 'bulk-licenses' );

lib/classes/class-utility.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Screen UI
+ *
+ * @namespace UsabilityDynamics
+ *
+ */
+namespace UsabilityDynamics\UD_API {
+
+  if( !class_exists( 'UsabilityDynamics\UD_API\Utility' ) ) {
+
+    /**
+     * 
+     * @author: peshkov@UD
+     */
+    class Utility {
+      
+
+      /**
+       * Returns current url
+       *
+       * @param mixed $args GET args which should be added to url
+       * @param mixed $except_args GET args which will be removed from URL if they exist
+       *
+       * @return string
+       * @author peshkov@UD
+       */
+      static public function current_url( $args = array(), $except_args = array() ) {
+        $url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER[ 'HTTP_HOST' ] . $_SERVER[ 'REQUEST_URI' ];
+
+        $args        = wp_parse_args( $args );
+        $except_args = wp_parse_args( $except_args );
+
+        if( !empty( $args ) ) {
+          foreach( (array) $args as $k => $v ) {
+            if( is_string( $v ) ) $url = add_query_arg( $k, $v, $url );
+          }
+        }
+
+        if( !empty( $except_args ) ) {
+          foreach( (array) $except_args as $arg ) {
+            if( is_string( $arg ) ) $url = remove_query_arg( $arg, $url );
+          }
+        }
+
+        return $url;
+      }
+     
+    }
+  
+  }
+  
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lib-ud-api-client",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "UD Client for WooCommerce API Manager",
   "repository": {
     "type": "git",