- Re-organized files structure

vagharsh · Nov 12, 2017 · 18fbd05 · 18fbd05
1 parent d0e79d0
commit 18fbd05
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/backend/functions.php b/backend/functions.php
@@ -1,9 +1,7 @@
 <?php
 
 function putInConsul($path, $value, $cas) {
-    if ($cas == 0){
-        $path = $path."?cas=0";
-    }
+    if ($cas == 0){$path = $path."?cas=0";}
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

diff --git a/backend/requests.php b/backend/requests.php
@@ -28,8 +28,8 @@
         }
     } elseif ($method === 'BulkIMPORT') {
         if ($userRights[1] == 1) {
-            if (isset($_POST['path']) && isset($_POST['value']) && isset($_POST['cas'])) {
-                echo (importFn($_POST['path'], $_POST['value'], $_POST['cas']));
+            if (isset($_POST['consul']) && isset($_POST['value']) && isset($_POST['cas'])) {
+                echo (importFn($_POST['consul'], $_POST['value'], $_POST['cas']));
             }
         } else {
             echo "You are not Authorized to perform this action";
@@ -72,9 +72,9 @@
         }
     }
 }
-if (isset($_GET['path'])) {
+if (isset($_GET['consul'])) {
     if ($userRights[0] == 1) {
-        echo(json_encode(getFromConsul($_GET['path'])));
+        echo(json_encode(getFromConsul($_GET['consul'])));
     } else {
         echo "You are not Authorized to perform this action";
     }

diff --git a/lib/js/functions.js b/lib/js/functions.js
@@ -125,7 +125,7 @@ function importConsul(cas) {
             method: "POST",
             url: "backend/requests.php",
             data: {
-                path: consulUrl,
+                consul: consulUrl,
                 method: "BulkIMPORT",
                 cas: cas,
                 value: JSON.stringify(result)
@@ -346,7 +346,7 @@ function getTree(tree, allKeys) {
         url: "backend/requests.php",
         dataType: 'json',
         data: {
-            path: allKeys
+            consul: allKeys
         }
     }).done(function (data) {
         $('#connectingModalId').modal('hide');

diff --git a/lib/js/triggers.js b/lib/js/triggers.js
@@ -223,5 +223,4 @@ $(function () {
             searchInputObj.parent().removeClass('has-error');
         }, 1000);
     });
-
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -223,5 +223,4 @@ $(function () { @@
                 searchInputObj.parent().removeClass('has-error');
             }, 1000);
         });
     });