Changeset 884 for trunk/Modules/User

Timestamp:

Apr 8, 2020, 7:27:09 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Error during user registration.
• Fixed: Error on user enter to new team.

Location:

trunk/Modules/User

Files:

• Options.php (modified) (2 diffs)
• Registration.php (modified) (1 diff)
• User.php (modified) (2 diffs)

trunk/Modules/User/Options.php

@@ -53 +53 @@
         '</form>';
 
-    $Output .= '  <fieldset><legend>'.T('Translation team').'</legend>';
+    $Output .= '<fieldset><legend>'.T('Translation team').'</legend>';
     $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `Team`');
-    $Output .= '<a href="team/?action=create">'.T('Create team').'</a><br />'.
-        '<a href="team/?action=leave">'.T('Leave team').'</a><br />'.
-        '<br /><form action="team/" method="get">'.
+    $Output .= '<a href="'.$this->System->Link('/team/?action=create').'">'.T('Create team').'</a><br />'.
+        '<a href="'.$this->System->Link('/team/?action=leave').'">'.T('Leave team').'</a><br />'.
+        '<br /><form action="'.$this->System->Link('/team/').'" method="get">'.
         '<input type="hidden" name="action" value="gointeam"/>'.
         '<select name="id">';
@@ -66 +66 @@
       $Output .= '>'.htmlspecialchars($LineTeam['Name']).'</option>';
     }
-    $Output .= '</select> <input type="submit" value="'.T('Enter').'" />
-    </form>';
-    $Output .= '</fieldset>';
+    $Output .= '</select>'.
+      '<input type="submit" value="'.T('Enter').'" />'.
+      '</form>';
+      '</fieldset>';
     return $Output;
   }

trunk/Modules/User/Registration.php

@@ -103 +103 @@
       if (array_key_exists('Language', $_POST)) $Language = $_POST['Language'] * 1;
         else $Language = '';
-      if (array_key_exists('ClientVersion', $_POST)) $PreferredVersion = $_POST['ClientVersion'] * 1;
+      if (array_key_exists('ClientVersion', $_POST) and is_numeric($_POST['ClientVersion']))
+        $PreferredVersion = $_POST['ClientVersion'] * 1;
         else $PreferredVersion = '';
       if ($PreferredVersion == '') $PreferredVersion = 'NULL';

trunk/Modules/User/User.php

@@ -257 +257 @@
       // Refresh time of last access
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('ActivityTime' => 'NOW()'));
-    } else {
+    } else
+    {
       if (GetRemoteAddress() != '') $HostName = gethostbyaddr(GetRemoteAddress());
         else $HostName = '';
@@ -313 +314 @@
     $UserId = $this->Database->insert_id;
     $this->Database->query('INSERT INTO `UserTrace` (`User`, `LastIP`, `UserAgent`) '.
-        'VALUES ('.$UserId.', "'.GetRemoteAddress().'", '.
-        '"'.$this->Database->real_escape_string($_SERVER['HTTP_USER_AGENT']).'")');
+      'VALUES ('.$UserId.', "'.GetRemoteAddress().'", '.
+      '"'.$this->Database->real_escape_string($_SERVER['HTTP_USER_AGENT']).'")');
   }
 }