Changeset 46

Timestamp:

Jun 19, 2009, 9:41:07 AM (15 years ago)

Author:

george

Message:

• Opraveno: Zobrazit chybu při pokusu o zobrazení neexistujícího serveru.
• Opraveno: Při inicializace databáze použij verzi s celou databází a následně proveď aktualizaci na požadovanou verzi.

Location:

trunk

Files:

• bin/backup.sh (modified) (1 diff)
• bin/start.sh (modified) (1 diff)
• bin/task_process.sh (modified) (1 diff)
• www/error.php (modified) (1 diff)
• www/form_classes.php (modified) (1 diff)
• www/index.php (modified) (4 diffs)
• www/server.php (modified) (3 diffs)
• www/types/PointerOneToOne.php (modified) (1 diff)
• www/user.php (modified) (1 diff)

trunk/bin/backup.sh

@@ -1 +1 @@
 #!/bin/sh
-cd /a
 php www/shell.php BackupCreateAll
 

trunk/bin/start.sh

@@ -1 +1 @@
 #!/bin/sh
-cd /a
 php www/shell.php ServerStartAll
 bin/task_process.sh&

trunk/bin/task_process.sh

@@ -1 +1 @@
 #!/bin/sh
-cd /a
 php www/shell.php TaskProcess
 

trunk/www/error.php

@@ -28 +28 @@
     $Backtrace[0]['function'] = '';
     $Backtrace[0]['args'] = '';
+    if(!array_key_exists('line', $Backtrace[0])) $Backtrace[0]['line'] = '';
+    if(!array_key_exists('file', $Backtrace[0])) $Backtrace[0]['file'] = '';
     //$First = array_shift($Backtrace);
     //print_r($First);

trunk/www/form_classes.php

@@ -248 +248 @@
 RegisterType('ServerType', 'Enumeration', array('Normální', 'PvP', 'RP', 'RPPvP'));
 RegisterType('OnlineState', 'Enumeration', array('Neaktivní', 'Aktivní'));
-RegisterType('Database', 'PointerOneToOne', array('Table' => 'Database', 'Id' => 'Id', 'Name' => 'CONCAT(Name, " ", Version, " r", Revision)'));
+RegisterType('Database', 'PointerOneToOne', array('Table' => 'Database', 'Id' => 'Id', 'Name' => 'CONCAT(Name, " ", Version, " r", Revision)', 'Condition' => 'Emulator <> 0'));
 RegisterType('Client', 'PointerOneToOne', array('Table' => 'Client', 'Id' => 'Id', 'Name' => 'Version'));
 

trunk/www/index.php

@@ -52 +52 @@
     
     $Server = new Server($this->Database, $Id);
+    if(isset($Server->Server))
+    {
     $Output = '<h4>Podrobnosti serveru</h4>';
     $Form = new Form('ServerView');
@@ -88 +90 @@
     $Output .= ' <a href="?Action=GameAccountRegister&amp;Id='.$Server->Id.'">Vytvoření herního účtu</a>';
     $Output .= '</div>';
+    } else $Output = $this->SystemMessage('Zobrazení serveru', 'Server se zadaným id nenalezen.');
     return($Output);
   }
@@ -482 +485 @@
               $Output .= $Form->ShowEditForm();
             }
-          } else $Output .= $this->SystemMessage('Nový serve', 'Nelze vytvářet další servery');
+          } else $Output .= $this->SystemMessage('Nový server', 'Nelze vytvářet další servery');
         } else $Output .= USER_BAD_ROLE;
       } else
@@ -503 +506 @@
             $Form = new Form('ServerCreate', array());
             $Form->LoadValuesFromForm();
-            $this->Database->insert('Server', array('Name' => $Form->Values['Name'], 'Description' => $Form->Values['Description'], 'User' => $this->System->Modules['User']->User['Id'], 'Motd' => $Form->Values['Motd'], 'Homepage' => $Form->Values['Homepage'], 'Type' => $Form->Values['Type'], 'Database' => 1, 'NetworkPortWorldd' => $NewPortWorldd, 'NetworkPortRealmd' => $NewPortRealmd, 'Lock' => 1, 'TimeCreate' => 'NOW()'));
+            $this->Database->insert('Server', array('Name' => $Form->Values['Name'], 'Description' => $Form->Values['Description'], 'User' => $this->System->Modules['User']->User['Id'], 'Motd' => $Form->Values['Motd'], 'Homepage' => $Form->Values['Homepage'], 'Type' => $Form->Values['Type'], 'Database' => $Form->Values['Database'], 'NetworkPortWorldd' => $NewPortWorldd, 'NetworkPortRealmd' => $NewPortRealmd, 'Lock' => 1, 'TimeCreate' => 'NOW()'));
             $LastInsertId = $this->Database->insert_id;
             $Server = new Server($this->Database, $LastInsertId);

trunk/www/server.php

@@ -69 +69 @@
       ));
     }
+    // Lookup nearest database with full import
+    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Emulator` <> 0) AND (`Revision` <= '.$this->Server['Database']['Revision'].') AND (`SourceFileName` <> "") ORDER BY `Revision` DESC');
+    $Database = $DbResult->fetch_assoc();
+    
     $CommandList = array_merge($CommandList, array(
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_mangos < database/'.$this->Server['Database']['Id'].'/'.$this->Server['Database']['SourceFileName'],
-      '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_create_structure.sql',
-      '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'].'/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',
-      'php www/shell.php ServerDatabaseChange '.$this->Id.' '.$this->Server['Database']['Id'],
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_mangos < database/'.$Database['Id'].'/'.$Database['SourceFileName'],
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_scriptdev2 < emulator/'.$Database['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_create_structure.sql',
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_scriptdev2 < emulator/'.$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/'.$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/'.$Database['Emulator']['Id'].'/share/mangos/sql/realmd.sql',
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_characters < emulator/'.$Database['Emulator']['Id'].'/share/mangos/sql/characters.sql',
+      'php www/shell.php ServerDatabaseChange '.$this->Id.' '.$Database['Id'],
       'php www/shell.php ServerUnLock '.$this->Id,
     ));    
     $this->Task->Add('Inicializace databáze', $CommandList);
+    
+    if($Database['Id'] != $this->Server['Database']['Id']) 
+    {
+      $NewDatabaseId = $this->Server['Database']['Id'];
+      $this->Server['Database']['Id'] = $Database['Id'];
+      $this->Update($NewDatabaseId, false, false);
+    }
     return('Úloha načtení nové databáze zařazena do fronty.');
   } 
@@ -297 +308 @@
   }
   
-  function Update($DatabaseId)
+  function Update($DatabaseId, $DoBackup = true, $DoStop = true)
   {
     $this->Lock();
+    $Output = '';
     
     // Stop server before update
-    $Output = $this->Stop();
+    if($DoStop)
+    {
+      $Output .= $this->Stop();
+    }
     
     // Backup current 
-    $Backup = new Backup($this->Database, 0);
-    $Output .= '<br />'.$Backup->Create($this->Id);
+    if($DoBackup)
+    {
+      $Backup = new Backup($this->Database, 0);
+      $Output .= '<br />'.$Backup->Create($this->Id);
+    }
     
     // Do update
@@ -326 +344 @@
       {
         $Parts = explode('|', $Update); 
-        $Command = 'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Database'].'/update/'.$Parts[1];
+        $Command = 'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Id'].'/'.$Parts[1];
         $Commands[] = $Command;
       }     

trunk/www/types/PointerOneToOne.php

@@ -28 +28 @@
     $Output = '<select name="'.$Item['Name'].'">';
     $Type = $TypeDefinitionList[$Item['Type']];
-    $DbResult = $Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name,'.$Type['Parameters']['Id'].' AS Id FROM `'.$Type['Parameters']['Table'].'`');
+    if(array_key_exists('Condition', $Type['Parameters'])) $Where = ' WHERE '.$Type['Parameters']['Condition'];
+      else $Where = '';
+    $DbResult = $Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name,'.$Type['Parameters']['Id'].' AS Id FROM `'.$Type['Parameters']['Table'].'`'.$Where.' ORDER BY Name DESC');
     while($DbRow = $DbResult->fetch_assoc())
     {

trunk/www/user.php

@@ -44 +44 @@
   {
     $SID = session_id();
+
+    // Check login
+    $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
+    $Row = $Query->fetch_assoc();
+    if($Row['User'] != $this->AnonymousUserId) 
+    {
+      $Query = $this->Database->select('User', '*', 'Id='.$Row['User']);
+      $this->User = $Query->fetch_assoc();
+      $Result = USER_LOGGED;
+    } else 
+    {
+      $Query = $this->Database->select('User', '*', 'Id='.$this->AnonymousUserId);
+      $this->User = $Query->fetch_assoc();
+      $Result = USER_NOT_LOGGED;
+    }
 
     // Remove nonactive users