From 46dbfff0261f4ed68f43fda210b14be3544a444d Mon Sep 17 00:00:00 2001 From: bergware Date: Wed, 7 Mar 2018 16:12:45 +0100 Subject: [PATCH] Standardize VM folder structure (step 1) Moved the PHP files to the subfolder 'classes' together with all other PHP files --- plugins/dynamix.vm.manager/AddVM.page | 3 +-- plugins/dynamix.vm.manager/UpdateVM.page | 3 +-- plugins/dynamix.vm.manager/VMMachines.page | 2 +- plugins/dynamix.vm.manager/VMSettings.page | 8 ++++---- plugins/dynamix.vm.manager/{ => classes}/VMajax.php | 0 plugins/dynamix.vm.manager/{ => classes}/VMedit.php | 0 plugins/dynamix.vm.manager/javascript/vmmanager.js | 2 +- plugins/dynamix.vm.manager/templates/Custom.form.php | 6 +++--- plugins/dynamix.vm.manager/templates/LibreELEC.form.php | 2 +- plugins/dynamix.vm.manager/templates/OpenELEC.form.php | 2 +- 10 files changed, 13 insertions(+), 15 deletions(-) rename plugins/dynamix.vm.manager/{ => classes}/VMajax.php (100%) rename plugins/dynamix.vm.manager/{ => classes}/VMedit.php (100%) diff --git a/plugins/dynamix.vm.manager/AddVM.page b/plugins/dynamix.vm.manager/AddVM.page index a1fe6a1a4..841bfaf49 100644 --- a/plugins/dynamix.vm.manager/AddVM.page +++ b/plugins/dynamix.vm.manager/AddVM.page @@ -15,7 +15,6 @@ Markdown="false" * all copies or substantial portions of the Software. */ ?> - \ No newline at end of file diff --git a/plugins/dynamix.vm.manager/UpdateVM.page b/plugins/dynamix.vm.manager/UpdateVM.page index be595c9ac..7083ebab7 100644 --- a/plugins/dynamix.vm.manager/UpdateVM.page +++ b/plugins/dynamix.vm.manager/UpdateVM.page @@ -15,7 +15,6 @@ Markdown="false" * all copies or substantial portions of the Software. */ ?> - \ No newline at end of file diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 83ef98731..323b91b15 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -202,7 +202,7 @@ foreach ($vms as $vm) { $('.autostart').switchButton({labels_placement:"right"}); $('.autostart').change(function() { - $.post('/plugins/dynamix.vm.manager/VMajax.php',{action:'domain-autostart',uuid:$(this).attr('uuid'),autostart:$(this).prop('checked'),response:'json'},function(data){ + $.post('/plugins/dynamix.vm.manager/classes/VMajax.php',{action:'domain-autostart',uuid:$(this).attr('uuid'),autostart:$(this).prop('checked'),response:'json'},function(data){ $(this).prop('checked', data.autostart); },'json'); }); diff --git a/plugins/dynamix.vm.manager/VMSettings.page b/plugins/dynamix.vm.manager/VMSettings.page index fadd05fd8..8be7ec133 100644 --- a/plugins/dynamix.vm.manager/VMSettings.page +++ b/plugins/dynamix.vm.manager/VMSettings.page @@ -334,11 +334,11 @@ $(function(){ return; } if ($('#pcie_acs_override').val() == '1') { - $.getJSON("/plugins/dynamix.vm.manager/VMajax.php", {action: "acs-override-enable"}, function(data) { + $.getJSON("/plugins/dynamix.vm.manager/classes/VMajax.php", {action: "acs-override-enable"}, function(data) { $("#settingsForm").submit(); }); } else { - $.getJSON("/plugins/dynamix.vm.manager/VMajax.php", {action: "acs-override-disable"}, function(data) { + $.getJSON("/plugins/dynamix.vm.manager/classes/VMajax.php", {action: "acs-override-disable"}, function(data) { $("#settingsForm").submit(); }); } @@ -365,7 +365,7 @@ $(function(){ $form.find('input,select').prop('disabled', true); $button.removeClass('fa-download').addClass('fa-circle-o-notch fa-spin'); - $.post("/plugins/dynamix.vm.manager/VMajax.php", postdata, function( data ) { + $.post("/plugins/dynamix.vm.manager/classes/VMajax.php", postdata, function( data ) { if (data.error) { $("#download_status").html('' + data.error + ''); } else { @@ -419,7 +419,7 @@ $(function(){ file: $(this).val() }; - $.get("/plugins/dynamix.vm.manager/VMajax.php", params, function( data ) { + $.get("/plugins/dynamix.vm.manager/classes/VMajax.php", params, function( data ) { if (!data.exists) { $("#download_button").show('fast'); diff --git a/plugins/dynamix.vm.manager/VMajax.php b/plugins/dynamix.vm.manager/classes/VMajax.php similarity index 100% rename from plugins/dynamix.vm.manager/VMajax.php rename to plugins/dynamix.vm.manager/classes/VMajax.php diff --git a/plugins/dynamix.vm.manager/VMedit.php b/plugins/dynamix.vm.manager/classes/VMedit.php similarity index 100% rename from plugins/dynamix.vm.manager/VMedit.php rename to plugins/dynamix.vm.manager/classes/VMedit.php diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js index ad685720c..b93a832d6 100644 --- a/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -1,7 +1,7 @@ function ajaxVMDispatch(params, reload){ var spin = typeof reload != 'undefined'; if (spin) $('#vm-'+params['uuid']).find('i').addClass('fa-spin'); - $.post("/plugins/dynamix.vm.manager/VMajax.php", params, function(data) { + $.post("/plugins/dynamix.vm.manager/classes/VMajax.php", params, function(data) { if (data.error) { swal({title:"Execution error",text:data.error,type:"error"}); } else { diff --git a/plugins/dynamix.vm.manager/templates/Custom.form.php b/plugins/dynamix.vm.manager/templates/Custom.form.php index d8752b1ab..6b6748981 100644 --- a/plugins/dynamix.vm.manager/templates/Custom.form.php +++ b/plugins/dynamix.vm.manager/templates/Custom.form.php @@ -1133,7 +1133,7 @@ $(function() { $disk_bus_sections.filter('.wasadvanced').removeClass('wasadvanced').addClass('advanced'); slideDownRows($disk_bus_sections.not(isVMAdvancedMode() ? '.basic' : '.advanced')); - $.getJSON("/plugins/dynamix.vm.manager/VMajax.php?action=file-info&file=" + encodeURIComponent($disk_input.val()), function( info ) { + $.getJSON("/plugins/dynamix.vm.manager/classes/VMajax.php?action=file-info&file=" + encodeURIComponent($disk_input.val()), function( info ) { if (info.isfile || info.isblock) { slideUpRows($disk_file_sections); $disk_file_sections.filter('.advanced').removeClass('advanced').addClass('wasadvanced'); @@ -1159,7 +1159,7 @@ $(function() { $disk_bus_sections.filter('.wasadvanced').removeClass('wasadvanced').addClass('advanced'); slideDownRows($disk_bus_sections.not(isVMAdvancedMode() ? '.basic' : '.advanced')); - $.getJSON("/plugins/dynamix.vm.manager/VMajax.php?action=file-info&file=" + encodeURIComponent(auto_disk_path), function( info ) { + $.getJSON("/plugins/dynamix.vm.manager/classes/VMajax.php?action=file-info&file=" + encodeURIComponent(auto_disk_path), function( info ) { if (info.isfile || info.isblock) { slideUpRows($disk_file_sections); $disk_file_sections.filter('.advanced').removeClass('advanced').addClass('wasadvanced'); @@ -1277,7 +1277,7 @@ $(function() { $("#vmform").on("click", ".mac_generate", function generateMac() { var $input = $(this).prev('input'); - $.getJSON("/plugins/dynamix.vm.manager/VMajax.php?action=generate-mac", function( data ) { + $.getJSON("/plugins/dynamix.vm.manager/classes/VMajax.php?action=generate-mac", function( data ) { if (data.mac) { $input.val(data.mac); } diff --git a/plugins/dynamix.vm.manager/templates/LibreELEC.form.php b/plugins/dynamix.vm.manager/templates/LibreELEC.form.php index 44996faa8..10cbf82bf 100644 --- a/plugins/dynamix.vm.manager/templates/LibreELEC.form.php +++ b/plugins/dynamix.vm.manager/templates/LibreELEC.form.php @@ -1028,7 +1028,7 @@ $(function() { $("#vmform").on("click", ".mac_generate", function generateMac() { var $input = $(this).prev('input'); - $.getJSON("/plugins/dynamix.vm.manager/VMajax.php?action=generate-mac", function (data) { + $.getJSON("/plugins/dynamix.vm.manager/classes/VMajax.php?action=generate-mac", function (data) { if (data.mac) { $input.val(data.mac); } diff --git a/plugins/dynamix.vm.manager/templates/OpenELEC.form.php b/plugins/dynamix.vm.manager/templates/OpenELEC.form.php index 0b4e9bd3f..e59ae6211 100644 --- a/plugins/dynamix.vm.manager/templates/OpenELEC.form.php +++ b/plugins/dynamix.vm.manager/templates/OpenELEC.form.php @@ -1031,7 +1031,7 @@ $(function() { $("#vmform").on("click", ".mac_generate", function generateMac() { var $input = $(this).prev('input'); - $.getJSON("/plugins/dynamix.vm.manager/VMajax.php?action=generate-mac", function (data) { + $.getJSON("/plugins/dynamix.vm.manager/classes/VMajax.php?action=generate-mac", function (data) { if (data.mac) { $input.val(data.mac); }