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

Timestamp:

Mar 6, 2023, 1:48:45 AM (14 months ago)

Author:

chronos

Message:

• Fixed: Class types casting for better type checking.
• Fixed: XML direct export.
• Modified: User class instance moved from Core class to ModuleUser class.

File:

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

trunk/Modules/User/User.php

@@ -1 +1 @@
 <?php
 
+include_once(dirname(__FILE__).'/ModuleUser.php');
 include_once(dirname(__FILE__).'/UserList.php');
 include_once(dirname(__FILE__).'/Options.php');
 include_once(dirname(__FILE__).'/Registration.php');
 include_once(dirname(__FILE__).'/Profile.php');
-
-class ModuleUser extends Module
-{
-  function __construct(System $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 DoStart(): void
-  {
-    $this->System->User = new User($this->System);
-    $this->System->RegisterPage(['users'], 'PageUserList');
-    $this->System->RegisterPage(['options'], 'PageUserOptions');
-    $this->System->RegisterPage(['registration'], 'PageUserRegistration');
-    $this->System->RegisterPage(['user'], 'PageUserProfile');
-    $this->System->RegisterPage(['login'], 'PageUserLogin');
-    Core::Cast($this->System)->RegisterMenuItem(array(
-      'Title' => T('Translators'),
-      'Hint' => 'Seznam registrovaných uživatelů',
-      'Link' => $this->System->Link('/users/'),
-      '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('/users/?search='));
-      Core::Cast($this->System)->RegisterPageBarItem('Top', 'User', array($this, 'TopBarCallback'));
-      Core::Cast($this->System)->RegisterPageBarItem('Left', 'User', array($this, 'ShowOnlineList'));
-  }
-
-  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/?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
-      $Output .= $Name.'<br />';
-    }
-    return $Output;
-  }
-
-  function TopBarCallback()
-  {
-    $Output = '';
-    if ($this->System->User->Licence(LICENCE_USER))
-    {
-      //$DbResult =$this->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$this->System->User->Team);
-      //$Team = $DbResult->fetch_assoc();
-      //$Output .= ''<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>';
-      $Output .= $this->System->User->Name.' <a href="'.$this->System->Link('/?action=logout').'">'.T('Logout').'</a>'.
-          ' <a href="'.$this->System->Link('/user/?user='.$this->System->User->Id).'">'.T('My page').'</a>'.
-          ' <a href="'.$this->System->Link('/options/').'">'.T('Options').'</a>'.
-          ' <a title="Vámi přeložené texty" href="'.$this->System->Link('/TranslationList.php?user='.
-          $this->System->User->Id.'&amp;group=0&amp;state=2&amp;text=&amp;entry=').'">'.T('Translated').'</a>'.
-          ' <a title="Vaše rozpracované text" href="'.$this->System->Link('/TranslationList.php?user='.
-          $this->System->User->Id.'&amp;group=0&amp;state=3&amp;text=&amp;entry=').'">'.T('Unfinished').'</a>'.
-          ' <a title="Nikým nepřeložené texty" href="'.
-          $this->System->Link('/TranslationList.php?user=0&amp;group=0&amp;state=1&amp;text=&amp;entry=').'">'.T('Untranslated').'</a>';
-    } else
-    {
-      $Output .= '<a href="'.$this->System->Link('/login/').'">'.T('Login').'</a>&nbsp;'.
-        '<a href="'.$this->System->Link('/registration/').'">'.T('Registration').'</a>';
-    }
-    return $Output;
-  }
-}
 
 class PageUserLogin extends Page
@@ -117 +41 @@
 {
   var $Id;
-  var $Name;
+  public string $Name;
   var $Team;
   var $Role;
@@ -126 +50 @@
   var $OnlineStateTimeout;
   var $PreferredVersion = 0;
+  public string $PreferredVersionGame;
+  public string $Email;
+  public string $Info;
 
   function __construct(System $System)