+
@@ -216,7 +216,7 @@ switch ($theme) {
@@ -464,10 +464,10 @@ if (_var($var,'shareSMBEnabled')=='yes') {
$list = "$name ";
if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list);
elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list);
- $comment = $share['comment'] ?: ' ';
+ $comment = $share['comment'] ?: '-';
$security = export_settings(_var($var,'shareSMBEnabled'), $sec[$name]);
$last = $name==array_key_last($shares) ? ' last' : '';
- echo " $comment $security 0 ".htmlspecialchars($comment)." $security 0 "._("No shares present")." $name ";
if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list);
elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list);
- $comment = $share['comment'] ?: ' ';
+ $comment = $share['comment'] ?: '-';
$security = export_settings(_var($var,'shareNFSEnabled'), $sec_nfs[$name]);
$last = $name==array_key_last($shares) ? ' last' : '';
- echo "$comment $security - ".htmlspecialchars($comment)." $security - "._("No shares present")." $name ";
if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list);
elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list);
- $comment = $share['comment'] ?: ' ';
- echo "$comment - - ".htmlspecialchars($comment)." - - "._("No shares present")." $name ";
- $desc = $user['desc'] ?: ' ';
+ $desc = $user['desc'] ?: '-';
if ($name=='root') {
$write = $read = '-';
} else {
@@ -544,27 +544,27 @@ if (_var($var,'shareSMBEnabled')=='yes') {
}
if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);
$last = $name==array_key_last($users) ? ' last' : '';
- echo "$desc $write $read ".htmlspecialchars($desc)." $write $read $name ";
- $desc = $user['desc'] ?: ' ';
+ $desc = $user['desc'] ?: '-';
$write = '-'; $read = '-';
if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);
$last = $name==array_key_last($users) ? ' last' : '';
- echo "$desc $write $read ".htmlspecialchars($desc)." $write $read $name ";
- $desc = $user['desc'] ?: ' ';
+ $desc = $user['desc'] ?: '-';
if ($user['passwd']!='yes') $list = str_replace('blue-text','orange-text',$list);
- echo "$desc - - ".htmlspecialchars($desc)." - - _(Existing content is permanently lost)_
",
html:true,
type:'input',
- inputPlaceholder:"",
+ inputPlaceholder:"",
showCancelButton:true,
closeOnConfirm:false,
confirmButtonText:"_(Proceed)_",
@@ -641,7 +642,7 @@ function eraseDisk(name) {
$('#eraseButton').prop('disabled',true);
$('#removeButton').prop('disabled',true);
$('div.spinner.fixed').show();
- $.post("/update.htm",{cmdWipefs:name},function(){
+ $.post("/update.htm",{cmdWipefs:""},function(){
$('div.spinner.fixed').hide();
refresh();
});
@@ -650,13 +651,13 @@ function eraseDisk(name) {
}
});
}
-function removePool(name) {
+function removePool() {
swal({
title:"_(Remove pool)_?",
text:"",
html:true,
type:'input',
- inputPlaceholder:"",
+ inputPlaceholder:"",
showCancelButton:true,
closeOnConfirm:false,
confirmButtonText:"_(Proceed)_",
@@ -669,22 +670,22 @@ function removePool(name) {
$('#eraseButton').prop('disabled',true);
$('#removeButton').prop('disabled',true);
$('div.spinner.fixed').show();
- $.post("/update.htm",{changeSlots:"apply",poolName:name,poolSlots:0},function(){
+ $.post("/update.htm",{changeSlots:"apply",poolName:"",poolSlots:0},function(){
$('div.spinner.fixed').hide();
- refresh();
+ done();
});
} else {
if (confirm.length) swal({title:"_(Incorrect confirmation)_",text:"_(Please try again)_!",type:'error',html:true,confirmButtonText:"_(Ok)_"});
}
});
}
-function upgradeZpool(name) {
+function upgradeZpool() {
swal({
title:"_(Upgrade ZFS Pool)_?",
text:"_(This operation cannot be reversed)_. _(After upgrading the volume may not be mountable in previous versions of Unraid)_._(The ZFS volume will be upgraded)_
",
html:true,
type:'input',
- inputPlaceholder:"",
+ inputPlaceholder:"",
showCancelButton:true,
closeOnConfirm:false,
confirmButtonText:"_(Proceed)_",
@@ -697,7 +698,7 @@ function upgradeZpool(name) {
$('#eraseButton').prop('disabled',true);
$('#deleteButton').prop('disabled',true);
$('div.spinner.fixed').show();
- $.post("/webGui/include/zfs_upgrade.php",{name:name},function(){
+ $.post("/webGui/include/zfs_upgrade.php",{name:""},function(){
$('div.spinner.fixed').hide();
refresh();
});
@@ -711,11 +712,11 @@ function upgradeZpool(name) {
@@ -1143,7 +1144,7 @@ _(zfs pool status)_:
: _(Caution)_: _(Renaming the pool will change the share storage allocations)_. _(After renaming the pool, check that your shares are assigned to the proper primary and secondary storage locations)_.
_(Name)_:
-:
+?>
title="_(Set default boot menu)_" onchange="changeMenu(this.form,this.id,true)">
-
+
_(Syslinux configuration)_:
-:
+:
_(Server boot mode)_:
diff --git a/emhttp/plugins/dynamix/SyslogSettings.page b/emhttp/plugins/dynamix/SyslogSettings.page
index 9029986d1..0914c7088 100644
--- a/emhttp/plugins/dynamix/SyslogSettings.page
+++ b/emhttp/plugins/dynamix/SyslogSettings.page
@@ -95,7 +95,7 @@ _(Local syslog server)_:
-
diff --git a/emhttp/plugins/dynamix/UserEdit.page b/emhttp/plugins/dynamix/UserEdit.page
index 6cdfe1370..b9d846184 100644
--- a/emhttp/plugins/dynamix/UserEdit.page
+++ b/emhttp/plugins/dynamix/UserEdit.page
@@ -14,12 +14,11 @@ Tag="user"
* all copies or substantial portions of the Software.
*/
?>
-
- .
-
+
-
+
@@ -35,6 +33,6 @@ _(No users are defined)_. _(Click **Add User** to create a user for remote share
-
diff --git a/emhttp/plugins/dynamix/include/.login.php b/emhttp/plugins/dynamix/include/.login.php
index 6f0805707..73b6b554b 100644
--- a/emhttp/plugins/dynamix/include/.login.php
+++ b/emhttp/plugins/dynamix/include/.login.php
@@ -480,10 +480,10 @@ $theme_dark = in_array($display['theme'], ['black', 'gray']);
-
+
-
+
diff --git a/emhttp/plugins/dynamix/include/.set-password.php b/emhttp/plugins/dynamix/include/.set-password.php
index 2717eb0f6..091f31be3 100644
--- a/emhttp/plugins/dynamix/include/.set-password.php
+++ b/emhttp/plugins/dynamix/include/.set-password.php
@@ -306,8 +306,8 @@ $THEME_DARK = in_array($display['theme'],['black','gray']);
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 1c3de385d..6cb750a5c 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -720,7 +720,7 @@ if (isset($myPage['Load']) && $myPage['Load']>0) echo "\n
+