diff --git a/admin/admin_ranks.php b/admin/admin_ranks.php index d5e31a485..398f63a10 100644 --- a/admin/admin_ranks.php +++ b/admin/admin_ranks.php @@ -83,7 +83,7 @@ if ($mode != '') { // The rank image has to be a jpg, gif or png // if ($rank_image != '') { - if (!preg_match('/(\.gif|\.png|\.jpg|\.jpeg|\.bmp|\.webp)$/is', $rank_image)) { + if (!preg_match('/(\.gif|\.png|\.jpg|\.jpeg|\.bmp|\.webp|\.ico)$/is', $rank_image)) { $rank_image = ''; } } diff --git a/admin/admin_ug_auth.php b/admin/admin_ug_auth.php index f027a6542..a279bea11 100644 --- a/admin/admin_ug_auth.php +++ b/admin/admin_ug_auth.php @@ -82,7 +82,7 @@ if ($submit && $mode == 'user') { \TorrentPier\Legacy\Group::delete_permissions($group_id, $user_id); $message = $lang['AUTH_UPDATED'] . '

'; - $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') . '

'; + $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') . '

'; $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); @@ -98,7 +98,7 @@ if ($submit && $mode == 'user') { \TorrentPier\Legacy\Group::delete_permissions($group_id, $user_id); $message = $lang['AUTH_UPDATED'] . '

'; - $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') . '

'; + $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') . '

'; $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); @@ -126,7 +126,7 @@ if ($submit && $mode == 'user') { $l_auth_return = ($mode == 'user') ? $lang['CLICK_RETURN_USERAUTH'] : $lang['CLICK_RETURN_GROUPAUTH']; $message = $lang['AUTH_UPDATED'] . '

'; - $message .= sprintf($l_auth_return, '', '') . '

'; + $message .= sprintf($l_auth_return, '', '') . '

'; $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); @@ -154,7 +154,7 @@ elseif ($submit && $mode == 'group' && (!empty($_POST['auth']) && is_array($_POS $l_auth_return = $lang['CLICK_RETURN_GROUPAUTH']; $message = $lang['AUTH_UPDATED'] . '

'; - $message .= sprintf($l_auth_return, '', '') . '

'; + $message .= sprintf($l_auth_return, '', '') . '

'; $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 5527a23ea..53bf2f68d 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -284,7 +284,7 @@ CREATE TABLE IF NOT EXISTS `bb_bt_torrents` `reg_time` INT(11) NOT NULL DEFAULT '0', `call_seed_time` INT(11) NOT NULL DEFAULT '0', `complete_count` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', - `seeder_last_seen` MEDIUMINT(10) NOT NULL DEFAULT '0', + `seeder_last_seen` MEDIUMINT(10) NOT NULL DEFAULT '0', `tor_status` TINYINT(4) NOT NULL DEFAULT '0', `checked_user_id` MEDIUMINT(8) NOT NULL DEFAULT '0', `checked_time` INT(11) NOT NULL DEFAULT '0', @@ -1457,7 +1457,7 @@ CREATE TABLE IF NOT EXISTS `buf_last_seeder` ( `topic_id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', `seeder_last_seen` INT(11) NOT NULL DEFAULT '0', - `user_id` MEDIUMINT(10) NOT NULL DEFAULT '0', + `user_id` MEDIUMINT(10) NOT NULL DEFAULT '0', PRIMARY KEY (`topic_id`) ) ENGINE = MyISAM diff --git a/library/defines.php b/library/defines.php index 1c0643b4e..7ebb95591 100644 --- a/library/defines.php +++ b/library/defines.php @@ -73,7 +73,7 @@ define('SQL_TR_LOG_NAME', 'sql_error_tr'); // mysql log filename (Tracker) define('SQL_CALC_QUERY_TIME', true); // for stats define('SQL_LOG_SLOW_QUERIES', true); // log sql slow queries define('SQL_SLOW_QUERY_TIME', 10); // slow query in seconds -define('SQL_PREPEND_SRC_COMM', false); // prepend source file comment to sql query +define('SQL_PREPEND_SRC', true); // prepend source file to sql query // Log options define('LOG_EXT', 'log'); // log file extension diff --git a/library/includes/functions.php b/library/includes/functions.php index 37bd848df..3486bdd27 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -1176,17 +1176,17 @@ function bb_date($gmepoch, $format = false, $friendly_date = true) /** * Get user's torrent client string * - * @param string $peer_id + * @param string $peerId * @return mixed|string */ -function get_user_torrent_client(string $peer_id): mixed +function get_user_torrent_client(string $peerId): mixed { static $clients = [ '-AG' => 'Ares', '-AZ' => 'Vuze', '-A~' => 'Ares', '-BC' => 'BitComet', '-BE' => 'BitTorrent SDK', '-BI' => 'BiglyBT', '-BL' => 'BitLord', '-BT' => 'BitTorrent', '-CT' => 'CTorrent', '-DE' => 'Deluge', '-FD' => 'Free Download Manager', 'FD6' => 'Free Download Manager', '-FG' => 'FlashGet', '-FL' => 'Folx', '-HL' => 'Halite', '-KG' => 'KGet', - '-KT' => 'KTorrent', '-LT' => 'libTorrent', '-Lr' => 'LibreTorrent', '-MG' => 'MediaGet', + '-KT' => 'KTorrent', '-LT' => 'libTorrent', '-Lr' => 'LibreTorrent', '-TR' => 'Transmission', '-tT' => 'tTorrent', '-UM' => "uTorrent Mac", '-UT' => 'uTorrent', '-UW' => 'uTorrent Web', '-WW' => 'WebTorrent', '-WD' => 'WebTorrent', '-XL' => 'Xunlei', '-PI' => 'PicoTorrent', '-qB' => 'qBittorrent', 'M' => 'BitTorrent', 'MG' => 'MediaGet', @@ -1220,21 +1220,28 @@ function get_user_torrent_client(string $peer_id): mixed * ======================================================================= **/ ]; + static $iconExtension = '.png'; + $bestMatch = null; $bestMatchLength = 0; foreach ($clients as $key => $clientName) { - if (str_starts_with($peer_id, $key) !== false && strlen($key) > $bestMatchLength) { + if (str_starts_with($peerId, $key) !== false && strlen($key) > $bestMatchLength) { $bestMatch = $clientName; $bestMatchLength = strlen($key); } } - if (!empty($bestMatchLength)) { - return '' . $bestMatch . ''; + if (!empty($bestMatchLength) && !empty($bestMatch)) { + $clientIconPath = 'styles/images/clients/' . $bestMatch . $iconExtension; + if (is_file($clientIconPath)) { + return '' . $bestMatch . ''; + } else { + return $bestMatch; + } } - return $peer_id; + return $peerId; } function birthday_age($date) diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php index 9a5eb9759..c775ac664 100644 --- a/library/includes/page_footer.php +++ b/library/includes/page_footer.php @@ -63,9 +63,9 @@ if ($show_dbg_info) { $stat .= '  ] |'; $stat .= !empty($_COOKIE['sql_log']) ? ' [ wrap · max ] |' : ''; - $stat .= '  | -  | - '; + $stat .= '  | +  | + '; echo '
' . $stat . '
'; } diff --git a/library/includes/page_footer_dev.php b/library/includes/page_footer_dev.php index ae26e7143..fe67bba74 100644 --- a/library/includes/page_footer_dev.php +++ b/library/includes/page_footer_dev.php @@ -50,7 +50,7 @@ if (!defined('BB_ROOT')) { .sqlExplain { color: #B50000; font-size: 13px; - cursor: default; + cursor: inherit !important; } .sqlHover { diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php index b2ecb76cd..e5692c5a8 100644 --- a/library/includes/ucp/register.php +++ b/library/includes/ucp/register.php @@ -161,7 +161,8 @@ $cur_pass_valid = $adm_edit; foreach ($profile_fields as $field => $can_edit) { // Проверка на возможность редактирования if ((bool)$can_edit === false) { - continue; + // TODO: При continue; не устанавливаются переменные ($tp_data) шаблона прописанные в case + // continue; } switch ($field) { diff --git a/memberlist.php b/memberlist.php index 387f07f5f..d0360045c 100644 --- a/memberlist.php +++ b/memberlist.php @@ -141,7 +141,6 @@ $sql .= " ORDER BY $order_by"; if ($result = DB()->fetch_rowset($sql)) { foreach ($result as $i => $row) { $user_id = $row['user_id']; - $user_info = generate_user_info($row); $row_class = !($i % 2) ? 'row1' : 'row2'; diff --git a/posting.php b/posting.php index 8720d9df9..d493e6a83 100644 --- a/posting.php +++ b/posting.php @@ -284,7 +284,7 @@ if (!IS_GUEST && $mode != 'newtopic' && ($submit || $preview || $mode == 'quote' 'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2', 'POSTER' => profile_url($row), 'POSTER_NAME_JS' => addslashes($row['username']), - 'POST_DATE' => bb_date($row['post_time'], $bb_cfg['post_date_format']), + 'POST_DATE' => '' . bb_date($row['post_time'], $bb_cfg['post_date_format']) . '', 'MESSAGE' => get_parsed_post($row) ]); } diff --git a/search.php b/search.php index 6d1e0b73e..a08438f8b 100644 --- a/search.php +++ b/search.php @@ -12,6 +12,7 @@ define('BB_SCRIPT', 'search'); require __DIR__ . '/common.php'; require INC_DIR . '/bbcode.php'; +$page_cfg['use_tablesorter'] = true; $page_cfg['load_tpl_vars'] = [ 'post_buttons', 'post_icons', diff --git a/src/Legacy/Atom.php b/src/Legacy/Atom.php index d0fc66782..6ae860bf4 100644 --- a/src/Legacy/Atom.php +++ b/src/Legacy/Atom.php @@ -226,7 +226,7 @@ class Atom } $atom .= ""; @unlink($file_path); - $fp = fopen($file_path, 'wb'); + $fp = fopen($file_path, 'wb+'); fwrite($fp, $atom); fclose($fp); return true; diff --git a/src/Legacy/Cache/Common.php b/src/Legacy/Cache/Common.php index 59d7049ee..04f6e96a3 100644 --- a/src/Legacy/Cache/Common.php +++ b/src/Legacy/Cache/Common.php @@ -95,7 +95,7 @@ class Common */ public function debug_find_source(string $mode = 'all'): string { - if (!SQL_PREPEND_SRC_COMM) { + if (!SQL_PREPEND_SRC) { return 'src disabled'; } foreach (debug_backtrace() as $trace) { diff --git a/src/Legacy/Datastore/Common.php b/src/Legacy/Datastore/Common.php index f67e2bdfa..ba6c92a75 100644 --- a/src/Legacy/Datastore/Common.php +++ b/src/Legacy/Datastore/Common.php @@ -169,7 +169,7 @@ class Common */ public function debug_find_source(string $mode = 'all'): string { - if (!SQL_PREPEND_SRC_COMM) { + if (!SQL_PREPEND_SRC) { return 'src disabled'; } foreach (debug_backtrace() as $trace) { diff --git a/src/Legacy/SqlDb.php b/src/Legacy/SqlDb.php index a485a0f15..d2130d159 100644 --- a/src/Legacy/SqlDb.php +++ b/src/Legacy/SqlDb.php @@ -849,7 +849,7 @@ class SqlDb */ public function debug_find_source(string $mode = 'all'): string { - if (!SQL_PREPEND_SRC_COMM) { + if (!SQL_PREPEND_SRC) { return 'src disabled'; } foreach (debug_backtrace() as $trace) { diff --git a/src/Legacy/Torrent.php b/src/Legacy/Torrent.php index 7259d5b46..82cccc3b4 100644 --- a/src/Legacy/Torrent.php +++ b/src/Legacy/Torrent.php @@ -275,7 +275,6 @@ class Torrent { global $bb_cfg, $lang, $reg_mode; - $announce_urls = []; $attach_id = (int)$attach_id; $reg_mode = $mode; diff --git a/styles/templates/admin/admin_sitemap.tpl b/styles/templates/admin/admin_sitemap.tpl index 5dfad0abc..ed9e83b59 100644 --- a/styles/templates/admin/admin_sitemap.tpl +++ b/styles/templates/admin/admin_sitemap.tpl @@ -111,7 +111,7 @@ ajax.callback.sitemap = function(data) {
-

{L_SITEMAP_ADD_EXP_1} {L_SITEMAP_ADD_EXP_2}

+

{L_SITEMAP_ADD_EXP_1}

{L_SITEMAP_ADD_EXP_2}

diff --git a/styles/templates/default/css/main_content.css b/styles/templates/default/css/main_content.css index de9e9033e..9e4522f12 100644 --- a/styles/templates/default/css/main_content.css +++ b/styles/templates/default/css/main_content.css @@ -226,6 +226,7 @@ table.forums { .f_icon { width: 46px; + text-align: center; padding: 6px 0 !important; } diff --git a/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl index 680d5c7a1..713b9b4fa 100644 --- a/styles/templates/default/memberlist.tpl +++ b/styles/templates/default/memberlist.tpl @@ -1,79 +1,82 @@

{PAGE_TITLE}

- - - - - - + + + + +
{L_SORT_BY}: {S_MODE_SELECT}  {L_ORDER}: {S_ORDER_SELECT}  
+ + + + + + - - - - -
{L_SORT_BY}: {S_MODE_SELECT}  {L_ORDER}: {S_ORDER_SELECT}  
-   +   -
{L_SORT_PER_LETTER}: {S_LETTER_SELECT}{S_LETTER_HIDDEN}
+
{L_SORT_PER_LETTER}: {S_LETTER_SELECT}{S_LETTER_HIDDEN}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#{L_USERNAME}{L_PM}{L_EMAIL}{L_LOCATION}{L_JOINED}{L_POSTS_SHORT}{L_WEBSITE}
 {no_username.NO_USER_ID_SPECIFIED} 
{memberrow.ROW_NUMBER}
{memberrow.AVATAR}
{memberrow.USER}		{memberrow.PM}{memberrow.EMAIL}{memberrow.FROM} - {memberrow.JOINED_RAW} - {memberrow.JOINED} - {memberrow.POSTS}{memberrow.WWW}
 
#{L_USERNAME}{L_PM}{L_EMAIL}{L_LOCATION}{L_JOINED}{L_POSTS_SHORT}{L_WEBSITE}
{memberrow.ROW_NUMBER} +
{memberrow.AVATAR}
+ {memberrow.USER} + 		{memberrow.PM}{memberrow.EMAIL}{memberrow.FROM} + {memberrow.JOINED_RAW} + {memberrow.JOINED} + {memberrow.POSTS}{memberrow.WWW}
{no_username.NO_USER_ID_SPECIFIED}
 
- -
-

{PAGE_NUMBER}

-

{PAGINATION}

-
-
+
+

{PAGE_NUMBER}

+

{PAGINATION}

+
+
-
- -
-

{CURRENT_TIME}

-

{S_TIMEZONE}

-
-
+
+
+

{CURRENT_TIME}

+

{S_TIMEZONE}

+
+
diff --git a/styles/templates/default/posting_smilies.tpl b/styles/templates/default/posting_smilies.tpl index 10912cecd..c1c1419f9 100644 --- a/styles/templates/default/posting_smilies.tpl +++ b/styles/templates/default/posting_smilies.tpl @@ -31,7 +31,7 @@ function emoticon(text) { - {L_MORE_EMOTICONS} + {L_MORE_EMOTICONS} diff --git a/styles/templates/default/privmsgs_read.tpl b/styles/templates/default/privmsgs_read.tpl index da50b5bb9..8b763c16d 100644 --- a/styles/templates/default/privmsgs_read.tpl +++ b/styles/templates/default/privmsgs_read.tpl @@ -66,13 +66,13 @@
{S_HIDDEN_FIELDS} diff --git a/styles/templates/default/search_results.tpl b/styles/templates/default/search_results.tpl index 19a8aa554..47b02cd6a 100644 --- a/styles/templates/default/search_results.tpl +++ b/styles/templates/default/search_results.tpl @@ -126,33 +126,35 @@ function show_edit_options ()
- +
+ - - - - - + + + + + + - + + +
 {L_FORUM}{L_TOPICS}{L_AUTHOR}{L_REPLIES_SHORT}{L_LASTPOST}{L_FORUM}{L_TOPICS}{L_AUTHOR}{L_REPLIES_SHORT}{L_LASTPOST}
@@ -177,7 +179,7 @@ function show_edit_options () {t.TOPIC_AUTHOR}{t.REPLIES}{t.REPLIES}

{t.LAST_POST_TIME}

@@ -187,6 +189,7 @@ function show_edit_options ()

@@ -208,6 +211,7 @@ function show_edit_options ()
diff --git a/styles/templates/default/usercp_viewprofile.tpl b/styles/templates/default/usercp_viewprofile.tpl index 5061f7de6..a44008ac3 100644 --- a/styles/templates/default/usercp_viewprofile.tpl +++ b/styles/templates/default/usercp_viewprofile.tpl @@ -1,74 +1,72 @@ {action: "edit_user_profile", id: "username"} @@ -180,6 +178,10 @@ ajax.callback.index_data = function(data) { {L_PROFILE} · {L_PERMISSIONS}

+ +

+ {L_PROFILE} +

diff --git a/styles/templates/default/viewforum.tpl b/styles/templates/default/viewforum.tpl index 7135f7b96..ee4b58a0c 100644 --- a/styles/templates/default/viewforum.tpl +++ b/styles/templates/default/viewforum.tpl @@ -66,90 +66,88 @@ function show_forum_mod_options () ajax.in_moderation = true; } -function edit_topic_title (topic_id) -{ - if (ajax.in_title_edit) return false; +function edit_topic_title(topic_id) { + if (ajax.in_title_edit) return false; - var $tt_td = $('td#'+topic_id).siblings('td.tt'); - var tt_text = $tt_td.find('.tt-text').text(); + var $tt_td = $('td#' + topic_id).siblings('td.tt'); + var tt_text = $tt_td.find('.tt-text').text(); - $tt_td.attr({id: 'tte-'+topic_id}); - ajax.tte_cur_topic_id = topic_id; - ajax.tte_orig_html = $tt_td.html(); + $tt_td.attr({id: 'tte-'+topic_id}); + ajax.tte_cur_topic_id = topic_id; + ajax.tte_orig_html = $tt_td.html(); - $tt_td.html( $('#tt-edit-tpl').html() ); - $('.tt-edit-input', $tt_td).val(tt_text).focus(); + $tt_td.html($('#tt-edit-tpl').html()); + $('.tt-edit-input', $tt_td).val(tt_text).focus(); - ajax.in_title_edit = true; + ajax.in_title_edit = true; } -function tte_submit (mode) -{ - var topic_id = ajax.tte_cur_topic_id; - var $tt_td = $('#tte-'+topic_id); - var topic_title = $('.tt-edit-input', $tt_td).val(); +function tte_submit(mode) { + var topic_id = ajax.tte_cur_topic_id; + var $tt_td = $('#tte-' + topic_id); + var topic_title = $('.tt-edit-input', $tt_td).val(); - if (mode == 'save') { - ajax.edit_topic_title(topic_id, topic_title); - } - else { - $tt_td.html(ajax.tte_orig_html); - $('.tt-text').addClass('folded2 tLink') - .click(function(){ ajax.view_post(topic_id, this); return false; }); - } - ajax.in_title_edit = false; + if (mode == 'save') { + ajax.edit_topic_title(topic_id, topic_title); + } else { + $tt_td.html(ajax.tte_orig_html); + $('.tt-text').addClass('folded2 tLink').click(function () { + ajax.view_post(topic_id, this); + return false; + }); + } + ajax.in_title_edit = false; } -ajax.edit_topic_title = function(topic_id, topic_title) { - ajax.exec({ - action : 'mod_action', - mode : 'edit_topic_title', - topic_id : topic_id, - topic_title : topic_title - }); +ajax.edit_topic_title = function (topic_id, topic_title) { + ajax.exec({ + action: 'mod_action', + mode: 'edit_topic_title', + topic_id: topic_id, + topic_title: topic_title + }); }; -function mod_action (mode) -{ - var topics = 0; - $('input.topic-chbox:checked').each(function(){ - topics += ','+ this.value; - }); - if(!topics){ - alert('{L_NONE_SELECTED}'); - return false; - } - if(mode == 'tor_status'){ - status = $('#st option:selected').val(); - if(status == '-1'){ - alert('{L_TOR_STATUS_NOT_SELECT}'); - return false; - } - ajax.mod_action(topics, mode, status); - } - return true; +function mod_action(mode) { + var topics = 0; + $('input.topic-chbox:checked').each(function () { + topics += ',' + this.value; + }); + if (!topics) { + alert('{L_NONE_SELECTED}'); + return false; + } + if (mode == 'tor_status') { + status = $('#st option:selected').val(); + if (status == '-1') { + alert('{L_TOR_STATUS_NOT_SELECT}'); + return false; + } + ajax.mod_action(topics, mode, status); + } + return true; } -ajax.mod_action = function(topic_ids, mode, status) { - ajax.exec({ - action : 'mod_action', - mode : mode, - topic_ids : topic_ids, - status : status - }); +ajax.mod_action = function (topic_ids, mode, status) { + ajax.exec({ + action: 'mod_action', + mode: mode, + topic_ids: topic_ids, + status: status + }); }; -ajax.callback.mod_action = function(data) { - if(data.topics) { - for(i=0; i < data.topics.length; i++) { - $('#status-'+ data.topics[i]).html(data.status); - } - } - if(data.topic_title) { - var $tt_td = $('#tte-'+data.topic_id); - $tt_td.html(ajax.tte_orig_html); - $('.tt-text', $tt_td).html(data.topic_title); - } +ajax.callback.mod_action = function (data) { + if (data.topics) { + for (i = 0; i < data.topics.length; i++) { + $('#status-' + data.topics[i]).html(data.status); + } + } + if (data.topic_title) { + var $tt_td = $('#tte-' + data.topic_id); + $tt_td.html(ajax.tte_orig_html); + $('.tt-text', $tt_td).html(data.topic_title); + } }; diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl index 086f8151f..b2713d9da 100644 --- a/styles/templates/default/viewtopic.tpl +++ b/styles/templates/default/viewtopic.tpl @@ -381,10 +381,10 @@ function build_poll_add_form (src_el)

{MINIPOST_IMG_NEW}{MINIPOST_IMG} {postrow.POST_DATE} | #{postrow.POST_NUMBER} + · {L_AUTHOR} ({L_POSTED_AFTER} {postrow.POSTED_AFTER}) - · {L_AUTHOR}

diff --git a/styles/templates/default/viewtopic_torrent.tpl b/styles/templates/default/viewtopic_torrent.tpl index d463c2520..9ea3610e0 100644 --- a/styles/templates/default/viewtopic_torrent.tpl +++ b/styles/templates/default/viewtopic_torrent.tpl @@ -134,7 +134,7 @@ ajax.callback.callseed = function (data) { - +

{L_SEEDERS}:

{L_SEEDERS}:
@@ -185,7 +185,7 @@ ajax.callback.callseed = function (data) { - +

{L_LEECHERS}:

{L_LEECHERS}: