Merge remote-tracking branch 'chomp-/develop' into develop

This commit is contained in:
rembo10
2012-11-23 00:31:55 -05:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -299,7 +299,7 @@
<tr> <tr>
<td><input class="switch" type="checkbox" name="nzbmatrix" value="1" ${config['use_nzbmatrix']} /></td> <td><input class="switch" type="checkbox" name="nzbmatrix" value="1" ${config['use_nzbmatrix']} /></td>
<td> <td>
<h2><a href="http://www.nzbmatrix.com" target="_blank"><span class="wsr">D</span>NZBMatrix</a></h2> <h2><a href="https://www.nzbmatrix.com" target="_blank"><span class="wsr">D</span>NZBMatrix</a></h2>
<small><label for="nzbmatrix">Enabled/Disabled</label></small> <small><label for="nzbmatrix">Enabled/Disabled</label></small>
</td> </td>
</tr> </tr>
+1 -1
View File
@@ -209,7 +209,7 @@ def searchNZB(albumid=None, new=False, losslessOnly=False):
"term": term "term": term
} }
searchURL = "http://rss.nzbmatrix.com/rss.php?" + urllib.urlencode(params) searchURL = "https://rss.nzbmatrix.com/rss.php?" + urllib.urlencode(params)
logger.info(u'Parsing results from <a href="%s">NZBMatrix</a>' % searchURL) logger.info(u'Parsing results from <a href="%s">NZBMatrix</a>' % searchURL)
try: try:
data = urllib2.urlopen(searchURL, timeout=20).read() data = urllib2.urlopen(searchURL, timeout=20).read()