PHP8 support - round 3

This commit is contained in:
bergware
2023-01-05 20:43:11 +01:00
parent f6a5671b80
commit 7198d7f4f2
+18 -18
View File
@@ -41,7 +41,7 @@ function maintenance_mode() {
}
$sheets = []; $n = 0;
foreach ($disks as $sheet) {
if ($sheet['type']=='Flash' || $sheet['color']=='grey-off') continue;
if ((isset($sheet['type']) && $sheet['type']=='Flash') || (isset($sheet['color']) && $sheet['color']=='grey-off')) continue;
$sheets[] = $sheet['name'];
if ($sheet['name']==$name) { $i = $n; }
$n++;
@@ -135,21 +135,21 @@ function selectDiskFsWidth(num_devices,selected_width) {
}
function selectDiskFsProfile(num_devices, width) {
var disabled = $('#diskFsType').prop('disabled');
if ($('#diskFsType').val().indexOf('auto') != -1) {
if (($('#diskFsType').val()||'').indexOf('auto') != -1) {
$('#diskFsProfileBTRFS').css('display','none');
$('#diskFsProfileBTRFS').prop('disabled',true);
$('#diskFsProfileZFS').css('display','none');
$('#diskFsProfileZFS').prop('disabled',true);
$('#diskFsWidthZFS').css('display','none');
$('#diskFsWidthZFS').prop('disabled',true);
} else if ($('#diskFsType').val().indexOf('btrfs') != -1) {
} else if (($('#diskFsType').val()||'').indexOf('btrfs') != -1) {
$('#diskFsProfileBTRFS').css('display','inline');
$('#diskFsProfileBTRFS').prop('disabled',disabled);
$('#diskFsProfileZFS').css('display','none');
$('#diskFsProfileZFS').prop('disabled',true);
$('#diskFsWidthZFS').css('display','none');
$('#diskFsWidthZFS').prop('disabled',true);
} else if ($('#diskFsType').val().indexOf('zfs') != -1) {
} else if (($('#diskFsType').val()||'').indexOf('zfs') != -1) {
$('#diskFsProfileBTRFS').css('display','none');
$('#diskFsProfileBTRFS').prop('disabled',true);
$('#diskFsProfileZFS').css('display','inline');
@@ -393,7 +393,7 @@ $(function() {
$('div[id=title]:first').append(ctrl);
<?endif;?>
<?endif;?>
<?if (strpos($disk['status'],'_NP')===false):?>
<?if (strpos($disk['status']??'','_NP')===false):?>
var form = document.smart_settings;
<?if (!isset($disk['smType'])):?>
form.smType.selectedIndex = 0;
@@ -428,7 +428,7 @@ $(function() {
}
});
}
selectDiskFsProfile(<?=$disk['devices']?>,<?=$disk['fsWidth']?>);
selectDiskFsProfile(<?=$disk['devices']??0?>,<?=$disk['fsWidth']??0?>);
});
</script>
@@ -442,7 +442,7 @@ _(Name)_:
: <?=_(my_disk($name),3)?>
<?endif;?>
<?if (strpos($disk['status'],'_NP')!==false):?>
<?if (strpos($disk['status']??'','_NP')!==false):?>
_(Identification)_:
: _(No device)_
@@ -452,7 +452,7 @@ _(Identification)_:
<?endif;?>
<?if (!$unassigned):?>
<?if ($disk['type']=='Data' || ($disk['type']=='Cache' && in_array($disk['name'],$pools))):?>
<?if ((isset($disk['type']) && ($disk['type']=='Data' || $disk['type']=='Cache')) && in_array($disk['name'],$pools)):?>
_(Comments)_:
: <input type="text" name="diskComment.<?=$disk['idx']?>" maxlength="256" value="<?=htmlspecialchars($disk['comment'])?>">
@@ -460,12 +460,12 @@ _(Comments)_:
<?endif;?>
_(Partition size)_:
: <?=my_number($disk['sizeSb'])?> KB (K=1024)
: <?=my_number($disk['size'])?> KB (K=1024)
_(Partition format)_:
: <?=_($disk['format'])?>
<?if ($var['spinupGroups']=="yes" && ($disk['type']=="Data" || $disk['type']=="Parity")):?>
<?if ($var['spinupGroups']=="yes" && (isset($disk['type']) && ($disk['type']=="Data" || $disk['type']=="Parity"))):?>
_(Spinup group(s))_:
: <input type="text" name="diskSpinupGroup.<?=$disk['idx']?>" maxlength="256" value="<?=$disk['spinupGroup']?>">
@@ -489,12 +489,12 @@ _(Spin down delay)_:
</select><span id="smart_selftest" class='orange-text'></span>
<?endif;?>
<?if ($disk['type']=="Data" || in_array($tag,$pools)):?>
<?if ((isset($disk['type']) && $disk['type']=="Data") || in_array($tag,$pools)):?>
_(File system status)_:
: <?=_($disk['fsStatus'])?>&nbsp;
<?$disabled = (($var['fsState']=="Stopped" && $var['mdState']=="SWAP_DSBL") || $disk['fsStatus']=='Mounted') || !empty($disk['uuid']) ? "disabled" : ""?>
<?if ($disk['type']=="Data" || (isset($disk['slots']) && $disk['slots']==1)):?>
<?if ((isset($disk['type']) && $disk['type']=="Data") || (isset($disk['slots']) && $disk['slots']==1)):?>
_(File system type)_:
: <select id="diskFsType" name="diskFsType.<?=$disk['idx']?>" <?=$disabled?>>
<?=mk_option($disk['fsType'], "auto", _('auto'))?>
@@ -512,7 +512,7 @@ _(File system type)_:
<?elseif (isset($disk['slots']) && $disk['slots']>1):?>
_(File system type)_:
: <select id="diskFsType" name="diskFsType.<?=$disk['idx']?>" <?=$disabled?> onchange="selectDiskFsProfile(<?=$disk['devices']?>,0)">
: <select id="diskFsType" name="diskFsType.<?=$disk['idx']?>" <?=$disabled?> onchange="selectDiskFsProfile(<?=$disk['devices']??''?>,0)">
<?=mk_option($disk['fsType'], "auto", _('auto'))?>
<?=mk_option($disk['fsType'], "zfs", _('zfs'))?>
<?=mk_option($disk['fsType'], "btrfs", _('btrfs'))?>
@@ -527,7 +527,7 @@ _(File system type)_:
<?if ($disk['devices']>=4) echo mk_option($disk['fsProfile'],"raid10", _('raid10'))?>
<?if ($disk['devices']>=3) echo mk_option($disk['fsProfile'],"raid5", _('raid5'))?>
<?if ($disk['devices']>=4) echo mk_option($disk['fsProfile'],"raid6", _('raid6'))?>
</select><select id="diskFsProfileZFS" name="diskFsProfile.<?=$disk['idx']?>" <?=$disabled?> onchange="selectDiskFsWidth(<?=$disk['devices']?>,0)">
</select><select id="diskFsProfileZFS" name="diskFsProfile.<?=$disk['idx']?>" <?=$disabled?> onchange="selectDiskFsWidth(<?=$disk['devices']??''?>,0)">
<?if ($disk['devices']==1) echo mk_option($disk['fsProfile'],"", _('single'))?>
<?if ($disk['devices']>=2) echo mk_option($disk['fsProfile'],"", _('raid0'))?>
<?if (($disk['devices']%2)==0 || ($disk['devices']%3)==0 || ($disk['devices']%4)==0) echo mk_option($disk['fsProfile'],"mirror", _('mirror'))?>
@@ -568,11 +568,11 @@ _(Critical disk utilization threshold)_ (%):
&nbsp;
: <input type="submit" name="changeDisk" value="_(Apply)_" disabled><input type="button" value="_(Done)_" onclick="done()">
<?$erasable=false?>
<?if ($disk['type']=='Data' || $disk['type']=='Parity'):?>
<?if ($var['fsState']=="Stopped" && strpos($disk['status'],'_NEW')!==FALSE):?>
<?if (isset($disk['type']) && ($disk['type']=='Data' || $disk['type']=='Parity')):?>
<?if ($var['fsState']=="Stopped" && strpos($disk['status']??'','_NEW')!==false):?>
<?$erasable=true?>
<?endif;?>
<?if ($var['fsState']=="Started" && $var['startMode']!="Normal" && $disk['type']=='Data'):?>
<?if ($var['fsState']=="Started" && $var['startMode']!="Normal" && (isset($disk['type']) && $disk['type']=='Data')):?>
<?$erasable=true?>
<?endif;?>
<input type="button" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
@@ -932,7 +932,7 @@ _(xfs_repair status)_:
</form>
<?endif;?>
<?if (strpos($disk['status'],'_NP')===false):?>
<?if (strpos($disk['status']??'','_NP')===false):?>
<div id="title"><span class="left"><i class="title fa fa-plus-square"></i>_(SMART Settings)_</span></div>
<form markdown="1" name="smart_settings" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareDeviceInfo(this)">