diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page index 85c2cc576..571763dce 100755 --- a/emhttp/plugins/dynamix/DeviceInfo.page +++ b/emhttp/plugins/dynamix/DeviceInfo.page @@ -621,11 +621,11 @@ _(File system type)_: - + - + style="display:none"> _(ReiserFS is deprecated, please use another file system)_! :info_file_system_help: diff --git a/emhttp/plugins/dynamix/DiskSettings.page b/emhttp/plugins/dynamix/DiskSettings.page index b9d0a8004..f54cc2a7f 100644 --- a/emhttp/plugins/dynamix/DiskSettings.page +++ b/emhttp/plugins/dynamix/DiskSettings.page @@ -159,11 +159,11 @@ _(Default file system)_: - + - + :disk_default_file_system_help: diff --git a/emhttp/plugins/dynamix/SecurityNFS.page b/emhttp/plugins/dynamix/SecurityNFS.page index 6a6223b71..ef329f743 100644 --- a/emhttp/plugins/dynamix/SecurityNFS.page +++ b/emhttp/plugins/dynamix/SecurityNFS.page @@ -17,6 +17,10 @@ Cond="(($var['shareNFSEnabled']!='no') && (isset($name)?array_key_exists($name,$ ?> :nfs_security_help: @@ -73,10 +77,10 @@ _(Security)_: -
+ _(Rule)_: -: +:   : @@ -85,58 +89,140 @@ _(Rule)_: diff --git a/emhttp/plugins/dynamix/ShareList.page b/emhttp/plugins/dynamix/ShareList.page index 949d949a5..8b33a5b4a 100644 --- a/emhttp/plugins/dynamix/ShareList.page +++ b/emhttp/plugins/dynamix/ShareList.page @@ -15,6 +15,11 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'" * all copies or substantial portions of the Software. */ ?> + + @@ -22,7 +27,7 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'" - +> diff --git a/emhttp/plugins/dynamix/include/DiskList.php b/emhttp/plugins/dynamix/include/DiskList.php index c2f7e97a1..eb2b9b683 100644 --- a/emhttp/plugins/dynamix/include/DiskList.php +++ b/emhttp/plugins/dynamix/include/DiskList.php @@ -28,10 +28,13 @@ $var = parse_ini_file('state/var.ini'); $sec = parse_ini_file('state/sec.ini',true); $sec_nfs = parse_ini_file('state/sec_nfs.ini',true); -// exit when no disks -$nodisks = ""; +// exit when no mountable array disks +$nodisks = ""; if (!$disks) die($nodisks); +// No shared disks +$nodisks = ""; + // GUI settings extract(parse_plugin_cfg('dynamix',true)); diff --git a/emhttp/plugins/dynamix/include/ShareList.php b/emhttp/plugins/dynamix/include/ShareList.php index 341542dcb..577464fcb 100644 --- a/emhttp/plugins/dynamix/include/ShareList.php +++ b/emhttp/plugins/dynamix/include/ShareList.php @@ -46,6 +46,10 @@ $var = parse_ini_file('state/var.ini'); $sec = parse_ini_file('state/sec.ini',true); $sec_nfs = parse_ini_file('state/sec_nfs.ini',true); +// exit when no mountable array disks +$nodisks = ""; +if (!$disks) die($nodisks); + // exit when no shares $noshares = ""; if (!$shares) die($noshares); diff --git a/emhttp/plugins/dynamix/include/update.parity.php b/emhttp/plugins/dynamix/include/update.parity.php index db09d54cc..899725218 100644 --- a/emhttp/plugins/dynamix/include/update.parity.php +++ b/emhttp/plugins/dynamix/include/update.parity.php @@ -29,8 +29,7 @@ if (isset($_POST['#apply'])) { $dotm = $_POST['dotm'] ?? '*'; $month = $_POST['month'] ?? '*'; $day = $_POST['day'] ?? '*'; - $write = $_POST['write'] ?? ''; - $write = ($write == "yes") ? "" : "NOCORRECT"; + $write = $_POST['write'] ?? 'NOCORRECT'; $term = $test = $end1 = $end2 = ''; switch ($dotm) { case '28-31':
_(Name)__(Comment)__(SMB)__(NFS)__(Storage)__(Size)__(Free)_
"._('There are no exportable disk shares')."
"._('There are no mountable array or pool disks - cannot add shares').".
"._('There are no exportable disk shares')."
"._('There are no mountable array or pool disks - cannot add shares').".
"._('There are no exportable user shares')."