minor fix

Author: Novik

plugins/autotools/util_rt.php

@@ -355,85 +355,4 @@ function rtExec( $cmds, $hash, $dbg )
 		return null;
 	}
 	else return $req;
-}
-
-//------------------------------------------------------------------------------
-// Make string param for XMLRPC call
-//------------------------------------------------------------------------------
-function rtMakeStrParam( $param )
-{
-	return "<param><value><string>".$param."</string></value></param>";
-}
-
-//------------------------------------------------------------------------------
-// Add ".torrent" file to rTorrent
-//------------------------------------------------------------------------------
-function rtAddTorrent( $fname, $isStart, $directory, $label, $dbg = false )
-{
-	if( $isStart )
-		$method = 'load_start_verbose';
-	else
-		$method = 'load_verbose';
-
-	if( $dbg ) rtDbg( __FUNCTION__, "1".$fname );
-	$torrent = new Torrent($fname);
-	if( $dbg ) rtDbg( __FUNCTION__, "2" );
-	if( $torrent->errors() )
-	{
-		if( $dbg ) rtDbg( __FUNCTION__, "fail to create Torrent() object" );
-		return false;
-	}
-
-	if( $directory && strlen( $directory ) > 0 )
-	{
-		$directory = rtMakeStrParam( "d.set_directory=\"".$directory."\"" );
-	}
-	else $directory = "";
-
-	$comment = $torrent->comment();
-	if( $comment && strlen( $comment ) > 0 )
-	{
-		if( isInvalidUTF8( $comment ) )
-			$comment = win2utf($comment);
-		if( strlen( $comment ) > 0 )
-		{
-			$comment = rtMakeStrParam( "d.set_custom2=VRS24mrker".rawurlencode( $comment ) );
-			if(strlen($comment)>4096)
-				$comment = '';
-		}
-	}
-	else $comment = "";
-
-	if( $label && strlen( $label ) > 0 )
-	{
-		$label = rtMakeStrParam( "d.set_custom1=\"".rawurlencode( $label )."\"" );
-	}
-	else $label = "";
-
-	$addition = "";
-	global $saveUploadedTorrents;
-	$delete_tied = ($saveUploadedTorrents ? "" : rtMakeStrParam( "d.delete_tied=" ));
-
-	$content =
-		'<?xml version="1.0" encoding="UTF-8"?>'.
-		'<methodCall>'.
-		'<methodName>'.$method.'</methodName>'.
-		'<params>'.
-			'<param><value><string>'.$fname.'</string></value></param>'.
-			$directory.
-			$comment.
-			$label.
-			$addition.
-			$delete_tied.
-		'</params></methodCall>';
-
-	//if( $dbg ) rtDbg( __FUNCTION__, $content );
-	$res = rXMLRPCRequest::send( $content );
-
-	if( $dbg && !empty($res) ) rtDbg( __FUNCTION__, $res );
-
-	if( !$res || $res = '' )
-		return false;
-	else
-		return $torrent->hash_info();
-}
+}

plugins/autotools/watch.php

@@ -78,13 +78,6 @@ function Debug( $str )
 
 		if( $is_ok )
 		{
-//			$hash = rtAddTorrent(
-//				$torrent_file,			// path to .torrent file
-//				$auto_start,			// start it or not
-//				$dest_path,			// directory for torrent's data
-//				null,				// label is emply
-//				$autodebug_enabled
-//			);
 			$hash = rTorrent::sendTorrent(
 				$torrent_file,			// path to .torrent file
 				$auto_start,			// start it or not
@@ -96,7 +89,7 @@ function Debug( $str )
 			);
 			if( $hash === false )
 			{
-				Debug( "rtAddTorrent() fail" );
+				Debug( "addition of torrent fail" );
 				$is_ok = false;
 			}
 			else {