Index: !install.txt =================================================================== --- !install.txt (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ !install.txt (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -9,5 +9,5 @@ installation: -make, libcurl-openssl-dev, pkg-config, sigc++-2.0-dev, libncurses-dev +you might need the following packages: make, libcurl-openssl-dev, pkg-config, sigc++-2.0-dev, libncurses-dev to install xmlrpc, get the source from here: http://sourceforge.net/project/showfiles.php?group_id=16847 @@ -25,7 +25,7 @@ to install libtorrent, follow the next steps, as root: mkdir /usr/src/libtorrent - wget http://libtorrent.rakshasa.no/downloads/libtorrent-0.11.8.tar.gz - tar xvf libtorrent-0.11.8.tar.gz - cd /usr/src/libtorrent-0.11.8 + wget http://libtorrent.rakshasa.no/downloads/libtorrent-0.11.9.tar.gz + tar xvf libtorrent-0.11.9.tar.gz + cd /usr/src/libtorrent-0.11.9 ./configure make @@ -34,7 +34,7 @@ to install rtorrent, follow the next steps, as root: mkdir /usr/src/rtorrent - wget http://libtorrent.rakshasa.no/downloads/rtorrent-0.7.8.tar.gz - tar xvf rtorrent-0.7.8.tar.gz - cd /usr/src/rtorrent-0.7.8 + wget http://libtorrent.rakshasa.no/downloads/rtorrent-0.7.9.tar.gz + tar xvf rtorrent-0.7.9.tar.gz + cd /usr/src/rtorrent-0.7.9 ./configure --with-xmlrpc-c make @@ -60,5 +60,5 @@ adding users: - -find row 44, and change it: + -find row 32, and change it: -replace "userX" with the actual linux username -replace "1234567890abcdef1234567890abcdef12345678" with the sha1 hash of the choosen password for the webui (you can generate the sha1 hash here => http://www.johnmaguire.us/tools/hashcalc/index.php) @@ -71,8 +71,4 @@ "user3" => array( "pass" => "1234567890abcdef1234567890abcdef12345678", "port" => "12347" ), ); - --all users, using this webui will need an "!rtwi_files" directory into their download directory (set by "directory = some/path" in the .rtorrent.rc) with 0777 rights --the download directory should be inside your home directory (this might change later, as soon as i find out something secure) - troubleshooting: Index: includes/classes/xsl_handler.inc.php =================================================================== --- includes/classes/xsl_handler.inc.php (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ includes/classes/xsl_handler.inc.php (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -21,6 +21,9 @@ $this->content->importStyleSheet( $xsl ); -//print $this->page_data->saveXML(); exit; $this->xml_data = $this->content->transformToXML( $this->page_data ); + } + + function parse_c() { + $this->xml_data = $this->page_data->saveXML(); } @@ -31,4 +34,9 @@ } + function fetch_c() { + $this->xml_data = preg_replace( "/\<\?xml( version=\"[\d\.]+\")*( encoding=\".*\")*\?\>[\\r\\n]*/", "\\0theme}/{$this->main_file}\"?>\r\n", $this->xml_data ); + return $this->xml_data; + } + } Index: includes/config.inc.php =================================================================== --- includes/config.inc.php (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ includes/config.inc.php (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -5,20 +5,9 @@ *******************************/ -// default extension for php files (html/php) -$default_ext = "html"; - -// paths -$abs_path = "/var/www"; // webroot (with heading slash) -- change this, if neccessary -$domain = "rtwi.cyla.homelinux.net"; // site domain (or ip) -- change this, if neccessary -$site_path = "/"; // site path (with heading and trailing slash) -- change this, if neccessary -$include_path = "includes"; // include path (include files can be found here) - // URLs -$url = array( - "base" => "http://{$domain}{$site_path}", // base url - "index" => "index.{$default_ext}", // index page - "input" => "input.php", // input file (for forms) -); -$url["full"] = "{$url["base"]}/index.{$default_ext}"; // absolute url, of the index page +$url["base"] = "http://rtwi.cyla.homelinux.net/"; // base url +$url["index"] = "index.html"; // index page +$url["input"] = "input.php"; // input file (for forms) +$url["full"] = "{$url["base"]}/{$url["index"]}"; // absolute url of the index page /******************************* @@ -41,8 +30,5 @@ // array of users, each, with the sha1 hash of the password, and the scgi port of the rtorrent -- you can add users here $users = array( -// "username" => array( "pass" => "7e240de74fb1ed08fa08d38063f6a6a91462a815", "port" => "36100" ), - "cyla" => array( "pass" => "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", "port" => "36100" ), - "freez" => array( "pass" => "3c6ac60db4ea17076ddd3e044799e70832916837", "port" => "36099" ), - "pilok" => array( "pass" => "bbe31b37f154f7eadbc657d4187e79122592cd13", "port" => "36098" ), + "user1" => array( "pass" => "7e240de74fb1ed08fa08d38063f6a6a91462a815", "port" => "36100" ), ); @@ -51,9 +37,31 @@ *******************************/ -// umask for new files - set this to "0000" (keep the quotes) if you want to remove the files when erasing a torrent - also need to change download directory permissions (see the manual) -$torrents_umask = "0000"; +// do a directory tree - set to false (witouth the quotes), if your webserver is running on a slow machine, and you have torrents with a lots of files (a few hundreds) +$config["dodirtree"] = true; -// do a directory tree - set to "false" (witouth the quotes), if your webserver is running on a slow machine, and you have torrents with a lots of files (a few hundreds) -$dodirtree = false; +// true if ajax is allowed +$config["allow"]["ajax"] = true; + +// true if dht is enabled +$config["allow"]["dht"] = true; + +// true if users are allowed to download finished files from the webui +$config["allow"]["download"] = true; + +// true if users are allowed to erase downloaded data from the webui +$config["allow"]["erase"] = true; + +// true if hiding the filelist is allowed +$config["allow"]["hidedirtree"] = true; + +// true if users are allowed to set a meta-refresh interval +$config["allow"]["refresh"] = true; + +// true if users are allowed to set throttle +$config["allow"]["throttle"] = true; + +/******************************* +* theme and lingual settings +*******************************/ // language (only english is available atm) Index: includes/messages.en.inc.php =================================================================== --- includes/messages.en.inc.php (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ includes/messages.en.inc.php (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -10,10 +10,12 @@ "nohashfound" => "No torrents found for this hash", "noidfound" => "No id was given", + "nodirfound" => "No directory was given", "noinputmod" => "No mod was specified", "nooponalltorrent" => "No task was given", + "badidfound" => "Invalid id was given", + "baddirfound" => "Invalid directory was given", + "notanurl" => "Not valid URL was given", - "notrtfdircreated" => "You MUST have an \"!rtwi_files\" (without quotes) directory with 0777 rights in your rTorrent download directory", - "notrtfdirwriteright" => "The \"!rtwi_files\" directory in your rTorrent download directory MUST have 0777 rights", "rtfileinisize" => "The uploaded file exceeds the upload_max_filesize directive in php.ini", "rtfileformsize" => "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form", @@ -23,4 +25,8 @@ "rtfilenowrite" => "Failed to write file to disk", "rtfileother" => "Upload error", + "rtfileattack" => "Possible file upload attack!", + + "badthrottlevals" => "Invalid values for throttle", + "succthrottlechange" => "Throttle changed", "badrtdirectory" => "rTorrent download directry is not set correctly", @@ -50,11 +56,19 @@ "succtorrentsremove" => "Torrents removed", "succtorrenterase" => "Torrent erased", - "warntorrenterase" => "Torrent erased, but not all the files removed", + "warntorrenterase" => "Torrent erased, but not all the files were removed", "succtorrentserase" => "Torrents erased", "succprioritychange" => "Torrent priority changed", "succfileprioritychange" => "File priority changed", + "succdirprioritychange" => "Directory priority changed", "succtrackerenabledchange" => "Tracker availablity changed", "succviewchange" => "View changed", "succrefreshchange" => "Refresh rate changed", + "succdhtstart" => "DHT server started", + "succdhtstop" => "DHT server stopped", + + "downloadnotallowed" => "You are not allowed to download torrents from the webui", + "erasenotallowed" => "You are not allowed to erase downloaded data from the webui", + "refreshnotallowed" => "You are not allowed to set a meta-refresh interval", + "throttlenotallowed" => "You are not allowed to set throttle", "viewtype_main" => "Main", @@ -66,17 +80,4 @@ "viewtype_hashing" => "Hashing", "viewtype_seeding" => "Seeding", - - "refreshrate_0" => "Off", - "refreshrate_5" => "5 secs", - "refreshrate_10" => "10 secs", - "refreshrate_30" => "30 secs", - "refreshrate_60" => "1 minute", - "refreshrate_120" => "2 minutes", - "refreshrate_180" => "3 minutes", - "refreshrate_300" => "5 minutes", - "refreshrate_600" => "10 minutes", - "refreshrate_1200" => "20 minutes", - "refreshrate_1800" => "30 minutes", - "refreshrate_3600" => "1 hour", "no" => "No", @@ -95,5 +96,5 @@ "d_hash_checked_1" => "Hash checked", "d_multi_file_multi" => "Multi", - "d_multi_file_single" => "Single", + "d_multi_file_single" => "Single", "d_open_0" => "Closed", "d_open_1" => "Open", @@ -124,13 +125,22 @@ "t_type_2" => "UDP", - "bind_0000" => "Not set", - "ip_0000" => "All IP addresses", + "bind_0000" => "All IP addresses", + "ip_0000" => "Not set", "proxy_address_0000" => "Not set", - - "pics" => "rTWi - The rTorrent Web interface", - ); +$refresh = array( + "refreshrate_0" => "Off", + "refreshrate_60" => "1 minute", + "refreshrate_120" => "2 minutes", + "refreshrate_180" => "3 minutes", + "refreshrate_300" => "5 minutes", + "refreshrate_600" => "10 minutes", + "refreshrate_900" => "15 minutes", + "refreshrate_1200" => "20 minutes", +); + $label = array( + // html head "title" => "rTWi - The rTorrent Web interface", "description" => "rTWi - The rTorrent Web interface", @@ -139,33 +149,30 @@ "mailto" => "ghudiczius@gmail.com?subject=rTWi - The rTorrent Web interface", - "torrents" => "Torrents", - "peerlist" => "Peer list", - "info" => "Info", - "filelist" => "File list", - "trackerlist" => "Tracker list", - "chunksseen" => "Chunks seen", + // login + "username" => "Username", + "password" => "Password", + "login" => "Login", + + // menu + "torrents" => "Torrents", + "peerlist" => "Peer list", + "info" => "Info", + "filelist" => "File list", + "trackerlist" => "Tracker list", + "chunksseen" => "Chunks seen", "transferlist" => "Transfer list", - "addtorrent" => "Add torrent", - "logout" => "Logout", - - "clicktohide" => "Click to hide", - "clicktoopen" => "Click to open", - - "openfrom" => "Open from", - "fileupload" => "File upload", - "url" => "URL", - "torrentfile" => "Torrent file", - "torrenturl" => "Torrent URL", - "starttorrent" => "Start torrent", - "starttorrentafteradded" => "Start torrent after added", - "downloadto" => "Download to", - - "throttle" => "Throttle", - "off" => "off", - "uploadlimit" => "Upload limit", - "nouploadlimit" => "No upload limit", - "downloadlimit" => "Download limit", - "nodownloadlimit" => "No download limit", - "rate" => "Rate", + "addtorrent" => "Add torrent", + "serverinfo" => "Server info", + "logout" => "Logout", + + // misc + "ok" => "OK", + "yes" => "Yes", + "no" => "No", + + "clicktohide" => "Click to hide", + "clicktoopen" => "Click to open", + "clicktocloseopen" => "Click to close/open", + "clicktochange" => "Click to change", "view" => "View", @@ -174,4 +181,163 @@ "selectrefreshrate" => "Select refresh rate", + "areyousure" => "Are you sure?", + "areyousureerase" => "Are you sure? All downloaded data will be erased.", + + // add torrent + "openfrom" => "Open from", + "fileupload" => "File upload", + "url" => "URL", + "torrentfile" => "Torrent file", + "torrenturl" => "Torrent URL", + "starttorrent" => "Start torrent", + "starttorrentafteradded" => "Start torrent after added", + "downloadto" => "Download to", + + // tasks on torrents + "selecttask" => "Select task", + "selectone" => "Select one", + + "startall" => "Start all", + "stopall" => "Stop all", + "openall" => "Open all", + "closeall" => "Close all", + "checkall" => "Check all", + "removeall" => "Remove all", + "eraseall" => "Erase all", + + "start" => "Start", + "stop" => "Stop", + "open" => "Open", + "close" => "Close", + "checkhash" => "Check hash", + "remove" => "Remove", + "erase" => "Erase", + + "selectpriority" => "Select priority", + "selectdirpriority" => "Select directory priority", + "selectfilepriority" => "Select file priority", + + // torrent states + "started" => "Started", + "stopped" => "Stopped", + "opened" => "Opened", + "closed" => "Closed", + "finished" => "Finished", + "checkhashed" => "Hash checked", + + "startedsince" => "Started since", + "stopedsince" => "Stoped since", + "openedsince" => "Opened since", + "closedsince" => "Closeed since", + "finishedsince" => "Finished since", + "hashingsince" => "Hashing since", + + "sincepre" => "since", + "sincepost" => "", + + // torrent stats + "details" => "Details", + + "done" => "done", + "downloadfinished" => "Download finished", + "downloadeddata" => "Downloaded data", + "torrentsize" => "Torrent size", + "uploaded" => "Uploaded", + "uploadeddata" => "Uploaded data", + + "percenthashed" => "percent hashed", + "percentcompleted" => "percent completed", + "estimatedtimeremaining" => "Estimated time remaining", + "ignorecommands" => "Ignore commands", + "ratio" => "Ratio", + + "off" => "Off", + "low" => "Low", + "normal" => "Normal", + "high" => "High", + + "message" => "Message", + + "lasttouched" => "Last touched", + "filesize" => "File size", + "downloadfile" => "Download file", + "trackergroup" => "Tracker group", + "type" => "Type", + "selecttrackerenabled" => "Select if tracker is enabled", + "mininterval" => "Minimum interval", + + // stats + "throttle" => "Throttle", + "uploadspeed" => "Upload speed", + "uploadlimit" => "Upload limit", + "nouploadlimit" => "No upload limit", + "downloadspeed" => "Download speed", + "downloadlimit" => "Download limit", + "nodownloadlimit" => "No download limit", + "rate" => "Rate", + + // info page + "name" => "Name", + "infohash" => "Info hash", + "localid" => "Local ID", + "localidhtml" => "Local ID (html)", + "directory" => "Directory", + "tiedtofile" => "Tied to file", + "filestats" => "File stats", + "files" => "files", + "private" => "Private", + "chunks" => "Chunks", + "priority" => "Priority", + "statechanged" => "State changed", + "freediskspace" => "Free diskspace", + "connectiontype" => "Connection type", + "trackers" => "Trackers", + "leechers" => "Leechers", + "seeders" => "Seeders", + "pexenabled" => "PEX enabled", + "pexsize" => "PEX size", + "upload" => "Upload", + "download" => "Download", + "skipped" => "Skipped", + + // server info page + "clientversion" => "Client version", + "libraryversion" => "Library version", + "workingdirectory" => "Working directory", + "downloaddirectory" => "Download directory", + "sessiondirectory" => "Session directory", + "hostname" => "Hostname", + "listeningipaddress" => "Listening IP address", + "reportedipaddress" => "IP address reported to the tracker", + "portopened" => "Port opened", + "randomport" => "Random port", + "portrange" => "Port range", + "changedhtstatus" => "Start/stop DHT server", + "dht" => "DHT server", + "dhtport" => "DHT port", + "dhtcycle" => "DHT cycle", + "dhtqueries" => "DHT queries received / sent", + "dhtreplies" => "DHT replies received", + "dhtbytes" => "DHT bytes read / written", + "dhtnodes" => "DHT nodes", + "in" => "in", + "buckets" => "buckets", + "dhtpeers" => "DHT peers", + "dhttorrents" => "DHT torrents", + "maxuploads" => "Maximum number of uploads", + "maxpeers" => "Minimum number of peers", + "minpeers" => "Maximum number of peers", + "memoryusage" => "Memory usage", + "maxmemoryusage" => "Max memory usage", + "hashcheck" => "Hash check", + "safesync" => "Safe sync", + "sendbuffer" => "Send buffer", + "receivebuffer" => "Receive buffer", + + // tracker list page + "focus" => "Focus", + "enabled" => "Enabled", + "seedersleechers" => "S/L", + "lasttimescraped" => "Last time scraped", ); Index: includes/messages.hu.inc.php =================================================================== --- includes/messages.hu.inc.php (revision 49fafb4c4b73ded67f75984b08c402355a202a61) +++ includes/messages.hu.inc.php (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -0,0 +1,344 @@ + "Hibás felhasználó, vagy jelszó", + "succlogin" => "Sikeres bejelentkezés", + "succlogout" => "Sikeres kijelentkezés", + + "noconn" => "Nincs kapcsolat", + + "nohashfound" => "Nincs ilyen torrent", + "noidfound" => "Nincs ID megadva", + "nodirfound" => "Nincs könyvtár megadva", + "noinputmod" => "Nincs funkció megadva", + "nooponalltorrent" => "Nincs feladat megadva", + + "badidfound" => "Hibás ID", + "baddirfound" => "Hibás könyvtárnév", + + "notanurl" => "Nincs URL megadva", + "rtfileinisize" => "A feltöltött fájl mérete meghaladja a PHP.ini-ben megengedett (upload_max_filesize) méretet", + "rtfileformsize" => "A feltöltött fájl mérete meghaladja a HTML űrlapon megengedett (MAX_FILE_SIZE) méretet", + "rtfilepartial" => "A fájl csak részlegesen került feltöltésre", + "rtfilenofile" => "Nem történt fájlfeltöltés", + "rtfilenotmpdir" => "Nincs megadva ideiglenes könyvtár", + "rtfilenowrite" => "Nem sikerült írni a lemezre", + "rtfileother" => "Feltöltési hiba", + "rtfileattack" => "Lehetséges támadás!", + + "badthrottlevals" => "Hibás sebességkorlát érték", + "succthrottlechange" => "Sebességkorlát megváltoztatva", + + "badrtdirectory" => "Az rTorrent letöltési könyvtár hibásan van megadva", + "badatpath" => "Hibás útvonal", + + "novaluefound" => "Nincs érték megadva", + "badvaluefound" => "Hibás érték", + + "nopriorityfound" => "Nincs prioritás megadva", + "badpriorityfound" => "Hibás prioritás", + + "badviewtype" => "Hibás nézet", + "badrefreshrate" => "Hibás frissítési intervallum", + + "succtorrentload" => "Torrent betöltve", + "succtorrentstart" => "Torrent elindítva", + "succtorrentsstart" => "Torrentek elindítva", + "succtorrentopen" => "Torrent megnyitva", + "succtorrentsopen" => "Torrentek megnzitva", + "succtorrentstop" => "Torrent leállítva", + "succtorrentsstop" => "Torrentek leállítva", + "succtorrentclose" => "Torrent bezárva", + "succtorrentsclose" => "Torrentek bezárva", + "succtorrentcheckhash" => "Torrent ellenőrzés elindítva", + "succtorrentscheckhash" => "Torrentek ellenőrzése elindítva", + "succtorrentremove" => "Torrent eltávolítva", + "succtorrentsremove" => "Torrentek eltávolítva", + "succtorrenterase" => "Torrent törölve", + "warntorrenterase" => "Torrent törölve, de nem minden fájl lett eltávolítva", + "succtorrentserase" => "Torrentek törölve", + "succprioritychange" => "Torrent prioritása beállítva", + "succfileprioritychange" => "Fájl prioritása beállítva", + "succdirprioritychange" => "Könyvtár prioritása beállítva", + "succtrackerenabledchange" => "Tracker elérhetősége beállítva", + "succviewchange" => "Nézet beállítva", + "succrefreshchange" => "Frissítés beállítva", + "succdhtstart" => "DHT szerver elindítva", + "succdhtstop" => "DHT szerver leállítva", + + "downloadnotallowed" => "Nem vagy jogosult torrentek letöltésére a web-es felületről", + "erasenotallowed" => "Nem vagy jogosult torrentek törlésére a web-es felületen", + "refreshnotallowed" => "Nem vagy jogosult frissítés beállítására", + "throttlenotallowed" => "Nem vagy jogosult sebességkorlát beállítására", + + "viewtype_main" => "Alapértelmezett", + "viewtype_name" => "Név szerint", + "viewtype_started" => "Elindított torrentek", + "viewtype_stopped" => "Leállított torrentek", + "viewtype_complete" => "Befejezett torrentek", + "viewtype_incomplete" => "Befejezetlen torrentek", + "viewtype_hashing" => "Ellenőrzés alatt álló torrentek", + "viewtype_seeding" => "Feltöltések", + + "no" => "Nem", + "yes" => "Igen", + "disabled" => "Letiltva", + "enabled" => "Engedélyezve", + "notset" => "Nincs beállítva", + + "d_connection_current_leech" => "Letöltés", + "d_connection_current_seed" => "Feltöltés", + "d_ignore_commands_0" => "Parancsok figyelembevétele", + "d_ignore_commands_1" => "Parancsok figyelmen kívü hagyása", + "d_active_0" => "Leállítva", + "d_active_1" => "Elindítva", + "d_hash_checked_0" => "Nem volt ellenőrizve", + "d_hash_checked_1" => "Ellenőrizve", + "d_multi_file_multi" => "", + "d_multi_file_single" => "Egyetlen fájl", + "d_open_0" => "Zárva", + "d_open_1" => "Nyitva", + "d_complete_0" => "Befejezetlen", + "d_complete_1" => "Befejezett", + "d_hash_checking_0" => "Nincs ellenőrzés alatt", + "d_hash_checking_1" => "Ellenőrzés alatt", + "d_hashing_0" => "Nincs ellenőrzés alatt", + "d_hashing_1" => "Normál ellenőrzés", + "d_hashing_2" => "Letöltés befejezve, ellenőrzés", + "d_hashing_3" => "Újraellenőrzés", + "d_priority_0" => "Leállítva", + "d_priority_1" => "Alacsonz", + "d_priority_2" => "Normál", + "d_priority_3" => "Magas", + "d_state_0" => "Leállítva", + "d_state_1" => "Elindítva", + "f_is_open_0" => "Zárva", + "f_is_open_1" => "Nyitva", + "f_priority_0" => "Leállítva", + "f_priority_1" => "Normál", + "f_priority_2" => "Magas", + "t_enabled_0" => "Letiltva", + "t_enabled_1" => "Engedélyezve", + "t_open_0" => "Zárva", + "t_open_1" => "Nyitva", + "t_type_1" => "TCP", + "t_type_2" => "UDP", + + "bind_0000" => "Minden IP cím", + "ip_0000" => "Nincs beállítva", + "proxy_address_0000" => "Nincs beállítva", +); + +$refresh = array( + "refreshrate_0" => "Letiltva", + "refreshrate_60" => "1 perc", + "refreshrate_120" => "2 perc", + "refreshrate_180" => "3 perc", + "refreshrate_300" => "5 perc", + "refreshrate_600" => "10 perc", + "refreshrate_900" => "15 perc", + "refreshrate_1200" => "20 perc", +); + +$label = array( + // html head + "title" => "rTWi - Az rTorrent Web interfész", + "description" => "rTWi - Az rTorrent Web interfész", + "keywords" => "rTWi - Az rTorrent Web interfész", + "author" => "Hudiczius Gábor", + "mailto" => "ghudiczius@gmail.com?subject=rTWi - Az rTorrent Web interfész", + + // login + "username" => "Felhasználó", + "password" => "Jelszó", + "login" => "Belépés", + + // menu + "torrents" => "Torrentek", + "peerlist" => "Peer lista", + "info" => "Információ", + "filelist" => "Fájl lista", + "trackerlist" => "Tracker lista", + "chunksseen" => "Elérhető syeletek", + "transferlist" => "Átviteli lista", + "addtorrent" => "Torrent hozzáadása", + "serverinfo" => "Szerver információ", + "logout" => "Kijelentkezés", + + // misc + "ok" => "OK", + "yes" => "Igen", + "no" => "Nem", + + "clicktohide" => "Kattints ide az elrejtéshez", + "clicktoopen" => "Kattints ide a lenyitáshoz", + "clicktocloseopen" => "Kattints ide a bezáráshoz/lenyitáshoz", + "clicktochange" => "Kattints ide a megváltoztatásához", + + "view" => "Nézet", + "selectviewtype" => "Válassz megjelenítést", + "refresh" => "Frissítés", + "selectrefreshrate" => "Válassz frissítési időközt", + + "areyousure" => "Biztosan törlöd?", + "areyousureerase" => "Biztosan törlöd? Minden letöltött adat törlésre kerül.", + + // add torrent + "openfrom" => "Megnyitás", + "fileupload" => "Fájlfeltöltéssel", + "url" => "URL megadásával", + "torrentfile" => "Torrent fájl", + "torrenturl" => "Torrent URL-je", + "starttorrent" => "Torrent indítása", + "starttorrentafteradded" => "Torrent indítása letöltés után", + "downloadto" => "Letöltés", + + // tasks on torrents + "selecttask" => "Válassz műveletet", + "selectone" => "Válassz egyet", + + "startall" => "Összes indítása", + "stopall" => "Összes leállítása", + "openall" => "Összes megnyitása", + "closeall" => "Összes bezárása", + "checkall" => "Összes ellenőrzése", + "removeall" => "Összes eltávolítása", + "eraseall" => "Összes törlése", + + "start" => "Elindít", + "stop" => "Leállít", + "open" => "Megnyit", + "close" => "Bezár", + "checkhash" => "Hash ellenőrzés", + "remove" => "Eltávolít", + "erase" => "Töröl", + + "selectpriority" => "Válassz prioritást", + "selectdirpriority" => "Válassz könyvtár prioritást", + "selectfilepriority" => "Válassz fájl prioritást", + + // torrent states + "started" => "Elindítva", + "stopped" => "Leállítva", + "opened" => "Nyitva", + "closed" => "Zárva", + "finished" => "Kész", + "checkhashed" => "Hash ellenőrizve", + + "startedsince" => "Elindítva:", + "stopedsince" => "Leállítva:", + "openedsince" => "Megyyitva:", + "closedsince" => "Beárva:", + "finishedsince" => "elkészült:", + "hashingsince" => "Hash ellenőrés elindítva:", + + "sincepre" => "", + "sincepost" => "óta", + + // torrent stats + "details" => "Részletek", + + "done" => "kész", + "downloadfinished" => "Letöltés elkészült", + "downloadeddata" => "Letöltött adatmennyiség", + "torrentsize" => "Torrent mérete", + "uploaded" => "Feltöltve", + "uploadeddata" => "Feltöltött adatmennyiség", + + "percenthashed" => "százalék ellenőrizve", + "percentcompleted" => "százalék elkészült", + "estimatedtimeremaining" => "Becsült hátralévő idő", + "ignorecommands" => "Parancsdok figyelmen kívül hagyása", + "ratio" => "Arány", + + "off" => "Leállítva", + "low" => "Alacsony", + "normal" => "Normál", + "high" => "Magas", + + "message" => "Üzenet", + + "lasttouched" => "Legutóbb módosítva", + "filesize" => "Fájl mérete", + "downloadfile" => "Fájl letöltése", + "trackergroup" => "Tracker csoport", + "type" => "Típus", + "selecttrackerenabled" => "Tracker engedélyezése", + "mininterval" => "Leggyakoribb kapcsolódás", + + // stats + "throttle" => "Korlát", + "uploadspeed" => "Feltöltési sebesség", + "uploadlimit" => "Feltöltési korlát", + "nouploadlimit" => "Nincs feltöltési korlát", + "downloadspeed" => "Letöltési sebesség", + "downloadlimit" => "Letöltési korlát", + "nodownloadlimit" => "Nincs letöltési korlát", + "rate" => "Sebesség", + + // info page + "name" => "Torrent neve", + "infohash" => "Info hash", + "localid" => "Azonosító", + "localidhtml" => "Azonosító (html)", + "directory" => "Könyvtár", + "tiedtofile" => "Fájlhoz kötve", + "filestats" => "Fájlok száma", + "files" => "fájl", + "private" => "Privát torrent", + "chunks" => "Szeletek", + "priority" => "Prioritás", + "statechanged" => "Utolsó állapotváltozás", + "freediskspace" => "Szabad lemezterület", + "connectiontype" => "Kapcsolat tipusa", + "trackers" => "Trackerek száma", + "leechers" => "Letöltők száma", + "seeders" => "Feltöltők száma", + "pexenabled" => "PEX engedélyezve", + "pexsize" => "PEX mérete", + "upload" => "Feltöltés", + "download" => "Letöltés", + "skipped" => "Kihagyva", + + // server info page + "clientversion" => "Kliens verzió", + "libraryversion" => "Függvénykönyvtár verzió", + "workingdirectory" => "Munkakönyvtár", + "downloaddirectory" => "Letöltési könyvtár", + "sessiondirectory" => "Munkamenet könyvtár", + "hostname" => "Hosztnév", + "listeningipaddress" => "Kapcsolatot fogadó IP cím", + "reportedipaddress" => "Tracker felé jelentett IP cím", + "portopened" => "Nyitott port", + "randomport" => "Véletlen port", + "portrange" => "Porttartomány", + "changedhtstatus" => "DHT szerver elindítása/leállítása", + "dht" => "DHT szerver", + "dhtport" => "DHT port", + "dhtcycle" => "DHT kör", + "dhtqueries" => "DHT fogadott / küldött kérések", + "dhtreplies" => "DHT fogadott válaszok", + "dhtbytes" => "DHT olvasott / írt bájtok", + "dhtnodes" => "DHT pontok", + "in" => "pont", + "buckets" => "csokorban", + "dhtpeers" => "DHT peer-ek", + "dhttorrents" => "DHT torrentek", + "maxuploads" => "Feltöltések maximális száma", + "maxpeers" => "Peer-ek maximális száma", + "minpeers" => "Peer-ek minimális száma", + "memoryusage" => "Memóriahasználat", + "maxmemoryusage" => "Maximális memóriahasználat", + "hashcheck" => "Hash ellenőrzés", + "safesync" => "Biztonságos szinkronizálás", + "sendbuffer" => "Kimeneti puffer", + "receivebuffer" => "Bejövő puffer", + + // tracker list page + "focus" => "Fókusz", + "enabled" => "Engedélyezve", + "seedersleechers" => "Fel/Le", + "lasttimescraped" => "Utoljára lekérdezve", +); + +?> Index: index.html =================================================================== --- index.html (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ index.html (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -1,10 +1,3 @@ array( "get_bind", "get_check_hash", "get_connection_leech", "get_connection_seed", "get_directory", "get_download_rate", "get_handshake_log", "get_hash_interval", "get_hash_max_tries", "get_hash_read_ahead", "get_http_cacert", "get_http_capath", "get_http_proxy", "get_ip", "get_key_layout", "get_max_downloads_div", "get_max_downloads_global", "get_max_file_size", "get_max_memory_usage", "get_max_open_files", "get_max_open_http", "get_max_open_sockets", "get_max_peers", "get_max_peers_seed", "get_max_uploads", "get_max_uploads_div", "get_max_uploads_global", "get_memory_usage", "get_min_peers", "get_min_peers_seed", "get_name", "get_peer_exchange", "get_port_open", "get_port_random", "get_port_range", "get_preload_min_size", "get_preload_required_rate", "get_preload_type", "get_proxy_address", "get_receive_buffer_size", "get_safe_free_diskspace", "get_safe_sync", "get_scgi_dont_route", "get_send_buffer_size", "get_session", "get_session_lock", "get_session_on_completion", "get_split_file_size", "get_split_suffix", "get_stats_not_preloaded", "get_stats_preloaded", "get_timeout_safe_sync", "get_timeout_sync", "get_tracker_dump", "get_tracker_numwant", "get_upload_rate", "get_use_udp_trackers", "system.client_version", "system.get_cwd", "system.hostname", "system.library_version", "system.pid" ), - "d" => array( "d.get_base_filename=", "d.get_base_path=", "d.get_bytes_done=", "d.get_chunk_size=", "d.get_chunks_hashed=", "d.get_complete=", "d.get_completed_bytes=", "d.get_completed_chunks=", "d.get_connection_current=", "d.get_connection_leech=", "d.get_connection_seed=", "d.get_creation_date=", "d.get_custom1=", "d.get_custom2=", "d.get_custom3=", "d.get_custom4=", "d.get_custom5=", "d.get_directory=", "d.get_down_rate=", "d.get_down_total=", "d.get_free_diskspace=", "d.get_hash=", "d.get_hashing=", "d.get_ignore_commands=", "d.get_left_bytes=", "d.get_local_id=", "d.get_local_id_html=", "d.get_max_file_size=", "d.get_max_peers=", "d.get_max_uploads=", "d.get_message=", "d.get_min_peers=", "d.get_name=", "d.get_peer_exchange=", "d.get_peers_accounted=", "d.get_peers_complete=", "d.get_peers_connected=", "d.get_peers_max=", "d.get_peers_min=", "d.get_peers_not_connected=", "d.get_priority=", "d.get_priority_str=", "d.get_ratio=", "d.get_size_bytes=", "d.get_size_chunks=", "d.get_size_files=", "d.get_skip_rate=", "d.get_skip_total=", "d.get_state=", "d.get_state_changed=", "d.get_tied_to_file=", "d.get_tracker_focus=", "d.get_tracker_numwant=", "d.get_tracker_size=", "d.get_up_rate=", "d.get_up_total=", "d.get_uploads_max=", "d.is_active=", "d.is_hash_checked=", "d.is_hash_checking=", "d.is_multi_file=", "d.is_open=", "d.is_private=" ), - "f" => array( "f.get_completed_chunks=", "f.get_frozen_path=", "f.get_is_created=", "f.get_is_open=", "f.get_last_touched=", "f.get_match_depth_next=", "f.get_match_depth_prev=", "f.get_offset=", "f.get_path=", "f.get_path_components=", "f.get_path_depth=", "f.get_priority=", "f.get_range_first=", "f.get_range_second=", "f.get_size_bytes=", "f.get_size_chunks=" ), - "t" => array( "t.get_group=", "t.get_id=", "t.get_min_interval=", "t.get_normal_interval=", "t.get_scrape_complete=", "t.get_scrape_downloaded=", "t.get_scrape_incomplete=", "t.get_scrape_time_last=", "t.get_type=", "t.get_url=", "t.is_enabled=", "t.is_open=" ) -); function make_abs_path( &$rel_path, &$cwd, $home ) { @@ -59,5 +52,5 @@ } -function prepare_si_responses( &$responses, &$message, &$home_path ) { +function prepare_si_responses( &$responses, &$message, &$home_path, &$config = array() ) { $bytes_down_arr = switch_bytes( $responses["bytes_down"] ); $bytes_up_arr = switch_bytes( $responses["bytes_up"] ); @@ -129,4 +122,18 @@ $responses["split_file_size_value"] = sprintf( "%.1f", $split_file_size_arr[0] ); $responses["split_file_size_suffix"] = $split_file_size_arr[1]; + } + + if ( $config["allow"]["dht"] == true ) { + if ( $responses["dht_statistics_active"] != 0 ) { + $dht_statistics_bytes_read_arr = switch_bytes( $responses["dht_statistics_bytes_read"] ); + $dht_statistics_bytes_written_arr = switch_bytes( $responses["dht_statistics_bytes_written"] ); + + $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_written_value"] = sprintf( "%.1f", $dht_statistics_bytes_written_arr[0] ); + $responses["dht_statistics_bytes_written_suffix"] = $dht_statistics_bytes_written_arr[1]; + } + + $responses["dht_statistics_active_value"] = $responses["dht_statistics_active"] == 0 ? $message["disabled"] : $message["enabled"]; } @@ -193,4 +200,5 @@ $responses["d_peers_max_value"] = $responses["d_peers_max"] == -1 ? $message["disabled"] : $responses["d_peers_max"]; $responses["d_peers_min_value"] = $responses["d_peers_min"] == -1 ? $message["disabled"] : $responses["d_peers_min"]; + $responses["d_pex_active_value"] = $responses["d_pex_active"] == 1 ? $message["yes"] : $message["no"]; $responses["d_private_value"] = $responses["d_private"] == 1 ? $message["yes"] : $message["no"]; $responses["d_state_value"] = $responses["d_state"] == 1 ? $message["d_state_1"] : $message["d_state_0"]; @@ -213,4 +221,6 @@ $responses["d_percentage"] = $responses["d_completed_bytes"] / $responses["d_size_bytes"]; $responses["d_percentage_value"] = floor( $responses["d_completed_bytes"] / $responses["d_size_bytes"] * 100 ); + $responses["d_hpercentage"] = $responses["d_chunks_hashed"] / $responses["d_size_chunks"]; + $responses["d_hpercentage_value"] = floor( $responses["d_chunks_hashed"] / $responses["d_size_chunks"] * 100 ); } elseif ( $responses["d_complete"] != 1 ) { $responses["d_estimated_time"] = ""; @@ -332,5 +342,5 @@ } -function addrefresh( &$xml, &$node, &$message ) { +function addrefresh( &$xml, &$node, &$refresh ) { $node->setAttribute( "refreshrate", $_SESSION["rtwi_refresh"] ); @@ -338,64 +348,25 @@ $rrrnode = $node->appendChild( $xml->createElement( "refreshrates" ) ); $rrrnode->setAttribute( "value", $_SESSION["rtwi_refresh"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "0" ); - $rrnode->setAttribute( "title", $message["refreshrate_0"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "5" ); - $rrnode->setAttribute( "title", $message["refreshrate_5"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "10" ); - $rrnode->setAttribute( "title", $message["refreshrate_10"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "30" ); - $rrnode->setAttribute( "title", $message["refreshrate_30"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "60" ); - $rrnode->setAttribute( "title", $message["refreshrate_60"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "120" ); - $rrnode->setAttribute( "title", $message["refreshrate_120"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "180" ); - $rrnode->setAttribute( "title", $message["refreshrate_180"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "300" ); - $rrnode->setAttribute( "title", $message["refreshrate_300"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "600" ); - $rrnode->setAttribute( "title", $message["refreshrate_600"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "1200" ); - $rrnode->setAttribute( "title", $message["refreshrate_1200"] ); - $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); - $rrnode->setAttribute( "value", "1800" ); - $rrnode->setAttribute( "title", $message["refreshrate_1800"] ); - $rrnode->setAttribute( "value", "3600" ); - $rrnode->setAttribute( "title", $message["refreshrate_3600"] ); -} - -function build_xmltree( $list, &$tree, &$xml ) { - if ( count( $list ) > 1 ) { - $sublist = $list; - array_shift( $sublist ); - - if ( !is_object( $tree->getElementsByTagName( "directory" )->item( 0 ) ) ) { + foreach ( $refresh as $key => $val ) { + $rrnode = $rrrnode->appendChild( $xml->createElement( "refreshrate" ) ); + $rrnode->setAttribute( "value", substr( $key, 12 ) ); + $rrnode->setAttribute( "title", $val ); + } +} + +function build_xmltree( &$dstruct, &$tree, &$xml, $fullpath, $responses ) { + foreach ( $dstruct as $key => $val ) { + if ( is_array( $val ) ) { $subtree = $tree->appendChild( $xml->createElement( "directory" ) ); - $subtree->setAttribute( "dirname", $list[0] ); + $subtree->setAttribute( "id", sha1( mt_rand() ) ); + $subtree->setAttribute( "dirname", $key ); + $subtree->setAttribute( "dirpath", urlencode( "{$fullpath}/{$key}" ) ); + $ret = build_xmltree( $val, $subtree, $xml, "{$fullpath}/{$key}", $responses ); } else { - for ( $i = 0; $i < $tree->getElementsByTagName( "directory" )->length; $i++ ) { - if ( $tree->getElementsByTagName( "directory" )->item( $i )->getAttribute( "dirname" ) == $list[0] ) { - $subtree = $tree->getElementsByTagName( "directory" )->item( $i ); - } - } - if ( !isset( $subtree ) || !is_object( $subtree ) ) { - $subtree = $tree->appendChild( $xml->createElement( "directory" ) ); - $subtree->setAttribute( "dirname", $list[0] ); - } - } - $ret = build_xmltree( $sublist, $subtree, $xml ); - } else { - $ret = $tree->appendChild( $xml->createElement( "file" ) ); - $ret->setAttribute( "filename", $list[0] ); + $ret = $tree->appendChild( $xml->createElement( "file" ) ); + $ret->setAttribute( "id", $key ); + $ret->setAttribute( "filename", $val ); + xmlrpc_multiappend( $xml, $ret, $responses[$key] ); + } } @@ -452,8 +423,15 @@ $methodval = substr( $methodval, 7 ); $methodval = "{$methodval}"; + } elseif ( substr( $methodval, 0, 3 ) == "dht" ) { } else { $methodval = substr( $methodval, 4 ); } - $responses[$methodval] = $response[$r++][0]; + if ( $methodval == "dht_statistics" ) { + foreach ( $response[$r++][0] as $dkey => $dval ) { + $responses["{$methodval}_{$dkey}"] = $dval; + } + } else { + $responses[$methodval] = $response[$r++][0]; + } } @@ -487,8 +465,8 @@ } -set_time_limit( 0 ); - error_reporting( E_ALL ); //error_reporting( E_ALL ^ E_NOTICE ); + +set_time_limit( 0 ); session_start(); @@ -499,5 +477,5 @@ require_once( "includes/config.inc.php" ); require_once( "includes/messages.{$lang}.inc.php" ); -require_once( "{$include_path}/tools/functions.time.inc.php" ); +require_once( "includes/tools/functions.time.inc.php" ); $st = getmicrotime(); @@ -505,4 +483,11 @@ $calltime = 0; $multicallnum = 0; + +$xmlrpc_methods = array( + "si" => $config["allow"]["dht"] == true ? array( "dht_statistics", "get_bind", "get_check_hash", "get_connection_leech", "get_connection_seed", "get_dht_port", "get_directory", "get_download_rate", "get_handshake_log", "get_hash_interval", "get_hash_max_tries", "get_hash_read_ahead", "get_http_cacert", "get_http_capath", "get_http_proxy", "get_ip", "get_key_layout", "get_max_downloads_div", "get_max_downloads_global", "get_max_file_size", "get_max_memory_usage", "get_max_open_files", "get_max_open_http", "get_max_open_sockets", "get_max_peers", "get_max_peers_seed", "get_max_uploads", "get_max_uploads_div", "get_max_uploads_global", "get_memory_usage", "get_min_peers", "get_min_peers_seed", "get_name", "get_peer_exchange", "get_port_open", "get_port_random", "get_port_range", "get_preload_min_size", "get_preload_required_rate", "get_preload_type", "get_proxy_address", "get_receive_buffer_size", "get_safe_free_diskspace", "get_safe_sync", "get_scgi_dont_route", "get_send_buffer_size", "get_session", "get_session_lock", "get_session_on_completion", "get_split_file_size", "get_split_suffix", "get_stats_not_preloaded", "get_stats_preloaded", "get_timeout_safe_sync", "get_timeout_sync", "get_tracker_dump", "get_tracker_numwant", "get_upload_rate", "get_use_udp_trackers", "system.client_version", "system.get_cwd", "system.hostname", "system.library_version", "system.pid" ) : array( "get_bind", "get_check_hash", "get_connection_leech", "get_connection_seed", "get_directory", "get_download_rate", "get_handshake_log", "get_hash_interval", "get_hash_max_tries", "get_hash_read_ahead", "get_http_cacert", "get_http_capath", "get_http_proxy", "get_ip", "get_key_layout", "get_max_downloads_div", "get_max_downloads_global", "get_max_file_size", "get_max_memory_usage", "get_max_open_files", "get_max_open_http", "get_max_open_sockets", "get_max_peers", "get_max_peers_seed", "get_max_uploads", "get_max_uploads_div", "get_max_uploads_global", "get_memory_usage", "get_min_peers", "get_min_peers_seed", "get_name", "get_peer_exchange", "get_port_open", "get_port_random", "get_port_range", "get_preload_min_size", "get_preload_required_rate", "get_preload_type", "get_proxy_address", "get_receive_buffer_size", "get_safe_free_diskspace", "get_safe_sync", "get_scgi_dont_route", "get_send_buffer_size", "get_session", "get_session_lock", "get_session_on_completion", "get_split_file_size", "get_split_suffix", "get_stats_not_preloaded", "get_stats_preloaded", "get_timeout_safe_sync", "get_timeout_sync", "get_tracker_dump", "get_tracker_numwant", "get_upload_rate", "get_use_udp_trackers", "system.client_version", "system.get_cwd", "system.hostname", "system.library_version", "system.pid" ), + "d" => array( "d.get_base_filename=", "d.get_base_path=", "d.get_bytes_done=", "d.get_chunk_size=", "d.get_chunks_hashed=", "d.get_complete=", "d.get_completed_bytes=", "d.get_completed_chunks=", "d.get_connection_current=", "d.get_connection_leech=", "d.get_connection_seed=", "d.get_creation_date=", "d.get_custom1=", "d.get_custom2=", "d.get_custom3=", "d.get_custom4=", "d.get_custom5=", "d.get_directory=", "d.get_down_rate=", "d.get_down_total=", "d.get_free_diskspace=", "d.get_hash=", "d.get_hashing=", "d.get_ignore_commands=", "d.get_left_bytes=", "d.get_local_id=", "d.get_local_id_html=", "d.get_max_file_size=", "d.get_max_peers=", "d.get_max_size_pex=", "d.get_max_uploads=", "d.get_message=", "d.get_min_peers=", "d.get_name=", "d.get_peer_exchange=", "d.get_peers_accounted=", "d.get_peers_complete=", "d.get_peers_connected=", "d.get_peers_max=", "d.get_peers_min=", "d.get_peers_not_connected=", "d.get_priority=", "d.get_priority_str=", "d.get_ratio=", "d.get_size_bytes=", "d.get_size_chunks=", "d.get_size_files=", "d.get_size_pex=", "d.get_skip_rate=", "d.get_skip_total=", "d.get_state=", "d.get_state_changed=", "d.get_tied_to_file=", "d.get_tracker_focus=", "d.get_tracker_numwant=", "d.get_tracker_size=", "d.get_up_rate=", "d.get_up_total=", "d.get_uploads_max=", "d.is_active=", "d.is_hash_checked=", "d.is_hash_checking=", "d.is_multi_file=", "d.is_open=", "d.is_pex_active=", "d.is_private=" ), + "f" => array( "f.get_completed_chunks=", "f.get_frozen_path=", "f.get_is_created=", "f.get_is_open=", "f.get_last_touched=", "f.get_match_depth_next=", "f.get_match_depth_prev=", "f.get_offset=", "f.get_path=", "f.get_path_components=", "f.get_path_depth=", "f.get_priority=", "f.get_range_first=", "f.get_range_second=", "f.get_size_bytes=", "f.get_size_chunks=" ), + "t" => array( "t.get_group=", "t.get_id=", "t.get_min_interval=", "t.get_normal_interval=", "t.get_scrape_complete=", "t.get_scrape_downloaded=", "t.get_scrape_incomplete=", "t.get_scrape_time_last=", "t.get_type=", "t.get_url=", "t.is_enabled=", "t.is_open=" ) +); if ( isset( $_REQUEST["mod"] ) ) { @@ -602,4 +587,10 @@ $root->appendChild( $xml->createElement( "purl", isset( $_SESSION["rtwi_lastpage"] ) ? str_replace( "&", "&", $_SESSION["rtwi_lastpage"] ) : "" ) ); $root->appendChild( $xml->createElement( "datetime", date( "Y. m. d. H:i:s", time() ) ) ); +$root->appendChild( $xml->createElement( "lang", $lang ) ); +foreach ( $config["allow"] as $key => $val ) { + if ( $val == true ) { + $root->appendChild( $xml->createElement( "allow_{$key}", "true" ) ); + } +} $labels = $root->appendChild( $xml->createElement( "labels" ) ); @@ -623,4 +614,57 @@ case "login" : { // login $layout_file = "layout.main.login.xsl"; + + break; + } + case "serverinfo" : { // server info + // creating torrents node + $tnode = $root->appendChild( $xml->createElement( "torrents" ) ); + if ( $config["allow"]["refresh"] ) { + addrefresh( $xml, $tnode, $refresh ); + } + + // retrieving server info + $methodlist = $xmlrpc_methods["si"]; + $si_responses = xmlrpc_multicall( $xmlrpc_array, $methodlist, $multicallnum, $callnum, $calltime ); + + $methodlist = array( "d.get_down_rate=", "d.get_up_rate=" ); + $request = xmlrpc_encode_request( "d.multicall", array_merge( array( $_SESSION["rtwi_view"] ), $methodlist ) ); + $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); + $response = preg_replace( "/i8|ex\.i8/", "string", $response ); + $response = xmlrpc_decode( $response ); + + $bytes_down = 0; + $bytes_up = 0; + for ( $i = 0; $i < count( $response ); $i++ ) { + for ( $r = 0; $r < count( $methodlist ); $r++ ) { + $methodval = preg_replace( "/(.)\.get_(.*)=/", "$1_$2", $methodlist[$r] ); + $d_responses[$i][$methodval] = $response[$i][$r]; + } + $bytes_down += $d_responses[$i]["d_down_rate"]; + $bytes_up += $d_responses[$i]["d_up_rate"]; + } + + $si_responses["bytes_down"] = $bytes_down; + $si_responses["bytes_up"] = $bytes_up; + + prepare_si_responses( $si_responses, $message, $home_path, $config ); + + $node = $tnode->appendChild( $xml->createElement( "bytes_down", $si_responses["bytes_down"] ) ); + $node->setAttribute( "suffix", $si_responses["bytes_down_suffix"] ); + $node->setAttribute( "value", $si_responses["bytes_down_value"] ); + $node = $tnode->appendChild( $xml->createElement( "bytes_up", $si_responses["bytes_up"] ) ); + $node->setAttribute( "suffix", $si_responses["bytes_up_suffix"] ); + $node->setAttribute( "value", $si_responses["bytes_up_value"] ); + $node = $tnode->appendChild( $xml->createElement( "download_rate", $si_responses["download_rate"] ) ); + $node->setAttribute( "suffix", $si_responses["download_rate_suffix"] ); + $node->setAttribute( "value", $si_responses["download_rate_value"] ); + $node = $tnode->appendChild( $xml->createElement( "upload_rate", $si_responses["upload_rate"] ) ); + $node->setAttribute( "suffix", $si_responses["upload_rate_suffix"] ); + $node->setAttribute( "value", $si_responses["upload_rate_value"] ); + + $inode = $tnode->appendChild( $xml->createElement( "server_info" ) ); + xmlrpc_multiappend( $xml, $inode, $si_responses ); + + $layout_file = "layout.main.index.xsl"; break; @@ -673,5 +717,5 @@ $dpath = str_replace( "//", "/", "{$path}/{$val}" ); $fdpath = str_replace( "//", "/", "{$directory}/{$dpath}" ); - if ( ( is_dir( $fdpath ) || ( is_link( $fdpath ) && is_dir( readlink( $fdpath ) ) ) ) && substr( $val, 0, 1 ) != "." && $fdpath != "{$directory}/!rtwi_files" ) { + if ( ( is_dir( $fdpath ) || ( is_link( $fdpath ) && is_dir( readlink( $fdpath ) ) ) ) && substr( $val, 0, 1 ) != "." ) { $freespace = switch_bytes( disk_free_space( $fdpath ) ); @@ -692,5 +736,7 @@ // creating torrents node $tnode = $root->appendChild( $xml->createElement( "torrents" ) ); - addrefresh( $xml, $tnode, $message ); + if ( $config["allow"]["refresh"] ) { + addrefresh( $xml, $tnode, $refresh ); + } // retrieving server info @@ -756,16 +802,25 @@ } } + + $dstruct = array(); for ( $i = 0; $i < $torrent["d_size_files"]; $i++ ) { prepare_f_responses( $responses[$i], $message, $home_path, $si_response["get_cwd"] ); - if ( $dodirtree === true ) { - $fnode = build_xmltree( $responses[$i]["f_path_components"], $node, $xml ); - } else { - $fnode = $node->appendChild( $xml->createElement( "file" ) ); - $fnode->setAttribute( "filename", $responses[$i]["f_path"] ); + $n = 0; + $tmp = &$dstruct; + foreach ( $responses[$i]["f_path_components"] as $key => $val ) { + if ( count( $responses[$i]["f_path_components"] ) == ++$n ) { + $tmp[$i] = $val; + } else { + if ( !isset( $tmp[$val] ) ) { + $tmp[$val] = array(); + } + $tmp = &$tmp[$val]; + } } - $fnode->setAttribute( "id", $i ); - xmlrpc_multiappend( $xml, $fnode, $responses[$i] ); + } + $fnode = build_xmltree( $dstruct, $node, $xml, $torrent["d_directory_value"], $responses ); + $ftt = getmicrotime(); @@ -819,5 +874,5 @@ $si_responses["bytes_up"] = $bytes_up; - prepare_si_responses( $si_responses, $message, $home_path ); + prepare_si_responses( $si_responses, $message, $home_path, $config ); $node = $tnode->appendChild( $xml->createElement( "bytes_down", $si_responses["bytes_down"] ) ); @@ -843,5 +898,13 @@ } case "getfile" : { // download a file - if ( $id >= 0 ) { + if ( !$config["allow"]["download"] ) { + $_SESSION["rtwi_err"] = "downloadnotallowed"; + header( "location: {$url["index"]}" ); + exit; + } elseif ( $id < 0 ) { + $_SESSION["rtwi_err"] = "noidfound"; + header( "location: {$url["index"]}" ); + exit; + } else { // retrieving server info $methodlist = $xmlrpc_methods["si"]; @@ -889,15 +952,15 @@ $layout_file = "layout.main.index.xsl"; } - } else { - $_SESSION["rtwi_err"] = "noidfound"; - $layout_file = "layout.main.index.xsl"; } break; } - case "serverinfo" : { // server info + default : { // torrents // creating torrents node $tnode = $root->appendChild( $xml->createElement( "torrents" ) ); - addrefresh( $xml, $tnode, $message ); + addview( $xml, $tnode, $message ); + if ( $config["allow"]["refresh"] ) { + addrefresh( $xml, $tnode, $refresh ); + } // retrieving server info @@ -905,19 +968,23 @@ $si_responses = xmlrpc_multicall( $xmlrpc_array, $methodlist, $multicallnum, $callnum, $calltime ); - $methodlist = array( "d.get_down_rate=", "d.get_up_rate=" ); + $methodlist = $xmlrpc_methods["d"]; $request = xmlrpc_encode_request( "d.multicall", array_merge( array( $_SESSION["rtwi_view"] ), $methodlist ) ); $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); $response = preg_replace( "/i8|ex\.i8/", "string", $response ); $response = xmlrpc_decode( $response ); - +//print_r( $response ); exit; $bytes_down = 0; $bytes_up = 0; for ( $i = 0; $i < count( $response ); $i++ ) { for ( $r = 0; $r < count( $methodlist ); $r++ ) { - $methodval = preg_replace( "/(.)\.get_(.*)=/", "$1_$2", $methodlist[$r] ); + $methodval = preg_replace( "/(.)\.(get|is)_(.*)=/", "$1_$3", $methodlist[$r] ); $d_responses[$i][$methodval] = $response[$i][$r]; } $bytes_down += $d_responses[$i]["d_down_rate"]; $bytes_up += $d_responses[$i]["d_up_rate"]; + + prepare_d_responses( $d_responses[$i], $message, $home_path, $si_responses["get_cwd"] ); + $ttnode = $tnode->appendChild( $xml->createElement( "torrent" ) ); + xmlrpc_multiappend( $xml, $ttnode, $d_responses[$i] ); } @@ -925,5 +992,5 @@ $si_responses["bytes_up"] = $bytes_up; - prepare_si_responses( $si_responses, $message, $home_path ); + prepare_si_responses( $si_responses, $message, $home_path, $config ); $node = $tnode->appendChild( $xml->createElement( "bytes_down", $si_responses["bytes_down"] ) ); @@ -940,60 +1007,4 @@ $node->setAttribute( "value", $si_responses["upload_rate_value"] ); - $inode = $tnode->appendChild( $xml->createElement( "server_info" ) ); - xmlrpc_multiappend( $xml, $inode, $si_responses ); - - $layout_file = "layout.main.index.xsl"; - - break; - } - default : { // torrents - // creating torrents node - $tnode = $root->appendChild( $xml->createElement( "torrents" ) ); - addview( $xml, $tnode, $message ); - addrefresh( $xml, $tnode, $message ); - - // retrieving server info - $methodlist = $xmlrpc_methods["si"]; - $si_responses = xmlrpc_multicall( $xmlrpc_array, $methodlist, $multicallnum, $callnum, $calltime ); - - $methodlist = $xmlrpc_methods["d"]; - $request = xmlrpc_encode_request( "d.multicall", array_merge( array( $_SESSION["rtwi_view"] ), $methodlist ) ); - $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); - $response = preg_replace( "/i8|ex\.i8/", "string", $response ); - $response = xmlrpc_decode( $response ); - - $bytes_down = 0; - $bytes_up = 0; - for ( $i = 0; $i < count( $response ); $i++ ) { - for ( $r = 0; $r < count( $methodlist ); $r++ ) { - $methodval = preg_replace( "/(.)\.(get|is)_(.*)=/", "$1_$3", $methodlist[$r] ); - $d_responses[$i][$methodval] = $response[$i][$r]; - } - $bytes_down += $d_responses[$i]["d_down_rate"]; - $bytes_up += $d_responses[$i]["d_up_rate"]; - - prepare_d_responses( $d_responses[$i], $message, $home_path, $si_responses["get_cwd"] ); - $ttnode = $tnode->appendChild( $xml->createElement( "torrent" ) ); - xmlrpc_multiappend( $xml, $ttnode, $d_responses[$i] ); - } - - $si_responses["bytes_down"] = $bytes_down; - $si_responses["bytes_up"] = $bytes_up; - - prepare_si_responses( $si_responses, $message, $home_path ); - - $node = $tnode->appendChild( $xml->createElement( "bytes_down", $si_responses["bytes_down"] ) ); - $node->setAttribute( "suffix", $si_responses["bytes_down_suffix"] ); - $node->setAttribute( "value", $si_responses["bytes_down_value"] ); - $node = $tnode->appendChild( $xml->createElement( "bytes_up", $si_responses["bytes_up"] ) ); - $node->setAttribute( "suffix", $si_responses["bytes_up_suffix"] ); - $node->setAttribute( "value", $si_responses["bytes_up_value"] ); - $node = $tnode->appendChild( $xml->createElement( "download_rate", $si_responses["download_rate"] ) ); - $node->setAttribute( "suffix", $si_responses["download_rate_suffix"] ); - $node->setAttribute( "value", $si_responses["download_rate_value"] ); - $node = $tnode->appendChild( $xml->createElement( "upload_rate", $si_responses["upload_rate"] ) ); - $node->setAttribute( "suffix", $si_responses["upload_rate_suffix"] ); - $node->setAttribute( "value", $si_responses["upload_rate_value"] ); - $layout_file = "layout.main.index.xsl"; @@ -1020,5 +1031,5 @@ if ( $mod != "getfile" ) { - require_once( "{$include_path}/classes/xsl_handler.inc.php" ); + require_once( "includes/classes/xsl_handler.inc.php" ); $page = new page_handler( $site_theme, $layout_file, $xml ); $page->parse(); @@ -1026,5 +1037,5 @@ $len = strlen( $text ); - @header( "content-length: {$len}" ); +// @header( "content-length: {$len}" ); @header( "content-type: text/html; charset=utf-8" ); @header( "content-language: hu" ); @@ -1049,5 +1060,4 @@ $tt = getmicrotime(); -/* printf( "
\r\nXMLRPC calls: %d (%d multicall)", $callnum, $multicallnum ); printf( "
\r\nXMLRPC time: %0.6f sec", $calltime ); @@ -1056,5 +1066,4 @@ } printf( "
\r\nTotal time: %0.6f sec", $tt - $st ); -*/ ?> Index: input.php =================================================================== --- input.php (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ input.php (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -39,6 +39,6 @@ require_once( "includes/config.inc.php" ); -require_once( "{$include_path}/tools/functions.time.inc.php" ); -require_once( "{$include_path}/classes/bittorrent_handler.inc.php" ); +require_once( "includes/tools/functions.time.inc.php" ); +require_once( "includes/classes/bittorrent_handler.inc.php" ); $st = getmicrotime(); @@ -84,7 +84,4 @@ $xmlrpc_array["port"] = $users[$_SESSION["rtwi_nick"]]["port"]; - $request = xmlrpc_encode_request( "system.set_umask", array( $torrents_umask ) ); - $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); - $_SESSION["rtwi_err"] = "succlogin"; header( "location: {$url["index"]}" ); @@ -168,4 +165,9 @@ } case "changerefresh" : { // change view + if ( !$config["allow"]["refresh"] ) { + $_SESSION["rtwi_err"] = "refreshnotallowed"; + header( "location: {$url["index"]}" ); + exit; + } if ( isset( $_REQUEST["refreshrate"] ) && $_REQUEST["refreshrate"] != "" ) { $refreshrate = $_REQUEST["refreshrate"]; @@ -191,4 +193,9 @@ } case "changethrottle" : { // change view + if ( !$config["allow"]["throttle"] ) { + $_SESSION["rtwi_err"] = "throttlenotallowed"; + header( "location: {$url["index"]}" ); + exit; + } if ( isset( $_REQUEST["upspeed"] ) && $_REQUEST["upspeed"] != "" && isset( $_REQUEST["downspeed"] ) && $_REQUEST["downspeed"] != "" ) { $upspeed = $_REQUEST["upspeed"]; @@ -208,8 +215,9 @@ $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); + $_SESSION["rtwi_err"] = "succthrottlechange"; header( "location: {$_SESSION["rtwi_lastpage"]}" ); exit; } else { - $_SESSION["rtwi_err"] = "badrefreshrate"; + $_SESSION["rtwi_err"] = "badthrottlevals"; header( "location: {$_SESSION["rtwi_lastpage"]}" ); exit; @@ -235,5 +243,5 @@ $directory = substr( $directory, 0, -1 ); } - if ( in_array( "..", split( "/", $directory ) ) || in_array( ".", split( "/", $directory ) ) ) { + if ( in_array( "..", split( "/", $directory ) ) ) { $_SESSION["rtwi_err"] = "badrtdirectory"; header( "location: {$url["index"]}?mod=addtorrent" ); @@ -268,34 +276,10 @@ case 0 : { if ( is_uploaded_file( $_FILES["torrentfile"]["tmp_name"] ) ) { - if ( isset( $_REQUEST["keeptorrentfile"] ) && $_REQUEST["keeptorrentfile"] == "on" ) { - $prefix = time() . mt_rand(); - $uploadpath = "{$directory}/!rtwi_files/{$prefix}_{$_FILES["torrentfile"]["name"]}"; - - if ( !is_dir( "{$directory}/!rtwi_files" ) && !@mkdir( "{$directory}/!rtwi_files", 0777 ) ) { - $_SESSION["rtwi_err"] = "notrtfdircreated"; - header( "location: {$url["index"]}?mod=addtorrent" ); - exit; - } - - if ( @copy( $_FILES["torrentfile"]["tmp_name"], $uploadpath ) ) { - chmod( $uploadpath, 0666 ); - $torrent = $uploadpath; - } else { - if ( !is_dir( $directory ) ) { - $_SESSION["rtwi_err"] = "notrtfdircreated"; - header( "location: {$url["index"]}?mod=addtorrent" ); - exit; - } else { - $_SESSION["rtwi_err"] = "notrtfdirwriteright"; - header( "location: {$url["index"]}?mod=addtorrent" ); - exit; - } - } - } else { - $torrent = file_get_contents( $_FILES["torrentfile"]["tmp_name"] ); - xmlrpc_set_type( &$torrent, "base64" ); - } + $torrent = file_get_contents( $_FILES["torrentfile"]["tmp_name"] ); + xmlrpc_set_type( &$torrent, "base64" ); } else { - print "Possible file upload attack!\n"; + $_SESSION["rtwi_err"] = "rtfileattack"; + header( "location: {$url["index"]}?mod=addtorrent" ); + exit; } @@ -361,5 +345,5 @@ $dlpath = substr( $dlpath, 0, -1 ); } - if ( in_array( "..", split( "/", $dlpath ) ) || in_array( ".", split( "/", $dlpath ) ) ) { + if ( in_array( "..", split( "/", $dlpath ) ) ) { $_SESSION["rtwi_err"] = "badatpath"; header( "location: {$url["index"]}?mod=addtorrent" ); @@ -529,4 +513,9 @@ } case "torrenterase" : { // erase a torrent and delete the data + if ( !$config["allow"]["erase"] ) { + $_SESSION["rtwi_err"] = "erasenotallowed"; + header( "location: {$url["index"]}" ); + exit; + } $request = xmlrpc_encode_request( "download_list", array() ); $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); @@ -562,7 +551,8 @@ $directory = substr( $directory, 0, -1 ); } - if ( in_array( "..", split( "/", $directory ) ) || in_array( ".", split( "/", $directory ) ) ) { +// print_r( split( "/", $directory ) ); + if ( in_array( "..", split( "/", $directory ) ) ) { $_SESSION["rtwi_err"] = "badrtdirectory"; - header( "location: {$url["index"]}?mod=addtorrent" ); + header( "location: {$url["index"]}" ); exit; } elseif ( substr( $directory, 0, 2 ) == "./" ) { @@ -578,7 +568,7 @@ $dd = substr( $dd, 0, -1 ); } - if ( in_array( "..", split( "/", $dd ) ) || in_array( ".", split( "/", $dd ) ) ) { + if ( in_array( "..", split( "/", $dd ) ) ) { $_SESSION["rtwi_err"] = "badrtdirectory"; - header( "location: {$url["index"]}?mod=addtorrent" ); + header( "location: {$url["index"]}" ); exit; } elseif ( substr( $dd, 0, 2 ) == "./" ) { @@ -811,5 +801,5 @@ if ( isset( $_REQUEST["filepriority"] ) ) { $filepriority = $_REQUEST["filepriority"]; - settype( $fpriority, "int" ); + settype( $filepriority, "int" ); } else { $_SESSION["rtwi_err"] = "nopriorityfound"; @@ -833,4 +823,89 @@ $_SESSION["rtwi_err"] = "succfileprioritychange"; + header( "location: {$tourl}" ); + exit; + + break; + } + case "changedirpriority" : { // set file priority + $request = xmlrpc_encode_request( "download_list", array() ); + $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); + $response = preg_replace( "/i8|ex\.i8/", "string", $response ); + $torrents = xmlrpc_decode( $response ); + + if ( isset( $_REQUEST["ajax"] ) && $_REQUEST["ajax"] == "true" ) { + $tourl = "{$url["index"]}?mod=torrent&hash={$hash}&page=files&ajax=true"; + } else { + $tourl = "{$url["index"]}?mod=torrent&hash={$hash}&page=files"; + } + + if ( !in_array( $hash, $torrents ) ) { + $_SESSION["rtwi_err"] = "nohashfound"; + header( "location: {$tourl}" ); + exit; + } + + if ( isset( $_REQUEST["dirpriority"] ) ) { + $dirpriority = $_REQUEST["dirpriority"]; + settype( $dirpriority, "int" ); + } else { + $_SESSION["rtwi_err"] = "nopriorityfound"; + header( "location: {$tourl}" ); + exit; + } + + if ( !in_array( $dirpriority, array( 0, 1, 2 ) ) ) { + $_SESSION["rtwi_err"] = "badpriorityfound"; + header( "location: {$tourl}" ); + exit; + } + + if ( isset( $_REQUEST["dir"] ) ) { + $dir = $_REQUEST["dir"]; + } else { + $_SESSION["rtwi_err"] = "nodirfound"; + header( "location: {$tourl}" ); + exit; + } + + if ( substr( $dir, -1 ) != "/" ) { + $dir = "{$dir}/"; + } + $len = strlen( $dir ); + + $request = xmlrpc_encode_request( "f.multicall", array( $hash, 0, "f.get_frozen_path=" ) ); + $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); + $response = preg_replace( "/i8|ex\.i8/", "string", $response ); + $files = xmlrpc_decode( $response ); + + $badpath = true; + $request = array(); + foreach ( $files as $key => $val ) { + if ( strpos( $val[0], $dir ) === 0 ) { + $request[] = array( "methodName" => "f.set_priority", "params" => array( $hash, $key, $dirpriority ) ); + $filestochange[] = array( $key, $val[0] ); + if ( $badpath == true ) { + $badpath = false; + } + } + } + + if ( $badpath === true ) { + $_SESSION["rtwi_err"] = "baddirfound"; + header( "location: {$tourl}" ); + exit; + } + + + $request = xmlrpc_encode_request( "system.multicall", array( $request ) ); + $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); + + $request = xmlrpc_encode_request( "d.update_priorities ", array( $hash ) ); + $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); + + + sleep( 1 ); + + $_SESSION["rtwi_err"] = "succdirprioritychange"; header( "location: {$tourl}" ); exit; @@ -902,7 +977,36 @@ break; } + case "changedhtstatus" : { // start/stop dht server + if ( !isset( $_REQUEST["dhtstatus"] ) || $_REQUEST["dhtstatus"] == "" ) { + $_SESSION["rtwi_err"] = "novaluefound"; + header( "location: {$url["index"]}?mod=serverinfo" ); + exit; + } + + $dhtstatus = $_REQUEST["dhtstatus"]; + settype( $dhtstatus, "int" ); + if ( $dhtstatus != 0 && $dhtstatus != 1 ) { + $_SESSION["rtwi_err"] = "badvaluefound"; + header( "location: {$url["index"]}?mod=serverinfo" ); + exit; + } + + $dhtstatus = $dhtstatus == 1 ? "on" : "off"; + + $request = xmlrpc_encode_request( "dht", array( $dhtstatus ) ); + $response = xmlrpc_call( $xmlrpc_array, $request, $callnum, $calltime ); + + $_SESSION["rtwi_err"] = $dhtstatus == 1 ? "succdhtstart" : "succdhtstop"; + + sleep( 1 ); + + header( "location: {$url["index"]}?mod=serverinfo" ); + exit; + + break; + } default : { $_SESSION["rtwi_err"] = "noinputmod"; - header( "location: {$url["index"]}" ); + header( "location: {$_SESSION["rtwi_lastpage"]}" ); exit; Index: themes/default_ajax/inc/afunc.js =================================================================== --- themes/default_ajax/inc/afunc.js (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ themes/default_ajax/inc/afunc.js (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -49,4 +49,54 @@ } +function loadcontent_dirpriority( iurl, hash, dir, dirpriority ) { + var xmlHttp; + try { + xmlHttp = new XMLHttpRequest(); + } + catch ( e ) { + try { + xmlHttp = new ActiveXObject( "Msxml2.XMLHTTP" ); + } + catch ( e ) { + try { + xmlHttp = new ActiveXObject( "Microsoft.XMLHTTP" ); + } catch ( e ) { + alert( "Your browser does not support AJAX!" ); + return false; + } + } + } + xmlHttp.onreadystatechange = function() { + switch ( xmlHttp.readyState ) { + case 0 : { + document.getElementById( 'torrent_' + hash + '_content' ).innerHTML = 0; + break; + } + case 1 : { + document.getElementById( 'torrent_' + hash + '_content' ).innerHTML = 'Requesting...'; + break; + } + case 2 : { + document.getElementById( 'torrent_' + hash + '_content' ).innerHTML = 2; + break; + } + case 3 : { + document.getElementById( 'torrent_' + hash + '_content' ).innerHTML = 'Processing...'; + break; + } + case 4 : { + document.getElementById( 'torrent_' + hash + '_content' ).innerHTML = xmlHttp.responseText; + break; + } + default : { + document.getElementById( 'torrent_' + hash + '_content' ).innerHTML = '.'; + break; + } + } + } + xmlHttp.open( 'GET', iurl + '?mod=changedirpriority&hash=' + hash + '&dir=' + dir + '&dirpriority=' + dirpriority + '&ajax=true', true ); + xmlHttp.send( null ); +} + function loadcontent_filepriority( iurl, hash, id, filepriority ) { var xmlHttp; Index: themes/default_ajax/inc/hfunc.js =================================================================== --- themes/default_ajax/inc/hfunc.js (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ themes/default_ajax/inc/hfunc.js (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -1,13 +1,16 @@ function toggle( modpage ) { switch ( modpage ) { + case '_info' : case 'torrent_info' : case 'torrent_trackers' : - case '_info' : { - document.getElementById( 'throttleupinput' ).style.display = 'none'; - document.getElementById( 'throttledowninput' ).style.display = 'none'; - document.getElementById( 'tsubmit' ).style.display = 'none'; + case 'serverinfo_info' : { + if ( document.getElementById( 'changethrottleform' ) != null ) { + document.getElementById( 'throttleupinput' ).style.display = 'none'; + document.getElementById( 'throttledowninput' ).style.display = 'none'; + document.getElementById( 'tsubmit' ).style.display = 'none'; - document.getElementById( 'throttleup' ).style.display = ''; - document.getElementById( 'throttledown' ).style.display = ''; + document.getElementById( 'throttleup' ).style.display = ''; + document.getElementById( 'throttledown' ).style.display = ''; + } break; @@ -31,6 +34,9 @@ var uls = document.getElementsByTagName( 'ul' ); for ( i = 0; i < uls.length; i++ ) { - if ( uls.item( i ).getAttribute( 'class' ) == 'directory' ) { - uls.item( i ).style.display='none'; + var atts = uls.item( i ).attributes; + for ( j = 0; j < atts.length; j++ ) { + if ( atts[j].nodeName == 'class' && atts[j].nodeValue == 'directory' ) { + uls.item( i ).style.display='none'; + } } } Index: themes/default_ajax/inc/style.css =================================================================== --- themes/default_ajax/inc/style.css (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ themes/default_ajax/inc/style.css (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -75,5 +75,5 @@ } -#balh { +#leftcol { float: left; width: 13%; @@ -81,5 +81,5 @@ } -#kozeph { +#maincol { float: left; width: 84%; @@ -88,5 +88,5 @@ } -#fomenu { +#mainmenu { margin: 0 0 1em 0; padding: 0; @@ -94,5 +94,5 @@ } -#fomenu li.first { +#mainmenu li.first { margin: 0; padding: 0; @@ -100,9 +100,9 @@ } -#fomenu li { +#mainmenu li { border-top: 1px solid #aaaaaa; } -#fomenu a { +#mainmenu a { display: block; padding: .2em 0 .2em 0; @@ -112,5 +112,5 @@ } -#fomenu a:hover { +#mainmenu a:hover { display: block; color: #000000; @@ -181,6 +181,6 @@ .tthrottle input[type="text"] { - width: 2em; - text-align: right; + width: 2em; + text-align: right; } @@ -222,5 +222,5 @@ .trates { float: left; - width: 13em; + width: 14em; margin: 0 .5em 0 0; background: #eeeeee; @@ -238,5 +238,5 @@ .tpercentage { float: left; - width: 3em; + width: 3.5em; margin: 0 .5em 0 0; background: #eeeeee; @@ -306,5 +306,5 @@ .tcontainer a.files { float: left; - width: 13em; + width: 14em; margin: 0 .5em 0 0; background: #eeeeee; @@ -365,4 +365,31 @@ } +.dopenlink { + float: left; +} + +.dpriority { + float: right; + margin: 0; + font-size: smaller; + text-align: right; + background: #eeeeee; +} + +.dpriority select { + font-size: smaller; +} + +.dpriority .submit { + font-size: smaller; +} + +.tcontent .dpriority { + float: right; + margin: 0; + text-align: right; + background: #eeeeee; +} + .fname { float: left; @@ -393,5 +420,5 @@ .fpriority { float: right; - width: 7.5em; + width: 8.5em; margin: 0 0 0 .5em; font-size: smaller; @@ -410,5 +437,5 @@ .tcontent .fpriority { float: right; - width: 6.5em; + width: 8em; margin: 0 0 0 .5em; text-align: right; @@ -455,4 +482,8 @@ } +.tcontainer .tenabled { + width: 13em; +} + .tenabled .submit { font-size: smaller; Index: themes/default_ajax/layout.ajax.index.xsl =================================================================== --- themes/default_ajax/layout.ajax.index.xsl (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ themes/default_ajax/layout.ajax.index.xsl (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -1,5 +1,5 @@  + lang="en">
- + @@ -32,7 +32,7 @@ -
  • -
    - Name: +
  • +
    +
    @@ -41,7 +41,7 @@
    • -
  • -
    - Info hash: +
  • +
    +
    @@ -52,5 +52,23 @@
  • - Directory: + +
    +
    + +
    +
    +
    • +
  • +
    + +
    +
    + +
    +
    +
    • +
  • +
    +
    @@ -61,5 +79,5 @@
  • - Tied to file: +
    @@ -69,5 +87,5 @@ - No + @@ -75,7 +93,7 @@
    • -
  • -
    - File stats: +
  • +
    +
    @@ -85,5 +103,6 @@ - files + + @@ -91,7 +110,16 @@
    • -
  • -
    - Chunks: +
  • +
    + +
    +
    + +
    +
    +
    • +
  • +
    +
    @@ -108,5 +136,5 @@
  • - Priority: +
    @@ -117,5 +145,5 @@
  • - State changed: +
    @@ -126,5 +154,5 @@
  • - Free diskspace: +
    @@ -137,5 +165,5 @@
  • - Connection type: +
    @@ -146,5 +174,14 @@
  • - Leechers: + +
    +
    + +
    +
    +
    • +
  • +
    +
    @@ -155,5 +192,5 @@
  • - Seeders: +
    @@ -164,5 +201,25 @@
  • - Upload: + +
    +
    + +
    +
    +
    • +
  • +
    + +
    +
    + + / + +
    +
    +
    • +
  • +
    +
    @@ -179,5 +236,5 @@
  • - Download: +
    @@ -194,5 +251,5 @@
  • - Skipped: +
    @@ -232,5 +289,21 @@
  • - +
    + +
    +
    +
    + + +
    +
    +
    _
    • - Rate: - + + : + @@ -368,5 +403,5 @@ / - + @@ -375,6 +410,6 @@
    - Uploaded: - + : + @@ -384,15 +419,35 @@ -
    - - [ - - %] - -
    + + +
    + + [ + + %] + +
    +
    + + [ + + %] + +
    +     + +
    + + [ + + %] + +
    +     +
    - + @@ -406,13 +461,13 @@ - T + T - I - - - + I + + + R: @@ -422,34 +477,34 @@
    - - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -457,14 +512,18 @@
    - Message: -
    -
    - + : +
    +
    + + + + +
    @@ -478,5 +537,5 @@
  • - Name: +
    @@ -487,5 +546,5 @@
  • - Info hash: +
    @@ -496,5 +555,5 @@
  • - Local ID: +
    @@ -505,5 +564,5 @@
  • - Local ID (html): +
    @@ -514,5 +573,5 @@
  • - Directory: +
    @@ -523,5 +582,5 @@
  • - Tied to file: +
    @@ -531,5 +590,5 @@ - No + @@ -539,5 +598,5 @@
  • - File stats: +
    @@ -547,5 +606,6 @@ - files + + @@ -555,5 +615,5 @@
  • - Private: +
    @@ -564,5 +624,5 @@
  • - Chunks: +
    @@ -579,5 +639,5 @@
  • - Priority: +
    @@ -588,5 +648,5 @@
  • - State changed: +
    @@ -597,5 +657,5 @@
  • - Free diskspace: +
    @@ -608,5 +668,5 @@
  • - Connection type: +
    @@ -617,5 +677,5 @@
  • - Trackers: +
    @@ -626,5 +686,5 @@
  • - Leechers: +
    @@ -635,5 +695,5 @@
  • - Seeders: +
    @@ -644,5 +704,25 @@
  • - Upload: + +
    +
    + +
    +
    +
    • +
  • +
    + +
    +
    + + / + +
    +
    +
    • +
  • +
    +
    @@ -659,5 +739,5 @@
  • - Download: +
    @@ -674,5 +754,5 @@
  • - Skipped: +
    @@ -708,5 +788,5 @@
  • - Client version: +
    @@ -717,5 +797,5 @@
  • - Library version: +
    @@ -726,5 +806,5 @@
  • - Working directory: +
    @@ -735,5 +815,5 @@
  • - Download directory: +
    @@ -744,5 +824,5 @@
  • - Session directory: +
    @@ -753,5 +833,5 @@
  • - Hostname: +
    @@ -762,5 +842,5 @@
  • - Listening IP address: +
    @@ -771,5 +851,5 @@
  • - IP address reported to the tracker: +
    @@ -780,5 +860,5 @@
  • - Port opened: +
    @@ -789,5 +869,5 @@
  • - Random port: +
    @@ -798,5 +878,5 @@
  • - Port range: +
    @@ -805,7 +885,139 @@
    • -
  • -
    - Maximum number of uploads: + + + + +
  • +
    + +
    +
    +
    + + +
    +
    +
    +
    • + + +
  • +
    + +
    +
    +
    + + +
    +
    +
    +
    • +
  • +
    + +
    +
    + +
    +
    +
    • +
  • +
    + +
    +
    + +
    +
    +
    • +
  • +
    + +
    +
    + + / + +
    +
    +
    • +
  • +
    + +
    +
    + +
    +
    +
    • +
  • +
    + +
    +
    + + + + / + + + +
    +
    +
    • +
  • +
    + +
    +
    + + + + + + + +
    +
    +
    • +
  • +
    + +
    +
    + + / + +
    +
    +
    • +
  • +
    + +
    +
    + +
    +
    +
    • +     + + + +
  • +
    +
    @@ -816,5 +1028,5 @@
  • - Minimum number of peers: +
    @@ -825,5 +1037,5 @@
  • - Maximum number of peers: +
    @@ -834,5 +1046,5 @@
  • - Memory usage: +
    @@ -845,5 +1057,5 @@
  • - Max memory usage: +
    @@ -856,5 +1068,5 @@
  • - Check hash: +
    @@ -865,5 +1077,5 @@
  • - Safe sync: +
    @@ -874,5 +1086,5 @@
  • - Send buffer: +
    @@ -885,5 +1097,5 @@
  • - Receive buffer: +
    @@ -903,9 +1115,35 @@
  • - -
      - - -
    +
    + +
    +
    +
    + + +
    +
    +
    + + +
      + + +
    +     + +
      + + +
    +     +
    • @@ -914,10 +1152,10 @@
  • - +
    - + [ @@ -927,30 +1165,30 @@
    - - - - + + + - - - + + + - - - + + +
    - + @@ -959,5 +1197,5 @@
    - + @@ -973,7 +1211,7 @@
    - +
    - Download +
    @@ -1004,5 +1242,5 @@
  • - + : @@ -1010,5 +1248,5 @@
    - + @@ -1020,8 +1258,12 @@ - Focus: Yes + + : + - Focus: No + + : + @@ -1029,35 +1271,38 @@
    - Enabled: - - - + + - - + +
    - Open: + + : - Yes + - No +
    - S/L: + + : / @@ -1068,6 +1313,7 @@
  • - - Last time scraped: + + + : Index: themes/default_ajax/layout.main.login.xsl =================================================================== --- themes/default_ajax/layout.main.login.xsl (revision fbc3369abde946a919e6c00b3dd10c2e5cb7d35b) +++ themes/default_ajax/layout.main.login.xsl (revision 49fafb4c4b73ded67f75984b08c402355a202a61) @@ -1,5 +1,5 @@  + lang="en"> - + - + - - - + + + - <xsl:value-of select="/root/title" /> + <xsl:value-of select="labels/title" /> @@ -31,20 +31,20 @@
    -
    +
    • -
      Username:
      +
      :
      - +
    • -
      Password:
      +
      :
      - +
    • - +
    @@ -57,5 +57,5 @@
    - +