github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-14 18:48:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #440 from Exile37/bugfix/profile-ip-list

Browse source 
Remove matching users with default IP from profile list
This commit is contained in:
Yuriy Pikhtarev 2017-08-07 01:01:34 +03:00 • committed by GitHub
commit e234ea5e43
7 changed files with 36 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -29,7 +29,7 @@ and go from there. The documentation will be translated into english in the near
* Apache / nginx
* MySQL / MariaDB / Percona
* PHP: 5.6 / 7.0 / 7.1
* PHP Extensions: bcmath, intl, tidy (optional)
* PHP Extensions: bcmath, intl, tidy (optional), xml
## Installation

94
admin/admin_bt_tracker_cfg.php
View file

@ -1,94 +0,0 @@
<?php
/**
* MIT License
*
* Copyright (c) 2005-2017 TorrentPier
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
if (!empty($setmodules)) {
if (IS_SUPER_ADMIN) {
$module['TP']['TRACKER_CONFIG'] = basename(__FILE__);
}
return;
}
require __DIR__ . '/pagestart.php';
if (!IS_SUPER_ADMIN) {
bb_die($lang['NOT_ADMIN']);
}
require INC_DIR . '/functions_admin_torrent.php';
$submit = isset($_POST['submit']);
$confirmed = isset($_POST['confirm']);
/**
* All config names with default values
*/
$default_cfg_str = array(
'off_reason' => 'Tracker is disabled',
'browser_redirect_url' => 'http://demo.torrentpier.com/',
);
$default_cfg_bool = array(
'autoclean' => 1,
'off' => 0,
'compact_mode' => 1,
'update_dlstat' => 1,
'limit_active_tor' => 0,
'limit_concurrent_ips' => 0,
'retracker' => 1,
);
$default_cfg_num = array(
'numwant' => 50,
'expire_factor' => 4,
'limit_seed_count' => 20,
'limit_leech_count' => 4,
'leech_expire_factor' => 60,
'limit_seed_ips' => 0,
'limit_leech_ips' => 0,
);
/**
* Set template vars
*/
set_tpl_vars($default_cfg_str, $bb_cfg['tracker']);
set_tpl_vars_lang($default_cfg_str);
set_tpl_vars_bool($default_cfg_bool, $bb_cfg['tracker']);
set_tpl_vars_lang($default_cfg_bool);
set_tpl_vars($default_cfg_num, $bb_cfg['tracker']);
set_tpl_vars_lang($default_cfg_num);
$template->assign_vars(array(
'IGNORE_REPORTED_IP' => $bb_cfg['ignore_reported_ip'],
'ANNOUNCE_INTERVAL' => $bb_cfg['announce_interval'],
'PASSKEY_KEY' => $bb_cfg['passkey_key'],
'GOLD_SILVER_ENABLED' => $bb_cfg['tracker']['gold_silver_enabled'],
'DISABLE_SUBMIT' => true,
'S_HIDDEN_FIELDS' => '',
'S_CONFIG_ACTION' => 'admin_bt_tracker_cfg.php',
));
print_page('admin_bt_tracker_cfg.tpl', 'admin');

62
admin/admin_ug_auth.php
View file

@ -87,37 +87,39 @@ if ($submit && $mode == 'user') {
}
// Make user an admin (if already user)
if ($_POST['userlevel'] === 'admin') {
if ($userdata['user_id'] == $user_id || $user_id == GUEST_UID || $user_id == BOT_UID) {
bb_die('Could not update admin status');
if (isset($_POST['userlevel'])) {
if ($_POST['userlevel'] === 'admin') {
if ($userdata['user_id'] == $user_id || $user_id == GUEST_UID || $user_id == BOT_UID) {
bb_die('Could not update admin status');
}
DB()->query('UPDATE ' . BB_USERS . ' SET user_level = ' . ADMIN . " WHERE user_id = $user_id");
// Delete any entries in auth_access, they are not required if user is becoming an admin
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 . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message);
} // Make admin a user (if already admin)
elseif ($_POST['userlevel'] === 'user') {
// ignore if you're trying to change yourself from an admin to user!
if ($userdata['user_id'] == $user_id) {
bb_die('Could not update admin status<br /><br />Could not change yourself from an admin to user');
}
// Update users level, reset to USER
DB()->query('UPDATE ' . BB_USERS . ' SET user_level = ' . USER . " WHERE user_id = $user_id");
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 . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message);
}
DB()->query('UPDATE ' . BB_USERS . ' SET user_level = ' . ADMIN . " WHERE user_id = $user_id");
// Delete any entries in auth_access, they are not required if user is becoming an admin
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 . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message);
} // Make admin a user (if already admin)
elseif ($_POST['userlevel'] === 'user') {
// ignore if you're trying to change yourself from an admin to user!
if ($userdata['user_id'] == $user_id) {
bb_die('Could not update admin status<br /><br />Could not change yourself from an admin to user');
}
// Update users level, reset to USER
DB()->query('UPDATE ' . BB_USERS . ' SET user_level = ' . USER . " WHERE user_id = $user_id");
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 . '">', '</a>') . '<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message);
}
//

4
library/ajax/mod_action.php
View file

@ -98,13 +98,13 @@ switch ($mode) {
$reg_ip = DB()->fetch_rowset("SELECT username, user_id, user_rank FROM " . BB_USERS . "
WHERE user_reg_ip = '{$profiledata['user_reg_ip']}'
AND user_reg_ip != ''
AND user_reg_ip != 0
AND user_id != {$profiledata['user_id']}
ORDER BY username ASC");
$last_ip = DB()->fetch_rowset("SELECT username, user_id, user_rank FROM " . BB_USERS . "
WHERE user_last_ip = '{$profiledata['user_last_ip']}'
AND user_last_ip != ''
AND user_last_ip != 0
AND user_id != {$profiledata['user_id']}");
$link_reg_ip = $link_last_ip = '';

1
library/language/source/main.php
View file

@ -2014,7 +2014,6 @@ $lang['DELETE_DISALLOW_EXPLAIN'] = 'You can remove a disallowed username by sele
$lang['ADD_DISALLOW'] = 'Add';
$lang['ADD_DISALLOW_TITLE'] = 'Add a disallowed username';
$lang['ADD_DISALLOW_EXPLAIN'] = 'You can disallow a username using the wildcard character * to match any character';
$lang['NO_DISALLOWED'] = 'No Disallowed Usernames';

134
styles/templates/admin/admin_bt_tracker_cfg.tpl
View file

@ -1,134 +0,0 @@
<h1>{L_TRACKER_CFG_TITLE}</h1>
<form action="{S_CONFIG_ACTION}" method="post">
<table class="forumline">
<col class="row1">
<col class="row2">
<tr>
<th colspan="2">{L_TRACKER_SETTINGS}</th>
</tr>
<!-- IF DISABLE_SUBMIT -->
<tr>
<td colspan="2" class="pad_0 tCenter">
<p class="warnColor1 warnBorder1 pad_10">{L_CHANGES_DISABLED}</p>
</td>
</tr>
<!-- ENDIF -->
<tr>
<td width="70%"><h4>{L_OFF_TRACKER}</h4></td>
<td width="30%"><label for="off1"><input type="radio" name="off" id="off1" value="1" {OFF_YES} /> {L_OFF_YES}&nbsp;</label><label for="off2">&nbsp;<input type="radio" name="off" id="off2" value="0" {OFF_NO} /> {L_OFF_NO} &nbsp;</label></td>
</tr>
<tr>
<td style="padding-left: 20px"><h4>{L_OFF_REASON}</h4><h6>{L_OFF_REASON_EXPL}</h6></td>
<td>&nbsp; <input class="post" type="text" size="30" maxlength="255" name="off_reason" value="{OFF_REASON}" /></span></td>
</tr>
<tr>
<td><h4>{L_AUTOCLEAN}</h4><h6>Used in cron <b>Tracker cleanup and dlstat</b></h6><h6>{L_AUTOCLEAN_EXPL}</h6></td>
<td><label for="autoclean1"><input type="radio" name="autoclean" id="autoclean1" value="1" {AUTOCLEAN_YES} /> {L_AUTOCLEAN_YES}&nbsp;</label><label for="autoclean2">&nbsp;<input type="radio" name="autoclean" id="autoclean2" value="0" {AUTOCLEAN_NO} /> {L_AUTOCLEAN_NO} &nbsp;</label></td>
</tr>
<tr>
<td><h4>{L_COMPACT_MODE}</h4><h6>{L_COMPACT_MODE_EXPL}</h6></td>
<td><label for="compact_mode1"><input type="radio" name="compact_mode" id="compact_mode1" value="1" {COMPACT_MODE_YES} /> {L_COMPACT_MODE_YES}&nbsp;</label><label for="compact_mode2">&nbsp;<input type="radio" name="compact_mode" id="compact_mode2" value="0" {COMPACT_MODE_NO} /> {L_COMPACT_MODE_NO} &nbsp;</label></td>
</tr>
<tr>
<td><h4>{L_BROWSER_REDIRECT_URL}</h4><h6>{L_BROWSER_REDIRECT_URL_EXPL}</h6></td>
<td>&nbsp; <input class="post" type="text" size="35" maxlength="255" name="browser_redirect_url" value="{BROWSER_REDIRECT_URL}" /></span>&nbsp;</td>
</tr>
<tr>
<th colspan="2">{L_USE_AUTH_KEY_HEAD}</th>
</tr>
<tr>
<td><h4>{L_USE_AUTH_KEY}</h4><h6>{L_USE_AUTH_KEY_EXPL}</h6></td>
<td>&nbsp; {L_YES}</td>
</tr>
<tr>
<td><h4>{L_AUTH_KEY_NAME}</h4><h5>$bb_cfg['passkey_key']</h5><h6>{L_AUTH_KEY_NAME_EXPL}</h6></td>
<td>&nbsp; <b>{PASSKEY_KEY}</b></td>
</tr>
<tr>
<td><h4>{L_ALLOW_GUEST_DL}</h4><!-- IF L_ALLOW_GUEST_DL_EXPL --><h6>{L_ALLOW_GUEST_DL_EXPL}</h6><!-- ENDIF --></td>
<td>&nbsp; <!-- IF $bb_cfg['bt_tor_browse_only_reg'] -->{L_NO}<!-- ELSE -->{L_YES}<!-- ENDIF --></td>
</tr>
<tr>
<th colspan="2">{L_LIMIT_ACTIVE_TOR_HEAD}</th>
</tr>
<tr>
<td><h4>{L_NUMWANT}</h4><h6>{L_NUMWANT_EXPL}</h6></td>
<td>&nbsp; <input class="post" type="text" size="3" maxlength="4" name="numwant" value="{NUMWANT}" /></td>
</tr>
<tr>
<td><h4>{L_LIMIT_ACTIVE_TOR}</h4></td>
<td><label for="limit_active_tor1"><input type="radio" name="limit_active_tor" id="limit_active_tor1" value="1" {LIMIT_ACTIVE_TOR_YES} /> {L_LIMIT_ACTIVE_TOR_YES}&nbsp;</label><label for="limit_active_tor2">&nbsp;<input type="radio" name="limit_active_tor" id="limit_active_tor2" value="0" {LIMIT_ACTIVE_TOR_NO} /> {L_LIMIT_ACTIVE_TOR_NO} &nbsp;</label></td>
</tr>
<tr>
<td style="padding-left: 20px"><h4>{L_LIMIT_SEED_COUNT}</h4><h6>{L_LIMIT_SEED_COUNT_EXPL}</h6></td>
<td>&nbsp; <input class="post" type="text" size="3" maxlength="4" name="limit_seed_count" value="{LIMIT_SEED_COUNT}" /> <span class="med">torrents</span></td>
</tr>
<tr>
<td style="padding-left: 20px"><h4>{L_LIMIT_LEECH_COUNT}</h4><h6>{L_LIMIT_LEECH_COUNT_EXPL}</h6></td>
<td>&nbsp; <input class="post" type="text" size="3" maxlength="4" name="limit_leech_count" value="{LIMIT_LEECH_COUNT}" /> <span class="med">torrents</span></td>
</tr>
<tr>
<td style="padding-left: 20px"><h4>{L_LEECH_EXPIRE_FACTOR}</h4><h6>{L_LEECH_EXPIRE_FACTOR_EXPL}</h6></td>
<td>&nbsp; <input class="post" type="text" size="3" maxlength="4" name="leech_expire_factor" value="{LEECH_EXPIRE_FACTOR}" /> <span class="med">minutes</span></td>
</tr>
<tr>
<td><h4>{L_LIMIT_CONCURRENT_IPS}</h4><h6>{L_LIMIT_CONCURRENT_IPS_EXPL}</h6></td>
<td><label for="limit_concurrent_ips1"><input type="radio" name="limit_concurrent_ips" id="limit_concurrent_ips1" value="1" {LIMIT_CONCURRENT_IPS_YES} /> {L_LIMIT_CONCURRENT_IPS_YES}&nbsp;</label><label for="limit_concurrent_ips2">&nbsp;<input type="radio" name="limit_concurrent_ips" id="limit_concurrent_ips2" value="0" {LIMIT_CONCURRENT_IPS_NO} /> {L_LIMIT_CONCURRENT_IPS_NO} &nbsp;</label></td>
</tr>
<tr>
<td style="padding-left: 20px"><h4>{L_LIMIT_SEED_IPS}</h4><h6>{L_LIMIT_SEED_IPS_EXPL}</h6></td>
<td>&nbsp; <input class="post" type="text" size="3" maxlength="4" name="limit_seed_ips" value="{LIMIT_SEED_IPS}" /> <span class="med">IP's</span></td>
</tr>
<tr>
<td style="padding-left: 20px"><h4>{L_LIMIT_LEECH_IPS}</h4><h6>{L_LIMIT_LEECH_IPS_EXPL}</h6></td>
<td>&nbsp; <input class="post" type="text" size="3" maxlength="4" name="limit_leech_ips" value="{LIMIT_LEECH_IPS}" /> <span class="med">IP's</span></td>
</tr>
<tr>
<th colspan="2">{L_ANNOUNCE_INTERVAL_HEAD}</th>
</tr>
<tr>
<td><h4>{L_ANNOUNCE_INTERVAL}</h4><h5>$bb_cfg['announce_interval']</h5><h6>{L_ANNOUNCE_INTERVAL_EXPL}</h6></td>
<td><span class="med">&nbsp; <b>{ANNOUNCE_INTERVAL}</b></span> <span class="med">seconds</span></td>
</tr>
<tr>
<td><h4>{L_EXPIRE_FACTOR}</h4><h6>{L_EXPIRE_FACTOR_EXPL}</h6></td>
<td>&nbsp; <input class="post" type="text" size="3" maxlength="4" name="expire_factor" value="{EXPIRE_FACTOR}" /></td>
</tr>
<tr>
<td><h4>{L_UPDATE_DLSTAT}</h4><h6>Used in cron <b>Tracker cleanup and dlstat</b></h6></td>
<td><label for="update_dlstat1"><input type="radio" name="update_dlstat" id="update_dlstat1" value="1" {UPDATE_DLSTAT_YES} /> {L_UPDATE_DLSTAT_YES}&nbsp;</label><label for="update_dlstat2">&nbsp;<input type="radio" name="update_dlstat" id="update_dlstat2" value="0" {UPDATE_DLSTAT_NO} /> {L_UPDATE_DLSTAT_NO} &nbsp;</label></td>
</tr>
<tr>
<td><h4>{L_ADD_RETRACKER}</h4></td>
<td><label for="retracker_true"><input type="radio" name="retracker" id="retracker_true" value="1" {RETRACKER_YES} /> {L_YES}&nbsp;</label><label for="retracker_false">&nbsp;<input type="radio" name="retracker" id="retracker_false" value="0" {RETRACKER_NO} /> {L_NO} &nbsp;</label></td>
</tr>
<tr>
<td><h4>{L_GOLD} / {L_SILVER}</h4></td>
<td>
<label><input type="radio" name="gold_silver_enabled" value="1" <!-- IF GOLD_SILVER_ENABLED -->checked="checked"<!-- ENDIF --> />{L_ENABLED}</label>
<label><input type="radio" name="gold_silver_enabled" value="0" <!-- IF not GOLD_SILVER_ENABLED -->checked="checked"<!-- ENDIF --> />{L_DISABLED}</label>
</td>
</tr>
<tr>
<td><h4>{L_IGNORE_GIVEN_IP}</h4><h5>$bb_cfg['ignore_reported_ip']</h5><h6><!-- IF L_IGNOR_GIVEN_IP_EXPL -->{L_IGNOR_GIVEN_IP_EXPL}<!-- ENDIF --></h6></td>
<td>&nbsp; <!-- IF IGNORE_REPORTED_IP -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
</tr>
<tr>
<td colspan="2" class="catBottom">
<!-- IF not DISABLE_SUBMIT -->
{S_HIDDEN_FIELDS}
<input type="submit" name="set_defaults" id="def" value="{L_SET_DEFAULTS}" class="liteoption" disabled="disabled" />&nbsp;
<input type="reset" value="{L_RESET}" class="liteoption" />&nbsp;
<input type="submit" name="submit" id="send" value="{L_SUBMIT}" class="mainoption" disabled="disabled" />&nbsp;
<label for="confirm">{L_CONFIRM}&nbsp;<input onclick="toggle_disabled('def', this.checked); toggle_disabled('send', this.checked)" id="confirm" type="checkbox" name="confirm" value="1" /></label>
<!-- ENDIF -->
</td>
</tr>
</table>
</form>
<br clear="all" />

3
styles/templates/admin/admin_disallow.tpl
View file

@ -12,8 +12,7 @@
<th colspan="2">{L_ADD_DISALLOW_TITLE}</th>
</tr>
<tr>
<td><h4>{L_USERNAME}</h4><h6>{L_ADD_DISALLOW_EXPLAIN}</h6></td>
<td><input class="post" type="text" name="disallowed_user" size="30" />&nbsp;<input type="submit" name="add_name" value="{L_ADD_DISALLOW}" class="mainoption" /></td>
<td colspan="2"><input class="post" type="text" name="disallowed_user" size="100" />&nbsp;<input type="submit" name="add_name" value="{L_ADD_DISALLOW}" class="mainoption" /></td>
</tr>
<tr>
<th colspan="2">{L_DELETE_DISALLOW_TITLE}</th>