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 cd33ec496ce72a93eaf29979373d8bbf0225a187..8965ff70e5a071acf96de06daf92feff2806a464 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -91,6 +91,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 7756f26447fc587b307cfc29bb0724e860342db5..8adc0f4ef9d1123c7a69ed7d9ab0c940d85e5617 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -625,6 +625,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 21fa1ad170fc9376235f1dd36585d67ef9dd260f..b5361a7b44c962457272d40dd218afec93a1316d 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -610,6 +610,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 3a8f682b5f12f0aaf525613f5f7fe869f1a66dbe..febebf9d1ec2b818a8f7bb4ddda9dbd8ee4c729d 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -527,6 +527,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 7756f26447fc587b307cfc29bb0724e860342db5..8adc0f4ef9d1123c7a69ed7d9ab0c940d85e5617 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -625,6 +625,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 324c4772090b1723f62a38368618c16bc456a290..47c2da4771c9c28f29b04065b0e4152ea514c450 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -590,6 +590,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 31a18c92a44252c97bf875ed9c9a81cebd0279b4..6679e73b3feea7162706c456fc4e5c3577e4976a 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -523,6 +523,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 e47da816f78eeae29a4eadca2f0968753c374750..a9fa8756e1d3463929ebb2da8f7e8d70d5a674e6 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -116,6 +116,7 @@
 < snort working
 < static routes
 < system information
+< tor
 < tor accounting
 < tor accounting bytes
 < tor accounting bytes left
@@ -346,6 +347,7 @@
 < Set time on boot
 < static routes
 < system information
+< tor
 < tor accounting
 < tor accounting bytes
 < tor accounting bytes left
@@ -528,6 +530,7 @@
 < qos enter bandwidths
 < server restart
 < static routes
+< tor
 < tor accounting
 < tor accounting bytes
 < tor accounting bytes left
@@ -715,6 +718,7 @@
 < qos enter bandwidths
 < 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 848aaefa24f34c994fee0cd814791e71f8cb8047..a21f75ab3448a3763c84433ee6daef641acc6e35 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1797,6 +1797,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 150411a4adadd0f05dfcd7476c37648ee5f5dd40..b16ecbf845e19613c4f70337b06c4d276a5ac812 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1831,6 +1831,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',