Changeset 74


Ignore:
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
Files:
2 added
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/Application/Config/ConfigSample.php

    r69 r74  
    2929    'TableRowPerPage' => 30,
    3030    'UserRegistrationEnabled' => false,
     31    'UserAnonymousId' => 1,
     32    'UserConsoleId' => 2,
    3133  ),
    3234  'BaseDir' => '/opt/wowhosting/',

  • trunk/www/Application/Controller/Include.php

    r73 r74  
    1111include('Application/Controller/Debug.php');
    1212include('Application/Controller/Backup.php');
     13include('Application/Controller/Cluster.php');
    1314
    1415?>

  • trunk/www/Application/Controller/Server.php

    r73 r74  
    9797    $View->XMLExport();
    9898  }   
     99 
     100  function UnLock()
     101  {
     102    $Model = new Server($this->Database, $_GET['Id']);
     103    $Model->UnLock();
     104  }   
     105
     106  function Lock()
     107  {
     108    $Model = new Server($this->Database, $_GET['Id']);
     109    $Model->Lock();
     110  }     
    99111}
    100112

  • trunk/www/Application/Model/Cluster.php

    r69 r74  
    66  {
    77    $this->System = $System;
     8    $this->Config = $System->Config;
    89    $this->Database = $System->Database;
    910   
    … …  
    2021  }
    2122 
     23  function MigrateRealm($RealmId)
     24  {
     25  }
     26 
     27  function MigrateServer($ServerId)
     28  {
     29  } 
    2230}
    2331

  • trunk/www/Application/Model/Include.php

    r69 r74  
    1111include('Application/Model/Platform.php');
    1212include('Application/Model/History.php');
    13 include('Application/Model/Shell.php');
    1413
    1514?>

  • trunk/www/Application/Model/Shell.php

    r69 r74  
    2121  }
    2222
    23   function Show()
    24   {
    25     global $System;
    26    
    27     $Output = '';
    28     if(count($_SERVER['argv']) > 1)
    29     {
    30      $Command = $_SERVER['argv'][1];
    31       if($Command == 'ServerProcessLog')
    32       {
    33         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
    34         {
    35           $MangosDebug = new MangosDebug($this->Database);
    36           $Output = $MangosDebug->ProcessLog($_SERVER['argv'][2]);
    37         } else $Output = 'Jako druhý parameter je nutno zadat Id serveru.';
    38       } else
    39       if($Command == 'ServerLock')
    40       {
    41         if((count($_SERVER['argv']) > 2) and is_numeric($_SERVER['argv'][2]))
    42         {
    43           $Server = new Server($this->Database, $_SERVER['argv'][2]);
    44           $Server->Lock();
    45         } else $Output = 'Jako druhý parameter je nutno zadat Id serveru.';
    46       } else
    4723      if($Command == 'ServerUnLock')
    4824      {

  • trunk/www/Application/Model/User.php

    r69 r74  
    3838  var $User = array();
    3939  var $DefaultRole = 2;
    40   var $AnonymousUserId = 1;
    4140  var $OnlineStateTimeout = 600; // in seconds
    4241
    … …  
    5049    {
    5150      $this->System->Modules['User']->User['Id'] = $DbRow['User'];
    52       if($DbRow['User'] != $this->AnonymousUserId) $this->System->Modules['Log']->NewRecord('User', 'Logout');
     51      if($DbRow['User'] != $this->Config['Web']['UserAnonymousId']) $this->System->Modules['Log']->NewRecord('User', 'Logout');
    5352      $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
    5453    }
    … …  
    5756    $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
    5857    if($Query->num_rows == 0)
    59       $this->Database->insert('UserOnline', array('SessionId' => $SID, 'User' => $this->AnonymousUserId, 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()', 'IpAddress' => GetRemoteAddress(), 'HostName' => gethostbyaddr(GetRemoteAddress()), 'ScriptName' => $_SERVER['PHP_SELF']));
     58      $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']));
    6059    //echo($this->Database->LastQuery);
    6160
    … …  
    6362    $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
    6463    $Row = $Query->fetch_assoc();
    65     if($Row['User'] != $this->AnonymousUserId)
     64    if($Row['User'] != $this->Config['Web']['UserAnonymousId'])
    6665    {
    6766      $Query = $this->Database->select('User', '*', 'Id='.$Row['User']);
    … …  
    7069    } else
    7170    {
    72       $Query = $this->Database->select('User', '*', 'Id='.$this->AnonymousUserId);
     71      $Query = $this->Database->select('User', '*', 'Id='.$this->Config['Web']['UserAnonymousId']);
    7372      $this->User = $Query->fetch_assoc();
    7473      $Result = USER_NOT_LOGGED;
    … …  
    162161  {
    163162    $SID = session_id();
    164     $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $this->AnonymousUserId));
     163    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $this->Config['Web']['UserAnonymousId']));
    165164    $this->System->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
    166165    $this->Check();

  • trunk/www/Application/View/Emulator.php

    r72 r74  
    104104      $Emulator->Download();       
    105105      $Output = $this->System->SystemMessage('Stažení emulátoru', 'Úloha zařazena do fronty');
    106       $TaskView = new TaskView($this->Database, $this->System);
     106      $TaskView = new TaskView($this->System);
    107107      $Output .= $TaskView->ItemList();
    108108    } else $Output = $this->System->SystemMessage('Stažení emulátoru', 'Nebylo zadáno Id');
    … …  
    117117      $Emulator->Compile();       
    118118      $Output = $this->System->SystemMessage('Překlad emulátoru', 'Úloha zařazena do fronty');
    119       $TaskView = new TaskView($this->Database, $this->System);
     119      $TaskView = new TaskView($this->System);
    120120      $Output .= $TaskView->ItemList();
    121121    } else $Output = $this->System->SystemMessage('Překlad emulátoru', 'Nebylo zadáno Id');

  • trunk/www/Application/View/Include.php

    r69 r74  
    1414include('Application/View/Client.php');
    1515include('Application/View/Debug.php');
     16include('Application/View/Cluster.php');
     17
    1618?>

  • trunk/www/Application/View/Page.php

    r73 r74  
    3535    ' <a href="?Module=Emulator&amp;Action=ItemList">Verze emulátoru</a>'.
    3636    '</span><div class="MenuItem2">';
    37     if($this->System->Modules['User']->User['Id'] == $this->System->Modules['User']->AnonymousUserId)
     37    if($this->System->Modules['User']->User['Id'] == $this->Config['Web']['UserAnonymousId'])
    3838    {
    3939      $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/?Module=User&amp;Action=Login">Přihlášení</a>';
    … …  
    6464  {
    6565    $Output = '<table class="BasicTable"><tr>';
    66     if($this->System->Modules['User']->User['Id'] != $this->System->Modules['User']->AnonymousUserId)
     66    if($this->System->Modules['User']->User['Id'] != $this->Config['Web']['UserAnonymousId'])
    6767      $Output .= '<td class="UserMenu">'.$this->UserMenu().'</td>';
    6868    $Output .= '<td class="Content">'.$Content.'</td>';
    6969    if(!array_key_exists('Action', $_GET))
    7070    {
    71       $NewsView = new NewsView($this->Database, $this->System);
     71      $NewsView = new NewsView($this->System);
    7272      $Output .= $NewsView->View();
    7373    }
    … …  
    7979  {   
    8080    $Output = '<strong>Uživatelské menu</strong><br />';
    81     if($this->System->Modules['User']->User['Id'] != $this->System->Modules['User']->AnonymousUserId)
     81    if($this->System->Modules['User']->User['Id'] != $this->Config['Web']['UserAnonymousId'])
    8282    {
     83      $Output .= '<div><a href="?Module=Cluster&amp;Action=ItemList">Uzly skupiny</a></div>';
    8384      $Output .= '<div><a href="?Module=Server&amp;Action=ItemList&amp;Filter=User">Moje servery</a></div>';
    8485      //$Output .= '<div><a href="?Action=RealmList&amp;Filter=User">Moje světy</a></div>';

  • trunk/www/Application/View/Realm.php

    r72 r74  
    230230        $Realm->CreateDatabase();           
    231231        $Output = $this->System->SystemMessage('Vytvoření světu', $Realm->ImportDatabase(true));
    232         $TaskView = new TaskView($this->Database, $this->System);
     232        $TaskView = new TaskView($this->System);
    233233        $Output .= $TaskView->ItemList();
    234234        //$UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
    … …  
    337337      {
    338338        $Output .= $this->System->SystemMessage('Spuštění serveru', $Realm->Start());
    339         $TaskView = new TaskView($this->Database, $this->System);
     339        $TaskView = new TaskView($this->System);
    340340        $Output .= $TaskView->ItemList();;
    341341      } else $this->System->SystemMessage('Spuštění serveru', 'Nemáte oprávnění');
    … …  
    353353      {
    354354        $Output .= $this->System->SystemMessage('Zastavení serveru', $Realm->Stop());
    355         $TaskView = new TaskView($this->Database, $this->System);
     355        $TaskView = new TaskView($this->System);
    356356        $Output .= $TaskView->ItemList();;
    357357      } else $this->System->SystemMessage('Zastavení serveru', 'Nemáte oprávnění');
    … …  
    373373        {
    374374          $Output = $this->System->SystemMessage('Vynulování databáze', $Realm->ImportDatabase(true));
    375           $TaskView = new TaskView($this->Database, $this->System);
     375          $TaskView = new TaskView($this->System);
    376376          $Output .= $TaskView->ItemList();
    377377          //$UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);

  • trunk/www/Base/Global.php

    r69 r74  
    7373}
    7474
     75function ParseCommandLineArgs($argv)
     76{
     77  array_shift($argv);
     78  $out = array();
     79  foreach ($argv as $arg)
     80  {
     81    if(substr($arg,0,2) == '--')
     82    {
     83      $eqPos = strpos($arg,'=');
     84      if($eqPos === false)
     85      {
     86        $key = substr($arg,2);
     87        $out[$key] = isset($out[$key]) ? $out[$key] : true;
     88      } else
     89      {
     90        $key = substr($arg,2,$eqPos-2);
     91        $out[$key] = substr($arg,$eqPos+1);
     92      }
     93    } else if(substr($arg,0,1) == '-')
     94    {
     95      if(substr($arg,2,1) == '=')
     96      {
     97        $key = substr($arg,1,1);
     98        $out[$key] = substr($arg,3);
     99      } else
     100      {
     101        $chars = str_split(substr($arg,1));
     102        foreach($chars as $char)
     103        {
     104          $key = $char;
     105          $out[$key] = isset($out[$key]) ? $out[$key] : true;
     106        }
     107      }
     108    } else
     109    {
     110      $out[] = $arg;
     111    }
     112  }
     113  return($out);
     114}
     115
    75116?>

  • trunk/www/index.php

    r69 r74  
    22
    33include('Include.php');
     4if(array_key_exists('argv', $_SERVER))
     5  $_GET = array_merge($_GET, ParseCommandLineArgs($_SERVER['argv']));
    46
    57// SQL injection hack protection
    … …  
    1820$System->AddModule(new User($System));
    1921if(isset($_SERVER['REMOTE_ADDR'])) $System->Modules['User']->Check();
    20   else $System->Modules['User']->User['Id'] = 0;
    21 
     22  else $System->Modules['User']->User['Id'] = $Config['Web']['UserConsoleId'];
    2223
    2324if(array_key_exists('Module', $_GET)) $Module = $_GET['Module'];
Note: See TracChangeset for help on using the changeset viewer.