Index: includes/classes/xmlrpc_handler.inc.php
===================================================================
--- includes/classes/xmlrpc_handler.inc.php (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ includes/classes/xmlrpc_handler.inc.php (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -131,5 +131,5 @@
private function decode( $str ) {
- $str = preg_replace( "%<(/{0,1})(i8|ex\.i8)>%", "<\\1string>", $str );
+ $str = preg_replace( "%<(/{0,1})(i8|ex.i8)>%", "<\\1string>", $str );
$str = preg_replace( "/>\s*?<", $str );
$xml = new DOMDocument( "1.0", "utf-8" );
@@ -231,5 +231,5 @@
}
default : {
- print "Bibi: ".gettype( $param );
+ print "Error: ".gettype( $param );
exit;
break;
@@ -321,5 +321,5 @@
$line = fgets( $fp );
} while ( trim( $line ) != "" );
-
+
if ( ( $this->response = stream_get_contents( $fp ) ) !== false ) {
$tt = getmicrotime();
Index: includes/messages.cht.inc.php
===================================================================
--- includes/messages.cht.inc.php (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ includes/messages.cht.inc.php (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -86,4 +86,5 @@
"d_connection_current_leech" => "Leeching",
"d_connection_current_seed" => "做種中",
+ "d_connection_current_initial_seed" => "Initial seeding",
"d_ignore_commands_0" => "Not ignoring commands",
"d_ignore_commands_1" => "Ignoring commands",
@@ -207,5 +208,6 @@
"areyousure" => "你確定嗎?",
- "areyousureerase" => "Are you sure? All downloaded data will be erased.",
+ "areyousureerase" => "Are you sure, you want to delete",
+ "alldatawillbedestroyed" => "All data will be destroyed.",
"homepage" => "rTWi project homepage",
Index: includes/messages.de.inc.php
===================================================================
--- includes/messages.de.inc.php (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ includes/messages.de.inc.php (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -86,4 +86,5 @@
"d_connection_current_leech" => "Leeche",
"d_connection_current_seed" => "Seede",
+ "d_connection_current_initial_seed" => "Initial seeding",
"d_ignore_commands_0" => "Ignoriere Befehle nicht",
"d_ignore_commands_1" => "Ignoriere Befhele",
@@ -207,5 +208,6 @@
"areyousure" => "Bist du dir sicher?",
- "areyousureerase" => "Bist du dir sicher? Alle heruntegeladenen Daten werden gelöscht.",
+ "areyousureerase" => "Bist du dir sicher?",
+ "alldatawillbedestroyed" => "Alle heruntegeladenen Daten werden gelöscht.",
"homepage" => "rTWi Projekt Homepage",
Index: includes/messages.en.inc.php
===================================================================
--- includes/messages.en.inc.php (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ includes/messages.en.inc.php (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -86,4 +86,5 @@
"d_connection_current_leech" => "Leeching",
"d_connection_current_seed" => "Seeding",
+ "d_connection_current_initial_seed" => "Initial seeding",
"d_ignore_commands_0" => "Not ignoring commands",
"d_ignore_commands_1" => "Ignoring commands",
@@ -207,5 +208,6 @@
"areyousure" => "Are you sure?",
- "areyousureerase" => "Are you sure? All downloaded data will be erased.",
+ "areyousureerase" => "Are you sure, you want to delete",
+ "alldatawillbedestroyed" => "All data will be destroyed.",
"homepage" => "rTWi project homepage",
Index: includes/messages.hu.inc.php
===================================================================
--- includes/messages.hu.inc.php (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ includes/messages.hu.inc.php (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -86,4 +86,5 @@
"d_connection_current_leech" => "Letöltés",
"d_connection_current_seed" => "Feltöltés",
+ "d_connection_current_initial_seed" => "Kezdő feltöltés",
"d_ignore_commands_0" => "Parancsok figyelembevétele",
"d_ignore_commands_1" => "Parancsok figyelmen kívü hagyása",
@@ -207,5 +208,6 @@
"areyousure" => "Biztosan törlöd?",
- "areyousureerase" => "Biztosan törlöd? Minden letöltött adat törlésre kerül.",
+ "areyousureerase" => "Biztosan törlöd?",
+ "alldatawillbedestroyed" => "Minden adat törlésre fog kerülni.",
"homepage" => "rTWi honlap",
Index: cludes/rtwi.conf
===================================================================
--- includes/rtwi.conf (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ (revision )
@@ -1,54 +1,0 @@
-; full url of the rTWi (with a trailing slash)
-base = http://example.com/
-
-; change, if you've renamed the index.html file
-index = index.php
-
-; change, if you've renamed the input.php file
-input = input.php
-
-; path to home directory of users (with heading and trailing slash)
-home_path = /home/
-
-; path to the file which keeps the user related informations
-user_conf = /etc/rtorrent/users.conf
-
-; language (english and hungarian is available)
-lang = en
-
-; site theme (look for themes in the "themes" directory)
-site_theme = default_ajax
-
-; do a directory tree, which can be expanded/collapsed
-; set to "false" (without the quotes),
-; if your webserver is running on a slow machine
-; and you have torrents with a lots of files
-; (a few hundreds of files in a single torrent, and more)
-dodirtree = true
-
-; true if ajax is allowed
-ajax = true
-
-; true if dht is enabled
-dht = true
-
-; true if users are allowed to download finished files from the webui
-download = true
-
-; true if users are allowed to erase downloaded data from the webui
-erase = true
-
-; true if flags are allowed in peers page
-flags = false
-
-; true if hiding the filelist is allowed
-hidedirtree = true
-
-; true if users are allowed to set the language of the web interface
-language = true
-
-; true if users are allowed to set a meta-refresh interval
-refresh = true
-
-; true if users are allowed to set throttle
-throttle = true
Index: index.php
===================================================================
--- index.php (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ index.php (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -131,5 +131,5 @@
$responses["dht_statistics_bytes_read_value"] = sprintf( "%.1f", $dht_statistics_bytes_read_arr[0] );
- $responses["dht_statistics_bytes_read_suffix"] = $bytes_up_arr[1];
+ $responses["dht_statistics_bytes_read_suffix"] = $dht_statistics_bytes_read_arr[1];
$responses["dht_statistics_bytes_written_value"] = sprintf( "%.1f", $dht_statistics_bytes_written_arr[0] );
$responses["dht_statistics_bytes_written_suffix"] = $dht_statistics_bytes_written_arr[1];
@@ -188,5 +188,4 @@
$responses["d_active_value"] = $responses["d_active"] == 1 ? $message["d_active_1"] : $message["d_active_0"];
$responses["d_complete_value"] = $responses["d_complete"] == 1 ? $message["d_complete_1"] : $message["d_complete_0"];
- $responses["d_connection_current_value"] = $responses["d_connection_current"] == "seed" ? $message["d_connection_current_seed"] : $message["d_connection_current_leech"];
$responses["d_creation_date_value"] = date( "Y-m-d H:i:s", $responses["d_creation_date"] );
$responses["d_ignore_commands_value"] = $responses["d_ignore_commands"] == 1 ? $message["d_ignore_commands_1"] : $message["d_ignore_commands_0"];
@@ -205,7 +204,7 @@
$responses["d_uploads_max_value"] = $responses["d_uploads_max"] == -1 ? $message["disabled"] : $responses["d_uploads_max"];
- $responses["d_base_path_value"] = myrealpath( $responses["d_base_path"], $config["home_path"], $cwd );
- $responses["d_directory_value"] = myrealpath( $responses["d_directory"], $config["home_path"], $cwd );
- $responses["d_tied_to_file_value"] = myrealpath( $responses["d_tied_to_file"], $config["home_path"], $cwd );
+ $responses["d_base_path_value"] = myrealpath( $responses["d_base_path"], $home_path, $cwd );
+ $responses["d_directory_value"] = myrealpath( $responses["d_directory"], $home_path, $cwd );
+ $responses["d_tied_to_file_value"] = myrealpath( $responses["d_tied_to_file"], $home_path, $cwd );
if ( $responses["d_down_rate"] > 0 ) {
@@ -233,4 +232,9 @@
}
+ switch ( $responses["d_connection_current"] ) {
+ case "seed" : $responses["d_connection_current_value"] = $message["d_connection_current_seed"]; break;
+ case "initial_seed" : $responses["d_connection_current_value"] = $message["d_connection_current_initial_seed"]; break;
+ default : $responses["d_connection_current_value"] = $message["d_connection_current_leech"]; break;
+ }
switch ( $responses["d_hashing"] ) {
case 1 : $responses["d_hashing_value"] = $message["d_hashing_1"]; break;
@@ -265,5 +269,5 @@
$responses["f_last_touched_value"] = date( "Y-m-d H:i:s", substr( $responses["f_last_touched"], 0, -6 ) );
- $responses["f_frozen_path_value"] = myrealpath( $responses["f_frozen_path"], $config["home_path"], $cwd );
+ $responses["f_frozen_path_value"] = myrealpath( $responses["f_frozen_path"], $home_path, $cwd );
if ( $responses["f_size_chunks"] == 0 ) {
@@ -776,5 +780,5 @@
if ( is_array( $torrent ) ) {
// prepare download variables
- prepare_downloadlist_responses( $torrent, $message, $home_path, $si_responses["get_cwd"] );
+ prepare_downloadlist_responses( $torrent, $message, $config["home_path"], $si_responses["get_cwd"] );
// decide what to do
switch ( $page ) {
@@ -823,5 +827,5 @@
$node = $node->appendChild( $xml->createElement( "files_root" ) );
$node = $node->appendChild( $xml->createElement( "directory" ) );
- $node->setAttribute( "dirname", $torrent["d_directory_value"] );
+ $node->setAttribute( "dirname", $torrent["d_base_filename"] );
$fst = getmicrotime();
@@ -1096,5 +1100,5 @@
@header( "Content-Type: application/force-download" );
@header( "Content-Length: {$filesize}" );
- @header( "Content-Disposition: attachment; filename={$response["f_path"]}" );
+ @header( "Content-Disposition: attachment; filename=\"{$response["f_path"]}\"" );
// sending the file
Index: input.php
===================================================================
--- input.php (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ input.php (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -448,5 +448,5 @@
}
- $xmlrpc->setrequest( "d.close", $hash );
+ $xmlrpc->setmrequest( array( "d.stop", "d.close" ), array( $hash ) );
$xmlrpc->call();
@@ -511,78 +511,23 @@
exit;
}
- $xmlrpc->setrequest( "download_list", "" );
- $xmlrpc->call();
- $xmlrpc->parse();
- $torrents = $xmlrpc->fetch();
-
- if ( !in_array( $hash, $torrents ) ) {
- $_SESSION["rtwi_err"] = "nohashfound";
- header( "location: {$config["index"]}" );
- exit;
- }
-
- $xmlrpc->setrequest( "d.multicall", array( "", "d.get_hash=", "d.get_directory=", "d.get_size_files=" ) );
+
+ $xmlrpc->setrequest( "download_list", "" );
+ $xmlrpc->call();
+ $xmlrpc->parse();
+ $torrents = $xmlrpc->fetch();
+
+ if ( !in_array( $hash, $torrents ) ) {
+ $_SESSION["rtwi_err"] = "nohashfound";
+ header( "location: {$config["index"]}" );
+ exit;
+ }
+
+ $xmlrpc->setrequest( "d.get_base_path", $hash );
$xmlrpc->call();
$xmlrpc->parse();
$response = $xmlrpc->fetch();
- foreach ( $response as $key => $val ) {
- if ( $val[0] == $hash ) {
- $response = $val;
- }
- }
- $directory = $response[1];
- $size_files = $response[2];
-
- $xmlrpc->setmrequest( array( "get_directory", "system.get_cwd" ) );
- $xmlrpc->call();
- $xmlrpc->parse();
- $directories = $xmlrpc->fetch();
- $dd = $directories[0][0];
- $cwd = $directories[1][0];
-
- $directory = myrealpath( $directory, $config["home_path"], $cwd );
- $dd = myrealpath( $dd, $config["home_path"], $cwd );
-
- $xmlrpc->setrequest( "f.multicall", array( $hash, 0, "f.get_frozen_path=" ) );
- $xmlrpc->call();
- $xmlrpc->parse();
- $files = $xmlrpc->fetch();
-
- $unlink_num = 0;
- $dirs = array();
- foreach ( $files as $key => $val ) {
- $dirs[] = dirname( $val[0] );
- if ( is_writable( $val[0] ) ) {
- if ( @unlink( $val[0] ) ) {
- $unlink_num++;
- }
- }
- }
-
- $dirs = array_unique( $dirs );
- foreach ( $dirs as $key => $val ) {
- $pattern = "'({$directory}.*?)(/[^/]*)$'";
- if ( preg_match( $pattern, $val, $match ) ) {
- $dirs[] = $match[1];
- }
- }
- $dirs = array_unique( $dirs );
- if ( in_array( $dd, $dirs ) ) {
- $key = array_search( $dd, $dirs );
- unset( $dirs[$key] );
- }
- rsort( $dirs );
- //print_r( $dirs );
-
- $size_dirs = $size_files == 1 ? 0 : count( $dirs );
- $rmdir_num = 0;
- foreach ( $dirs as $key => $val ) {
- if ( is_writable( $val ) ) {
- if ( @rmdir( $val ) ) {
- $rmdir_num++;
- }
- }
- }
-
+
+ $xmlrpc->setrequest( "execute", array( "rm", "-rf", "--", $response ) );
+ $xmlrpc->call();
$xmlrpc->setrequest( "d.erase", $hash );
$xmlrpc->call();
@@ -590,13 +535,7 @@
sleep( 1 );
- if ( $unlink_num != $size_files || $rmdir_num != $size_dirs ) {
- $_SESSION["rtwi_err"] = "warntorrenterase";
- header( "location: {$config["index"]}" );
- exit;
- } else {
- $_SESSION["rtwi_err"] = "succtorrenterase";
- header( "location: {$config["index"]}" );
- exit;
- }
+ $_SESSION["rtwi_err"] = "succtorrenterase";
+ header( "location: {$config["index"]}" );
+ exit;
break;
@@ -641,5 +580,5 @@
}
case "close" : {
- $xmlrpc->setrequest( "d.multicall", array( $_SESSION["rtwi_view"], "d.close=" ) );
+ $xmlrpc->setrequest( "d.multicall", array( $_SESSION["rtwi_view"], "d.stop=", "d.close=" ) );
$xmlrpc->call();
Index: themes/default_ajax/inc/style.css
===================================================================
--- themes/default_ajax/inc/style.css (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ themes/default_ajax/inc/style.css (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -119,5 +119,4 @@
#mainmenu a:hover {
- display: block;
color: #000000;
background: #e0e0e0;
Index: themes/default_ajax/layout.main.index.xsl
===================================================================
--- themes/default_ajax/layout.main.index.xsl (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ themes/default_ajax/layout.main.index.xsl (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -403,5 +403,5 @@
-
+
Index: themes/default_ajax/layout.main.login.xsl
===================================================================
--- themes/default_ajax/layout.main.login.xsl (revision a771e83914371fb8278b43b20bbc1826934f91ae)
+++ themes/default_ajax/layout.main.login.xsl (revision ac81d6ab67f361949a2231eeea3a030ff5f7987e)
@@ -42,5 +42,5 @@
:
-
+
@@ -48,9 +48,9 @@
:
-
+
-
+