tor.cgi: Remove NoAdvertise option.

This does not make much sense with our setup.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 9d241abb95e392ff0bd17c3bf12d54358ad0ee46..790ce1acc26a7506eab37850f61c00dd49c7c71c 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -642,7 +642,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor configuration
 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 enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index dffd62024225318a67075ec207b055cdfcd41ed7..41d8d9d7895854d614300c7bae6cc965f259c0c6 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -627,7 +627,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor configuration
 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 enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index b57eaeabf2774d2b5682361ddf9b77bec67a0b87..46838b024a12b8083ad6dd5711b8b24f42b71bce 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -544,7 +544,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor configuration
 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 enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 9d241abb95e392ff0bd17c3bf12d54358ad0ee46..790ce1acc26a7506eab37850f61c00dd49c7c71c 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -642,7 +642,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor configuration
 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 enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 0a468036c6423434e635e609279dd9277f8fbc21..67006968301e4d59bea4db238ce1b74b554e9c63 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -607,7 +607,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor configuration
 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 enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index a9d565933fcdc6c44b16004c54eefa5270efd0ad..6c4502fd6296bccfb8ddc41dea512063cd3f23fb 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -540,7 +540,6 @@ WARNING: untranslated string: tor common settings
 WARNING: untranslated string: tor configuration
 WARNING: untranslated string: tor connected relays
 WARNING: untranslated string: tor contact info
 WARNING: untranslated string: tor configuration
 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 enabled
 WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid ip or mask

diff --git a/doc/language_missings b/doc/language_missings
index 6aac6b857796d4ae091705ca2211d43c1d31024f..3c611e617eab5128ee3ede471becfab03ee3c8ba 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -136,7 +136,6 @@
 < tor configuration
 < tor connected relays
 < tor contact info
 < tor configuration
 < tor connected relays
 < tor contact info

-< tor do not advertise relay

 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask


@@ -372,7 +371,6 @@
 < tor configuration
 < tor connected relays
 < tor contact info
 < tor configuration
 < tor connected relays
 < tor contact info

-< tor do not advertise relay

 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask


@@ -560,7 +558,6 @@
 < tor configuration
 < tor connected relays
 < tor contact info
 < tor configuration
 < tor connected relays
 < tor contact info

-< tor do not advertise relay

 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask


@@ -753,7 +750,6 @@
 < tor configuration
 < tor connected relays
 < tor contact info
 < tor configuration
 < tor connected relays
 < tor contact info

-< tor do not advertise relay

 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask
 < tor enabled
 < tor errmsg invalid accounting limit
 < tor errmsg invalid ip or mask

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 2b578810d5263f4b58c20e97e63361128c90e1de..2a31dd4bf8ebc51875e7d53516f750316c444b55 100644 (file)
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -77,7 +77,6 @@ $settings{'TOR_RELAY_ADDRESS'} = '';
 $settings{'TOR_RELAY_PORT'} = 9001;
 $settings{'TOR_RELAY_NICKNAME'} = '';
 $settings{'TOR_RELAY_CONTACT_INFO'} = '';
 $settings{'TOR_RELAY_PORT'} = 9001;
 $settings{'TOR_RELAY_NICKNAME'} = '';
 $settings{'TOR_RELAY_CONTACT_INFO'} = '';

-$settings{'TOR_RELAY_NOADVERTISE'} = 'off';

 $settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0;
 $settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0;
 $settings{'TOR_RELAY_ACCOUNTING_LIMIT'} = 0;
 $settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0;
 $settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0;
 $settings{'TOR_RELAY_ACCOUNTING_LIMIT'} = 0;


@@ -283,10 +282,6 @@ END
        &Header::closebox();
 
        # Tor relay box
        &Header::closebox();
 
        # Tor relay box

-       $checked{'TOR_RELAY_NOADVERTISE'}{'on'} = '';
-       $checked{'TOR_RELAY_NOADVERTISE'}{'off'} = '';
-       $checked{'TOR_RELAY_NOADVERTISE'}{$settings{'TOR_RELAY_NOADVERTISE'}} = 'checked';
-

        $selected{'TOR_RELAY_MODE'}{'bridge'} = '';
        $selected{'TOR_RELAY_MODE'}{'exit'} = '';
        $selected{'TOR_RELAY_MODE'}{'private-bridge'} = '';
        $selected{'TOR_RELAY_MODE'}{'bridge'} = '';
        $selected{'TOR_RELAY_MODE'}{'exit'} = '';
        $selected{'TOR_RELAY_MODE'}{'private-bridge'} = '';


@@ -324,9 +319,9 @@ END
                                                <option value='private-bridge' $selected{'TOR_RELAY_MODE'}{'private-bridge'}>$Lang::tr{'tor relay mode private bridge'}</option>
                                        </select>
                                </td>
                                                <option value='private-bridge' $selected{'TOR_RELAY_MODE'}{'private-bridge'}>$Lang::tr{'tor relay mode private bridge'}</option>
                                        </select>
                                </td>

-                               <td width='25%' class='base'>$Lang::tr{'tor relay port'}:</td>
+                               <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}:&nbsp;<img src='/blob.gif' alt='*' /></td>

                                <td width='20%'>
                                <td width='20%'>

-                                       <input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />
+                                       <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' />

                                </td>
                        </tr>
                        <tr>
                                </td>
                        </tr>
                        <tr>


@@ -334,22 +329,15 @@ END
                                <td width='30%'>
                                        <input type='text' name='TOR_RELAY_ADDRESS' value='$settings{'TOR_RELAY_ADDRESS'}' />
                                </td>
                                <td width='30%'>
                                        <input type='text' name='TOR_RELAY_ADDRESS' value='$settings{'TOR_RELAY_ADDRESS'}' />
                                </td>

-                               <td width='25%' class='base'>$Lang::tr{'tor do not advertise relay'}:</td>
+                               <td width='25%' class='base'>$Lang::tr{'tor relay port'}:</td>

                                <td width='20%'>
                                <td width='20%'>

-                                       <input type='checkbox' name='TOR_RELAY_NOADVERTISE' $checked{'TOR_RELAY_NOADVERTISE'}{'on'} />
-                               </td>
-                       </tr>
-                       <tr>
-                               <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-                               <td width='30%'>
-                                       <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' />
+                                       <input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />

                                </td>
                                </td>

-                               <td colspan='2'></td>

                        </tr>
                        <tr>
                                <td width='25%' class='base'>$Lang::tr{'tor contact info'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
                                <td width='75%' colspan='3'>
                        </tr>
                        <tr>
                                <td width='25%' class='base'>$Lang::tr{'tor contact info'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
                                <td width='75%' colspan='3'>

-                                       <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' size='60' />
+                                       <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' style='width: 98%;' />

                                </td>
                        </tr>
                </table>
                                </td>
                        </tr>
                </table>


@@ -628,11 +616,7 @@ sub BuildConfiguration() {
                # Reject access to private networks.
                print FILE "ExitPolicyRejectPrivate 1\n";
 
                # Reject access to private networks.
                print FILE "ExitPolicyRejectPrivate 1\n";
 

-               print FILE "ORPort $settings{'TOR_RELAY_PORT'}";
-               if ($settings{'TOR_RELAY_NOADVERTISE'} eq 'on') {
-                       print FILE " NoAdvertise";
-               }
-               print FILE "\n";
+               print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";

 
                if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
                        print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n";
 
                if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
                        print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n";

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 021682f702370f46497179c41480e1acfe9541dc..a0c426f3fb1eb985ef0f531472c38011e610a2df 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1817,7 +1817,6 @@
 'tor configuration' => 'Tor-Konfiguration',
 'tor connected relays' => 'Verbundene Relays',
 'tor contact info' => 'Kontaktinformationen',
 'tor configuration' => 'Tor-Konfiguration',
 'tor connected relays' => 'Verbundene Relays',
 '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 enabled' => 'Tor einschalten',
 'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit',
 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 2e04c468d08ba95e18c4cc435ebae1b7feff6ded..b12ae7d2ec367453c827e54a288f2e9eecea0996 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1852,7 +1852,6 @@
 'tor configuration' => 'Tor Configuration',
 'tor connected relays' => 'Connected relays',
 'tor contact info' => 'Contact Info',
 'tor configuration' => 'Tor Configuration',
 'tor connected relays' => 'Connected relays',
 '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 enabled' => 'Enable Tor',
 'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
 'tor errmsg invalid ip or mask' => 'Invalid IP subnet',