Changeset 45

Timestamp:

Jun 19, 2009, 8:31:51 AM (15 years ago)

Author:

george

Message:

• Opraveno: Generování úloh pro stažení a překlad emulátorů.
• Přidáno: Formulář pro přidání nového emulátoru do databáze.
• Přidáno: Sloupec v databázi pro povolování použití emulátorů.
• Opraveno: Automatické odhlašování uživatelů při nečinnosti.

Location:

trunk/www

Files:

• emulator.php (modified) (3 diffs)
• form_classes.php (modified) (1 diff)
• index.php (modified) (3 diffs)
• server.php (modified) (1 diff)
• sql/updates/45.sql (added)
• user.php (modified) (2 diffs)

trunk/www/emulator.php

@@ -46 +46 @@
       'svn checkout -r '.$this->Emulator['ScriptDev2Revision'].' https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2/ src/bindings/ScriptDev2',
       'git apply src/bindings/ScriptDev2/patches/'.$this->Emulator['ScriptDev2PatchFileName'],
+      'cd ../../..',
       'php www/shell.php EmulatorUnLock '.$this->Id,
     ));
@@ -61 +62 @@
       'mkdir objdir',
       'cd objdir',
-      'export CFLAGS="-g -ggdb '.$Config['CompilerParameters'],
-      'export CXXFLAGS="-g -ggdb '.$Config['CompilerParameters'],
+      'export CFLAGS="-g -ggdb '.$Config['CompilerParameters'].'"',
+      'export CXXFLAGS="-g -ggdb '.$Config['CompilerParameters'].'"',
       '../configure --prefix='.$Config['BaseDir'].'emulator/'.$this->Id.'/ --enable-cli --enable-ra',
       'make',
       'make install',
+      'cd ../../../..',
       'php www/shell.php EmulatorUnLock '.$this->Id,
     ));
@@ -79 +81 @@
       'mv wowclient/'.$this->Emulator['Client']['Version'].'/client/dbc wowclient/'.$this->Emulator['Client']['Version'].'/',
       'mv wowclient/'.$this->Emulator['Client']['Version'].'/client/maps wowclient/'.$this->Emulator['Client']['Version'].'/',
+      'cd ../../..',
       'php www/shell.php EmulatorUnLock '.$this->Id,      
     ));

trunk/www/form_classes.php

@@ -107 +107 @@
   'EmulatorList' => array(
     'Title' => 'Emulátory',
-    'Table' => '(SELECT `Emulator`.`Name`, `Emulator`.`Id`, `Client`.`Version` AS `ClientVersion`, `Emulator`.`Revision`, `Emulator`.`ScriptDev2Revision`, `Emulator`.`ScriptDev2PatchFileName`, `Emulator`.`Version`, `Emulator`.`CommitHash` FROM `Emulator` JOIN `Client` ON `Client`.`Id` = `Emulator`.`Client`)',
+    'Table' => '(SELECT `Emulator`.`Name`, `Emulator`.`Id`, `Client`.`Version` AS `ClientVersion`, `Emulator`.`Revision`, `Emulator`.`ScriptDev2Revision`, `Emulator`.`ScriptDev2PatchFileName`, `Emulator`.`Version`, `Emulator`.`CommitHash` FROM `Emulator` JOIN `Client` ON `Client`.`Id` = `Emulator`.`Client` WHERE `Emulator`.`Enable` = 1)',
     'DefaultOrderColumn' => 'Revision',
     'DefaultOrderDirection' => 1,

trunk/www/index.php

@@ -126 +126 @@
         $Output .= 'Před provedením aktualizace bude server zastaven a provedena záloha databáze.';
         $Table = new Table('EmulatorList');
-        $Table->Definition['Table'] = substr($Table->Definition['Table'], 0, -1).' WHERE Revision > '.$Server->Server['Database']['Emulator']['Revision'].' ORDER BY Revision)';
+        $Table->Definition['Table'] = substr($Table->Definition['Table'], 0, -1).' WHERE `Revision` > '.$Server->Server['Database']['Emulator']['Revision'].' AND `Enable`=1 ORDER BY `Revision`)';
         $Table->Definition['Items']['Id'] = array('Type' => 'Hidden', 'Caption' => '', 'Default' => '');
         $Table->LoadValuesFromDatabase($this->Database);
@@ -679 +679 @@
       if($_GET['Action'] == 'GameAccountRegister')
       {
-        $Form = new Form('GameAccountNew', $_GET['Id']);
+        $Form = new Form('GameAccountNew');
         $Form->LoadValuesFromForm();
         $Form->Values['ServerId'] = $_GET['Id'];
@@ -692 +692 @@
         $Output .= $this->SystemMessage('Vytvoření herního účtu', $Server->NewAccount($Form->Values['Name'], $Form->Values['Password'], $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Expansion']));
         $Output .= '<a href="?Action=GameAccountRegister&amp;Id='.$Form->Values['ServerId'].'">Zpět k zadání údajů</a>';
+      } else      
+      if($_GET['Action'] == 'EmulatorAdd')
+      {
+        if($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR)
+        {
+          $Form = new Form('EmulatorItem');
+          $Form->LoadValuesFromForm();
+          $Form->OnSubmit = '?Action=EmulatorAdd2';
+          $Output .= $Form->ShowEditForm();
+        } else $Output .= USER_BAD_ROLE;
+      } else
+      if($_GET['Action'] == 'EmulatorAdd2')
+      {
+        if($this->System->Modules['User']->User['Role'] >= USER_ROLE_ADMINISTRATOR)
+        {
+          $Form = new Form('EmulatorItem');
+          $Form->LoadValuesFromForm();
+          $Form->SaveValuesToDatabase(0);
+          $Output .= $this->SystemMessage('Přidání nového emulátoru', 'Emulátor přidán.');
+        } else $Output .= USER_BAD_ROLE;
       } else      
       if($_GET['Action'] == 'Info')

trunk/www/server.php

@@ -318 +318 @@
     $DbRow = $DbResult->fetch_assoc();
     $DatabaseRevisionEnd = $DbRow['Revision'];
-    $DbResult = $this->Database->query('SELECT * FROM `DatabaseUpdate` WHERE (`Revision` > '.$DatabaseRevisionStart.') AND (`Revision` <= '.$DatabaseRevisionEnd.') ORDER BY `Revision`');
+    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Revision` > '.$DatabaseRevisionStart.') AND (`Revision` <= '.$DatabaseRevisionEnd.') ORDER BY `Revision`');
     while($DbRow = $DbResult->fetch_assoc())
     {
-      $Updates = explode("\n", $DbRow['Updates']);
+      $Updates = explode("\n", $DbRow['Update']);
       foreach($Updates as $Update)
       if($Update != '')

trunk/www/user.php

@@ -44 +44 @@
   {
     $SID = session_id();
+
+    // Remove nonactive users
+    $DbResult = $this->Database->select('UserOnline', 'Id, User', 'ActivityTime < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)');
+    while($DbRow = $DbResult->fetch_array())
+    {
+      if($DbRow['User'] != $this->AnonymousUserId) $this->System->Modules['Log']->NewRecord('User', 'Logout');
+      $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
+    }
+
     // Lookup user record
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
@@ -68 +77 @@
     }
 
-    // Remove nonactive users
-    $DbResult = $this->Database->select('UserOnline', 'Id, User', 'ActivityTime < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)');
-    while($DbRow = $DbResult->fetch_array())
-    {
-      $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
-      if($DbRow['User'] != $this->AnonymousUserId) $this->System->Modules['Log']->NewRecord('User', 'Logout');
-    }
     //$this->LoadPermission($this->User['Role']);