tor.cgi: Check for valid accounting limit.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 709f8beeb3a9de775df9bb56cdd196dabc24ee49..9d241abb95e392ff0bd17c3bf12d54358ad0ee46 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -644,6 +644,7 @@ WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
+WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask
 WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 365a969c1e72dfd199f59656634cc3011d43782a..dffd62024225318a67075ec207b055cdfcd41ed7 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -629,6 +629,7 @@ WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
+WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask
 WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index a8b7b5226a26fe44c35877d047db736cd4223ff7..b57eaeabf2774d2b5682361ddf9b77bec67a0b87 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -546,6 +546,7 @@ WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
+WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask
 WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 709f8beeb3a9de775df9bb56cdd196dabc24ee49..9d241abb95e392ff0bd17c3bf12d54358ad0ee46 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -644,6 +644,7 @@ WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
+WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask
 WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 3941287cf9e14da6a0c9f4a48165232c31f6fdb3..0a468036c6423434e635e609279dd9277f8fbc21 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -609,6 +609,7 @@ WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
+WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask
 WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 8e1c1887b72b8ea03c037f0fcdcb2c89842e1a19..a9d565933fcdc6c44b16004c54eefa5270efd0ad 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -542,6 +542,7 @@ WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor do not advertise relay
 WARNING: untranslated string: tor enabled
+WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask
 WARNING: untranslated string: tor errmsg invalid relay address
 WARNING: untranslated string: tor errmsg invalid relay name

diff --git a/doc/language_missings b/doc/language_missings
index cd8e1ae25ac198cabf415103ca649b077802163c..6aac6b857796d4ae091705ca2211d43c1d31024f 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -138,6 +138,7 @@
 < tor contact info
 < tor do not advertise relay
 < tor enabled
+< tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
 < tor errmsg invalid relay address
 < tor errmsg invalid relay name
@@ -373,6 +374,7 @@
 < tor contact info
 < tor do not advertise relay
 < tor enabled
+< tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
 < tor errmsg invalid relay address
 < tor errmsg invalid relay name
@@ -560,6 +562,7 @@
 < tor contact info
 < tor do not advertise relay
 < tor enabled
+< tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
 < tor errmsg invalid relay address
 < tor errmsg invalid relay name
@@ -752,6 +755,7 @@
 < tor contact info
 < tor do not advertise relay
 < tor enabled
+< tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
 < tor errmsg invalid relay address
 < tor errmsg invalid relay name

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 59f1cc01c6842d6b915cecab768a7079483e199c..28d8bf7ef15f71b92f8ba9d2ac21b311b56b35d4 100644 (file)
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -116,6 +116,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
                }
        }
 
+       if ($settings{'TOR_RELAY_ACCOUNTING_LIMIT'} !~ /^\d+$/) {
+               $errormessage = "$Lang::tr{'tor errmsg invalid accounting limit'}: $settings{'TOR_RELAY_ACCOUNTING_LIMIT'}";
+       }
+
        my @temp = split(/[\n,]/,$settings{'TOR_ALLOWED_SUBNETS'});
        $settings{'TOR_ALLOWED_SUBNETS'} = "";
        foreach (@temp) {

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 13c79a4b46b35c0a14fb099cee7fa2bc47b1a01e..021682f702370f46497179c41480e1acfe9541dc 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1819,6 +1819,7 @@
 'tor contact info' => 'Kontaktinformationen',
 'tor do not advertise relay' => 'Relay nicht announcieren',
 'tor enabled' => 'Tor einschalten',
+'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit',
 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz',
 'tor errmsg invalid relay address' => 'Ungültige Relay-Adresse',
 'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname.',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 9e3abe0181cfaeea4ec8bcda26be94f5112e79e7..2e04c468d08ba95e18c4cc435ebae1b7feff6ded 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1854,6 +1854,7 @@
 'tor contact info' => 'Contact Info',
 'tor do not advertise relay' => 'Do not advertise the relay',
 'tor enabled' => 'Enable Tor',
+'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
 'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
 'tor errmsg invalid node id' => 'Invalid node ID',
 'tor errmsg invalid relay address' => 'Invalid relay address',