Merge pull request #1213 from bergware/master

PHP 8.1 support (round 1)
This commit is contained in:
tom mortensen
2022-12-05 09:39:55 -08:00
committed by GitHub
10 changed files with 336 additions and 336 deletions

View File

@@ -36,7 +36,7 @@ $ALLOWED_UPC_ENV_VALS = [
'development',
'local',
];
$UPC_ENV_CK = in_array($_COOKIE['UPC_ENV'], $ALLOWED_UPC_ENV_VALS)
$UPC_ENV_CK = in_array($_COOKIE['UPC_ENV']??'', $ALLOWED_UPC_ENV_VALS)
? $_COOKIE['UPC_ENV']
: null;
// Determine what source we should use for web components

View File

@@ -857,42 +857,42 @@ _(Critical disk temperature threshold)_ (&deg;<?=$display['unit']?>):
_(SMART notification value)_:
: <select name="smSelect">
<?=mk_option($disk['smSelect'], "-1", _('Use default'))?>
<?=mk_option($disk['smSelect'], "0", _('Raw'))?>
<?=mk_option($disk['smSelect'], "1", _('Normalized'))?>
<?=mk_option($disk['smSelect']??'', "-1", _('Use default'))?>
<?=mk_option($disk['smSelect']??'', "0", _('Raw'))?>
<?=mk_option($disk['smSelect']??'', "1", _('Normalized'))?>
</select>
:info_smart_notifications_help:
_(SMART notification tolerance level)_:
: <select name="smLevel">
<?=mk_option($disk['smLevel'], "-1", _('Use default'))?>
<?=mk_option($disk['smLevel'], "1.00", _('Absolute'))?>
<?=mk_option($disk['smLevel'], "1.05", "5%")?>
<?=mk_option($disk['smLevel'], "1.10", "10%")?>
<?=mk_option($disk['smLevel'], "1.15", "15%")?>
<?=mk_option($disk['smLevel'], "1.20", "20%")?>
<?=mk_option($disk['smLevel'], "1.25", "25%")?>
<?=mk_option($disk['smLevel'], "1.50", "50%")?>
<?=mk_option($disk['smLevel']??'', "-1", _('Use default'))?>
<?=mk_option($disk['smLevel']??'', "1.00", _('Absolute'))?>
<?=mk_option($disk['smLevel']??'', "1.05", "5%")?>
<?=mk_option($disk['smLevel']??'', "1.10", "10%")?>
<?=mk_option($disk['smLevel']??'', "1.15", "15%")?>
<?=mk_option($disk['smLevel']??'', "1.20", "20%")?>
<?=mk_option($disk['smLevel']??'', "1.25", "25%")?>
<?=mk_option($disk['smLevel']??'', "1.50", "50%")?>
</select>
:info_tolerance_level_help:
_(SMART controller type)_:
: <select name="smType" onchange="setGlue(this.form,true)">
<?=mk_option($disk['smType'], "-1", _('Use default'))?>
<?=mk_option($disk['smType'], " ", _('Automatic'))?>
<?=mk_option($disk['smType'], "-d ata", "ATA")?>
<?=mk_option($disk['smType'], "-d nvme", "NVMe")?>
<?=mk_option($disk['smType'], "-d sat", "SAT")?>
<?=mk_option($disk['smType'], "-d scsi", "SCSI")?>
<?=mk_option($disk['smType'], "-d 3ware", "3Ware")?>
<?=mk_option($disk['smType'], "-d aacraid", "Adaptec")?>
<?=mk_option($disk['smType'], "-d areca", "Areca")?>
<?=mk_option($disk['smType'], "-d hpt", "HighPoint")?>
<?=mk_option($disk['smType'], "-d cciss", "HP cciss")?>
<?=mk_option($disk['smType'], "-d marvell", "Marvell")?>
<?=mk_option($disk['smType'], "-d megaraid", "MegaRAID")?>
<?=mk_option($disk['smType']??'', "-1", _('Use default'))?>
<?=mk_option($disk['smType']??'', " ", _('Automatic'))?>
<?=mk_option($disk['smType']??'', "-d ata", "ATA")?>
<?=mk_option($disk['smType']??'', "-d nvme", "NVMe")?>
<?=mk_option($disk['smType']??'', "-d sat", "SAT")?>
<?=mk_option($disk['smType']??'', "-d scsi", "SCSI")?>
<?=mk_option($disk['smType']??'', "-d 3ware", "3Ware")?>
<?=mk_option($disk['smType']??'', "-d aacraid", "Adaptec")?>
<?=mk_option($disk['smType']??'', "-d areca", "Areca")?>
<?=mk_option($disk['smType']??'', "-d hpt", "HighPoint")?>
<?=mk_option($disk['smType']??'', "-d cciss", "HP cciss")?>
<?=mk_option($disk['smType']??'', "-d marvell", "Marvell")?>
<?=mk_option($disk['smType']??'', "-d megaraid", "MegaRAID")?>
</select>
<input type="text" name="smPort1" value="<?=$disk['smPort1']??''?>" class="option"><select name="smPort1" class="narrow option" disabled></select>
<input type="text" name="smPort2" value="<?=$disk['smPort2']??''?>" class="option"><select name="smPort2" class="narrow option" disabled></select>
@@ -906,7 +906,7 @@ _(SMART attribute notifications)_:
<?for ($x=0; $x < count($preselect); $x++):?>
&nbsp;
: <input type="checkbox" name="at<?=$x?>" value="<?=$preselect[$x]['code']?>"<?=in_array($preselect[$x]['code'],$events)?' checked':''?>><span class="code">_(Attribute)_ = <?=$preselect[$x]['code']?></span><?=$preselect[$x]['text']?>
: <input type="checkbox" name="at<?=$x?>" value="<?=$preselect[$x]['code']??''?>"<?=in_array($preselect[$x]['code']??'',$events)?' checked':''?>><span class="code">_(Attribute)_ = <?=$preselect[$x]['code']?></span><?=$preselect[$x]['text']?>
<?endfor;?>
:info_attribute_notifications_help:

View File

@@ -198,39 +198,39 @@ _(Default critical disk temperature threshold)_ (&deg;<?=$display['unit']?>):
<input type="hidden" name="smIndex" value="0">
_(Default SMART notification value)_:
: <select name="smSelect" size="1">
<?=mk_option($var['smSelect'], "0", _('Raw'))?>
<?=mk_option($var['smSelect'], "1", _('Normalized'))?>
<?=mk_option($var['smSelect']??'', "0", _('Raw'))?>
<?=mk_option($var['smSelect']??'', "1", _('Normalized'))?>
</select>
:disk_default_smart_notification_help:
_(Default SMART notification tolerance level)_:
: <select name="smLevel" size="1">
<?=mk_option($var['smLevel'], "1.00", _('Absolute'))?>
<?=mk_option($var['smLevel'], "1.05", "5%")?>
<?=mk_option($var['smLevel'], "1.10", "10%")?>
<?=mk_option($var['smLevel'], "1.15", "15%")?>
<?=mk_option($var['smLevel'], "1.20", "20%")?>
<?=mk_option($var['smLevel'], "1.25", "25%")?>
<?=mk_option($var['smLevel'], "1.50", "50%")?>
<?=mk_option($var['smLevel']??'', "1.00", _('Absolute'))?>
<?=mk_option($var['smLevel']??'', "1.05", "5%")?>
<?=mk_option($var['smLevel']??'', "1.10", "10%")?>
<?=mk_option($var['smLevel']??'', "1.15", "15%")?>
<?=mk_option($var['smLevel']??'', "1.20", "20%")?>
<?=mk_option($var['smLevel']??'', "1.25", "25%")?>
<?=mk_option($var['smLevel']??'', "1.50", "50%")?>
</select>
:disk_default_smart_tolerance_help:
_(Default SMART controller type)_:
: <select name="smType" size="1" onchange="setIndex(this.form)">
<?=mk_option($var['smType'], "", _('Automatic'))?>
<?=mk_option($var['smType'], "-d ata", "ATA")?>
<?=mk_option($var['smType'], "-d nvme", "NVMe")?>
<?=mk_option($var['smType'], "-d sat", "SAT")?>
<?=mk_option($var['smType'], "-d scsi", "SCSI")?>
<?=mk_option($var['smType'], "-d 3ware", "3Ware")?>
<?=mk_option($var['smType'], "-d aacraid", "Adaptec")?>
<?=mk_option($var['smType'], "-d areca", "Areca")?>
<?=mk_option($var['smType'], "-d hpt", "HighPoint")?>
<?=mk_option($var['smType'], "-d cciss", "HP cciss")?>
<?=mk_option($var['smType'], "-d marvell", "Marvell")?>
<?=mk_option($var['smType'], "-d megaraid", "MegaRAID")?>
<?=mk_option($var['smType']??'', "", _('Automatic'))?>
<?=mk_option($var['smType']??'', "-d ata", "ATA")?>
<?=mk_option($var['smType']??'', "-d nvme", "NVMe")?>
<?=mk_option($var['smType']??'', "-d sat", "SAT")?>
<?=mk_option($var['smType']??'', "-d scsi", "SCSI")?>
<?=mk_option($var['smType']??'', "-d 3ware", "3Ware")?>
<?=mk_option($var['smType']??'', "-d aacraid", "Adaptec")?>
<?=mk_option($var['smType']??'', "-d areca", "Areca")?>
<?=mk_option($var['smType']??'', "-d hpt", "HighPoint")?>
<?=mk_option($var['smType']??'', "-d cciss", "HP cciss")?>
<?=mk_option($var['smType']??'', "-d marvell", "Marvell")?>
<?=mk_option($var['smType']??'', "-d megaraid", "MegaRAID")?>
</select>
:disk_default_smart_controller_help:
@@ -240,7 +240,7 @@ _(Default SMART attribute notifications)_:
<?for ($x = 0; $x < count($preselect); $x++):?>
&nbsp;
: <input type="checkbox" name="at<?=$x?>" value="<?=$preselect[$x]['code']?>"<?=in_array($preselect[$x]['code'],$events)?' checked':''?>><span class="code">_(Attribute)_ = <?=$preselect[$x]['code']?></span><?=$preselect[$x]['text']?>
: <input type="checkbox" name="at<?=$x?>" value="<?=$preselect[$x]['code']??''?>"<?=in_array($preselect[$x]['code']??'',$events)?' checked':''?>><span class="code">_(Attribute)_ = <?=$preselect[$x]['code']?></span><?=$preselect[$x]['text']?>
<?endfor;?>
:disk_default_smart_attribute_help:

View File

@@ -462,8 +462,8 @@ _(MAC address)_:
_(Enable bonding)_:
: <select name="BONDING" onchange="checkBondingSettings(this.form,1,'eth0')">
<?=mk_option($eth0['BONDING'], "no", _("No"))?>
<?=mk_option($eth0['BONDING'], "yes", _("Yes"))?>
<?=mk_option($eth0['BONDING']??'', "no", _("No"))?>
<?=mk_option($eth0['BONDING']??'', "yes", _("Yes"))?>
</select>
:eth_enable_bonding_help:
@@ -471,13 +471,13 @@ _(Enable bonding)_:
<div markdown="1" id="bond-members-eth0" style="display:none">
_(Bonding mode)_:
: <select name="BONDING_MODE" onchange="checkBondingSettings(this.form,-1,'eth0')">
<?=mk_option($eth0['BONDING_MODE'], "0", _("balance-rr")." (0)")?>
<?=mk_option($eth0['BONDING_MODE'], "1", _("active-backup")." (1)",isset($eth0['BONDING_MODE'])?'':'selected')?>
<?=mk_option($eth0['BONDING_MODE'], "2", _("balance-xor")." (2)")?>
<?=mk_option($eth0['BONDING_MODE'], "3", _("broadcast")." (3)")?>
<?=mk_option($eth0['BONDING_MODE'], "4", _("802.3ad")." (4)")?>
<?=mk_option($eth0['BONDING_MODE'], "5", _("balance-tlb")." (5)")?>
<?=mk_option($eth0['BONDING_MODE'], "6", _("balance-alb")." (6)")?>
<?=mk_option($eth0['BONDING_MODE']??'', "0", _("balance-rr")." (0)")?>
<?=mk_option($eth0['BONDING_MODE']??'', "1", _("active-backup")." (1)",isset($eth0['BONDING_MODE'])?'':'selected')?>
<?=mk_option($eth0['BONDING_MODE']??'', "2", _("balance-xor")." (2)")?>
<?=mk_option($eth0['BONDING_MODE']??'', "3", _("broadcast")." (3)")?>
<?=mk_option($eth0['BONDING_MODE']??'', "4", _("802.3ad")." (4)")?>
<?=mk_option($eth0['BONDING_MODE']??'', "5", _("balance-tlb")." (5)")?>
<?=mk_option($eth0['BONDING_MODE']??'', "6", _("balance-alb")." (6)")?>
</select>
<span id="attention0" style="display:none">**_(Attention)_:** _(this mode requires a network switch with proper setup and support)_...</span>
@@ -485,9 +485,9 @@ _(Bonding mode)_:
_(Bonding members of)_ bond0:
: <select id="bond-eth0" name="BONDNICS" multiple="multiple" style="display:none">
<?=mk_option($eth0['BONDNICS'],'eth0','eth0','selected disabled')?>
<?=mk_option($eth0['BONDNICS']??'','eth0','eth0','selected disabled')?>
<?foreach ($ports as $port):?>
<?if (!locked('eth0',$port)) echo mk_option_check($eth0['BONDNICS'],$port,$port)?>
<?if (!locked('eth0',$port)) echo mk_option_check($eth0['BONDNICS']??'',$port,$port)?>
<?endforeach;?>
</select>
@@ -496,8 +496,8 @@ _(Bonding members of)_ bond0:
</div>
_(Enable bridging)_:
: <select name="BRIDGING" onchange="checkBridgingSettings(this.form,1,'eth0')">
<?=mk_option($eth0['BRIDGING'], "no", _("No"))?>
<?=mk_option($eth0['BRIDGING'], "yes", _("Yes"))?>
<?=mk_option($eth0['BRIDGING']??'', "no", _("No"))?>
<?=mk_option($eth0['BRIDGING']??'', "yes", _("Yes"))?>
</select>
:eth_enable_bridging_help:
@@ -505,9 +505,9 @@ _(Enable bridging)_:
<div markdown="1" id="bridge-members-eth0" style="display:none">
_(Bridging members of)_ br0:
: <select id="bridge-eth0" name="BRNICS" multiple="multiple" style="display:none">
<?=mk_option($eth0['BRNICS'],'eth0','eth0','selected disabled')?>
<?=mk_option($eth0['BRNICS']??'','eth0','eth0','selected disabled')?>
<?foreach ($ports as $port):?>
<?if (!locked('eth0',$port)) echo mk_option_check($eth0['BRNICS'],$port,$port)?>
<?if (!locked('eth0',$port)) echo mk_option_check($eth0['BRNICS']??'',$port,$port)?>
<?endforeach;?>
</select>
@@ -516,9 +516,9 @@ _(Bridging members of)_ br0:
</div>
_(Network protocol)_:
: <select name="PROTOCOL:0" onchange="selectProtocol(this.form,'eth0',0)">
<?=mk_option($eth0["PROTOCOL:0"], 'ipv4', _('IPv4 only'))?>
<?=mk_option($eth0["PROTOCOL:0"], 'ipv6', _('IPv6 only'))?>
<?=mk_option($eth0["PROTOCOL:0"], 'ipv4+ipv6', _('IPv4 + IPv6'))?>
<?=mk_option($eth0["PROTOCOL:0"]??'', 'ipv4', _('IPv4 only'))?>
<?=mk_option($eth0["PROTOCOL:0"]??'', 'ipv6', _('IPv6 only'))?>
<?=mk_option($eth0["PROTOCOL:0"]??'', 'ipv4+ipv6', _('IPv4 + IPv6'))?>
</select>
:eth_network_protocol_help:
@@ -526,8 +526,8 @@ _(Network protocol)_:
<div markdown="1" class="ipv4-eth0-0" style="display:none">
_(IPv4 address assignment)_:
: <select name="USE_DHCP:0" onchange="selectProtocol(this.form,'eth0',0)">
<?=mk_option($eth0["USE_DHCP:0"], 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP:0"], 'no', _('Static'))?>
<?=mk_option($eth0["USE_DHCP:0"]??'', 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP:0"]??'', 'no', _('Static'))?>
</select>
:eth_ipv4_address_assignment_help:
@@ -535,22 +535,22 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-eth0-0" style="display:none">
_(IPv4 address)_:
: <input type="text" name="IPADDR:0" maxlength="15" value="<?=$eth0["IPADDR:0"]??''?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:0" class="slim">
<?=mk_option($eth0["NETMASK:0"], "255.0.0.0", "8")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.0.0", "16")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.128.0", "17")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.192.0", "18")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.224.0", "19")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.240.0", "20")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.248.0", "21")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.252.0", "22")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.254.0", "23")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.255.0", "24", $eth0["IPADDR:0"]?"":"selected")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.255.128", "25")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.255.192", "26")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.255.224", "27")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.255.240", "28")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.255.248", "29")?>
<?=mk_option($eth0["NETMASK:0"], "255.255.255.252", "30")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.0.0.0", "8")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.0.0", "16")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.128.0", "17")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.192.0", "18")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.224.0", "19")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.240.0", "20")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.248.0", "21")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.252.0", "22")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.254.0", "23")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.255.0", "24", $eth0["IPADDR:0"]?"":"selected")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.255.128", "25")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.255.192", "26")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.255.224", "27")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.255.240", "28")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.255.248", "29")?>
<?=mk_option($eth0["NETMASK:0"]??'', "255.255.255.252", "30")?>
</select>
:eth_ipv4_address_help:
@@ -564,8 +564,8 @@ _(IPv4 default gateway)_:
</div>
_(IPv4 DNS server assignment)_:
: <select name="DHCP_KEEPRESOLV" onchange="checkDNSSettings(this.form)">
<?=mk_option($eth0['DHCP_KEEPRESOLV'], "no", _("Automatic"))?>
<?=mk_option($eth0['DHCP_KEEPRESOLV'], "yes", _("Static"))?>
<?=mk_option($eth0['DHCP_KEEPRESOLV']??'', "no", _("Automatic"))?>
<?=mk_option($eth0['DHCP_KEEPRESOLV']??'', "yes", _("Static"))?>
</select>
:eth_ipv4_dns_server_assignment_help:
@@ -593,8 +593,8 @@ _(IPv4 DNS server)_ 3:
<div markdown="1" class="ipv6-eth0-0" style="display:none">
_(IPv6 address assignment)_:
: <select name="USE_DHCP6:0" onchange="selectProtocol(this.form,'eth0',0)">
<?=mk_option($eth0["USE_DHCP6:0"], 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP6:0"], 'no', _('Static'))?>
<?=mk_option($eth0["USE_DHCP6:0"]??'', 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP6:0"]??'', 'no', _('Static'))?>
</select>
:eth_ipv6_address_assignment_help:
@@ -613,8 +613,8 @@ _(IPv6 default gateway)_:
_(IPv6 privacy extensions)_:
: <select name="PRIVACY6:0">
<?=mk_option($eth0["PRIVACY6:0"], "0", _("Disabled"))?>
<?=mk_option($eth0["PRIVACY6:0"], "2", _("Enabled"))?>
<?=mk_option($eth0["PRIVACY6:0"]??'', "0", _("Disabled"))?>
<?=mk_option($eth0["PRIVACY6:0"]??'', "2", _("Enabled"))?>
</select>
:eth_ipv6_privacy_extensions_help:
@@ -623,8 +623,8 @@ _(IPv6 privacy extensions)_:
<div markdown="1" id="dns6server1" style="display:none">
_(IPv6 DNS server assignment)_:
: <select name="DHCP6_KEEPRESOLV" onchange="checkDNSSettings6(this.form)">
<?=mk_option($eth0['DHCP6_KEEPRESOLV'], "no", _("Automatic"))?>
<?=mk_option($eth0['DHCP6_KEEPRESOLV'], "yes", _("Static"))?>
<?=mk_option($eth0['DHCP6_KEEPRESOLV']??'', "no", _("Automatic"))?>
<?=mk_option($eth0['DHCP6_KEEPRESOLV']??'', "yes", _("Static"))?>
</select>
:eth_ipv6_dns_server_assignment_help:
@@ -657,8 +657,8 @@ _(Desired MTU)_:
_(Enable VLANs)_:
: <select name="TYPE" onchange="checkNetworkAccess(this.form,'eth0')">
<?=mk_option($eth0['TYPE'], 'access', _('No'))?>
<?=mk_option($eth0['TYPE'], 'trunk', _('Yes'))?>
<?=mk_option($eth0['TYPE']??'', 'access', _('No'))?>
<?=mk_option($eth0['TYPE']??'', 'trunk', _('Yes'))?>
</select>
:eth_enable_vlans_help:
@@ -682,9 +682,9 @@ _(VLAN number)_:
_(Network protocol)_:
: <select name="PROTOCOL:<?=$i?>" onchange="selectProtocol(this.form,'eth0',<?=$i?>)">
<?=mk_option($eth0["PROTOCOL:$i"], 'ipv4', _('IPv4 only'))?>
<?=mk_option($eth0["PROTOCOL:$i"], 'ipv6', _('IPv6 only'))?>
<?=mk_option($eth0["PROTOCOL:$i"], 'ipv4+ipv6', _('IPv4 + IPv6'))?>
<?=mk_option($eth0["PROTOCOL:$i"]??'', 'ipv4', _('IPv4 only'))?>
<?=mk_option($eth0["PROTOCOL:$i"]??'', 'ipv6', _('IPv6 only'))?>
<?=mk_option($eth0["PROTOCOL:$i"]??'', 'ipv4+ipv6', _('IPv4 + IPv6'))?>
</select>
:eth_network_protocol_help:
@@ -692,10 +692,10 @@ _(Network protocol)_:
<div markdown="1" class="ipv4-eth0-<?=$i?>" style="display:none">
_(IPv4 address assignment)_:
: <select name="USE_DHCP:<?=$i?>" onchange="selectProtocol(this.form,'eth0',<?=$i?>)">
<?=mk_option($eth0["USE_DHCP:$i"], 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP:$i"], 'no', _('Static'))?>
<?=mk_option($eth0["USE_DHCP:$i"]??'', 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP:$i"]??'', 'no', _('Static'))?>
<?if ($i>0):?>
<?=mk_option($eth0["USE_DHCP:$i"], '', _('None'))?>
<?=mk_option($eth0["USE_DHCP:$i"]??'', '', _('None'))?>
<?endif;?>
</select>
@@ -704,22 +704,22 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-eth0-<?=$i?>" style="display:none">
_(IPv4 address)_:
: <input type="text" name="IPADDR:<?=$i?>" maxlength="15" value="<?=$eth0["IPADDR:$i"]??''?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:<?=$i?>" class="slim">
<?=mk_option($eth0["NETMASK:$i"], "255.0.0.0", "8")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.0.0", "16")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.128.0", "17")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.192.0", "18")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.224.0", "19")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.240.0", "20")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.248.0", "21")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.252.0", "22")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.254.0", "23")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.255.0", "24", $eth0["IPADDR:$i"]?"":"selected")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.255.128", "25")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.255.192", "26")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.255.224", "27")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.255.240", "28")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.255.248", "29")?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.255.252", "30")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.0.0.0", "8")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.0.0", "16")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.128.0", "17")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.192.0", "18")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.224.0", "19")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.240.0", "20")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.248.0", "21")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.252.0", "22")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.254.0", "23")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.255.0", "24", $eth0["IPADDR:$i"]??''?"":"selected")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.255.128", "25")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.255.192", "26")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.255.224", "27")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.255.240", "28")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.255.248", "29")?>
<?=mk_option($eth0["NETMASK:$i"]??'', "255.255.255.252", "30")?>
</select>
:eth_ipv4_address_help:
@@ -735,10 +735,10 @@ _(IPv4 default gateway)_:
<div markdown="1" class="ipv6-eth0-<?=$i?>" style="display:none">
_(IPv6 address assignment)_:
: <select name="USE_DHCP6:<?=$i?>" onchange="selectProtocol(this.form,'eth0',<?=$i?>)">
<?=mk_option($eth0["USE_DHCP6:$i"], 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP6:$i"], 'no', _('Static'))?>
<?=mk_option($eth0["USE_DHCP6:$i"]??'', 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP6:$i"]??'', 'no', _('Static'))?>
<?if ($i>0):?>
<?=mk_option($eth0["USE_DHCP6:$i"], '', _('None'))?>
<?=mk_option($eth0["USE_DHCP6:$i"]??'', '', _('None'))?>
<?endif;?>
</select>
@@ -758,8 +758,8 @@ _(IPv6 default gateway)_:
_(IPv6 privacy extensions)_:
: <select name="PRIVACY6:<?=$i?>">
<?=mk_option($eth0["PRIVACY6:$i"], "0", _("Disabled"))?>
<?=mk_option($eth0["PRIVACY6:$i"], "2", _("Enabled"))?>
<?=mk_option($eth0["PRIVACY6:$i"]??'', "0", _("Disabled"))?>
<?=mk_option($eth0["PRIVACY6:$i"]??'', "2", _("Enabled"))?>
</select>
:eth_ipv6_privacy_extensions_help:
@@ -790,38 +790,38 @@ _(VLAN number)_:
_(Network protocol)_:
: <select name="PROTOCOL:INDEX" onchange="selectProtocol(this.form,'eth0',INDEX)">
<?=mk_option($eth0["PROTOCOL:INDEX"], 'ipv4', _('IPv4 only'))?>
<?=mk_option($eth0["PROTOCOL:INDEX"], 'ipv6', _('IPv6 only'))?>
<?=mk_option($eth0["PROTOCOL:INDEX"], 'ipv4+ipv6', _('IPv4 + IPv6'))?>
<?=mk_option($eth0["PROTOCOL:INDEX"]??'', 'ipv4', _('IPv4 only'))?>
<?=mk_option($eth0["PROTOCOL:INDEX"]??'', 'ipv6', _('IPv6 only'))?>
<?=mk_option($eth0["PROTOCOL:INDEX"]??'', 'ipv4+ipv6', _('IPv4 + IPv6'))?>
</select>
<div markdown="1" class="ipv4-eth0-INDEX" style="display:none">
_(IPv4 address assignment)_:
: <select name="USE_DHCP:INDEX" onchange="selectProtocol(this.form,'eth0',INDEX)">
<?=mk_option($eth0["USE_DHCP:INDEX"], 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP:INDEX"], 'no', _('Static'))?>
<?=mk_option($eth0["USE_DHCP:INDEX"], '', _('None'))?>
<?=mk_option($eth0["USE_DHCP:INDEX"]??'', 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP:INDEX"]??'', 'no', _('Static'))?>
<?=mk_option($eth0["USE_DHCP:INDEX"]??'', '', _('None'))?>
</select>
<div markdown="1" class="more-ipv4-eth0-INDEX" style="display:none">
_(IPv4 address)_:
: <input type="text" name="IPADDR:INDEX" maxlength="15" value="<?=$eth0["IPADDR:INDEX"]??''?>" class="narrow" pattern="<?=$validIP4?>" title="=_(IPv4 address A.B.C.D)_">/<select name="NETMASK:INDEX" class="slim">
<?=mk_option($eth0["NETMASK:INDEX"], "255.0.0.0", "8")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.0.0", "16")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.128.0", "17")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.192.0", "18")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.224.0", "19")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.240.0", "20")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.248.0", "21")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.252.0", "22")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.254.0", "23")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.0", "24", "selected")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.128", "25")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.192", "26")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.224", "27")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.240", "28")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.248", "29")?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.252", "30")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.0.0.0", "8")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.0.0", "16")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.128.0", "17")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.192.0", "18")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.224.0", "19")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.240.0", "20")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.248.0", "21")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.252.0", "22")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.254.0", "23")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.255.0", "24", "selected")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.255.128", "25")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.255.192", "26")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.255.224", "27")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.255.240", "28")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.255.248", "29")?>
<?=mk_option($eth0["NETMASK:INDEX"]??'', "255.255.255.252", "30")?>
</select>
_(IPv4 default gateway)_:
@@ -833,9 +833,9 @@ _(IPv4 default gateway)_:
<div markdown="1" class="ipv6-eth0-INDEX" style="display:none">
_(IPv6 address assignment)_:
: <select name="USE_DHCP6:INDEX" onchange="selectProtocol(this.form,'eth0',INDEX)">
<?=mk_option($eth0["USE_DHCP6:INDEX"], 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP6:INDEX"], 'no', _('Static'))?>
<?=mk_option($eth0["USE_DHCP6:INDEX"], '', _('None'))?>
<?=mk_option($eth0["USE_DHCP6:INDEX"]??'', 'yes', _('Automatic'))?>
<?=mk_option($eth0["USE_DHCP6:INDEX"]??'', 'no', _('Static'))?>
<?=mk_option($eth0["USE_DHCP6:INDEX"]??'', '', _('None'))?>
</select>
<div markdown="1" class="more-ipv6-eth0-INDEX" style="display:none">
@@ -848,8 +848,8 @@ _(IPv6 default gateway)_:
_(IPv6 privacy extensions)_:
: <select name="PRIVACY6:INDEX">
<?=mk_option($eth0['PRIVACY6:INDEX'], "0", _("Disabled"))?>
<?=mk_option($eth0['PRIVACY6:INDEX'], "2", _("Enabled"))?>
<?=mk_option($eth0['PRIVACY6:INDEX']??'', "0", _("Disabled"))?>
<?=mk_option($eth0['PRIVACY6:INDEX']??'', "2", _("Enabled"))?>
</select>
</div>

View File

@@ -114,8 +114,8 @@ _(MAC address)_:
<div markdown="1" class="slave-ethX">
_(Enable bonding)_:
: <select name="BONDING" onchange="checkBondingSettings(this.form,1,'ethX')">
<?=mk_option($ethX['BONDING'], "no", _("No"))?>
<?=mk_option($ethX['BONDING'], "yes", _("Yes"))?>
<?=mk_option($ethX['BONDING']??'', "no", _("No"))?>
<?=mk_option($ethX['BONDING']??'', "yes", _("Yes"))?>
</select>
:eth_enable_bonding_help:
@@ -123,13 +123,13 @@ _(Enable bonding)_:
<div markdown="1" id="bond-members-ethX" style="display:none">
_(Bonding mode)_:
: <select name="BONDING_MODE" onchange="checkBondingSettings(this.form,-1,'ethX')">
<?=mk_option($ethX['BONDING_MODE'], "0", _("balance-rr")." (0)")?>
<?=mk_option($ethX['BONDING_MODE'], "1", _("active-backup")." (1)",isset($ethX['BONDING_MODE'])?'':'selected')?>
<?=mk_option($ethX['BONDING_MODE'], "2", _("balance-xor")." (2)")?>
<?=mk_option($ethX['BONDING_MODE'], "3", _("broadcast")." (3)")?>
<?=mk_option($ethX['BONDING_MODE'], "4", _("802.3ad")." (4)")?>
<?=mk_option($ethX['BONDING_MODE'], "5", _("balance-tlb")." (5)")?>
<?=mk_option($ethX['BONDING_MODE'], "6", _("balance-alb")." (6)")?>
<?=mk_option($ethX['BONDING_MODE']??'', "0", _("balance-rr")." (0)")?>
<?=mk_option($ethX['BONDING_MODE']??'', "1", _("active-backup")." (1)",isset($ethX['BONDING_MODE'])?'':'selected')?>
<?=mk_option($ethX['BONDING_MODE']??'', "2", _("balance-xor")." (2)")?>
<?=mk_option($ethX['BONDING_MODE']??'', "3", _("broadcast")." (3)")?>
<?=mk_option($ethX['BONDING_MODE']??'', "4", _("802.3ad")." (4)")?>
<?=mk_option($ethX['BONDING_MODE']??'', "5", _("balance-tlb")." (5)")?>
<?=mk_option($ethX['BONDING_MODE']??'', "6", _("balance-alb")." (6)")?>
</select>
<span id="attention0" style="display:none">**_(Attention)_:** _(this mode requires a network switch with proper setup and support)_...</span>
@@ -137,9 +137,9 @@ _(Bonding mode)_:
_(Bonding members of)_ bondX:
: <select id="bond-ethX" name="BONDNICS" multiple="multiple" style="display:none">
<?=mk_option($ethX['BONDNICS'],'ethX','ethX','selected disabled')?>
<?=mk_option($ethX['BONDNICS']??'','ethX','ethX','selected disabled')?>
<?foreach ($ports as $port):?>
<?if ($port!='ethX' && !locked('ethX',$port)) echo mk_option_check($ethX['BONDNICS'],$port,$port)?>
<?if ($port!='ethX' && !locked('ethX',$port)) echo mk_option_check($ethX['BONDNICS']??'',$port,$port)?>
<?endforeach;?>
</select>
@@ -148,8 +148,8 @@ _(Bonding members of)_ bondX:
</div>
_(Enable bridging)_:
: <select name="BRIDGING" onchange="checkBridgingSettings(this.form,1,'ethX')">
<?=mk_option($ethX['BRIDGING'], "no", _("No"))?>
<?=mk_option($ethX['BRIDGING'], "yes", _("Yes"))?>
<?=mk_option($ethX['BRIDGING']??'', "no", _("No"))?>
<?=mk_option($ethX['BRIDGING']??'', "yes", _("Yes"))?>
</select>
:eth_enable_bridging_help:
@@ -157,9 +157,9 @@ _(Enable bridging)_:
<div markdown="1" id="bridge-members-ethX" style="display:none">
_(Bridging members of)_ brX:
: <select id="bridge-ethX" name="BRNICS" multiple="multiple" style="display:none">
<?=mk_option($ethX['BRNICS'],'ethX','ethX','selected disabled')?>
<?=mk_option($ethX['BRNICS']??'','ethX','ethX','selected disabled')?>
<?foreach ($ports as $port):?>
<?if ($port!='ethX' && !locked('ethX',$port)) echo mk_option_check($ethX['BRNICS'],$port,$port)?>
<?if ($port!='ethX' && !locked('ethX',$port)) echo mk_option_check($ethX['BRNICS']??'',$port,$port)?>
<?endforeach;?>
</select>
@@ -168,9 +168,9 @@ _(Bridging members of)_ brX:
</div>
_(Network protocol)_:
: <select name="PROTOCOL:0" onchange="selectProtocol(this.form,'ethX',0)">
<?=mk_option($ethX["PROTOCOL:0"], 'ipv4', _('IPv4 only'))?>
<?=mk_option($ethX["PROTOCOL:0"], 'ipv6', _('IPv6 only'))?>
<?=mk_option($ethX["PROTOCOL:0"], 'ipv4+ipv6', _('IPv4 + IPv6'))?>
<?=mk_option($ethX["PROTOCOL:0"]??'', 'ipv4', _('IPv4 only'))?>
<?=mk_option($ethX["PROTOCOL:0"]??'', 'ipv6', _('IPv6 only'))?>
<?=mk_option($ethX["PROTOCOL:0"]??'', 'ipv4+ipv6', _('IPv4 + IPv6'))?>
</select>
:eth_network_protocol_help:
@@ -178,9 +178,9 @@ _(Network protocol)_:
<div markdown="1" class="ipv4-ethX-0" style="display:none">
_(IPv4 address assignment)_:
: <select name="USE_DHCP:0" onchange="selectProtocol(this.form,'ethX',0)">
<?=mk_option($ethX["USE_DHCP:0"], 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP:0"], 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP:0"], '', _('None'))?>
<?=mk_option($ethX["USE_DHCP:0"]??'', 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP:0"]??'', 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP:0"]??'', '', _('None'))?>
</select>
:eth_ipv4_address_assignment_help:
@@ -188,22 +188,22 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-ethX-0" style="display:none">
_(IPv4 address)_:
: <input type="text" name="IPADDR:0" maxlength="15" value="<?=$ethX["IPADDR:0"]??''?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:0" class="slim">
<?=mk_option($ethX["NETMASK:0"], "255.0.0.0", "8")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.0.0", "16")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.128.0", "17")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.192.0", "18")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.224.0", "19")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.240.0", "20")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.248.0", "21")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.252.0", "22")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.254.0", "23")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.255.0", "24", $ethX["IPADDR:0"]?"":"selected")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.255.128", "25")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.255.192", "26")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.255.224", "27")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.255.240", "28")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.255.248", "29")?>
<?=mk_option($ethX["NETMASK:0"], "255.255.255.252", "30")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.0.0.0", "8")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.0.0", "16")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.128.0", "17")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.192.0", "18")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.224.0", "19")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.240.0", "20")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.248.0", "21")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.252.0", "22")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.254.0", "23")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.255.0", "24", $ethX["IPADDR:0"]??''?"":"selected")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.255.128", "25")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.255.192", "26")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.255.224", "27")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.255.240", "28")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.255.248", "29")?>
<?=mk_option($ethX["NETMASK:0"]??'', "255.255.255.252", "30")?>
</select>
:eth_ipv4_address_help:
@@ -219,9 +219,9 @@ _(IPv4 default gateway)_:
<div markdown="1" class="ipv6-ethX-0" style="display:none">
_(IPv6 address assignment)_:
: <select name="USE_DHCP6:0" onchange="selectProtocol(this.form,'ethX',0)">
<?=mk_option($ethX["USE_DHCP6:0"], 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP6:0"], 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP6:0"], '', _('None'))?>
<?=mk_option($ethX["USE_DHCP6:0"]??'', 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP6:0"]??'', 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP6:0"]??'', '', _('None'))?>
</select>
:eth_ipv6_address_assignment_help:
@@ -240,8 +240,8 @@ _(IPv6 default gateway)_:
_(IPv6 privacy extensions)_:
: <select name="PRIVACY6:0">
<?=mk_option($ethX["PRIVACY6:0"], "0", _("Disabled"))?>
<?=mk_option($ethX["PRIVACY6:0"], "2", _("Enabled"))?>
<?=mk_option($ethX["PRIVACY6:0"]??'', "0", _("Disabled"))?>
<?=mk_option($ethX["PRIVACY6:0"]??'', "2", _("Enabled"))?>
</select>
:eth_ipv6_privacy_extensions_help:
@@ -255,8 +255,8 @@ _(Desired MTU)_:
_(Enable VLANs)_:
: <select name="TYPE" onchange="checkNetworkAccess(this.form,'ethX')">
<?=mk_option($ethX['TYPE'], 'access', _('No'))?>
<?=mk_option($ethX['TYPE'], 'trunk', _('Yes'))?>
<?=mk_option($ethX['TYPE']??'', 'access', _('No'))?>
<?=mk_option($ethX['TYPE']??'', 'trunk', _('Yes'))?>
</select>
:eth_enable_vlans_help:
@@ -281,9 +281,9 @@ _(VLAN number)_:
_(Network protocol)_:
: <select name="PROTOCOL:<?=$i?>" onchange="selectProtocol(this.form,'ethX',<?=$i?>)">
<?=mk_option($ethX["PROTOCOL:$i"], 'ipv4', _('IPv4 only'))?>
<?=mk_option($ethX["PROTOCOL:$i"], 'ipv6', _('IPv6 only'))?>
<?=mk_option($ethX["PROTOCOL:$i"], 'ipv4+ipv6', _('IPv4 + IPv6'))?>
<?=mk_option($ethX["PROTOCOL:$i"]??'', 'ipv4', _('IPv4 only'))?>
<?=mk_option($ethX["PROTOCOL:$i"]??'', 'ipv6', _('IPv6 only'))?>
<?=mk_option($ethX["PROTOCOL:$i"]??'', 'ipv4+ipv6', _('IPv4 + IPv6'))?>
</select>
:eth_network_protocol_help:
@@ -291,9 +291,9 @@ _(Network protocol)_:
<div markdown="1" class="ipv4-ethX-<?=$i?>" style="display:none">
_(IPv4 address assignment)_:
: <select name="USE_DHCP:<?=$i?>" onchange="selectProtocol(this.form,'ethX',<?=$i?>)">
<?=mk_option($ethX["USE_DHCP:$i"], 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP:$i"], 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP:$i"], '', _('None'))?>
<?=mk_option($ethX["USE_DHCP:$i"]??'', 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP:$i"]??'', 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP:$i"]??'', '', _('None'))?>
</select>
:eth_ipv4_address_assignment_help:
@@ -301,22 +301,22 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-ethX-<?=$i?>" style="display:none">
_(IPv4 address)_:
: <input type="text" name="IPADDR:<?=$i?>" maxlength="15" value="<?=$ethX["IPADDR:$i"]??''?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:<?=$i?>" class="slim">
<?=mk_option($ethX["NETMASK:$i"], "255.0.0.0", "8")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.0.0", "16")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.128.0", "17")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.192.0", "18")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.224.0", "19")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.240.0", "20")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.248.0", "21")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.252.0", "22")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.254.0", "23")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.255.0", "24", $ethX["IPADDR:$i"]?"":"selected")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.255.128", "25")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.255.192", "26")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.255.224", "27")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.255.240", "28")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.255.248", "29")?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.255.252", "30")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.0.0.0", "8")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.0.0", "16")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.128.0", "17")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.192.0", "18")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.224.0", "19")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.240.0", "20")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.248.0", "21")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.252.0", "22")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.254.0", "23")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.255.0", "24", $ethX["IPADDR:$i"]?"":"selected")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.255.128", "25")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.255.192", "26")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.255.224", "27")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.255.240", "28")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.255.248", "29")?>
<?=mk_option($ethX["NETMASK:$i"]??'', "255.255.255.252", "30")?>
</select>
:eth_ipv4_address_help:
@@ -332,9 +332,9 @@ _(IPv4 default gateway)_:
<div markdown="1" class="ipv6-ethX-<?=$i?>" style="display:none">
_(IPv6 address assignment)_:
: <select name="USE_DHCP6:<?=$i?>" onchange="selectProtocol(this.form,'ethX',<?=$i?>)">
<?=mk_option($ethX["USE_DHCP6:$i"], 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP6:$i"], 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP6:$i"], '', _('None'))?>
<?=mk_option($ethX["USE_DHCP6:$i"]??'', 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP6:$i"]??'', 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP6:$i"]??'', '', _('None'))?>
</select>
:eth_ipv6_address_assignment_help:
@@ -353,8 +353,8 @@ _(IPv6 default gateway)_:
_(IPv6 privacy extensions)_:
: <select name="PRIVACY6:<?=$i?>">
<?=mk_option($ethX["PRIVACY6:$i"], "0", _("Disabled"))?>
<?=mk_option($ethX["PRIVACY6:$i"], "2", _("Enabled"))?>
<?=mk_option($ethX["PRIVACY6:$i"]??'', "0", _("Disabled"))?>
<?=mk_option($ethX["PRIVACY6:$i"]??'', "2", _("Enabled"))?>
</select>
:eth_ipv6_privacy_extensions_help:
@@ -386,38 +386,38 @@ _(VLAN number)_:
_(Network protocol)_:
: <select name="PROTOCOL:INDEX" onchange="selectProtocol(this.form,'ethX',INDEX)">
<?=mk_option($ethX["PROTOCOL:INDEX"], 'ipv4', _('IPv4 only'))?>
<?=mk_option($ethX["PROTOCOL:INDEX"], 'ipv6', _('IPv6 only'))?>
<?=mk_option($ethX["PROTOCOL:INDEX"], 'ipv4+ipv6', _('IPv4 + IPv6'))?>
<?=mk_option($ethX["PROTOCOL:INDEX"]??'', 'ipv4', _('IPv4 only'))?>
<?=mk_option($ethX["PROTOCOL:INDEX"]??'', 'ipv6', _('IPv6 only'))?>
<?=mk_option($ethX["PROTOCOL:INDEX"]??'', 'ipv4+ipv6', _('IPv4 + IPv6'))?>
</select>
<div markdown="1" class="ipv4-ethX-INDEX" style="display:none">
_(IPv4 address assignment)_:
: <select name="USE_DHCP:INDEX" onchange="selectProtocol(this.form,'ethX',INDEX)">
<?=mk_option($ethX["USE_DHCP:INDEX"], 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP:INDEX"], 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP:INDEX"], '', _('None'))?>
<?=mk_option($ethX["USE_DHCP:INDEX"]??'', 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP:INDEX"]??'', 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP:INDEX"]??'', '', _('None'))?>
</select>
<div markdown="1" class="more-ipv4-ethX-INDEX" style="display:none">
_(IPv4 address)_:
: <input type="text" name="IPADDR:INDEX" maxlength="15" value="<?=$ethX["IPADDR:INDEX"]??''?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:INDEX" class="slim">
<?=mk_option($ethX["NETMASK:INDEX"], "255.0.0.0", "8")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.0.0", "16")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.128.0", "17")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.192.0", "18")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.224.0", "19")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.240.0", "20")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.248.0", "21")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.252.0", "22")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.254.0", "23")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.0", "24", "selected")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.128", "25")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.192", "26")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.224", "27")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.240", "28")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.248", "29")?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.252", "30")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.0.0.0", "8")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.0.0", "16")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.128.0", "17")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.192.0", "18")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.224.0", "19")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.240.0", "20")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.248.0", "21")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.252.0", "22")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.254.0", "23")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.255.0", "24", "selected")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.255.128", "25")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.255.192", "26")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.255.224", "27")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.255.240", "28")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.255.248", "29")?>
<?=mk_option($ethX["NETMASK:INDEX"]??'', "255.255.255.252", "30")?>
</select>
_(IPv4 default gateway)_:
@@ -429,9 +429,9 @@ _(IPv4 default gateway)_:
<div markdown="1" class="ipv6-ethX-INDEX" style="display:none">
_(IPv6 address assignment)_:
: <select name="USE_DHCP6:INDEX" onchange="selectProtocol(this.form,'ethX',INDEX)">
<?=mk_option($ethX["USE_DHCP6:INDEX"], 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP6:INDEX"], 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP6:INDEX"], '', _('None'))?>
<?=mk_option($ethX["USE_DHCP6:INDEX"]??'', 'yes', _('Automatic'))?>
<?=mk_option($ethX["USE_DHCP6:INDEX"]??'', 'no', _('Static'))?>
<?=mk_option($ethX["USE_DHCP6:INDEX"]??'', '', _('None'))?>
</select>
<div markdown="1" class="more-ipv6-ethX-INDEX" style="display:none">
@@ -444,8 +444,8 @@ _(IPv6 default gateway)_:
_(IPv6 privacy extensions)_:
: <select name="PRIVACY6:INDEX">
<?=mk_option($ethX['PRIVACY6:INDEX'], "0", _("Disabled"))?>
<?=mk_option($ethX['PRIVACY6:INDEX'], "2", _("Enabled"))?>
<?=mk_option($ethX['PRIVACY6:INDEX']??'', "0", _("Disabled"))?>
<?=mk_option($ethX['PRIVACY6:INDEX']??'', "2", _("Enabled"))?>
</select>
</div>

View File

@@ -83,7 +83,7 @@ _(Enable user shares)_:
_(Included disk(s))_:
: <select id="s1" name="shareUserInclude" multiple="multiple" style="display:none">
<?foreach ($disks as $disk):?>
<?=mk_option_luks($disk['name'], $var['shareUserInclude'], strstr($disk['fsType'],':',true))?>
<?=mk_option_luks($disk['name'], $var['shareUserInclude'], strstr($disk['fsType']??'',':',true))?>
<?endforeach;?>
</select>
@@ -92,7 +92,7 @@ _(Included disk(s))_:
_(Excluded disk(s))_:
: <select id="s2" name="shareUserExclude" multiple="multiple" style="display:none">
<?foreach ($disks as $disk):?>
<?=mk_option_luks($disk['name'], $var['shareUserExclude'], strstr($disk['fsType'],':',true))?>
<?=mk_option_luks($disk['name'], $var['shareUserExclude'], strstr($disk['fsType']??'',':',true))?>
<?endforeach;?>
</select>

View File

@@ -3,8 +3,8 @@ Title="SMTP Settings"
Tag="envelope"
---
<?PHP
/* Copyright 2005-2020, Lime Technology
* Copyright 2012-2020, Bergware International.
/* Copyright 2005-2022, Lime Technology
* Copyright 2012-2022, Bergware International.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2,
@@ -75,112 +75,112 @@ function settings(form, data) {
<input type="hidden" name="#arg[1]" value="smtp-init">
_(Preset service)_:
: <select name="service" size="1" onchange="settings(this.form,this.value)">
<?=mk_option($ssmtp['service'], "smtp.gmail.com:465:YES:NO:login", "Gmail")?>
<?=mk_option($ssmtp['service'], "smtp.gmail.com:587:YES:YES:login", "Gmail with TLS")?>
<?=mk_option($ssmtp['service'], "smtp.office365.com:587:YES:YES:login", "Outlook")?>
<?=mk_option($ssmtp['service'], "smtp.office365.com:587:YES:YES:login", "Hotmail")?>
<?=mk_option($ssmtp['service'], "smtp.office365.com:587:YES:YES:login", "Office365")?>
<?=mk_option($ssmtp['service'], "smtp.mail.yahoo.com:465:YES:NO:login", "Yahoo")?>
<?=mk_option($ssmtp['service'], "plus.smtp.mail.yahoo.com:465:YES:NO:login", "Yahoo Plus")?>
<?=mk_option($ssmtp['service'], "smtp.mail.yahoo.co.uk:465:YES:NO:login", "Yahoo UK")?>
<?=mk_option($ssmtp['service'], "smtp.mail.yahoo.com.au:465:YES:NO:login", "Yahoo AU/NZ")?>
<?=mk_option($ssmtp['service'], "smtp.o2.ie:25:NO:NO:login", "O2")?>
<?=mk_option($ssmtp['service'], "smtp.o2.co.uk:25:NO:NO:login", "O2 UK")?>
<?=mk_option($ssmtp['service'], "smtp.o2online.de:25:NO:NO:login", "O2 Online Deutschland")?>
<?=mk_option($ssmtp['service'], "securesmtp.t-online.de:587:YES:YES:login", "T-Online Deutschland")?>
<?=mk_option($ssmtp['service'], "smtp.1and1.com:587:YES:YES:login", "1&1")?>
<?=mk_option($ssmtp['service'], "smtp.1und1.de:587:YES:YES:login", "1&1 Deutschland")?>
<?=mk_option($ssmtp['service'], "smtp.att.yahoo.com:465:YES:NO:login", "AT&T")?>
<?=mk_option($ssmtp['service'], "smtp.ntlworld.com:465:YES:NO:login", "NTL")?>
<?=mk_option($ssmtp['service'], "mail.btopenworld.com:25:NO:NO:login", "BT Openworld")?>
<?=mk_option($ssmtp['service'], "mail.btinternet.com:25:NO:NO:login", "BT Internet")?>
<?=mk_option($ssmtp['service'], "smtp.comcast.net:465:YES:NO:login", "Comcast")?>
<?=mk_option($ssmtp['service'], "outgoing.verizon.net:465:YES:NO:login", "Verizon")?>
<?=mk_option($ssmtp['service'], "outgoing.yahoo.verizon.net:587:NO:NO:login", "Verizon (Yahoo hosted)")?>
<?=mk_option($ssmtp['service'], "smtp.mail.com:465:YES:NO:login", "Mail.com")?>
<?=mk_option($ssmtp['service'], "smtp.gmx.com:465:YES:NO:login", "GMX.com")?>
<?=mk_option($ssmtp['service'], "smtp.zoho.com:465:YES:NO:login", "zoho Mail")?>
<?=mk_option($ssmtp['service'], "::NO:NO:none", _("Custom"))?>
<?=mk_option($ssmtp['service']??'', "smtp.gmail.com:465:YES:NO:login", "Gmail")?>
<?=mk_option($ssmtp['service']??'', "smtp.gmail.com:587:YES:YES:login", "Gmail with TLS")?>
<?=mk_option($ssmtp['service']??'', "smtp.office365.com:587:YES:YES:login", "Outlook")?>
<?=mk_option($ssmtp['service']??'', "smtp.office365.com:587:YES:YES:login", "Hotmail")?>
<?=mk_option($ssmtp['service']??'', "smtp.office365.com:587:YES:YES:login", "Office365")?>
<?=mk_option($ssmtp['service']??'', "smtp.mail.yahoo.com:465:YES:NO:login", "Yahoo")?>
<?=mk_option($ssmtp['service']??'', "plus.smtp.mail.yahoo.com:465:YES:NO:login", "Yahoo Plus")?>
<?=mk_option($ssmtp['service']??'', "smtp.mail.yahoo.co.uk:465:YES:NO:login", "Yahoo UK")?>
<?=mk_option($ssmtp['service']??'', "smtp.mail.yahoo.com.au:465:YES:NO:login", "Yahoo AU/NZ")?>
<?=mk_option($ssmtp['service']??'', "smtp.o2.ie:25:NO:NO:login", "O2")?>
<?=mk_option($ssmtp['service']??'', "smtp.o2.co.uk:25:NO:NO:login", "O2 UK")?>
<?=mk_option($ssmtp['service']??'', "smtp.o2online.de:25:NO:NO:login", "O2 Online Deutschland")?>
<?=mk_option($ssmtp['service']??'', "securesmtp.t-online.de:587:YES:YES:login", "T-Online Deutschland")?>
<?=mk_option($ssmtp['service']??'', "smtp.1and1.com:587:YES:YES:login", "1&1")?>
<?=mk_option($ssmtp['service']??'', "smtp.1und1.de:587:YES:YES:login", "1&1 Deutschland")?>
<?=mk_option($ssmtp['service']??'', "smtp.att.yahoo.com:465:YES:NO:login", "AT&T")?>
<?=mk_option($ssmtp['service']??'', "smtp.ntlworld.com:465:YES:NO:login", "NTL")?>
<?=mk_option($ssmtp['service']??'', "mail.btopenworld.com:25:NO:NO:login", "BT Openworld")?>
<?=mk_option($ssmtp['service']??'', "mail.btinternet.com:25:NO:NO:login", "BT Internet")?>
<?=mk_option($ssmtp['service']??'', "smtp.comcast.net:465:YES:NO:login", "Comcast")?>
<?=mk_option($ssmtp['service']??'', "outgoing.verizon.net:465:YES:NO:login", "Verizon")?>
<?=mk_option($ssmtp['service']??'', "outgoing.yahoo.verizon.net:587:NO:NO:login", "Verizon (Yahoo hosted)")?>
<?=mk_option($ssmtp['service']??'', "smtp.mail.com:465:YES:NO:login", "Mail.com")?>
<?=mk_option($ssmtp['service']??'', "smtp.gmx.com:465:YES:NO:login", "GMX.com")?>
<?=mk_option($ssmtp['service']??'', "smtp.zoho.com:465:YES:NO:login", "zoho Mail")?>
<?=mk_option($ssmtp['service']??'', "::NO:NO:none", _("Custom"))?>
</select>
:smtp_preset_service_help:
_(Sending email address)_:
: <input type="text" name="root" value="<?=htmlspecialchars($ssmtp['root'])?>">
: <input type="text" name="root" value="<?=htmlspecialchars($ssmtp['root']??'')?>">
:smtp_email_address_help:
_(Email recipients)_:
: <input type="text" name="RcptTo" value="<?=htmlspecialchars($ssmtp['RcptTo'])?>">
: <input type="text" name="RcptTo" value="<?=htmlspecialchars($ssmtp['RcptTo']??'')?>">
:smtp_recipients_help:
_(Priority in header)_:
: <select name="SetEmailPriority">
<?=mk_option($ssmtp['SetEmailPriority'], "False", _("No"))?>
<?=mk_option($ssmtp['SetEmailPriority'], "True", _("Yes"))?>
<?=mk_option($ssmtp['SetEmailPriority']??'', "False", _("No"))?>
<?=mk_option($ssmtp['SetEmailPriority']??'', "True", _("Yes"))?>
</select>
:smtp_priority_help:
_(Email subject prefix)_:
: <input type="text" name="Subject" value="<?=htmlspecialchars($ssmtp['Subject'])?>">
: <input type="text" name="Subject" value="<?=htmlspecialchars($ssmtp['Subject']??'')?>">
:smtp_subject_prefix_help:
_(Mail server)_:
: <input type="text" name="server" value="<?=htmlspecialchars($ssmtp['server'])?>">
: <input type="text" name="server" value="<?=htmlspecialchars($ssmtp['server']??'')?>">
:smtp_mail_server_help:
_(Mail server port)_:
: <input type="text" name="port" class="narrow" maxlength="5" value="<?=htmlspecialchars($ssmtp['port'])?>">
: <input type="text" name="port" class="narrow" maxlength="5" value="<?=htmlspecialchars($ssmtp['port']??'')?>">
:smtp_mail_server_port_help:
_(Use SSL/TLS)_:
: <select name="UseTLS">
<?=mk_option($ssmtp['UseTLS'], "NO", _("No"))?>
<?=mk_option($ssmtp['UseTLS'], "YES", _("Yes"))?>
<?=mk_option($ssmtp['UseTLS']??'', "NO", _("No"))?>
<?=mk_option($ssmtp['UseTLS']??'', "YES", _("Yes"))?>
</select>
:smtp_use_ssl_tls_help:
_(Use STARTTLS)_:
: <select name="UseSTARTTLS">
<?=mk_option($ssmtp['UseSTARTTLS'], "NO", _("No"))?>
<?=mk_option($ssmtp['UseSTARTTLS'], "YES", _("Yes"))?>
<?=mk_option($ssmtp['UseSTARTTLS']??'', "NO", _("No"))?>
<?=mk_option($ssmtp['UseSTARTTLS']??'', "YES", _("Yes"))?>
</select>
:smtp_use_starttls_help:
_(Define a TLS certificate)_:
: <select name="UseTLSCert" onchange="tls(this.form)">
<?=mk_option($ssmtp['UseTLSCert'], "NO", _("No"))?>
<?=mk_option($ssmtp['UseTLSCert'], "YES", _("Yes"))?>
<?=mk_option($ssmtp['UseTLSCert']??'', "NO", _("No"))?>
<?=mk_option($ssmtp['UseTLSCert']??'', "YES", _("Yes"))?>
</select>
:smtp_define_tls_cert_help:
_(TLS certificate location)_:
: <input type="text" name="TLSCert" value="<?=htmlspecialchars($ssmtp['TLSCert'])?>">
: <input type="text" name="TLSCert" value="<?=htmlspecialchars($ssmtp['TLSCert']??'')?>">
:smtp_tls_cert_location_help:
_(Authentication method)_:
: <select name="AuthMethod" onchange="pwd(this.form)">
<?=mk_option($ssmtp['AuthMethod'], "none", _("None"))?>
<?=mk_option($ssmtp['AuthMethod'], "cram-md5", _("CRAM-MD5"))?>
<?=mk_option($ssmtp['AuthMethod'], "login", _("Login"))?>
<?=mk_option($ssmtp['AuthMethod']??'', "none", _("None"))?>
<?=mk_option($ssmtp['AuthMethod']??'', "cram-md5", _("CRAM-MD5"))?>
<?=mk_option($ssmtp['AuthMethod']??'', "login", _("Login"))?>
</select>
:smtp_authentication_method_help:
_(Username)_:
: <input type="text" name="AuthUser" value="<?=htmlspecialchars($ssmtp['AuthUser'])?>">
: <input type="text" name="AuthUser" value="<?=htmlspecialchars($ssmtp['AuthUser']??'')?>">
_(Password)_:
: <input type="password" name="AuthPass" value="<?=htmlspecialchars($ssmtp['AuthPass'])?>">
: <input type="password" name="AuthPass" value="<?=htmlspecialchars($ssmtp['AuthPass']??'')?>">
:smtp_username_password_help:

View File

@@ -90,13 +90,13 @@ function validatePort(form) {
_(Local syslog server)_:
: <span class="span"><select name="local_server" onchange="localFolder(this.value,'slow')">
<?=mk_option($syslog['local_server'], "", _("Disabled"))?>
<?=mk_option($syslog['local_server'], "1", _("Enabled"))?>
<?=mk_option($syslog['local_server']??'', "", _("Disabled"))?>
<?=mk_option($syslog['local_server']??'', "1", _("Enabled"))?>
</select></span>
<select name="server_protocol" class="narrow">
<?=mk_option($syslog['server_protocol'], "udp", _("UDP"))?>
<?=mk_option($syslog['server_protocol'], "tcp", _("TCP"))?>
<?=mk_option($syslog['server_protocol'], "both", _("Both"))?>
<?=mk_option($syslog['server_protocol']??'', "udp", _("UDP"))?>
<?=mk_option($syslog['server_protocol']??'', "tcp", _("TCP"))?>
<?=mk_option($syslog['server_protocol']??'', "both", _("Both"))?>
</select>
<input type="text" name="server_port" class="trim" value="<?=$syslog['server_port']??''?>" maxlength="5" placeholder="514">
@@ -106,15 +106,15 @@ _(Local syslog server)_:
_(Local syslog folder)_:
: <select name="server_folder">
<?=mk_option(0,'','&lt;'._('custom').'&gt;','disabled')?>
<?foreach ($shares as $share){echo mk_option($syslog['server_folder'], '/mnt/user/'.$share['name'], $share['name']);}?>
<?foreach ($shares as $share){echo mk_option($syslog['server_folder']??'', '/mnt/user/'.$share['name'], $share['name']);}?>
</select>
:syslog_local_folder_help:
_(Local syslog rotation)_:
: <select name="log_rotation" onchange="logOptions(this.value,'slow')">
<?=mk_option($syslog['log_rotation'], "", _("Disabled"))?>
<?=mk_option($syslog['log_rotation'], "1", _("Enabled"))?>
<?=mk_option($syslog['log_rotation']??'', "", _("Disabled"))?>
<?=mk_option($syslog['log_rotation']??'', "1", _("Enabled"))?>
</select>
:syslog_local_rotation_help:
@@ -122,25 +122,25 @@ _(Local syslog rotation)_:
<div markdown="1" id="log_options" style="display:none">
_(Local syslog maximum file size)_:
: <select name="log_size">
<?=mk_option($syslog['log_size'], '1M', '1 '._('MB'))?>
<?=mk_option($syslog['log_size'], '2M', '2 '._('MB'))?>
<?=mk_option($syslog['log_size'], '5M', '5 '._('MB'))?>
<?=mk_option($syslog['log_size'], '10M', '10 '._('MB'))?>
<?=mk_option($syslog['log_size'], '20M', '20 '._('MB'))?>
<?=mk_option($syslog['log_size'], '50M', '50 '._('MB'))?>
<?=mk_option($syslog['log_size'], '100M', '100 '._('MB'))?>
<?=mk_option($syslog['log_size'], '200M', '200 '._('MB'))?>
<?=mk_option($syslog['log_size'], '500M', '500 '._('MB'))?>
<?=mk_option($syslog['log_size']??'', '1M', '1 '._('MB'))?>
<?=mk_option($syslog['log_size']??'', '2M', '2 '._('MB'))?>
<?=mk_option($syslog['log_size']??'', '5M', '5 '._('MB'))?>
<?=mk_option($syslog['log_size']??'', '10M', '10 '._('MB'))?>
<?=mk_option($syslog['log_size']??'', '20M', '20 '._('MB'))?>
<?=mk_option($syslog['log_size']??'', '50M', '50 '._('MB'))?>
<?=mk_option($syslog['log_size']??'', '100M', '100 '._('MB'))?>
<?=mk_option($syslog['log_size']??'', '200M', '200 '._('MB'))?>
<?=mk_option($syslog['log_size']??'', '500M', '500 '._('MB'))?>
</select>
:syslog_local_file_size_help:
_(Local syslog number of files)_:
: <select name="log_files">
<?=mk_option($syslog['log_files'], '1', '1')?>
<?=mk_option($syslog['log_files'], '2', '2')?>
<?=mk_option($syslog['log_files'], '3', '3')?>
<?=mk_option($syslog['log_files'], '4', '4')?>
<?=mk_option($syslog['log_files']??'', '1', '1')?>
<?=mk_option($syslog['log_files']??'', '2', '2')?>
<?=mk_option($syslog['log_files']??'', '3', '3')?>
<?=mk_option($syslog['log_files']??'', '4', '4')?>
</select>
:syslog_local_file_number_help:
@@ -151,8 +151,8 @@ _(Local syslog number of files)_:
_(Remote syslog server)_:
: <span class="span"><input type="text" name="remote_server" class="narrow" value="<?=$syslog['remote_server']??''?>" maxlength="23" placeholder="_(name or ip address)_"></span>
<select name="remote_protocol" class="narrow" size="1">
<?=mk_option($syslog['remote_protocol'], "udp", _("UDP"))?>
<?=mk_option($syslog['remote_protocol'], "tcp", _("TCP"))?>
<?=mk_option($syslog['remote_protocol']??'', "udp", _("UDP"))?>
<?=mk_option($syslog['remote_protocol']??'', "tcp", _("TCP"))?>
</select>
<input type="number" name="remote_port" class="trim" value="<?=$syslog['remote_port']??''?>" maxlength="5" placeholder="514" pattern="([0-9]{1,5})">
@@ -160,8 +160,8 @@ _(Remote syslog server)_:
_(Mirror syslog to flash)_:
: <select name="syslog_flash" size="1">
<?=mk_option($syslog['syslog_flash'], "", _("No"))?>
<?=mk_option($syslog['syslog_flash'], "1", _("Yes"))?>
<?=mk_option($syslog['syslog_flash']??'', "", _("No"))?>
<?=mk_option($syslog['syslog_flash']??'', "1", _("Yes"))?>
</select>
:syslog_mirror_flash_help:

View File

@@ -62,7 +62,7 @@ $(function() {
_(SSD TRIM schedule)_:
: <select name="mode" onchange="presetTrim(this.form)">
<?for ($m=0; $m<count($mode); $m++):?>
<?=mk_option($ssd['mode'], strval($m), _($mode[$m]))?>
<?=mk_option($ssd['mode']??'', strval($m), _($mode[$m]))?>
<?endfor;?>
</select>
@@ -75,9 +75,9 @@ _(SSD TRIM schedule)_:
_(Day of the week)_:
: <select name="day">
<?for ($d=0; $d<count($days); $d++):?>
<?=mk_option($ssd['day'], strval($d), _($days[$d],0))?>
<?=mk_option($ssd['day']??'', strval($d), _($days[$d],0))?>
<?endfor;?>
<?=mk_option($ssd['day'], "*", "--------", _("disabled"))?>
<?=mk_option($ssd['day']??'', "*", "--------", _("disabled"))?>
</select>
:trim_day_of_the_week_plug:
@@ -87,9 +87,9 @@ _(Day of the week)_:
_(Day of the month)_:
: <select name="dotm">
<?for ($d=1; $d<=31; $d++):?>
<?=mk_option($ssd['dotm'], strval($d), sprintf("%02d", $d))?>
<?=mk_option($ssd['dotm']??'', strval($d), sprintf("%02d", $d))?>
<?endfor;?>
<?=mk_option($ssd['dotm'], "*", "--------", _("disabled"))?>
<?=mk_option($ssd['dotm']??'', "*", "--------", _("disabled"))?>
</select>
:trim_day_of_the_month_plug:
@@ -99,21 +99,21 @@ _(Day of the month)_:
_(Time of the day)_:
: <span id="hour1" style="display:none"><select name="hour1" class="narrow">
<?for ($d=0; $d<=23; $d++):?>
<?=mk_option($ssd['hour'], strval($d), sprintf("%02d", $d))?>
<?=mk_option($ssd['hour']??'', strval($d), sprintf("%02d", $d))?>
<?endfor;?>
</select>
<select name="min" class="narrow">
<?for ($d=0; $d<=55; $d+=5):?>
<?=mk_option($ssd['min'], strval($d), sprintf("%02d", $d))?>
<?=mk_option($ssd['min']??'', strval($d), sprintf("%02d", $d))?>
<?endfor;?>
</select>&nbsp;&nbsp;_(HH:MM)_</span>
: <span id="hour2" style="display:none"><select name="hour2">
<?=mk_option($ssd['hour'], "*/1", _("Every hour"))?>
<?=mk_option($ssd['hour'], "*/2", _("Every 2 hours"))?>
<?=mk_option($ssd['hour'], "*/3", _("Every 3 hours"))?>
<?=mk_option($ssd['hour'], "*/4", _("Every 4 hours"))?>
<?=mk_option($ssd['hour'], "*/6", _("Every 6 hours"))?>
<?=mk_option($ssd['hour'], "*/8", _("Every 8 hours"))?>
<?=mk_option($ssd['hour']??'', "*/1", _("Every hour"))?>
<?=mk_option($ssd['hour']??'', "*/2", _("Every 2 hours"))?>
<?=mk_option($ssd['hour']??'', "*/3", _("Every 3 hours"))?>
<?=mk_option($ssd['hour']??'', "*/4", _("Every 4 hours"))?>
<?=mk_option($ssd['hour']??'', "*/6", _("Every 6 hours"))?>
<?=mk_option($ssd['hour']??'', "*/8", _("Every 8 hours"))?>
</select></span>
:trim_time_of_the_day_plug:

View File

@@ -44,8 +44,8 @@ function check_temp(&$disk,$text,$info) {
global $notify,$saved,$server,$display,$top;
$name = $disk['name'];
$temp = $disk['temp'];
$hot = $disk['hotTemp'] ?? $display['hot'];
$max = $disk['maxTemp'] ?? $display['max'];
$hot = $disk['hotTemp'] ?? $display['hot'] ?? 0;
$max = $disk['maxTemp'] ?? $display['max'] ?? 0;
$warn = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false);
$item = 'temp';
$last = $saved[$item][$name] ?? 0;
@@ -186,7 +186,7 @@ foreach ($disks as $disk) {
if ($disk['numErrors']>0) $errors[] = "$text - $info (errors {$disk['numErrors']})";
// check file system of cache pool
$item = 'pool';
if (in_array($name,$pools) && strpos($disk['fsType'],'btrfs')!==false) {
if (in_array($name,$pools) && strpos($disk['fsType']??'','btrfs')!==false) {
$attr = 'missing';
if (exec("/sbin/btrfs filesystem show {$disk['uuid']} 2>/dev/null|grep -c 'missing'")>0) {
if (empty($saved[$item][$attr])) {