Changeset 74 for trunk/www/Application

Timestamp:

Aug 23, 2009, 9:38:51 PM (15 years ago)

Author:

george

Message:

• Přidáno: Zobrazení počítačů ve skupině.
• Opraveno: Různé opravy změny struktury tříd.

Location:

trunk/www/Application

Files:

• Config/ConfigSample.php (modified) (1 diff)
• Controller/Cluster.php (added)
• Controller/Include.php (modified) (1 diff)
• Controller/Server.php (modified) (1 diff)
• Model/Cluster.php (modified) (2 diffs)
• Model/Include.php (modified) (1 diff)
• Model/Shell.php (modified) (1 diff)
• Model/User.php (modified) (6 diffs)
• View/Cluster.php (added)
• View/Emulator.php (modified) (2 diffs)
• View/Include.php (modified) (1 diff)
• View/Page.php (modified) (3 diffs)
• View/Realm.php (modified) (4 diffs)

trunk/www/Application/Config/ConfigSample.php

@@ -29 +29 @@
     'TableRowPerPage' => 30,
     'UserRegistrationEnabled' => false,
+    'UserAnonymousId' => 1,
+    'UserConsoleId' => 2,
   ),
   'BaseDir' => '/opt/wowhosting/',

trunk/www/Application/Controller/Include.php

@@ -11 +11 @@
 include('Application/Controller/Debug.php');
 include('Application/Controller/Backup.php');
+include('Application/Controller/Cluster.php');
 
 ?>

trunk/www/Application/Controller/Server.php

@@ -97 +97 @@
     $View->XMLExport();
   }    
+  
+  function UnLock()
+  {
+    $Model = new Server($this->Database, $_GET['Id']);
+    $Model->UnLock();
+  }    
+
+  function Lock()
+  {
+    $Model = new Server($this->Database, $_GET['Id']);
+    $Model->Lock();
+  }      
 }
 

trunk/www/Application/Model/Cluster.php

@@ -6 +6 @@
   {
     $this->System = $System;
+    $this->Config = $System->Config;
     $this->Database = $System->Database;
     
@@ -20 +21 @@
   }
   
+  function MigrateRealm($RealmId)
+  {
+  }
+  
+  function MigrateServer($ServerId)
+  {
+  }  
 }
 

trunk/www/Application/Model/Include.php

@@ -11 +11 @@
 include('Application/Model/Platform.php');
 include('Application/Model/History.php');
-include('Application/Model/Shell.php');
 
 ?>

trunk/www/Application/Model/Shell.php

@@ -21 +21 @@
   }
 
-  function Show()
-  {
-    global $System;
-    
-    $Output = '';
-    if(count($_SERVER['argv']) > 1)
-    {
-     $Command = $_SERVER['argv'][1];
-      if($Command == 'ServerProcessLog')
-      {
-        if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
-        {
-          $MangosDebug = new MangosDebug($this->Database);
-          $Output = $MangosDebug->ProcessLog($_SERVER['argv'][2]);
-        } else $Output = 'Jako druhý parameter je nutno zadat Id serveru.';
-      } else
-      if($Command == 'ServerLock')
-      {
-        if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
-        {
-          $Server = new Server($this->Database, $_SERVER['argv'][2]);
-          $Server->Lock();
-        } else $Output = 'Jako druhý parameter je nutno zadat Id serveru.';
-      } else 
       if($Command == 'ServerUnLock')
       {

trunk/www/Application/Model/User.php

@@ -38 +38 @@
   var $User = array();
   var $DefaultRole = 2;
-  var $AnonymousUserId = 1;
   var $OnlineStateTimeout = 600; // in seconds
 
@@ -50 +49 @@
     {
       $this->System->Modules['User']->User['Id'] = $DbRow['User'];
-      if($DbRow['User'] != $this->AnonymousUserId) $this->System->Modules['Log']->NewRecord('User', 'Logout');
+      if($DbRow['User'] != $this->Config['Web']['UserAnonymousId']) $this->System->Modules['Log']->NewRecord('User', 'Logout');
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
     }
@@ -57 +56 @@
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
     if($Query->num_rows == 0)
-      $this->Database->insert('UserOnline', array('SessionId' => $SID, 'User' => $this->AnonymousUserId, 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()', 'IpAddress' => GetRemoteAddress(), 'HostName' => gethostbyaddr(GetRemoteAddress()), 'ScriptName' => $_SERVER['PHP_SELF']));
+      $this->Database->insert('UserOnline', array('SessionId' => $SID, 'User' => $this->Config['Web']['UserAnonymousId'], 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()', 'IpAddress' => GetRemoteAddress(), 'HostName' => gethostbyaddr(GetRemoteAddress()), 'ScriptName' => $_SERVER['PHP_SELF']));
     //echo($this->Database->LastQuery);
 
@@ -63 +62 @@
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
     $Row = $Query->fetch_assoc();
-    if($Row['User'] != $this->AnonymousUserId) 
+    if($Row['User'] != $this->Config['Web']['UserAnonymousId']) 
     {
       $Query = $this->Database->select('User', '*', 'Id='.$Row['User']);
@@ -70 +69 @@
     } else 
     {
-      $Query = $this->Database->select('User', '*', 'Id='.$this->AnonymousUserId);
+      $Query = $this->Database->select('User', '*', 'Id='.$this->Config['Web']['UserAnonymousId']);
       $this->User = $Query->fetch_assoc();
       $Result = USER_NOT_LOGGED;
@@ -162 +161 @@
   {
     $SID = session_id();
-    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $this->AnonymousUserId));
+    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $this->Config['Web']['UserAnonymousId']));
     $this->System->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
     $this->Check();

trunk/www/Application/View/Emulator.php

@@ -104 +104 @@
       $Emulator->Download();       
       $Output = $this->System->SystemMessage('Stažení emulátoru', 'Úloha zařazena do fronty');
-      $TaskView = new TaskView($this->Database, $this->System);
+      $TaskView = new TaskView($this->System);
       $Output .= $TaskView->ItemList();
     } else $Output = $this->System->SystemMessage('Stažení emulátoru', 'Nebylo zadáno Id');
@@ -117 +117 @@
       $Emulator->Compile();       
       $Output = $this->System->SystemMessage('Překlad emulátoru', 'Úloha zařazena do fronty');
-      $TaskView = new TaskView($this->Database, $this->System);
+      $TaskView = new TaskView($this->System);
       $Output .= $TaskView->ItemList();
     } else $Output = $this->System->SystemMessage('Překlad emulátoru', 'Nebylo zadáno Id');

trunk/www/Application/View/Include.php

@@ -14 +14 @@
 include('Application/View/Client.php');
 include('Application/View/Debug.php');
+include('Application/View/Cluster.php');
+
 ?>

trunk/www/Application/View/Page.php

@@ -35 +35 @@
     ' <a href="?Module=Emulator&amp;Action=ItemList">Verze emulátoru</a>'.
     '</span><div class="MenuItem2">';
-    if($this->System->Modules['User']->User['Id'] == $this->System->Modules['User']->AnonymousUserId)
+    if($this->System->Modules['User']->User['Id'] == $this->Config['Web']['UserAnonymousId'])
     {
       $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Module=User&amp;Action=Login">Přihlášení</a>';
@@ -64 +64 @@
   {
     $Output = '<table class="BasicTable"><tr>';
-    if($this->System->Modules['User']->User['Id'] != $this->System->Modules['User']->AnonymousUserId) 
+    if($this->System->Modules['User']->User['Id'] != $this->Config['Web']['UserAnonymousId']) 
       $Output .= '<td class="UserMenu">'.$this->UserMenu().'</td>';
     $Output .= '<td class="Content">'.$Content.'</td>';
     if(!array_key_exists('Action', $_GET))
     {
-      $NewsView = new NewsView($this->Database, $this->System);
+      $NewsView = new NewsView($this->System);
       $Output .= $NewsView->View();
     }
@@ -79 +79 @@
   {    
     $Output = '<strong>Uživatelské menu</strong><br />';
-    if($this->System->Modules['User']->User['Id'] != $this->System->Modules['User']->AnonymousUserId) 
+    if($this->System->Modules['User']->User['Id'] != $this->Config['Web']['UserAnonymousId']) 
     {
+      $Output .= '<div><a href="?Module=Cluster&amp;Action=ItemList">Uzly skupiny</a></div>';
       $Output .= '<div><a href="?Module=Server&amp;Action=ItemList&amp;Filter=User">Moje servery</a></div>';
       //$Output .= '<div><a href="?Action=RealmList&amp;Filter=User">Moje světy</a></div>';

trunk/www/Application/View/Realm.php

@@ -230 +230 @@
         $Realm->CreateDatabase();            
         $Output = $this->System->SystemMessage('Vytvoření světu', $Realm->ImportDatabase(true));
-        $TaskView = new TaskView($this->Database, $this->System);
+        $TaskView = new TaskView($this->System);
         $Output .= $TaskView->ItemList();
         //$UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
@@ -337 +337 @@
       {
         $Output .= $this->System->SystemMessage('Spuštění serveru', $Realm->Start());
-        $TaskView = new TaskView($this->Database, $this->System);
+        $TaskView = new TaskView($this->System);
         $Output .= $TaskView->ItemList();;
       } else $this->System->SystemMessage('Spuštění serveru', 'Nemáte oprávnění');
@@ -353 +353 @@
       {
         $Output .= $this->System->SystemMessage('Zastavení serveru', $Realm->Stop());
-        $TaskView = new TaskView($this->Database, $this->System);
+        $TaskView = new TaskView($this->System);
         $Output .= $TaskView->ItemList();;
       } else $this->System->SystemMessage('Zastavení serveru', 'Nemáte oprávnění');
@@ -373 +373 @@
         {
           $Output = $this->System->SystemMessage('Vynulování databáze', $Realm->ImportDatabase(true));
-          $TaskView = new TaskView($this->Database, $this->System);
+          $TaskView = new TaskView($this->System);
           $Output .= $TaskView->ItemList();
           //$UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);