Changeset 880 for trunk/Modules/User/User.php

Timestamp:

Apr 7, 2020, 10:15:48 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• trunk/Modules/User/User.php (modified) (17 diffs)

trunk/Modules/User/User.php

@@ -34 +34 @@
       'Icon' => '',
     ), 0);
-    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+    if (array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('user',
       T('Translators'), array('Name'), '`User`', $this->System->Link('/users/?search='));
@@ -49 +49 @@
       'WHERE (`ActivityTime` >= NOW() - 300) '.
       'ORDER BY `ActivityTime` DESC ) AS `T` GROUP BY `Name`');
-    while($DbUser = $DbResult->fetch_assoc())
+    while ($DbUser = $DbResult->fetch_assoc())
     {
       $Name = '<a href="'.$this->System->Link('/user/?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
       $Output .= $Name.'<br />';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -60 +60 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       //$DbResult =$this->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$this->System->User->Team);
@@ -79 +79 @@
         '<a href="'.$this->System->Link('/registration/').'">'.T('Registration').'</a>';
     }
-    return($Output);
+    return $Output;
   }
 }
@@ -104 +104 @@
       </table>
       </fieldset></form>';
-      return($Output);
+      return $Output;
   }
 }
@@ -132 +132 @@
     $this->Database = &$System->Database;
     $this->OnlineStateTimeout = 600; // in seconds
-    if(isset($_SESSION)) $this->Check();
+    if (isset($_SESSION)) $this->Check();
   }
 
@@ -144 +144 @@
     $DbResult = $this->Database->query('SELECT `ID` FROM `User` WHERE '.
       'LOWER(`Name`) = LOWER("'.$Name.'") AND `Pass` = '.$this->CryptPasswordSQL('"'.$Password.'"', '`Salt`'));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $User = $DbResult->fetch_assoc();
@@ -151 +151 @@
       // Prepare cookies for permanent login
       $StayLoggedSalt = $this->GetPasswordSalt();
-      if($StayLogged == true) $StayLoggedValue = 1; else $StayLoggedValue = 0;
+      if ($StayLogged == true) $StayLoggedValue = 1; else $StayLoggedValue = 0;
       $this->Database->update('UserOnline', '`SessionId`="'.$SID.'"', array(
         'User' => $User['ID'], 'StayLogged' => $StayLoggedValue, 'StayLoggedHash' => $StayLoggedSalt));
-      if($StayLogged)
+      if ($StayLogged)
       {
         setcookie('LoginUserId', $User['ID'], time() + 365 * 24 * 60 * 60);
@@ -176 +176 @@
   {
     $SID = session_id();
-    if($this->Role != LICENCE_ANONYMOUS)
+    if ($this->Role != LICENCE_ANONYMOUS)
     {
       $this->Database->update('UserOnline', '`SessionId`="'.$SID.'"', array('User' => null));
@@ -192 +192 @@
     'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
     'WHERE `User`.`ID` = '.$this->Id);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $User = $DbResult->fetch_assoc();
@@ -222 +222 @@
   function Licence($Licence)
   {
-    if(GetRemoteAddress() == '') return(true); // Execution from command line
-      else return($this->Role >= $Licence);
+    if (GetRemoteAddress() == '') return true; // Execution from command line
+      else return $this->Role >= $Licence;
   }
 
@@ -229 +229 @@
   {
     $DbResult = $this->Database->select('APIToken', 'User', '`Token`="'.$Token.'"');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
       $DbResult2 = $this->Database->select('User', 'GM', '`ID`="'.$DbRow['User'].'"');
       $DbRow2 = $DbResult2->fetch_assoc();
-      return($DbRow2['GM'] >= $Licence);
-    } else return(false);
+      return $DbRow2['GM'] >= $Licence;
+    } else return false;
   }
 
   function GetPasswordSalt()
   {
-    return(substr(sha1(mt_rand()), 0, 8));
+    return substr(sha1(mt_rand()), 0, 8);
   }
 
   function CryptPasswordSQL($Password, $Salt)
   {
-    return('SHA1(CONCAT(SHA1('.$Password.'), '.$Salt.'))');
+    return 'SHA1(CONCAT(SHA1('.$Password.'), '.$Salt.'))';
   }
 
@@ -253 +253 @@
     // Lookup user record
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
-    if($Query->num_rows > 0)
+    if ($Query->num_rows > 0)
     {
       // Refresh time of last access
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('ActivityTime' => 'NOW()'));
     } else {
-      if(GetRemoteAddress() != '') $HostName = gethostbyaddr(GetRemoteAddress());
+      if (GetRemoteAddress() != '') $HostName = gethostbyaddr(GetRemoteAddress());
         else $HostName = '';
       $this->Database->insert('UserOnline', array('SessionId' => $SID,
@@ -267 +267 @@
 
     // Logged permanently?
-    if(array_key_exists('LoginHash', $_COOKIE))
+    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)
+      if ($DbResult->num_rows > 0)
       {
         $DbRow = $DbResult->fetch_assoc();
-        if(sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
+        if (sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
         {
           $this->Database->query('DELETE FROM `UserOnline` WHERE `SessionId`="'.$SID.'"');
@@ -285 +285 @@
     $Query = $this->Database->select('UserOnline', '*', '`SessionId`="'.$SID.'"');
     $Row = $Query->fetch_assoc();
-    if($Row['User'] != '')
+    if ($Row['User'] != '')
     {
       $this->Id = $Row['User'];
@@ -296 +296 @@
     // Remove nonactive users
     $DbResult = $this->Database->select('UserOnline', '`Id`, `User`', '(`ActivityTime` < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)) AND (`StayLogged` = 0)');
-    while($DbRow = $DbResult->fetch_array())
+    while ($DbRow = $DbResult->fetch_array())
     {
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
@@ -305 +305 @@
   {
     $Salt = $this->GetPasswordSalt();
-    if($Team == null) $Team = 'NULL';
-    if($PreferredVersion == null) $PreferredVersion = 'NULL';
+    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` ) '.