From cd6fb7a519fb492d760c9b4b2b9371fa3bdfa190 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Tue, 11 Sep 2018 03:32:36 +0200
Subject: [PATCH] CPU pinning: hanlde dots in VM names

---
 plugins/dynamix/CPUvms.page           | 11 ++++++-----
 plugins/dynamix/include/UpdateOne.php |  8 ++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/plugins/dynamix/CPUvms.page b/plugins/dynamix/CPUvms.page
index 4f7ce487f..67a9c178e 100644
--- a/plugins/dynamix/CPUvms.page
+++ b/plugins/dynamix/CPUvms.page
@@ -50,7 +50,8 @@ input.flat{margin:0}
 input.lock{margin:0}
 </style>
 <script>
-String.prototype.stripper = function(){return this.replace(/ |\(|\)|\[|\]/g,'');}
+String.prototype.strip = function(){return this.replace(/ |\(|\)|\[|\]/g,'');}
+String.prototype.encode = function(){return this.replace(/\./g,'%2e');}
 
 function apply(form) {
   // disable buttons
@@ -61,10 +62,10 @@ function apply(form) {
   var id = $(form).prop('name');
   var args = {};
   args['id'] = id;
-  args['names'] = form.names.value;
+  args['names'] = form.names.value.encode();
   // get the 'checked' cpus
   $(form).find('input[type=checkbox]').each(function(){
-    if ($(this).prop('checked')) args[$(this).prop('name')] = 'on';
+    if ($(this).prop('checked')) args[$(this).prop('name').encode()] = 'on';
   });
   // show the instant wait message
   $('#wait-'+id).show();
@@ -80,7 +81,7 @@ function apply(form) {
       wait = data.length;
       for (var i=0; i < data.length; i++) {
         var name = data[i];
-        $('#'+id+'-'+name.stripper()).show('slow');
+        $('#'+id+'-'+name.strip()).show('slow');
         // step 2: apply the changes by updating the vm or container
         $.post('/webGui/include/UpdateTwo.php',{id:id,name:encodeURI(name)},function(reply){
           if (reply.error) {
@@ -91,7 +92,7 @@ function apply(form) {
               reset($('form[name="'+id+'"]'));
             });
           } else {
-            $('#'+id+'-'+reply.success.stripper()).hide('slow');
+            $('#'+id+'-'+reply.success.strip()).hide('slow');
             // cleanup when all is done
             if (!--wait) {
               setTimeout(function(){$('#wait-'+id).hide();},500);
diff --git a/plugins/dynamix/include/UpdateOne.php b/plugins/dynamix/include/UpdateOne.php
index bfa9a820f..c82d9e190 100644
--- a/plugins/dynamix/include/UpdateOne.php
+++ b/plugins/dynamix/include/UpdateOne.php
@@ -11,14 +11,18 @@
  */
 ?>
 <?
+function decode($data) {
+  return str_replace('%2e','.',urldecode($data));
+}
+
 $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 $map = $changes = [];
-foreach (array_map('urldecode',explode(';',$_POST['names'])) as $name) $map[$name] = '';
+foreach (array_map('decode',explode(';',$_POST['names'])) as $name) $map[$name] = '';
 
 foreach($_POST as $key => $val) {
   if ($val != 'on') continue;
   list($name,$cpu) = explode(':',$key);
-  $map[urldecode($name)] .= "$cpu,";
+  $map[decode($name)] .= "$cpu,";
 }
 // map holds the list of each vm, container or isolcpus and its newly proposed cpu assignments
 $map = array_map(function($d){return substr($d,0,-1);},$map);