From eccc182e33138d09789e923b64473c81b16c925f Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Sat, 7 May 2022 22:11:24 +0800
Subject: [PATCH] remove ad id & fix claim pager params

---
 include/functions.php | 8 ++++----
 public/claim.php      | 2 +-
 public/details.php    | 2 +-
 public/forums.php     | 4 ++--
 public/fun.php        | 2 +-
 public/shoutbox.php   | 6 +++---
 public/torrents.php   | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 73eb9c65..222d5207 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2500,7 +2500,7 @@ else
 <?php if ($Advertisement->enable_ad()){
 		$headerad=$Advertisement->get_ad('header');
 		if ($headerad){
-			echo "<span id=\"ad_header\">".$headerad[0]."</span>";
+			echo "<span>".$headerad[0]."</span>";
 		}
 }
 if ($enabledonation == 'yes'){?>
@@ -2640,7 +2640,7 @@ else {
 	if ($Advertisement->enable_ad()){
 			$belownavad=$Advertisement->get_ad('belownav');
 			if ($belownavad)
-			echo "<div align=\"center\" style=\"margin-bottom: 10px\" id=\"ad_belownav\">".$belownavad[0]."</div>";
+			echo "<div align=\"center\" style=\"margin-bottom: 10px\" id=\"\">".$belownavad[0]."</div>";
 	}
 if ($msgalert)
 {
@@ -2765,7 +2765,7 @@ function stdfoot() {
 	if ($Advertisement->enable_ad()){
 			$footerad=$Advertisement->get_ad('footer');
 			if ($footerad)
-			echo "<div align=\"center\" style=\"margin-top: 10px\" id=\"ad_footer\">".$footerad[0]."</div>";
+			echo "<div align=\"center\" style=\"margin-top: 10px\" id=\"\">".$footerad[0]."</div>";
 	}
 	print("<div style=\"margin-top: 10px; margin-bottom: 30px;\" align=\"center\">");
 	if ($CURUSER){
@@ -3071,7 +3071,7 @@ function commenttable($rows, $type, $parent_id, $review = false)
 		{
 			if ($Advertisement->enable_ad()){
 				if (!empty($commentad[$count-1]))
-				echo "<div align=\"center\" style=\"margin-top: 10px\" id=\"ad_comment_".$count."\">".$commentad[$count-1]."</div>";
+				echo "<div align=\"center\" style=\"margin-top: 10px\" id=\"\">".$commentad[$count-1]."</div>";
 			}
 		}
 		print("<div style=\"margin-top: 8pt; margin-bottom: 8pt;\"><table id=\"cid".$row["id"]."\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td class=\"embedded\" width=\"99%\">#" . $row["id"] . "&nbsp;&nbsp;<font color=\"gray\">".$lang_functions['text_by']."</font>");
diff --git a/public/claim.php b/public/claim.php
index 29106a44..9161020c 100644
--- a/public/claim.php
+++ b/public/claim.php
@@ -54,7 +54,7 @@ JS;
 
 begin_main_frame();
 $total = (clone $query)->count();
-list($pagertop, $pagerbottom, $limit, $offset, $pageSize) = pager(50, $total, $pagerParam);
+list($pagertop, $pagerbottom, $limit, $offset, $pageSize) = pager(50, $total, "$pagerParam&");
 $list = (clone $query)->with(['user', 'torrent', 'snatch'])->offset($offset)->limit($pageSize)->orderBy('id', 'desc')->get();
 print("<table id='claim-table' width='100%'>");
 print("<tr>
diff --git a/public/details.php b/public/details.php
index e744affe..50b7352f 100644
--- a/public/details.php
+++ b/public/details.php
@@ -237,7 +237,7 @@ JS;
 
 		if ($CURUSER['showdescription'] != 'no' && !empty($row["descr"])){
             $torrentdetailad=$Advertisement->get_ad('torrentdetail');
-            tr("<a href=\"javascript: klappe_news('descr')\"><span class=\"nowrap\"><img class=\"minus\" src=\"pic/trans.gif\" alt=\"Show/Hide\" id=\"picdescr\" title=\"".($lang_details['title_show_or_hide'] ?? '')."\" /> ".$lang_details['row_description']."</span></a>", "<div id='kdescr'>".($Advertisement->enable_ad() && $torrentdetailad ? "<div align=\"left\" style=\"margin-bottom: 10px\" id=\"ad_torrentdetail\">".$torrentdetailad[0]."</div>" : "").format_comment($row["descr"])."</div>", 1);
+            tr("<a href=\"javascript: klappe_news('descr')\"><span class=\"nowrap\"><img class=\"minus\" src=\"pic/trans.gif\" alt=\"Show/Hide\" id=\"picdescr\" title=\"".($lang_details['title_show_or_hide'] ?? '')."\" /> ".$lang_details['row_description']."</span></a>", "<div id='kdescr'>".($Advertisement->enable_ad() && $torrentdetailad ? "<div align=\"left\" style=\"margin-bottom: 10px\" id=\"\">".$torrentdetailad[0]."</div>" : "").format_comment($row["descr"])."</div>", 1);
 		}
 
 		if (get_user_class() >= $viewnfo_class && $CURUSER['shownfo'] != 'no' && $row["nfosz"] > 0){
diff --git a/public/forums.php b/public/forums.php
index 65c1bccb..e01ae2e7 100644
--- a/public/forums.php
+++ b/public/forums.php
@@ -644,7 +644,7 @@ if ($action == "viewtopic")
 		{
 			if ($Advertisement->enable_ad()){
 				if (!empty($forumpostad[$pn-1]))
-				echo "<div align=\"center\" style=\"margin-top: 10px\" id=\"ad_forumpost_".$pn."\">".$forumpostad[$pn-1]."</div>";
+				echo "<div align=\"center\" style=\"margin-top: 10px\" id=\"\">".$forumpostad[$pn-1]."</div>";
 			}
 		}
 		++$pn;
@@ -1458,7 +1458,7 @@ foreach ($overforums as $a)
 	if ($count>=1)
 	if ($Advertisement->enable_ad()){
 		if (!empty($interoverforumsad[$count-1]))
-			echo "<tr><td colspan=\"5\" align=\"center\" id=\"ad_interoverforums_".($count-1)."\">".$interoverforumsad[$count-1]."</td></tr>";
+			echo "<tr><td colspan=\"5\" align=\"center\" id=\"\">".$interoverforumsad[$count-1]."</td></tr>";
 	}
 	$forid = $a["id"];
 	$overforumname = $a["name"];
diff --git a/public/fun.php b/public/fun.php
index 8c246477..c0ff6228 100644
--- a/public/fun.php
+++ b/public/fun.php
@@ -87,7 +87,7 @@ if ($action == 'view')
 <link rel="stylesheet" href="<?php echo get_font_css_uri()?>" type="text/css">
 <link rel="stylesheet" href="<?php echo get_css_uri()."theme.css"?>" type="text/css">
 <link rel="stylesheet" href="styles/curtain_imageresizer.css" type="text/css">
-<script src="curtain_imageresizer.js" type="text/javascript"></script><style type="text/css">body {overflow-y:scroll; overflow-x: hidden}</style>
+<script src="js/curtain_imageresizer.js" type="text/javascript"></script><style type="text/css">body {overflow-y:scroll; overflow-x: hidden}</style>
 </head><body class='inframe'>
 <?php
 print(get_style_addicode());
diff --git a/public/shoutbox.php b/public/shoutbox.php
index b7e5073f..43240903 100644
--- a/public/shoutbox.php
+++ b/public/shoutbox.php
@@ -21,7 +21,7 @@ $refresh = ($CURUSER['sbrefresh'] ? $CURUSER['sbrefresh'] : 120)
 <link rel="stylesheet" href="<?php echo get_font_css_uri()?>" type="text/css">
 <link rel="stylesheet" href="<?php echo get_css_uri()."theme.css"?>" type="text/css">
 <link rel="stylesheet" href="styles/curtain_imageresizer.css" type="text/css">
-<script src="curtain_imageresizer.js" type="text/javascript"></script><style type="text/css">body {overflow-y:scroll; overflow-x: hidden}</style>
+<script src="js/curtain_imageresizer.js" type="text/javascript"></script><style type="text/css">body {overflow-y:scroll; overflow-x: hidden}</style>
 <?php
 print(get_style_addicode());
 $startcountdown = "startcountdown(".$CURUSER['sbrefresh'].")";
@@ -45,7 +45,7 @@ function countdown(time)
 	else {
 	parent.document.getElementById("hbsubmit").value=time;
 	time=time-1;
-	setTimeout("countdown("+time+")", 1000); 
+	setTimeout("countdown("+time+")", 1000);
 	}
 }
 function hbquota(){
@@ -94,7 +94,7 @@ else
 }
 }
 
-$limit = ($CURUSER['sbnum'] ? $CURUSER['sbnum'] : 70); 
+$limit = ($CURUSER['sbnum'] ? $CURUSER['sbnum'] : 70);
 if ($where == "helpbox")
 {
 $sql = "SELECT * FROM shoutbox WHERE type='hb' ORDER BY date DESC LIMIT ".$limit;
diff --git a/public/torrents.php b/public/torrents.php
index 3774ec74..a7f1df6d 100644
--- a/public/torrents.php
+++ b/public/torrents.php
@@ -1040,7 +1040,7 @@ if ($allsec != 1 || $enablespecial != 'yes'){ //do not print searchbox if showin
 								<tr>
 									<td class="embedded">
 										<input id="searchinput" name="search" type="text" value="<?php echo  $searchstr_ori ?>" autocomplete="off" style="width: 200px" ondblclick="suggest(event.keyCode,this.value);" onkeyup="suggest(event.keyCode,this.value);" onkeypress="return noenter(event.keyCode);"/>
-										<script src="suggest.js" type="text/javascript"></script>
+										<script src="js/suggest.js" type="text/javascript"></script>
 										<div id="suggcontainer" style="text-align: left; width:100px;  display: none;">
 											<div id="suggestions" style="width:204px; border: 1px solid rgb(119, 119, 119); cursor: default; position: absolute; color: rgb(0,0,0); background-color: rgb(255, 255, 255);"></div>
 										</div>
@@ -1121,7 +1121,7 @@ if ($tagKeyById->isNotEmpty()) {
 	if ($Advertisement->enable_ad()){
         $belowsearchboxad = $Advertisement->get_ad('belowsearchbox');
         if (!empty($belowsearchboxad[0])) {
-            echo "<div align=\"center\" style=\"margin-top: 10px\" id=\"ad_belowsearchbox\">".$belowsearchboxad[0]."</div>";
+            echo "<div align=\"center\" style=\"margin-top: 10px\" id=\"\">".$belowsearchboxad[0]."</div>";
         }
 	}
 if($inclbookmarked == 1)