Merge branch 'master' of ssh://people.ipfire.org/pub/git/ipfire-2.x

[people/mfischer/ipfire-2.x.git] / html / cgi-bin / modem.cgi

diff --git a/html/cgi-bin/modem.cgi b/html/cgi-bin/modem.cgi
index 48d1260e88e26a73777de923d04ef42b27da17b1..640a0a049d2478ffdc4678377c2213a393c1dde0 100644 (file)
--- a/html/cgi-bin/modem.cgi
+++ b/html/cgi-bin/modem.cgi
@@ -40,13 +40,13 @@ $modemsettings{'VALID'} = '';
 &Header::getcgihash(\%modemsettings);
 
 if ($modemsettings{'ACTION'} eq $Lang::tr{'save'})
-{ 
+{
         if (!($modemsettings{'TIMEOUT'} =~ /^\d+$/))
         {
                $errormessage = $Lang::tr{'timeout must be a number'};
                goto ERROR;
         }
-ERROR:   
+ERROR:
         if ($errormessage) {
                 $modemsettings{'VALID'} = 'no'; }
         else {
@@ -57,7 +57,7 @@ ERROR:
 
 if ($modemsettings{'ACTION'} eq $Lang::tr{'restore defaults'})
 {
-       system('/bin/cp', "${General::swroot}/modem/defaults", "${General::swroot}/modem/settings", '-f');
+       &General::system("cp", "-f", "${General::swroot}/modem/defaults", "${General::swroot}/modem/settings");
 }
 
 &General::readhash("${General::swroot}/modem/settings", \%modemsettings);
@@ -78,25 +78,25 @@ print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 print <<END
 <table width='100%'>
 <tr>
-       <td width='25%' class='base'>$Lang::tr{'init string'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td width='25%' class='base'>$Lang::tr{'init string'}</td>
        <td width='25%'><input type='text' name='INIT' value='$modemsettings{'INIT'}' /></td>
-       <td width='25%' class='base'>$Lang::tr{'hangup string'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td width='25%' class='base'>$Lang::tr{'hangup string'}</td>
        <td width='25%'><input type='text' name='HANGUP' value='$modemsettings{'HANGUP'}' /></td>
 </tr>
 <tr>
-       <td class='base'>$Lang::tr{'speaker on'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td class='base'>$Lang::tr{'speaker on'}</td>
        <td><input type='text' name='SPEAKER_ON' value='$modemsettings{'SPEAKER_ON'}' /></td>
-       <td class='base'>$Lang::tr{'speaker off'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td class='base'>$Lang::tr{'speaker off'}</td>
        <td><input type='text' name='SPEAKER_OFF' value='$modemsettings{'SPEAKER_OFF'}' /></td>
 </tr>
 <tr>
-       <td class='base'>$Lang::tr{'tone dial'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td class='base'>$Lang::tr{'tone dial'}</td>
        <td><input type='text' name='TONE_DIAL' value='$modemsettings{'TONE_DIAL'}' /></td>
-       <td class='base'>$Lang::tr{'pulse dial'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td class='base'>$Lang::tr{'pulse dial'}</td>
        <td><input type='text' name='PULSE_DIAL' value='$modemsettings{'PULSE_DIAL'}' /></td>
 </tr>
 <tr>
-       <td class='base'>$Lang::tr{'connect timeout'}</td>
+       <td class='base'>$Lang::tr{'connect timeout'}&nbsp;<img src='/blob.gif' alt='*' /></td>
        <td><input type='text' name='TIMEOUT' value='$modemsettings{'TIMEOUT'}' /></td>
        <td class='base'>&nbsp;</td>
        <td>&nbsp;</td>
@@ -107,8 +107,7 @@ print <<END
 <hr />
 <tr>
        <td width='33%'>
-               <img src='/blob.gif' align='top' alt='*' />&nbsp;
-               <font class='base'>$Lang::tr{'this field may be blank'}</font>
+               <img src='/blob.gif' align='top' alt='*' />&nbsp;<font class='base'>$Lang::tr{'required field'}</font>
        </td>
        <td width='33%' align='center'>
                <input type='submit' name='ACTION' value='$Lang::tr{'restore defaults'}' />