From 888f50e0bddca46b6d0e710abf59cac9a2224b16 Mon Sep 17 00:00:00 2001
From: SPC <github@spcsky.com>
Date: Thu, 2 Jan 2025 11:20:49 +0800
Subject: [PATCH 1/2] fix: viewrequests.php: Totalreq style fix

Signed-off-by: SPC <github@spcsky.com>
---
 public/viewrequests.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/viewrequests.php b/public/viewrequests.php
index e08a134f..705b7550 100644
--- a/public/viewrequests.php
+++ b/public/viewrequests.php
@@ -81,13 +81,15 @@ else {
                     print("<tr><td class=colhead align=left>{$lang_viewrequests['thead_name']}</td><td class=colhead align=center>{$lang_viewrequests['thead_price_newest']}</td><td class=colhead align=center>{$lang_viewrequests['thead_price_original']}</td><td class=colhead  align=center>{$lang_viewrequests['thead_comment_count']}</td><td class=colhead  align=center>{$lang_viewrequests['thead_on_request_count']}</td><td class=colhead align=center>{$lang_viewrequests['thead_request_user']}</td><td class=colhead align=center>{$lang_viewrequests['thead_created_at']}</td><td class=colhead align=center>{$lang_viewrequests['thead_status']}</td></tr>\n");
                     while ($row = mysql_fetch_array($rows)) {
                         print("<tr>
-	<td align=left class='rowfollow'><a href='viewrequests.php?action=view&id=" . $row["id"] . "'><b>" . $row["request"] . "</b></a></td>
-	<td align=center class='rowfollow nowrap'><font color=#ff0000><b>" . $row['amount'] . "</b></font></td>
-	<td align=center class='rowfollow nowrap'>" . $row['ori_amount'] . "</td>
-	<td align=center class='rowfollow nowrap'>" . ($row['comments']) . "</td><td align=center>" . ($row['Totalreq']) . "</td>
-	<td align=center class='rowfollow nowrap'>" . get_username($row['userid']) . "</td>
-	<td align=center class='rowfollow nowrap'>" . gettime($row['added'], true, false) . "</td>
-	<td align=center class='rowfollow nowrap'>" . ($row['finish'] == "yes" ? $lang_viewrequests['request_status_resolved'] : ($row['userid'] == $CURUSER['id'] ? $lang_viewrequests['request_status_resolving'] : "<a href='viewrequests.php?action=res&id=" . $row["id"] . "'>{$lang_viewrequests['request_status_resolving']}</a>")) . "</td></tr>\n");
+                                <td align=left class='rowfollow'><a href='viewrequests.php?action=view&id=" . $row["id"] . "'><b>" . $row["request"] . "</b></a></td>
+                                <td align=center class='rowfollow nowrap'><font color=#ff0000><b>" . $row['amount'] . "</b></font></td>
+                                <td align=center class='rowfollow nowrap'>" . $row['ori_amount'] . "</td>
+                                <td align=center class='rowfollow nowrap'>" . ($row['comments']) . "</td>
+                                <td align=center class='rowfollow nowrap'>" . ($row['Totalreq']) . "</td>
+                                <td align=center class='rowfollow nowrap'>" . get_username($row['userid']) . "</td>
+                                <td align=center class='rowfollow nowrap'>" . gettime($row['added'], true, false) . "</td>
+                                <td align=center class='rowfollow nowrap'>" . ($row['finish'] == "yes" ? $lang_viewrequests['request_status_resolved'] : ($row['userid'] == $CURUSER['id'] ? $lang_viewrequests['request_status_resolving'] : "<a href='viewrequests.php?action=res&id=" . $row["id"] . "'>{$lang_viewrequests['request_status_resolving']}</a>")) . "</td>
+                            </tr>\n");
                     }
                 }
                 print("</table>\n");

From 22277c375029f38ac0f479b40a7635f4859f50e4 Mon Sep 17 00:00:00 2001
From: tdh <821028463@qq.com>
Date: Thu, 2 Jan 2025 12:06:08 +0800
Subject: [PATCH 2/2] Already have peers6 parameters, which should NOT disable
 compact announce with IPv6. Thanks to Properformer for reporting this issue.

---
 public/announce.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/announce.php b/public/announce.php
index 12d99a42..d3cac181 100644
--- a/public/announce.php
+++ b/public/announce.php
@@ -115,8 +115,6 @@ $ip = getip();	// avoid to get the spoof ip from some agent
 $_GET['ip'] = $ip;
 if (!$port || $port > 0xffff)
 	warn("invalid port");
-if (!ip2long($ip)) //Disable compact announce with IPv6
-	$compact = 0;
 
 $ipv4 = $ipv6 = '';
 if (isIPV4($ip)) {