From 65c5e5a2753b01d70a778ad2308595170cada3ef Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Tue, 17 Oct 2023 09:10:13 +0700
Subject: [PATCH] Minor improvements (#976)

---
 library/includes/ucp/register.php           | 23 +++++++++++-------
 styles/templates/admin/admin_mass_email.tpl |  2 +-
 styles/templates/default/page_header.tpl    |  2 +-
 styles/templates/default/usercp_email.tpl   | 27 +++++++++------------
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php
index 5116b8873..f5ada61f5 100644
--- a/library/includes/ucp/register.php
+++ b/library/includes/ucp/register.php
@@ -103,8 +103,8 @@ switch ($mode) {
             'user_password' => true,
             'user_email' => true, // должен быть после user_password
             'user_lang' => true,
-            'user_gender' => true,
-            'user_birthday' => true,
+            'user_gender' => $bb_cfg['gender'],
+            'user_birthday' => $bb_cfg['birthday_enabled'],
             'user_timezone' => true,
             'user_opt' => true,
             'avatar_ext_id' => true,
@@ -159,9 +159,14 @@ if ($submit) {
 $cur_pass_valid = $adm_edit;
 
 foreach ($profile_fields as $field => $can_edit) {
+    // Проверка на возможность редактирования
+    if ((bool)$can_edit === false) {
+        continue;
+    }
+
     switch ($field) {
         /**
-         *  Активация (edit, reg)
+         *  Активация (edit)
          */
         case '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') {
                     $errors[] = $err;
                 }
-                if ($can_edit && $username != $pr_data['username'] || $mode == 'register') {
+                if ($username != $pr_data['username'] || $mode == 'register') {
                     $pr_data['username'] = $username;
                     $db_data['username'] = $username;
                 }
@@ -281,7 +286,7 @@ foreach ($profile_fields as $field => $can_edit) {
             break;
 
         /**
-         *  Пол (edit, reg)
+         *  Пол (edit)
          */
         case '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;
 
         /**
-         *  opt (edit)
+         *  opt (edit, reg)
          */
         case 'user_opt':
             $user_opt = $pr_data['user_opt'];
@@ -453,7 +458,7 @@ foreach ($profile_fields as $field => $can_edit) {
             break;
 
         /**
-         *  Интересы
+         *  Интересы (edit)
          */
         case '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;
 
         /**
-         *  Skype
+         *  Skype (edit)
          */
         case '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;
 
         /**
-         *  Twitter
+         *  Twitter (edit)
          */
         case 'user_twitter':
             $twitter = isset($_POST['user_twitter']) ? (string)$_POST['user_twitter'] : $pr_data['user_twitter'];
diff --git a/styles/templates/admin/admin_mass_email.tpl b/styles/templates/admin/admin_mass_email.tpl
index c46f28967..e7139862d 100644
--- a/styles/templates/admin/admin_mass_email.tpl
+++ b/styles/templates/admin/admin_mass_email.tpl
@@ -50,7 +50,7 @@
 
 <script type="text/javascript">
     function checkForm(formObj) {
-        var formErrors = false;
+        let formErrors = false;
 
         if (formObj.message.value.length < 2) {
             formErrors = "{L_EMPTY_MESSAGE_EMAIL}";
diff --git a/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl
index b008263b1..a70f07b51 100644
--- a/styles/templates/default/page_header.tpl
+++ b/styles/templates/default/page_header.tpl
@@ -286,7 +286,7 @@ function go_to_page ()
 <div id="logo">
 	<!--<h1>{SITENAME}</h1>
 	<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>
 <!--/logo-->
 
diff --git a/styles/templates/default/usercp_email.tpl b/styles/templates/default/usercp_email.tpl
index e85339081..cd61f0426 100644
--- a/styles/templates/default/usercp_email.tpl
+++ b/styles/templates/default/usercp_email.tpl
@@ -48,21 +48,18 @@
 </div><!--/bottom_info-->
 
 <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) {
-		formErrors = "{L_EMPTY_MESSAGE_EMAIL}";
-	}
-	else if ( formObj.subject.value.length < 2)
-	{
-		formErrors = "{L_EMPTY_SUBJECT_EMAIL}";
-	}
-
-	if (formErrors) {
-		alert(formErrors);
-		return false;
-	}
-}
+        if (formErrors) {
+            alert(formErrors);
+            return false;
+        }
+    }
 </script>