Minor improvements (#323)

* Minor improvements

* Update register.php

* Update register.php

* Update register.php

* Update register.php

* Update poll.php

* Update usercp_register.tpl

* Update page_header.tpl

* Revert "Update usercp_register.tpl"

This reverts commit 4b061c4e97.

* Update CHANGELOG.md
This commit is contained in:
Roman Kelesidis 2023-10-17 00:06:37 +07:00 committed by GitHub
parent d590760fef
commit 7e075fa622
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 10 deletions

View File

@ -10,7 +10,7 @@
- Release v2.1.5-2023.10 🎉 - Release v2.1.5-2023.10 🎉
- Updated utf8 & reflection type hint classes [\#320](https://github.com/torrentpier/torrentpier-lts/pull/320) ([belomaxorka](https://github.com/belomaxorka)) - Updated utf8 & reflection type hint classes [\#320](https://github.com/torrentpier/torrentpier-lts/pull/320) ([belomaxorka](https://github.com/belomaxorka))
- Updated Text_LangCorrect class [\#309](https://github.com/torrentpier/torrentpier-lts/pull/309) ([belomaxorka](https://github.com/belomaxorka)) - Updated Text_LangCorrect class [\#309](https://github.com/torrentpier/torrentpier-lts/pull/309) ([belomaxorka](https://github.com/belomaxorka))
- Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298), [\#300](https://github.com/torrentpier/torrentpier-lts/pull/300), [\#301](https://github.com/torrentpier/torrentpier-lts/pull/301), [\#302](https://github.com/torrentpier/torrentpier-lts/pull/302), [\#303](https://github.com/torrentpier/torrentpier-lts/pull/303), [\#305](https://github.com/torrentpier/torrentpier-lts/pull/305), [\#306](https://github.com/torrentpier/torrentpier-lts/pull/306), [\#307](https://github.com/torrentpier/torrentpier-lts/pull/307), [\#310](https://github.com/torrentpier/torrentpier-lts/pull/310), [\#312](https://github.com/torrentpier/torrentpier-lts/pull/312), [\#313](https://github.com/torrentpier/torrentpier-lts/pull/313), [\#315](https://github.com/torrentpier/torrentpier-lts/pull/315), [\#316](https://github.com/torrentpier/torrentpier-lts/pull/316), [\#317](https://github.com/torrentpier/torrentpier-lts/pull/317), [\#319](https://github.com/torrentpier/torrentpier-lts/pull/319), [\#321](https://github.com/torrentpier/torrentpier-lts/pull/321), [\#322](https://github.com/torrentpier/torrentpier-lts/pull/322) ([belomaxorka](https://github.com/belomaxorka)) - Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298), [\#300](https://github.com/torrentpier/torrentpier-lts/pull/300), [\#301](https://github.com/torrentpier/torrentpier-lts/pull/301), [\#302](https://github.com/torrentpier/torrentpier-lts/pull/302), [\#303](https://github.com/torrentpier/torrentpier-lts/pull/303), [\#305](https://github.com/torrentpier/torrentpier-lts/pull/305), [\#306](https://github.com/torrentpier/torrentpier-lts/pull/306), [\#307](https://github.com/torrentpier/torrentpier-lts/pull/307), [\#310](https://github.com/torrentpier/torrentpier-lts/pull/310), [\#312](https://github.com/torrentpier/torrentpier-lts/pull/312), [\#313](https://github.com/torrentpier/torrentpier-lts/pull/313), [\#315](https://github.com/torrentpier/torrentpier-lts/pull/315), [\#316](https://github.com/torrentpier/torrentpier-lts/pull/316), [\#317](https://github.com/torrentpier/torrentpier-lts/pull/317), [\#319](https://github.com/torrentpier/torrentpier-lts/pull/319), [\#321](https://github.com/torrentpier/torrentpier-lts/pull/321), [\#322](https://github.com/torrentpier/torrentpier-lts/pull/322), [\#323](https://github.com/torrentpier/torrentpier-lts/pull/323) ([belomaxorka](https://github.com/belomaxorka))
## [v2.1.5-2023.09](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.09) (2023-10-04) ## [v2.1.5-2023.09](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.09) (2023-10-04)
[Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08-HotFix...v2.1.5-2023.09) [Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08-HotFix...v2.1.5-2023.09)

View File

@ -164,10 +164,16 @@ $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'];
@ -191,7 +197,7 @@ foreach ($profile_fields as $field => $can_edit)
{ {
$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;
@ -322,7 +328,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'];
@ -366,7 +372,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'];
@ -527,7 +533,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'];
@ -541,7 +547,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'];
@ -558,7 +564,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'];

View File

@ -139,7 +139,7 @@ switch ($mode)
bb_die($lang['NEW_POLL_ADDED']); bb_die($lang['NEW_POLL_ADDED']);
break; break;
// редакторование // редактирование
case 'poll_edit': case 'poll_edit':
if (!$t_data['topic_vote']) if (!$t_data['topic_vote'])
{ {

View File

@ -286,7 +286,7 @@ if ( (typeof(window.opera) != "undefined" && window.opera.version() < 12) || (wi
<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-->