Changeset 893 for trunk/Modules/User/Registration.php

Timestamp:

Mar 6, 2023, 1:48:45 AM (21 months ago)

Author:

chronos

Message:

• Fixed: Class types casting for better type checking.
• Fixed: XML direct export.
• Modified: User class instance moved from Core class to ModuleUser class.

File:

• trunk/Modules/User/Registration.php (modified) (4 diffs)

trunk/Modules/User/Registration.php

@@ -86 +86 @@
   function CheckRegistration()
   {
-    global $Config;
-
     $Output = '';
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $ShowForm = true;
 
@@ -114 +113 @@
         if (($UserName != '') and ($Pass != '') and ($Pass2 != ''))
         {
-          if (!in_array(strtolower($UserName), $Config['ForbiddedUserNames']))
+          if (!in_array(strtolower($UserName), Core::Cast($this->System)->Config['ForbiddedUserNames']))
           {
             if ($Pass == $Pass2)
@@ -121 +120 @@
               $Line = $DbResult->fetch_row();
               if (!$Line)
-              {
+              {                
                 if ($Team == 0) $Team = 'NULL';
-                $this->System->User->Register($UserName, $Pass, $Email, $Language, $Team, $PreferredVersion);
+                $User->Register($UserName, $Pass, $Email, $Language, $Team, $PreferredVersion);
                 $Output .= ShowMessage(T('Registration was successful'));
                 $Output .= 'Přečtěte si pozorně <a href="'.$this->System->Link('/info/').'">pokyny pro překladání</a> a můžete pak hned začít překládat.';
-                $this->System->User->Login($UserName, $Pass);
+                $User->Login($UserName, $Pass);
                 $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel se zaregistroval: '.$UserName, LOG_TYPE_USER);
                 $ShowForm = false;
@@ -136 +135 @@
                 if (array_key_exists('Tag'.$UserTag['ID'], $_POST)) {
                   $Query = 'SELECT * FROM `UserTag` '.
-                  'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
+                  'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($User->Id * 1);
                   $DbResult2 = $this->Database->query($Query);
                   if ($DbResult2->num_rows == 0) {
                     $Query = 'INSERT INTO `UserTag` (`ID` ,`UserTagType`,`User` ) '.
-                    'VALUES (NULL, '.$UserTag['ID'].' , '.($this->System->User->Id * 1).')';
+                    'VALUES (NULL, '.$UserTag['ID'].' , '.($User->Id * 1).')';
                     $DbResult2 = $this->Database->query($Query);
                   }
                 } else {
                   $Query = 'DELETE FROM `UserTag` '.
-                  'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
+                  'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($User->Id * 1);
                   $DbResult2 = $this->Database->query($Query);
                 }