Changeset 75 for trunk/www/Application/Model

Timestamp:

Aug 24, 2009, 1:18:40 PM (15 years ago)

Author:

george

Message:

• Přidáno: Podpora pro překlad rozhraní.

¨

Location:

trunk/www/Application/Model

Files:

• Backup.php (modified) (1 diff)
• Cluster.php (modified) (1 diff)
• ClusterList.php (modified) (1 diff)
• Emulator.php (modified) (1 diff)
• History.php (modified) (1 diff)
• MangosConfigurationFile.php (modified) (1 diff)
• MangosDebug.php (modified) (1 diff)
• Platform.php (modified) (1 diff)
• Realm.php (modified) (1 diff)
• Server.php (modified) (1 diff)
• Shell.php (modified) (1 diff)
• Task.php (modified) (1 diff)
• User.php (modified) (14 diffs)

trunk/www/Application/Model/Backup.php

@@ -1 +1 @@
 <?php
 
-class Backup extends Module
+class Backup extends Model
 {
   var $Id;

trunk/www/Application/Model/Cluster.php

@@ -1 +1 @@
 <?php
 
-class Cluster extends Module
+class Cluster extends Model
 {
   function __construct($System, $Id)

trunk/www/Application/Model/ClusterList.php

@@ -1 +1 @@
 <?php
 
-class ClusterList extends Module
+class ClusterList extends Model
 {
-  function __construct($System)
-  {
-    $this->System = $System;
-    $this->Database = $System->Database;
-  }
-  
   function Add()
   {

trunk/www/Application/Model/Emulator.php

@@ -1 +1 @@
 <?php
 
-class Emulator extends Module
+class Emulator extends Model
 {
   var $Id;

trunk/www/Application/Model/History.php

@@ -1 +1 @@
 <?php
 
-class History extends Module
+class History extends Model
 {
   var $ServerId;

trunk/www/Application/Model/MangosConfigurationFile.php

@@ -1 +1 @@
 <?php
 
-class MangosConfigurationFile extends Module
+class MangosConfigurationFile extends Model
 { 
   var $ParameterList;

trunk/www/Application/Model/MangosDebug.php

@@ -1 +1 @@
 <?php
 
-class MangosDebug extends Module
+class MangosDebug extends Model
 {
   var $ItemPerPage = 35;

trunk/www/Application/Model/Platform.php

@@ -1 +1 @@
 <?php
 
-class Platform extends Module
+class Platform extends Model
 {
   var $Id;

trunk/www/Application/Model/Realm.php

@@ -1 +1 @@
 <?php
 
-class Realm extends Module
+class Realm extends Model
 {
   var $Id;

trunk/www/Application/Model/Server.php

@@ -1 +1 @@
 <?php
 
-class Server extends Module
+class Server extends Model
 {
   var $Id;

trunk/www/Application/Model/Shell.php

@@ -1 +1 @@
 <?php
 
-class Shell extends Module
+class Shell extends Model
 {
   var $Database;

trunk/www/Application/Model/Task.php

@@ -1 +1 @@
 <?php
 
-class Task extends Module
+class Task extends Model
 {
   var $TempScript = 'temp/wowhosting_script.sh';

trunk/www/Application/Model/User.php

@@ -1 +1 @@
 <?php
 
-define('LOGIN_USED', 'Přihlašovací jméno již použito.');
-define('NAME_USED', 'Jméno uživatele již použito');
-define('EMAIL_USED', 'Email je již použitý. Použijte jiný email nebo si můžete nechat zaslat nové heslo na email.');
-define('USER_REGISTRATED', 'Uživatel registrován. Na zadanou emailovou adresu byl poslán mail s odkazem pro aktivování účtu.');
-define('USER_REGISTRATION_CONFIRMED', 'Vaše registrace byla potvrzena.');
-define('DATA_MISSING', 'Chybí emailová adresa, přezdívka, nebo některé z hesel.');
-define('PASSWORDS_UNMATCHED', 'Hesla si neodpovídají.');
-define('ACCOUNT_LOCKED', 'Účet je uzamčen. Po registraci je nutné provést aktivaci účtu pomocí odkazu zaslaného v aktivačním emailu.');
-define('USER_NOT_LOGGED', 'Nejste přihlášen.');
-define('USER_LOGGED', 'Uživatel přihlášen.');
-define('USER_NOT_REGISTRED', 'Uživatel neregistrován.');
-define('USER_ALREADY_LOGGED', 'Uživatel již přihlášen.');
-define('USER_LOGGED_IN', 'Byl jste přihlášen.');
-define('USER_LOGGED_OUT', 'Byl jste odhlášen.');
-define('BAD_PASSWORD', 'Špatné heslo.');
-define('USER_NOT_FOUND', 'Uživatel nenalezen.');
-define('USER_PASSWORD_RECOVERY_SUCCESS', 'Přihlašovací údaje byly odeslány na zadanou emailovou adresu.');
-define('USER_PASSWORD_RECOVERY_FAIL', 'Podle zadaných údajů nebyl nalezen žádný uživatel.');
-define('USER_PASSWORD_RECOVERY_CONFIRMED', 'Nové heslo bylo aktivováno.');
-
-define('USER_BAD_ROLE', 'Nemáte dostatečná oprávnění');
-
-define('USER_EVENT_REGISTER', 1);
-define('USER_EVENT_LOGIN', 2);
-define('USER_EVENT_LOGOUT', 3);
-define('USER_EVENT_OPTIONS_CHANGED', 4);
-
-define('USER_ROLE_ANONYMOUS', 1);
-define('USER_ROLE_USER', 2);
-define('USER_ROLE_ADMINISTRATOR', 3);
-
-class User extends Module
+class User extends Model
 {
   var $Dependencies = array('Log');
-  var $Roles = array();
-  var $User = array();
+  var $Data = array();
   var $DefaultRole = 2;
   var $OnlineStateTimeout = 600; // in seconds
 
+  var $Roles = array('Unknown', 'Anonymous', 'User', 'Administrator');
+
+  function PasswordHash($Name, $Password)
+  {
+    return(sha1(strtoupper($Name.':'.$Password)));
+  }
+
   function Check()
   {
@@ -48 +23 @@
     while($DbRow = $DbResult->fetch_array())
     {
-      $this->System->Modules['User']->User['Id'] = $DbRow['User'];
+      $this->System->Modules['User']->Data['Id'] = $DbRow['User'];
       if($DbRow['User'] != $this->Config['Web']['UserAnonymousId']) $this->System->Modules['Log']->NewRecord('User', 'Logout');
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
@@ -65 +40 @@
     {
       $Query = $this->Database->select('User', '*', 'Id='.$Row['User']);
-      $this->User = $Query->fetch_assoc();
-      $Result = USER_LOGGED;
+      $this->Data = $Query->fetch_assoc();
+      $Result = $this->System->Translate('UserLogged');
     } else 
     {
       $Query = $this->Database->select('User', '*', 'Id='.$this->Config['Web']['UserAnonymousId']);
-      $this->User = $Query->fetch_assoc();
-      $Result = USER_NOT_LOGGED;
+      $this->Data = $Query->fetch_assoc();
+      $Result = $this->System->Translate('UserNotLogged');
     }
 
@@ -77 +52 @@
     $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('ActivityTime' => 'NOW()'));
 
-    //$this->LoadPermission($this->User['Role']);
+    //$this->LoadPermission($this->Data['Role']);
 
     // Role and permission
@@ -87 +62 @@
     global $Options, $Config;
 
-    if(($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = DATA_MISSING;
-    else if($Password != $Password2) $Result = PASSWORDS_UNMATCHED;
+    if(($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = $this->System->Translate('MissingData');
+    else if($Password != $Password2) $Result = $this->System->Translate('PasswordsUnmatched');
     else
     {
       // Je uživatel registrován?
       $Query = $this->Database->select('User', '*', 'Login = "'.$Login.'"');
-      if($Query->num_rows > 0) $Result = LOGIN_USED;
+      if($Query->num_rows > 0) $Result = $this->System->Translate('LoginUsed');
       else
       {
         $Query = $this->Database->select('User', '*', 'Name = "'.$Name.'"');
-        if($Query->num_rows > 0) $Result = NAME_USED;
+        if($Query->num_rows > 0) $Result = $this->System->Translate('NameUsed');
         else
         { 
           $Query = $this->Database->select('User', '*', 'Email = "'.$Email.'"');
-          if($Query->num_rows > 0) $Result = EMAIL_USED;
+          if($Query->num_rows > 0) $Result = $this->System->Translate('EmailUsed');
           else
           {
-            $this->Database->insert('User', array('Name' => $Name, 'Login' => $Login, 'Password' => sha1($Password), 'Email' => $Email, 'RegistrationTime' => 'NOW()', 'Locked' => 1, 'Role' => 2));
+            $this->Database->insert('User', array('Name' => $Name, 'Login' => $Login, 'Password' => $this->PasswordHash($Login, $Password), 'Email' => $Email, 'RegistrationTime' => 'NOW()', 'Locked' => 1, 'Role' => 2));
             $UserId = $this->Database->insert_id;
             
             $Subject = FromUTF8('Registrace nového účtu', 'iso2');
-            $Message = 'Provedli jste registraci nového účtu na serveru <a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/">http://'.$Config['Web']['Host'].$Config['Web']['RootFolder']."/</a>.<br>\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br><br>\n\nVáš účet je: ".$Login."\n<br>Pro dokončení registrace klikněte na tento odkaz: ".'<a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.sha1($Password).'">http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.sha1($Password).'</a>.'."\n<br> \n\n<br><br>Na tento email neodpovídejte.";
+            $Message = 'Provedli jste registraci nového účtu na serveru <a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/">http://'.$Config['Web']['Host'].$Config['Web']['RootFolder']."/</a>.<br>\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br><br>\n\nVáš účet je: ".$Login."\n<br>Pro dokončení registrace klikněte na tento odkaz: ".'<a href="http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.$this->PasswordHash($Login, $Password).'">http://'.$Config['Web']['Host'].$Config['Web']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.$this->PasswordHash($Login, $Password).'</a>.'."\n<br> \n\n<br><br>Na tento email neodpovídejte.";
             $AdditionalHeaders = "To: ".$Name." <".$Email.">\n"."From: ".FromUTF8($Config['Web']['Title'], 'iso2')." <noreplay@zdechov.net>\n"."MIME-Version: 1.0\n"."Content-type: text/html; charset=utf-8";
             mail($Email, $Subject, $Message, $AdditionalHeaders);
-            $Result = USER_REGISTRATED;
+            $Result = $this->System->Translate('UserRegistrated');
             $this->System->Modules['Log']->NewRecord('User', 'NewRegistration', $Login);
           }
@@ -129 +104 @@
       {
         $this->Database->update('User', 'Id='.$Row['Id'], array('Locked' => 0));
-        $Output = USER_REGISTRATION_CONFIRMED;
+        $Output = $this->System->Translate('UserRegistrationConfirmed');
         $this->System->Modules['Log']->NewRecord('User', 'RegisterConfirm', 'Login='.$Row['Login'].', Id='.$Row['Id']);
-      } else $Output = PASSWORDS_UNMATCHED;
-    } else $Output = USER_NOT_FOUND;
+      } else $Output = $this->System->Translate('PasswordsUnmatched');
+    } else $Output = $this->System->Translate('UserNotFound');
     return($Output);
   }
@@ -143 +118 @@
     {
       $Row = $Query->fetch_assoc();
-      if($Row['Password'] != sha1($Password)) $Result = BAD_PASSWORD;
-      else if($Row['Locked'] == 1) $Result = ACCOUNT_LOCKED;
+      if($Row['Password'] != $this->PasswordHash($Login, $Password)) $Result = $this->System->Translate('BadPassword');
+      else if($Row['Locked'] == 1) $Result = $this->System->Translate('AccountLocked');
       else 
       {
@@ -150 +125 @@
         $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $Row['Id']));
         // načtení stavu stromu
-        $Result = USER_LOGGED_IN;
+        $Result = $this->System->Translate('UserLoggedIn');
         $this->System->Modules['Log']->NewRecord('User', 'Login', 'Login='.$Login.',Host='.gethostbyaddr(GetRemoteAddress()));
       }
-    } else $Result = USER_NOT_REGISTRED;
+    } else $Result = $this->System->Translate('UserNotRegistred');
     $this->Check();
     return($Result);
@@ -162 +137 @@
     $SID = session_id();
     $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $this->Config['Web']['UserAnonymousId']));
-    $this->System->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
+    $this->System->Modules['Log']->NewRecord('User', 'Logout', $this->Data['Login']);
     $this->Check();
-    return(USER_LOGGED_OUT);
+    return($this->System->Translate('UserLoggedOut'));
   }
 
@@ -177 +152 @@
   function LoadPermission($Role)
   {
-    $this->User['Permission'] = array();
+    $this->Data['Permission'] = array();
     $DbResult = $this->Database->query('SELECT `UserRolePermission`.*, `PermissionOperation`.`Description` FROM `UserRolePermission` JOIN `PermissionOperation` ON `PermissionOperation`.`Id` = `UserRolePermission`.`Operation` WHERE `UserRolePermission`.`Role` = '.$Role);
     if($DbResult->num_rows > 0)
     while($DbRow = $DbResult->fetch_array())
-      $this->User['Permission'][$DbRow['Operation']] = $DbRow;
+      $this->Data['Permission'][$DbRow['Operation']] = $DbRow;
   }
 
@@ -222 +197 @@
 
       // Check user-operation relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', '*', '`User`="'.$this->User['Id'].'" AND `GroupOrOperation`="'.$OperationId.'" AND `Type`="Operation"');
+      $DbResult = $this->Database->select('PermissionUserAssignment', '*', '`User`="'.$this->Data['Id'].'" AND `GroupOrOperation`="'.$OperationId.'" AND `Type`="Operation"');
       if($DbResult->num_rows > 0) return(true);
 
       // Check user-group relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', 'GroupOrOperation', '`User`="'.$this->User['Id'].'" AND `Type`="Group"');
+      $DbResult = $this->Database->select('PermissionUserAssignment', 'GroupOrOperation', '`User`="'.$this->Data['Id'].'" AND `Type`="Group"');
       while($DbRow = $DbResult->fetch_array())
       {
@@ -249 +224 @@
       $AdditionalHeaders = "To: ".$Row['Name']." <".$Row['Email'].">\n"."From: ".FromUTF8($Config['Web']['Title'], 'iso2')." <noreplay@zdechov.net>\n"."MIME-Version: 1.0\n"."Content-type: text/html; charset=utf-8";
       mail($Row['Email'], $Subject, $Message, $AdditionalHeaders);
-      $Output = USER_PASSWORD_RECOVERY_SUCCESS;
+      $Output = $this->System->Translate('UserPasswordRecoverySuccess');
       $this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
-    } else $Output = USER_PASSWORD_RECOVERY_FAIL;
+    } else $Output = $this->System->Translate('UserPasswordRecoveryFail');
     return($Output);
   }
@@ -265 +240 @@
       {
         $this->Database->update('User', 'Id='.$Row['Id'], array('Password' => sha1($NewPassword), 'Locked' => 0));
-        $Output = USER_PASSWORD_RECOVERY_CONFIRMED;
+        $Output = $this->System->Translate('UserPasswordRecoveryConfirmed');
         $this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'Login='.$Row['Login']);
-      } else $Output = PASSWORDS_UNMATCHED;
-    } else $Output = USER_NOT_FOUND;
+      } else $Output = $this->System->Translate('UserPasswordUnmatched');
+    } else $Output = $this->System->Translate('UserNotFound');
     return($Output);
   }
@@ -274 +249 @@
   function ServerCount()
   {
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->User['Id']);
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->Data['Id']);
     $DbRow = $DbResult->fetch_row();
     return($DbRow[0]);