Minor improvements (#236)

* Minor improvements * Update CHANGELOG.md
2025-02-28 15:10:54 +03:00 · 2023-09-09 10:57:44 +07:00 · 2023-09-09 10:57:44 +07:00 · 88867e063d
commit 88867e063d
parent 3fe8570726
8 changed files with 21 additions and 20 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,7 +6,7 @@
 **Merged pull requests:**

 - Release v2.1.5-2023.09 🎉
- Minor improvements [\#235](https://github.com/torrentpier/torrentpier-lts/pull/235) ([belomaxorka](https://github.com/belomaxorka))
+- Minor improvements [\#235](https://github.com/torrentpier/torrentpier-lts/pull/235), [\#236](https://github.com/torrentpier/torrentpier-lts/pull/236) ([belomaxorka](https://github.com/belomaxorka))

 ## [v2.1.5-2023.08](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.08) (2023-09-04)
 [Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.07...v2.1.5-2023.08)
--- a/admin/admin_attach_cp.php
+++ b/admin/admin_attach_cp.php
@ -496,7 +496,7 @@ if ($view == 'attachments')
 						$post_title = str_short($post_title, 30);
 					}

-					$view_topic = BB_ROOT . 'viewtopic.php?' . POST_POST_URL . '=' . $ids[$j]['post_id'] . '#' . $ids[$j]['post_id'];
+					$view_topic = BB_ROOT . POST_URL . $ids[$j]['post_id'] . '#' . $ids[$j]['post_id'];

 					$post_titles[] = '<a href="' . $view_topic . '" class="gen" target="_blank">' . $post_title . '</a>';
 				}
@ -553,4 +553,4 @@ if ($do_pagination && $total_rows > $bb_cfg['topics_per_page'])
 	generate_pagination('admin_attach_cp.php?view=' . $view . '&amp;mode=' . $mode . '&amp;order=' . $sort_order . '&amp;uid=' . $uid, $total_rows, $bb_cfg['topics_per_page'], $start);
 }

-print_page('admin_attach_cp.tpl', 'admin');
+print_page('admin_attach_cp.tpl', 'admin');
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@ -102,7 +102,7 @@ if (!$tor_reged)
 		'U_DOWNLOAD_LINK' => $download_link,
 		'FILESIZE'        => $tor_file_size,

-		'DOWNLOAD_COUNT'  => sprintf($lang['DOWNLOAD_NUMBER'], $download_count),
+		'DOWNLOAD_COUNT'  => declension((int)$download_count, 'times'),
 		'POSTED_TIME'     => $tor_file_time,
 	));

@ -231,11 +231,11 @@ if ($tor_reged && $tor_info)
 			'FILESIZE'        => $tor_file_size,
 			'MAGNET'          => $tor_magnet,
 			'HASH'            => strtoupper(bin2hex($tor_info['info_hash'])),
-			'DOWNLOAD_COUNT'  => sprintf($lang['DOWNLOAD_NUMBER'], $download_count),
+			'DOWNLOAD_COUNT'  => declension((int)$download_count, 'times'),
 			'REGED_TIME'      => bb_date($tor_info['reg_time']),
 			'REGED_DELTA'     => delta_time($tor_info['reg_time']),
 			'TORRENT_SIZE'    => humn_size($tor_size),
-			'COMPLETED'       => sprintf($lang['DOWNLOAD_NUMBER'], $tor_info['complete_count']),
+			'COMPLETED'       => declension((int)$tor_info['complete_count'], 'times'),
 		));

 		if ($comment)
@ -252,7 +252,8 @@ if ($tor_reged && $tor_info)

 			'TOR_SIZE'      => humn_size($tor_size),
 			'TOR_LONGEVITY' => delta_time($tor_info['reg_time']),
-			'TOR_COMPLETED' => declension($tor_info['complete_count'], 'times'),
+			'TOR_COMPLETED' => declension((int)$tor_info['complete_count'], 'times'),
+			'TOR_DOWNLOAD_COUNT' => declension((int)$download_count, 'times'),
 		));
 	}

@ -433,7 +434,7 @@ if ($tor_reged && $tor_info)
 						if (!defined('SEEDER_EXIST'))
 						{
 							define('SEEDER_EXIST', true);
-							$seed_order_action = "viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&amp;spmode=full#seeders";
+							$seed_order_action = TOPIC_URL . "$bt_topic_id&amp;spmode=full#seeders";

 							$template->assign_block_vars("$x_full", array(
 								'SEED_ORD_ACT'   => $seed_order_action,
@ -586,7 +587,7 @@ if ($bb_cfg['bt_allow_spmode_change'] && $s_mode != 'full')
 {
 	$template->assign_vars(array(
 		'PEERS_FULL_LINK'  => true,
-		'SPMODE_FULL_HREF' => "viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&amp;spmode=full#seeders",
+		'SPMODE_FULL_HREF' => TOPIC_URL . "$bt_topic_id&amp;spmode=full#seeders",
 	));
 }

--- a/library/includes/page_header.php
+++ b/library/includes/page_header.php
@ -234,7 +234,7 @@ if (!empty($page_cfg['show_torhelp'][BB_SCRIPT]) && !empty($userdata['torhelp'])

 		foreach (DB()->fetch_rowset($sql) as $row)
 		{
-			$torhelp_topics[] = '<a href="viewtopic.php?t='. $row['topic_id'] .'">'. $row['topic_title'] .'</a>';
+			$torhelp_topics[] = '<a href="' . TOPIC_URL . $row['topic_id'] . '">'. $row['topic_title'] .'</a>';
 		}

 		$template->assign_vars(array(
@ -276,4 +276,4 @@ define('PAGE_HEADER_SENT', true);
 if (!$bb_cfg['gzip_compress'])
 {
 	flush();
-}
+}
--- a/modcp.php
+++ b/modcp.php
@ -565,8 +565,8 @@ switch ($mode)
 				sync('forum', array($forum_id, $new_forum_id));

 				//bot
-				$message = $lang['TOPIC_SPLIT'] .'<br /><br /><a href="' . "viewtopic.php?". POST_TOPIC_URL ."=$topic_id&amp;sid=". $userdata['session_id'] .'">'. $lang['TOPIC_SPLIT_OLD'] .'</a>';
-				$message .= ' &nbsp;::&nbsp; <a href="' . "viewtopic.php?". POST_TOPIC_URL ."=$new_topic_id&amp;sid=". $userdata['session_id'] .'">'. $lang['TOPIC_SPLIT_NEW'] .'</a>';
+				$message = $lang['TOPIC_SPLIT'] . '<br /><br /><a href="' . TOPIC_URL . "$topic_id&amp;sid=" . $userdata['session_id'] . '">' . $lang['TOPIC_SPLIT_OLD'] . '</a>';
+				$message .= ' &nbsp;::&nbsp; <a href="' . TOPIC_URL . "$new_topic_id&amp;sid=" . $userdata['session_id'] . '">' . $lang['TOPIC_SPLIT_NEW'] . '</a>';

 				// Log action
 				$log_action->mod('mod_topic_split', array(
--- a/posting.php
+++ b/posting.php
@ -712,7 +712,7 @@ $template->assign_vars(array(
 	'POSTER_RGROUPS'       => isset($poster_rgroups) && !empty($poster_rgroups) ? $poster_rgroups : '',
 	'ATTACH_RG_SIG'        => ($switch_rg_sig) ? $switch_rg_sig : false,

-	'U_VIEWTOPIC'          => ($mode == 'reply') ? "viewtopic.php?" . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc" : '',
+	'U_VIEWTOPIC'          => ($mode == 'reply') ? TOPIC_URL . "$topic_id&amp;postorder=desc" : '',

 	'S_NOTIFY_CHECKED'     => ($notify_user) ? 'checked="checked"' : '',
 	'S_TYPE_TOGGLE'        => $topic_type_toggle,
--- a/styles/templates/default/viewtopic_attach.tpl
+++ b/styles/templates/default/viewtopic_attach.tpl
@ -216,8 +216,8 @@
 		</td>
 	</tr>
 	<tr class="row1">
-		<td>{L_COMPLETED}:</td>
-		<td><span title="{L_DOWNLOADED}: {postrow.attach.tor_reged.DOWNLOAD_COUNT}">{postrow.attach.tor_reged.COMPLETED}</span></td>
+		<td>{L_DOWNLOADED}:</td>
+		<td><span title="{L_COMPLETED}: {postrow.attach.tor_reged.COMPLETED}">{postrow.attach.tor_reged.DOWNLOAD_COUNT}</span></td>
 	</tr>
 	<tr class="row1">
 		<td>{L_SIZE}:</td>
@ -366,4 +366,4 @@ $('#tor-filelist-btn').click(function(){
 <!-- ENDIF -->
 <!-- END tor_reged -->

-<!-- END attach -->
+<!-- END attach -->
--- a/styles/templates/default/viewtopic_torrent.tpl
+++ b/styles/templates/default/viewtopic_torrent.tpl
@ -46,14 +46,14 @@ $(document).ready(function(){
 	<td colspan="2" class="borderless bCenter pad_8">
 			{L_SIZE}:&nbsp; <b>{TOR_SIZE}</b>&nbsp; &nbsp;|&nbsp; &nbsp;
 			{L_IS_REGISTERED}:&nbsp; <b>{TOR_LONGEVITY}</b>&nbsp; &nbsp;|&nbsp; &nbsp;
-			{L_COMPLETED}:&nbsp; <b>{TOR_COMPLETED}</b>
+			{L_DOWNLOADED}:&nbsp; <b title="{L_COMPLETED}: {TOR_COMPLETED}">{TOR_DOWNLOAD_COUNT}</b>
 	</td>
 </tr>
 <!-- ENDIF / SHOW_DL_LIST_TOR_INFO -->

 <!-- BEGIN dl_list_none -->
 <tr>
-	<td colspan="2" class="pad_6"><!-- IF SHOW_DL_LIST && SHOW_TOR_ACT -->DL-List: <!-- ENDIF -->{L_NONE}</td>
+	<td colspan="2" class="pad_6"><!-- IF SHOW_DL_LIST && SHOW_TOR_ACT -->{L_SHOW_DL_LIST}: {L_NONE}<!-- ENDIF --></td>
 </tr>
 <!-- END dl_list_none -->

@ -244,4 +244,4 @@ $(document).ready(function(){
 </tr>

 </table>
-<div class="spacer_6"></div>
+<div class="spacer_6"></div>