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

Minor improvements (#1265)

Browse source
This commit is contained in:
Roman Kelesidis 2023-12-26 17:59:16 +07:00 • committed by GitHub
commit 6b798b0bf5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Validate.php
View file

@ -93,11 +93,11 @@ class Validate
* Validate user entered email * Validate user entered email
* *
* @param string $email * @param string $email
* @param bool $check_ban_and_taken * @param bool $check_taken
* *
* @return bool|string * @return bool|string
*/ */
public static function email(string $email, bool $check_ban_and_taken = true) public static function email(string $email, bool $check_taken = true)
{ {
global $lang, $userdata, $bb_cfg; global $lang, $userdata, $bb_cfg;
@ -132,19 +132,8 @@ class Validate
} }
} }
if ($check_ban_and_taken) { // Check taken
// Check banned if ($check_taken) {
$banned_emails = [];
foreach (DB()->fetch_rowset("SELECT ban_email FROM " . BB_BANLIST . " ORDER BY NULL") as $row) {
$banned_emails[] = str_replace('\*', '.*?', preg_quote($row['ban_email'], '#'));
}
if ($banned_emails_exp = implode('|', $banned_emails)) {
if (preg_match("#^($banned_emails_exp)$#i", $email)) {
return sprintf($lang['EMAIL_BANNED'], $email);
}
}
// Check taken
$email_sql = DB()->escape($email); $email_sql = DB()->escape($email);
if ($row = DB()->fetch_row("SELECT `user_email` FROM " . BB_USERS . " WHERE user_email = '$email_sql' LIMIT 1")) { if ($row = DB()->fetch_row("SELECT `user_email` FROM " . BB_USERS . " WHERE user_email = '$email_sql' LIMIT 1")) {
if ($row['user_email'] == $userdata['user_email']) { if ($row['user_email'] == $userdata['user_email']) {

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

@ -296,7 +296,7 @@ ajax.callback.index_data = function(data) {
<td id="username"> <td id="username">
<span class="editable bold">{USERNAME}</span> <span class="editable bold">{USERNAME}</span>
<!-- BEGIN ban --> <!-- BEGIN ban -->
<!-- IF ban.IS_BANNED --><b title="{L_BANNED_USERS}" style="color: red;">{L_BANNED}</b><!-- ENDIF --> <!-- IF ban.IS_BANNED -->(<b title="{L_BANNED_USERS}" style="color: red;">{L_BANNED}</b>)<!-- ENDIF -->
<!-- END ban --> <!-- END ban -->
</td> </td>
</tr> </tr>