Commit 3f42f94f authored by SVN-Git Migration's avatar SVN-Git Migration

Imported Upstream version 0.7.8

parent 6f42bec8
******************************************* *******************************************
*** This is SABnzbd 0.7.6 *** *** This is SABnzbd 0.7.8 ***
******************************************* *******************************************
SABnzbd is an open-source cross-platform binary newsreader. SABnzbd is an open-source cross-platform binary newsreader.
It simplifies the process of downloading from Usenet dramatically, It simplifies the process of downloading from Usenet dramatically,
......
-------------------------------------------------------------------------------
0.7.8Final by The SABnzbd-Team
-------------------------------------------------------------------------------
- Fix problem with %fn substitution in Sorting
- Add special "wait_for_dfolder", enables waiting for external temp download folder
- Work-around for servers that do not support STAT command
- Removed articles are now listed seperately in download report
- Add "abort" option to encryption detection
- Fix missing Retry link for "Out of retention" jobs.
- Option to abort download when it is clear that not enough data is available
- Support "nzbname" parameter in addfile/addlocalfile api calls for
ZIP files with a single NZB
- Support NZB-1.1 meta data "password" and "category"
- Don't retry an empty but correct NZB from an indexer
-------------------------------------------------------------------------------
0.7.7Final by The SABnzbd-Team
-------------------------------------------------------------------------------
- Windows/OSX: Update unrar to 4.20
- Fix some issues with orphaned items
- Generic sort didn't always rename media files in multi-part jobs properly
- Optional web-ui watchdog
- Always show RSS items in the same order as the original RSS feed
- Remove unusable folders from folder selector (Plush skin)
- Remove newzbin support
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
0.7.6Final by The SABnzbd-Team 0.7.6Final by The SABnzbd-Team
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
......
(c) Copyright 2007-2012 by "The SABnzbd-team" <team@sabnzbd.org> (c) Copyright 2007-2013 by "The SABnzbd-team" <team@sabnzbd.org>
The SABnzbd-team is: The SABnzbd-team is:
......
SABnzbd 0.7.6 SABnzbd 0.7.8
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
0) LICENSE 0) LICENSE
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
(c) Copyright 2007-2012 by "The SABnzbd-team" <team@sabnzbd.org> (c) Copyright 2007-2013 by "The SABnzbd-team" <team@sabnzbd.org>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
......
Metadata-Version: 1.0 Metadata-Version: 1.0
Name: SABnzbd Name: SABnzbd
Version: 0.7.6 Version: 0.7.8
Summary: SABnzbd-0.7.6 Summary: SABnzbd-0.7.8
Home-page: http://sabnzbd.org Home-page: http://sabnzbd.org
Author: The SABnzbd Team Author: The SABnzbd Team
Author-email: team@sabnzbd.org Author-email: team@sabnzbd.org
......
Release Notes - SABnzbd 0.7.6 Release Notes - SABnzbd 0.7.8
=============================== ===============================
## Features ## Features
- Properly handle par2-sets that were renamed after creation by the poster - Use "category" and "password" meta-data in NZB files
- Recursive scanning when re-queuing downloaded NZB files (Provided by some indexers)
- Option to abort download when it is clear that not enough data is available
(For removed posts it will be faster than pre-download check)
- Add "Abort" option for encryption detection
- Removed articles are now listed separately in download report
- Special option "wait_for_dfolder", enables waiting for external temp download folder at startup
## Bug fixes ## Bug fixes
- Prevent blocking assembly of completed files, (this resulted in excessive CPU and memory usage) - Fix problem with %fn substitution in Sorting
- Fix speed issues with some Usenet servers due to unreachable IPv6 addresses - Pre-download check did not work with all servers
- Fix issues with SFV-base checks - Fix missing Retry link for "Out of retention" jobs.
- Successfully pre-checked job lost its attributes when those were changed during check - API function "addfile" now accepts "nzbname" parameter for ZIP/RAR files with one NZB.
- No longer check version when looking for a running instance of SABnzbd (this prevents unintended multiple instances). - Prevent retries when an NZB with just samples is retrieved from an indexer
- A damaged base par2 file could block download of more par2 files (and you had the "do not download samples" option enabled).
- Fix evaluation of schedules at startup
- Fix possible failing startup when running as a Windows Service
## What's new in 0.7.0 ## What's new in 0.7.0
...@@ -43,7 +46,7 @@ Release Notes - SABnzbd 0.7.6 ...@@ -43,7 +46,7 @@ Release Notes - SABnzbd 0.7.6
built-in post-processing options that automatically verify, repair, built-in post-processing options that automatically verify, repair,
extract and clean up posts downloaded from Usenet. extract and clean up posts downloaded from Usenet.
(c) Copyright 2007-2012 by "The SABnzbd-team" \<team@sabnzbd.org\> (c) Copyright 2007-2013 by "The SABnzbd-team" \<team@sabnzbd.org\>
### IMPORTANT INFORMATION about release 0.7.x ### IMPORTANT INFORMATION about release 0.7.x
......
#!/usr/bin/python -OO #!/usr/bin/python -OO
# Copyright 2008-2012 The SABnzbd-Team <team@sabnzbd.org> # Copyright 2008-2013 The SABnzbd-Team <team@sabnzbd.org>
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
...@@ -260,7 +260,7 @@ def print_version(): ...@@ -260,7 +260,7 @@ def print_version():
print """ print """
%s-%s %s-%s
Copyright (C) 2008-2012, The SABnzbd-Team <team@sabnzbd.org> Copyright (C) 2008-2013, The SABnzbd-Team <team@sabnzbd.org>
SABnzbd comes with ABSOLUTELY NO WARRANTY. SABnzbd comes with ABSOLUTELY NO WARRANTY.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions. It is licensed under the under certain conditions. It is licensed under the
...@@ -686,12 +686,12 @@ def attach_server(host, port, cert=None, key=None, chain=None): ...@@ -686,12 +686,12 @@ def attach_server(host, port, cert=None, key=None, chain=None):
adapter.subscribe() adapter.subscribe()
def is_sabnzbd_running(url): def is_sabnzbd_running(url, timeout=None):
""" Return True when there's already a SABnzbd instance running. """ Return True when there's already a SABnzbd instance running.
""" """
try: try:
url = '%s&mode=version' % (url) url = '%s&mode=version' % (url)
ver = sabnzbd.newsunpack.get_from_url(url) ver = sabnzbd.newsunpack.get_from_url(url, timeout=timeout)
return bool(ver and re.search(r'\d+\.\d+\.', ver)) return bool(ver and re.search(r'\d+\.\d+\.', ver))
except: except:
return False return False
...@@ -1563,7 +1563,7 @@ def main(): ...@@ -1563,7 +1563,7 @@ def main():
add_local(f) add_local(f)
# Have to keep this running, otherwise logging will terminate # Have to keep this running, otherwise logging will terminate
timer = 0 timer = timer5 = 0
while not sabnzbd.SABSTOP: while not sabnzbd.SABSTOP:
if sabnzbd.WIN_SERVICE: if sabnzbd.WIN_SERVICE:
rc = win32event.WaitForMultipleObjects((sabnzbd.WIN_SERVICE.hWaitStop, rc = win32event.WaitForMultipleObjects((sabnzbd.WIN_SERVICE.hWaitStop,
...@@ -1603,6 +1603,15 @@ def main(): ...@@ -1603,6 +1603,15 @@ def main():
if sabnzbd.WIN_SERVICE and mail: if sabnzbd.WIN_SERVICE and mail:
mail.send('active') mail.send('active')
if timer5 > 9:
### 5 minute polling tasks
timer5 = 0
if sabnzbd.cfg.web_watchdog() and not is_sabnzbd_running('%s/api?tickleme=1' % sabnzbd.BROWSER_URL, 120):
autorestarted = True
cherrypy.engine.execv = True
else:
timer5 += 1
else: else:
timer += 1 timer += 1
......
#encoding UTF-8 #encoding UTF-8
## Translation by Thomas Lucke (Lucky)
## ##
## Bad URL Fetch Email template for SABnzbd ## Bad URL Fetch Email template for SABnzbd
## This a Cheetah template ## This a Cheetah template
...@@ -10,14 +11,12 @@ ...@@ -10,14 +11,12 @@
To: $to To: $to
From: $from From: $from
Date: $date Date: $date
Subject: SABnzbd failed to fetch an NZB Subject: SABnzbd konnte eine NZB-Datei nicht herunterladen
X-priority: 5 X-priority: 5
X-MS-priority: 5 X-MS-priority: 5
## After this comes the body, the empty line is required! ## After this comes the body, the empty line is required!
Hi, Hallo,
SABnzbd has failed to retrieve the NZB from $url. SABnzbd konnte die NZB-Datei von $url nicht herrunterladen.
The error message was: $msg Die Fehlermeldung war: $msg
Bye
...@@ -6,59 +6,6 @@ ...@@ -6,59 +6,6 @@
<!--#set global $submenu="newzbin"#--> <!--#set global $submenu="newzbin"#-->
<!--#include $webdir + "/inc_cmenu.tmpl"#--> <!--#include $webdir + "/inc_cmenu.tmpl"#-->
<h2>Newzbin</h2>
$T('explain-newzbin')<br/><br/>
<form action="saveNewzbin" method="post" autocomplete="off">
<div class="EntryBlock">
<fieldset class="EntryFieldSet">
<legend>$T('accountInfo')</legend>
<strong>$T('opt-username_newzbin'):</strong><br>
$T('explain-username_newzbin')<br>
<input type="text" name="username_newzbin" value="$username_newzbin">
<br>
<br>
<strong>$T('opt-password_newzbin'):</strong><br>
$T('explain-password_newzbin')<br>
<input type="password" name="password_newzbin" value="$password_newzbin">
</fieldset>
</div>
<div class="EntryBlock">
<fieldset class="EntryFieldSet">
<legend>$T('newzbinBookmarks')</legend>
<label><input type="checkbox" name="newzbin_bookmarks" value="1" <!--#if $newzbin_bookmarks > 0 then "checked=1" else ""#--> <strong>$T('opt-newzbin_bookmarks'):</strong></label><br>
$T('explain-newzbin_bookmarks')<br>
<a href="getBookmarks?session=$session">$T('link-getBookmarks')</a>
<br>
<!--#if $bookmarks_list#-->
<a href="hideBookmarks?session=$session">$T('link-HideBM')</a>
<!--#else#-->
<a href="showBookmarks?session=$session">$T('link-ShowBM')</a>
<!--#end if#-->
<br/>
<br/>
<label><input type="checkbox" name="newzbin_unbookmark" value="1" <!--#if $newzbin_unbookmark > 0 then "checked=1" else ""#--> /> <strong>$T('opt-newzbin_unbookmark'):</strong></label><br>
$T('explain-newzbin_unbookmark')<br>
<br/>
<strong>$T('opt-bookmark_rate'):</strong><br>
$T('explain-bookmark_rate')<br>
<input type="text" name="bookmark_rate" value="$bookmark_rate">
</fieldset>
</div>
<!--#if $bookmarks_list#-->
<fieldset class="EntryFieldSet">
<legend>$T('processedBM')</legend>
<!--#for $msgid in $bookmarks_list#-->
<a href="https://$newzbin_url/browse/post/$msgid/" target="_blank">$msgid</a>&nbsp;
<!--#end for#-->
</fieldset>
<!--#end if#-->
<input type="hidden" name="session" value="$session">
<p><input type="submit" value="$T('button-saveChanges')"></p>
</form>
<hr/>
<h2>NzbMatrix</h2> <h2>NzbMatrix</h2>
$T('explain-nzbmatrix')<br/><br/> $T('explain-nzbmatrix')<br/><br/>
......
...@@ -47,11 +47,13 @@ ...@@ -47,11 +47,13 @@
<a href="$cpath/notify/">$T('cmenu-notif')</a> | <a href="$cpath/notify/">$T('cmenu-notif')</a> |
<!--#end if#--> <!--#end if#-->
<!--#if 0#-->
<!--#if $submenu=="indexers"#--> <!--#if $submenu=="indexers"#-->
<a class="current" href="./">$T('cmenu-newzbin')</a> | <a class="current" href="./">$T('cmenu-newzbin')</a> |
<!--#else#--> <!--#else#-->
<a href="$cpath/indexers/">$T('cmenu-newzbin')</a> | <a href="$cpath/indexers/">$T('cmenu-newzbin')</a> |
<!--#end if#--> <!--#end if#-->
<!--#end if#-->
<!--#if $submenu=="categories"#--> <!--#if $submenu=="categories"#-->
<a class="current" href="./">$T('cmenu-cat')</a> | <a class="current" href="./">$T('cmenu-cat')</a> |
......
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
<div class="EntryBlock"> <div class="EntryBlock">
<form action="addID" method="get"> <form action="addID" method="get">
<fieldset class="EntryFieldSet"> <fieldset class="EntryFieldSet">
<legend>$T('add') <legend>$T('add') URL</legend>
<!--#if $varExists('newzbinDetails')#--> $T('reportId') / <!--#end if#-->URL</legend>
<input type="text" name="id"> <input type="text" name="id">
<!--#if $cat_list#--> <!--#if $cat_list#-->
<select name="cat" > <select name="cat" >
......
...@@ -128,9 +128,11 @@ ...@@ -128,9 +128,11 @@
<a href="${root}config/notify/"> <a href="${root}config/notify/">
<div #if $pane == "Email" then 'class="active"' else ""#>$T('cmenu-notif')</div> <div #if $pane == "Email" then 'class="active"' else ""#>$T('cmenu-notif')</div>
</a> </a>
<!--#if 0#-->
<a href="${root}config/indexers/"> <a href="${root}config/indexers/">
<div #if $pane == "Index Sites" then 'class="active"' else ""#>$T('cmenu-newzbin')</div> <div #if $pane == "Index Sites" then 'class="active"' else ""#>$T('cmenu-newzbin')</div>
</a> </a>
<!--#end if#-->
<a href="${root}config/categories/"> <a href="${root}config/categories/">
<div #if $pane == "Categories" then 'class="active"' else ""#>$T('cmenu-cat')</div> <div #if $pane == "Categories" then 'class="active"' else ""#>$T('cmenu-cat')</div>
</a> </a>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</table> </table>
</div> </div>
<div class="padding alt"> <div class="padding alt">
<h5 class="copyright">Copyright &copy; 2008-2012 The SABnzbd Team &lt;<span style="color: #0000ff;">team@sabnzbd.org</span>&gt;</h5> <h5 class="copyright">Copyright &copy; 2008-2013 The SABnzbd Team &lt;<span style="color: #0000ff;">team@sabnzbd.org</span>&gt;</h5>
<p class="copyright"><small>$T('yourRights')</small></p> <p class="copyright"><small>$T('yourRights')</small></p>
</div> </div>
<!--#if $news_items#--> <!--#if $news_items#-->
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
</div> </div>
<div class="field-pair alt"> <div class="field-pair alt">
<label class="config" for="cleanup_list">$T('opt-cleanup_list')</label> <label class="config" for="cleanup_list">$T('opt-cleanup_list')</label>
<input type="text" name="cleanup_list" id="cleanup_list" value="$cleanup_list" size="50" placeholder=".nfo, .sfv" /> <input type="text" name="cleanup_list" id="cleanup_list" value="$cleanup_list" size="50"/>
<span class="desc">$T('explain-cleanup_list')</span> <span class="desc">$T('explain-cleanup_list')</span>
</div> </div>
<div class="field-pair"> <div class="field-pair">
......
...@@ -33,84 +33,6 @@ ...@@ -33,84 +33,6 @@
</fieldset> </fieldset>
</div><!-- /col1 --> </div><!-- /col1 -->
</div><!-- /section --> </div><!-- /section -->
<div class="section">
<div class="col2">
<h3>Newzbin $T('accountInfo')</h3>
<p>$T('explain-newzbin')</p>
</div><!-- /col2 -->
<div class="col1">
<fieldset>
<div class="field-pair alt">
<label class="config" for="username_newzbin">$T('opt-username_newzbin')</label>
<input type="text" name="username_newzbin" id="username_newzbin" value="$username_newzbin" size="30" />
<span class="desc">$T('explain-username_newzbin')</span>
</div>
<div class="field-pair">
<label class="config" for="password_newzbin">$T('opt-password_newzbin')</label>
<input type="password" name="password_newzbin" id="password_newzbin" value="$password_newzbin" size="30" />
<span class="desc">$T('explain-password_newzbin')</span>
</div>
<div class="field-pair">
<input type="submit" value="$T('button-saveChanges')" class="saveButton" />
</div>
</fieldset>
</div><!-- /col1 -->
</div><!-- /section -->
<div class="section">
<div class="col2">
<h3>Newzbin $T('newzbinBookmarks')</h3>
<p>
<input type="button" id="getBookmarks" value="$T('link-getBookmarks')" />
<span id="getBookmarks-result" class="icon">&nbsp;</span>
<br/><br/>
<!--#if $bookmarks_list#-->
<input type="button" id="hideBookmarks" value="$T('link-HideBM')" />
<!--#else#-->
<input type="button" id="showBookmarks" value="$T('link-ShowBM')" />
<!--#end if#-->
</p>
</div><!-- /col2 -->
<div class="col1">
<fieldset>
<div class="field-pair alt">
<label class="config" for="newzbin_bookmarks">$T('opt-newzbin_bookmarks')</label>
<input type="checkbox" name="newzbin_bookmarks" id="newzbin_bookmarks" value="1" <!--#if int($newzbin_bookmarks) > 0 then 'checked="checked"' else ""#--> />
<span class="desc">$T('explain-newzbin_bookmarks')</span>
</div>
<div class="field-pair">
<label class="config" for="newzbin_unbookmark">$T('opt-newzbin_unbookmark')</label>
<input type="checkbox" name="newzbin_unbookmark" id="newzbin_unbookmark" value="1" <!--#if int($newzbin_unbookmark) > 0 then 'checked="checked"' else ""#--> />
<span class="desc">$T('explain-newzbin_unbookmark')</span>
</div>
<div class="field-pair alt">
<label class="config" for="bookmark_rate">$T('opt-bookmark_rate')</label>
<input type="number" name="bookmark_rate" id="bookmark_rate" value="$bookmark_rate" size="8" min="15" max="1440" />
<span class="desc">$T('explain-bookmark_rate')</span>
</div>
<div class="field-pair">
<input type="submit" value="$T('button-saveChanges')" class="saveButton" />
</div>
</fieldset>
</div><!-- /col1 -->
</div><!-- /section -->
<!--#if $bookmarks_list#-->
<div class="section">
<div class="col2">
<h3>Newzbin Bookmarks</h3>
</div><!-- /col2 -->
<div class="col1">
<fieldset>
<!--#set $odd = False#-->
<!--#for $msgid in $bookmarks_list#-->
<!--#set $odd = not $odd#-->
<div class="field-pair <!--#if $odd then "alt" else ""#-->">
<a href="https://$newzbin_url/browse/post/$msgid/" target="_blank">$msgid</a><br/>
</div>
<!--#end for#-->
</fieldset>
</div><!-- /col1 -->
</div><!-- /section -->
<!--#end if#-->
<div class="padding alt"> <div class="padding alt">
<input type="submit" value="$T('button-saveChanges')" class="saveButton" /> <input type="submit" value="$T('button-saveChanges')" class="saveButton" />
<input type="button" value="$T('button-restart') SABnzbd" class="sabnzbd_restart" /> <input type="button" value="$T('button-restart') SABnzbd" class="sabnzbd_restart" />
......
...@@ -155,10 +155,10 @@ ...@@ -155,10 +155,10 @@
<div class="col2" style="display:block;"> <div class="col2" style="display:block;">
<!--#if 'amounts' in $servers[$server]#--> <!--#if 'amounts' in $servers[$server]#-->
<b>$T('srv-bandwidth'):</b><br/> <b>$T('srv-bandwidth'):</b><br/>
$T('total'): $servers[$server]['amounts'][0]<br/> $T('total'): $(servers[$server]['amounts'][0])B<br/>
$T('today'): $servers[$server]['amounts'][3]<br/> $T('today'): $(servers[$server]['amounts'][3])B<br/>
$T('thisWeek'): $servers[$server]['amounts'][2]<br/> $T('thisWeek'): $(servers[$server]['amounts'][2])B<br/>
$T('thisMonth'): $servers[$server]['amounts'][1] $T('thisMonth'): $(servers[$server]['amounts'][1])B
<!--#end if#--> <!--#end if#-->
</div> </div>
</div><!-- /section --> </div><!-- /section -->
......
...@@ -83,6 +83,11 @@ ...@@ -83,6 +83,11 @@
</div><!-- /col2 --> </div><!-- /col2 -->
<div class="col1"> <div class="col1">
<fieldset> <fieldset>
<div class="field-pair">
<label class="config" for="fail_hopeless">$T('opt-fail_hopeless')</label>
<input type="checkbox" name="fail_hopeless" id="fail_hopeless" value="1" <!--#if int($fail_hopeless) > 0 then 'checked="checked"' else ""#--> />
<span class="desc">$T('explain-fail_hopeless')</span>
</div>
<div class="field-pair alt"> <div class="field-pair alt">
<label class="config" for="pre_check">$T('opt-pre_check')</label> <label class="config" for="pre_check">$T('opt-pre_check')</label>
<input type="checkbox" name="pre_check" id="pre_check" value="1" <!--#if int($pre_check) > 0 then 'checked="checked"' else ""#--> /> <input type="checkbox" name="pre_check" id="pre_check" value="1" <!--#if int($pre_check) > 0 then 'checked="checked"' else ""#--> />
...@@ -104,7 +109,11 @@ ...@@ -104,7 +109,11 @@
</div> </div>
<div class="field-pair"> <div class="field-pair">
<label class="config" for="pause_on_pwrar">$T('opt-pause_on_pwrar')</label> <label class="config" for="pause_on_pwrar">$T('opt-pause_on_pwrar')</label>
<input type="checkbox" name="pause_on_pwrar" id="pause_on_pwrar" value="1" <!--#if int($pause_on_pwrar) > 0 then 'checked="checked"' else ""#--> /> <select name="pause_on_pwrar" id="pause_on_pwrar">
<option value="0" <!--#if int($pause_on_pwrar) == 0 then 'selected="selected" class="selected"' else ""#--> >$T('nodupes-off')</option>
<option value="1" <!--#if int($pause_on_pwrar) == 1 then 'selected="selected" class="selected"' else ""#--> >$T('nodupes-pause')</option>
<option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected" class="selected"' else ""#--> >$T('abort')</option>
</select>
<span class="desc">$T('explain-pause_on_pwrar')</span> <span class="desc">$T('explain-pause_on_pwrar')</span>
</div> </div>
<div class="field-pair alt"> <div class="field-pair alt">
......
...@@ -126,8 +126,10 @@ ...@@ -126,8 +126,10 @@
<div class="config_sprite_container sprite_config_nav_scheduling">$T('Plush-cmenu-scheduling')</div></a></li> <div class="config_sprite_container sprite_config_nav_scheduling">$T('Plush-cmenu-scheduling')</div></a></li>
<li><a class="#if $pane=="Email"#nav_active#end if#" id="config_nav_email" href="${path}config/notify/"> <li><a class="#if $pane=="Email"#nav_active#end if#" id="config_nav_email" href="${path}config/notify/">
<div class="config_sprite_container sprite_config_nav_email">$T('cmenu-notif')</div></a></li> <div class="config_sprite_container sprite_config_nav_email">$T('cmenu-notif')</div></a></li>
<!--#if 0#-->
<li><a class="#if $pane=="Index Sites"#nav_active#end if#" id="config_nav_index_sites" href="${path}config/indexers/"> <li><a class="#if $pane=="Index Sites"#nav_active#end if#" id="config_nav_index_sites" href="${path}config/indexers/">
<div class="config_sprite_container sprite_config_nav_indexsites">$T('cmenu-newzbin')</div></a></li> <div class="config_sprite_container sprite_config_nav_indexsites">$T('cmenu-newzbin')</div></a></li>
<!--#end if#-->
<li><a class="#if $pane=="Categories"#nav_active#end if#" id="config_nav_categories" href="${path}config/categories/"> <li><a class="#if $pane=="Categories"#nav_active#end if#" id="config_nav_categories" href="${path}config/categories/">
<div class="config_sprite_container sprite_config_nav_categories">$T('cmenu-cat')</div></a></li> <div class="config_sprite_container sprite_config_nav_categories">$T('cmenu-cat')</div></a></li>
<li><a class="#if $pane=="Sorting"#nav_active#end if#" id="config_nav_sorting" href="${path}config/sorting/"> <li><a class="#if $pane=="Sorting"#nav_active#end if#" id="config_nav_sorting" href="${path}config/sorting/">
......
...@@ -43,90 +43,6 @@ ...@@ -43,90 +43,6 @@
</fieldset> </fieldset>
</div><!-- /component-group1 --> </div><!-- /component-group1 -->
<div id="core-component-group2" class="component-group clearfix">
<div class="component-group-desc">
<h3>Newzbin $T('accountInfo')</h3>
<p>$T('explain-newzbin')</p>
</div>
<fieldset class="component-group-list">
<div class="field-pair">
<label class="nocheck clearfix" for="username_newzbin">
<span class="component-title">$T('opt-username_newzbin')</span>
<input type="text" name="username_newzbin" id="username_newzbin" value="$username_newzbin"/>
</label>
<label class="nocheck clearfix">
<span class="component-title">&nbsp;</span>
<span class="component-desc">$T('explain-username_newzbin')</span>
</label>
</div>
<div class="field-pair alt">
<label class="nocheck clearfix" for="password_newzbin">
<span class="component-title">$T('opt-password_newzbin')</span>
<input type="password" name="password_newzbin" id="password_newzbin" value="$password_newzbin"/>
</label>
<label class="nocheck clearfix">
<span class="component-title">&nbsp;</span>
<span class="component-desc">$T('explain-password_newzbin')</span>
</label>
</div>
</fieldset>
</div><!-- /component-group2 -->
<div id="core-component-group3" class="component-group clearfix">
<div class="component-group-desc">
<h3>Newzbin $T('newzbinBookmarks')</h3>
<p>
<input type="button" class="juiButton" id="getBookmarks" value="$T('link-getBookmarks')" />
<br/><br/>
<!--#if $bookmarks_list#-->
<input type="button" class="juiButton" id="hideBookmarks" value="$T('link-HideBM')" />
<!--#else#-->
<input type="button" class="juiButton" id="showBookmarks" value="$T('link-ShowBM')" />
<!--#end if#-->
</p>
</div>
<fieldset class="component-group-list">
<div class="field-pair">
<input type="checkbox" name="newzbin_bookmarks" id="newzbin_bookmarks" value="1" <!--#if $newzbin_bookmarks > 0 then "checked=1" else ""#--> />
<label class="clearfix" for="newzbin_bookmarks">
<span class="component-title">$T('opt-newzbin_bookmarks')</span>
<span class="component-desc">$T('explain-newzbin_bookmarks')</span>
</label>
</div>
<div class="field-pair alt">
<input type="checkbox" name="newzbin_unbookmark" id="newzbin_unbookmark" value="1" <!--#if $newzbin_unbookmark > 0 then "checked=1" else ""#--> />
<label class="clearfix" for="newzbin_unbookmark">
<span class="component-title">$T('opt-newzbin_unbookmark')</span>
<span class="component-desc">$T('explain-newzbin_unbookmark')</span>
</label>
</div>
<div class="field-pair">
<label class="nocheck clearfix" for="bookmark_rate">
<span class="component-title">$T('opt-bookmark_rate')</span>
<input type="text" name="bookmark_rate" id="bookmark_rate" size="6" value="$bookmark_rate"/>
</label>
<label class="nocheck clearfix">
<span class="component-title">&nbsp;</span>
<span class="component-desc">$T('explain-bookmark_rate')</span>
</label>
</div>
</fieldset>
</div><!-- /component-group3 -->
<!--#if $bookmarks_list#-->
<div id="core-component-group4" class="component-group clearfix">
<div class="component-group-desc">
<h3>Newzbin $T('accountInfo')</h3>
<p>$T('explain-newzbin')</p>
</div>
<fieldset class="component-group-list">
<!--#for $msgid in $bookmarks_list#-->
<a href="https://$newzbin_url/browse/post/$msgid/" target="_blank">$msgid</a><br/>
<!--#end for#-->
</fieldset>
</div><!-- /component-group4 -->
<!--#end if#-->
<div class="component-group-last clearfix"> <div class="component-group-last clearfix">
<div class="component-group-desc"> <div class="component-group-desc">
<h3>&nbsp;</h3> <h3>&nbsp;</h3>
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
<a class="sf-with-ul">$T('menu-queue')</a> <a class="sf-with-ul">$T('menu-queue')</a>
<ul> <ul>
<!--#if $have_quota#--><li><a id="reset_quota_now" class="pointer">$T('link-resetQuota')</a></li><!--#end if#--> <!--#if $have_quota#--><li><a id="reset_quota_now" class="pointer">$T('link-resetQuota')</a></li><!--#end if#-->
<!--#if $varExists('newzbinDetails')#--><li><a id="get_bookmarks_now" class="pointer">$T('link-getBookmarks')</a></li><!--#end if#-->
<!--#if $have_rss_defined#--><li><a id="get_rss_now" class="pointer">$T('button-rssNow')</a></li><!--#end if#--> <!--#if $have_rss_defined#--><li><a id="get_rss_now" class="pointer">$T('button-rssNow')</a></li><!--#end if#-->
<!--#if $have_watched_dir#--><li><a id="get_watched_now" class="pointer">$T('sch-scan_folder')</a></li><!--#end if#--> <!--#if $have_watched_dir#--><li><a id="get_watched_now" class="pointer">$T('sch-scan_folder')</a></li><!--#end if#-->
<li><a id="topmenu_toggle" class="pointer">$T('Plush-topMenu')</a></li> <li><a id="topmenu_toggle" class="pointer">$T('Plush-topMenu')</a></li>
......
<a href="${helpuri}Configure+Indexers-0-7" id="help" target="_blank">$T('menu-help')</a><h3>Newzbin</h3> <a href="${helpuri}Configure+Indexers-0-7" id="help" target="_blank">$T('menu-help')</a>
<form id="configNewzbin" class="cmxform" autocomplete="off">
$T('explain-newzbin')<br/>
<br/>
<div class="EntryBlock">
<fieldset class="EntryFieldSet">
<legend>$T('accountInfo')</legend>
<hr />
<label class="label">$T('opt-username_newzbin'):</label>
<input type="text" name="username_newzbin" value="$username_newzbin">
<span class="tips">$T('explain-username_newzbin')</span>
<br class="clear" />
<label class="label">$T('opt-password_newzbin'):</label>
<input type="password" name="password_newzbin" value="$password_newzbin">
<span class="tips">$T('explain-password_newzbin')</span>
<br class="clear" />
</fieldset>
<fieldset class="EntryFieldSet">
<legend>$T('newzbinBookmarks')</legend>
<hr />
<label><span class="label">$T('newzbinBookmarks'):</span>
<input class="radio" type="checkbox" name="newzbin_bookmarks" value="1" <!--#if $newzbin_bookmarks > 0 then "checked=1" else ""#--> />
<span class="tips">$T('explain-newzbin_bookmarks')</span></label>
<br class="clear" />
<label><span class="label">$T('opt-newzbin_unbookmark'):</span>
<input class="radio" type="checkbox" name="newzbin_unbookmark" value="1" <!--#if $newzbin_unbookmark > 0 then "checked=1" else ""#--> />
<span class="tips">$T('explain-newzbin_unbookmark')</span></label>
<br class="clear" />
<label class="label">$T('opt-bookmark_rate'):</label>
<input type="text" name="bookmark_rate" value="$bookmark_rate">
<span class="tips">$T('explain-bookmark_rate')</span>
<br class="clear" />
</fieldset>
<a class="config" onClick="getBookmarks();">$T('link-getBookmarks')</a>
<!--#if $bookmarks_list#-->
<a class="config" onClick="lr('config/indexers/hideBookmarks');">$T('link-HideBM')</a>
<!--#else#-->
<a class="config" onClick="lr('config/indexers/showBookmarks');">$T('link-ShowBM')</a>
<!--#end if#-->