From: Jan Paul Tuecking <earl@ipfire.org>
Date: Mon, 14 Sep 2009 15:21:01 +0000 (+0200)
Subject: Change menu to force the user to reboot after deleting mac address.
X-Git-Tag: v2.5-core31~18^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e7457d35f4ef9a2fca8abc9ef89b6e6574748c5;p=ipfire-2.x.git

Change menu to force the user to reboot after deleting mac address.
---

diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi
index 4d49c18df1..93767d00d1 100755
--- a/html/cgi-bin/mac.cgi
+++ b/html/cgi-bin/mac.cgi
@@ -67,18 +67,26 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
 		$errormessage = $Lang::tr{'mac address error not valid'};
 	}
 }
-if ($macsettings{'RECONNECT'} eq $Lang::tr{'reconnect'}) {
+if ($macsettings{'ACTION'} eq $Lang::tr{'reconnect'}) {
 	system("/usr/local/bin/redctrl restart >/dev/null 2>&1 &");
 	&Header::openbox('100%', 'left', $Lang::tr{'mac address recon'} );
 	print "<font class='base'>$Lang::tr{'mac address done'}</font>\n";
 	&Header::closebox();	
 }
-if ($macsettings{'DELETE'} eq $Lang::tr{'delete'} ) {
+if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
 	system("cat /dev/null > ${General::swroot}/mac/settings &");
 	&Header::openbox('100%', 'left', $Lang::tr{'mac address deleted'} );
 	print "<font class='base'>$Lang::tr{'mac address deleted txt'}</font>\n";
 	&Header::closebox();	
 }
+if ($macsettings{'ACTION'} eq $Lang::tr{'reboot'}) {
+	&General::log($Lang::tr{'rebooting ipfire'});
+	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;'>";
+	&Header::closebox();
+}
 
 # DPC move error message to top so it is seen!
 if ($errormessage) {
@@ -101,25 +109,69 @@ print <<END
   </tr>
   <tr>
     <td><font class='base'>$Lang::tr{'mac new'}&nbsp;</font>
+END
+;
+if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
+print <<END 
+      <input type="text" name="MAC" maxlength="17" value=''/></td>
+END
+;
+} else {   
+print <<END
       <input type="text" name="MAC" maxlength="17" value='$macsettings{"MAC"}'/></td>
+END
+;  
+} 
+print <<END    
   </tr>
   <tr>
     <td><hr /></td>
   </tr>
   <tr>
     <td><div align="center">
+END
+;
+if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
+print <<END
+      <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
+      &nbsp;&nbsp;&nbsp;&nbsp;
+      <input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
+      &nbsp;&nbsp;&nbsp;&nbsp;
+      <input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' />
+END
+;
+} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'} && $errormessage eq "") {	
+print <<END
       <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
       &nbsp;&nbsp;&nbsp;&nbsp;
-      <input type='submit' name='DELETE' value='$Lang::tr{'delete'}' />
+      <input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
       &nbsp;&nbsp;&nbsp;&nbsp;
-      <input type='submit' name='RECONNECT' value='$Lang::tr{'reconnect'}' />
+      <input type='submit' name='ACTION' value='$Lang::tr{'reconnect'}' />
+END
+;
+} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {	
+print <<END
+      <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
+END
+;
+} else {	
+print <<END
+      <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
+      &nbsp;&nbsp;&nbsp;&nbsp;
+      <input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
+END
+;
+}
+print <<END
     </div></td>
   </tr>
+  
+
+
 </table>
 
 END
 ;
-
 &Header::closebox();
 
 print "</form>\n";
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 845f6f7daf..ee5743967d 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1057,7 +1057,7 @@
 'mac address saved' => 'Erfolgreich gespeichert!',
 'mac address saved txt' => 'Die MAC-Adresse wurde erfolgreich gespeichert. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
 'mac address deleted' => 'Erfolgreich gelöscht! ',
-'mac address deleted txt' => 'Mac Adresse wurde erfolgreich gelöscht. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
+'mac address deleted txt' => 'Mac Adresse wurde erfolgreich gelöscht. Änderungen werden jedoch erst nach einem <strong>Neustart</strong> übernommen.',
 'mac address recon' => 'Es wird neu Verbunden!',
 'mac address done' => 'Die MAC-Adressen Einstellungen werden übernommen',
 'mac desc' => 'Sie können an dieser Stelle die MAC-Adresse von red0 ändern. Die Adresse muss in hexadezimal (0-9,a-f) eingegeben werden, eine gültige Eingaben ist z.B. 00-01-02-0e-b8-d6 oder 00:01:02:0e:b8:d6.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 887301e452..1fcae040b2 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1087,7 +1087,7 @@
 'mac address saved' => 'Successfully saved!',
 'mac address saved txt' => 'The MAC address has been successfully saved, but changes will only take effect after reboot or reconnection.',
 'mac address deleted' => 'Successfully deleted!',
-'mac address deleted txt' => 'The MAC address has been successfully deleted, but changes will only take effect after reboot or reconnection.',
+'mac address deleted txt' => 'The MAC address has been successfully deleted, but changes will only take effect after <strong>reboot</strong>.',
 'mac address recon' => 'Trying to reconnect!',
 'mac address done' => 'The MAC address settings are going to be saved.',
 'mac desc' => 'Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is <br />e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.',