From: Jan Paul Tuecking <earl@ipfire.org>
Date: Thu, 10 Sep 2009 19:35:13 +0000 (+0200)
Subject: Added a delete button to mac.cgi - now it will be possible to delete his own configur... 
X-Git-Tag: v2.5-core31~30
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=958a98a253ce89e25ea01b36307a7c4266cbf0d7

Added a delete button to mac.cgi - now it will be possible to delete his own configuration, after the delete mac address will be read out of the hardware device.
---

diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi
old mode 100644
new mode 100755
index 6261c59140..4d49c18df1
--- a/html/cgi-bin/mac.cgi
+++ b/html/cgi-bin/mac.cgi
@@ -73,6 +73,12 @@ if ($macsettings{'RECONNECT'} eq $Lang::tr{'reconnect'}) {
 	print "<font class='base'>$Lang::tr{'mac address done'}</font>\n";
 	&Header::closebox();	
 }
+if ($macsettings{'DELETE'} 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();	
+}
 
 # DPC move error message to top so it is seen!
 if ($errormessage) {
@@ -104,6 +110,8 @@ print <<END
     <td><div align="center">
       <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
       &nbsp;&nbsp;&nbsp;&nbsp;
+      <input type='submit' name='DELETE' value='$Lang::tr{'delete'}' />
+      &nbsp;&nbsp;&nbsp;&nbsp;
       <input type='submit' name='RECONNECT' value='$Lang::tr{'reconnect'}' />
     </div></td>
   </tr>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2851d603b4..ddf2c0a5d2 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -333,7 +333,6 @@
 'alt system' => 'System',
 'alt vpn' => 'VPNs',
 'and' => 'Und',
-'apcupsd' => 'APCUPSD',
 'apply' => 'Jetzt anwenden',
 'april' => 'April',
 'archive not exist' => 'Konfigurationsarchiv existiert nicht',
@@ -1054,11 +1053,14 @@
 'mac address error not valid' => 'Keine gültige MAC-Adresse!',
 'mac address error not 00' => 'MAC-Adresse muss mit 00 beginnen!',
 '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 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 recon' => 'Es wird neu Verbunden!',
-'mac address done' => 'Die MAC-Adresse wird übernommen',
+'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.',
 'mac new' => 'Neue MAC-Adresse:',
+'mac new' => 'Neue MAC-Adresse:',
 'magic packet send to:' => 'Sende WOL-Paket an',
 'mailmethod' => 'Mail Methode',
 'mailprogramm' => 'Mail Programm',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f787f6d94f..a7263aa7b4 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -338,7 +338,6 @@
 'alt vpn' => 'VPNs',
 'and' => 'And',
 'ansi t1.483' => 'TO BE REMOVED',
-'apcupsd' => 'APCUPSD',
 'apply' => 'Apply now',
 'april' => 'April',
 'archive not exist' => 'Configuration archive does not exist',
@@ -1084,7 +1083,9 @@
 'mac address error not valid' => 'MAC addresse not valid!',
 'mac address error not 00' => 'MAC addresse has to start with 00!',
 'mac address saved' => 'Successfully saved!',
-'mac address saved txt' => 'The MAC address has been successfully saved, but changes will take effect after reboot or reconnection.',
+'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 recon' => 'Trying to reconnect!',
 'mac address done' => 'The MAC address will 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.',