remote.cgi: Fix splitting output from ssh-keygen.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / mac.cgi

diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi
index f95c0d802623f7e549d084fd19db5e2e5bb0d89e..f4c5aa2d4bff792b75587ac6035db047a1d2387b 100644 (file)
--- a/html/cgi-bin/mac.cgi
+++ b/html/cgi-bin/mac.cgi
@@ -94,7 +94,7 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
        }
 }
 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();    
@@ -107,7 +107,7 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
 }
 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 "&nbsp;&nbsp;<img src='/images/indicator.gif' /><br /><br />";
        print "<meta http-equiv='refresh' content='120;'>";
@@ -134,7 +134,7 @@ print <<END
     <td colspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td width="25%"><font class='base'>$Lang::tr{'mac new'}&nbsp;</font></td><td>
+    <td width="25%"><font class='base'>$Lang::tr{'mac new'}&nbsp;<img src='/blob.gif' alt='*' /></font></td><td>
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -159,12 +159,12 @@ END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
 print <<END 
-      <input type="text" name="MAC1" maxlength="17" value=''/><img src='/blob.gif' alt='*' /></td>
+      <input type="text" name="MAC1" maxlength="17" value=''/></td>
 END
 ;
 } else {   
 print <<END
-      <input type="text" name="MAC1" maxlength="17" value='$macsettings{"MAC1"}'/><img src='/blob.gif' alt='*' /></td>
+      <input type="text" name="MAC1" maxlength="17" value='$macsettings{"MAC1"}'/></td>
 END
 ;  
 } 
@@ -179,12 +179,12 @@ END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
 print <<END 
-      <input type="text" name="MAC2" maxlength="17" value=''/><img src='/blob.gif' alt='*' /></td>
+      <input type="text" name="MAC2" maxlength="17" value=''/></td>
 END
 ;
 } else {   
 print <<END
-      <input type="text" name="MAC2" maxlength="17" value='$macsettings{"MAC2"}'/><img src='/blob.gif' alt='*' /></td>
+      <input type="text" name="MAC2" maxlength="17" value='$macsettings{"MAC2"}'/></td>
 END
 ;  
 } 
@@ -192,10 +192,11 @@ END
 print <<END    
   </tr>
     <tr>
-    <td colspan="2"><hr /></td>
+    <td colspan="2"><br><hr /></td>
   </tr>
   <tr>
-    <td colspan="2"><div align="center">
+    <td align='left'><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'required field'}</td><div align="right"></td>
+    <td align='right'>
 END
 ;
 if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
@@ -232,11 +233,6 @@ END
 print <<END
     </div></td>
   </tr>
-  <tr>
-    <td colspan="2"align='left'>
-        <img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td>
-  </tr>
-
 </table>
 
 END