Encode uri (#2383)

lemonldap-ng-manager/site/coffee/manager.coffee

@@ -578,8 +578,8 @@ llapp.controller 'TreeCtrl', [
 			d.notify 'Trying to get datas'
 			$scope.waiting = true
 			console.log "Trying to get key #{node.cnodes}"
-			key = node.cnodes.replace(/%/, '%25') if node.cnodes.match /^virtualHosts/	
-			$http.get("#{window.confPrefix}#{$scope.currentCfg.cfgNum}/#{key}").then (response) ->
+			uri = encodeURI node.cnodes
+			$http.get("#{window.confPrefix}#{$scope.currentCfg.cfgNum}/#{uri}").then (response) ->
 				data = response.data
 				# Manage datas errors
 				if not data
@@ -761,13 +761,13 @@ llapp.controller 'TreeCtrl', [
 						d.reject response.statusLine
 						$scope.waiting = false
 				else
-					key = ''
+					uri = ''
 					if node.get
 						console.log "Trying to get key #{node.get}"
-						key = node.get.replace(/%/, '%25') if node.get.match /^virtualHosts/
+						uri = encodeURI node.get
 					else
 						console.log "Trying to get title #{node.title}"
-					$http.get("#{window.confPrefix}#{$scope.currentCfg.cfgNum}/#{if node.get then key else node.title}").then (response) ->
+					$http.get("#{window.confPrefix}#{$scope.currentCfg.cfgNum}/#{if node.get then uri else node.title}").then (response) ->
 						# Set default value if response is null or if asked by server
 						data = response.data
 						if (data.value == null or (data.error and data.error.match /setDefault$/ ) ) and node['default'] != null

lemonldap-ng-manager/site/coffee/viewer.coffee

@@ -259,8 +259,8 @@ llapp.controller 'TreeCtrl', [
 			d.notify 'Trying to get datas'
 			$scope.waiting = true
 			console.log "Trying to get key #{node.cnodes}"
-			key = node.cnodes.replace(/%/, '%25') if node.cnodes.match /^virtualHosts/	
-			$http.get("#{window.confPrefix}#{$scope.currentCfg.cfgNum}/#{key}").then (response) ->
+			uri = encodeURI node.cnodes
+			$http.get("#{window.confPrefix}#{$scope.currentCfg.cfgNum}/#{uri}").then (response) ->
 				data = response.data
 				# Manage datas errors
 				if not data
@@ -362,13 +362,13 @@ llapp.controller 'TreeCtrl', [
 						d.reject response.statusLine
 						$scope.waiting = false
 				else
-					key = ''
+					uri = ''
 					if node.get
 						console.log "Trying to get key #{node.get}"
-						key = node.get.replace(/%/, '%25') if node.get.match /^virtualHosts/
+						uri = encodeURI node.get
 					else
 						console.log "Trying to get title #{node.title}"
-					$http.get("#{window.confPrefix}#{$scope.currentCfg.cfgNum}/#{if node.get then key else node.title}").then (response) ->
+					$http.get("#{window.confPrefix}#{$scope.currentCfg.cfgNum}/#{if node.get then uri else node.title}").then (response) ->
 						# Set default value if response is null or if asked by server
 						data = response.data
 						if (data.value == null or (data.error and data.error.match /setDefault$/ ) ) and node['default'] != null

lemonldap-ng-manager/site/htdocs/static/js/manager.js

@@ -718,15 +718,13 @@ This file contains:
         return _download(node);
       };
       _download = function(node) {
-        var d, key;
+        var d, uri;
         d = $q.defer();
         d.notify('Trying to get datas');
         $scope.waiting = true;
         console.log("Trying to get key " + node.cnodes);
-        if (node.cnodes.match(/^virtualHosts/)) {
-          key = node.cnodes.replace(/%/, '%25');
-        }
-        $http.get("" + window.confPrefix + $scope.currentCfg.cfgNum + "/" + key).then(function(response) {
+        uri = encodeURI(node.cnodes);
+        $http.get("" + window.confPrefix + $scope.currentCfg.cfgNum + "/" + uri).then(function(response) {
           var a, data, len, o;
           data = response.data;
           if (!data) {
@@ -904,7 +902,7 @@ This file contains:
         }, readError);
       };
       $scope.getKey = function(node) {
-        var d, i, key, len, n, o, ref, tmp;
+        var d, i, len, n, o, ref, tmp, uri;
         d = $q.defer();
         if (!node.data) {
           $scope.waiting = true;
@@ -927,16 +925,14 @@ This file contains:
               return $scope.waiting = false;
             });
           } else {
-            key = '';
+            uri = '';
             if (node.get) {
               console.log("Trying to get key " + node.get);
-              if (node.get.match(/^virtualHosts/)) {
-                key = node.get.replace(/%/, '%25');
-              }
+              uri = encodeURI(node.get);
             } else {
               console.log("Trying to get title " + node.title);
             }
-            $http.get("" + window.confPrefix + $scope.currentCfg.cfgNum + "/" + (node.get ? key : node.title)).then(function(response) {
+            $http.get("" + window.confPrefix + $scope.currentCfg.cfgNum + "/" + (node.get ? uri : node.title)).then(function(response) {
               var data;
               data = response.data;
               if ((data.value === null || (data.error && data.error.match(/setDefault$/))) && node['default'] !== null) {

lemonldap-ng-manager/site/htdocs/static/js/viewer.js

@@ -328,15 +328,13 @@ This file contains:
         return _download(node);
       };
       _download = function(node) {
-        var d, key;
+        var d, uri;
         d = $q.defer();
         d.notify('Trying to get datas');
         $scope.waiting = true;
         console.log("Trying to get key " + node.cnodes);
-        if (node.cnodes.match(/^virtualHosts/)) {
-          key = node.cnodes.replace(/%/, '%25');
-        }
-        $http.get("" + window.confPrefix + $scope.currentCfg.cfgNum + "/" + key).then(function(response) {
+        uri = encodeURI(node.cnodes);
+        $http.get("" + window.confPrefix + $scope.currentCfg.cfgNum + "/" + uri).then(function(response) {
           var a, data, l, len;
           data = response.data;
           if (!data) {
@@ -424,7 +422,7 @@ This file contains:
         }
       };
       $scope.getKey = function(node) {
-        var d, i, key, l, len, n, ref, tmp;
+        var d, i, l, len, n, ref, tmp, uri;
         d = $q.defer();
         if (!node.data) {
           $scope.waiting = true;
@@ -447,16 +445,14 @@ This file contains:
               return $scope.waiting = false;
             });
           } else {
-            key = '';
+            uri = '';
             if (node.get) {
               console.log("Trying to get key " + node.get);
-              if (node.get.match(/^virtualHosts/)) {
-                key = node.get.replace(/%/, '%25');
-              }
+              uri = encodeURI(node.get);
             } else {
               console.log("Trying to get title " + node.title);
             }
-            $http.get("" + window.confPrefix + $scope.currentCfg.cfgNum + "/" + (node.get ? key : node.title)).then(function(response) {
+            $http.get("" + window.confPrefix + $scope.currentCfg.cfgNum + "/" + (node.get ? uri : node.title)).then(function(response) {
               var data;
               data = response.data;
               if ((data.value === null || (data.error && data.error.match(/setDefault$/))) && node['default'] !== null) {