Index: urdd/do_functions.php
===================================================================
--- urdd/do_functions.php (revision 1262)
+++ urdd/do_functions.php (working copy)
@@ -1686,14 +1686,23 @@
}
-function do_delete_set(DatabaseConnection $db, array $setids)
+function do_delete_set(DatabaseConnection $db, action $item)
{
+ $arg_list = $item->get_args();
+ $setids = preg_split('/[\s]+/', $item->get_args());
+
+ $status = QUEUE_RUNNING;
+ $l = count($setids);
+ $cnt = 0;
+ $cmt = '';
foreach ($setids as $setid) {
$db->escape($setid, TRUE);
$sql = "SELECT \"groupID\" FROM setdata WHERE \"ID\" = $setid";
$res = $db->execute_query($sql);
- if ($res === FALSE)
- throw new exception ("Set not Found $setid");
+ if ($res === FALSE) {
+ write_log("Set not Found $setid", LOG_ERR);
+ $cmt .= "Set not Found $setid ";
+ }
$group_id = $res[0]['groupID'];
$sql = "SELECT \"binaryID\" FROM binaries_$group_id WHERE \"setID\" = $setid";
$res = $db->execute_query($sql);
@@ -1714,17 +1723,28 @@
$sql = "DELETE FROM parts_$group_id WHERE \"binaryID\" = $bin_id";
$db->execute_query($sql);
}
+ update_queue_status($db, $item->get_dbid(), $status, 0, (int)(($cnt / $l) * 100), $cmt);
}
+ $status = QUEUE_FINISHED;
+ update_queue_status($db, $item->get_dbid(), $status, 0, 100, ($cmt == '' ? 'Complete' : $cmt));
}
-function do_delete_set_rss(DatabaseConnection $db, array $setids)
+function do_delete_set_rss(DatabaseConnection $db, action $item)
{
+ $arg_list = $item->get_args();
+ $setids = preg_split('/[\s]+/', $item->get_args());
$db->escape($setids, TRUE);
+ $l = count($setids);
+ $status = QUEUE_RUNNING;
+ $cnt = 0;
foreach ($setids as $setid) {
$sql = "DELETE FROM rss_sets WHERE \"setid\" = $setid";
$db->execute_query($sql);
+ update_queue_status($db, $item->get_dbid(), $status, 0, (int)(($cnt / $l) * 100), 'Complete');
}
+ $status = QUEUE_FINISHED;
+ update_queue_status($db, $item->get_dbid(), $status, 0, 100, 'Complete');
}
Index: urdd/urdd_client.php
===================================================================
--- urdd/urdd_client.php (revision 1262)
+++ urdd/urdd_client.php (working copy)
@@ -652,10 +652,20 @@
$setid_list = '';
if ($setid == array())
return FALSE;
- foreach ($setid as $s)
+ $cnt = 0;
+ foreach ($setid as $s) {
$setid_list .= " $s";
+ $cnt++;
+ if ($cnt > 10) {
+ list($code, $resp, $data) = $this->send_multi_command(get_command(COMMAND_DELETE_SET) . " $setid_list");
+ $cnt = 0;
+ $setid_list = '';
- list($code, $resp, $data) = $this->send_multi_command(get_command(COMMAND_DELETE_SET) . " $setid_list");
+ }
+ }
+ if ($cnt > 0)
+ list($code, $resp, $data) = $this->send_multi_command(get_command(COMMAND_DELETE_SET) . " $setid_list");
+
if ($code == 200)
return TRUE;
else
@@ -666,10 +676,18 @@
$setid_list = '';
if ($setid == array())
return FALSE;
- foreach ($setid as $s)
+ $cnt = 0;
+ foreach ($setid as $s) {
$setid_list .= " $s";
-
- list($code, $resp, $data) = $this->send_multi_command(get_command(COMMAND_DELETE_SET_RSS) . " $setid_list");
+ $cnt++;
+ if ($cnt > 10) {
+ list($code, $resp, $data) = $this->send_multi_command(get_command(COMMAND_DELETE_SET_RSS) . " $setid_list");
+ $cnt = 0;
+ $setid_list = '';
+ }
+ }
+ if ($cnt > 0)
+ list($code, $resp, $data) = $this->send_multi_command(get_command(COMMAND_DELETE_SET_RSS) . " $setid_list");
if ($code == 200)
return TRUE;
else
Index: urdd/urdd_command.php
===================================================================
--- urdd/urdd_command.php (revision 1262)
+++ urdd/urdd_command.php (working copy)
@@ -358,7 +358,7 @@
$response = $responses[501];
else {
try {
- do_delete_set_rss($db, $arg_list);
+ queue_delete_set_rss($db, $servers, $args, $username, $priority);
$response = $responses[200];
} catch (exception $e) {
$response = $responses[513];
@@ -370,7 +370,7 @@
$response = $responses[501];
else {
try {
- do_delete_set($db, $arg_list);
+ queue_delete_set($db, $servers, $args, $username, $priority);
$response = $responses[200];
} catch (exception $e) {
$response = $responses[513];
Index: urdd/urdd.php
===================================================================
--- urdd/urdd.php (revision 1262)
+++ urdd/urdd.php (working copy)
@@ -128,7 +128,9 @@
COMMAND_CHECK_VERSION =>'do_check_version',
COMMAND_PARSE_NZB =>'do_parse_nzb',
COMMAND_MERGE_SETS =>'do_merge_sets',
- COMMAND_FINDSERVERS => 'do_find_servers'
+ COMMAND_FINDSERVERS => 'do_find_servers',
+ COMMAND_DELETE_SET => 'do_delete_set',
+ COMMAND_DELETE_SET_RSS => 'do_delete_set_rss'
);
if (isset($cmd_table[$cmd_code]))
$rv = $cmd_table[$cmd_code]($db, $item);
Index: urdd/queue_functions.php
===================================================================
--- urdd/queue_functions.php (revision 1262)
+++ urdd/queue_functions.php (working copy)
@@ -94,6 +94,24 @@
}
+
+function queue_delete_set(DatabaseConnection $db, server_data &$servers, $arg, $username, $priority=DEFAULT_PRIORITY)
+{
+ assert(is_numeric($priority) && $username != '');
+ echo_debug_function(DEBUG_SERVER, __FUNCTION__);
+ return queue_generic($db, $servers, $username, COMMAND_DELETE_SET, $arg, FALSE, $priority, FALSE);
+}
+
+
+function queue_delete_set_rss(DatabaseConnection $db, server_data &$servers, $arg, $username, $priority=DEFAULT_PRIORITY)
+{
+ assert(is_numeric($priority) && $username != '');
+ echo_debug_function(DEBUG_SERVER, __FUNCTION__);
+ return queue_generic($db, $servers, $username, COMMAND_DELETE_SET_RSS, $arg, FALSE, $priority, FALSE);
+}
+
+
+
function queue_merge_sets(DatabaseConnection $db, server_data &$servers, $arg, $username, $priority=DEFAULT_PRIORITY)
{
assert(is_numeric($priority) && $username != '');
Index: html/admin_config.php
===================================================================
--- html/admin_config.php (revision 1262)
+++ html/admin_config.php (working copy)
@@ -623,17 +623,12 @@
$pref_list[] = array('name'=>$LN['config_formatstrings'], 'value'=>$format_strings);
$pref_list[] = array('name'=>$LN['config_globalsettings'],'value'=> $global_settings);
-//$challenge = set_challenge();
init_smarty( $LN['config_title']);
-$smarty->assign('level', /*$prefs['pref_level']*/ $pref_level);
+$smarty->assign('level', $pref_level);
$smarty->assign('saved', $saved);
$smarty->assign('imported', $imported);
$smarty->assign('__message', $__message);
-//$smarty->assign('title', 'URD - ' . $LN['config_title']);
-//$smarty->assign('heading', $LN['config_title']);
$smarty->assign('pref_list', $pref_list);
-//$smarty->assign('menu', generate_menu($LN));
-//$smarty->assign('challenge', $challenge);
$smarty->assign('referrer', basename(__FILE__));
$smarty->display('settings.tpl');
Index: html/smarty/templates/default/js.js
===================================================================
--- html/smarty/templates/default/js.js (revision 1262)
+++ html/smarty/templates/default/js.js (working copy)
@@ -883,12 +883,17 @@
var statusval = document.getElementById('status_select');
var timeval = document.getElementById('time_select');
var tasksearch = document.getElementById('tasksearch');
+ var max_count = document.getElementById('max_count');
var orderdirval = document.getElementById('order_dir');
if (timeval != null ){
timeval = timeval.options[timeval.selectedIndex].value;
url=url+"&time="+timeval;
}
- if (tasksearch != null){
+ if (max_count != null && max_count.name != '_max_count'){
+ max_count = max_count.value;
+ url=url+"&max_count="+max_count;
+ }
+ if (tasksearch != null && tasksearch.name != '_search'){
tasksearch = tasksearch.value;
url=url+"&tasksearch="+tasksearch;
}
@@ -2300,10 +2305,20 @@
level = level.options[level.selectedIndex].value;
if (cur_level == null || cur_level.value != level) {
myform.submit();
-/* var url = window.location;
- window.location = url + '?level='+ level;*/
}
}
}
+function clean_input(id, name)
+{
+ var input = document.getElementById(id);
+ if (input != null && input.name != name){
+ input.value = "";
+ var name = input.name;
+ name = name.replace("_", "");
+ input.name = name;
+ }
+}
+
+
Index: html/smarty/templates/default/admin_tasks.tpl
===================================================================
--- html/smarty/templates/default/admin_tasks.tpl (revision 1262)
+++ html/smarty/templates/default/admin_tasks.tpl (working copy)
@@ -36,7 +36,8 @@
{/foreach}
-
+
+
Index: html/ajax_admintasks.php
===================================================================
--- html/ajax_admintasks.php (revision 1262)
+++ html/ajax_admintasks.php (working copy)
@@ -84,19 +84,24 @@
$qtime = " AND \"lastupdate\" >= '$time'";
}
-$sql = "SELECT * FROM queueinfo WHERE 1=1 $qtime $qstatus ORDER BY \"$sort\" $sort_dir";
-$res = $db->execute_query($sql);
+$max_cnt = get_request('max_count', 0);
+if ($max_cnt == 0 || !is_numeric($max_cnt))
+ $max_cnt = $prefs['setsperpage'];
+$sql = "* FROM queueinfo WHERE 1=1 $qtime $qstatus ORDER BY \"$sort\" $sort_dir";
+$res = $db->select_query($sql, 2 * $max_cnt);
+
$tasks = array();
if ($res !== FALSE) {
+ $cnt = 1;
foreach ($res as $row) {
$description = $row['description'];
$progress = $row['progress'];
$ETA = $row['ETA'];
$task['progress'] = $progress;
$task['urdd_id'] = $row['urdd_id'];
- $task['status'] = isset($LN['transfers_status_' . strtolower($row['status'])]) ?$LN['transfers_status_' . strtolower($row['status'])]:'?';
+ $task['status'] = isset($LN['transfers_status_' . strtolower($row['status'])]) ?$LN['transfers_status_' . strtolower($row['status'])] : '?';
$task['raw_status'] = $row['status'];
$task['comment'] = $row['comment'];
$task['added'] = time_format($row['starttime']);
@@ -121,7 +126,9 @@
$task['description'] = $task_short;
$task['task_popup'] = $task_popup;
- $tasks[] = $task;
+ $tasks[] = $task;
+ if ($cnt >= $max_cnt) break;
+ $cnt++;
}
}
@@ -132,6 +139,7 @@
$smarty->assign('order', $sort);
$smarty->assign('order_dir', $sort_dir);
$smarty->assign('urdd_online', (int)$urdd_online);
+$smarty->assign('max_count', $max_cnt);
$smarty->display('ajax_admintasks.tpl');
?>
Index: html/ajax_showstatus.php
===================================================================
--- html/ajax_showstatus.php (revision 1262)
+++ html/ajax_showstatus.php (working copy)
@@ -84,11 +84,17 @@
// We're gonna use $row as the array containing all data:
$row['niceeta'] = -1;
$row['target'] = '';
- $isUpdate = $isUpdateRSS = $isCheckVersion = $isPurge = $isPurgeRSS = $isExpireRSS = $isExpire =
+ $isUpdate = $isUpdateRSS = $isCheckVersion = $isPurge = $isPurgeRSS = $isExpireRSS = $isExpire = $isDeleteSet =
$isDownload = $isDownload = $isGroups = $isOptimise = $isUnParRar = $isGetSetInfo = $isSendSetInfo =
$isGenSets = $isAddData = $isParseNZB = $isMakeNZB = $isCleanDir = $isCleanDb = $isMergeSets = $isFindServers = FALSE;
// $count++; // never used ?
switch($command_id) {
+ case COMMAND_DELETE_SET:
+ case COMMAND_DELETE_SET_RSS:
+ $isDeleteSet = TRUE;
+ $row['name'] = $LN['cmd_descr_deleteset'];
+ $row['type'] = 'update'; //XXX
+ break;
case COMMAND_FINDSERVERS:
$isFindServers = TRUE;
$row['name'] = $LN['taskfindservers'];
Index: install/update.sh
===================================================================
--- install/update.sh (revision 1262)
+++ install/update.sh (working copy)
@@ -43,6 +43,10 @@
dbhost=`grep db_hostname ../dbconfig.php | cut -s -d\' -f 4`
+mysql_cmd="mysql --user=$dbuser --password=$dbpass $dbname --max_allowed_packet=16M --host=$dbhost"
+psql_cmd="psql -v ON_ERROR_STOP=1 -q -U $dbuser -d $dbname --host=$dbhost"
+
+
if [ "$dbtype" = "postgres8" -o "$dbtype" = "postgres7" ] ; then
dbtype="pgsql"
elif [ "$dbtype" = "mysql" -o "$dbtype" = "mysqli" -o "$dbtype" = "mysqlt" ] ; then
@@ -101,7 +105,7 @@
else
#Mysql:
if [ "$dbtype" = "mysql" ] ; then
- oldversion=`mysql --user=$dbuser --password=$dbpass $dbname -e 'select value from preferences where \`option\` = "URD_version";' -ss`
+ oldversion=`$mysql_cmd -e 'select value from preferences where \`option\` = "URD_version";' -ss`
if [ "$?" != "0" ] ; then
echo "Query could not be executed"
exit -1;
@@ -109,7 +113,7 @@
#Pgsql:
elif [ "$dbtype" = "pgsql" ] ; then
qry="select \"value\" from preferences where \"option\" = 'URD_version';"
- oldversion=`psql -v ON_ERROR_STOP=1 -U $dbuser -d $dbname -t -q -c "$qry"`
+ oldversion=`$psql_cmd -t -c "$qry"`
if [ "$?" != "0" ] ; then
echo "Query could not be executed"
exit -1;
@@ -146,7 +150,7 @@
if [ "$oldversion" \< "0.6.0" ] ; then
# Update DB
if [ "$dbtype" = "mysql" ] ; then
- mysql --user=$dbuser --password=$dbpass $dbname --max_allowed_packet=16M < update_db_0.5.5_to_0.6.0_mysql.sql
+ $mysql_cmd < update_db_0.5.5_to_0.6.0_mysql.sql
if [ "$?" != "0" ] ; then
echo "Query could not be executed"
exit -1;
@@ -154,7 +158,7 @@
fi
if [ "$dbtype" = "pgsql" ] ; then
# zoiets
- psql -v ON_ERROR_STOP=1 -q -U $dbuser -d $dbname -f update_db_0.5.5_to_0.6.0_pgsql.sql
+ $psql_cmd update_db_0.5.5_to_0.6.0_pgsql.sql
if [ "$?" != "0" ] ; then
echo "Database update failed"
exit -1;
@@ -165,7 +169,7 @@
if [ "$oldversion" \< "0.6.1" ] ; then
# Update DB
if [ "$dbtype" = "mysql" ] ; then
- mysql --user=$dbuser --password=$dbpass $dbname --max_allowed_packet=16M < update_db_0.6.0_to_0.6.1_mysql.sql
+ $mysql_cmd < update_db_0.6.0_to_0.6.1_mysql.sql
if [ "$?" != "0" ] ; then
echo "Query could not be executed"
exit -1;
@@ -173,7 +177,7 @@
fi
if [ "$dbtype" = "pgsql" ] ; then
- psql -v ON_ERROR_STOP=1 -q -U $dbuser -d $dbname -f update_db_0.6.0_to_0.6.1_pgsql.sql
+ $psql_cmd update_db_0.6.0_to_0.6.1_pgsql.sql
if [ "$?" != "0" ] ; then
echo "Database update failed"
exit -1;
@@ -207,14 +211,14 @@
# Update DB
if [ "$dbtype" = "mysql" ] ; then
- mysql --user=$dbuser --password=$dbpass $dbname --max_allowed_packet=16M < update_db_0.6.1_to_0.6.2_mysql.sql
+ $mysql_cmd < update_db_0.6.1_to_0.6.2_mysql.sql
if [ "$?" != "0" ] ; then
echo "Query could not be executed"
exit -1;
fi
fi
if [ "$dbtype" = "pgsql" ] ; then
- psql -v ON_ERROR_STOP=1 -q -U $dbuser -d $dbname -f update_db_0.6.1_to_0.6.2_pgsql.sql
+ $psql_cmd update_db_0.6.1_to_0.6.2_pgsql.sql
if [ "$?" != "0" ] ; then
echo "Database update failed"
exit -1;
@@ -226,14 +230,14 @@
# Remove files:
# Update DB
if [ "$dbtype" = "mysql" ] ; then
- mysql --user=$dbuser --password=$dbpass $dbname --max_allowed_packet=16M < update_db_0.6.2_to_1.0.0_mysql.sql
+ $mysql_cmd < update_db_0.6.2_to_1.0.0_mysql.sql
if [ "$?" != "0" ] ; then
echo "Query could not be executed"
exit -1;
fi
fi
if [ "$dbtype" = "pgsql" ] ; then
- psql -v ON_ERROR_STOP=1 -q -U $dbuser -d $dbname -f update_db_0.6.2_to_1.0.0_pgsql.sql
+ $psql_cmd update_db_0.6.2_to_1.0.0_pgsql.sql
if [ "$?" != "0" ] ; then
echo "Database update failed"
exit -1;
@@ -246,14 +250,14 @@
# Remove files:
# Update DB
if [ "$dbtype" = "mysql" ] ; then
- mysql --user=$dbuser --password=$dbpass $dbname --max_allowed_packet=16M < update_db_1.0.0_to_1.0.1_mysql.sql
+ $mysql_cmd < update_db_1.0.0_to_1.0.1_mysql.sql
if [ "$?" != "0" ] ; then
echo "Query could not be executed"
exit -1;
fi
fi
if [ "$dbtype" = "pgsql" ] ; then
- psql -v ON_ERROR_STOP=1 -q -U $dbuser -d $dbname -f update_db_1.0.0_to_1.0.1_pgsql.sql
+ $psql_cmd update_db_1.0.0_to_1.0.1_pgsql.sql
if [ "$?" != "0" ] ; then
echo "Database update failed"
exit -1;
@@ -265,14 +269,14 @@
# Remove files:
# Update DB
if [ "$dbtype" = "mysql" ] ; then
- mysql --user=$dbuser --password=$dbpass $dbname --max_allowed_packet=16M < update_db_1.0.1_to_1.0.2_mysql.sql
+ $mysql_cmd < update_db_1.0.1_to_1.0.2_mysql.sql
if [ "$?" != "0" ] ; then
echo "Query could not be executed"
exit -1;
fi
fi
if [ "$dbtype" = "pgsql" ] ; then
- psql -v ON_ERROR_STOP=1 -q -U $dbuser -d $dbname -f update_db_1.0.1_to_1.0.2_pgsql.sql
+ $psql_cmd update_db_1.0.1_to_1.0.2_pgsql.sql
if [ "$?" != "0" ] ; then
echo "Database update failed"
exit -1;
@@ -285,14 +289,14 @@
# Remove files:
# Update DB
if [ "$dbtype" = "mysql" ] ; then
- mysql --user=$dbuser --password=$dbpass $dbname --max_allowed_packet=16M < update_db_1.0.2_to_1.0.3_mysql.sql
+ $mysql_cmd < update_db_1.0.2_to_1.0.3_mysql.sql
if [ "$?" != "0" ] ; then
echo "Query could not be executed"
exit -1;
fi
fi
if [ "$dbtype" = "pgsql" ] ; then
- psql -v ON_ERROR_STOP=1 -q -U $dbuser -d $dbname -f update_db_1.0.2_to_1.0.3.pgsql.sql
+ $psql_cmd update_db_1.0.2_to_1.0.3.pgsql.sql
if [ "$?" != "0" ] ; then
echo "Database update failed"
exit -1;
Index: functions/lang/english.php
===================================================================
--- functions/lang/english.php (revision 1262)
+++ functions/lang/english.php (working copy)
@@ -224,6 +224,7 @@
$LN['clear'] = 'Clear';
$LN['reset'] = 'Reset';
$LN['search'] = 'Search';
+$LN['number'] = 'Number';
$LN['rename'] = 'Rename';
$LN['register'] = 'Register';
$LN['delete'] = 'Delete';
@@ -605,6 +606,7 @@
$LN['cmd_descr_mergesets'] = 'Merging sets';
$LN['cmd_descr_findservers'] = 'Auto configuring usenet servers';
$LN['cmd_descr_parsenzb'] = 'Reading NZB file';
+$LN['cmd_descr_deleteset'] = 'Removeing set';
//$LN['cmd_descr_'] = '';
Index: functions/lang/nederlands.php
===================================================================
--- functions/lang/nederlands.php (revision 1262)
+++ functions/lang/nederlands.php (working copy)
@@ -227,6 +227,7 @@
$LN['clear'] = 'Wis';
$LN['reset'] = 'Herstel';
$LN['search'] = 'Zoek';
+$LN['number'] = 'Aantal';
$LN['rename'] = 'Wijzig';
$LN['register'] = 'Registreer';
$LN['delete'] = 'Verwijder';
@@ -610,6 +611,7 @@
$LN['cmd_descr_mergesets'] = 'Sets samenvoegen';
$LN['cmd_descr_findservers'] = 'Usenet servers autoconfigureren';
$LN['cmd_descr_parsenzb'] = 'NZB bestand inlezen';
+$LN['cmd_descr_deleteset'] = 'Set verwijderen';
//$LN['cmd_descr_'] = '';
Index: functions/lang/deutsch.php
===================================================================
--- functions/lang/deutsch.php (revision 1262)
+++ functions/lang/deutsch.php (working copy)
@@ -224,6 +224,7 @@
$LN['clear'] = 'Bereinigen';
$LN['reset'] = 'Reset';
$LN['search'] = 'Suche';
+$LN['number'] = 'Number';
$LN['rename'] = 'Umbennen';
$LN['register'] = 'Registriere';
$LN['delete'] = 'Lösche';
@@ -602,6 +603,7 @@
$LN['cmd_descr_mergesets'] = 'Merging sets';
$LN['cmd_descr_findservers'] = 'Auto configuring usenet servers';
$LN['cmd_descr_parsenzb'] = 'NZB Datei liesen';
+$LN['cmd_descr_deleteset'] = 'Removeing set';
//$LN['cmd_descr_'] = '';
Index: functions/lang/francais.php
===================================================================
--- functions/lang/francais.php (revision 1262)
+++ functions/lang/francais.php (working copy)
@@ -224,6 +224,7 @@
$LN['clear'] = 'Effacer';
$LN['reset'] = 'Annuler';
$LN['search'] = 'Rechercher';
+$LN['number'] = 'Nombre';
$LN['rename'] = 'Renommer';
$LN['register'] = 'S'enregistrer';
$LN['delete'] = 'Supprimer';
@@ -600,6 +601,7 @@
$LN['cmd_descr_mergesets'] = 'Fusion des ensembles';
$LN['cmd_descr_findservers'] = 'Auto configuration des serveurs usenet';
$LN['cmd_descr_parsenzb'] = 'Lecture du fichier NZB';
+$LN['cmd_descr_deleteset'] = 'Removeing set';
//$LN['cmd_descr_'] = '';
// admin tasks
Index: functions/web_functions.php
===================================================================
--- functions/web_functions.php (revision 1262)
+++ functions/web_functions.php (working copy)
@@ -542,7 +542,7 @@
global $LN;
$isCheckVersion = $isCleandir = $isCleandb = $isExpire = $isUpdate = $isPurge = $isDownload = $isGroups = FALSE;
$isSendSetInfo = $isGetSetInfo = $isUnParRar = $isOptimise = $isUpdateRss = $isPurgeRss = $isExpireRss = FALSE;
- $isGenSets = $isAddData = $isMergeSets = $isFindServers = $isParseNzb = FALSE;
+ $isGenSets = $isAddData = $isMergeSets = $isFindServers = $isParseNzb = $isDeleteSet = $isDeleteSetRss = FALSE;
if (stripos($task, get_command(COMMAND_UPDATE) . ' ') === 0) $isUpdate = TRUE;
else if (stripos($task, get_command(COMMAND_PURGE) . ' ') === 0) $isPurge = TRUE;
@@ -565,6 +565,8 @@
else if (stripos($task, get_command(COMMAND_ADDDATA)) === 0) $isAddData = TRUE;
else if (stripos($task, get_command(COMMAND_MERGE_SETS)) === 0) $isMergeSets = TRUE;
else if (stripos($task, get_command(COMMAND_FINDSERVERS)) === 0) $isFindServers = TRUE;
+ else if (stripos($task, get_command(COMMAND_DELETE_SET)) === 0) $isDeleteSet = TRUE;
+ else if (stripos($task, get_command(COMMAND_DELETE_SET_RSS)) === 0) $isDeleteSetRss = TRUE;
// For tasks that end with a groupID:
if ($isPurge || $isUpdate || $isExpire || $isGenSets) {
@@ -610,6 +612,12 @@
$task = $LN['cmd_descr_findservers'];
} elseif ($isParseNzb) {
$task = $LN['cmd_descr_parsenzb'];
+ } elseif ($isDeleteSet) {
+ $ids = str_ireplace(get_command(COMMAND_DELETE_SET) . ' ', '', $task);
+ $task = $LN['cmd_descr_deleteset'] . ' ' . $ids;
+ } elseif ($isDeleteSetRss) {
+ $ids = str_ireplace(get_command(COMMAND_DELETE_SET_RSS) . ' ', '', $task);
+ $task = $LN['cmd_descr_deleteset']. ' ' . $ids;
} elseif ($isCleandir) {
$dir = str_ireplace(get_command(COMMAND_CLEANDIR) . ' ', '', $task);
$task = $LN['cmd_descr_cleandir'] . ' ' . htmlentities($dir);