Improved display name

visiks-vs · Mar 17, 2021 · 2f97c37 · 2f97c37
1 parent a5091dd
commit 2f97c37
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.046.1
+2.1.076.2
diff --git a/config/config.json.example b/config/config.json.example
@@ -1,5 +1,5 @@
 {
-  "VERSION":"2.1.046.1",
+  "VERSION":"2.1.076.2",
   "DB_HOST":"localhost",
   "DB_NAME":"your_database_name",
   "DB_USER":"your_database_user",

diff --git a/logic/get_user.php b/logic/get_user.php
@@ -73,7 +73,7 @@ function get_user($user_id, $public = true, $return_row = false)
 function check_trainername($row){
     global $config;
     // if Custom Trainername is enabled by config
-    if($config->CUSTOM_TRAINERNAME == false || check_for_empty_string($row['trainername']) || $row['display_name'] != 1){ // trainername not set by user
+    if($config->CUSTOM_TRAINERNAME == false || check_for_empty_string($row['trainername']) || (isset($row['display_name']) && $row['display_name'] != 1)){ // trainername not set by user
         // check if Telegram-@Nick is set
         if(!check_for_empty_string($row['nick']) && $config->RAID_POLL_SHOW_NICK_OVER_NAME){
             // set Telegram-@Nick as Name inside the bot

diff --git a/mods/change_trainername.php b/mods/change_trainername.php
@@ -11,7 +11,8 @@
     my_query(
         "
         UPDATE users
-        SET trainername =   '{$trainername}'
+        SET trainername =   '{$trainername}',
+            display_name = IF(trainername is null, 0, 1)
         WHERE user_id =     {$userid}
         "
     );

diff --git a/mods/trainer_code.php b/mods/trainer_code.php
@@ -56,10 +56,10 @@
     $keys[] = [
             [
                 'text'          => getTranslation('back'),
-                'callback_data' => $mode.':trainer_code:cancel'
+                'callback_data' => '0:trainer_code:cancel'
             ],[
                 'text'          => getTranslation('delete'),
-                'callback_data' => $mode.':trainer_code:delete'
+                'callback_data' => '0:trainer_code:delete'
             ]
         ];
     // Answer callback.

diff --git a/mods/trainer_name.php b/mods/trainer_name.php
@@ -73,23 +73,23 @@
             $keys[] = [
                     [
                         'text'          => getTranslation('switch_display_name'),
-                        'callback_data' => $mode.':trainer_name:switch'
+                        'callback_data' => '0:trainer_name:switch'
                     ]
                 ];
             $keys[] = [
                     [
                         'text'          => getTranslation('trainername_edit'),
-                        'callback_data' => $mode.':trainer_name:add'
+                        'callback_data' => '0:trainer_name:add'
                     ],[
                         'text'          => getTranslation('delete'),
-                        'callback_data' => $mode.':trainer_name:delete'
+                        'callback_data' => '0:trainer_name:delete'
                     ]
                 ];
         }else {
             $keys[] = [
                     [
                         'text'          => getTranslation('trainername_add'),
-                        'callback_data' => $mode.':trainer_name:add'
+                        'callback_data' => '0:trainer_name:add'
                     ]
                 ];
         }