mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-13 14:30:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'limetech/master'

Browse Source
This commit is contained in:
bergware
2016-04-06 08:31:59 +02:00
parent 8d6ec6db1b 6322def12b
commit 01fddb315d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/dynamix.docker.manager/include/CreateDocker.php
View File

@@ -169,7 +169,7 @@ function postToXML($post, $setOwnership = false) {
$dom->appendChild($dom->createElement("Container"));
$xml = simplexml_import_dom($dom);
$xml["version"] = 2;
$xml->Name = xml_encode($post['contName']);
$xml->Name = xml_encode(preg_replace('/\s+/', '', $post['contName']));
$xml->Repository = xml_encode($post['contRepository']);
$xml->Registry = xml_encode($post['contRegistry']);
$xml->Network = xml_encode($post['contNetwork']);
@@ -233,7 +233,7 @@ function xmlToVar($xml) {
$xml = (is_file($xml)) ? simplexml_load_file($xml) : simplexml_load_string($xml);
$out = [];
$out['Name'] = xml_decode($xml->Name);
$out['Name'] = preg_replace('/\s+/', '', xml_decode($xml->Name));
$out['Repository'] = xml_decode($xml->Repository);
$out['Registry'] = xml_decode($xml->Registry);
$out['Network'] = (isset($xml->Network)) ? xml_decode($xml->Network) : xml_decode($xml->Network['Default']);

4
plugins/dynamix/dynamix.plg
View File

@@ -3,8 +3,8 @@
<!DOCTYPE PLUGIN [
<!ENTITY name "dynamix">
<!ENTITY author "Bergware">
<!ENTITY version "2016.03.25"> <!-- Intended new version of Dynamix webGUI -->
<!ENTITY unRAID "6.2.0-beta20"> <!-- Change to new unRAID version when issued together -->
<!ENTITY version "2016.04.05"> <!-- Intended new version of Dynamix webGUI -->
<!ENTITY unRAID "6.2.0-beta21"> <!-- Change to new unRAID version when issued together -->
<!ENTITY pluginURL "https://raw.github.com/limetech/&name;-6.2/master/plugins/&name;/&name;.plg">
]>