Changeset 801

Timestamp:

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

Author:

chronos

Message:

• Fixed: Better registration form values validation.

Location:

trunk

Files:

• Modules/FrontPage/FrontPage.php (modified) (1 diff)
• Modules/User/Registration.php (modified) (4 diffs)
• Modules/User/User.php (modified) (16 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/FrontPage/FrontPage.php

@@ -136 +136 @@
         if(isset($_GET['Action']))
         {
-                if($_GET['Action'] == 'HideWelcome') $_COOKIE['HideWelcome'] = 1;
-                if($_GET['Action'] == 'UnHideWelcome') $_COOKIE['HideWelcome'] = 0;
+                if($_GET['Action'] == 'HideWelcome')
+      {
+        $_COOKIE['HideWelcome'] = 1;
+        setcookie('HideWelcome', $_COOKIE['HideWelcome'], time() + 3600 * 24 * 365);
+      }
+                if($_GET['Action'] == 'UnHideWelcome')
+      {
+                        $_COOKIE['HideWelcome'] = 0;
+        setcookie('HideWelcome', $_COOKIE['HideWelcome'], time() + 3600 * 24 * 365);
+                }
         }
-        setcookie('HideWelcome', $_COOKIE['HideWelcome'], time() + 3600 * 24 * 365);
 
         if(isset($_COOKIE['HideWelcome']) and ($_COOKIE['HideWelcome'] == 1))

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);
-        }       
-} 
+        }
+}

trunk/Modules/User/User.php

@@ -18 +18 @@
                 $this->Dependencies = array();
         }
-        
+
         function Start()
         {
@@ -38 +38 @@
       T('Translators'), array('Name'), '`User`', $this->System->Link('/userlist.php?search='));
         }
-        
+
         function ShowOnlineList()
         {
                 $Output = T('Online translators').':<br />';
-                $DbResult = $this->System->Database->query('SELECT * FROM ('. 
+                $DbResult = $this->System->Database->query('SELECT * FROM ('.
 'SELECT `User`.`Name`, `User`.`ID` FROM `UserOnline` '.
                                 'JOIN `User` ON `User`.`ID` = `UserOnline`.`User` '.
@@ -53 +53 @@
                 }
                 return($Output);
-        }       
+        }
 }
 
@@ -61 +61 @@
         {
                 $Output = '<form action="'.$this->System->Link('/?action=login').'" method="post">'.
-                        '<fieldset><legend>'.T('Login').'</legend>                      
+                        '<fieldset><legend>'.T('Login').'</legend>
                         <table>
                         <tr>
@@ -99 +99 @@
   var $OnlineStateTimeout;
   var $PreferredVersion = 0;
-  
+
   function __construct($System)
   {
@@ -105 +105 @@
     $this->Database = &$System->Database;
     $this->OnlineStateTimeout = 600; // in seconds
-    if(isset($_SESSION)) $this->Check();    
-  }
-  
+    if(isset($_SESSION)) $this->Check();
+  }
+
   function __destroy()
   {
   }
-  
+
   function Login($Name, $Password, $StayLogged = false)
   {
@@ -120 +120 @@
     {
       $User = $DbResult->fetch_assoc();
-      $this->Id = $User['ID']; 
-      
-      // Prepare cookies for permanent login     
+      $this->Id = $User['ID'];
+
+      // Prepare cookies for permanent login
       $StayLoggedSalt = $this->GetPasswordSalt();
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array(
         'User' => $User['ID'], 'StayLogged' => $StayLogged, 'StayLoggedHash' => $StayLoggedSalt));
-      if($StayLogged) 
+      if($StayLogged)
       {
         setcookie('LoginUserId', $User['ID'], time()+365*24*60*60);
@@ -133 +133 @@
         setcookie('LoginUserId', '', time() - 3600);
         setcookie('LoginHash', '', time() - 3600);
-      }      
-      
+      }
+
       $this->Database->query('UPDATE `UserTrace` SET '.
         '`LastLogin` = NOW(), '.
@@ -144 +144 @@
     };
   }
-  
+
   function Logout()
   {
@@ -157 +157 @@
     }
   }
-  
+
   function Load()
   {
@@ -180 +180 @@
     } else $this->SetAnonymous();
   }
-  
+
   function SetAnonymous()
   {
@@ -187 +187 @@
     $this->Role = LICENCE_ANONYMOUS;
     $this->Language = NULL;
-    $this->Redirecting = 1; 
+    $this->Redirecting = 1;
     $this->Team = '';
     $this->Email = '';
   }
-  
+
   function Licence($Licence)
   {
     if(!isset($_SERVER['REMOTE_ADDR'])) return(true); // Execution from command line
-    else return($this->Role >= $Licence);    
-  }
-  
+    else return($this->Role >= $Licence);
+  }
+
   function CheckToken($Licence, $Token)
   {
@@ -207 +207 @@
       $DbRow2 = $DbResult2->fetch_assoc();
       return($DbRow2['GM'] >= $Licence);
-    } else return(false);    
+    } else return(false);
   }
 
@@ -214 +214 @@
     return(substr(sha1(mt_rand()), 0, 8));
   }
-  
+
   function CryptPasswordSQL($Password, $Salt)
   {
     return('SHA1(CONCAT(SHA1('.$Password.'), '.$Salt.'))');
-  } 
-  
+  }
+
   function Check()
   {
@@ -229 +229 @@
       // Refresh time of last access
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('ActivityTime' => 'NOW()'));
-    } else $this->Database->insert('UserOnline', array('SessionId' => $SID, 
-      'User' => null, 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()', 
-      'IpAddress' => GetRemoteAddress(), 'HostName' => gethostbyaddr(GetRemoteAddress()), 
+    } else $this->Database->insert('UserOnline', array('SessionId' => $SID,
+      'User' => null, 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()',
+      'IpAddress' => GetRemoteAddress(), 'HostName' => gethostbyaddr(GetRemoteAddress()),
       'ScriptName' => $_SERVER['REQUEST_URI']));
-      
-    // Logged permanently? 
-          if(array_key_exists('LoginHash', $_COOKIE)) 
-          { 
-            $DbResult = $this->Database->query('SELECT * FROM `UserOnline` WHERE `User`='.$_COOKIE['LoginUserId']. 
-              ' AND `StayLogged`=1 AND SessionId!="'.$SID.'"'); 
-            if($DbResult->num_rows > 0) 
-            { 
-              $DbRow = $DbResult->fetch_assoc(); 
-              if(sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash']) 
-              {                
-                $this->Database->query('DELETE FROM `UserOnline` WHERE `SessionId`="'.$SID.'"'); 
-                $this->Database->query('UPDATE `UserOnline` SET `SessionId`="'.$SID.'" WHERE `Id`='.$DbRow['Id']); 
-              } 
-            } 
-    } 
-        
+
+    // Logged permanently?
+          if(array_key_exists('LoginHash', $_COOKIE))
+          {
+            $DbResult = $this->Database->query('SELECT * FROM `UserOnline` WHERE `User`='.$_COOKIE['LoginUserId'].
+              ' AND `StayLogged`=1 AND SessionId!="'.$SID.'"');
+            if($DbResult->num_rows > 0)
+            {
+              $DbRow = $DbResult->fetch_assoc();
+              if(sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
+              {
+                $this->Database->query('DELETE FROM `UserOnline` WHERE `SessionId`="'.$SID.'"');
+                $this->Database->query('UPDATE `UserOnline` SET `SessionId`="'.$SID.'" WHERE `Id`='.$DbRow['Id']);
+              }
+            }
+    }
+
           // Check login
     $Query = $this->Database->select('UserOnline', '*', '`SessionId`="'.$SID.'"');
     $Row = $Query->fetch_assoc();
-    if($Row['User'] != '') 
+    if($Row['User'] != '')
     {
         $this->Id = $Row['User'];
       $this->Load();
-    } else 
+    } else
     {
       $this->SetAnonymous();
     }
-    
+
     // Remove nonactive users
     $DbResult = $this->Database->select('UserOnline', '`Id`, `User`', '(`ActivityTime` < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)) AND (`StayLogged` = 0)');
@@ -269 +269 @@
     }
   }
-  
+
   function Register($UserName, $Password, $Email, $Language, $Team, $PreferredVersion)
   {
     $Salt = $this->GetPasswordSalt();
+    if($Team == null) $Team = 'NULL';
+    if($PreferredVersion == null) $PreferredVersion = 'NULL';
     $this->Database->query('INSERT INTO `User` '.
       '(`Name` , `Pass` , `Salt`, `Email` , `Language` , `Team` , `NeedUpdate`, `RegistrationTime`, `PreferredVersion` ) '.

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 800; // Subversion revision
+$Revision = 801; // Subversion revision
 $DatabaseRevision = 787; // Database structure revision
-$ReleaseTime = '2014-03-16';
+$ReleaseTime = '2014-03-31';