Changeset 8 for trunk/www

Timestamp:

Jun 10, 2009, 10:35:57 PM (15 years ago)

Author:

george

Message:

• Opraveno: Správné pořadí zpracování úloh.
• Opraveno: Cesta k inicializačním SQL souborům databáze.

Location:

trunk/www

Files:

• config.sample.php (modified) (1 diff)
• page.php (modified) (1 diff)
• process_tasks.php (modified) (1 diff)
• server.php (modified) (2 diffs)

trunk/www/config.sample.php

@@ -28 +28 @@
     'ErrorLogFile' => 'php_script_error.log',    
   ),
-  'BaseDir' => '/opt/wowhosting',
+  'BaseDir' => '/opt/wowhosting/',
 );
 

trunk/www/page.php

@@ -30 +30 @@
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->System->Modules['User']->User['Id']);
       $DbRow = $DbResult->fetch_row();
-      if($DbRow[0] > 0) $Output .= '<a href="?Action=ServerShow">Vlastní server</a>';
-      else $Output .= '<a href="?Action=ServerAdd">Vytvořit vlastní server</a>';
+      if($DbRow[0] > 0) $Output .= ' <a href="?Action=ServerShow">Vlastní server</a>';
+      else $Output .= ' <a href="?Action=ServerAdd">Vytvořit vlastní server</a>';
     }
     $Output .= '</span><div class="MenuItem2">';

trunk/www/process_tasks.php

@@ -6 +6 @@
 
 $Script = '/tmp/wowhosting_script.sh';
-$DbResult = $Database->query('SELECT * FROM Task WHERE Executed = 0 ORDER BY Time ASC');
+$DbResult = $Database->query('SELECT * FROM Task WHERE Executed = 0 ORDER BY Id,Time ASC');
 while($Task = $DbResult->fetch_assoc())
 {

trunk/www/server.php

@@ -63 +63 @@
       'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_scriptdev2 < emulator/'.$this->Server['Database']['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_script_full.sql',
       'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_mangos < emulator/'.$this->Server['Database']['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/mangos_scriptname_full.sql',
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_realmd < emulator/'.$this->Server['Database']['Emulator']['Id'].'/mangos/sql/realmd.sql',
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_characters < emulator/'.$this->Server['Database']['Emulator']['Id'].'/mangos/sql/characters.sql',
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_realmd < emulator/'.$this->Server['Database']['Emulator']['Id'].'/share/mangos/sql/realmd.sql',
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_characters < emulator/'.$this->Server['Database']['Emulator']['Id'].'/share/mangos/sql/characters.sql',
     );
     if($Delete = true) 
@@ -85 +85 @@
     $this->AddTask('Start emulátoru', array(
       'screen -A -m -d -S server'.$this->Id.'-realmd "emulator/'.$this->Server['Database']['Emulator']['Id'].'/bin/mangos-realmd -c server/'.$this->Id.'/etc/realmd.conf"',
-      'screen -A -m -d -S server'.$this->Id.'-worldd emulator/'.$this->Server['Database']['Emulator']['Id'].'/bin/mangos-worldd -c server/'.$this->Id.'/etc/mangosd.conf',
+      'screen -A -m -d -S server'.$this->Id.'-worldd "emulator/'.$this->Server['Database']['Emulator']['Id'].'/bin/mangos-worldd -c server/'.$this->Id.'/etc/mangosd.conf"',
     ));
     return('Požadavek na start serveru zařazen.');