Changeset 9

Timestamp:

Jun 11, 2009, 11:26:18 AM (15 years ago)

Author:

george

Message:

• Odstraněno: Původní adresář souborů emulátorů.
• Přidáno: Omezení max. počtu serverů.
• Přidáno: Třída pro obsluhu úloh.
• Opraveno: Pojemnování zdrojových konfiguračních souborů mangosu.
• Upraveno: U úloh doplněn stav běžící.
• Přidáno: Kostra třídy pro zobrazování tabulek.

Location:

trunk

Files:

• emu (deleted)
• www/config.sample.php (modified) (1 diff)
• www/global.php (modified) (1 diff)
• www/index.php (modified) (3 diffs)
• www/process_tasks.php (modified) (1 diff)
• www/server.php (modified) (4 diffs)

trunk/www/config.sample.php

@@ -29 +29 @@
   ),
   'BaseDir' => '/opt/wowhosting/',
+  'MaxServerCount' => 20,
 );
 

trunk/www/global.php

@@ -18 +18 @@
 include('page.php');
 include('log.php');
-include('forms.php');
+include('types/include.php');
+include('form.php');
+include('table.php');
 include('server.php');
 include('emulator.php');
 include('mangos_configuration_file.php');
+include('task.php');
 
 $PrefixMultipliers = array

trunk/www/index.php

@@ -10 +10 @@
   function ShowServerList()
   {
+    global $Config;
+    
     $OnlineState = array(false => 'Neaktivní', true => 'Aktivní');
     $Output = '<h4>Seznam serverů</h4>';
@@ -21 +23 @@
     }
     $Output .= '</table>';
-    if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER) $Output .= '<br /><div style="text-align: center;"><a href="?Action=ServerAdd">Vytvořit nový server</a></dev>';      
+    if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER) 
+    {
+      $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server');
+      $DbRow = $DbResult->fetch_row();
+      $ServerCount = $DbRow[0];
+      if($ServerCount < $Config['MaxServerCount'])
+        $Output .= '<br /><div style="text-align: center;"><a href="?Action=ServerAdd">Vytvořit nový server</a></dev>';      
+    }
     return($Output);
   }
@@ -147 +156 @@
         }
       } else
-      if($_GET['Action'] == 'MemberOptions')
-      {
-        $UserOptions = new Form('MemberOptions');
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
-        $DbRow = $DbResult->fetch_array();
-        foreach($UserOptions->Definition['Items'] as $Index => $Item)
-        {
-          $UserOptions->Values[$Index] = $DbRow[$Index];
-        }
-        $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
-        $Output .= $UserOptions->ShowEditForm();
-      } else
-      if($_GET['Action'] == 'MemberOptionsSave')
-      {
-        $UserOptions = new Form('MemberOptions');
-        $UserOptions->LoadValuesFromForm();
-        if($UserOptions->Values['FamilyMemberCount'] < 0)
-          $UserOptions->Values['FamilyMemberCount'] = 0;
-        if($UserOptions->Values['BillingPeriodNext'] < 2)
-          $UserOptions->Values['BillingPeriodNext'] = 2;
-          
-        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->User['Member'], array('InternetTariffNextMonth' => $UserOptions->Values['InternetTariffNextMonth'], 'FamilyMemberCount' => $UserOptions->Values['FamilyMemberCount'], 'BillingPeriodNext' => $UserOptions->Values['BillingPeriodNext']));
-        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->Modules['User']->User['Member']);
-        $Member = $DbResult->fetch_assoc();
-        $DbResult = $this->Database->update('Subject', 'Id='.$Member['Subject'], array('Name' => $UserOptions->Values['Name'], 'AddressStreet' => $UserOptions->Values['AddressStreet'], 'AddressTown' => $UserOptions->Values['AddressTown'], 'AddressPSC' => $UserOptions->Values['AddressPSC'], 'IC' => $UserOptions->Values['IC'], 'DIC' => $UserOptions->Values['DIC']));
-        $Output .= $this->SystemMessage('Nastavení', 'Nastavení domácnosti uloženo.');
-        $this->System->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno', $UserOptions->Values['Name']);
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
-        $DbRow = $DbResult->fetch_array();
-        foreach($UserOptions->Definition['Items'] as $Index => $Item)
-        {
-          $UserOptions->Values[$Index] = $DbRow[$Index];
-        }
-        $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
-        $Output .= $UserOptions->ShowEditForm();
-      } else
       if($_GET['Action'] == 'ServerAdd')
       {
         if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
         {
-          $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->System->Modules['User']->User['Id']);
+          $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server');
           $DbRow = $DbResult->fetch_row();
-          if($DbRow[0] > 0) $Output .= $this->SystemMessage('Nový server', 'Lze vytvořit pouze jeden server pro každý uživatelský účet.');
-          else 
+          $ServerCount = $DbRow[0];
+          if($ServerCount < $Config['MaxServerCount'])
           {
-            $Form = new Form('NewServer');
-            $Form->LoadValuesFromForm();
-            $Form->OnSubmit = '?Action=ServerCreate';
-            $Output .= 'Tento formulář vám umožní si vytvořit nový server. Pečlivě vyplňte požadované údaje.';
-            $Output .= $Form->ShowEditForm();
-          }
+            $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 .= $this->SystemMessage('Nový server', 'Lze vytvořit pouze jeden server pro každý uživatelský účet.');
+            else 
+            {
+              $Form = new Form('NewServer');
+              $Form->LoadValuesFromForm();
+              $Form->OnSubmit = '?Action=ServerCreate';
+              $Output .= 'Tento formulář vám umožní si vytvořit nový server. Pečlivě vyplňte požadované údaje.';
+              $Output .= $Form->ShowEditForm();
+            }
+          } else $Output .= $this->SystemMessage('Nový serve', 'Nelze vytvářet další servery');
         } else $Output .= USER_BAD_ROLE;
       } else

trunk/www/process_tasks.php

@@ -3 +3 @@
 include('global.php');
 
-chdir('..');
-
-$Script = '/tmp/wowhosting_script.sh';
-$DbResult = $Database->query('SELECT * FROM Task WHERE Executed = 0 ORDER BY Id,Time ASC');
-while($Task = $DbResult->fetch_assoc())
-{
-  echo('Provádím '.$Task['Title']."...\n");
-  $Task['CommandList'] = "#!/bin/sh\n".$Task['CommandList'];
-  file_put_contents($Script, $Task['CommandList']);
-  chmod($Script, 0755); 
-  passthru($Script, $Output);
-  //exec($Script, $Output);
-  $Output = ''; //implode("\n", $Output);
-  //echo($Output);
-  $Database->query('UPDATE Task SET Executed=1, Output="'.addslashes($Output).'" WHERE Id='.$Task['Id']);
-}
+$Task = new Task();
+$Task->ProcessAll();
 
 ?>

trunk/www/server.php

@@ -31 +31 @@
   function AddTask($Title, $Task)
   {
-    $this->Database->insert('Task', array('Server' => $this->Server['Id'], 'Title' => $Title, 'Time' => 'NOW()', 'CommandList' => implode("\n", $Task)));
+    $this->Database->insert('Task', array('User' => $this->System->Modules['User']->User['Id'], 'Title' => $Title, 'Time' => 'NOW()', 'CommandList' => implode("\n", $Task)));
   }
   
@@ -66 +66 @@
       '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) 
+    if($Delete == true) 
     {
       array_unshift($CommandList, 'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_mangos -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_mangos');
@@ -162 +162 @@
     // mangosd.conf
     $Config = new MangosConfigurationFile($this->Database);
-    $Config->Load($EmulatorEtcDir.'mangosd.conf');
+    $Config->Load($EmulatorEtcDir.'mangosd.conf.dist');
     $Config->ParameterList['LoginDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';server'.$this->Id.'_realmd';
     $Config->ParameterList['WorldDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';server'.$this->Id.'_mangos';
@@ -177 +177 @@
     // realmd.conf
     $Config = new MangosConfigurationFile($this->Database);
-    $Config->Load($EmulatorEtcDir.'realmd.conf');
+    $Config->Load($EmulatorEtcDir.'realmd.conf.dist');
     $Config->ParameterList['LoginDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';server'.$this->Id.'_realmd';
     $Config->ParameterList['RealmServerPort'] = $this->RealmdBaseNetworkPort + $this->Id;