Changeset 93 for trunk/www/Application/Model/Server.php

Timestamp:

Aug 15, 2013, 11:17:26 PM (11 years ago)

Author:

chronos

Message:

• Fixed: System variable as parameter to constructors of descendents of Module class.
• Removed: End PHP mark "?>" from all files.

File:

• trunk/www/Application/Model/Server.php (modified) (11 diffs)

trunk/www/Application/Model/Server.php

@@ -9 +9 @@
   var $Task;
   
-  function __construct($Database, $Id)
-  {
-    $this->Database = $Database;
-    $this->Task = new Task($Database);
+  function __construct($System, $Id)
+  {
+    parent::__construct($System);
+    $this->Task = new Task($System);
     $this->Id = $Id;
     $DbResult = $this->Database->query('SELECT * FROM `Server` WHERE `Id`='.$Id);
@@ -68 +68 @@
   function GetState()
   {
-    global $System;
-    
     $State = array();
-    $State['RealmdPortState'] = $System->NetworkPortState('localhost', $this->Server['NetworkPortRealmd']);
+    $State['RealmdPortState'] = $this->System->NetworkPortState('localhost', $this->Server['NetworkPortRealmd']);
     $State['Online'] = $State['RealmdPortState'];
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA = "server'.$this->Id.'_realmd"');
@@ -97 +95 @@
   function UpdateRealmlist()
   {
-    global $Config;
-    
     $this->Database->query('TRUNCATE TABLE server'.$this->Id.'_realmd.realmlist');
     $DbResult = $this->Database->select('Realm', '*', 'Server = '.$this->Id);
     while($Realm = $DbResult->fetch_assoc())
     {
-      $this->Database->insert('server'.$this->Id.'_realmd`.`realmlist', array('id' => $Realm['Id'], 'name' => addslashes($Realm['Name']), 'address' => $Config['Web']['Host'], 'port' => $Realm['NetworkPortWorldd'], 'icon' => 0, 'timezone' => 1, 'color' => 0));
+      $this->Database->insert('server'.$this->Id.'_realmd`.`realmlist', 
+        array('id' => $Realm['Id'], 'name' => addslashes($Realm['Name']), 
+        'address' => $this->Config['Web']['Host'], 'port' => $Realm['NetworkPortWorldd'], 
+        'icon' => 0, 'timezone' => 1, 'color' => 0));
     }
   }
@@ -116 +115 @@
   function UpdateScripts()
   {
-    global $Config;
-    
     $ServerBinDir = '../server/'.$this->Id.'/bin/';
     if(!file_exists($ServerBinDir)) mkdir($ServerBinDir, 0777, true);       
@@ -147 +144 @@
   function SetupConfigurationFiles()
   {
-    global $Config;
-    
     $EmulatorEtcDir = '../emulator/'.$this->Server['Database']['Emulator']['Id'].'/etc/';
     $ServerEtcDir = '../server/'.$this->Id.'/etc/';
@@ -156 +151 @@
     
     // realmd.conf
-    $EmulatorConfig = new MangosConfigurationFile($this->Database);
+    $EmulatorConfig = new MangosConfigurationFile($this->System);
     $EmulatorConfig->Load($EmulatorEtcDir.'realmd.conf.dist');
     $EmulatorConfig->ParameterList['LoginDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';server'.$this->Id.'_realmd';
@@ -178 +173 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
-      $Server = new Server($this->Database, $DbRow['Id']);
+      $Server = new Server($this->System, $DbRow['Id']);
       $Server->UpdateState();
     }    
@@ -249 +244 @@
     if($DoBackup)
     {
-      $Backup = new Backup($this->Database, 0);
+      $Backup = new Backup($this->System, 0);
       $Output .= '<br />'.$Backup->Create($this->Id);
     }
@@ -308 +303 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
-      $Realm = new Realm($this->Database, $DbRow['Id']);
+      $Realm = new Realm($this->System, $DbRow['Id']);
       $UsedMemory += $Realm->GetUsedMemory();
     }
@@ -335 +330 @@
   function UpdateRealmlistAccountCount()
   {
-    global $Config;
-    
     $this->Database->query('TRUNCATE TABLE server'.$this->Id.'_realmd.realmcharacters');
     $DbResult = $this->Database->select('Realm', '*', 'Server = '.$this->Id);
@@ -345 +338 @@
   }
 }
-
-?>