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

Timestamp:

Feb 22, 2015, 11:20:50 PM (9 years ago)

Author:

chronos

Message:

• Modified: Tabs converted to spaces.
• Modified: Remove spaces from end of lines.
• Added: Code format script.

File:

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

trunk/Modules/User/User.php

@@ -8 +8 @@
 class ModuleUser extends AppModule
 {
-        function __construct($System)
-        {
-                parent::__construct($System);
-                $this->Name = 'User';
-                $this->Version = '1.1';
-                $this->Creator = 'Chronos';
-                $this->License = 'GNU/GPL';
-                $this->Description = 'User and permission management';
-                $this->Dependencies = array();
-        }
-
-        function Start()
-        {
-                $this->System->User = new User($this->System);
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'User';
+    $this->Version = '1.1';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPL';
+    $this->Description = 'User and permission management';
+    $this->Dependencies = array();
+  }
+
+  function Start()
+  {
+    $this->System->User = new User($this->System);
     $this->System->RegisterPage('userlist.php', 'PageUserList');
-                $this->System->RegisterPage('Options.php', 'PageUserOptions');
-                $this->System->RegisterPage('registrace.php', 'PageUserRegistration');
-                $this->System->RegisterPage('user.php', 'PageUserProfile');
-                $this->System->RegisterPage('login', 'PageUserLogin');
-                $this->System->RegisterMenuItem(array(
-        'Title' => T('Translators'),
-        'Hint' => 'Seznam registrovaných uživatelů',
-        'Link' => $this->System->Link('/userlist.php'),
-        'Permission' => LICENCE_ANONYMOUS,
-        'Icon' => '',
+    $this->System->RegisterPage('Options.php', 'PageUserOptions');
+    $this->System->RegisterPage('registrace.php', 'PageUserRegistration');
+    $this->System->RegisterPage('user.php', 'PageUserProfile');
+    $this->System->RegisterPage('login', 'PageUserLogin');
+    $this->System->RegisterMenuItem(array(
+      'Title' => T('Translators'),
+      'Hint' => 'Seznam registrovaných uživatelů',
+      'Link' => $this->System->Link('/userlist.php'),
+      'Permission' => LICENCE_ANONYMOUS,
+      'Icon' => '',
     ), 0);
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('user',
       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 ('.
+  }
+
+  function ShowOnlineList()
+  {
+    $Output = T('Online translators').':<br />';
+    $DbResult = $this->System->Database->query('SELECT * FROM ('.
 'SELECT `User`.`Name`, `User`.`ID` FROM `UserOnline` '.
-                                'JOIN `User` ON `User`.`ID` = `UserOnline`.`User` '.
-                                'WHERE (`ActivityTime` >= NOW() - 300) '.
-                                'ORDER BY `ActivityTime` DESC ) AS `T` GROUP BY `Name`');
-                while($DbUser = $DbResult->fetch_assoc())
-                {
-                        $Name = '<a href="'.$this->System->Link('/user.php?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
-                        $Output .= $Name.'<br />';
-                }
-                return($Output);
-        }
+        'JOIN `User` ON `User`.`ID` = `UserOnline`.`User` '.
+        'WHERE (`ActivityTime` >= NOW() - 300) '.
+        'ORDER BY `ActivityTime` DESC ) AS `T` GROUP BY `Name`');
+    while($DbUser = $DbResult->fetch_assoc())
+    {
+      $Name = '<a href="'.$this->System->Link('/user.php?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
+      $Output .= $Name.'<br />';
+    }
+    return($Output);
+  }
 }
 
 class PageUserLogin extends Page
 {
-        function Show()
-        {
-                $Output = '<form action="'.$this->System->Link('/?action=login').'" method="post">'.
-                        '<fieldset><legend>'.T('Login').'</legend>
-                        <table>
-                        <tr>
-                        <td>'.T('Name').':</td><td><input type="text" name="LoginUser" size="13" /></td>
-                        </tr>
-                        <tr>
-                        <td>'.T('Password').':</td><td><input type="password" name="LoginPass" size="13" /></td>
-                        </tr>
-                        <tr>
-                        <td>'.T('Stay logged').':</td><td><input type="checkbox" name="StayLogged" /></td>
-                        </tr>
-                        <tr>
-                        <th><input type="submit" value="'.T('Do login').'" /></th>
-                        </tr>
-                        </table>
-                        </fieldset></form>';
-                        return($Output);
-        }
+  function Show()
+  {
+    $Output = '<form action="'.$this->System->Link('/?action=login').'" method="post">'.
+      '<fieldset><legend>'.T('Login').'</legend>
+      <table>
+      <tr>
+      <td>'.T('Name').':</td><td><input type="text" name="LoginUser" size="13" /></td>
+      </tr>
+      <tr>
+      <td>'.T('Password').':</td><td><input type="password" name="LoginPass" size="13" /></td>
+      </tr>
+      <tr>
+      <td>'.T('Stay logged').':</td><td><input type="checkbox" name="StayLogged" /></td>
+      </tr>
+      <tr>
+      <th><input type="submit" value="'.T('Do login').'" /></th>
+      </tr>
+      </table>
+      </fieldset></form>';
+      return($Output);
+  }
 }
 
@@ -114 +114 @@
   function Login($Name, $Password, $StayLogged = false)
   {
-        $SID = session_id();
+    $SID = session_id();
     $DbResult = $this->Database->query('SELECT `ID` FROM `User` WHERE '.
       'LOWER(`Name`) = LOWER("'.$Name.'") AND `Pass` = '.$this->CryptPasswordSQL('"'.$Password.'"', '`Salt`'));
@@ -147 +147 @@
   function Logout()
   {
-        $SID = session_id();
+    $SID = session_id();
     if($this->Role != LICENCE_ANONYMOUS)
     {
@@ -162 +162 @@
     $DbResult = $this->Database->query('SELECT `User`.`PreferredVersion`,`User`.`ID`,`User`.`Team`,`User`.`Redirecting`,`User`.`Email`,`User`.`Info`,'.
     '`User`.`Language`,`User`.`Name`,`User`.`GM`,`ClientVersion`.`Version` AS `PreferredVersionGame` FROM `User` '.
-                'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
+    'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
     'WHERE `User`.`ID` = '.$this->Id);
     if($DbResult->num_rows > 0)
@@ -230 +230 @@
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('ActivityTime' => 'NOW()'));
     } else {
-        if(GetRemoteAddress() != '') $HostName = gethostbyaddr(GetRemoteAddress());
-          else $HostName = '';
-        $this->Database->insert('UserOnline', array('SessionId' => $SID,
+      if(GetRemoteAddress() != '') $HostName = gethostbyaddr(GetRemoteAddress());
+        else $HostName = '';
+      $this->Database->insert('UserOnline', array('SessionId' => $SID,
       'User' => null, 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()',
       'IpAddress' => GetRemoteAddress(), 'HostName' => $HostName,
       'ScriptName' => GetRequestURI()));
     }
-        
+
     // 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
+    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'] != '')
     {
-        $this->Id = $Row['User'];
+      $this->Id = $Row['User'];
       $this->Load();
     } else