WUI: Add Tor menu entry.

diff --git a/config/menu/EX-tor.menu b/config/menu/EX-tor.menu
new file mode 100644 (file)
index 0000000..00ddffe
--- /dev/null
+++ b/config/menu/EX-tor.menu
@@ -0,0 +1,6 @@
+$subipfire->{'50.tor'} = {
+       'caption' => $Lang::tr{'tor'},
+       'uri' => '/cgi-bin/tor.cgi',
+       'title' => $Lang::tr{'tor'},
+       'enabled' => 1,
+};

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index c5ab9dbd025d459f1baa70627bd8ffd935a9fe49..32f7d4d563d2a6f059388e6ecc5a543b245688e5 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -106,6 +106,7 @@ var/ipfire/menu.d/70-log.menu
 #var/ipfire/menu.d/EX-imspector.menu
 #var/ipfire/menu.d/EX-mpfire.menu
 #var/ipfire/menu.d/EX-samba.menu
+#var/ipfire/menu.d/EX-tor.menu
 #var/ipfire/menu.d/EX-tripwire.menu
 #var/ipfire/menu.d/EX-wlanap.menu
 var/ipfire/modem

diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor
index e670be2d566460a0c70ed2a77ce2777e0cf0ba84..1861f4f494f15f50746f32236851e9a7d1a4f4e2 100644 (file)
--- a/config/rootfiles/packages/tor
+++ b/config/rootfiles/packages/tor
@@ -4,6 +4,7 @@ etc/rc.d/init.d/tor
 #etc/tor
 etc/tor/tor-tsocks.conf
 etc/tor/torrc
+srv/web/ipfire/cgi-bin/tor.cgi
 usr/bin/tor
 usr/bin/tor-gencert
 usr/bin/tor-resolve
@@ -22,7 +23,7 @@ usr/share/tor
 usr/share/tor/defaults-torrc
 usr/share/tor/geoip
 var/ipfire/backup/addons/includes/tor
-srv/web/ipfire/cgi-bin/tor.cgi
+var/ipfire/menu.d/EX-tor.menu
 var/ipfire/tor
 var/ipfire/tor/settings
 var/ipfire/tor/torrc

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 4bcaf0e263db2500308558db5a73d69421de15fb..a09c507fde720e6a01d2841ff848587a1b642f73 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -808,6 +808,7 @@ WARNING: untranslated string: routing table
 WARNING: untranslated string: server restart
 WARNING: untranslated string: static routes
 WARNING: untranslated string: system information
+WARNING: untranslated string: tor
 WARNING: untranslated string: tor accounting
 WARNING: untranslated string: tor accounting bytes
 WARNING: untranslated string: tor accounting bytes left

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index c34e62f3f2d06abe3d22af7913db512f924f4dfd..bcc871bc486ea0ce307ab224a3c3aae576fb46f2 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -799,6 +799,7 @@ WARNING: untranslated string: server restart
 WARNING: untranslated string: snort working
 WARNING: untranslated string: static routes
 WARNING: untranslated string: system information
+WARNING: untranslated string: tor
 WARNING: untranslated string: tor accounting
 WARNING: untranslated string: tor accounting bytes
 WARNING: untranslated string: tor accounting bytes left

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 54e4c895fb68e2c2b0125a59570a27ccd14cdd7b..5b44a0c6e90d7d0c7a3f6f7966891f77b12af7ce 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -716,6 +716,7 @@ WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
+WARNING: untranslated string: tor
 WARNING: untranslated string: tor accounting
 WARNING: untranslated string: tor accounting bytes
 WARNING: untranslated string: tor accounting bytes left

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 4bcaf0e263db2500308558db5a73d69421de15fb..a09c507fde720e6a01d2841ff848587a1b642f73 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -808,6 +808,7 @@ WARNING: untranslated string: routing table
 WARNING: untranslated string: server restart
 WARNING: untranslated string: static routes
 WARNING: untranslated string: system information
+WARNING: untranslated string: tor
 WARNING: untranslated string: tor accounting
 WARNING: untranslated string: tor accounting bytes
 WARNING: untranslated string: tor accounting bytes left

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index e6812bb2c66fcc62a1112fff7873c7dfc4c83c7b..203d1b5e72efcfc99453d762f4b355f3821cd17f 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -779,6 +779,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: server restart
 WARNING: untranslated string: static routes
+WARNING: untranslated string: tor
 WARNING: untranslated string: tor accounting
 WARNING: untranslated string: tor accounting bytes
 WARNING: untranslated string: tor accounting bytes left

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 216db7565cdf90aa727054f065baeef14b6f1ae6..e1fd0161126e3f926393d8e32e6f46c1a089d5ba 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -712,6 +712,7 @@ WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
+WARNING: untranslated string: tor
 WARNING: untranslated string: tor accounting
 WARNING: untranslated string: tor accounting bytes
 WARNING: untranslated string: tor accounting bytes left

diff --git a/doc/language_missings b/doc/language_missings
index c2398beb7d978a1f340454d35ac077a296b61eea..ec781ad7256b4f9ff8fb05a480199870ccd25393 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -327,6 +327,7 @@
 < snort working
 < static routes
 < system information
+< tor
 < tor accounting
 < tor accounting bytes
 < tor accounting bytes left
@@ -730,6 +731,7 @@
 < Set time on boot
 < static routes
 < system information
+< tor
 < tor accounting
 < tor accounting bytes
 < tor accounting bytes left
@@ -1085,6 +1087,7 @@
 < red1
 < server restart
 < static routes
+< tor
 < tor accounting
 < tor accounting bytes
 < tor accounting bytes left
@@ -1445,6 +1448,7 @@
 < red1
 < server restart
 < static routes
+< tor
 < tor accounting
 < tor accounting bytes
 < tor accounting bytes left

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index d7b759982141e19a72f6ef5eacae536becc3bf16..a286d74cebc815b2528f94cbd8c7fc63e387d0c9 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1970,6 +1970,7 @@
 'tone' => 'Ton',
 'tone dial' => 'Tonwahl:',
 'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt',
+'tor' => 'Tor',
 'tor accounting' => 'Accounting',
 'tor accounting bytes' => 'Traffic (empfangen/gesendet)',
 'tor accounting bytes left' => 'übrig',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8cded0ab7c54351d6c9e9cff4bd3424fd7fd1cbf..39222b6024761b95fc4096a8009ff39b68d04e85 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1996,6 +1996,7 @@
 'tone' => 'Tone',
 'tone dial' => 'Tone dial:',
 'too long 80 char max' => ' is too long, maximum allowed is 80 characters',
+'tor' => 'Tor',
 'tor accounting' => 'Accounting',
 'tor accounting bytes' => 'Traffic (read/written)',
 'tor accounting bytes left' => 'left',