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

Timestamp:

Mar 31, 2014, 9:10:41 AM (11 years ago)

Author:

chronos

Message:

• Fixed: Better registration form values validation.

File:

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

trunk/Modules/User/Registration.php

@@ -5 +5 @@
         function ShowForm()
         {
-                global $System;
-        
                 if(array_key_exists('sc', $_POST)) $Human = true;
-                else $Human = false;
+      else $Human = false;
                 if(array_key_exists('user', $_POST)) $UserName = $_POST['user'];
                 else $UserName = '';
@@ -17 +15 @@
                 if(array_key_exists('Language', $_POST)) $Language = $_POST['Language'];
                 else $Language = 1;
-        
+
                 $Output = '<form action="?" method="post">
                 <fieldset><legend>'.T('New user registration').'</legend>
@@ -64 +62 @@
                 </tr>';
                 $Output .= '</td></tr>'.
-                                '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection('').'</td></tr>'; 
-                
+                                '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection('').'</td></tr>';
+
         $Output .= '<tr><td>';
                 $Query = 'SELECT * FROM UserTagType';
                 $DbResult = $this->Database->query($Query);
     $Output .= 'Vyberte pravidla, kterými se při překladu chcete řídit:</td><td>';
-    while ($UserTag = $DbResult->fetch_array()) { 
-                  $checked = false; 
-      
-      $Output .= CheckBox('Tag'.$UserTag['ID'], $checked, 'CheckBox');    
+    while ($UserTag = $DbResult->fetch_array()) {
+                  $checked = false;
+
+      $Output .= CheckBox('Tag'.$UserTag['ID'], $checked, 'CheckBox');
       $Output .= ''.$UserTag['Text'].'<br />';
     }
     $Output .= '</td></tr>';
-    
+
     $Output .= '<tr>
                 <th><input type="submit" value="Registrovat" /></th>
@@ -84 +82 @@
                 return($Output);
         }
-        
+
+  function CheckRegistration()
+  {
+    global $Config;
+
+    $Output = '';
+    $ShowForm = true;
+
+      if(array_key_exists('user', $_POST)) $UserName = $_POST['user'];
+        else $UserName = '';
+      if(array_key_exists('pass', $_POST)) $Pass = $_POST['pass'];
+        else $Pass = '';
+      if(array_key_exists('pass2', $_POST)) $Pass2 = $_POST['pass2'];
+        else $Pass2 = '';
+      if(array_key_exists('Email', $_POST)) $Email = $_POST['Email'];
+        else $Email = '';
+      if(array_key_exists('Team', $_POST)) $Team = $_POST['Team'] * 1;
+        else $Team = '';
+      if(array_key_exists('Language', $_POST)) $Language = $_POST['Language'] * 1;
+        else $Language = '';
+      if(array_key_exists('ClientVersion', $_POST)) $PreferredVersion = $_POST['ClientVersion'] * 1;
+        else $PreferredVersion = '';
+      if($PreferredVersion == '') $PreferredVersion = 'NULL';
+      if(array_key_exists('sc', $_POST)) $SpamCheck = $_POST['sc'];
+        else $SpamCheck = '';
+
+      if($SpamCheck != '')
+      {
+        if(($UserName != '') and ($Pass != '') and ($Pass2 != ''))
+        {
+          if(!in_array(strtolower($UserName), $Config['ForbiddedUserNames']))
+          {
+            if($Pass == $Pass2)
+            {
+              $DbResult = $this->Database->query('SELECT * FROM `User` WHERE LOWER(`Name`) = LOWER("'.$UserName.'")');
+              $Line = $DbResult->fetch_row();
+              if(!$Line)
+              {
+                if($Team == 0) $Team = 'NULL';
+                $this->System->User->Register($UserName, $Pass, $Email, $Language, $Team, $PreferredVersion);
+                $Output .= ShowMessage('Registrace proběhla úspěšně.');
+                $Output .= 'Přečtěte si pozorně <a href="'.$this->System->Link('/info.php').'">pokyny pro překladání</a> a můžete pak hned začít překládat.';
+                $this->System->User->Login($UserName, $Pass);
+                $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel se zaregistroval: '.$UserName, LOG_TYPE_USER);
+                $ShowForm = false;
+
+                      //tag
+                $Query = 'SELECT * FROM UserTagType';
+                $DbResult = $this->Database->query($Query);
+                while ($UserTag = $DbResult->fetch_array()) {
+                if (array_key_exists('Tag'.$UserTag['ID'], $_POST)) {
+                  $Query = 'SELECT * FROM `UserTag` '.
+                  'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->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).')';
+                    $DbResult2 = $this->Database->query($Query);
+                  }
+                } else {
+                  $Query = 'DELETE FROM `UserTag` '.
+                  'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
+                  $DbResult2 = $this->Database->query($Query);
+                }
+                }
+              } else $Output = ShowMessage('Uživatel se zadanou přezdívkou již existuje.', MESSAGE_CRITICAL);
+            } else $Output = ShowMessage('Hesla se neshodují.', MESSAGE_CRITICAL);
+          } else $Output = ShowMessage('To jméno uživatele nemůžete použít.', MESSAGE_CRITICAL);
+        } else $Output = ShowMessage('Nelze použít prázdné jméno nebo heslo.', MESSAGE_CRITICAL);
+      } else $Output = ShowMessage('Nejsi člověk. Strojům není dovoleno se registrovat.', MESSAGE_CRITICAL);
+
+      if($ShowForm) $Output .= $this->ShowForm();
+      return($Output);
+  }
+
         function Show()
         {
-                global $Config;
-        
           $this->Title = T('User registration');
                 $Output = '';
                 if(array_key_exists('user', $_POST))
                 {
-                        $ShowForm = true;
-        
-                        $UserName = $_POST['user'];
-                        $Pass = $_POST['pass'];
-                        $Pass2 = $_POST['pass2'];
-                        $Email = $_POST['Email'];
-                        $Team = $_POST['Team'];
-                        $Language = $_POST['Language'];
-                        $PreferredVersion = $_POST['ClientVersion'];
-                        if($PreferredVersion == '') $PreferredVersion = 'NULL';
-                        if(array_key_exists('sc', $_POST)) $SpamCheck = $_POST['sc'];
-                        else $SpamCheck = '';
-        
-                        if($SpamCheck != '')
-                        {
-                                if(($UserName != '') and ($Pass != '') and ($Pass2 != ''))
-                                {
-                                        if(!in_array(strtolower($UserName), $Config['ForbiddedUserNames']))
-                                        {
-                                                if($Pass == $Pass2)
-                                                {
-                                                        $DbResult = $this->Database->query('SELECT * FROM `User` WHERE LOWER(`Name`) = LOWER("'.$UserName.'")');
-                                                        $Line = $DbResult->fetch_row();
-                                                        if(!$Line)
-                                                        {
-                                                                if($Team == 0) $Team = 'NULL';
-                                                                $this->System->User->Register($UserName, $Pass, $Email, $Language, $Team, $PreferredVersion);
-                                                                $Output .= ShowMessage('Registrace proběhla úspěšně.');
-                                                                $Output .= 'Přečtěte si pozorně <a href="'.$this->System->Link('/info.php').'">pokyny pro překladání</a> a můžete pak hned začít překládat.';
-                                                                $this->System->User->Login($UserName, $Pass);
-                                                                $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel se zaregistroval: '.$UserName, LOG_TYPE_USER);
-                                                                $ShowForm = false;
-                
-                                                                      //tag
-                                                        $Query = 'SELECT * FROM UserTagType';
-                                                        $DbResult = $this->Database->query($Query);
-                                        while ($UserTag = $DbResult->fetch_array()) { 
-                                        if (array_key_exists('Tag'.$UserTag['ID'], $_POST)) {
-                                                        $Query = 'SELECT * FROM `UserTag` '.
-                                                'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->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).')';
-                                                        $DbResult2 = $this->Database->query($Query);
-                                                }
-                                        } else {
-                                                        $Query = 'DELETE FROM `UserTag` '.
-                                                'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
-                                                        $DbResult2 = $this->Database->query($Query);
-                                        }
-                                        }
-                
-                
-                
-                                                        } else $Output = ShowMessage('Uživatel se zadanou přezdívkou již existuje.', MESSAGE_CRITICAL);
-                                                } else $Output = ShowMessage('Hesla se neshodují.', MESSAGE_CRITICAL);
-                                        } else $Output = ShowMessage('To jméno uživatele nemůžete použít.', MESSAGE_CRITICAL);
-                                } else $Output = ShowMessage('Nelze použít prázdné jméno nebo heslo.', MESSAGE_CRITICAL);
-                        } else $Output = ShowMessage('Nejsi člověk. Strojům není dovoleno se registrovat.', MESSAGE_CRITICAL);
-        
-                        if($ShowForm) $Output .= $this->ShowForm();
+      $Output .= $this->CheckRegistration();
                 } else $Output .= $this->ShowForm();
                 return($Output);
-        }       
-} 
+        }
+}