Changeset 524 for trunk/Common/Global.php

Timestamp:

Apr 20, 2013, 8:51:15 PM (11 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.

File:

• trunk/Common/Global.php (modified) (5 diffs)

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();
 }