moparisthebest
/
SickRage
mirror of https://github.com/moparisthebest/SickRage
1
0
Fork 0
Code Issues Releases Wiki Activity

remove default proxy setting, fix indent

This commit is contained in:
Peter Maciocia 2014-04-24 18:08:24 +01:00
parent 09b106ec6b
commit ddaa5bb5e6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/slick/interfaces/default/config_general.tmpl
View File

@ -281,7 +281,7 @@
</label>
<label class="nocheck clearfix">
<span class="component-title">&nbsp;</span>
<span class="component-desc">Proxy to use for connecting to providers</b></span>
<span class="component-desc">Proxy to use for connecting to providers. Leave empty to not use proxy</b></span>
</label>
</div>
<input type="submit" class="btn config_submitter" value="Save Changes" />

4
sickbeard/__init__.py
View File

@ -488,7 +488,7 @@ def initialize(consoleLogging=True):
METADATA_WDTV, METADATA_TIVO, IGNORE_WORDS, CALENDAR_UNPROTECTED, CREATE_MISSING_SHOW_DIRS, \
ADD_SHOWS_WO_DIR, USE_SUBTITLES, SUBTITLES_LANGUAGES, SUBTITLES_DIR, SUBTITLES_SERVICES_LIST, SUBTITLES_SERVICES_ENABLED, SUBTITLES_HISTORY, SUBTITLES_FINDER_FREQUENCY, subtitlesFinderScheduler, \
USE_FAILED_DOWNLOADS, DELETE_FAILED, ANON_REDIRECT, LOCALHOST_IP, TMDB_API_KEY, \
PROXY_SETTING
PROXY_SETTING
if __INITIALIZED__:
return False
@ -542,7 +542,7 @@ def initialize(consoleLogging=True):
LOCALHOST_IP = check_setting_str(CFG, 'General', 'localhost_ip', '')
ANON_REDIRECT = check_setting_str(CFG, 'General', 'anon_redirect', 'http://dereferer.org/?')
PROXY_SETTING = check_setting_str(CFG, 'General', 'proxy_setting', 'http://192.168.1.11:8118')
PROXY_SETTING = check_setting_str(CFG, 'General', 'proxy_setting', '')
# attempt to help prevent users from breaking links by using a bad url
if not ANON_REDIRECT.endswith('?'):
ANON_REDIRECT = ''