Changeset 93 for trunk/www/Application/Model/Realm.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/Realm.php (modified) (11 diffs)

trunk/www/Application/Model/Realm.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 `Realm` WHERE `Id`='.$Id);
@@ -31 +31 @@
 
   function GetState()
-  {
-    global $System;
-    
+  {    
     $State = array();
-    $State['WorlddPortState'] = $System->NetworkPortState('localhost', $this->Data['NetworkPortWorldd']);
+    $State['WorlddPortState'] = $this->System->NetworkPortState('localhost', $this->Data['NetworkPortWorldd']);
     $State['Online'] = $State['WorlddPortState'];
     $State['Uptime'] = $this->Uptime();
@@ -140 +138 @@
   function UpdateRealmlist()
   {
-    $Server = new Server($this->Database, $this->Data['Server']);
+    $Server = new Server($this->System, $this->Data['Server']);
     $Server->UpdateRealmList();
   }
@@ -153 +151 @@
   function UpdateScripts()
   {
-    global $Config;
-    
     $RealmBinDir = '../realm/'.$this->Id.'/bin/';
     if(!file_exists($RealmBinDir)) mkdir($RealmBinDir, 0777, true);    
@@ -165 +161 @@
       'info thread',
     );
-    for($I = 1; $I < $Config['MangosWorlddThreadCountMax']; $I++)
+    for($I = 1; $I < $this->Config['MangosWorlddThreadCountMax']; $I++)
       $Content[] = 'thread apply '.$I.' bt full';
     file_put_contents($ScriptFileName, implode("\n", $Content));
@@ -209 +205 @@
   function SetupConfigurationFiles()
   {
-    global $Config;
-    
     $EmulatorEtcDir = '../emulator/'.$this->Data['Database']['Emulator']['Id'].'/etc/';
     $RealmEtcDir = '../realm/'.$this->Id.'/etc/';
@@ -220 +214 @@
     if(!file_exists($RealmEtcDir.'mangosd.conf')) 
       file_put_contents($RealmEtcDir.'mangosd.conf', file_get_contents($EmulatorEtcDir.'mangosd.conf.dist'));
-    $EmulatorConfig = new MangosConfigurationFile($this->Database);
+    $EmulatorConfig = new MangosConfigurationFile($this->System);
     $EmulatorConfig->Load($RealmEtcDir.'mangosd.conf');
     $EmulatorConfig->ParameterList['RealmID'] = $this->Data['Id'];
@@ -235 +229 @@
       
     // scriptdev2.conf
-    $EmulatorConfig = new MangosConfigurationFile($this->Database);
+    $EmulatorConfig = new MangosConfigurationFile($this->System);
     $EmulatorConfig->Load($EmulatorEtcDir.'scriptdev2.conf');
     $EmulatorConfig->ParameterList['ScriptDev2DatabaseInfo'] = 'localhost;3306;server'.$this->Data['Server'].';server'.$this->Data['Server'].';realm'.$this->Id.'_scriptdev2';
@@ -255 +249 @@
     if($DoBackup)
     {
-      $Backup = new Backup($this->Database, 0);
+      $Backup = new Backup($this->System, 0);
       $Output .= '<br />'.$Backup->Create($this->Id);
     }
@@ -364 +358 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
-      $Realm = new Realm($this->Database, $DbRow['Id']);    
+      $Realm = new Realm($this->System, $DbRow['Id']);    
       $Realm->UpdateState();
     }    
@@ -380 +374 @@
   }
 }
-
-?>