Changeset 524

Timestamp:

Apr 20, 2013, 8:51:15 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Definice třída User přesunuta do modulu User. Existuje aplikační modul System->ModuleManager->ModulesUser a samotná instance třídy System->User.
• Upraveno: Zbylá inicializace starého modulového systému třídy Module přesunuta do startovní části aplikačních modulů.
• Upraveno: Třída System přesunuta ze souboru Common/Global do samostatného souboru Common/System.

Location:

trunk

Files:

• Common/AppModule.php (modified) (2 diffs)
• Common/Database.php (modified) (1 diff)
• Common/Global.php (modified) (5 diffs)
• Common/Log.php (deleted)
• Common/Module.php (modified) (1 diff)
• Common/Page.php (modified) (2 diffs)
• Common/Version.php (modified) (1 diff)
• Modules/Chat/Chat.php (modified) (1 diff)
• Modules/File/File.php (modified) (2 diffs)
• Modules/Finance/Customers.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (2 diffs)
• Modules/Finance/Import.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (7 diffs)
• Modules/Finance/Overview.php (modified) (1 diff)
• Modules/Finance/UserState.php (modified) (1 diff)
• Modules/Finance/Zivnost.php (modified) (1 diff)
• Modules/FinanceBankAPI/FileImport.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (2 diffs)
• Modules/Log/Log.php (modified) (1 diff)
• Modules/Network/Administration.php (modified) (1 diff)
• Modules/Network/UserHosts.php (modified) (1 diff)
• Modules/NetworkShare/SharePage.php (modified) (1 diff)
• Modules/News/News.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (7 diffs)
• Modules/OpeningHours/OpeningHours.php (modified) (3 diffs)
• Modules/Portal/Portal.php (modified) (14 diffs)
• Modules/TV/tkr.php (modified) (1 diff)
• Modules/User/User.php (moved) (moved from trunk/Common/User.php ) (12 diffs)
• Modules/WebCam/WebCam.php (modified) (1 diff)
• block/index.php (modified) (1 diff)
• missing.php (modified) (1 diff)
• temp/renumbering.php (modified) (1 diff)
• temp/user_mail.php (modified) (1 diff)

trunk/Common/AppModule.php

@@ -24 +24 @@
     $this->System = &$System;
     $this->Database = &$System->Database;
+    $this->Installed = false;
   }
   
@@ -86 +87 @@
     unset($this->Modules[array_search($Module, $this->Modules)]);  
   }
+  
+  /* @return Module */
+  function SearchModuleById($Id)
+  {
+    foreach($this->Modules as $Module)
+    {
+      //DebugLog($Module->Name.' '.$Module->Id);
+      if($Module->Id == $Id) return($Module->Name);
+    }
+    return('');
+  }
+  
 }
 

trunk/Common/Database.php

@@ -71 +71 @@
       $this->Error = $this->Error[2];
       if(($this->Error != '') and ($this->ShowSQLError == true)) 
-        //echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
+        echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
         throw new Exception('SQL Error: </strong>'.$this->Error.', Query: '.$Query);
     }

trunk/Common/Global.php

@@ -15 +15 @@
 include_once(dirname(__FILE__).'/Database.php');
 include_once(dirname(__FILE__).'/Code.php');
+include_once(dirname(__FILE__).'/System.php');
 include_once(dirname(__FILE__).'/Mail.php');
-include_once(dirname(__FILE__).'/Log.php');
-include_once(dirname(__FILE__).'/User.php');
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Form/Form.php');
@@ -23 +22 @@
  
 // Application modules
+include_once(dirname(__FILE__).'/../Modules/System/System.php');
 include_once(dirname(__FILE__).'/../Modules/Error/Error.php');
+include_once(dirname(__FILE__).'/../Modules/Log/Log.php');
 include_once(dirname(__FILE__).'/../Modules/File/File.php');
 include_once(dirname(__FILE__).'/../Modules/Meteostation/Meteostation.php');
@@ -45 +46 @@
 include_once(dirname(__FILE__).'/../Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php');
 
-class System extends Module
-{
-  var $Modules; 
-  /** @var Type */
-  var $Type;
-  var $Pages;
-  /** @var AppModuleManager */
-  var $ModuleManager;
-  var $PathItems;
-  var $RootURLFolder;
-
-  function __construct()
-  {
-    parent::__construct();
-    $this->Modules = array();
-    $this->Pages = array();
-    $this->ModuleManager = new AppModuleManager();
-    $this->Database = new Database();
-    $this->FormManager = new FormManager($this->Database);
-  }  
-  
-  function RegisterPage($Path, $Handler)
-  {
-    if(is_array($Path))
-    {
-      $Page = &$this->Pages;
-      $LastKey = array_pop($Path);
-      foreach($Path as $PathItem)
-      {
-        $Page = &$Page[$PathItem];       
-      }
-      if(!is_array($Page)) $Page = array('' => $Page);
-      $Page[$LastKey] = $Handler;
-    } else $this->Pages[$Path] = $Handler;
-  }
-  
-  function SearchPage($PathItems, $Pages)
-  {
-    if(count($PathItems) > 0) $PathItem = $PathItems[0];
-      else $PathItem = '';
-    if(array_key_exists($PathItem, $Pages))
-    {
-      if(is_array($Pages[$PathItem])) 
-      {
-        array_shift($PathItems);
-        return($this->SearchPage($PathItems, $Pages[$PathItem]));
-      } else return($Pages[$PathItem]);
-    } else return('');
-  }
-  
-  function PageNotFound()
-  {
-    return('Page '.implode('/', $this->PathItems).' not found.');
-  }
-  
-  function ShowPage()
-  {
-    /* @var $Page Page */
-    $ClassName = $this->SearchPage($this->PathItems, $this->Pages);     
-    if($ClassName != '') 
-    {
-      $Page = new $ClassName();
-      $Page->System = &$this;
-      $Page->Database = &$this->Database;
-      $Page->GetOutput();
-    } else echo($this->PageNotFound());
-  }
-  
-  function ModulePresent($Name)
-  {
-    return(array_key_exists($Name, $this->Modules));
-  }
-
-  function AddModule($Module)
-  {
-    //echo('Přidávám modul '.get_class($Module).'<br />');
-    $Module->System = &$this;
-    $Module->Database = &$this->Database;
-    $this->Modules[get_class($Module)] = $Module;
-  }
-  
-  function AddEmailToQueue($To, $Subject, $Content, $From, $AttachmentFileId = '')
-  {
-    $Values = array('To' => $To, 
-      'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()', 
-      'From' => $From);
-    if($AttachmentFileId != '') $Values['AttachmentFile'] = $AttachmentFileId;
-    $this->Database->insert('EmailQueue', $Values);
-  }
-  
-  function ProcessEmailQueue()
-  {
-    $Output = '';
-    $DbResult = $this->Database->select('EmailQueue', '*', 'Archive=0');
-    while($DbRow = $DbResult->fetch_assoc())
-    {      
-      $Mail = new Mail();
-      $Mail->AddToCombined($DbRow['To']);
-      $Mail->Subject = $DbRow['Subject'];
-      $Mail->From = $DbRow['From'];
-      $Mail->AddBody(strip_tags($DbRow['Content']), 'text/plain');
-      $Mail->AddBody($DbRow['Content'], 'text/html');
-      if($DbRow['AttachmentFile'] != '')
-      {
-        $DbResult2 = $this->Database->select('File', '*', 'Id='.$DbRow['AttachmentFile']);
-        while($File = $DbResult2->fetch_assoc())
-          $Mail->AttachFile($this->Config['Web']['FileRootFolder'].$File['DrivePath'], $File['MimeType']);
-      }
-      $Mail->Send();
-      $this->Database->update('EmailQueue', 'Id='.$DbRow['Id'], array('Archive' => 1));
-      $this->Modules['Log']->NewRecord('System', 'SendEmail', $DbRow['Id']);
-      $Output .= 'To: '.$DbRow['To'].'  Subject: '.$DbRow['Subject'].'<br />';
-    }    
-    return($Output);
-  }
-  
-  function HumanDate($Time)
-  {
-    return(date('j.n.Y', $Time));
-  }
-  
-  function Link($Target)
-  {
-    return($this->RootURLFolder.$Target);
-  }   
-}
-
 function GlobalInit()
 {
@@ -204 +78 @@
   if(!$UpdateManager->IsUpToDate()) die('Systém vyžaduje aktualizaci databáze.');
   
-  // Init old modules
-  $System->AddModule(new Log());
-  $System->AddModule(new User());
-  if(isset($_SERVER['REMOTE_ADDR'])) $System->Modules['User']->Check();
-  $System->AddModule(new Bill());
-  $System->AddModule(new Finance());
-  $System->Modules['Finance']->MainSubject = $Config['Finance']['MainSubjectId'];
-  $System->Modules['Finance']->DirectoryId = $Config['Finance']['DirectoryId'];
-  $System->Modules['Finance']->LoadMonthParameters(0);
-  $System->Modules['Log']->Database->LastQuery = 'ssd';
-  RegisterFormClasses($System->FormManager);
-  
+  $Database = $System->Database; 
+  RegisterFormClasses($System->FormManager);  
   
   // Register new modules
   $System->ModuleManager->RegisterModule(new ModuleError($System));
+  $System->ModuleManager->RegisterModule(new ModuleSystem($System));
+  $System->ModuleManager->RegisterModule(new ModuleLog($System));
   $System->ModuleManager->RegisterModule(new ModuleFile($System));
   $System->ModuleManager->RegisterModule(new ModuleMeteostation($System));
@@ -236 +102 @@
   $System->ModuleManager->RegisterModule(new ModuleMeals($System));
   $System->ModuleManager->RegisterModule(new ModuleNetworkTopology($System));
+  $System->ModuleManager->RegisterModule(new ModuleNetworkConfig($System));
+  $System->ModuleManager->RegisterModule(new ModuleNetworkConfigRouterOS($System));
+  $System->ModuleManager->RegisterModule(new ModuleNetworkConfigLinux($System));
   $System->ModuleManager->StartAll();
 }

trunk/Common/Module.php

@@ -11 +11 @@
   var $CurrentPath = '/';
 
-  function __construct()
+  function __construct($System)
   {
+    $this->System = &$System;
+    $this->Database = &$System->Database;    
   }
 }

trunk/Common/Page.php

@@ -67 +67 @@
     if($this->System->Config['Web']['UserSupport'] == 1)
     {
-      if($this->System->Modules['User']->User['Id'] == null)
+      if($this->System->User->User['Id'] == null)
         $Output .= '<a href="'.$this->System->Link('/?Action=LoginForm').'">Přihlášení</a> <a href="'.$this->System->Link('/?Action=UserRegister').'">Registrace</a>'; 
-        else $Output .= $this->System->Modules['User']->User['Name'].' <a href="'.$this->System->Link('/?Action=Logout').'">Odhlásit</a>';
+        else $Output .= $this->System->User->User['Name'].' <a href="'.$this->System->Link('/?Action=Logout').'">Odhlásit</a>';
    } else $Output .= '&nbsp;';
 // <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>'; 
@@ -78 +78 @@
   function ShowFooter()
   {
-  global $ScriptTimeStart;
+    global $ScriptTimeStart;
     $Time = round(GetMicrotime() - $ScriptTimeStart, 2);
     $Output = '<div id="Footer">
    <i>| Správa webu: '.$this->System->Config['Web']['Admin'].' | e-mail: '.$this->System->Config['Web']['AdminEmail'].' |';
     if($this->ShowRuntimeInfo == true) $Output .= ' Doba generování: '.$Time.' s / '.ini_get('max_execution_time').' s | Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B |';
-  $Output .= '</i></div></body></html>';
+    $Output .= '</i></div></body></html>';
     return($Output); 
   }

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 522; // Subversion revision
+$Revision = 524; // Subversion revision
 $DatabaseRevision = 517; // SQL structure revision
-$ReleaseTime = '2013-04-15';
+$ReleaseTime = '2013-04-20';
 
 ?>

trunk/Modules/Chat/Chat.php

@@ -21 +21 @@
     global $MonthNames;
     
-    if(!$this->System->Modules['User']->CheckPermission('Chat', 'Display')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Chat', 'Display')) return('Nemáte oprávnění');
 
     if(array_key_exists('date', $_GET)) $Date = $_GET['date']; 

trunk/Modules/File/File.php

@@ -7 +7 @@
   var $FilesDir;
   
-  function __construct($Database) 
+  function __construct($System) 
   {
-    $this->Database = $Database;
+    parent::__construct($System);
     $this->FilesDir = '';
   }
@@ -118 +118 @@
     parent::Start();
     $this->System->RegisterPage('file', 'PageFile');
-    $File = new File($this->System->Database);
-    $File->FilesDir = dirname(__FILE__).'/../../'.$Config['Web']['UploadFileFolder'];    
-    $this->System->AddModule($File);
+    $this->System->AddModule(new File($this->System));
+    $this->System->Modules['File']->FilesDir = dirname(__FILE__).'/../../'.$Config['Web']['UploadFileFolder'];
   }  
   

trunk/Modules/Finance/Customers.php

@@ -11 +11 @@
     $Finance = $this->System->Modules['Finance'];
     $this->System->Modules['Finance']->LoadTariffs();
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
 
     $Output = 'Seznam účastníků:<br/>';

trunk/Modules/Finance/Finance.php

@@ -37 +37 @@
   function Start()
   {
+    global $Config;
+    
     parent::Start();
     $this->System->RegisterPage('finance', 'PageFinance');
@@ -48 +50 @@
     $this->System->RegisterPage(array('finance', 'import'), 'PageFinanceImportPayment');    
     $this->System->RegisterPage(array('finance', 'zivnost'), 'PageFinanceTaxFiling');    
+
+    $this->System->AddModule(new Bill($this->System));
+    $this->System->AddModule(new Finance($this->System));
+    $this->System->Modules['Finance']->MainSubject = $Config['Finance']['MainSubjectId'];
+    $this->System->Modules['Finance']->DirectoryId = $Config['Finance']['DirectoryId'];
+    $this->System->Modules['Finance']->LoadMonthParameters(0);  
   }  
   

trunk/Modules/Finance/Import.php

@@ -9 +9 @@
   function Show()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
     if(array_key_exists('Operation', $_GET))
     {

trunk/Modules/Finance/Manage.php

@@ -9 +9 @@
   function Show()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) 
+    if(!$this->System->User->CheckPermission('Finance', 'Manage')) 
       return('Nemáte oprávnění');
 
@@ -203 +203 @@
     $Form->SaveValuesToDatabase(0);
     $Output = $this->SystemMessage('Finance', 'Zařízení vloženo.');
-    $this->System->Modules['Log']->NewRecord('Finance', 'NewDeviceInserted');
+    $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewDeviceInserted');
     return($Output);
   }
@@ -223 +223 @@
     $Form->SaveValuesToDatabase(0);
     $Output = $this->SystemMessage('Finance', 'Záznam historie zařízení vložen.');
-    $this->System->Modules['Log']->NewRecord('Finance', 'NewDeviceHistoryInserted');
+    $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewDeviceHistoryInserted');
     return($Output);
   }
@@ -246 +246 @@
     $DbRow = $DbResult->fetch_assoc();
     $Output = $this->SystemMessage('Finance', 'Platba vložena '.$DbRow['BillCode'].'.');
-    $this->System->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
+    $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
     return($Output);
   }
@@ -272 +272 @@
     $DbRow = $DbResult->fetch_assoc();
     $Output = $this->SystemMessage('Finance', 'Faktura vložena '.$DbRow['BillCode'].'.');
-    $this->System->Modules['Log']->NewRecord('Finance', 'NewInvoiceInserted');
+    $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewInvoiceInserted');
     return($Output);
   }
@@ -308 +308 @@
   function ShowMonthlyPayment()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
     $SQL = 'SELECT Member.*, MemberPayment.MonthlyTotal AS Monthly, '.
       'MemberPayment.Cash AS Cash, '.
@@ -450 +450 @@
   function ProcessMonthlyPayment()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
     $Output = '';
 

trunk/Modules/Finance/Overview.php

@@ -15 +15 @@
     $Output .= '<a href="'.$this->System->Link('/finance/sluzby/').'">Přehled nabízených služeb</a><br />';
     $Output .= '<a href="'.$this->System->Link('/finance/zarizeni/').'">Výpis zařízení</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) 
+    if($this->System->User->CheckPermission('Finance', 'SubjectList')) 
       $Output .= '<a href="'.$this->System->Link('/finance/zakaznici/').'">Seznam zákazníků</a><br />';
     $Output .= '<a href="'.$this->System->Link('/finance/spotreba/').'">Spotřeba energie</a><br />';

trunk/Modules/Finance/UserState.php

@@ -14 +14 @@
     if(array_key_exists('Subject', $_GET))
     {
-      if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
+      if(!$this->System->User->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
       $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id='.$_GET['Subject']);
       $Subject = $DbResult->fetch_assoc();
     } else
     {
-      if(!$this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
-      $UserId = $this->System->Modules['User']->User['Id'];
+      if(!$this->System->User->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
+      $UserId = $this->System->User->User['Id'];
       $DbResult = $this->Database->query('SELECT Customer FROM UserCustomerRel WHERE User='.$UserId.' LIMIT 1');
       if($DbResult->num_rows > 0)

trunk/Modules/Finance/Zivnost.php

@@ -55 +55 @@
   function Show()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'TradingStatus')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Finance', 'TradingStatus')) return('Nemáte oprávnění');
     $this->System->Modules['Finance']->LoadTariffs(1);
     //TransformFinance();

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -29 +29 @@
   function Show()
   {   
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
      
     $DbResult = $this->Database->select('FinanceBankAccount', '*', 'Id='.$_GET['id']);
@@ -56 +56 @@
   {
     $Output = '';
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
     if(array_key_exists('Operation', $_GET))
     {

trunk/Modules/IS/IS.php

@@ -12 +12 @@
   function Show()
   {
-    if(!$this->System->Modules['User']->CheckPermission('IS', 'Manage')) 
+    if(!$this->System->User->CheckPermission('IS', 'Manage')) 
       return('Nemáte oprávnění');
 
@@ -107 +107 @@
         $_SESSION['Id'] = $Id;
         //$this->Database->update($Table, 'Id='.$Id, 
-        //  array('UserCreate' => $this->System->Modules['User']->User['Id'], 
+        //  array('UserCreate' => $this->System->User->User['Id'], 
         //  'TimeCreate' => 'NOW()'));
         $Output .= $this->ShowView($Table, $Id);   

trunk/Modules/Log/Log.php

@@ -37 +37 @@
   {
     if(array_key_exists('User', $this->System->Modules) and 
-      array_key_exists('Id', $this->System->Modules['User']->User))
-      $UserId = $this->System->Modules['User']->User['Id'];
+      array_key_exists('Id', $this->System->User->User))
+      $UserId = $this->System->User->User['Id'];
       else $UserId = NULL;
     $this->Database->insert('Log', array('Time' => 'NOW()', 

trunk/Modules/Network/Administration.php

@@ -13 +13 @@
   function Show()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Network', 'Administration')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Network', 'Administration')) return('Nemáte oprávnění');
     $Output = '';
     if(array_key_exists('Action', $_GET))

trunk/Modules/Network/UserHosts.php

@@ -17 +17 @@
     $Output = '<div align="center" style="font-size: small;"><table class="WideTable">';
     $Output .= '<tr><th>Jméno počítače</th><th>Místní adresa</th><th>Veřejná adresa</th><th>Fyzická adresa</th><th>Typ</th><th>Naposledy online</th></tr>';
-    $DbResult = $this->Database->query('SELECT NetworkDevice.*, NetworkDeviceType.Name AS HostType FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDevice.Used = 1 AND NetworkDevice.Member = (SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->Modules['User']->User['Id'].') ORDER BY NetworkDevice.Name');
+    $DbResult = $this->Database->query('SELECT NetworkDevice.*, NetworkDeviceType.Name AS HostType FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDevice.Used = 1 AND NetworkDevice.Member = (SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->User->User['Id'].') ORDER BY NetworkDevice.Name');
     while($Device = $DbResult->fetch_assoc())
     {

trunk/Modules/NetworkShare/SharePage.php

@@ -68 +68 @@
   function Show()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Share', 'Display')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('Share', 'Display')) return('Nemáte oprávnění');
 
     // If not only online checkbox checked

trunk/Modules/News/News.php

@@ -51 +51 @@
     $Output = '<div class="NewsPanel"><div class="Title">'.$Row['Caption'];      
     $Output .= '<div class="Action"><a href="aktuality/?category='.$Category.'">Zobrazit</a>';
-    if($this->System->Modules['User']->CheckPermission('News', 'Insert', 'Group', $Category))
+    if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category))
       $Output .= ' <a href="aktuality/?action=add&amp;category='.$Category.'">Přidat</a>';
     $Output .= '</div></div><div class="Content">';

trunk/Modules/News/NewsPage.php

@@ -38 +38 @@
     {
       case 'view':
-        if(!$this->System->Modules['User']->CheckPermission('News', 'Display', 'Item')) $Output .= 'Nemáte oprávnění';
+        if(!$this->System->User->CheckPermission('News', 'Display', 'Item')) $Output .= 'Nemáte oprávnění';
         else 
         {
@@ -49 +49 @@
               else $Author = $Row['Name'];
             $Output .= '<div class="Panel"><div class="Title">'.$Row['Title'].' ('.HumanDate($Row['Date']).', '.$Author.')';
-            if($this->System->Modules['User']->User['Id'] == $Row['User'])
+            if($this->System->User->User['Id'] == $Row['User'])
             { 
               $Output .= '<div class="Action">';
@@ -79 +79 @@
         while($DbRow = $DbResult->fetch_array()) 
         {
-          if($this->System->Modules['User']->CheckPermission('News', 'Insert', 'Group', $DbRow['Id']))
+          if($this->System->User->CheckPermission('News', 'Insert', 'Group', $DbRow['Id']))
           {
             if($DbRow['Id'] == $Category) $Selected = ' selected="1"'; else $Selected = '';
@@ -98 +98 @@
       case 'add2':
         $RemoteAddr = GetRemoteAddress();  
-        if($this->System->Modules['User']->CheckPermission('News', 'Insert', 'Group', $Category))
+        if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category))
         {
           // Process uploaded file
@@ -121 +121 @@
           $this->Database->insert('News', array('Category' => $Category, 'Title' => $_POST['title'], 
             'Content' => $_POST['content'], 'Date' => 'NOW()', 'IP' => $RemoteAddr, 
-            'Enclosure' => $Enclosures, 'Author' => $this->System->Modules['User']->User['Name'], 'User' => $this->System->Modules['User']->User['Id'], 'Link' => $_POST['link']));
+            'Enclosure' => $Enclosures, 'Author' => $this->System->User->User['Name'], 'User' => $this->System->User->User['Id'], 'Link' => $_POST['link']));
           $Output .= 'Aktualita přidána!<br />Pokud budete chtít vaši aktualitu smazat, klikněte na odkaz Smazat v seznamu všech aktualit v kategorii.<br /><br />';
           $Output .= '<a href="?category='.$_POST['category'].'">Zpět na seznam aktualit</a>';
@@ -130 +130 @@
         $DbResult = $this->Database->query('SELECT * FROM News WHERE Id='.$_GET['id']);
         $Row = $DbResult->fetch_array();
-        if($this->System->Modules['User']->User['Id'] == $Row['User'])
+        if($this->System->User->User['Id'] == $Row['User'])
         {
           $Row['Content'] = str_replace('<br />', '', $Row['Content']);
@@ -151 +151 @@
         {
           $Row = $DbResult->fetch_array();
-          if($this->System->Modules['User']->User['Id'] == $Row['User'])
+          if($this->System->User->User['Id'] == $Row['User'])
           {
             $_POST['content'] = str_replace("\n", '<br />', $_POST['content']);

trunk/Modules/OpeningHours/OpeningHours.php

@@ -35 +35 @@
   function EditSubject($Id)
   {
-    if($this->System->Modules['User']->CheckPermission('SubjectOpenTime', 'Edit'))
+    if($this->System->User->CheckPermission('SubjectOpenTime', 'Edit'))
     {
       $Output = '<div class="Centred">';
@@ -77 +77 @@
     
     $Output = '';
-    if($this->System->Modules['User']->CheckPermission('SubjectOpenTime', 'Edit'))
+    if($this->System->User->CheckPermission('SubjectOpenTime', 'Edit'))
     {
       $this->Database->delete('SubjectOpenTimeDay', 'Subject='.$Id);
@@ -189 +189 @@
       if($Subject['Photo'] != 0) $Output .= '<a href="file?id='.$Subject['Photo'].'">Fotka</a> ';
       
-      if($this->System->Modules['User']->CheckPermission('SubjectOpenTime', 'Edit'))
+      if($this->System->User->CheckPermission('SubjectOpenTime', 'Edit'))
         $Output .= '<a href="edit?Subject='.$Subject['Id'].'">Editovat</a><br />';
       $Output .= '<br />';

trunk/Modules/Portal/Portal.php

@@ -16 +16 @@
       if($HyperLink['IconFile'] == '') $HyperLink['IconFile'] = 'clear.png';
         if(substr($HyperLink['URL'], 0, 4) != 'http') $HyperLink['URL'] = $this->System->Config['Web']['RootFolder'].$HyperLink['URL'];
-        if(($HyperLink['PermissionModule'] == '') or (($HyperLink['PermissionModule'] != '') and $this->System->Modules['User']->Modules['User']->CheckPermission($HyperLink['PermissionModule'], $HyperLink['PermissionOperation'])))        
+        if(($HyperLink['PermissionModule'] == '') or (($HyperLink['PermissionModule'] != '') and $this->System->User->User->CheckPermission($HyperLink['PermissionModule'], $HyperLink['PermissionOperation'])))        
         $Output .= '<img alt="'.$HyperLink['Name'].'" src="images/favicons/'.$HyperLink['IconFile'].'" width="16" height="16" /> <a href="'.$HyperLink['URL'].'">'.$HyperLink['Name'].'</a><br />';
     }
@@ -55 +55 @@
     //$Output .= 'Server běží: '.$this->GetServerUptime().' &nbsp;  &nbsp; ';
 
-    if($this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState'))
-    {
-      $DbResult = $this->Database->select('MemberPayment', 'Cash', 'Member=(SELECT Customer FROM UserCustomerRel WHERE Id='.$this->System->Modules['User']->User['Id'].')');
+    if($this->System->User->CheckPermission('Finance', 'DisplaySubjectState'))
+    {
+      $DbResult = $this->Database->select('MemberPayment', 'Cash', 'Member=(SELECT Customer FROM UserCustomerRel WHERE Id='.$this->System->User->User['Id'].')');
       if($DbResult->num_rows > 0)
       {
@@ -72 +72 @@
   {
     $Output = '<a href="'.$this->System->Link('/?Action=UserOptions').'">Profil</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Finance', 'MemberOptions')) 
+    if($this->System->User->CheckPermission('Finance', 'MemberOptions')) 
       $Output .= '<a href="'.$this->System->Link('/?Action=MemberOptions').'">Domácnost</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) 
+    if($this->System->User->CheckPermission('Finance', 'DisplaySubjectState')) 
       $Output .= '<a href="'.$this->System->Link('/finance/platby/').'">Finance</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Network', 'RegistredHostList')) 
+    if($this->System->User->CheckPermission('Network', 'RegistredHostList')) 
       $Output .= '<a href="'.$this->System->Link('/network/user-hosts/').'">Počítače</a><br />';
-    if($this->System->Modules['User']->CheckPermission('News', 'Insert')) 
+    if($this->System->User->CheckPermission('News', 'Insert')) 
       $Output .= '<a href="'.$this->System->Link('/aktuality/?action=add').'">Vložení aktuality</a><br />';
-    if($this->System->Modules['User']->CheckPermission('EatingPlace', 'Edit'))
+    if($this->System->User->CheckPermission('EatingPlace', 'Edit'))
       $Output .= '<a href="'.$this->System->Link('/jidelna/menuedit.php').'">Úprava jídelníčků</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Finance', 'Manage'))
+    if($this->System->User->CheckPermission('Finance', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/finance/sprava/').'">Správa financí</a><br />';
-    if($this->System->Modules['User']->CheckPermission('Network', 'Administration'))
+    if($this->System->User->CheckPermission('Network', 'Administration'))
       $Output .= '<a href="'.$this->System->Link('/network/administration/').'">Správa sítě</a><br />';
-    if($this->System->Modules['User']->CheckPermission('IS', 'Manage'))
+    if($this->System->User->CheckPermission('IS', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/is/').'">Správa dat</a><br />';
     return($Output);
@@ -156 +156 @@
         $Form->SetClass('UserLogin');
         $Form->OnSubmit = '?Action=Login';
-        $Result = $this->System->Modules['User']->Login($_POST['Username'], $_POST['Password']);
+        $Result = $this->System->User->Login($_POST['Username'], $_POST['Password']);
         $Output .= $this->SystemMessage('Přihlášení', $Result);
         if($Result <> USER_LOGGED_IN)
@@ -170 +170 @@
       if($_GET['Action'] == 'Logout')
       {
-        if($this->System->Modules['User']->User['Id'] != null)
-        {
-          $Output .= $this->SystemMessage('Odhlášení', $this->System->Modules['User']->Logout());
+        if($this->System->User->User['Id'] != null)
+        {
+          $Output .= $this->SystemMessage('Odhlášení', $this->System->User->Logout());
         } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
       } else
       if($_GET['Action'] == 'UserOptions')
       { 
-        if($this->System->Modules['User']->User['Id'] != null)
+        if($this->System->User->User['Id'] != null)
         {
           $UserOptions = new Form($this->System->FormManager);
           $UserOptions->SetClass('UserOptions');
-          $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
+          $UserOptions->LoadValuesFromDatabase($this->System->User->User['Id']);
           $UserOptions->OnSubmit = '?Action=UserOptionsSave';
           $Output .= $UserOptions->ShowEditForm();
@@ -191 +191 @@
         $UserOptions->SetClass('UserOptions');
         $UserOptions->LoadValuesFromForm();
-        $UserOptions->SaveValuesToDatabase($this->System->Modules['User']->User['Id']);
+        $UserOptions->SaveValuesToDatabase($this->System->User->User['Id']);
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení uloženo.');
         $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Nastavení uživatele změněno', $UserOptions->Values['Name']);
-        $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
+        $UserOptions->LoadValuesFromDatabase($this->System->User->User['Id']);
         $UserOptions->OnSubmit = '?Action=UserOptionsSave';
         $Output .= $UserOptions->ShowEditForm();
@@ -209 +209 @@
       {
         $Output .= $this->SystemMessage('Potvrzení registrace', 
-          $this->System->Modules['User']->RegisterConfirm($_GET['User'], $_GET['H']));
+          $this->System->User->RegisterConfirm($_GET['User'], $_GET['H']));
       } else
       if($_GET['Action'] == 'PasswordRecovery')
@@ -223 +223 @@
         $Form->SetClass('PasswordRecovery');
         $Form->LoadValuesFromForm();
-        $Result = $this->System->Modules['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
+        $Result = $this->System->User->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
         $Output .= $this->SystemMessage('Obnova hesla', $Result);
         if($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
@@ -232 +232 @@
       if($_GET['Action'] == 'PasswordRecoveryConfirm')
       {
-        $Output .= $this->SystemMessage('Obnova hesla', $this->System->Modules['User']->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
+        $Output .= $this->SystemMessage('Obnova hesla', $this->System->User->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
       } else
       if($_GET['Action'] == 'UserRegisterSave')
@@ -239 +239 @@
         $Form->SetClass('UserRegister');
         $Form->LoadValuesFromForm();
-        $Result = $this->System->Modules['User']->Register($Form->Values['Login'], $Form->Values['Password'], $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name'], $Form->Values['PhoneNumber'], $Form->Values['ICQ']);
+        $Result = $this->System->User->Register($Form->Values['Login'], $Form->Values['Password'], $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name'], $Form->Values['PhoneNumber'], $Form->Values['ICQ']);
         $Output .= $this->SystemMessage('Registrace nového účtu', $Result);
         if($Result <> USER_REGISTRATED) 
@@ -251 +251 @@
         $Form = new Form($this->System->FormManager);
         $Form->SetClass('MemberOptions');
-        $DbResult = $this->Database->query('SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->Modules['User']->User['Id']);
+        $DbResult = $this->Database->query('SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->User->User['Id']);
         if($DbResult->num_rows > 0)
         {
@@ -278 +278 @@
           $Form->Values['BillingPeriodNext'] = 2;
           
-        $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->User['Member'], 
+        $DbResult = $this->Database->update('Member', 'Id='.$this->System->User->User['Member'], 
            array('FamilyMemberCount' => $Form->Values['FamilyMemberCount'], 
            'BillingPeriodNext' => $Form->Values['BillingPeriodNext']));
-        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->Modules['User']->User['Member']);
+        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->User->User['Member']);
         $Member = $DbResult->fetch_assoc();
         $DbResult = $this->Database->update('Subject', 'Id='.$Member['Subject'], 
@@ -294 +294 @@
           'Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, '.
           'Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject '.
-          'ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
+          'ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->User->User['Member']);
         $DbRow = $DbResult->fetch_array();
         foreach($Form->Definition['Items'] as $Index => $Item)
@@ -326 +326 @@
         else if($Panel['Module'] == 'UserOptions') 
         {
-          if($this->System->Modules['User']->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
+          if($this->System->User->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
         } else
         if($Panel['Module'] == 'Webcam') $Output .= $this->Panel('Kamery', $this->WebcamPanel());

trunk/Modules/TV/tkr.php

@@ -23 +23 @@
 }
 
-$System->AddModule(new CableTVChennelListPage());
+$System->AddModule(new CableTVChennelListPage($System));
 $System->Modules['CableTVChennelListPage']->GetOutput();
 

trunk/Modules/User/User.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/UserList.php');
 
 define('LOGIN_USED', 'Přihlašovací jméno již použito.');
@@ -47 +49 @@
 class User extends Module
 {
-  var $Dependencies = array('Log');
   var $Roles = array();
   var $User = array();
-  var $DefaultRole = 2;
   var $OnlineStateTimeout = 600; // in seconds
   var $PermissionCache = array();
@@ -58 +58 @@
   var $PasswordHash;
   
-  function __construct()
-  {
+  function __construct($System)
+  {
+    parent::__construct($System);
     $this->PasswordHash = new PasswordHash();
   }
@@ -97 +98 @@
     {
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
-      if($DbRow['User'] != null) $this->System->Modules['Log']->NewRecord('User', 'Logout');
+      if($DbRow['User'] != null) $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout');
     }
     //$this->LoadPermission($this->User['Role']);
@@ -107 +108 @@
   function Register($Login, $Password, $Password2, $Email, $Name, $PhoneNumber, $ICQ)
   {
-    global $Options, $Config;
+    global $Config;
 
     if(($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = DATA_MISSING;
@@ -155 +156 @@
             
             $Result = USER_REGISTRATED;
-            $this->System->Modules['Log']->NewRecord('User', 'NewRegistration', $Login);
+            $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'NewRegistration', $Login);
           }
         }
@@ -174 +175 @@
         $this->Database->update('User', 'Id='.$Row['Id'], array('Locked' => 0));
         $Output = USER_REGISTRATION_CONFIRMED;
-        $this->System->Modules['Log']->NewRecord('User', 'RegisterConfirm', 'Login='.
+        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'RegisterConfirm', 'Login='.
           $Row['Login'].', Id='.$Row['Id']);
       } else $Output = PASSWORDS_UNMATCHED;
@@ -198 +199 @@
         $Result = USER_LOGGED_IN;
         $this->Check();
-        $this->System->Modules['Log']->NewRecord('User', 'Login', 'Login='.$Login.',Host='.gethostbyaddr(GetRemoteAddress()));
+        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Login', 'Login='.$Login.',Host='.gethostbyaddr(GetRemoteAddress()));
       }
     } else $Result = USER_NOT_REGISTRED;
@@ -208 +209 @@
     $SID = session_id();
     $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => null));
-    $this->System->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
+    $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
     $this->Check();
     return(USER_LOGGED_OUT);
@@ -354 +355 @@
       
       $Output = USER_PASSWORD_RECOVERY_SUCCESS;
-      $this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
+      $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
     } else $Output = USER_PASSWORD_RECOVERY_FAIL;
     return($Output);
@@ -373 +374 @@
           'Salt' => $Salt, 'Locked' => 0));
         $Output = USER_PASSWORD_RECOVERY_CONFIRMED;
-        $this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'Login='.$Row['Login']);
+        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'Login='.$Row['Login']);
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
@@ -380 +381 @@
 }
 
+class ModuleUser extends AppModule
+{
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'User';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPLv3';
+    $this->Description = 'User management';
+    $this->Dependencies = array();
+  }  
+
+  function Install()
+  {
+  }
+  
+  function Uninstall()
+  {     
+  }
+  
+  function Start()
+  {
+    parent::Start();
+    $this->System->User = new User($this->System);
+    if(isset($_SERVER['REMOTE_ADDR'])) $this->System->User->Check();
+    $this->System->RegisterPage('userlist', 'PageUserList');
+  }  
+  
+  function Stop()
+  { 
+  } 
+}
+
 ?>

trunk/Modules/WebCam/WebCam.php

@@ -68 +68 @@
     global $Config;
     $Output = '';
-    //$Output = '<a href="http://www.zdechov.net/kamery/?id=1"><img alt="Webkamera školní hřiště" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam.jpg" /></a>';
-    //$Output .= '<a href="http://www.zdechov.net/kamery/?id=2"><img alt="Webkamera střed obce obloha" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam2.jpg" /></a>';
-    //$Output .= '<a href="http://www.zdechov.net/kamery/?id=3"><img alt="Skiareál, motokrosová grapa" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam3.jpg" /></a>';
-    //$Output .= '<a href="http://www.zdechov.net/kamery/?id=4"><img alt="Fotbalové hřiště" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam4.jpg" /></a>';
+    $Output = '<a href="http://www.zdechov.net/kamery/?id=1"><img alt="Webkamera školní hřiště" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?id=2"><img alt="Webkamera střed obce obloha" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam2.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?id=3"><img alt="Skiareál, motokrosová grapa" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam3.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?id=4"><img alt="Fotbalové hřiště" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam4.jpg" /></a>';
           return($Output);   
   }  

trunk/block/index.php

@@ -41 +41 @@
 }
 
-$System->AddModule(new BlockPage());
+$System->AddModule(new BlockPage($System));
 $System->Modules['BlockPage']->GetOutput();
 

trunk/missing.php

@@ -13 +13 @@
 }
 
-$System->AddModule(new MissingPage());
+$System->AddModule(new MissingPage($System));
 $System->Modules['MissingPage']->GetOutput();
 

trunk/temp/renumbering.php

@@ -55 +55 @@
 }
 
-$System->AddModule(new Renumbering());
+$System->AddModule(new Renumbering($System));
 $System->Modules['Renumbering']->GetOutput();
 

trunk/temp/user_mail.php

@@ -36 +36 @@
 }
 
-$System->AddModule(new Transform());
+$System->AddModule(new Transform($System));
 $System->Modules['Transform']->GetOutput();