Changeset 501

Timestamp:

Mar 10, 2013, 8:15:46 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: FormManager pro objektové řešení zrušení vazeb na třídu System. FormManager nyní obsluhuje existující formulářové typy a třídy formulářů.
• Přidáno: Formulářový typ FileContent zajistí načtení obsahu souboru. Typ File pak zajistí i uložení do databáze a přiřazení Id do tabulky File.
• Odstraněno: Adresář docs obsahoval staré dokumenty. Ty musí být přesunuty do adresáře files a registrovány do databáze.
• Upraveno: Třídy Database nyní bude hlásit chyby přes výjimky PHP.

Location:

trunk

Files:

• Common/Database.php (modified) (2 diffs)
• Common/Error.php (modified) (3 diffs)
• Common/Form (added)
• Common/Form/Form.php (moved) (moved from trunk/Common/Forms.php ) (13 diffs)
• Common/Form/Types (moved) (moved from trunk/Common/Types )
• Common/Form/Types/Base.php (modified) (1 diff)
• Common/Form/Types/Enumeration.php (modified) (2 diffs)
• Common/Form/Types/File.php (copied) (copied from trunk/Common/Types/File/File.php )
• Common/Form/Types/File/File.php (deleted)
• Common/Form/Types/FileContent.php (added)
• Common/Form/Types/Hidden.php (modified) (1 diff)
• Common/Form/Types/OneToMany.php (modified) (2 diffs)
• Common/Form/Types/RandomHash.php (modified) (1 diff)
• Common/Form/Types/Type.php (copied) (copied from trunk/Common/Types/Type.php ) (6 diffs)
• Common/Global.php (modified) (6 diffs)
• Common/Page.php (modified) (1 diff)
• Common/Update.php (modified) (1 diff)
• Common/Version.php (modified) (1 diff)
• Modules/FinanceBankAPI/FileImport.php (modified) (1 diff)
• Modules/FinanceBankAPI/FinanceBankAPI.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (11 diffs)
• Modules/Map/Map.php (modified) (1 diff)
• Modules/Meteostation/Meteostation.php (modified) (1 diff)
• Modules/Network/HostList.php (modified) (1 diff)
• Modules/OpeningHours/OpeningHours.php (modified) (1 diff)
• Modules/Portal/Portal.php (modified) (15 diffs)
• Modules/TV/TV.php (modified) (1 diff)
• aktuality/news.php (modified) (2 diffs)
• config.sample.php (deleted)
• docs (deleted)
• finance/manage.php (modified) (9 diffs)
• form_classes.php (modified) (3 diffs)

trunk/Common/Database.php

@@ -38 +38 @@
   var $ShowSQLQuery = false;
   
-  function __construct($Host, $User, $Password, $Database)
+  function __construct()
+  {    
+  }
+  
+  function Connect($Host, $User, $Password, $Database)
   {    
     if($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
@@ -66 +70 @@
       $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);
     }
     return($Result);  

trunk/Common/Error.php

@@ -4 +4 @@
 {
   var $Encoding;
+  var $ShowError;
+  var $UserErrors;
     
   function __construct()
   {
     $this->Encoding = 'utf-8';
+    $this->ShowError = false;
+    $this->UserErrors = E_ALL;  //E_ERROR | E_WARNING | E_PARSE;
   }
   
@@ -17 +21 @@
   function Handle($Number, $Message, $FileName, $LineNumber, $Variables)
   {
-  global $Config;
+    $Date = date('Y-m-d H:i:s');                // časové razítko položky
+    $ErrorType = array
+    (
+      1 => 'Error',
+      2 => 'Warning',
+      4 => 'Parsing Error',
+      8 => 'Notice',
+      16 => 'Core Error',
+      32 => 'Core Warning',
+      64 => 'Compile Error',
+      128 => 'Compile Warning',
+      256 => 'User Error',
+      512 => 'User Warning',
+      1024 => 'User Notice'
+    );
   
-  $Date = date('Y-m-d H:i:s');          // časové razítko položky
-  $ErrorType = array
-  (
-    1 => 'Error',
-    2 => 'Warning',
-    4 => 'Parsing Error',
-    8 => 'Notice',
-    16 => 'Core Error',
-    32 => 'Core Warning',
-    64 => 'Compile Error',
-    128 => 'Compile Warning',
-    256 => 'User Error',
-    512 => 'User Warning',
-    1024 => 'User Notice'
-  );
-  $UserErrors = E_ALL;  //E_ERROR | E_WARNING | E_PARSE;
-  
-  if(($UserErrors & $Number))
-  {
-    $Error = '# '.$Date."\n";
-    $Backtrace = debug_backtrace();
-    $Backtrace[0]['function'] = $Message;
-    $Backtrace[0]['args'] = '';
-    $Backtrace[0]['file'] = $FileName;
-    $Backtrace[0]['line'] = $LineNumber;
-    //$First = array_shift($Backtrace);
-    //print_r($Backtrace);
+    if(($this->UserErrors & $Number))
+    {
+      $Error = '# '.$Date."\n";
+      $Backtrace = debug_backtrace();
+      $Backtrace[0]['function'] = $Message;
+      $Backtrace[0]['args'] = '';
+      $Backtrace[0]['file'] = $FileName;
+      $Backtrace[0]['line'] = $LineNumber;
+      //$First = array_shift($Backtrace);
     
-    //array_unshift($Backtrace, $First);
-    //array_shift($Backtrace);
-    //print_r($Backtrace);
-    foreach($Backtrace as $Item)
-    {
-      $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
-      $Arguments = '';
-      if(array_key_exists('args', $Item) and is_array($Item['args']))
+      //array_unshift($Backtrace, $First);
+      //array_shift($Backtrace);
+      foreach($Backtrace as $Item)
+      {
+        $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
+        $Arguments = '';
+        if(array_key_exists('args', $Item) and is_array($Item['args']))
         foreach($Item['args'] as $Item)
         {
@@ -61 +60 @@
           else $Arguments .= "'".$Item."',";
         }
-      if(strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';
+        if(strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';
+        $Error .= "\n";     
+      }
       $Error .= "\n";
      
+      $this->System->Modules['Log']->NewRecord('Error', 'Log', $Error);    
+    
+      //if($Config['Web']['ErrorLogFile'] != '')
+        // error_log($Error, 3, $Config['Web']['ErrorLogFile']);
+            // Pošli mi zprávu (pokud je to kritická chyba)
+         //mail($Config['Web']['AdminEmail'], $Config['Web']['Title'].' - Chybové hlášení', $Error);
+          // Show error message
+            if($this->ShowError == true)
+          {
+              echo('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".
+        '<meta http-equiv="Content-Language" content="cs">'."\n".
+        '<meta http-equiv="Content-Type" content="text/html; charset='.$this->Encoding.'"></head><body>'."\n".
+        'Došlo k vnitřní chybě!<br/> O chybě byl uvědoměn správce webu a chybu brzy odstraní.<br/><br/>');
+            echo('<pre>'.$Error.'</pre><br/>');                 // V případě ladění chybu i zobraz
+          echo('</body></html>');
+            }
+      if((E_ERROR | E_PARSE) & $Number) die(); 
     }
-    $Error .= "\n";
-    
-    $this->System->Modules['Log']->NewRecord('Error', 'Log', $Error);    
-    
-    //if($Config['Web']['ErrorLogFile'] != '')
-      //error_log($Error, 3, $Config['Web']['ErrorLogFile']);
-        // Pošli mi zprávu (pokud je to kritická chyba)
-        //mail($Config['Web']['AdminEmail'], $Config['Web']['Title'].' - Chybové hlášení', $Error);
-        // Show error message
-        if($Config['Web']['ShowPHPError'] == true)
-        {
-            echo('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".
-      '<meta http-equiv="Content-Language" content="cs">'."\n".
-      '<meta http-equiv="Content-Type" content="text/html; charset='.$this->Encoding.'"></head><body>'."\n".
-      'Došlo k vnitřní chybě!<br/> O chybě byl uvědoměn správce webu a chybu brzy odstraní.<br/><br/>');
-          echo('<pre>'.$Error.'</pre><br/>');                   // V případě ladění chybu i zobraz
-          echo('</body></html>');
-        }
-    if((E_ERROR | E_PARSE) & $Number) die(); 
-  }
   }
 }

trunk/Common/Form/Form.php

@@ -1 +1 @@
 <?php
 
-include_once(dirname(__FILE__).'/../form_classes.php');
-include_once(dirname(__FILE__).'/Database.php');
+include_once(dirname(__FILE__).'/../Database.php');
+include_once(dirname(__FILE__).'/Types/Type.php');
 
 class Form
 {
-  var $Definition = array();
-  var $Values = array();
-  var $OnSubmit = '';
-  
-  function __construct($ClassName)
-  {  
-    global $FormClasses;
-
-    $this->Definition = &$FormClasses[$ClassName];
-  }
+  var $FormManager;
+  var $Definition;
+  var $Values;
+  var $OnSubmit;
+  var $Database;
+  
+  function __construct($FormManager)
+  {      
+    $this->FormManager = &$FormManager;
+    $this->Database = $FormManager->Database;
+    $this->Definition = array();
+    $this->Values = array();    
+    $this->OnSubmit = '';
+  }
+  
+  function SetClass($Name)
+  {
+    $this->Definition = &$this->FormManager->Classes[$Name];    
+  } 
 
   function ShowViewForm()
   {
-    global $Database, $FormTypes, $System;
-
     $Table = array(
       //'Header' => array('Položka', 'Hodnota'),
@@ -26 +33 @@
     );
     foreach($this->Definition['Items'] as $Index => $Item)
-    if(!array_key_exists($Item['Type'], $FormTypes) or 
-    (array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
-    {
-      if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
-        if(array_key_exists($Item['Type'], $FormTypes))
-        {            
-          if(!array_key_exists($Item['Type'], $System->Type->TypeDefinitionList)) 
-            $System->Type->RegisterType($Item['Type'], '', $FormTypes[$Item['Type']]);
-          if($FormTypes[$Item['Type']]['Type'] == 'Reference') 
-            $UseType = 'OneToMany';
-          else if($FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
+    if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or 
+    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and 
+    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+    {
+      if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
+        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
+        {            
+          if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList)) 
+            $this->FormManager->Type->RegisterType($Item['Type'], '', $this->FormManager->FormTypes[$Item['Type']]);
+          if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference') 
+            $UseType = 'OneToMany';
+          else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
             $UseType = 'Enumeration';
         } else $UseType = $Item['Type'];            
-      $Edit = $System->Type->ExecuteTypeEvent($UseType, 'OnView', 
+      $Edit = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnView', 
         array('Value' => $this->Values[$Index], 'Name' => $Index, 
         'Type' => $Item['Type'], 'Values' => $this->Values));
       if(array_key_exists('Suffix', $Item)) $Edit .= ' '.$Item['Suffix'];
-      if(!$System->Type->IsHidden($UseType))
+      if(!$this->FormManager->Type->IsHidden($UseType))
         array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
     }
@@ -62 +70 @@
   function ShowEditBlock($Context = '')
   {
-    global $Database, $FormTypes, $System;
-
     $Hidden = '';
     $IsHidden = false;
@@ -75 +81 @@
       if(!array_key_exists('ReadOnly', $Item)) $Item['ReadOnly'] = false;
     if($Item['ReadOnly'] == false)
-    if(!array_key_exists($Item['Type'], $FormTypes) or 
-    (array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+    if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or 
+    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and 
+    ($$this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
     {
       if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
@@ -84 +91 @@
           else unset($Parameters['Null']);
 
-        if(array_key_exists($Item['Type'], $FormTypes))
-        {            
-          if(!array_key_exists($Item['Type'], $System->Type->TypeDefinitionList)) 
-            $System->Type->RegisterType($Item['Type'], '', 
-              $FormTypes[$Item['Type']]);
-          if($FormTypes[$Item['Type']]['Type'] == 'Reference') 
+        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
+        {            
+          if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList)) 
+            $this->FormManager->Type->RegisterType($Item['Type'], '', 
+              $this->FormManager->FormTypes[$Item['Type']]);
+          if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference') 
           {
             $UseType = 'OneToMany';
-          } else if($FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
-            $UseType = 'Enumeration';
-        } else $UseType = $Item['Type'];
-        $Edit = $System->Type->ExecuteTypeEvent($UseType, 'OnEdit', $Parameters);
+          } else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
+            $UseType = 'Enumeration';
+        } else $UseType = $Item['Type'];
+        $Edit = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnEdit', $Parameters);
         if(array_key_exists('Suffix', $Item)) $Edit .= $Item['Suffix'];
 
-      if(!$System->Type->IsHidden($UseType))
+      if(!$this->FormManager->Type->IsHidden($UseType))
           array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
       else $Hidden .= $Edit;
@@ -110 +117 @@
   function LoadValuesFromDatabase($Id)
   {
-    global $Database, $FormTypes, $System;
-
-    $DbResult = $Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
+    $DbResult = $this->Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
     $DbRow = $DbResult->fetch_array();
     foreach($this->Definition['Items'] as $Index => $Item)
-    if(!array_key_exists($Item['Type'], $FormTypes) or 
-    (array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
-    {
-      if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
-        if(array_key_exists($Item['Type'], $FormTypes))
-        {            
-          if(!array_key_exists($Item['Type'], $System->Type->TypeDefinitionList)) 
-            $System->Type->RegisterType($Item['Type'], '', 
-              $FormTypes[$Item['Type']]);
-          if($FormTypes[$Item['Type']]['Type'] == 'Reference') 
-            $UseType = 'OneToMany';
-          else if($FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
-            $UseType = 'Enumeration';
-        } else $UseType = $Item['Type'];
-        $this->Values[$Index] = $System->Type->ExecuteTypeEvent($UseType, 'OnLoadDb', 
+    if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or 
+    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and 
+    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+    {
+      if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
+        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
+        {            
+          if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList)) 
+            $this->FormManager->Type->RegisterType($Item['Type'], '', 
+              $this->FormManager->FormTypes[$Item['Type']]);
+          if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference') 
+            $UseType = 'OneToMany';
+          else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
+            $UseType = 'Enumeration';
+        } else $UseType = $Item['Type'];
+        $this->Values[$Index] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnLoadDb', 
             array('Value' => $DbRow[$Index], 'Name' => $Index, 
             'Type' => $Item['Type'], 'Values' => $this->Values));
@@ -139 +145 @@
   function SaveValuesToDatabase($Id)
   {
-    global $Database, $FormTypes, $System;
-
     $Values = array();
     foreach($this->Definition['Items'] as $Index => $Item)
@@ -146 +150 @@
       if(!array_key_exists('ReadOnly', $Item)) $Item['ReadOnly'] = false;
       if($Item['ReadOnly'] == false)
-    if(!array_key_exists($Item['Type'], $FormTypes) or 
-    (array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+    if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or 
+    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and 
+    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
     {
       if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
@@ -153 +158 @@
           'Type' => $Item['Type'], 'Values' => $this->Values);
       
-        if(array_key_exists($Item['Type'], $FormTypes))
-        {            
-          if(!array_key_exists($Item['Type'], $System->Type->TypeDefinitionList)) 
-            $System->Type->RegisterType($Item['Type'], '', 
-              $FormTypes[$Item['Type']]);
-          if($FormTypes[$Item['Type']]['Type'] == 'Reference') 
+        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
+        {            
+          if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList)) 
+            $this->FormManager->Type->RegisterType($Item['Type'], '', 
+              $this->FormManager->FormTypes[$Item['Type']]);
+          if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference') 
           {
             $UseType = 'OneToMany';
           }
-          else if($FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
-            $UseType = 'Enumeration';
-        } else $UseType = $Item['Type'];
-        $Values[$Index] = $System->Type->ExecuteTypeEvent($UseType, 'OnSaveDb', $Parameters);
+          else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
+            $UseType = 'Enumeration';
+        } else $UseType = $Item['Type'];
+        $Values[$Index] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnSaveDb', $Parameters);
         if(($Item['Type'] == 'Password') and ($Values[$Index] == '')) unset($Values[$Index]);
         
@@ -174 +179 @@
     {
       $Values['Id'] = $Id;
-      $DbResult = $Database->insert($this->Definition['Table'], $Values);
+      $DbResult = $this->Database->insert($this->Definition['Table'], $Values);
     } else
-      $DbResult = $Database->update($this->Definition['Table'], 'Id='.$Id, $Values);
+      $DbResult = $this->Database->update($this->Definition['Table'], 'Id='.$Id, $Values);
     //echo($Database->LastQuery);
   }
@@ -187 +192 @@
   function LoadValuesFromFormBlock($Context = '')
   {
-    global $Database, $FormTypes, $System;
-
     if($Context != '') $Context = $Context.'-';
     $Values = array();
     foreach($this->Definition['Items'] as $Index => $Item)
-    if((!array_key_exists($Item['Type'], $FormTypes) or 
-    (array_key_exists($Item['Type'], $FormTypes) and
-    ($FormTypes[$Item['Type']]['Type'] != 'ManyToOne'))) and
+    if((!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or 
+    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
+    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne'))) and
     (!array_key_exists('ReadOnly', $Item) or 
     (array_key_exists('ReadOnly', $Item) and
@@ -200 +203 @@
     {
       //if(array_key_exists($Context.$Index, $_POST))
-        if(array_key_exists($Item['Type'], $FormTypes))
-        {            
-          if(!array_key_exists($Item['Type'], $System->Type->TypeDefinitionList)) 
-            $System->Type->RegisterType($Item['Type'], '', 
-              $FormTypes[$Item['Type']]);
-          if($FormTypes[$Item['Type']]['Type'] == 'Reference') 
-            $UseType = 'OneToMany';
-          else if($FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
-            $UseType = 'Enumeration';
-        } else $UseType = $Item['Type'];
-        $Values[$Index] = $System->Type->ExecuteTypeEvent($UseType, 'OnLoad', 
+        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
+        {            
+          if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList)) 
+            $this->FormManager->Type->RegisterType($Item['Type'], '', 
+              $this->FormManager->FormTypes[$Item['Type']]);
+          if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference') 
+            $UseType = 'OneToMany';
+          else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
+            $UseType = 'Enumeration';
+        } else $UseType = $Item['Type'];
+        $Values[$Index] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnLoad', 
           array('Name' => $Index, 'Type' => $Item['Type'], 'Values' => $this->Values));
     }
@@ -246 +249 @@
 }
 
-function ShowEditTable($ClassName, $Values)
-{
+class FormManager
+{
+  var $Classes;
+  var $FormTypes;
+  var $Database;
+  var $Type;
+  
+  function __construct($Database)
+  {
+    $this->Database = &$Database;
+    $this->Classes = array();
+    $this->FormTypes = array();
+    $this->Type = new Type($this);
+  }
+  
+  function RegisterClass($Name, $Class)
+  {
+    $this->Classes[$Name] = $Class;
+  }
+  
+  function UnregisterClass($Name)
+  {
+    unset($this->Classes[$Name]);
+  }
 }
 

trunk/Common/Form/Types/Base.php

@@ -3 +3 @@
 class TypeBase
 {
-  var $System;
+  var $FormManager;
+  var $Database;
   var $DatabaseCompareOperators = array();
   var $Hidden;
 
-  function __construct($System)
+  function __construct($FormManager)
   {
-    $this->System = &$System;
+    $this->FormManager = &$FormManager;
+    $this->Database = &$FormManager->Database;
     $this->Hidden = false;
   }

trunk/Common/Form/Types/Enumeration.php

@@ -7 +7 @@
   function OnView($Item)
   {
-    $Type = $this->System->Type->GetTypeDefinition($Item['Type']);
+    $Type = $this->FormManager->Type->GetTypeDefinition($Item['Type']);
     if(array_key_exists($Item['Value'], $Type['Parameters']['States']))
       $Output = $Type['Parameters']['States'][$Item['Value']];
@@ -16 +16 @@
   function OnEdit($Item)
   {
-    $Type = $this->System->Type->GetTypeDefinition($Item['Type']);
+    $Type = $this->FormManager->Type->GetTypeDefinition($Item['Type']);
     $Output = '<select name="'.$Item['Name'].'">';
       if(array_key_exists('Null', $Item) and $Item['Null']) 

trunk/Common/Form/Types/Hidden.php

@@ -5 +5 @@
 class TypeHidden extends TypeBase
 {
-  function __construct($System)
+  function __construct($FormManager)
   {
-    parent::__construct($System);
+    parent::__construct($FormManager);
     $this->Hidden = true;
   }

trunk/Common/Form/Types/OneToMany.php

@@ -25 +25 @@
   {
     $Output = '<select name="'.$Item['Name'].'">';
-    $Type = $this->System->Type->TypeDefinitionList[$Item['Type']];
+    $Type = $this->FormManager->Type->TypeDefinitionList[$Item['Type']];
     if(array_key_exists('Condition', $Type['Parameters'])) $Where = ' WHERE '.$Type['Parameters']['Condition'];
       else $Where = '';
@@ -35 +35 @@
     if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
       else $Table = $Type['Parameters']['Table'];
-    $DbResult = $this->System->Database->query('SELECT '.$Type['Parameters']['Name'].' AS `Name`,'.$Type['Parameters']['Id'].' AS `Id` FROM '.$Table.''.$Where.' ORDER BY `Name`');
+    $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].' AS `Name`,'.$Type['Parameters']['Id'].' AS `Id` FROM '.$Table.''.$Where.' ORDER BY `Name`');
     while($DbRow = $DbResult->fetch_assoc())
     {

trunk/Common/Form/Types/RandomHash.php

@@ -5 +5 @@
 class TypeRandomHash extends TypeBase
 {
-  function __construct($System)
+  function __construct($FormManager)
   {
-    parent::__construct($System);
+    parent::__construct($FormManager);
     $this->Hidden = true;
   }

trunk/Common/Form/Types/Type.php

@@ -16 +16 @@
 include(dirname(__FILE__).'/Hyperlink.php');
 include(dirname(__FILE__).'/Hidden.php');
-include(dirname(__FILE__).'/File/File.php');
+include(dirname(__FILE__).'/File.php');
+include(dirname(__FILE__).'/FileContent.php');
 include(dirname(__FILE__).'/GPS.php');
 include(dirname(__FILE__).'/IPv4Address.php');
@@ -24 +25 @@
 class Type
 {
-  var $System;
+  var $FormManager;
   var $TypeDefinitionList;
   var $Values;
 
-  function __construct($System)
+  function __construct($FormManager)
   {
-    $this->System = $System;
+    $this->FormManager = &$FormManager;
     $this->TypeDefinitionList = array
     (
@@ -52 +53 @@
       'Color' => array('Name' => 'Color', 'Class' => 'Color', 'ParentType' => '', 'Parameters' => array()),
       'RandomHash' => array('Name' => 'RandomHash', 'Class' => 'RandomHash', 'ParentType' => '', 'Parameters' => array()),
+      'FileContent' => array('Name' => 'FileContent', 'Class' => 'FileContent', 'ParentType' => '', 'Parameters' => array()),
     );
   }
@@ -61 +63 @@
       $Type = $this->TypeDefinitionList[$TypeName];
       $TypeClass = 'Type'.$Type['Class'];
-      $TypeObject = new $TypeClass($this->System);
+      $TypeObject = new $TypeClass($this->FormManager);
       if(is_callable(array($TypeObject, $Event))) return($TypeObject->$Event($Parameters));
         else return($TypeName.'->'.$Event.'('.serialize($Parameters).')');
@@ -73 +75 @@
       $Type = $this->TypeDefinitionList[$TypeName];
       $TypeClass = 'Type'.$Type['Class'];
-      $TypeObject = new $TypeClass($this->System);
+      $TypeObject = new $TypeClass($this->FormManager);
       return($TypeObject->Hidden);
     } else return(false);
@@ -92 +94 @@
   }
 
+  function UnregisterType($Name)
+  {
+    unset($this->TypeDefinitionList[$Name]);
+    // TODO: remove dependent types
+  }
+  
   function GetTypeDefinition($TypeName)
   {

trunk/Common/Global.php

@@ -21 +21 @@
 include_once(dirname(__FILE__).'/User.php');
 include_once(dirname(__FILE__).'/Page.php');
-include_once(dirname(__FILE__).'/Forms.php');
-include_once(dirname(__FILE__).'/Types/Type.php');
+include_once(dirname(__FILE__).'/Form/Form.php');
 include_once(dirname(__FILE__).'/File.php');
 include_once(dirname(__FILE__).'/../aktuality/news.php');
 include_once(dirname(__FILE__).'/../finance/bills.php');
 include_once(dirname(__FILE__).'/../finance/finance.php');
+include_once(dirname(__FILE__).'/../form_classes.php');
+
   
 // Application modules
@@ -57 +58 @@
     parent::__construct();
     $this->Modules = array();
-    $this->Type = new Type($this);
     $this->Pages = array();
     $this->ModuleManager = new AppModuleManager();
     $this->FilesDir = '';
+    $this->Database = new Database();
+    $this->FormManager = new FormManager($this->Database);
   }  
   
@@ -101 +103 @@
   function AddModule($Module)
   {
-    global $Database;
-
     //echo('Přidávám modul '.get_class($Module).'<br />');
     $Module->System = &$this;
-    $Module->Database = &$Database;
+    $Module->Database = &$this->Database;
     $this->Modules[get_class($Module)] = $Module;
   }
@@ -166 +166 @@
   
   if(!isset($Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/install.php">zde</a>.');
-  
    
   // SQL injection hack protection
@@ -174 +173 @@
   if(isset($_SERVER['REMOTE_ADDR'])) session_start();
 
-  $Database = new Database($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
-  $Database->Prefix = $Config['Database']['Prefix'];
-  $Database->charset($Config['Database']['Charset']);
-  $Database->ShowSQLError = $Config['Web']['ShowSQLError'];
-  $Database->ShowSQLQuery = $Config['Web']['ShowSQLQuery'];
+  $System = new System();
+  $System->Config = $Config;
+  $System->FilesDir = dirname(__FILE__).'/../'.$Config['Web']['UploadFileFolder'].'/';
+  $System->Database->Connect($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
+  $System->Database->Prefix = $Config['Database']['Prefix'];
+  $System->Database->charset($Config['Database']['Charset']);
+  $System->Database->ShowSQLError = $Config['Web']['ShowSQLError'];
+  $System->Database->ShowSQLQuery = $Config['Web']['ShowSQLQuery'];
   
   // Check database persistence structure
   $UpdateManager = new UpdateManager();
-  $UpdateManager->Database = &$Database;
+  $UpdateManager->Database = &$System->Database;
   $UpdateManager->Revision = $DatabaseRevision;
   if(!$UpdateManager->IsInstalled()) die('Systém vyžaduje instalaci databáze.');
   if(!$UpdateManager->IsUpToDate()) die('Systém vyžaduje aktualizaci databáze.');
   
-  $System = new System();
-  $System->Config = $Config;
-  $System->FilesDir = dirname(__FILE__).'/../'.$Config['Web']['UploadFileFolder'].'/';
-  $System->Database = &$Database;
+  // Init old modules
   $System->AddModule(new Log());
   $System->AddModule(new ErrorHandler());
+  $System->Modules['ErrorHandler']->ShowErrors = $Config['Web']['ShowPHPError'];
   $System->Modules['ErrorHandler']->Init();
   $System->AddModule(new User());
@@ -200 +200 @@
   $System->AddModule(new Finance());
   $System->Modules['Finance']->LoadMonthParameters(0);
+  RegisterFormClasses($System->FormManager);
   
   // Register new modules

trunk/Common/Page.php

@@ -125 +125 @@
     foreach($ScriptNameParts as $ScriptNamePart)
     { 
-      //echo($ScriptNamePart.'<br />');
       if(array_key_exists($ScriptNamePart, $PathTreeItem))
       {

trunk/Common/Update.php

@@ -153 +153 @@
         if(isset($_SERVER['REMOTE_ADDR'])) session_start();
     
-        $Database = new Database($this->Config['Database']['Host'], $this->Config['Database']['User'], 
+        $Database = new Database();
+        $Database->Connect($this->Config['Database']['Host'], $this->Config['Database']['User'], 
            $this->Config['Database']['Password'], $this->Config['Database']['Database']);
         $Database->Prefix = $this->Config['Database']['Prefix'];

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 500; // Subversion revision
-$DatabaseRevision = 500; 
-$ReleaseTime = '2013-03-03';
+$Revision = 501; // Subversion revision
+$DatabaseRevision = 501; 
+$ReleaseTime = '2013-03-10';
 
 ?>

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -1 +1 @@
 <?php
 
-include_once(dirname(__FILE__).'/../Common/Global.php');
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PageFileImport extends Page

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -1 +1 @@
 <?php
 
-include_once('FileImport.php');
+include_once(dirname(__FILE__).'/FileImport.php');
 
 class ModuleFinanceBankAPI extends AppModule

trunk/Modules/IS/IS.php

@@ -1 +1 @@
 <?php
 
-include_once('Common/Global.php');
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PageIS extends Page
@@ -11 +11 @@
   function Show()
   {
-    global $FormClasses;
-     
     if(!$this->System->Modules['User']->CheckPermission('IS', 'Manage')) 
       return('Nemáte oprávnění');
@@ -55 +53 @@
       if($_GET['o'] == 'save')
       {
-        $Form = new Form($Table);
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass($Table);
         $Form->LoadValuesFromForm();
         $Form->SaveValuesToDatabase($Id);
@@ -64 +63 @@
     } else 
     {
-      $Form = new Form($Table);
+      $Form = new Form($this->System->FormManager);
+      $Form->SetClass($Table);
       $Form->LoadValuesFromDatabase($Id);
       $Form->OnSubmit = '?a=edit&amp;o=save';
@@ -97 +97 @@
       if($_GET['o'] == 'save')
       {
-        $Form = new Form($Table);
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass($Table);
         $Form->LoadValuesFromForm();
         $Form->SaveValuesToDatabase(0);
@@ -111 +112 @@
     } else 
     {
-      $Form = new Form($Table);
+      $Form = new Form($this->System->FormManager);
+      $Form->SetClass($Table);
       $Form->OnSubmit = '?a=add&amp;o=save';
       $Output .= $Form->ShowEditForm();
@@ -124 +126 @@
   function ShowView($Table, $Id)
   {
-    global $FormTypes;
-    
-    $Form = new Form($Table);
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass($Table);
     $Form->LoadValuesFromDatabase($Id);
     $Form->OnSubmit = '?a=view';
@@ -143 +144 @@
     // Show ManyToOne relations
     foreach($Form->Definition['Items'] as $Index => $Item)
-    if((array_key_exists($Item['Type'], $FormTypes) and ($FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
-    {
-      $Output .= $this->ShowList($FormTypes[$Item['Type']]['Table'], '`'.$FormTypes[$Item['Type']]['Ref'].'`='.$Id, $Item['Caption']).'<br/>';
+    if((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and 
+    ($this->System->FormManager->FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
+    {
+      $Output .= $this->ShowList($this->System->FormManager->FormTypes[$Item['Type']]['Table'], '`'.
+        $this->System->FormManager->FormTypes[$Item['Type']]['Ref'].'`='.$Id, $Item['Caption']).'<br/>';
     }    
     return($Output);
@@ -152 +155 @@
   function ShowList($Table, $Filter = '', $Title = '')
   {   
-    global $Type, $FormTypes, $FormClasses;
-    
-    if($Table != '') $FormClass = $FormClasses[$Table];
+    if($Table != '') $FormClass = $this->System->FormManager->Classes[$Table];
       else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
     if($Filter != '') $Filter = ' WHERE '.$Filter;
@@ -166 +167 @@
    
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-    if(!array_key_exists($FormItem['Type'], $FormTypes) or 
-      (array_key_exists($FormItem['Type'], $FormTypes) and ($FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
+    if(!array_key_exists($FormItem['Type'], $this->System->FormManager->Type) or 
+      (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and 
+      ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
       $TableColumns[] = array('Name' => $ItemIndex, 'Title' => $FormItem['Caption']);
     $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
@@ -182 +184 @@
       $Output .= '<tr>';
       foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-      if(!array_key_exists($FormItem['Type'], $FormTypes) or 
-      (array_key_exists($FormItem['Type'], $FormTypes) and ($FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
+      if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or 
+      (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and 
+      ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
       {
         //$Output .= '<td>'.$Row[$ItemIndex].'</td>';
         $UseType = $UseType = $FormItem['Type'];
-        if(array_key_exists($FormItem['Type'], $FormTypes))
+        if(array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes))
         {
-          if(!array_key_exists($FormItem['Type'], $this->System->Type->TypeDefinitionList)) 
-            $this->System->Type->RegisterType($FormItem['Type'], '', 
-              $FormTypes[$FormItem['Type']]);
-          if($FormTypes[$FormItem['Type']]['Type'] == 'Reference') 
+          if(!array_key_exists($FormItem['Type'], $this->System->FormManager->Type->TypeDefinitionList)) 
+            $this->System->FormManager->Type->RegisterType($FormItem['Type'], '', 
+              $this->System->FormManager->FormTypes[$FormItem['Type']]);
+          if($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Reference') 
           $UseType = 'OneToMany';
           else 
-          if($FormTypes[$FormItem['Type']]['Type'] == 'Enumeration') 
+          if($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Enumeration') 
           $UseType = 'Enumeration';
         }
-        $Row[$ItemIndex] = $this->System->Type->ExecuteTypeEvent($UseType, 'OnLoadDb', 
+        $Row[$ItemIndex] = $this->System->FormManager->Type->ExecuteTypeEvent($UseType, 'OnLoadDb', 
           array('Value' => $Row[$ItemIndex], 'Name' => $ItemIndex, 
           'Type' => $FormItem['Type']));
-        $Value = $this->System->Type->ExecuteTypeEvent($UseType, 'OnView', 
+        $Value = $this->System->FormManager->Type->ExecuteTypeEvent($UseType, 'OnView', 
           array('Value' => $Row[$ItemIndex], 'Name' => $ItemIndex, 
           'Type' => $FormItem['Type']));

trunk/Modules/Map/Map.php

@@ -1 +1 @@
 <?php
 
-include_once('Common/Global.php');
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PageNetworkMap extends Page

trunk/Modules/Meteostation/Meteostation.php

@@ -1 +1 @@
 <?php
 
-include_once('Common/Image.php');
-include_once('Common/Global.php');
+include_once(dirname(__FILE__).'/../../Common/Image.php');
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PageMeteo extends Page

trunk/Modules/Network/HostList.php

@@ -1 +1 @@
 <?php
-include_once('Common/Global.php');
+
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PageHostList extends Page

trunk/Modules/OpeningHours/OpeningHours.php

@@ -1 +1 @@
 <?php
 
-include_once('Common/Global.php');
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PageSubjectOpenTime extends Page

trunk/Modules/Portal/Portal.php

@@ -1 +1 @@
 <?php
 
-include_once('Common/Global.php');
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PagePortal extends Page
@@ -45 +45 @@
     $TotalUser = $DbRow[0];
 
-    $DbResult = $this->Database->query('SELECT COUNT(DISTINCT(Member)) FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDeviceType.ShowOnline = 1 AND NetworkDevice.Online = 1');
+    $DbResult = $this->Database->query('SELECT COUNT(DISTINCT(Member)) FROM NetworkDevice '.
+      'LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type '.
+      'WHERE NetworkDeviceType.ShowOnline = 1 AND NetworkDevice.Online = 1');
     $DbRow = $DbResult->fetch_array();
     $OnlineUser = $DbRow[0];
@@ -132 +134 @@
   function Show()
   {
-    global $Database, $Config, $User;
+    global $Config, $User;
 
     $Output = '';
@@ -143 +145 @@
       if($_GET['Action'] == 'LoginForm')
       {
-        $Form = new Form('UserLogin');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('UserLogin');
         $Form->OnSubmit = '?Action=Login';
         $Output .= $Form->ShowEditForm();
@@ -153 +156 @@
         if(array_key_exists('Username', $_POST) and array_key_exists('Password', $_POST))
         {
-        $Form = new Form('UserLogin');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('UserLogin');
         $Form->OnSubmit = '?Action=Login';
         $Result = $this->System->Modules['User']->Login($_POST['Username'], $_POST['Password']);
@@ -178 +182 @@
         if($this->System->Modules['User']->User['Id'] != null)
         {
-          $UserOptions = new Form('UserOptions');
+          $UserOptions = new Form($this->System->FormManager);
+          $UserOptions->SetClass('UserOptions');
           $UserOptions->LoadValuesFromDatabase($this->System->Modules['User']->User['Id']);
           $UserOptions->OnSubmit = '?Action=UserOptionsSave';
@@ -186 +191 @@
       if($_GET['Action'] == 'UserOptionsSave')
       {
-        $UserOptions = new Form('UserOptions', array());
+        $UserOptions = new Form($this->System->FormManager);
+        $UserOptions->SetClass('UserOptions');
         $UserOptions->LoadValuesFromForm();
         $UserOptions->SaveValuesToDatabase($this->System->Modules['User']->User['Id']);
@@ -197 +203 @@
       if($_GET['Action'] == 'UserRegister')
       {
-        $Form = new Form('UserRegister');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('UserRegister');
         //$Form->LoadValuesFromForm();
         $Form->OnSubmit = '?Action=UserRegisterSave';
@@ -209 +216 @@
       if($_GET['Action'] == 'PasswordRecovery')
       {
-        $Form = new Form('PasswordRecovery');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('PasswordRecovery');
         $Form->OnSubmit = '?Action=PasswordRecovery2';
         $Output .= $Form->ShowEditForm();
@@ -215 +223 @@
       if($_GET['Action'] == 'PasswordRecovery2')
       {
-        $Form = new Form('PasswordRecovery');
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('PasswordRecovery');
         $Form->LoadValuesFromForm();
         $Result = $this->System->Modules['User']->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
@@ -230 +239 @@
       if($_GET['Action'] == 'UserRegisterSave')
       {
-        $Form = new Form('UserRegister', array());
+        $Form = new Form($this->System->FormManager);
+        $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']);
@@ -242 +252 @@
       if($_GET['Action'] == 'MemberOptions')
       {
-        $UserOptions = new Form('MemberOptions');
+        $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']);
         if($DbResult->num_rows > 0)
@@ -252 +263 @@
            'ON Subject.Id = Member.Subject WHERE Member.Id='.$CustomerUserRel['Customer']);        
           $DbRow = $DbResult->fetch_array();
-          foreach($UserOptions->Definition['Items'] as $Index => $Item)
+          foreach($Form->Definition['Items'] as $Index => $Item)
           {
-            $UserOptions->Values[$Index] = $DbRow[$Index];
+            $Form->Values[$Index] = $DbRow[$Index];
           }
-          $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
-          $Output .= $UserOptions->ShowEditForm();
+          $Form->OnSubmit = '?Action=MemberOptionsSave';
+          $Output .= $Form->ShowEditForm();
         } else $Output .= $this->SystemMessage('Chyba', 'Nejste zákazníkem');
       } else
       if($_GET['Action'] == 'MemberOptionsSave')
       {
-        $UserOptions = new Form('MemberOptions');
-        $UserOptions->LoadValuesFromForm();
-        if($UserOptions->Values['FamilyMemberCount'] < 0)
-          $UserOptions->Values['FamilyMemberCount'] = 0;
-        if($UserOptions->Values['BillingPeriodNext'] < 2)
-          $UserOptions->Values['BillingPeriodNext'] = 2;
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass('MemberOptions');
+        $Form->LoadValuesFromForm();
+        if($Form->Values['FamilyMemberCount'] < 0)
+          $Form->Values['FamilyMemberCount'] = 0;
+        if($Form->Values['BillingPeriodNext'] < 2)
+          $Form->Values['BillingPeriodNext'] = 2;
           
         $DbResult = $this->Database->update('Member', 'Id='.$this->System->Modules['User']->User['Member'], 
-           array('FamilyMemberCount' => $UserOptions->Values['FamilyMemberCount'], 
-           'BillingPeriodNext' => $UserOptions->Values['BillingPeriodNext']));
+           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']);
         $Member = $DbResult->fetch_assoc();
         $DbResult = $this->Database->update('Subject', 'Id='.$Member['Subject'], 
-          array('Name' => $UserOptions->Values['Name'], 'AddressStreet' => $UserOptions->Values['AddressStreet'], 
-          'AddressTown' => $UserOptions->Values['AddressTown'], 'AddressCountry' => $UserOptions->Values['AddressCountry'],
-          'AddressPSC' => $UserOptions->Values['AddressPSC'], 'IC' => $UserOptions->Values['IC'], 
+          array('Name' => $Form->Values['Name'], 'AddressStreet' => $Form->Values['AddressStreet'], 
+          'AddressTown' => $Form->Values['AddressTown'], 'AddressCountry' => $Form->Values['AddressCountry'],
+          'AddressPSC' => $Form->Values['AddressPSC'], 'IC' => $Form->Values['IC'], 
           'DIC' => $UserOptions->Values['DIC']));
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení domácnosti uloženo.');
-        $this->System->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno', $UserOptions->Values['Name']);
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.FamilyMemberCount, Member.BillingPeriodNext, 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']);
+        $this->System->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno', 
+          $Form->Values['Name']);
+        $DbResult = $this->Database->query('SELECT Member.Id, Member.FamilyMemberCount, Member.BillingPeriodNext, '.
+          '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']);
         $DbRow = $DbResult->fetch_array();
-        foreach($UserOptions->Definition['Items'] as $Index => $Item)
-        {
-          $UserOptions->Values[$Index] = $DbRow[$Index];
+        foreach($Form->Definition['Items'] as $Index => $Item)
+        {
+          $Form->Values[$Index] = $DbRow[$Index];
         }
-        $UserOptions->OnSubmit = '?Action=MemberOptionsSave';
-        $Output .= $UserOptions->ShowEditForm();
+        $Form->OnSubmit = '?Action=MemberOptionsSave';
+        $Output .= $Form->ShowEditForm();
       }
     }
 
-    $Database->select_db($Config['Database']['Database']);
-
-    $DbResult = $Database->query('SELECT * FROM `HyperlinkGroup`');
+    $this->Database->select_db($Config['Database']['Database']);
+
+    $DbResult = $this->Database->query('SELECT * FROM `HyperlinkGroup`');
     while($DbRow = $DbResult->fetch_assoc())
       $HyperlinkGroups[$DbRow['Id']] = $DbRow;
@@ -302 +318 @@
     //$Output .= $this->InfoBar();
     $Output .= '<table id="MainTable"><tr>';
-    $DbResult = $Database->select('PanelColumn', '*');
+    $DbResult = $this->Database->select('PanelColumn', '*');
     while($PanelColumn =  $DbResult->fetch_assoc())
     {
@@ -308 +324 @@
         else $Width = '';
       $Output .= '<td valign="top"'.$Width.'>';
-      $DbResult2 = $Database->query('SELECT * FROM `Panel` WHERE `PanelColumn`='.$PanelColumn['Id'].' ORDER BY `Order`');
+      $DbResult2 = $this->Database->query('SELECT * FROM `Panel` WHERE `PanelColumn`='.$PanelColumn['Id'].' ORDER BY `Order`');
       while($Panel = $DbResult2->fetch_assoc())
       {

trunk/Modules/TV/TV.php

@@ -1 +1 @@
 <?php
 
-include_once('Common/Global.php');
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 class PageIPTV extends Page

trunk/aktuality/news.php

@@ -44 +44 @@
   function ShowNews($Category, $ItemCount, $DaysAgo)
   {
-    global $Database, $NewsCategoryNames, $NewsCountPerCategory, $UploadedFilesFolder;
+    global $NewsCategoryNames, $NewsCountPerCategory, $UploadedFilesFolder;
 
     $ItemCount = abs($ItemCount);
     $DaysAgo = abs($DaysAgo);
-    $DbResult = $Database->select('NewsCategory', '*', 'Id='.$Category);
+    $DbResult = $this->Database->select('NewsCategory', '*', 'Id='.$Category);
     $Row = $DbResult->fetch_array();
     $Output = '<div class="NewsPanel"><div class="Title">'.$Row['Caption'];      
@@ -55 +55 @@
       $Output .= ' <a href="aktuality/index.php?action=add&amp;category='.$Category.'">Přidat</a>';
     $Output .= '</div></div><div class="Content">';
-    $DbResult = $Database->query('SELECT `News`.*, `User`.`Name` FROM `News` LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`News`.`Category`='.$Category.') AND (DATE_SUB(NOW(), INTERVAL '.$DaysAgo.' DAY) < `News`.`Date`) ORDER BY `News`.`Date` DESC LIMIT 0,'.$ItemCount);
-    //echo('<table cellpadding="0" cellspacing="0" width="100%"><tr><td>');
+    $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`News`.`Category`='.$Category.') AND (DATE_SUB(NOW(), INTERVAL '.$DaysAgo.' DAY) < `News`.`Date`) ORDER BY `News`.`Date` DESC LIMIT 0,'.$ItemCount);
     $Index = 0;
     $FontSize = 12;

trunk/finance/manage.php

@@ -1 +1 @@
 <?php
 
-include_once('../Common/Global.php');
+include_once(dirname(__FILE__).'/../Common/Global.php');
 
 class FinanceManagePage extends Page
@@ -190 +190 @@
   function ShowNewDeviceForm()
   {
-    $Form = new Form('NewNetworkDevice');
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('NewNetworkDevice');
     $Form->OnSubmit = '?Operation=NewDeviceInsert';
     $Output = $Form->ShowEditForm();
@@ -198 +199 @@
   function ShowNewDeviceInsert()
   {
-    $Form = new Form('NewNetworkDevice');
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('NewNetworkDevice');
     $Form->LoadValuesFromForm();
     $Form->SaveValuesToDatabase(0);
@@ -208 +210 @@
   function ShowNewDeviceHistoryForm()
   {
-    $Form = new Form('NewNetworkDeviceHistory');
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('NewNetworkDeviceHistory');
     $Form->OnSubmit = '?Operation=NewDeviceHistoryInsert';
     $Output = $Form->ShowEditForm();
@@ -216 +219 @@
   function ShowNewDeviceHistoryInsert()
   {
-    $Form = new Form('NewNetworkDeviceHistory');
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('NewNetworkDeviceHistory');
     $Form->LoadValuesFromForm();
     $Form->SaveValuesToDatabase(0);
@@ -226 +230 @@
   function ShowNewPaymentForm()
   {
-    $Form = new Form('NewPayment');
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('NewPayment');
     $Form->OnSubmit = '?Operation=NewPaymentInsert';
     $Output = $Form->ShowEditForm();
@@ -234 +239 @@
   function ShowNewPaymentInsert()
   {
-    $Form = new Form('NewPayment');
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('NewPayment');
     $Form->LoadValuesFromForm();
     $this->InsertMoney($Form->Values['Subject'], $Form->Values['Value'], $Form->Values['Cash'], $Form->Values['Taxable'], $Form->Values['Time'], $Form->Values['Text'], $Form->Values['DocumentLine']);
@@ -247 +253 @@
   function ShowNewInvoiceForm()
   {
-    $Form = new Form('NewInvoice');
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('NewInvoice');
     $Form->OnSubmit = '?Operation=NewInvoiceInsert';
     $Output = $Form->ShowEditForm();
@@ -255 +262 @@
   function ShowNewInvoiceInsert()
   {
-    $Form = new Form('NewInvoice');
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('NewInvoice');
     $Form->LoadvaluesFromForm();
     $Items = array(array('Price' => $Form->Values['Value'], 

trunk/form_classes.php

@@ -16 +16 @@
 */
 
-$FormClasses = array(
+function RegisterFormClasses($FormManager)
+{
+  $FormManager->Classes = array(
   'ImportBankFile' => array(
     'Title' => 'Import souborů s platbami',
@@ -841 +843 @@
 );
 
-$FormTypes = array(
+$FormManager->FormTypes = array(
   'TServiceCategory' => array(
     'Type' => 'Reference',
@@ -1285 +1287 @@
   ),
 );
-
+}
 
 ?>