diff --git a/SABnzbd.py b/SABnzbd.py index 94d7ba1..552bdd3 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -717,7 +717,7 @@ def is_sabnzbd_running(url, timeout=None): # Do this without certificate verification, few installations will have that prev = sabnzbd.set_https_verification(False) ver = sabnzbd.newsunpack.get_from_url(url, timeout=timeout) - sabnzbd.set_https_verification(prev) + sabnzbd.set_https_verification(prev) return bool(ver and re.search(r'\d+\.\d+\.', ver)) except: return False @@ -1365,6 +1365,7 @@ def main(): import sabnzbd.utils.sslinfo logging.info("SSL version %s", sabnzbd.utils.sslinfo.ssl_version()) + logging.info("pyOpenSSL version %s", sabnzbd.utils.sslinfo.pyopenssl_version()) logging.info("SSL potentially supported protocols %s", str(sabnzbd.utils.sslinfo.ssl_potential())) logging.info("SSL actually supported protocols %s", str(sabnzbd.utils.sslinfo.ssl_protocols())) diff --git a/interfaces/Config/templates/config.tmpl b/interfaces/Config/templates/config.tmpl index bcddfdc..db7510d 100644 --- a/interfaces/Config/templates/config.tmpl +++ b/interfaces/Config/templates/config.tmpl @@ -1,64 +1,82 @@ -
$T('version'): | -$version [$build] | +||
$T('version'): | +$version [$build] | ||
---|---|---|---|
$T('uptime'): | -$uptime | +$T('uptime'): | +$uptime |
$T('confgFile'): | -$configfn | +||
$T('confgFile'): | +$configfn | ||
$T('cache').capitalize(): | -$msg | +$T('cache').capitalize(): | +$msg |
$T('parameters'): | -$cmdline | +||
$T('parameters'): | +$cmdline | ||
$T('pythonVersion'): | -$sys.version[:120] | +$T('pythonVersion'): | +$sys.version[:120] |
$T('homePage') | -http://sabnzbd.org/ | +||
OpenSSL: | +|||
$T('menu-wiki') | -http://wiki.sabnzbd.org/faq | +pyOpenSSL: | +|
$T('menu-forums') | -http://forums.sabnzbd.org/ | +||
yEnc: | +|||
$T('source') | -https://github.com/sabnzbd/sabnzbd | +$T('homePage') | +http://sabnzbd.org/ |
$T('menu-irc') | -#sabnzbd on irc.synirc.net $T('or') (webchat) | +||
$T('menu-wiki') | +http://wiki.sabnzbd.org/faq | ||
$T('menu-issues') | -http://wiki.sabnzbd.org/issues-1-0-0 | +$T('menu-forums') | +http://forums.sabnzbd.org/ | +
$T('source') | +https://github.com/sabnzbd/sabnzbd | +||
$T('menu-irc') | +#sabnzbd on irc.synirc.net $T('or') (webchat) |
$T('yourRights')
+$T('yourRights')
-