github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 13:54:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Minor improvements (#1461)

Browse source 
* Minor improvements

* Update edit_user_profile.php

* Update init_bb.php

* Update init_bb.php

* Update init_bb.php

* Update usercp_register.tpl

* Update admin_ug_auth.php

* Update admin_ug_auth.tpl

* Update tpl_config.php

* Update viewprofile.php

* Update group_membership.php

* Update group_membership.php

* Update viewtopic.tpl

* Update admin_ug_auth.php

* Update functions.php

* Update admin_ug_auth.php

* Update admin_ug_auth.php

* Update admin_ug_auth.php

* Update admin_forums.php

* Update admin_forums.php

* Update posting_tpl.php

* Update viewforum.php

* Update viewforum.tpl

* Update admin_forums.php

* Update admin_ug_auth.php

* Update admin_ug_auth.php

* Update usercp_viewprofile.tpl

* Update register.php

* Update admin_ug_auth.php

* Update admin_ug_auth.php

* Update posts.php

* Update posting_tpl.php

* Update viewforum.php

* Update admin_forums.php

* Update admin_forums.php

* Update admin_forumauth.php

* Update index_map.tpl

* Update index.tpl

* Update index.tpl

* Update group.php

* Update viewtopic.tpl

* Update change_torrent.php

* Update viewtopic.tpl

* Update viewtopic.php

* Update viewtopic.php

* Update admin_log.php

* Update search.php

* Update usercp_register.tpl

* Update CHANGELOG.md
This commit is contained in:
Roman Kelesidis 2024-05-04 11:58:21 +07:00 • committed by GitHub
commit 0ca5fe3abe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 83 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -14,7 +14,7 @@
- Fixed quote selection for smiles [\#1457](https://github.com/torrentpier/torrentpier/pull/1457) ([belomaxorka](https://github.com/belomaxorka))
- Demo mode: Allow registering torrents by default [\#1440](https://github.com/torrentpier/torrentpier/pull/1440) ([belomaxorka](https://github.com/belomaxorka))
- Code refactoring [\#1441](https://github.com/torrentpier/torrentpier/pull/1441) ([belomaxorka](https://github.com/belomaxorka))
- Minor improvements [\#1435](https://github.com/torrentpier/torrentpier/pull/1435), [\#1443](https://github.com/torrentpier/torrentpier/pull/1443), [\#1446](https://github.com/torrentpier/torrentpier/pull/1446), [\#1450](https://github.com/torrentpier/torrentpier/pull/1450), [\#1452](https://github.com/torrentpier/torrentpier/pull/1452), [\#1458](https://github.com/torrentpier/torrentpier/pull/1458) ([belomaxorka](https://github.com/belomaxorka))
- Minor improvements [\#1435](https://github.com/torrentpier/torrentpier/pull/1435), [\#1443](https://github.com/torrentpier/torrentpier/pull/1443), [\#1446](https://github.com/torrentpier/torrentpier/pull/1446), [\#1450](https://github.com/torrentpier/torrentpier/pull/1450), [\#1452](https://github.com/torrentpier/torrentpier/pull/1452), [\#1458](https://github.com/torrentpier/torrentpier/pull/1458), [\#1461](https://github.com/torrentpier/torrentpier/pull/1461) ([belomaxorka](https://github.com/belomaxorka))
- Updated deps [\#1454](https://github.com/torrentpier/torrentpier/pull/1454), [\#1455](https://github.com/torrentpier/torrentpier/pull/1455), [\#1459](https://github.com/torrentpier/torrentpier/pull/1459), [\#1460](https://github.com/torrentpier/torrentpier/pull/1460) ([belomaxorka](https://github.com/belomaxorka))
- New Crowdin updates [\#1444](https://github.com/torrentpier/torrentpier/pull/1444), [\#1447](https://github.com/torrentpier/torrentpier/pull/1447), [\#1453](https://github.com/torrentpier/torrentpier/pull/1453) ([Exileum](https://github.com/Exileum))

2
admin/admin_forumauth.php
View file

@ -207,7 +207,7 @@ if (empty($forum_id)) {
}
$adv_mode = empty($adv) ? '1' : '0';
$switch_mode = "admin_forumauth.php?f=$forum_id&adv=$adv_mode";
$switch_mode = "admin_forumauth.php?" . POST_FORUM_URL . "=$forum_id&adv=$adv_mode";
$switch_mode_text = empty($adv) ? $lang['ADVANCED_MODE'] : $lang['SIMPLE_MODE'];
$u_switch_mode = '<a href="' . $switch_mode . '">' . $switch_mode_text . '</a>';

34
admin/admin_forums.php
View file

@ -223,7 +223,7 @@ if ($mode) {
$datastore->update('cat_forums');
CACHE('bb_cache')->rm();
bb_die($lang['FORUMS_UPDATED'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_FORUMADMIN'], '<a href="admin_forums.php?c=' . $cat_id . '">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'));
bb_die($lang['FORUMS_UPDATED'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_FORUMADMIN'], '<a href="admin_forums.php?' . POST_CAT_URL . '=' . $cat_id . '">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'));
break;
@ -312,7 +312,7 @@ if ($mode) {
$message = $lang['FORUMS_UPDATED'] . '<br /><br />';
$message .= $fix ? "$fix<br /><br />" : '';
$message .= sprintf($lang['CLICK_RETURN_FORUMADMIN'], '<a href="admin_forums.php?c=' . $cat_id . '">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
$message .= sprintf($lang['CLICK_RETURN_FORUMADMIN'], '<a href="admin_forums.php?' . POST_CAT_URL . '=' . $cat_id . '">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message);
break;
@ -401,7 +401,7 @@ if ($mode) {
//
// Show form to delete a forum
//
$forum_id = (int)$_GET['f'];
$forum_id = (int)$_GET[POST_FORUM_URL];
$move_to_options = '<option value="-1">' . $lang['DELETE_ALL_POSTS'] . '</option>';
$move_to_options .= sf_get_list('forum', $forum_id, 0);
@ -650,7 +650,7 @@ if ($mode) {
break;
case 'forum_sync':
\TorrentPier\Legacy\Admin\Common::sync('forum', (int)$_GET['f']);
\TorrentPier\Legacy\Admin\Common::sync('forum', (int)$_GET[POST_FORUM_URL]);
$datastore->update('cat_forums');
CACHE('bb_cache')->rm();
@ -709,7 +709,7 @@ if (!$mode || $show_main_page) {
$bgr_class_over = 'prow3';
$template->assign_vars(array(
'U_ALL_FORUMS' => 'admin_forums.php?c=all',
'U_ALL_FORUMS' => 'admin_forums.php?' . POST_CAT_URL . '=all',
'FORUMS_COUNT' => $total_forums,
));
@ -723,12 +723,12 @@ if (!$mode || $show_main_page) {
'CAT_ID' => $cat_id,
'CAT_DESC' => htmlCHR($category_rows[$i]['cat_title']),
'U_CAT_EDIT' => "admin_forums.php?mode=editcat&amp;c=$cat_id",
'U_CAT_DELETE' => "admin_forums.php?mode=deletecat&amp;c=$cat_id",
'U_CAT_MOVE_UP' => "admin_forums.php?mode=cat_order&amp;move=-15&amp;c=$cat_id",
'U_CAT_MOVE_DOWN' => "admin_forums.php?mode=cat_order&amp;move=15&amp;c=$cat_id",
'U_VIEWCAT' => "admin_forums.php?c=$cat_id",
'U_CREATE_FORUM' => "admin_forums.php?mode=addforum&amp;c=$cat_id",
'U_CAT_EDIT' => "admin_forums.php?mode=editcat&amp;" . POST_CAT_URL . "=$cat_id",
'U_CAT_DELETE' => "admin_forums.php?mode=deletecat&amp;" . POST_CAT_URL . "=$cat_id",
'U_CAT_MOVE_UP' => "admin_forums.php?mode=cat_order&amp;move=-15&amp;" . POST_CAT_URL . "=$cat_id",
'U_CAT_MOVE_DOWN' => "admin_forums.php?mode=cat_order&amp;move=15&amp;" . POST_CAT_URL . "=$cat_id",
'U_VIEWCAT' => "admin_forums.php?" . POST_CAT_URL . "=$cat_id",
'U_CREATE_FORUM' => "admin_forums.php?mode=addforum&amp;" . POST_CAT_URL . "=$cat_id",
));
for ($j = 0; $j < $total_forums; $j++) {
@ -755,12 +755,12 @@ if (!$mode || $show_main_page) {
'FORUM_NAME_CLASS' => $forum_rows[$j]['forum_parent'] ? 'genmed' : 'gen',
'ADD_SUB_HREF' => !$forum_rows[$j]['forum_parent'] ? "admin_forums.php?mode=addforum&amp;forum_parent={$forum_rows[$j]['forum_id']}" : '',
'U_VIEWFORUM' => BB_ROOT . FORUM_URL . $forum_id,
'U_FORUM_EDIT' => "admin_forums.php?mode=editforum&amp;f=$forum_id",
'U_FORUM_PERM' => "admin_forumauth.php?f=$forum_id",
'U_FORUM_DELETE' => "admin_forums.php?mode=deleteforum&amp;f=$forum_id",
'U_FORUM_MOVE_UP' => "admin_forums.php?mode=forum_order&amp;move=-15&amp;f=$forum_id&amp;c=$req_cat_id",
'U_FORUM_MOVE_DOWN' => "admin_forums.php?mode=forum_order&amp;move=15&amp;f=$forum_id&amp;c=$req_cat_id",
'U_FORUM_RESYNC' => "admin_forums.php?mode=forum_sync&amp;f=$forum_id",
'U_FORUM_EDIT' => "admin_forums.php?mode=editforum&amp;" . POST_FORUM_URL . "=$forum_id",
'U_FORUM_PERM' => "admin_forumauth.php?" . POST_FORUM_URL . "=$forum_id",
'U_FORUM_DELETE' => "admin_forums.php?mode=deleteforum&amp;" . POST_FORUM_URL . "=$forum_id",
'U_FORUM_MOVE_UP' => "admin_forums.php?mode=forum_order&amp;move=-15&amp;" . POST_FORUM_URL . "=$forum_id&amp;" . POST_CAT_URL . "=$req_cat_id",
'U_FORUM_MOVE_DOWN' => "admin_forums.php?mode=forum_order&amp;move=15&amp;" . POST_FORUM_URL . "=$forum_id&amp;" . POST_CAT_URL . "=$req_cat_id",
'U_FORUM_RESYNC' => "admin_forums.php?mode=forum_sync&amp;" . POST_FORUM_URL . "=$forum_id",
));
}
}

6
admin/admin_log.php
View file

@ -36,9 +36,9 @@ $url = basename(__FILE__);
// Key names
$type_key = 'type';
$forum_key = 'f';
$topic_key = 't';
$user_key = 'u';
$forum_key = POST_FORUM_URL;
$topic_key = POST_TOPIC_URL;
$user_key = POST_USERS_URL;
$datetime_key = 'dt'; // value should be strtotime() time ("2006-06-25" etc.)
$daysback_key = 'db';
$sort_key = 'sort';

22
admin/admin_ug_auth.php
View file

@ -87,7 +87,7 @@ if ($submit && $mode == 'user') {
\TorrentPier\Legacy\Group::delete_permissions($group_id, $user_id);
$message = $lang['AUTH_UPDATED'] . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '<a href="admin_ug_auth.php?mode=' . $mode . '&u=' . $user_id . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '<a href="admin_ug_auth.php?mode=' . $mode . '&' . POST_USERS_URL . '=' . $user_id . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message);
@ -103,7 +103,7 @@ if ($submit && $mode == 'user') {
\TorrentPier\Legacy\Group::delete_permissions($group_id, $user_id);
$message = $lang['AUTH_UPDATED'] . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '<a href="admin_ug_auth.php?mode=' . $mode . '&u=' . $user_id . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '<a href="admin_ug_auth.php?mode=' . $mode . '&' . POST_USERS_URL . '=' . $user_id . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message);
@ -131,7 +131,7 @@ if ($submit && $mode == 'user') {
$l_auth_return = ($mode == 'user') ? $lang['CLICK_RETURN_USERAUTH'] : $lang['CLICK_RETURN_GROUPAUTH'];
$message = $lang['AUTH_UPDATED'] . '<br /><br />';
$message .= sprintf($l_auth_return, '<a href="admin_ug_auth.php?mode=' . $mode . '&u=' . $user_id . '">', '</a>') . '<br /><br />';
$message .= sprintf($l_auth_return, '<a href="admin_ug_auth.php?mode=' . $mode . '&' . POST_USERS_URL . '=' . $user_id . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message);
@ -159,7 +159,7 @@ elseif ($submit && $mode == 'group' && (!empty($_POST['auth']) && is_array($_POS
$l_auth_return = $lang['CLICK_RETURN_GROUPAUTH'];
$message = $lang['AUTH_UPDATED'] . '<br /><br />';
$message .= sprintf($l_auth_return, '<a href="admin_ug_auth.php?mode=' . $mode . '&g=' . $group_id . '">', '</a>') . '<br /><br />';
$message .= sprintf($l_auth_return, '<a href="admin_ug_auth.php?mode=' . $mode . '&' . POST_GROUPS_URL . '=' . $group_id . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message);
@ -185,7 +185,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) {
$datastore->update('cat_forums');
$forums = $datastore->get('cat_forums');
}
$base_url = basename(__FILE__) . "?mode=user&amp;u=$user_id";
$base_url = basename(__FILE__) . "?mode=user&amp;" . POST_USERS_URL . "=$user_id";
$ug_data = $this_userdata;
$ug_data['session_logged_in'] = 1;
@ -197,7 +197,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) {
$template->assign_block_vars('c', array(
'CAT_ID' => $c_id,
'CAT_TITLE' => $forums['cat_title_html'][$c_id],
'CAT_HREF' => "$base_url&amp;c=$c_id",
'CAT_HREF' => "$base_url&amp;" . POST_CAT_URL . "=$c_id",
));
if (!$c =& $_REQUEST['c'] or !in_array($c, array('all', $c_id)) or empty($c_data['forums'])) {
@ -304,7 +304,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) {
$datastore->update('cat_forums');
$forums = $datastore->get('cat_forums');
}
$base_url = basename(__FILE__) . "?mode=group&amp;g=$group_id";
$base_url = basename(__FILE__) . "?mode=group&amp;" . POST_GROUPS_URL . "=$group_id";
$ug_data = array('group_id' => $group_id);
$u_access = auth(AUTH_ALL, AUTH_LIST_ALL, $ug_data);
@ -313,7 +313,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) {
$template->assign_block_vars('c', array(
'CAT_ID' => $c_id,
'CAT_TITLE' => $forums['cat_title_html'][$c_id],
'CAT_HREF' => "$base_url&amp;c=$c_id",
'CAT_HREF' => "$base_url&amp;" . POST_CAT_URL . "=$c_id",
));
if (!($c =& $_REQUEST['c']) || !in_array($c, array('all', $c_id)) || empty($c_data['forums'])) {
@ -381,7 +381,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) {
$s_hidden_fields = '
<input type="hidden" name="mode" value="' . $mode . '" />
<input type="hidden" name="g" value="' . $group_id . '" />
<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />
';
$template->assign_vars(array(
@ -419,8 +419,8 @@ $template->assign_vars(array(
'YES_SIGN' => $yes_sign,
'NO_SIGN' => $no_sign,
'S_AUTH_ACTION' => 'admin_ug_auth.php',
'SELECTED_CAT' => !empty($_REQUEST['c']) ? $_REQUEST['c'] : '',
'U_ALL_FORUMS' => !empty($base_url) ? "$base_url&amp;c=all" : '',
'SELECTED_CAT' => !empty($_REQUEST[POST_CAT_URL]) ? $_REQUEST[POST_CAT_URL] : '',
'U_ALL_FORUMS' => !empty($base_url) ? "$base_url&amp;" . POST_CAT_URL . "=all" : '',
));
print_page('admin_ug_auth.tpl', 'admin');

2
group.php
View file

@ -396,7 +396,7 @@ if (!$group_id) {
'U_SEARCH_RELEASES' => "tracker.php?srg=$group_id",
'U_GROUP_RELEASES' => GROUP_URL . $group_id . "&view=releases",
'U_GROUP_MEMBERS' => GROUP_URL . $group_id . "&view=members",
'U_GROUP_CONFIG' => "group_edit.php?g=$group_id",
'U_GROUP_CONFIG' => "group_edit.php?" . POST_GROUPS_URL . "=$group_id",
'RELEASE_GROUP' => (bool)$group_info['release_group'],
'GROUP_TYPE' => $group_type,

2
library/ajax/change_torrent.php
View file

@ -96,7 +96,7 @@ switch ($type) {
$this->prompt_for_confirm($lang['DEL_MOVE_TORRENT']);
}
\TorrentPier\Legacy\Torrent::delete_torrent($attach_id);
$url = make_url("modcp.php?t={$torrent['topic_id']}&mode=move&sid={$userdata['session_id']}");
$url = make_url("modcp.php?" . POST_TOPIC_URL . "={$torrent['topic_id']}&mode=move&sid={$userdata['session_id']}");
break;
}

6
library/ajax/edit_user_profile.php
View file

@ -60,9 +60,8 @@ switch ($field) {
}
if (!isset($lang['GENDER_SELECT'][$value])) {
$this->ajax_die($lang['ERROR']);
} else {
$this->response['new_value'] = $lang['GENDER_SELECT'][$value];
}
$this->response['new_value'] = $lang['GENDER_SELECT'][$value];
break;
case 'user_birthday':
@ -107,8 +106,7 @@ switch ($field) {
case 'user_occ':
case 'user_interests':
$value = htmlCHR($value);
$this->response['new_value'] = $value;
$this->response['new_value'] = htmlCHR($value);
break;
case 'user_regdate':

4
library/ajax/group_membership.php
View file

@ -38,7 +38,7 @@ switch ($mode) {
$href = GROUP_URL . $row['group_id'];
if (IS_ADMIN) {
$href .= "&amp;u=$user_id";
$href .= "&amp;" . POST_USERS_URL . "=$user_id";
$link = '<a href="' . $href . '" class="' . $class . '" target="_blank">' . htmlCHR($row['group_name']) . '</a>';
$html[] = $link;
} else {
@ -48,7 +48,7 @@ switch ($mode) {
}
if ($row['group_moderator'] == $user->id) {
$class .= ' selfMod';
$href .= "&amp;u=$user_id"; // сам юзер модератор этой группы
$href .= "&amp;" . POST_USERS_URL . "=$user_id"; // сам юзер модератор этой группы
}
$link = '<a href="' . $href . '" class="' . $class . '" target="_blank">' . htmlCHR($row['group_name']) . '</a>';
$html[] = $link;

4
library/ajax/posts.php
View file

@ -85,7 +85,7 @@ switch ($this->request['type']) {
$message = "[quote]" . $post['topic_title'] . "[/quote]\r";
}
if (mb_strlen($message, 'UTF-8') > 1000) {
$this->response['redirect'] = make_url(POSTING_URL . '?mode=quote&p=' . $post_id);
$this->response['redirect'] = make_url(POSTING_URL . '?mode=quote&' . POST_POST_URL . '=' . $post_id);
}
$this->response['quote'] = true;
@ -112,7 +112,7 @@ switch ($this->request['type']) {
$this->ajax_die($lang['EDIT_OWN_POSTS']);
}
if ((mb_strlen($post['post_text'], 'UTF-8') > 1000) || $post['post_attachment'] || ($post['topic_first_post_id'] == $post_id)) {
$this->response['redirect'] = make_url(POSTING_URL . '?mode=editpost&p=' . $post_id);
$this->response['redirect'] = make_url(POSTING_URL . '?mode=editpost&' . POST_POST_URL . '=' . $post_id);
} elseif ($this->request['type'] == 'editor') {
$text = (string)$this->request['text'];
$text = prepare_message($text);

2
library/includes/functions.php
View file

@ -1844,7 +1844,7 @@ function set_pr_die_append_msg($pr_uid)
$template->assign_var('BB_DIE_APPEND_MSG', '
<a href="' . PROFILE_URL . $pr_uid . '" onclick="return post2url(this.href, {after_edit: 1});">' . $lang['PROFILE_RETURN'] . '</a>
<br /><br />
<a href="profile.php?mode=editprofile' . (IS_ADMIN ? "&amp;u=$pr_uid" : '') . '" onclick="return post2url(this.href, {after_edit: 1});">' . $lang['PROFILE_EDIT_RETURN'] . '</a>
<a href="profile.php?mode=editprofile' . (IS_ADMIN ? "&amp;" . POST_USERS_URL . "=$pr_uid" : '') . '" onclick="return post2url(this.href, {after_edit: 1});">' . $lang['PROFILE_EDIT_RETURN'] . '</a>
<br /><br />
<a href="index.php">' . $lang['INDEX_RETURN'] . '</a>
');

16
library/includes/init_bb.php
View file

@ -290,19 +290,19 @@ define('PASSWORD_MAX_LENGTH', 24);
define('PAGE_HEADER', INC_DIR . '/page_header.php');
define('PAGE_FOOTER', INC_DIR . '/page_footer.php');
define('CAT_URL', 'index.php?c=');
define('CAT_URL', 'index.php?' . POST_CAT_URL . '=');
define('DL_URL', $bb_cfg['dl_url']);
define('FORUM_URL', 'viewforum.php?f=');
define('GROUP_URL', 'group.php?g=');
define('FORUM_URL', 'viewforum.php?' . POST_FORUM_URL . '=');
define('GROUP_URL', 'group.php?' . POST_GROUPS_URL . '=');
define('LOGIN_URL', $bb_cfg['login_url']);
define('MODCP_URL', 'modcp.php?f=');
define('MODCP_URL', 'modcp.php?' . POST_FORUM_URL . '=');
define('PM_URL', $bb_cfg['pm_url']);
define('POST_URL', 'viewtopic.php?p=');
define('POST_URL', 'viewtopic.php?' . POST_POST_URL . '=');
define('POSTING_URL', $bb_cfg['posting_url']);
define('PROFILE_URL', 'profile.php?mode=viewprofile&amp;u=');
define('PROFILE_URL', 'profile.php?mode=viewprofile&amp;' . POST_USERS_URL . '=');
define('BONUS_URL', 'profile.php?mode=bonus');
define('TOPIC_URL', 'viewtopic.php?t=');
define('FILELIST_URL', 'filelist.php?t=');
define('TOPIC_URL', 'viewtopic.php?' . POST_TOPIC_URL . '=');
define('FILELIST_URL', 'filelist.php?' . POST_TOPIC_URL . '=');
define('USER_AGENT', strtolower($_SERVER['HTTP_USER_AGENT']));

8
library/includes/posting_tpl.php
View file

@ -26,7 +26,7 @@ $sql = "SELECT * FROM " . BB_TOPIC_TPL . " WHERE tpl_id = {$f_data['forum_tpl_id
if (!$f_data['forum_tpl_id'] || !$tpl_data = DB()->fetch_row($sql)) {
if (!$edit_tpl_mode) {
redirect(POSTING_URL . "?mode=newtopic&f=$forum_id");
redirect(POSTING_URL . "?mode=newtopic&" . POST_FORUM_URL . "=$forum_id");
}
}
@ -34,12 +34,12 @@ $template->assign_vars([
'PAGE_TITLE' => $lang['NEW_RELEASE'],
'FORUM_NAME' => $f_data['forum_name'],
'FORUM_ID' => $forum_id,
'TPL_FORM_ACTION' => POSTING_URL . "?mode=newtopic&amp;f=$forum_id",
'REGULAR_TOPIC_HREF' => POSTING_URL . "?mode=newtopic&amp;f=$forum_id",
'TPL_FORM_ACTION' => POSTING_URL . "?mode=newtopic&amp;" . POST_FORUM_URL . "=$forum_id",
'REGULAR_TOPIC_HREF' => POSTING_URL . "?mode=newtopic&amp;" . POST_FORUM_URL . "=$forum_id",
'TOR_REQUIRED' => $f_data['allow_reg_tracker'],
'EDIT_TPL' => $edit_tpl_mode,
'CAN_EDIT_TPL' => $can_edit_tpl,
'EDIT_TPL_URL' => POSTING_URL . "?mode=new_rel&amp;f=$forum_id&amp;edit_tpl=1"
'EDIT_TPL_URL' => POSTING_URL . "?mode=new_rel&amp;" . POST_FORUM_URL . "=$forum_id&amp;edit_tpl=1"
]);
if ($tpl_data) {

2
library/includes/ucp/register.php
View file

@ -627,7 +627,7 @@ if ($submit && !$errors) {
$emailer->set_template('user_activate', $pr_data['user_lang']);
$emailer->assign_vars([
'USERNAME' => html_entity_decode($username),
'U_ACTIVATE' => make_url("profile.php?mode=activate&u={$pr_data['user_id']}&act_key=$user_actkey"),
'U_ACTIVATE' => make_url("profile.php?mode=activate&" . POST_USERS_URL . "={$pr_data['user_id']}&act_key=$user_actkey"),
]);
$emailer->send();

4
library/includes/ucp/viewprofile.php
View file

@ -193,8 +193,8 @@ if (IS_ADMIN) {
$template->assign_vars([
'EDITABLE_TPLS' => true,
'AJAX_USER_OPT' => $ajax_user_opt,
'U_MANAGE' => "profile.php?mode=editprofile&amp;u={$profiledata['user_id']}",
'U_PERMISSIONS' => "admin/admin_ug_auth.php?mode=user&amp;u={$profiledata['user_id']}",
'U_MANAGE' => "profile.php?mode=editprofile&amp;" . POST_USERS_URL . "={$profiledata['user_id']}",
'U_PERMISSIONS' => "admin/admin_ug_auth.php?mode=user&amp;" . POST_USERS_URL . "={$profiledata['user_id']}",
]);
}

2
search.php
View file

@ -56,7 +56,7 @@ if (isset($_POST['del_my_post'])) {
DB()->query("UPDATE " . BB_POSTS . " SET user_post = 1 WHERE poster_id = {$user->id}");
redirect("search.php?u={$user->id}");
redirect("search.php?" . POST_USERS_URL . "={$user->id}");
}
$tracking_topics = get_tracks('topic');

2
styles/templates/admin/admin_ug_auth.tpl
View file

@ -170,7 +170,7 @@ thead tr {
<!-- END f -->
<!-- END c -->
<input type="hidden" name="c" value="{SELECTED_CAT}" />
<input type="hidden" name="{POST_CAT_URL}" value="{SELECTED_CAT}" />
</form>
<form method="post" action="{S_AUTH_ACTION}">

4
styles/templates/default/index.tpl
View file

@ -85,7 +85,7 @@
<!-- BEGIN f -->
<tr>
<td class="row1 f_icon">
<a href="{U_SEARCH}?f={c.f.FORUM_ID}&amp;new=1&amp;dm=1&amp;s=0&amp;o=1"><img class="forum_icon" src="{c.f.FORUM_FOLDER_IMG}" alt="{c.f.FORUM_FOLDER_ALT}" /></a>
<a href="{U_SEARCH}?{POST_FORUM_URL}={c.f.FORUM_ID}&amp;new=1&amp;dm=1&amp;s=0&amp;o=1"><img class="forum_icon" src="{c.f.FORUM_FOLDER_IMG}" alt="{c.f.FORUM_FOLDER_ALT}" /></a>
</td>
<td class="row1 f_titles">
@ -99,7 +99,7 @@
<p class="subforums">
<em>{L_SUBFORUMS}:</em>
<!-- BEGIN sf -->
<span class="sf_title{c.f.sf.SF_NEW}"><a href="{U_SEARCH}?f={c.f.sf.SF_ID}&amp;new=1&amp;dm=1&amp;s=0&amp;o=1" class="dot-sf">&#9658;</a><a href="{FORUM_URL}{c.f.sf.SF_ID}" class="dot-sf">{c.f.sf.SF_NAME}</a></span><span class="sf_separator"></span>
<span class="sf_title{c.f.sf.SF_NEW}"><a href="{U_SEARCH}?{POST_FORUM_URL}={c.f.sf.SF_ID}&amp;new=1&amp;dm=1&amp;s=0&amp;o=1" class="dot-sf">&#9658;</a><a href="{FORUM_URL}{c.f.sf.SF_ID}" class="dot-sf">{c.f.sf.SF_NAME}</a></span><span class="sf_separator"></span>
<!-- END sf -->
</p>
<!-- ENDIF -->

2
styles/templates/default/index_map.tpl
View file

@ -42,7 +42,7 @@ $(function(){
$.each($('#f-map a'), function(i,a) {
var f_id = $(a).attr('href');
$(a)
.attr('href', '{U_FORUM}?f='+ f_id)
.attr('href', '{U_FORUM}?{POST_FORUM_URL}='+ f_id)
.before('<img class="feed-small" src="{IMG}feed.png" alt="feed" onclick="open_feed('+ f_id +')">')
;
});

10
styles/templates/default/tpl_config.php
View file

@ -139,10 +139,10 @@ if (!empty($page_cfg['load_tpl_vars']) and $vars = array_flip($page_cfg['load_tp
'MC_IMG' => $bb_cfg['text_buttons'] ? '[' . $lang['COMMENT'] . ']' : '<img src="' . $images['icon_mc'] . '" alt="[' . $lang['COMMENT'] . ']" title="' . $lang['COMMENT'] . '" />',
'POLL_IMG' => $bb_cfg['text_buttons'] ? $lang['TOPIC_POLL'] : '<img src="' . $images['icon_poll'] . '" alt="' . $lang['TOPIC_POLL'] . '" title="' . $lang['ADD_POLL'] . '" />',
'QUOTE_URL' => BB_ROOT . POSTING_URL . '?mode=quote&amp;p=',
'EDIT_POST_URL' => BB_ROOT . POSTING_URL . '?mode=editpost&amp;p=',
'DELETE_POST_URL' => BB_ROOT . POSTING_URL . '?mode=delete&amp;p=',
'IP_POST_URL' => BB_ROOT . 'modcp.php?mode=ip&amp;p=',
'QUOTE_URL' => BB_ROOT . POSTING_URL . '?mode=quote&amp;' . POST_POST_URL . '=',
'EDIT_POST_URL' => BB_ROOT . POSTING_URL . '?mode=editpost&amp;' . POST_POST_URL . '=',
'DELETE_POST_URL' => BB_ROOT . POSTING_URL . '?mode=delete&amp;' . POST_POST_URL . '=',
'IP_POST_URL' => BB_ROOT . 'modcp.php?mode=ip&amp;' . POST_POST_URL . '=',
'PROFILE_IMG' => $bb_cfg['text_buttons'] ? $lang['READ_PROFILE_TXTB'] : '<img src="' . $images['icon_profile'] . '" alt="' . $lang['READ_PROFILE_TXTB'] . '" title="' . $lang['READ_PROFILE'] . '" />',
'PM_IMG' => $bb_cfg['text_buttons'] ? $lang['SEND_PM_TXTB'] : '<img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PM_TXTB'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" />',
@ -150,7 +150,7 @@ if (!empty($page_cfg['load_tpl_vars']) and $vars = array_flip($page_cfg['load_tp
'WWW_IMG' => $bb_cfg['text_buttons'] ? $lang['VISIT_WEBSITE_TXTB'] : '<img src="' . $images['icon_www'] . '" alt="' . $lang['VISIT_WEBSITE_TXTB'] . '" title="' . $lang['VISIT_WEBSITE'] . '" />',
'ICQ_IMG' => $bb_cfg['text_buttons'] ? $lang['ICQ_TXTB'] : '<img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ_TXTB'] . '" title="' . $lang['ICQ'] . '" />',
'EMAIL_URL' => BB_ROOT . 'profile.php?mode=email&amp;u=',
'EMAIL_URL' => BB_ROOT . 'profile.php?mode=email&amp;' . POST_USERS_URL . '=',
'FORUM_URL' => BB_ROOT . FORUM_URL,
'PM_URL' => BB_ROOT . PM_URL,
'PROFILE_URL' => BB_ROOT . PROFILE_URL

4
styles/templates/default/usercp_register.tpl
View file

@ -49,13 +49,13 @@
<p class="nav"><a href="{U_INDEX}">{T_INDEX}</a></p>
<form id="prof-form" method="post" action="profile.php<!-- IF IS_ADMIN && PR_USER_ID -->?u={PR_USER_ID}<!-- ENDIF -->"
<form id="prof-form" method="post" action="profile.php<!-- IF IS_ADMIN && PR_USER_ID -->?{POST_USERS_URL}={PR_USER_ID}<!-- ENDIF -->"
class="tokenized" enctype="multipart/form-data">
<input type="hidden" name="mode" value="{MODE}"/>
<input type="hidden" name="reg_agreed" value="1"/>
<!-- IF NEW_USER --><input type="hidden" name="admin" value="1"/><!-- ENDIF -->
<!-- IF ADM_EDIT -->
<input type="hidden" name="u" value="{PR_USER_ID}"/>
<input type="hidden" name="{POST_USERS_URL}" value="{PR_USER_ID}"/>
<!-- ENDIF -->
<table class="forumline prof-tbl">

2
styles/templates/default/usercp_viewprofile.tpl
View file

@ -377,7 +377,7 @@ ajax.callback.index_data = function(data) {
[ <a href="{U_SEARCH_USER}" class="med">{L_SEARCH_USER_POSTS}</a> ]
[ <a href="{U_SEARCH_TOPICS}" class="med">{L_SEARCH_USER_TOPICS}</a> ]
[ <a href="{U_SEARCH_RELEASES}" class="med">{L_SEARCH_RELEASES}</a> ]
<!-- IF PROFILE_USER || IS_ADMIN -->[ <a href="{U_WATCHED_TOPICS}&u={PROFILE_USER_ID}" class="med">{L_WATCHED_TOPICS}</a> ]<!-- ENDIF -->
<!-- IF PROFILE_USER || IS_ADMIN -->[ <a href="{U_WATCHED_TOPICS}&{POST_USERS_URL}={PROFILE_USER_ID}" class="med">{L_WATCHED_TOPICS}</a> ]<!-- ENDIF -->
[ <a title="{L_ATOM_SUBSCRIBE}" href="#" onclick="return post2url('feed.php', {mode: 'get_feed_url', type: 'u', id: {PROFILE_USER_ID}})">{FEED_IMG}</a> ]
</p>
</td>

10
styles/templates/default/viewforum.tpl
View file

@ -630,11 +630,11 @@ td.topic_id { cursor: pointer; }
<!-- IF IS_ADMIN -->
<div class="med tCenter">{L_ADMIN}:
<a href="{POSTING_URL}?mode=new_rel&amp;f={FORUM_ID}&amp;edit_tpl=1" class="bold" target="_blank">{L_DESIGNER}</a>&nbsp;&middot;
<a href="admin/admin_log.php?f={FORUM_ID}&amp;db={$bb_cfg['log_days_keep']}" target="_blank">{L_FORUM_LOGS}</a>&nbsp;&middot;
<a href="admin/admin_forums.php?mode=editforum&amp;f={FORUM_ID}" target="_blank">{L_EDIT}</a>&nbsp;&middot;
<a href="admin/admin_forumauth.php?f={FORUM_ID}" target="_blank">{L_PERMISSIONS}</a>&nbsp;&middot;
<a href="admin/admin_forums.php?mode=deleteforum&amp;f={FORUM_ID}" target="_blank">{L_DELETE}</a>
<a href="{POSTING_URL}?mode=new_rel&amp;{POST_FORUM_URL}={FORUM_ID}&amp;edit_tpl=1" class="bold" target="_blank">{L_DESIGNER}</a>&nbsp;&middot;
<a href="admin/admin_log.php?{POST_FORUM_URL}={FORUM_ID}&amp;db={$bb_cfg['log_days_keep']}" target="_blank">{L_FORUM_LOGS}</a>&nbsp;&middot;
<a href="admin/admin_forums.php?mode=editforum&amp;{POST_FORUM_URL}={FORUM_ID}" target="_blank">{L_EDIT}</a>&nbsp;&middot;
<a href="admin/admin_forumauth.php?{POST_FORUM_URL}={FORUM_ID}" target="_blank">{L_PERMISSIONS}</a>&nbsp;&middot;
<a href="admin/admin_forums.php?mode=deleteforum&amp;{POST_FORUM_URL}={FORUM_ID}" target="_blank">{L_DELETE}</a>
</div>
<!-- ENDIF / IS_ADMIN -->

6
styles/templates/default/viewtopic.tpl
View file

@ -285,7 +285,7 @@ function build_poll_add_form (src_el)
</td>
<td class="nowrap" style="padding: 0 4px 2px 4px;">
<form action="{U_SEARCH}?t={TOPIC_ID}&amp;dm=1&amp;s=1" method="post">
<form action="{U_SEARCH}?{POST_TOPIC_URL}={TOPIC_ID}&amp;dm=1&amp;s=1" method="post">
<input id="search-text" type="text" name="nm" class="hint" style="width: 150px;" placeholder="{L_SEARCH_IN_TOPIC}" required />
<input type="submit" class="bold" value="&raquo;" style="width: 30px;" />
</form>
@ -499,7 +499,7 @@ function build_poll_add_form (src_el)
<!-- ELSE -->
<div style="<!-- IF TEXT_BUTTONS --> padding: 2px 6px 4px;<!-- ELSE --> padding: 2px 3px;<!-- ENDIF -->" class="post_btn_2">
<a class="txtb" href="{PROFILE_URL}{postrow.POSTER_ID}">{PROFILE_IMG}</a>{POST_BTN_SPACER}
<a class="txtb" href="{PM_URL}?mode=post&amp;u={postrow.POSTER_ID}">{PM_IMG}</a>{POST_BTN_SPACER}
<a class="txtb" href="{PM_URL}?mode=post&amp;{POST_USERS_URL}={postrow.POSTER_ID}">{PM_IMG}</a>{POST_BTN_SPACER}
</div>
<!-- ENDIF -->
@ -513,7 +513,7 @@ function build_poll_add_form (src_el)
<tr id="del_split_row" class="row5" style="display: none;">
<td colspan="2" class="med pad_4 td2">
<form method="post" action="{S_SPLIT_ACTION}">
<input type="hidden" name="redirect" value="modcp.php?t={TOPIC_ID}&amp;mode=split" />
<input type="hidden" name="redirect" value="modcp.php?{POST_TOPIC_URL}={TOPIC_ID}&amp;mode=split" />
<input type="hidden" name="{POST_FORUM_URL}" value="{FORUM_ID}" />
<input type="hidden" name="{POST_TOPIC_URL}" value="{TOPIC_ID}" />
<input type="hidden" name="start" value="{START}" />

6
viewforum.php
View file

@ -355,11 +355,11 @@ if ($topics_csv = implode(',', $topic_ids)) {
}
if ($forum_data['allow_reg_tracker']) {
$post_new_topic_url = POSTING_URL . "?mode=new_rel&amp;f=$forum_id";
$post_new_topic_url = POSTING_URL . "?mode=new_rel&amp;" . POST_FORUM_URL . "=$forum_id";
$post_img = $images['release_new'];
$post_new_topic = $lang['POST_NEW_RELEASE'];
} else {
$post_new_topic_url = POSTING_URL . "?mode=newtopic&amp;f=$forum_id";
$post_new_topic_url = POSTING_URL . "?mode=newtopic&amp;" . POST_FORUM_URL . "=$forum_id";
$post_img = $images['post_new'];
$post_new_topic = $lang['POST_NEW_TOPIC'];
}
@ -409,7 +409,7 @@ $template->assign_vars([
'S_AUTH_LIST' => $u_auth,
'U_VIEW_FORUM' => FORUM_URL . $forum_id,
'U_MARK_READ' => FORUM_URL . $forum_id . "&amp;mark=topics",
'U_SEARCH_SELF' => "search.php?uid={$userdata['user_id']}&f=$forum_id",
'U_SEARCH_SELF' => "search.php?uid={$userdata['user_id']}&" . POST_FORUM_URL . "=$forum_id",
]);
// Okay, lets dump out the page ...

4
viewtopic.php
View file

@ -475,7 +475,7 @@ $template->assign_vars([
'HIDE_RANK_IMG_DIS' => !$bb_cfg['show_rank_image'],
'PINNED_FIRST_POST' => $t_data['topic_show_first_post'],
'PIN_HREF' => $t_data['topic_show_first_post'] ? "modcp.php?t=$topic_id&amp;mode=post_unpin" : "modcp.php?t=$topic_id&amp;mode=post_pin",
'PIN_HREF' => $t_data['topic_show_first_post'] ? "modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=post_unpin" : "modcp.php?" . POST_TOPIC_URL . "=$topic_id&amp;mode=post_pin",
'PIN_TITLE' => $t_data['topic_show_first_post'] ? $lang['POST_UNPIN'] : $lang['POST_PIN'],
'AUTH_MOD' => $is_auth['auth_mod'],
@ -773,7 +773,7 @@ foreach ($is_auth as $name => $is) {
$template->assign_vars(['PG_ROW_CLASS' => $pg_row_class ?? 'row1']);
if (IS_ADMIN) {
$template->assign_vars(['U_LOGS' => "admin/admin_log.php?t=$topic_id&amp;db={$bb_cfg['log_days_keep']}"]);
$template->assign_vars(['U_LOGS' => "admin/admin_log.php?" . POST_TOPIC_URL . "=$topic_id&amp;db={$bb_cfg['log_days_keep']}"]);
}
print_page('viewtopic.tpl');