improvement of code.

opentibiabr · May 30, 2024 · 052fea9 · 052fea9
1 parent e75bd89
commit 052fea9
Showing 1 changed file with 33 additions and 34 deletions.
diff --git a/login.php b/login.php
@@ -119,23 +119,7 @@ function parseEvent($table1, $date, $table2)
         $characters[] = createChar($config, $caster);
       }
 
-      $worlds   = [$world];
-      $playdata = compact('worlds', 'characters');
-      $session  = [
-        'sessionkey'                    => "$result->email\n$result->password",
-        'lastlogintime'                 => 0,
-        'ispremium'                     => false,
-        'premiumuntil'                  => 0,
-        'status'                        => 'active',
-        'returnernotification'          => false,
-        'showrewardnews'                => false,
-        'isreturner'                    => false,
-        'fpstracking'                   => false,
-        'optiontracking'                => false,
-        'tournamentticketpurchasestate' => 0,
-        'emailcoderequest'              => false
-      ];
-      die(json_encode(compact('session', 'playdata')));
+      die(json_encode(getSessionData($world, $result, $characters, true)));
     }
 
     $account = new OTS_Account();
@@ -170,23 +154,7 @@ function parseEvent($table1, $date, $table2)
       sendError("Error while fetching your account data. Please contact admin.");
     }
 
-    $worlds   = [$world];
-    $playdata = compact('worlds', 'characters');
-    $session  = [
-      'sessionkey'                    => "$result->email\n$result->password",
-      'lastlogintime'                 => $account ? $account->getLastLogin() : 0,
-      'ispremium'                     => $account->isPremium(),
-      'premiumuntil'                  => $premU,
-      'status'                        => 'active', // active, frozen or suspended
-      'returnernotification'          => false,
-      'showrewardnews'                => true,
-      'isreturner'                    => true,
-      'fpstracking'                   => false,
-      'optiontracking'                => false,
-      'tournamentticketpurchasestate' => 0,
-      'emailcoderequest'              => false
-    ];
-    die(json_encode(compact('session', 'playdata')));
+    die(json_encode(getSessionData($world, $result, $characters, false, $account, $premU)));
 
   default:
     sendError("Unrecognized event {$action}.");
@@ -222,6 +190,37 @@ function createChar($config, $player)
   ];
 }
 
+/**
+ * Check and return compacted session after checking cast
+ * @param $world
+ * @param $result
+ * @param $characters
+ * @param $isCast
+ * @param $account
+ * @param $premU
+ * @return array
+ */
+function getSessionData($world, $result, $characters, $isCast = false, $account = null, $premU = null): array
+{
+  $worlds   = [$world];
+  $playdata = compact('worlds', 'characters');
+  $session  = [
+    'sessionkey'                    => "$result->email\n$result->password",
+    'lastlogintime'                 => !$isCast && $account ? $account->getLastLogin() : 0,
+    'ispremium'                     => !$isCast ? $account->isPremium() : false,
+    'premiumuntil'                  => !$isCast ? $premU : 0,
+    'status'                        => 'active', // active, frozen or suspended
+    'returnernotification'          => false,
+    'showrewardnews'                => !$isCast,
+    'isreturner'                    => !$isCast,
+    'fpstracking'                   => false,
+    'optiontracking'                => false,
+    'tournamentticketpurchasestate' => 0,
+    'emailcoderequest'              => false
+  ];
+  return compact('session', 'playdata');
+}
+
 /**
  * Function to check account has premium time and update days
  * @param $db