Changeset 36

Timestamp:

Jun 15, 2009, 10:34:43 AM (15 years ago)

Author:

george

Message:

• Opraveno: Uchovávat informaci o verzi databáze zálohy pro pozdější obnovení a aktualizaci údajů.
• Opraveno: Změna id databáze z příkazové řádky.

Location:

trunk/www

Files:

• backup.php (modified) (2 diffs)
• index.php (modified) (1 diff)
• server.php (modified) (1 diff)
• shell.php (modified) (1 diff)
• sql/updates/36.sql (added)

trunk/www/backup.php

@@ -32 +32 @@
       'mysql --user=server'.$ServerId.' --password=server'.$ServerId.' server'.$ServerId.'_scriptdev2 < temp/wowhosting/scriptdev2.sql',
       'rm -rf temp/wowhosting',
+      'php www/shell.php ServerDatabaseChange '.$ServerId.' '.$this->Backup['Database'],      
       'php www/shell.php ServerUnLock '.$ServerId,      
     ));
@@ -41 +42 @@
     $Server = new Server($this->Database, $ServerId);
     $Description = 'MaNGOS r'.$Server->Server['Database']['Emulator']['Revision'].', UDB r'.$Server->Server['Database']['Revision'].', SD2 r'.$Server->Server['Database']['ScriptDev2Revision'].', Client '.$Server->Server['Database']['Emulator']['Client']['Version'];
-    $this->Database->insert('Backup', array('Server' => $ServerId, 'Time' => 'NOW()', 'Description' => $Description, 'Lock' => 1));
+    $this->Database->insert('Backup', array('Server' => $ServerId, 'Time' => 'NOW()', 'Description' => $Description, 'Lock' => 1, 'Database' => $Server->Server['Database']['Id']));
     $this->Id = $this->Database->insert_id;
     $this->Task->Add('Záloha databáze serveru', array(

trunk/www/index.php

@@ -166 +166 @@
         foreach($Table->Values as $Index => $Value)
         {
+          $Table->Values[$Index]['Actions'] = '';
           if($Value['Lock'] == 0) $Table->Values[$Index]['Actions'] = '<a href="?Action=BackupDownload&amp;Id='.$Value['Id'].'">Stáhnout</a>';
           if(($Server->Server['Lock'] == 0) and ($Value['Lock'] == 0)) $Table->Values[$Index]['Actions'] .= ' <a href="?Action=BackupRestore&amp;Id='.$Value['Id'].'">Obnovit</a>';

trunk/www/server.php

@@ -317 +317 @@
     }
     $Commands = array_merge($Commands, array(
-      'php www/shell.php ServerDatabaseChange '.$DatabaseId,
+      'php www/shell.php ServerDatabaseChange '.$this->Id.' '.$DatabaseId,
       'php www/shell.php ServerUnLock '.$this->Id,
     ));

trunk/www/shell.php

@@ -70 +70 @@
   if($Command == 'ServerDatabaseChange')
   {
-    if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
+    if((count($_SERVER['argv']) > 3) and is_numeric($_SERVER['argv'][2]) and is_numeric($_SERVER['argv'][3]))
     {
       $Server = new Server($Database, $_SERVER['argv'][2]);
-      $Server->ChangeDatabaseId($_SERVER['argv'][2]);
-    } else $Output = 'Jako druhý parameter je nutno zadat Id serveru.';
+      $Server->ChangeDatabaseId($_SERVER['argv'][3]);
+    } else $Output = 'Jako druhý parameter je nutno zadat Id serveru, jako třetí Id databáze.';
   } else 
     $Output = 'Neznámý příkaz '.$Command;