mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-08 03:49:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1720 from dlandon/master

Browse Source 
Disable "Add Share" button when there are no mountable array disks; disable Reiserfs selections; add multi line NFS Rule.
This commit is contained in:
tom mortensen
2024-05-11 21:20:56 -07:00
committed by GitHub
parent 86a014f82e f933c288e9
commit 8bf3cae742
7 changed files with 156 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
emhttp/plugins/dynamix/DeviceInfo.page
View File

@@ -621,11 +621,11 @@ _(File system type)_:
<?=mk_option(_var($disk,'fsType'), "xfs", _('xfs'))?>
<?=mk_option(_var($disk,'fsType'), "zfs", _('zfs'))?>
<?=mk_option(_var($disk,'fsType'), "btrfs", _('btrfs'))?>
<?=mk_option(_var($disk,'fsType'), "reiserfs", _('reiserfs'))?>
<?=mk_option(_var($disk,'fsType'), "reiserfs", _('reiserfs'), "disabled")?>
<?=mk_option(_var($disk,'fsType'), "luks:xfs", _('xfs')." - "._('encrypted'))?>
<?=mk_option(_var($disk,'fsType'), "luks:zfs", _('zfs')." - "._('encrypted'))?>
<?=mk_option(_var($disk,'fsType'), "luks:btrfs", _('btrfs')." - "._('encrypted'))?>
<?=mk_option(_var($disk,'fsType'), "luks:reiserfs", _('reiserfs')." - "._('encrypted'))?>
<?=mk_option(_var($disk,'fsType'), "luks:reiserfs", _('reiserfs')." - "._('encrypted'), "disabled")?>
</select><span id="reiserfs" class="warning"<?if (!fsType('reiserfs')):?> style="display:none"<?endif;?>><i class="fa fa-warning"></i>&nbsp;_(ReiserFS is deprecated, please use another file system)_!</span>
:info_file_system_help:

4
emhttp/plugins/dynamix/DiskSettings.page
View File

@@ -159,11 +159,11 @@ _(Default file system)_:
<?=mk_option($var['defaultFsType'], "xfs", _('xfs'));?>
<?=mk_option($var['defaultFsType'], "zfs", _('zfs'));?>
<?=mk_option($var['defaultFsType'], "btrfs", _('btrfs'));?>
<?=mk_option($var['defaultFsType'], "reiserfs", _('reiserfs'));?>
<?=mk_option($var['defaultFsType'], "reiserfs", _('reiserfs'), "disabled");?>
<?=mk_option($var['defaultFsType'], "luks:xfs", _('xfs')." - "._('encrypted'));?>
<?=mk_option($var['defaultFsType'], "luks:zfs", _('zfs')." - "._('encrypted'));?>
<?=mk_option($var['defaultFsType'], "luks:btrfs", _('btrfs')." - "._('encrypted'));?>
<?=mk_option($var['defaultFsType'], "luks:reiserfs", _('reiserfs')." - "._('encrypted'));?>
<?=mk_option($var['defaultFsType'], "luks:reiserfs", _('reiserfs')." - "._('encrypted'), "disabled");?>
</select>
:disk_default_file_system_help:

186
emhttp/plugins/dynamix/SecurityNFS.page
View File

@@ -17,6 +17,10 @@ Cond="(($var['shareNFSEnabled']!='no') && (isset($name)?array_key_exists($name,$
?>
<?
$width = [123,300];
/* Replace spaces in NFS rule with new lines for multi line textarea. */
$sec_nfs[$name]['hostList'] = str_replace(" ", "\n", $sec_nfs[$name]['hostList']);
?>
:nfs_security_help:
@@ -73,10 +77,10 @@ _(Security)_:
</form>
<?if ($sec_nfs[$name]['security']=='private'):?>
<form markdown="1" method="POST" name="otherForm" action="/update.htm" target="progressFrame">
<form id="nfsHostListForm" markdown="1" method="POST" name="otherForm" action="/update.htm" target="progressFrame">
<input type="hidden" name="shareName" value="<?=htmlspecialchars($name)?>">
_(Rule)_:
: <input type="text" name="shareHostListNFS" maxlength="512" value="<?=htmlspecialchars($sec_nfs[$name]['hostList'])?>">
: <textarea name="shareHostListNFS" cols="40" rows="5" style="width:45%" placeholder="Example: *(rw,sec=sys,insecure,anongid=100,anonuid=99,no_root_squash,lock)"><?= htmlspecialchars($sec_nfs[$name]['hostList']) ?></textarea>
&nbsp;
: <input type="submit" name="changeShareAccessNFS" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
@@ -85,58 +89,140 @@ _(Rule)_:
<script>
$(function() {
initDropdownNFS(false);
if ($.cookie('hostList')!=null) {
var host = $('input[name="shareHostListNFS"]');
host.val($.cookie('hostList'));
setTimeout(function(){host.trigger('change');},100);
$.removeCookie('hostList');
}
<?if ($tabbed):?>
<?$path=='Shares/Share' ? $t=2 : $t=1;?>
$('#tab<?=$t?>').bind({click:function(){initDropdownNFS(true);}});
<?endif;?>
/* Initialize dropdown for NFS and check for hostList cookie. */
initDropdownNFS(false);
if ($.cookie('hostList') != null) {
var host = $('input[name="shareHostListNFS"]');
host.val($.cookie('hostList'));
setTimeout(function() {
host.trigger('change');
}, 100);
$.removeCookie('hostList');
}
<?if ($tabbed):?>
/* Conditionally bind click event to tabs if tabbed interface is used. */
<?$path=='Shares/Share' ? $t=2 : $t=1;?>
$('#tab<?=$t?>').bind({click:function() {
initDropdownNFS(true);
}});
<?endif;?>
});
/* Add an event listener to update the text area to make all rules into a single line before being submitted. */
document.addEventListener("DOMContentLoaded", function() {
var form = document.getElementById('nfsHostListForm');
form.addEventListener('submit', function(event) {
var textarea = document.querySelector('textarea[name="shareHostListNFS"]');
/* Split the content into lines. */
var lines = textarea.value.split('\n');
/* Filter out empty lines or lines that contain only whitespace, and remove carriage returns and excessive spaces within lines. */
var cleanedLines = lines.map(function(line) {
/* Remove carriage returns and spaces within each line. */
return line.replace(/[\r\s]+/g, '');
}).filter(function(line) {
/* Keep only non-empty lines. */
return line.length > 0;
});
/* Join the remaining lines with a single space. */
textarea.value = cleanedLines.join(' ');
});
});
/* Function to initialize or reset the NFS dropdown */
function initDropdownNFS(reset) {
if (reset) {
$('#nfs1').dropdownchecklist('destroy');
}
$("#nfs1").dropdownchecklist({firstItemChecksAll:true, emptyText:"_(select)_...", width:<?=$width[0]?>, explicitClose:"..._(close)_"});
/* Check if reset is required and destroy existing dropdown if true */
if (reset) {
$('#nfs1').dropdownchecklist('destroy');
}
/* Initialize or re-initialize the dropdown with specified options */
$("#nfs1").dropdownchecklist({
firstItemChecksAll: true,
emptyText: "_(select)_...",
width: <?=$width[0]?>,
explicitClose: "..._(close)_"
});
}
/* Function to read NFS configuration based on selected options and copy to this share. */
function readNFS() {
var form = document.nfs_edit;
var name = $('select[name="readnfs"]').val();
$.get('/webGui/include/ProtocolData.php',{protocol:'nfs',name:name},function(json) {
var data = $.parseJSON(json);
form.shareExportNFS.value = data.export;
form.shareSecurityNFS.value = data.security;
if (data.hostList != '') $.cookie('hostList',data.hostList);
$(form).find('select').trigger('change');
});
/* Access the form for NFS editing */
var form = document.nfs_edit;
/* Retrieve selected NFS name from the dropdown */
var name = $('select[name="readnfs"]').val();
/* Perform a GET request to fetch NFS configuration data */
$.get('/webGui/include/ProtocolData.php', {protocol: 'nfs', name: name}, function(json) {
/* Parse the JSON response */
var data = $.parseJSON(json);
var textarea = $('textarea[name="shareHostListNFS"]');
/* Update form fields with fetched data */
form.shareExportNFS.value = data.export;
form.shareSecurityNFS.value = data.security;
/* Check if hostList is not empty and save it in a cookie */
if (data.hostList != '') {
$.cookie('hostList', data.hostList);
}
/* Replace all spaces in data.hostList with new lines. */
var formattedHostList = data.hostList.replace(/ /g, '\n');
/* Update textarea content. Use data from 'hostList'. */
textarea.val(formattedHostList);
/* Trigger change event on select elements to update UI */
$(form).find('select').trigger('change');
/* Trigger an input event as if the user had typed in the textarea. */
textarea.trigger('input');
});
}
function writeNFS(data,n,i) {
if (data) {
if (n<i) {
$.post('/update.htm',data[n], function(){setTimeout(function(){writeNFS(data,++n,i);},3000);});
} else {
toggleButton('writenfs',false);
$('div.spinner.fixed').hide();
}
} else {
var data = [], i = 0;
$('select#nfs1 option').map(function(i) {
if ($(this).prop('selected')==true && $(this).val()!='(_(All)_)') {
data[i] = {};
data[i]['shareName'] = $(this).val();
data[i]['shareExportNFS'] = '<?=addslashes(htmlspecialchars($sec_nfs[$name]['export']))?>';
data[i]['shareSecurityNFS'] = '<?=addslashes(htmlspecialchars($sec_nfs[$name]['security']))?>';
data[i]['changeShareSecurityNFS'] = 'Apply';
i++;
}
});
toggleButton('writenfs',true);
$('div.spinner.fixed').show('slow');
writeNFS(data,0,i);
}
/* Function to write NFS settings based on user selection to other shares. */
function writeNFS(data, n, i) {
if (data) {
if (n < i) {
$.post('/update.htm', data[n], function() {
setTimeout(function() { writeNFS(data, ++n, i); }, 3000);
});
} else {
toggleButton('writenfs', false);
$('div.spinner.fixed').hide();
}
} else {
var data = [];
/* Get the setting from the share config. */
var hostList = $('textarea[name="shareHostListNFS"]').val().trim();
/* Replace all new lines in data.hostList with spaces. */
var formattedHostList = <?= json_encode($sec_nfs[$name]['hostList']); ?>.replace(/\n/g, ' ');
$('select#nfs1 option').each(function() {
if ($(this).prop('selected') && $(this).val() != '(_(All)_)') {
data.push({
shareName: $(this).val(),
shareExportNFS: '<?=addslashes(htmlspecialchars($sec_nfs[$name]['export']))?>',
shareSecurityNFS: '<?=addslashes(htmlspecialchars($sec_nfs[$name]['security']))?>',
changeShareSecurityNFS: 'Apply'
});
data.push({
shareName: $(this).val(),
shareHostListNFS: formattedHostList,
changeShareSecurityNFS: 'Apply'
});
}
});
toggleButton('writenfs', true);
$('div.spinner.fixed').show('slow');
writeNFS(data, 0, data.length);
}
}
</script>

7
emhttp/plugins/dynamix/ShareList.page
View File

@@ -15,6 +15,11 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'"
* all copies or substantial portions of the Software.
*/
?>
<?
/* Are there any array disks? */
$nodisks = empty(parse_ini_file('state/disks.ini',true)) ? "disabled" : "";
?>
<table class="unraid share_status">
<thead><tr><td>_(Name)_</td><td>_(Comment)_</td><td>_(SMB)_</td><td>_(NFS)_</td><td>_(Storage)_</td><td>_(Size)_</td><td>_(Free)_</td></tr></thead>
<tbody id="shareslist"></tbody>
@@ -22,7 +27,7 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'"
<form name="share_form" method="POST" action="<?=htmlspecialchars($path)?>/Share?name=">
<input type="button" id="compute-shares" value="_(Compute All)_" onclick="$(this).prop('disabled',true);shareList('',-1)">
<input type="submit" value="_(Add Share)_">
<input type="submit" value="_(Add Share)_" <?echo $nodisks;?>>
<input type="button" value="_(Clean Up)_" onclick="cleanup()" id="cleanup-button" disabled>
</form>

7
emhttp/plugins/dynamix/include/DiskList.php
View File

@@ -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 = "<tr><td class='empty' colspan='7'><i class='fa fa-folder-open-o icon'></i>"._('There are no exportable disk shares')."</td></tr>";
// exit when no mountable array disks
$nodisks = "<tr><td class='empty' colspan='7'><strong>"._('There are no mountable array or pool disks - cannot add shares').".</strong></td></tr>";
if (!$disks) die($nodisks);
// No shared disks
$nodisks = "<tr><td class='empty' colspan='7'><i class='fa fa-folder-open-o icon'></i>"._('There are no exportable disk shares')."</td></tr>";
// GUI settings
extract(parse_plugin_cfg('dynamix',true));

4
emhttp/plugins/dynamix/include/ShareList.php
View File

@@ -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 = "<tr><td class='empty' colspan='7'><strong>"._('There are no mountable array or pool disks - cannot add shares').".</strong></td></tr>";
if (!$disks) die($nodisks);
// exit when no shares
$noshares = "<tr><td class='empty' colspan='7'><i class='fa fa-folder-open-o icon'></i>"._('There are no exportable user shares')."</td></tr>";
if (!$shares) die($noshares);

3
emhttp/plugins/dynamix/include/update.parity.php
View File

@@ -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':