Changeset 35 for trunk/www/index.php

Timestamp:

Jun 15, 2009, 10:19:02 AM (15 years ago)

Author:

george

Message:

• Upraveno: Zamykání a odemykání prostředků přímo z příkazů úloh. Zamykání serverů, emulátorů a záloh.
• Upraveno: Možnost volat shell.php z relativní cestou. Skript global.php si nastaví sám aktuální cestu.
• Opraveno: Zobrazovat sprváně trvání aktuálně běžící úlohy.

File:

• trunk/www/index.php (modified) (4 diffs)

trunk/www/index.php

@@ -113 +113 @@
         foreach($Table->Values as $Index => $Item)
         {
-          $Table->Values[$Index]['Actions'] = '<a href="?Action=EmulatorShow&amp;Id='.$Item['Id'].'">Podprobnosti</a>';
+          $Table->Values[$Index]['Actions'] = '<a href="?Action=EmulatorShow&amp;Id='.$Item['Id'].'">Podrobnosti</a>';
           if($Server->Server['Lock'] == 0) $Table->Values[$Index]['Actions'] .= ' <a href="?Action=Update&amp;Server='.$ServerId.'&amp;Update='.$Item['Id'].'">Aktualizovat</a>';
           unset($Table->Values[$Index]['Id']);
@@ -161 +161 @@
         $Table->Table = '(SELECT * FROM `Backup` WHERE `Server` = '.$ServerId.')';
         $Table->Definition['Items']['Id'] = array('Type' => 'Hidden', 'Caption' => 'Id', 'Default' => '');
+        $Table->Definition['Items']['Lock'] = array('Type' => 'Hidden', 'Caption' => 'Zámek', 'Default' => '');
         $Table->LoadValuesFromDatabase($this->Database);
         $Table->Definition['Items']['Actions'] = array('Type' => 'String', 'Caption' => '', 'Default' => '');
         foreach($Table->Values as $Index => $Value)
         {
-          $Table->Values[$Index]['Actions'] = '<a href="?Action=BackupDownload&amp;Id='.$Value['Id'].'">Stáhnout</a>';
-          if($Server->Server['Lock'] == 0) $Table->Values[$Index]['Actions'] .= ' <a href="?Action=BackupRestore&amp;Id='.$Value['Id'].'">Obnovit</a>';
+          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>';
           unset($Table->Values[$Index]['Id']);
+          unset($Table->Values[$Index]['Lock']);
         }
         $Output .= $Table->Show();
@@ -216 +218 @@
       $Table = new Table('TaskList');
       $Table->OnRow = array($this, 'ShowTaskListOnRow');
-      $Table->Definition['Table'] = '(SELECT (UNIX_TIMESTAMP(TimeEnd) - UNIX_TIMESTAMP(TimeStart)) AS Duration, TimeCreate, Title, State FROM Task WHERE User='.$this->System->Modules['User']->User['Id'].' ORDER BY Id DESC)';
+      $Table->Definition['Table'] = '(SELECT (COALESCE(UNIX_TIMESTAMP(TimeEnd), UNIX_TIMESTAMP(NOW())) - UNIX_TIMESTAMP(TimeStart)) AS Duration, TimeCreate, Title, State FROM Task WHERE User='.$this->System->Modules['User']->User['Id'].' ORDER BY Id DESC)';
       $Table->LoadValuesFromDatabase($this->Database);
       $Output .= $Table->Show();
@@ -481 +483 @@
             $Form = new Form('NewServer', 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));
+            $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));
             $LastInsertId = $this->Database->insert_id;
             $Server = new Server($this->Database, $LastInsertId);
-            $Server->CreateDatabase();
-            $Server->ImportDatabase(true);
-            $Output .= $this->SystemMessage('Vytvoření serveru', 'Úloha načtení nové databáze zařazena do fronty');
+            $Server->CreateDatabase();            
+            $Output .= $this->SystemMessage('Vytvoření serveru', $Server->ImportDatabase(true));
             $Output .= $this->ShowTaskList();
             //$UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);