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

trunk/www/Application/Model/Emulator.php

@@ -9 +9 @@
   var $Task;
   
-  function __construct($Database, $Id)
+  function __construct($System, $Id)
   {
-    $this->Database = $Database;
-    $this->Task = new Task($Database);
+    parent::__construct($System);
+    $this->Task = new Task($System);
     $this->Id = $Id;
     $DbResult = $this->Database->query('SELECT * FROM `Emulator` WHERE `Id`='.$Id);
@@ -35 +35 @@
   function Download()
   {
-    global $Config;
-    
     $this->Lock();
     $this->Task->Add('Stažení emulátoru', array(
       'php www/shell.php EmulatorLock '.$this->Id,
-      'mkdir '.$Config['BaseDir'].'emulator/'.$this->Id.'/',
-      'cd '.$Config['BaseDir'].'emulator/'.$this->Id.'/',
+      'mkdir '.$this->Config['BaseDir'].'emulator/'.$this->Id.'/',
+      'cd '.$this->Config['BaseDir'].'emulator/'.$this->Id.'/',
       'git clone git://github.com/mangos/mangos.git source',
       'cd source',
@@ -55 +53 @@
   function Compile()
   {
-    global $Config;
-    
     $this->Lock();
     $this->Task->Add('Překlad emulátoru', array(
       'php www/shell.php EmulatorLock '.$this->Id,
-      'cd '.$Config['BaseDir'].'emulator/'.$this->Id.'/source',
+      'cd '.$this->Config['BaseDir'].'emulator/'.$this->Id.'/source',
       'autoreconf -ifv',
       'mkdir objdir',
       'cd objdir',
-      'export CFLAGS="-g -ggdb '.$Config['CompilerParameters'].'"',
-      'export CXXFLAGS="-g -ggdb '.$Config['CompilerParameters'].'"',
-      '../configure --prefix='.$Config['BaseDir'].'emulator/'.$this->Id.'/ --enable-cli --enable-ra',
+      'export CFLAGS="-g -ggdb '.$this->Config['CompilerParameters'].'"',
+      'export CXXFLAGS="-g -ggdb '.$this->Config['CompilerParameters'].'"',
+      '../configure --prefix='.$this->Config['BaseDir'].'emulator/'.$this->Id.'/ --enable-cli --enable-ra',
       'make',
       'make install',
@@ -99 +95 @@
   }
 }
-
-?>