} else {
$errormessage = $Lang::tr{'mac address error not valid'};
}
+ $macsettings{'MAC1'} =~ s/\-/:/g;
+ if ( not ($macsettings{'MAC1'} eq "" )) {
+ my @mac = split(/:/,$macsettings{"MAC1"});
+ if ($#mac == 5) {
+ foreach (@mac) {
+ unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) {
+ $errormessage = $Lang::tr{'mac address error not valid'};
+ last;
+ }
+ }
+ } else {
+ $errormessage = $Lang::tr{'mac address error not valid'};
+ }
+ }
$macsettings{'MAC2'} =~ s/\-/:/g;
-
if ( not ($macsettings{'MAC2'} eq "" )) {
my @mac = split(/:/,$macsettings{"MAC2"});
if ($#mac == 5) {
}
if ($errormessage eq "") {
$macsettings{'MAC'} =~ s/\:/-/g;
+ $macsettings{'MAC1'} =~ s/\:/-/g;
$macsettings{'MAC2'} =~ s/\:/-/g;
&General::writehash("${General::swroot}/mac/settings", \%macsettings);
&Header::openbox('100%', 'left', $Lang::tr{'mac address saved'});
}
}
if ($macsettings{'ACTION'} eq $Lang::tr{'reconnect'}) {
- system("/usr/local/bin/redctrl restart >/dev/null 2>&1 &");
+ &General::system_background("/usr/local/bin/redctrl", "restart");
&Header::openbox('100%', 'left', $Lang::tr{'mac address recon'} );
print "<font class='base'>$Lang::tr{'mac address done'}</font>\n";
&Header::closebox();
}
if ($macsettings{'ACTION'} eq $Lang::tr{'reboot'}) {
&General::log($Lang::tr{'rebooting ipfire'});
- system("/usr/local/bin/ipfirereboot boot");
+ &General::system("/usr/local/bin/ipfirereboot", "boot");
&Header::openbox('100%', 'left', $Lang::tr{'rebooting ipfire'} );
print " <img src='/images/indicator.gif' /><br /><br />";
print "<meta http-equiv='refresh' content='120;'>";
<table border="0" width='100%'>
<tr>
- <td colspan=2><font class='base'>$Lang::tr{'mac desc'}</font></td>
+ <td colspan="2"><font class='base'>$Lang::tr{'mac desc'}</font></td>
</tr>
<tr>
- <td colspan=2> </td><td> </td>
+ <td colspan="2"> </td>
</tr>
<tr>
- <td><font class='base'>$Lang::tr{'mac new'} </font></td><td>
+ <td width="25%"><font class='base'>$Lang::tr{'mac new'} <img src='/blob.gif' alt='*' /></font></td><td>
END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
;
}
print <<END
+ </tr>
+ <tr>
+ <td> </td>
</tr>
<tr>
- <td colspan=2> </td><td> </td>
+ <td><font class='base'>$Lang::tr{'mac1 new'} </font></td><td>
+END
+;
+if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
+print <<END
+ <input type="text" name="MAC1" maxlength="17" value=''/></td>
+END
+;
+} else {
+print <<END
+ <input type="text" name="MAC1" maxlength="17" value='$macsettings{"MAC1"}'/></td>
+END
+;
+}
+print <<END
+ </tr>
+ <tr>
+ <td> </td>
</tr>
<tr>
<td><font class='base'>$Lang::tr{'mac2 new'} </font></td><td>
END
;
}
+
print <<END
</tr>
- <tr>
- <td colspan=2> </td><td> </td>
+ <tr>
+ <td colspan="2"><br><hr /></td>
</tr>
<tr>
- <td colspan=2><hr /></td>
- </tr>
- <tr>
- <td colspan=2><div align="center">
+ <td align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'required field'}</td><div align="right"></td>
+ <td align='right'>
END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
print <<END
</div></td>
</tr>
-
-
-
</table>
END