Merge develop into master for v5.3.0 release

● ## v5.3.0 Release

  Merge develop into master for the first release since v5.2.10 (July 2025).

  ### New features
  - Name normalization (toggleable via settings)
  - Log history plugin (persists log tab across reloads)
  - Tracker Status column
  - OblivionBlue theme
  - Dual IPv4/IPv6 port checking
  - Option to hide trackers from panel
  - Icon alias system for tracker/label dedup
  - conf.local.php support for deployment-specific overrides
  - Right-align count/size in panels with separator

  ### Bug fixes
  - PHP 8.2+ deprecation fixes (cache.php, Torrent.php, rss.php, trafic)
  - GeoIP2/MaxMindDB rewrite (replaces deprecated GeoIP1 extension)
  - rtorrent 0.16.x compatibility (erasedata, convert.kb, deprecated command aliases)
  - httprpc trust model fix for rtorrent 0.16.8
  - Explorer truncated file listing fix
  - DnD event handler leak fix
  - Theme race condition fix
  - Dialog header CSS fix for flex layout
  - RSS guid-based duplicate detection
  - Diskspace tooltip improvement
  - Directory picker sort fix
  - Right-align peers/seeds columns
  - Lookat plugin precedence bug fix
  - Check port graceful IPv6 handling
  - hideTrackers plugin load order fix
  - Various pt-BR translation fixes

Author: xirvik

README.md

@@ -18,7 +18,7 @@ This project is released under the GPLv3 license, for more details, take a look
 
 ## Download
 
- * [Development version](https://github.com/Novik/ruTorrent/tarball/master)
+ * [Development version](https://github.com/Novik/ruTorrent/tarball/develop)
  * [Stable version](https://github.com/Novik/ruTorrent/releases)
 
 ## Getting started

conf/config.php

@@ -89,3 +89,8 @@
 	$enableCSRFCheck = false;		// If true then Origin and Referer will be checked
 	$enabledOrigins = array();		// List of enabled domains for CSRF check (only hostnames, without protocols, port etc.).
 						// If empty, then will retrieve domain from HTTP_HOST / HTTP_X_FORWARDED_HOST
+
+	// Load local deployment overrides if present
+	$configLocalPath = dirname(__FILE__)."/config.local.php";
+	if(is_file($configLocalPath) && is_readable($configLocalPath))
+		require($configLocalPath);

css/panel-label.css

@@ -46,13 +46,17 @@ div {
 
 [part="count"],
 [part="size"] {
-  color: var(--badge-color);
   background-color: var(--badge-background-color);
   padding: var(--badge-padding, 0.1em 0.3em 0.1em 0.3em);
   border-radius: var(--badge-border-radius, 0.8em);
   white-space: pre;
 }
 
+:not(:host([selected])) [part="count"],
+:not(:host([selected])) [part="size"] {
+  color: var(--badge-color);
+}
+
 [part="icon"] {
   min-width: var(--icon-size);
   min-height: var(--icon-size);

css/style.css

@@ -165,7 +165,7 @@ button:not(:disabled):active, input[type=button]:not(:disabled):active, a.Button
 a.dropdown-item {
   width: auto;
 }
-category-list.rightalign-labelsize panel-label::part(size) {
+category-list.rightalign-labelsize panel-label::part(count) {
   margin-left: auto;
 }
 category-list.hide-textoverflow panel-label::part(text) {

index.html

@@ -21,27 +21,27 @@
 		<meta name="msapplication-TileColor" content="#FFFFFF" />
 		<meta name="msapplication-TileImage" content="./images/mstile-144x144.png" />
 
-		<link href="./css/bootstrap.min.css?v=5210" rel="stylesheet" type="text/css" />
-		<link href="./css/style.css?v=5210" rel="stylesheet" type="text/css" />
-		<link href="./css/stable.css?v=5210" rel="stylesheet" type="text/css" />
-		<link rel="preload" as="style" href="./css/category-panel.css?v=5210" />
-		<link rel="preload" as="style" href="./css/panel-label.css?v=5210" />
-		<script type="text/javascript" src="./js/jquery.js?v=5210"></script>
-		<script type="text/javascript" src="./js/jquery.flot.js?v=5210"></script>
-		<script type="text/javascript" src="./js/sanitize.js?v=5210"></script>
-		<script type="text/javascript" src="./js/sanitize.config.js?v=5210"></script>
-		<script type="text/javascript" src="./js/custom-elements.js?v=5210"></script>
-		<script type="text/javascript" src="./lang/langs.js?v=5210"></script>
-		<link rel="preload" as="script" href="./js/browser.js?v=5210" />
-		<link rel="preload" as="script" href="./js/common.js?v=5210" />
-		<link rel="preload" as="script" href="./js/objects.js?v=5210" />
-		<link rel="preload" as="script" href="./js/options.js?v=5210" />
-		<link rel="preload" as="script" href="./js/content.js?v=5210" />
-		<link rel="preload" as="script" href="./js/stable.js?v=5210" />
-		<link rel="preload" as="script" href="./js/graph.js?v=5210" />
-		<link rel="preload" as="script" href="./js/plugins.js?v=5210" />
-		<link rel="preload" as="script" href="./js/rtorrent.js?v=5210" />
-		<link rel="preload" as="script" href="./js/webui.js?v=5210" />
+		<link href="./css/bootstrap.min.css?v=530" rel="stylesheet" type="text/css" />
+		<link href="./css/style.css?v=530" rel="stylesheet" type="text/css" />
+		<link href="./css/stable.css?v=530" rel="stylesheet" type="text/css" />
+		<link rel="preload" as="style" href="./css/category-panel.css?v=530" />
+		<link rel="preload" as="style" href="./css/panel-label.css?v=530" />
+		<script type="text/javascript" src="./js/jquery.js?v=530"></script>
+		<script type="text/javascript" src="./js/jquery.flot.js?v=530"></script>
+		<script type="text/javascript" src="./js/sanitize.js?v=530"></script>
+		<script type="text/javascript" src="./js/sanitize.config.js?v=530"></script>
+		<script type="text/javascript" src="./js/custom-elements.js?v=530"></script>
+		<script type="text/javascript" src="./lang/langs.js?v=530"></script>
+		<link rel="preload" as="script" href="./js/browser.js?v=530" />
+		<link rel="preload" as="script" href="./js/common.js?v=530" />
+		<link rel="preload" as="script" href="./js/objects.js?v=530" />
+		<link rel="preload" as="script" href="./js/options.js?v=530" />
+		<link rel="preload" as="script" href="./js/content.js?v=530" />
+		<link rel="preload" as="script" href="./js/stable.js?v=530" />
+		<link rel="preload" as="script" href="./js/graph.js?v=530" />
+		<link rel="preload" as="script" href="./js/plugins.js?v=530" />
+		<link rel="preload" as="script" href="./js/rtorrent.js?v=530" />
+		<link rel="preload" as="script" href="./js/webui.js?v=530" />
 
 		<script>
 			loadUILang(() => {
@@ -57,10 +57,10 @@
 			});
 		</script>
 
-		<script type="module" src="./js/backgroundtask.js?v=5210"></script>
-		<script type="module" src="./js/category-list.js?v=5210"></script>
-		<script type="module" src="./js/panel.js?v=5210"></script>
-		<script type="text/javascript" src="./js/category-list-elements.js?v=5210" defer></script>
+		<script type="module" src="./js/backgroundtask.js?v=530"></script>
+		<script type="module" src="./js/category-list.js?v=530"></script>
+		<script type="module" src="./js/panel.js?v=530"></script>
+		<script type="text/javascript" src="./js/category-list-elements.js?v=530" defer></script>
 	</head>
 	<body>
 		<div id="preload" class="d-none"></div>
@@ -139,15 +139,16 @@ <h4 class="offcanvas-title" id="offcanvas-sidepanel-label"></h4>
 				</div>
 				<div class="p-1 p-md-0 offcanvas-body">
 					<template id="panel-label-template">
-						<link href="./css/panel-label.css?v=5210" rel="stylesheet" type="text/css" />
+						<link href="./css/panel-label.css?v=530" rel="stylesheet" type="text/css" />
 						<div part="prefix" hidden></div>
 						<div part="icon"></div>
 						<div part="text"></div>
 						<div part="count">0</div>
+						<div part="separator">/</div>
 						<div part="size" style="display: none;"></div>
 					</template>
 					<template id="category-panel-template">
-						<link href="./css/category-panel.css?v=5210" rel="stylesheet" type="text/css" />
+						<link href="./css/category-panel.css?v=530" rel="stylesheet" type="text/css" />
 						<div part="heading">
 							<span class="text"></span><slot name="decorator" class="decorator"></slot>
 						</div>
@@ -303,6 +304,6 @@ <h4 class="offcanvas-title" id="offcanvas-sidepanel-label"></h4>
 		<div class="graph_tab_legend"></div>
 		<div id="dialog-container"></div>
 		<div id="dir-container"></div>
-		<script type="text/javascript" src="./js/bootstrap.bundle.min.js?v=5210"></script>
+		<script type="text/javascript" src="./js/bootstrap.bundle.min.js?v=530"></script>
 	</body>
 </html>

js/category-list-elements.js

@@ -30,7 +30,7 @@ customElements.define(
   "panel-label",
   class extends CustomHTMLElement {
     static template = document.getElementById("panel-label-template");
-    static stringAttributeNames = ["prefix", "icon", "text", "count", "size"];
+    static stringAttributeNames = ["prefix", "icon", "text", "count", "separator", "size"];
     static booleanAttributeNames = ["selected"];
     static attributeChangeCallbacks = {
       prefix: function (_, newValue) {
@@ -78,6 +78,7 @@ customElements.define(
       },
       size: function (_, newValue) {
         this._hideOrSetText(this.parts.size, newValue);
+        this._hideOrSetText(this.parts.separator, newValue, true);
       },
       count: function (_, newValue) {
         this._hideOrSetText(this.parts.count, newValue);
@@ -91,10 +92,12 @@ customElements.define(
       this.customDefineAttributes();
     }
 
-    _hideOrSetText(el, newValue) {
+    _hideOrSetText(el, newValue, skipText = null) {
       if (newValue != null) {
         el.style.display = "block";
-        el.textContent = newValue;
+        if (!skipText) {
+          el.textContent = newValue;
+        }
       } else {
         el.style.display = "none";
       }

js/common.js

@@ -462,6 +462,70 @@ var theConverter =
 	}
 };
 
+var theNormalizer = {
+	encloses: ['[]', '{}', '()'],
+	getLabel(s) {
+		let res;
+		if (s !== null) {
+			for (const enclose of this.encloses) {
+				const o = enclose.substr(0, 1);
+				const c = enclose.substr(1, 1);
+				const re = new RegExp(`^\\${o}(.*?)\\${c}`, 'i');
+				const matches = re.exec(s);
+				if (matches) {
+					res = [matches[1], s.substr(matches[0].length)];
+					break;
+				}
+			}
+		}
+		return res;
+	},
+	clean(s, sortable = true) {
+		if (s !== null && s.length) {
+			if (sortable) {
+				// replace dot, underscore, and dash with whitespace
+				// replace multiple whitespace with single whitespace
+				s = s
+					.replace(/(\.|_|\-)/g, ' ')
+					.replace(/\s{2,}/g, ' ');
+			} else {
+				s = s
+					.replace(/^(\.|_|\-)/g, ' ')
+					.replace(/(\.|_|\-)$/g, ' ');
+			}
+			s = s.trim();
+		}
+		return s;
+	},
+	normalize(s, sortable = true) {
+		if (s !== null) {
+			// get label
+			const label = this.getLabel(s);
+			if (label) {
+				s = label[1];
+			}
+			s = this.clean(s, sortable);
+			if (sortable) {
+				// ignore 'the' in the beginning text
+				if (s.length && s.toLowerCase().substr(0, 3) === 'the') {
+					s = s
+						.substr(3)
+						.trim();
+				}
+			}
+			// append label if necessary
+			if (s.length && label) {
+				s += ` \`${label[0]}\``;
+			}
+			// treat label as string
+			if (s.length === 0 && label) {
+				s = label[0];
+			}
+		}
+		return s;
+	}
+}
+
 var theFormatter =
 {
 	torrents: function(table,arr)
@@ -473,6 +537,11 @@ var theFormatter =
 			else
    			switch(iv(i))
 			{
+				case 0:
+					if (theWebUI.settings["webui.normalize_torrent_name"]) {
+						arr[i] = theNormalizer.normalize(arr[i], false);
+					}
+					break;
 				case 3:
 					arr[i] = (arr[i] / 10) + "%";
 					break;

js/content.js

@@ -851,6 +851,27 @@ function correctContent()
 			"load"			:	{ name: "load.normal", prm: 1 }
 		});
 	}
+	if(theWebUI.systemInfo.rTorrent.iVersion>=0x1002)
+	{
+		$.extend(theRequestManager.aliases,
+		{
+			"dht"                           : { name: "dht.mode.set", prm: 1 },
+			"throttle.max_uploads.div"      : { name: "throttle.max_uploads.div._val", prm: 1 },
+			"throttle.max_uploads.global"   : { name: "throttle.max_uploads.global._val", prm: 1 },
+			"throttle.max_downloads.div"    : { name: "throttle.max_downloads.div._val", prm: 1 },
+			"throttle.max_downloads.global" : { name: "throttle.max_downloads.global._val", prm: 1 },
+			"ratio.enable"                  : { name: "group.seeding.ratio.enable", prm: 1 },
+			"ratio.disable"                 : { name: "group.seeding.ratio.disable", prm: 1 },
+			"ratio.min"                     : { name: "group2.seeding.ratio.min", prm: 0 },
+			"ratio.max"                     : { name: "group2.seeding.ratio.max", prm: 0 },
+			"ratio.upload"                  : { name: "group2.seeding.ratio.upload", prm: 0 },
+			"ratio.min.set"                 : { name: "group2.seeding.ratio.min.set", prm: 1 },
+			"ratio.max.set"                 : { name: "group2.seeding.ratio.max.set", prm: 1 },
+			"ratio.upload.set"              : { name: "group2.seeding.ratio.upload.set", prm: 1 },
+			"connection_leech"              : { name: "protocol.connection.leech.set", prm: 1 },
+			"connection_seed"               : { name: "protocol.connection.seed.set", prm: 1 },
+		});
+	}
 	if(theWebUI.systemInfo.rTorrent.iVersion < 0x907) {
 		const title = theUILang.requiresAtLeastRtorrent.replace('{version}', 'v0.9.7');
 		$($$('webui.show_open_status')).attr({ disabled: '', title });

js/objects.js

@@ -81,7 +81,7 @@ class DnD {
 	finish(e) {
 		$("body").css({cursor:""});
 		const self = e.data;
-		self.options.onFinish(e);
+		try { self.options.onFinish(e); } catch(err) { console.error("DnD onFinish error:", err); }
 		$(document).off("mousemove", self.run);
 		$(document).off("mouseup", self.finish);
 		return false;

js/options.js

@@ -33,10 +33,12 @@ const theOptionsWindow = {
 						['webui.selected_labels.keep', theUILang.KeepSelectedLabels],
 						['webui.effects', theUILang.UIEffects],
 						['webui.speedintitle', theUILang.showSpeedInTitle],
+						['webui.normalize_torrent_name', theUILang.normalizeTorrentName],
 					].map(([id, label]) => $("<div>").addClass("col-md-6").append(
 						$("<input>").attr({type: "checkbox", id: id}),
 						$("<label>").attr({for: id}).text(label),
 					)),
+					$("<div>").addClass("col-md-6"),
 					...[
 						["webui.update_interval", theUILang.Update_GUI_every + ": ", theUILang.ms, 3000],
 						["webui.reqtimeout", theUILang.ReqTimeout + ": ", theUILang.ms, 5000],