Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed speed graph width & other changes #2449

Merged
merged 6 commits into from
Feb 6, 2023
Merged

Fixed speed graph width & other changes #2449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fc3168
update Polish translation
koblack Feb 4, 2023
8ae7179
create plugin: update Polish translation
koblack Feb 4, 2023
c27ef65
adjust columns width
koblack Feb 4, 2023
3fbf950
update default user agent
koblack Feb 4, 2023
9890ec8
extsearch plugin: remove AwesomeHD
koblack Feb 4, 2023
a7dd6e7
loginmgr plugin: remove EliteTracker
koblack Feb 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions conf/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
// configuration parameters

// for snoopy client
$httpUserAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36';
$httpTimeOut = 30; // in seconds
$httpUserAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36';
$httpTimeOut = 30; // in seconds
$httpUseGzip = true;
$httpIP = null; // IP string. Or null for any.
$httpProxy = array
(
'use' => false,
'use' => false,
'proto' => 'http', // 'http' or 'https'
'host' => 'PROXY_HOST_HERE',
'port' => 3128
);

// for xmlrpc actions
$rpcTimeOut = 5; // in seconds
$rpcTimeOut = 5; // in seconds
$rpcLogCalls = false;
$rpcLogFaults = true;

Expand All @@ -27,41 +27,41 @@

$do_diagnostic = true; // Diagnose ruTorrent. Recommended to keep enabled, unless otherwise required.
$al_diagnostic = true; // Diagnose auto-loader. Set to "false" to make composer plugins work.

$log_file = '/tmp/errors.log'; // path to log file (comment or leave blank to disable logging)

$saveUploadedTorrents = true; // Save uploaded torrents to profile/torrents directory or not
$overwriteUploadedTorrents = false; // Overwrite existing uploaded torrents in profile/torrents directory or make unique name
$overwriteUploadedTorrents = false; // Overwrite existing uploaded torrents in profile/torrents directory or make unique name

$topDirectory = '/'; // Upper available directory. Absolute path with trail slash.
$forbidUserSettings = false;

$scgi_port = 5000;
$scgi_host = "127.0.0.1";

// For web->rtorrent link through unix domain socket
// (scgi_local in rtorrent conf file), change variables
// For web->rtorrent link through unix domain socket
// (scgi_local in rtorrent conf file), change variables
// above to something like this:
//
// $scgi_port = 0;
// $scgi_host = "unix:///tmp/rpc.socket";

$XMLRPCMountPoint = "/RPC2"; // DO NOT DELETE THIS LINE!!! DO NOT COMMENT THIS LINE!!!

$throttleMaxSpeed = 327625*1024; // DO NOT EDIT THIS LINE!!! DO NOT COMMENT THIS LINE!!!
// Can't be greater then 327625*1024 due to limitation in libtorrent ResourceManager::set_max_upload_unchoked function.

$pathToExternals = array(
"php" => '', // Something like /usr/bin/php. If empty, will be found in PATH.
"php" => '', // Something like /usr/bin/php. If empty, will be found in PATH.
"curl" => '', // Something like /usr/bin/curl. If empty, will be found in PATH.
"gzip" => '', // Something like /usr/bin/gzip. If empty, will be found in PATH.
"id" => '', // Something like /usr/bin/id. If empty, will be found in PATH.
"stat" => '', // Something like /usr/bin/stat. If empty, will be found in PATH.
);

$localHostedMode = false; // Set to true if rTorrent is hosted on the SAME machine as ruTorrent

$localhosts = array( // list of local interfaces
$localHostedMode = false; // Set to true if rTorrent is hosted on the SAME machine as ruTorrent

$localhosts = array( // list of local interfaces
"127.0.0.1",
"localhost",
);
Expand Down
14 changes: 7 additions & 7 deletions js/webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ var theWebUI =
[
{ text: theUILang.Name, width: "200px", id: "name", type: TYPE_STRING },
{ text: theUILang.Status, width: "100px", id: "status", type: TYPE_STRING },
{ text: theUILang.Size, width: "60px", id: "size", type: TYPE_NUMBER },
{ text: theUILang.Size, width: "70px", id: "size", type: TYPE_NUMBER },
{ text: theUILang.Done, width: "100px", id: "done", type: TYPE_PROGRESS },
{ text: theUILang.Downloaded, width: "100px", id: "downloaded", type: TYPE_NUMBER },
{ text: theUILang.Uploaded, width: "100px", id: "uploaded", type: TYPE_NUMBER },
{ text: theUILang.Ratio, width: "60px", id: "ratio", type: TYPE_NUMBER },
{ text: theUILang.DL, width: "60px", id: "dl", type: TYPE_NUMBER },
{ text: theUILang.UL, width: "60px", id: "ul", type: TYPE_NUMBER },
{ text: theUILang.DL, width: "70px", id: "dl", type: TYPE_NUMBER },
{ text: theUILang.UL, width: "70px", id: "ul", type: TYPE_NUMBER },
{ text: theUILang.ETA, width: "60px", id: "eta", type: TYPE_NUMBER },
{ text: theUILang.Label, width: "60px", id: "label", type: TYPE_STRING },
{ text: theUILang.Peers, width: "60px", id: "peers", type: TYPE_PEERS },
Expand All @@ -43,7 +43,7 @@ var theWebUI =
columns:
[
{ text: theUILang.Name, width: "200px", id: "name", type: TYPE_STRING },
{ text: theUILang.Size, width: "60px", id: "size", type: TYPE_NUMBER, "align" : ALIGN_RIGHT},
{ text: theUILang.Size, width: "70px", id: "size", type: TYPE_NUMBER, "align" : ALIGN_RIGHT},
{ text: theUILang.Done, width: "100px", id: "done", type: TYPE_NUMBER },
{ text: "%", width: "100px", id: "percent", type: TYPE_PROGRESS },
{ text: theUILang.Priority, width: "80px", id: "priority", type: TYPE_NUMBER }
Expand Down Expand Up @@ -98,9 +98,9 @@ var theWebUI =
{ text: theUILang.Done, width: "100px", id: "done", type: TYPE_PROGRESS },
{ text: theUILang.Downloaded, width: "100px", id: "downloaded", type: TYPE_NUMBER },
{ text: theUILang.Uploaded, width: "100px", id: "uploaded", type: TYPE_NUMBER },
{ text: theUILang.DL, width: "60px", id: "dl", type: TYPE_NUMBER },
{ text: theUILang.UL, width: "60px", id: "ul", type: TYPE_NUMBER },
{ text: theUILang.PeerDL, width: "60px", id: "peerdl", type: TYPE_NUMBER },
{ text: theUILang.DL, width: "70px", id: "dl", type: TYPE_NUMBER },
{ text: theUILang.UL, width: "70px", id: "ul", type: TYPE_NUMBER },
{ text: theUILang.PeerDL, width: "70px", id: "peerdl", type: TYPE_NUMBER },
{ text: theUILang.PeerDownloaded, width: "100px", id: "peerdownloaded", type: TYPE_NUMBER }
],
container: "PeerList",
Expand Down
46 changes: 23 additions & 23 deletions lang/pl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ var theUILang =
Alt_list_bckgnd : "Alternatywny kolor tła listy",
Show_cat_start : "Pokaż kategorie na starcie",
Show_det_start : "Pokaż szczegóły na starcie",
KeepSearches : "Keep searches",
KeepSelectedTab : "Keep selected tab",
KeepSelectedLabels : "Keep selected labels",
KeepSearches : "Pamiętaj wyszukiwania",
KeepSelectedTab : "Pamiętaj wybraną zakładkę",
KeepSelectedLabels : "Pamiętaj wybraną etykietę",
Dnt_start_down_auto : "Nie pobieraj automatycznie",
Listening_Port : "Port nasłuchu",
Port_f_incom_conns : "Port połączeń przychodzących",
Expand Down Expand Up @@ -153,7 +153,7 @@ var theUILang =
Glob_max_memory : "Maksymalne użycie pamięci",
Glob_max_files : "Maksymalna liczba otwartych plików",
Glob_max_http : "Maksymalna liczba otwartych połączeń http",
Open_label : "Otwarty",
Open_label : "Otwarte",
Other_sett : "Inne",
Directory_For_Dl : "Domyślny katalog pobierania",
Check_hash : "Sprawdzaj sumę kontrolą po pobraniu",
Expand Down Expand Up @@ -208,12 +208,12 @@ var theUILang =
plgShutdown : "Wyłącz",
limit : "Limit",
speedList : "Limit prędkości (oddzielaj przecinkiem)",
DecimalPlacesSizes : "Decimal Places of Sizes",
CatListSizeDecimalPlaces : "In category list",
TableSizeDecimalPlaces : "In tables",
DetailsSizeDecimalPlaces : "In general tab",
OtherSizeDecimalPlaces : "Other",
Default : "Default",
DecimalPlacesSizes : "Miejsca dziesiętne rozmiarów",
CatListSizeDecimalPlaces : "Menu kategorii",
TableSizeDecimalPlaces : "Lista torrentów",
DetailsSizeDecimalPlaces : "Zakładka Główne",
OtherSizeDecimalPlaces : "Pozostałe",
Default : "Domyślnie",
ClearButton : "Wyczyść",
dontShowTimeouts : "Nie powiadamiaj o braku odpowiedzi",
fullTableRender : "Pełne przetwarzanie dużych tabel",
Expand Down Expand Up @@ -253,15 +253,15 @@ var theUILang =
scrapeUpdate : "Zaktualizowany",
trkInterval : "Aktualizuj co",
logAutoSwitch : "Automatycznie przechodź do zakładki 'Dziennik'",
showStateLabelSize : "Show state size",
showStateLabelSize : "Pokaż rozmiar stanu",
showLabelSize : "Pokaż rozmiar etykiety",
showSearchLabelSize : "Show search size",
showCustomLabelTree : "Show label path tree",
labelSizeRightAlign : "Right align size in category list",
showEmptyPathLabel : "Show empty path labels",
showLabelTextOverflow : "Allow overflow of label text",
showOpenStatus : "Show open status in status bar",
requiresAtLeastRtorrent : "Requires rTorrent >= {version}", // ... v0.9.7
showSearchLabelSize : "Pokaż rozmiar wyszukiwania",
showCustomLabelTree : "Pokaż etykiety jak drzewo katalogów",
labelSizeRightAlign : "Wyrównaj rozmiar do prawej w menu kategorii",
showEmptyPathLabel : "Pokaż puste etykiety w drzewie katalogów",
showLabelTextOverflow : "Zezwalaj na przepełnienie tekstu etykiety",
showOpenStatus : "Pokaż otwarte połączenia na pasku stanu",
requiresAtLeastRtorrent : "Wymaga rTorrent >= {version}", // ... v0.9.7
phpParameterUnavailable : "Ustawienie PHP register_argc_argv jest wyłączone. Włącz je, inaczej niektóre wtyczki nie będą działać poprawnie.",
addTorrentFailedURL : "Torrent nie został dodany. Nie można pobrać adresu.",
addTorrentFailedFile : "Torrent nie został dodany. Pobrana zawartość nie jest poprawnym plikiem torrent.",
Expand All @@ -287,8 +287,8 @@ var theUILang =
Select_all : "Zaznacz wszystkie",
Deselect_all : "Odznacz wszystkie",
showSpeedInTitle : "Pokaż prędkość w tytule",
speedGraphDuration : "Duration of speed graph",
speedGraphDurationOptions : {600: "10 min", 1800: "30 min", 3600: "1 hr", 10800: "3 hrs"},
speedGraphDuration : "Czas trwania wykresu prędkości",
speedGraphDurationOptions : {600: "10 min", 1800: "30 min", 3600: "1 godz.", 10800: "3 godz."},
badTempPath : "Użytkownik serwera www nie ma uprawnień odczytu/zapisu/wykonywania w katalogu tymczasowym. ruTorrent nie będzie działać.",
badTempPath2 : "Użytkownik rTorrent nie ma uprawnień odczytu/zapisu/wykonywania w katalogu tymczasowym. ruTorrent nie będzie działać.",
doRandomizeHash : "Losuj info hash (cross-seeding)",
Expand All @@ -300,7 +300,7 @@ var theUILang =
registerMagnet : "Próbuj dodać obsługę linków magnet przy starcie",
linkTorTorrentRestored : "Nawiązano połączenie z rTorrent.",
removeAllTegs : "Usuń wszystkie znaczniki",
Torrents : "Torrent(s)",
copyToClipboardFailed : "The copy function isn't working in your browser.\nPlease copy this content manually:\n\n",
copyToClipboardSuccess : "Copied to clipboard successfully!"
Torrents : "Torrent(y)",
copyToClipboardFailed : "Funkcja kopiowania nie działa w Twojej przeglądarce.\nSkopiuj tę zawartość ręcznie:\n\n",
copyToClipboardSuccess : "Pomyślnie skopiowano do schowka!"
};
4 changes: 2 additions & 2 deletions plugins/create/lang/pl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
theUILang.torrentKilled = "Proces został zatrzymany.";
theUILang.recentTrackers = "Ostatnie trackery";
theUILang.source = "Źródło";
theUILang.HybridTorrent = "Hybrid torrent";
theUILang.deleteFromRecentTrackers = "> Delete";
theUILang.HybridTorrent = "Hybrydowy";
theUILang.deleteFromRecentTrackers = "> Usuń";

thePlugins.get("create").langLoaded();
91 changes: 0 additions & 91 deletions plugins/extsearch/engines/AwesomeHD.php
View file
Open in desktop

This file was deleted.

Binary file removed plugins/extsearch/images/AwesomeHD.png
View file
Open in desktop
Binary file not shown.
Binary file removed plugins/extsearch/images/EliteTracker.png
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion plugins/history/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ if(plugin.canChangeTabs() || plugin.canChangeColumns())
{ text: theUILang.Name, width: "200px", id: "name", type: TYPE_STRING },
{ text: theUILang.Status, width: "100px", id: "status", type: TYPE_STRING },
{ text: 'Time', width: "110px", id: "time", type: TYPE_NUMBER },
{ text: theUILang.Size, width: "60px", id: "size", type: TYPE_NUMBER },
{ text: theUILang.Size, width: "70px", id: "size", type: TYPE_NUMBER },
{ text: theUILang.Downloaded, width: "100px", id: "downloaded", type: TYPE_NUMBER },
{ text: theUILang.Uploaded, width: "100px", id: "uploaded", type: TYPE_NUMBER },
{ text: theUILang.Ratio, width: "60px", id: "ratio", type: TYPE_NUMBER },
Expand Down
28 changes: 0 additions & 28 deletions plugins/loginmgr/accounts/EliteTracker.php
View file
Open in desktop

This file was deleted.