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 (#976)

Browse source
This commit is contained in:
Roman Kelesidis 2023-10-17 09:10:13 +07:00 • committed by GitHub
commit 65c5e5a275
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,8 +103,8 @@ switch ($mode) {
'user_password' => true, 'user_password' => true,
'user_email' => true, // должен быть после user_password 'user_email' => true, // должен быть после user_password
'user_lang' => true, 'user_lang' => true,
'user_gender' => true, 'user_gender' => $bb_cfg['gender'],
'user_birthday' => true, 'user_birthday' => $bb_cfg['birthday_enabled'],
'user_timezone' => true, 'user_timezone' => true,
'user_opt' => true, 'user_opt' => true,
'avatar_ext_id' => true, 'avatar_ext_id' => true,
@ -159,9 +159,14 @@ if ($submit) {
$cur_pass_valid = $adm_edit; $cur_pass_valid = $adm_edit;
foreach ($profile_fields as $field => $can_edit) { foreach ($profile_fields as $field => $can_edit) {
// Проверка на возможность редактирования
if ((bool)$can_edit === false) {
continue;
}
switch ($field) { switch ($field) {
/** /**
* Активация (edit, reg) * Активация (edit)
*/ */
case 'user_active': case 'user_active':
$active = isset($_POST['user_active']) ? (int)$_POST['user_active'] : $pr_data['user_active']; $active = isset($_POST['user_active']) ? (int)$_POST['user_active'] : $pr_data['user_active'];
@ -182,7 +187,7 @@ foreach ($profile_fields as $field => $can_edit) {
if (!$errors and $err && $mode == 'register') { if (!$errors and $err && $mode == 'register') {
$errors[] = $err; $errors[] = $err;
} }
if ($can_edit && $username != $pr_data['username'] || $mode == 'register') { if ($username != $pr_data['username'] || $mode == 'register') {
$pr_data['username'] = $username; $pr_data['username'] = $username;
$db_data['username'] = $username; $db_data['username'] = $username;
} }
@ -281,7 +286,7 @@ foreach ($profile_fields as $field => $can_edit) {
break; break;
/** /**
* Пол (edit, reg) * Пол (edit)
*/ */
case 'user_gender': case 'user_gender':
$user_gender = isset($_POST['user_gender']) ? (int)$_POST['user_gender'] : $pr_data['user_gender']; $user_gender = isset($_POST['user_gender']) ? (int)$_POST['user_gender'] : $pr_data['user_gender'];
@ -317,7 +322,7 @@ foreach ($profile_fields as $field => $can_edit) {
break; break;
/** /**
* opt (edit) * opt (edit, reg)
*/ */
case 'user_opt': case 'user_opt':
$user_opt = $pr_data['user_opt']; $user_opt = $pr_data['user_opt'];
@ -453,7 +458,7 @@ foreach ($profile_fields as $field => $can_edit) {
break; break;
/** /**
* Интересы * Интересы (edit)
*/ */
case 'user_interests': case 'user_interests':
$interests = isset($_POST['user_interests']) ? (string)$_POST['user_interests'] : $pr_data['user_interests']; $interests = isset($_POST['user_interests']) ? (string)$_POST['user_interests'] : $pr_data['user_interests'];
@ -466,7 +471,7 @@ foreach ($profile_fields as $field => $can_edit) {
break; break;
/** /**
* Skype * Skype (edit)
*/ */
case 'user_skype': case 'user_skype':
$skype = isset($_POST['user_skype']) ? (string)$_POST['user_skype'] : $pr_data['user_skype']; $skype = isset($_POST['user_skype']) ? (string)$_POST['user_skype'] : $pr_data['user_skype'];
@ -481,7 +486,7 @@ foreach ($profile_fields as $field => $can_edit) {
break; break;
/** /**
* Twitter * Twitter (edit)
*/ */
case 'user_twitter': case 'user_twitter':
$twitter = isset($_POST['user_twitter']) ? (string)$_POST['user_twitter'] : $pr_data['user_twitter']; $twitter = isset($_POST['user_twitter']) ? (string)$_POST['user_twitter'] : $pr_data['user_twitter'];

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

@ -50,7 +50,7 @@
<script type="text/javascript"> <script type="text/javascript">
function checkForm(formObj) { function checkForm(formObj) {
var formErrors = false; let formErrors = false;
if (formObj.message.value.length < 2) { if (formObj.message.value.length < 2) {
formErrors = "{L_EMPTY_MESSAGE_EMAIL}"; formErrors = "{L_EMPTY_MESSAGE_EMAIL}";

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

@ -286,7 +286,7 @@ function go_to_page ()
<div id="logo"> <div id="logo">
<!--<h1>{SITENAME}</h1> <!--<h1>{SITENAME}</h1>
<h6>{SITE_DESCRIPTION}</h6> --> <h6>{SITE_DESCRIPTION}</h6> -->
<a href="{U_INDEX}"><img src="styles/images/logo/logo.png" alt="{SITENAME}" /></a> <a href="{U_INDEX}"><img src="styles/images/logo/logo.png" title="{SITENAME}" alt="{SITENAME}" /></a>
</div> </div>
<!--/logo--> <!--/logo-->

27
styles/templates/default/usercp_email.tpl
View file

@ -48,21 +48,18 @@
</div><!--/bottom_info--> </div><!--/bottom_info-->
<script type="text/javascript"> <script type="text/javascript">
function checkForm(formObj) { function checkForm(formObj) {
let formErrors = false;
var formErrors = false; if (formObj.message.value.length < 2) {
formErrors = "{L_EMPTY_MESSAGE_EMAIL}";
} else if (formObj.subject.value.length < 2) {
formErrors = "{L_EMPTY_SUBJECT_EMAIL}";
}
if (formObj.message.value.length < 2) { if (formErrors) {
formErrors = "{L_EMPTY_MESSAGE_EMAIL}"; alert(formErrors);
} return false;
else if ( formObj.subject.value.length < 2) }
{ }
formErrors = "{L_EMPTY_SUBJECT_EMAIL}";
}
if (formErrors) {
alert(formErrors);
return false;
}
}
</script> </script>