GH-139 Use user account activation function in display code as well

mdziekon · Dec 20, 2020 · ecb0b14 · ecb0b14
1 parent cf4ee56
commit ecb0b14
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/admin/user_info.php b/admin/user_info.php
@@ -320,7 +320,11 @@
         $Data['ally_name'] = $Data['ally_request_name'];
     }
     $Player['Ally'] = ($Data['ally_id'] > 0 ? '<a class="help" title="'.$_Lang['SearchByAlly'].'" href="userlist.php?search_user='.$Data['ally_id'].'&search_by=aid">'.$Data['ally_name'].' ('.$Data['ally_id'].')</a>'.($Data['ally_request'] != 0 ? ' ['.$_Lang['Request'].']' : ($Data['ally_owner'] == $UID ? ' ['.$_Lang['Ally_owner'].']' : '')) : '&nbsp;-&nbsp;');
-    $Player['AccountActive'] = (!empty($Data['activation_code']) ? "<b class=\"orange\">{$_Lang['_no']}</b><br/>{$_Lang['ActivationCode']}: {$Data['activation_code']}" : "<b class=\"lime\">{$_Lang['_yes']}</b>");
+    $Player['AccountActive'] = (
+        !isUserAccountActivated($Data) ?
+        "<b class=\"orange\">{$_Lang['_no']}</b><br/>{$_Lang['ActivationCode']}: {$Data['activation_code']}" :
+        "<b class=\"lime\">{$_Lang['_yes']}</b>"
+    );
     $Player['DisableIPCheck'] = (($Data['noipcheck'] == 1) ? $_Lang['_no'] : $_Lang['_yes']);
     $Player['MotherPlanet'] = "{$Data['mothername']} ({$_Lang['MotherPlanet_ID']}: {$Data['id_planet']}) [<a class=\"help\" title=\"{$_Lang['GoToGalaxy']}\" href=\"../galaxy.php?mode=3&amp;galaxy={$Data['galaxy']}&amp;system={$Data['system']}&amp;planet={$Data['planet']}\">{$Data['galaxy']}:{$Data['system']}:{$Data['planet']}</a>]";
 

diff --git a/admin/userlist.php b/admin/userlist.php
@@ -859,8 +859,7 @@
             $Bloc['UserMoreInfo'] .= "<br/><span class=\"fl\"><b class=\"red\">{$_Lang['UserIsBanned']}:</b> <b class=\"{$BanColor}\">".date('d.m.Y, H:i:s', $Data['ban_endtime'])."</b></span><span class=\"fr\">({$BanTime})</span>";
         }
         // MoreInfo - Activation Link
-        if(!empty($Data['activation_code']))
-        {
+        if (!isUserAccountActivated($Data)) {
             $Bloc['UserMoreInfo'] .= "<br/><span class=\"fl\"><b class=\"orange\">{$_Lang['UserNotActivated']}</b></span><span class=\"fr\">[{$_Lang['UserActivationLink']}: <a href=\"".(GAMEURL)."activate.php?code={$Data['activation_code']}\" target=\"_blank\">".(GAMEURL)."activate.php?code=<b class=\"orange\">{$Data['activation_code']}</b></a>]</span>";
         }
         // MoreInfo - is On Deletion

diff --git a/includes/functions/GalaxyRowUser.php b/includes/functions/GalaxyRowUser.php
@@ -47,7 +47,7 @@ function GalaxyRowUser($GalaxyRowPlanet, $GalaxyRowUser, $MyBuddies, $SFBStatus)
                 $NameClasses[] = array('class' => 'red', 'importance' => 100);
             }
         }
-        else if(!empty($GalaxyRowUser['activation_code']))
+        else if(!isUserAccountActivated($GalaxyRowUser))
         {
             $Status[] = array('class' => 'nonactivated', 'sign' => $_Lang['User_NonActivated']);
             $NameClasses[] = array('class' => 'nonactivated', 'importance' => 50);

diff --git a/overview.php b/overview.php
@@ -397,8 +397,7 @@
         }
 
         // --- Activation Box
-        if(!empty($_User['activation_code']))
-        {
+        if (!isUserAccountActivated($_User)) {
             $parse['ActivationInfoBox'] = '<tr><th class="c pad5 orange" colspan="3">'.$_Lang['ActivationInfo_Text'].'</th></tr><tr><th style="visibility: hidden;">&nbsp;</th></tr>';
         }