Changeset 738 for trunk/Common

Timestamp:

Apr 14, 2015, 10:20:16 PM (10 years ago)

Author:

chronos

Message:

• Removed: Spaces on end of line.
• Modified: Tabs converted to spaces.

Location:

trunk/Common

Files:

• AppModule.php (modified) (26 diffs)
• Application.php (modified) (1 diff)
• Base.php (modified) (2 diffs)
• Config.php (modified) (1 diff)
• Form/Form.php (modified) (5 diffs)
• Form/Types/Base.php (modified) (2 diffs)
• Form/Types/Boolean.php (modified) (1 diff)
• Form/Types/Enumeration.php (modified) (2 diffs)
• Form/Types/Hidden.php (modified) (1 diff)
• Form/Types/IPv4Address.php (modified) (1 diff)
• Form/Types/IPv6Address.php (modified) (1 diff)
• Form/Types/Image.php (modified) (1 diff)
• Form/Types/Integer.php (modified) (1 diff)
• Form/Types/MacAddress.php (modified) (1 diff)
• Form/Types/Password.php (modified) (3 diffs)
• Form/Types/RandomHash.php (modified) (1 diff)
• Global.php (modified) (7 diffs)
• Image.php (modified) (6 diffs)
• Mail.php (modified) (14 diffs)
• NetworkAddress.php (modified) (1 diff)
• Page.php (modified) (12 diffs)
• RSS.php (modified) (5 diffs)
• Setup/FullInstall.php (modified) (2 diffs)
• Setup/Setup.php (modified) (4 diffs)
• Setup/Update.php (modified) (1 diff)
• Setup/Updates.php (modified) (28 diffs)
• Table.php (modified) (11 diffs)
• UTF8.php (modified) (3 diffs)
• VCL/Database.php (modified) (1 diff)

trunk/Common/AppModule.php

@@ -1 +1 @@
 <?php
 
-/* This implementation will not support installation from remote source. Just 
+/* This implementation will not support installation from remote source. Just
  * installation of already presented modules mainly to persistence preparation.
  */
@@ -7 +7 @@
 class ModuleType
 {
-        const System = 0;
-        const Normal = 1;
-        const Application = 2;
+  const System = 0;
+  const Normal = 1;
+  const Application = 2;
 }
 
@@ -40 +40 @@
   var $Title;
   var $Version;
-  var $License; 
+  var $License;
   var $Creator;
   var $HomePage;
@@ -58 +58 @@
   var $Manager;
   var $OnChange;
-  
+
   function __construct(System $System)
   {
@@ -74 +74 @@
     $this->Type = ModuleType::Normal;
   }
-  
+
   function Install()
   {
@@ -82 +82 @@
     $this->Manager->Perform($List, array(ModuleAction::Install), array(ModuleCondition::NotInstalled));
     $this->DoInstall();
-        $this->Installed = true;
-        $this->InstalledVersion = $this->Version;
-        $this->Manager->Modules[$this->Name] = $this;
-  }
-  
+    $this->Installed = true;
+    $this->InstalledVersion = $this->Version;
+    $this->Manager->Modules[$this->Name] = $this;
+  }
+
   function Uninstall()
   {
@@ -97 +97 @@
     $this->DoUninstall();
   }
-  
+
   function Upgrade()
   {
@@ -106 +106 @@
     $this->DoUpgrade();
   }
-  
+
   function Reinstall()
   {
@@ -113 +113 @@
     $this->Install();
   }
-  
+
   function Start()
   {
     if($this->Running) return;
-    if(!$this->Installed) return; 
+    if(!$this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotRunning));
     $this->Manager->Perform($List, array(ModuleAction::Start), array(ModuleCondition::NotRunning));
     $this->DoStart();
-        $this->Running = true;
-  }
-  
+    $this->Running = true;
+  }
+
   function Stop()
   {
-        if(!$this->Running) return; 
+    if(!$this->Running) return;
     $this->Running = false;
-        $List = array();
-        $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Running));
+    $List = array();
+    $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Running));
     $this->Manager->Perform($List, array(ModuleAction::Stop), array(ModuleCondition::Running));
-        $this->DoStop();  
-  }   
-  
+    $this->DoStop();
+  }
+
   function Restart()
   {
@@ -140 +140 @@
     $this->Start();
   }
-  
+
   function Enable()
   {
@@ -150 +150 @@
     $this->Enabled = true;
   }
-  
+
   function Disable()
   {
@@ -160 +160 @@
     $this->Manager->Perform($List, array(ModuleAction::Disable), array(ModuleCondition::Enabled));
   }
-  
+
   protected function DoStart()
   {
   }
-  
+
   protected function DoStop()
-  {    
+  {
   }
 
@@ -172 +172 @@
   {
   }
-  
+
   protected function DoUninstall()
   {
@@ -179 +179 @@
 
 /* Manage installed modules */
-class AppModuleManager 
+class AppModuleManager
 {
   var $Modules;
@@ -185 +185 @@
   var $FileName;
   var $OnLoadModules;
-  
+
   function __construct(System $System)
   {
     $this->Modules = array();
     $this->System = &$System;
-    $this->FileName = 'Config/Modules.php';     
-  }
-  
+    $this->FileName = 'Config/Modules.php';
+  }
+
   function Perform($List, $Actions, $Conditions = array(ModuleCondition::All))
   {
@@ -217 +217 @@
     }
   }
-  
+
   function EnumDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
   {
@@ -236 +236 @@
     }
   }
-  
+
   function EnumSuperiorDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
   {
     foreach($this->Modules as $RefModule)
     {
-      if(in_array($Module->Name, $RefModule->Dependencies) and 
+      if(in_array($Module->Name, $RefModule->Dependencies) and
           (in_array(ModuleCondition::All, $Conditions) or
           ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
@@ -255 +255 @@
     }
   }
-  
+
   function Start()
   {
@@ -262 +262 @@
     $this->StartEnabled();
   }
-  
+
   function StartAll()
   {
     $this->Perform($this->Modules, array(ModuleAction::Start));
   }
-  
+
   function StartEnabled()
   {
@@ -277 +277 @@
     $this->Perform($this->Modules, array(ModuleAction::Stop));
   }
-  
+
   function UninstallAll()
   {
@@ -283 +283 @@
     $this->SaveState();
   }
-  
+
   function ModulePresent($Name)
   {
     return(array_key_exists($Name, $this->Modules));
   }
-  
+
   /* @return Module */
   function SearchModuleById($Id)
@@ -299 +299 @@
     return('');
   }
-  
+
   function LoadState()
   {
-        $ConfigModules = array();
+    $ConfigModules = array();
     include($this->FileName);
     foreach($ConfigModules as $Mod)
@@ -312 +312 @@
         $this->Modules[$Mod['Name']]->Installed = $Mod['Installed'];
         $this->Modules[$Mod['Name']]->InstalledVersion = $Mod['Version'];
-      }  
-    }
-  }
-  
+      }
+    }
+  }
+
   function SaveState()
   {
@@ -321 +321 @@
     foreach($this->Modules as $Module)
     {
-      $Data[] = array('Name' => $Module->Name, 'Enabled' => $Module->Enabled, 
+      $Data[] = array('Name' => $Module->Name, 'Enabled' => $Module->Enabled,
         'Version' => $Module->Version, 'Installed' => $Module->Installed);
     }
     file_put_contents($this->FileName, "<?php \n\n\$ConfigModules = ".var_export($Data, true).";\n");
   }
-  
+
   function RegisterModule(AppModule $Module)
   {
@@ -333 +333 @@
     $Module->OnChange = &$this->OnModuleChange;
   }
-  
+
   function UnregisterModule(AppModule $Module)
   {
     unset($this->Modules[array_search($Module, $this->Modules)]);
   }
-  
+
   function LoadModulesFromDir($Directory)
   {
-        $List = scandir($Directory);     
+    $List = scandir($Directory);
     foreach($List as $Item)
     {
@@ -352 +352 @@
     }
   }
-  
+
   function LoadModules()
   {
-        if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
+    if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
       $this->OnLoadModules();
     else $this->LoadModulesFromDir(dirname(__FILE__).'/../Modules');

trunk/Common/Application.php

@@ -3 +3 @@
 class Application
 {
-        var $Name;
-        var $System;
-        
-        function Run()
-        {
-                
-        }
+  var $Name;
+  var $System;
+
+  function Run()
+  {
+
+  }
 }

trunk/Common/Base.php

@@ -11 +11 @@
   {
     $this->System = &$System;
-    $this->Database = &$System->Database;    
+    $this->Database = &$System->Database;
   }
 }
@@ -17 +17 @@
 class Model extends Base
 {
-  
+
 }
 
 class View extends Base
 {
-  
+
 }
 
 class Controller extends Base
 {
-  
+
 }

trunk/Common/Config.php

@@ -1 +1 @@
 <?php
 
-class Config 
+class Config
 {
   var $Data;
-  
+
   function __construct()
   {
-        $this->Data = array();
+    $this->Data = array();
   }
-  
+
   function ReadValue($Name)
   {
-        if(!is_array($Name)) $Name = explode('/', $Name);
-        $Last = array_pop($Name);
-        $Data = &$this->Data;
-        foreach($Name as $Item)
-        {
-                $Data = &$Data[$Item];
-        }
-    return($Data[$Last]);  
+    if(!is_array($Name)) $Name = explode('/', $Name);
+    $Last = array_pop($Name);
+    $Data = &$this->Data;
+    foreach($Name as $Item)
+    {
+      $Data = &$Data[$Item];
+    }
+    return($Data[$Last]);
   }
-  
+
   function WriteValue($Name, $Value)
   {
-        if(!is_array($Name)) $Name = explode('/', $Name);
-        $Last = array_pop($Name);
-        $Data = &$this->Data;
-        foreach($Name as $Item)
-        {
-                $Data = &$Data[$Item];
-        }
+    if(!is_array($Name)) $Name = explode('/', $Name);
+    $Last = array_pop($Name);
+    $Data = &$this->Data;
+    foreach($Name as $Item)
+    {
+      $Data = &$Data[$Item];
+    }
     $Data[$Item] = $Value;
   }
-  
+
   function LoadFromFile($FileName)
   {
-        $ConfigData = array();
+    $ConfigData = array();
     include $FileName;
     foreach($this->Data as $Index => $Item)
     {
-        if(array_key_exits($Index, $ConfigData))
+      if(array_key_exits($Index, $ConfigData))
         $this->Data[$Index] = $ConfigData[$Index];
     }
-  } 
-  
+  }
+
   function SaveToFile($FileName)
   {
     file_put_contents($FileName, "<?php \n\n\$ConfigData = ".var_export($this->Data, true).";\n");
   }
-  
+
   function GetAsArray()
   {
-        return($this->Data);
+    return($this->Data);
   }
 }

trunk/Common/Form/Form.php

@@ -50 +50 @@
     {
       if(!array_key_exists($Index, $this->Values) and isset($Item['Default']))
-        $this->Values[$Index] = $Item['Default'];
+        $this->Values[$Index] = $Item['Default'];
     }
   }
@@ -62 +62 @@
   function GetValue($Index, $Event = 'OnView')
   {
-        $Item = $this->Definition['Items'][$Index];
-        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'];
-        return $this->FormManager->Type->ExecuteTypeEvent($UseType, $Event,
+    $Item = $this->Definition['Items'][$Index];
+    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'];
+    return $this->FormManager->Type->ExecuteTypeEvent($UseType, $Event,
         array('Value' => $this->Values[$Index], 'Name' => $Index,
         'Type' => $Item['Type'], 'Values' => $this->Values,
@@ -163 +163 @@
       if(array_key_exists($Index, $this->ValuesValidate) and
         $this->ValuesValidate[$Index]) {
-                $Format = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'GetValidationFormat', array());
-                if($Format != '') $Caption .= '<br/><small>'.$Format.'</small>';
-                $Caption = '<span style="color:red;">'.$Caption.'</span>';
+          $Format = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'GetValidationFormat', array());
+          if($Format != '') $Caption .= '<br/><small>'.$Format.'</small>';
+          $Caption = '<span style="color:red;">'.$Caption.'</span>';
         }
       if(!$this->FormManager->Type->IsHidden($UseType))
@@ -305 +305 @@
     {
       if(isset($Item['Default'])) {
-        if(isset($Item['Null']) and ($Item['Null'] == true))
-                $Values[$Index] = null;
-        else $Values[$Index] = $Item['Default'];
+        if(isset($Item['Null']) and ($Item['Null'] == true))
+          $Values[$Index] = null;
+        else $Values[$Index] = $Item['Default'];
       }
     }
@@ -342 +342 @@
         if(!$this->FormManager->Type->ExecuteTypeEvent($UseType, 'Validate',
           $Parameters)) {
-                $this->ValuesValidate[$Index] = true;
-                $Valid = false;
+            $this->ValuesValidate[$Index] = true;
+            $Valid = false;
           }
     }

trunk/Common/Form/Types/Base.php

@@ -44 +44 @@
     return(addslashes($Value));
   }
-  
+
   function OnFilterName($Item)
   {
-    if(array_key_exists('SQL', $Item) and ($Item['SQL'] != '')) 
+    if(array_key_exists('SQL', $Item) and ($Item['SQL'] != ''))
       $SQL = '('.$Item['SQL'].') AS ';
       else $SQL = '';
@@ -55 +55 @@
   function OnFilterNameQuery($Item)
   {
-    if(array_key_exists('SQL', $Item) and ($Item['SQL'] != '')) 
+    if(array_key_exists('SQL', $Item) and ($Item['SQL'] != ''))
       $Output = '('.$Item['SQL'].') AS `'.$Item['Name'].'`, ('.$Item['SQL'].') AS `'.$Item['Name'].'_Filter`';
       else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`';
     return($Output);
   }
-  
+
   function Validate($Item)
   {
-        return(true);
+    return(true);
   }
 
   function GetValidationFormat()
   {
-        return('');
+    return('');
   }
 }

trunk/Common/Form/Types/Boolean.php

@@ -21 +21 @@
   function OnLoad($Item)
   {
-    if(array_key_exists($Item['Name'], $_POST)) return(1); 
+    if(array_key_exists($Item['Name'], $_POST)) return(1);
       else return(0);
   }

trunk/Common/Form/Types/Enumeration.php

@@ -18 +18 @@
     $Type = $this->FormManager->Type->GetTypeDefinition($Item['Type']);
     $Output = '<select name="'.$Item['Name'].'">';
-      if(array_key_exists('Null', $Item) and $Item['Null']) 
+      if(array_key_exists('Null', $Item) and $Item['Null'])
     {
       if($Item['Value'] == NULL) $Selected = ' selected="1"'; else $Selected = '';
@@ -37 +37 @@
     return($_POST[$Item['Name']]);
   }
-  
+
   function OnLoadDb($Item)
   {

trunk/Common/Form/Types/Hidden.php

@@ -10 +10 @@
     $this->Hidden = true;
   }
-  
+
   function OnView($Item)
   {

trunk/Common/Form/Types/IPv4Address.php

@@ -21 +21 @@
     return($_POST[$Item['Name']]);
   }
-  
+
   function Validate($Item)
   {
-        if($Item['Null'] and ($Item['Value'] == '')) return(true);
-        return(filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV4)));
+    if($Item['Null'] and ($Item['Value'] == '')) return(true);
+    return(filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV4)));
   }
-  
+
   function GetValidationFormat()
   {
-        return('x.x.x.x kde x je hodnota 0..255');
-  } 
+    return('x.x.x.x kde x je hodnota 0..255');
+  }
 }

trunk/Common/Form/Types/IPv6Address.php

@@ -21 +21 @@
     return($_POST[$Item['Name']]);
   }
-  
+
   function Validate($Item)
   {
-        if($Item['Null'] and ($Item['Value'] == '')) return(true);
-        return(filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV6)));
+    if($Item['Null'] and ($Item['Value'] == '')) return(true);
+    return(filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV6)));
   }
 
   function GetValidationFormat()
   {
-        return('xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx kde x je hexa hodnota 0..f');
+    return('xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx kde x je hexa hodnota 0..f');
   }
 }

trunk/Common/Form/Types/Image.php

@@ -2 +2 @@
 
 class TypeImage extends TypeString
-{ 
+{
   function OnView($Item)
   {
     global $System;
-    
+
     return('<img src="'.$System->Link('/images/favicons/'.$Item['Value']).'"/> '.$Item['Value']);
   }

trunk/Common/Form/Types/Integer.php

@@ -23 +23 @@
     return($_POST[$Item['Name']]);
   }
-  
+
   function Validate($Item)
   {
-        if($Item['Null'] and ($Item['Value'] == '')) return(true);
-        return(preg_match('/^\-*[0-9\.]+$/', $Item['Value']));
+    if($Item['Null'] and ($Item['Value'] == '')) return(true);
+    return(preg_match('/^\-*[0-9\.]+$/', $Item['Value']));
   }
-  
+
   function GetValidationFormat()
   {
-        return('číselná hodnota');
-  } 
+    return('číselná hodnota');
+  }
 }

trunk/Common/Form/Types/MacAddress.php

@@ -32 +32 @@
   function Validate($Item)
   {
-        if($Item['Null'] and ($Item['Value'] == '')) return(true);
-        return(preg_match('/^([0-9A-F]{2}[:]){5}([0-9A-F]{2})$/', $Item['Value']));
+    if($Item['Null'] and ($Item['Value'] == '')) return(true);
+    return(preg_match('/^([0-9A-F]{2}[:]){5}([0-9A-F]{2})$/', $Item['Value']));
   }
 
   function GetValidationFormat()
   {
-        return('XX:XX:XX:XX:XX:XX kde X je hexa hodnota 0..F');
+    return('XX:XX:XX:XX:XX:XX kde X je hexa hodnota 0..F');
   }
 }

trunk/Common/Form/Types/Password.php

@@ -27 +27 @@
     $Result = $_POST[$Item['Name']];
     /*
-    if(!array_key_exists('SourceItemId', $Item)) $Result = sha1($_POST[$Item['Name']]);    
+    if(!array_key_exists('SourceItemId', $Item)) $Result = sha1($_POST[$Item['Name']]);
     else
     {
@@ -41 +41 @@
     return($Result);
   }
-  
+
   function OnSaveDb($Item)
   {
-    if($Item['Value'] == '') return(''); 
+    if($Item['Value'] == '') return('');
     else {
       $PasswordHash = new PasswordHash();
@@ -50 +50 @@
     }
   }
-   
+
   function OnLoadDb($Item)
   {

trunk/Common/Form/Types/RandomHash.php

@@ -10 +10 @@
     $this->Hidden = true;
   }
-  
+
   function OnView($Item)
   {

trunk/Common/Global.php

@@ -25 +25 @@
 
 $MonthNames = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen',
-        'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
+  'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
 
 $UnitNames = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB');
@@ -58 +58 @@
 function HumanDate($Time)
 {
-        if($Time != '') {
+  if($Time != '') {
     $Date = explode(' ', $Time);
     $Parts = explode('-', $Date[0]);
     if($Date != '0000-00-00') return(($Parts[2]*1).'.'.($Parts[1]*1).'.'.$Parts[0]);
     else return(' ');
-        } else return(' ');
+  } else return(' ');
 }
 
@@ -106 +106 @@
 {
   return(array(
-        'Year' => date('Y', $Time),
-        'Month' => date('n', $Time),
-        'Day' => date('j', $Time),
-        'Hour' => date('h', $Time),
-        'Minute' => date('i', $Time),
-        'Second' => date('s', $Time)
+    'Year' => date('Y', $Time),
+    'Month' => date('n', $Time),
+    'Day' => date('j', $Time),
+    'Hour' => date('h', $Time),
+    'Minute' => date('i', $Time),
+    'Second' => date('s', $Time)
   ));
 }
@@ -143 +143 @@
 class Paging
 {
-        var $TotalCount;
-        var $ItemPerPage;
-        var $Around;
-        var $SQLLimit;
-        var $Page;
-
-        function __construct()
-        {
-                global $System;
-
-                $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];
-                $this->Around = $System->Config['Web']['VisiblePagingItems'];
-        }
+  var $TotalCount;
+  var $ItemPerPage;
+  var $Around;
+  var $SQLLimit;
+  var $Page;
+
+  function __construct()
+  {
+    global $System;
+
+    $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];
+    $this->Around = $System->Config['Web']['VisiblePagingItems'];
+  }
 
   function Show()
@@ -356 +356 @@
 function IsInternetAddr()
 {
-        global $Config;
-
-        $Result = true;
+  global $Config;
+
+  $Result = true;
   $RemoteAddr = GetRemoteAddress();
   foreach($Config['Web']['IntranetSubnets'] as $Subnet)
@@ -364 +364 @@
     if(substr($RemoteAddr, 0, strlen($Subnet)) == $Subnet)
     {
-        $Result = false;
-        break;
+      $Result = false;
+      break;
     }
   }
@@ -467 +467 @@
 function pack_array($v, $a)
 {
-        return call_user_func_array('pack', array_merge(array($v), (array)$a));
-}
-
+  return call_user_func_array('pack', array_merge(array($v), (array)$a));
+}
+

trunk/Common/Image.php

@@ -12 +12 @@
   var $FileName;
   var $Color;
-  
-  function __construct() 
+
+  function __construct()
   {
     $this->Color = COLOR_BLACK;
@@ -27 +27 @@
   var $Y;
 
-  function __construct() 
+  function __construct()
   {
     $this->Color = COLOR_BLACK;
@@ -40 +40 @@
   var $Color;
 
-  function __construct() 
+  function __construct()
   {
     $this->Color = COLOR_BLACK;
@@ -47 +47 @@
 }
 
-class Image 
+class Image
 {
-  var $Image;  
+  var $Image;
   var $Type;
   var $Font;
   var $Pen;
-  
+
   function __construct()
   {
@@ -59 +59 @@
     $this->Type = IMAGETYPE_PNG;
     $this->Pen = new Pen();
-    $this->Font = new Font();   
-    $this->Brush = new Brush();   
+    $this->Font = new Font();
+    $this->Brush = new Brush();
   }
-  
+
   function SaveToFile($FileName)
   {
-    if($this->Type == IMAGETYPE_JPEG) 
+    if($this->Type == IMAGETYPE_JPEG)
     {
       imagejpeg($this->Image, $FileName);
     } else
-    if($this->Type == IMAGETYPE_GIF) 
+    if($this->Type == IMAGETYPE_GIF)
     {
       imagegif($this->Image, $FileName);
     } else
-    if($this->Type == IMAGETYPE_PNG) 
+    if($this->Type == IMAGETYPE_PNG)
     {
       imagepng($this->Image, $FileName);
     }
   }
-  
+
   function LoadFromFile($FileName)
   {
     $ImageInfo = getimagesize($FileName);
     $this->Type = $ImageInfo[2];
-    if($this->Type == IMAGETYPE_JPEG) 
+    if($this->Type == IMAGETYPE_JPEG)
     {
       $this->Image = imagecreatefromjpeg($FileName);
     } else
-    if($this->Type == IMAGETYPE_GIF) 
+    if($this->Type == IMAGETYPE_GIF)
     {
       $this->Image = imagecreatefromgif($FileName);
     } else
-    if( $this->Type == IMAGETYPE_PNG) 
+    if( $this->Type == IMAGETYPE_PNG)
     {
       $this->Image = imagecreatefrompng($FileName);
-    }  
+    }
   }
-  
+
   function Output()
   {
@@ -103 +103 @@
 
   function SetSize($Width, $Height)
-  {     
+  {
     $NewImage = imagecreatetruecolor($Width, $Height);
-    imagecopy($NewImage, $this->Image, 0, 0, 0, 0, $this->GetWidth(), $this->GetHeight());      
+    imagecopy($NewImage, $this->Image, 0, 0, 0, 0, $this->GetWidth(), $this->GetHeight());
     imagedestroy($this->Image);
     $this->Image = $NewImage;
   }
 
-  function GetWidth() 
-  { 
+  function GetWidth()
+  {
     return(imagesx($this->Image));
   }
-  
-  function GetHeight() 
+
+  function GetHeight()
   {
     return(imagesy($this->Image));
   }
-  
+
   function TextOut($X, $Y, $Text)
   {
     imagettftext($this->Image, $this->Font->Size, 0, $X, $Y, $this->ConvertColor($this->Font->Color), $this->Font->FileName, $Text);
   }
-  
+
   function ConvertColor($Color)
   {
     return(imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff));
   }
-  
+
   function FillRect($X1, $Y1, $X2, $Y2)
   {
     imagefilledrectangle($this->Image, $X1, $Y1, $X2, $Y2, $this->ConvertColor($this->Brush->Color));
   }
-  
+
   function Line($X1, $Y1, $X2, $Y2)
   {

trunk/Common/Mail.php

@@ -13 +13 @@
   var $From;
   var $Recipients;
-  var $Bodies;  
+  var $Bodies;
   var $Attachments;
   var $AgentIdent;
@@ -19 +19 @@
   var $ReplyTo;
   var $Headers;
-  
+
   function __construct()
   {
-    $this->Priorities = array('1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)');           
+    $this->Priorities = array('1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)');
     $this->Boundary = md5(date('r', time()));
     $this->AgentIdent = 'PHP/Mail';
     $this->Clear();
   }
-  
+
   function Clear()
   {
@@ -63 +63 @@
   function AddBody($Content, $MimeType = 'text/plain', $Charset = 'utf-8')
   {
-    $this->Bodies[] = array('Content' => $Content, 'Type' => strtolower($MimeType), 
+    $this->Bodies[] = array('Content' => $Content, 'Type' => strtolower($MimeType),
       'Charset' => strtolower($Charset));
   }
@@ -75 +75 @@
   {
     if(!intval($Priority)) return(false);
-                
+
     if(!isset($this->priorities[$Priority - 1])) return(false);
 
-    $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];   
+    $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];
     return(true);
   }
 
   function AttachFile($FileName, $FileType, $Disposition = DISPOSITION_ATTACHMENT)
-  {     
-    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType, 
+  {
+    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType,
       'Disposition' => $Disposition, 'Type' => 'File');
   }
@@ -90 +90 @@
   function AttachData($FileName, $FileType, $Data, $Disposition = DISPOSITION_ATTACHMENT)
   {
-    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType, 
+    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType,
       'Disposition' => $Disposition, 'Type' => 'Data', 'Data' => $Data);
   }
@@ -97 +97 @@
   {
     if(count($this->Bodies) == 0) throw new Exception('Mail: Need at least one text body');
-    
+
     $Body = $this->BuildAttachment($this->BuildBody());
-    
+
     $To = '';
     $this->Headers['CC'] = '';
     $this->Headers['BCC'] = '';
-    foreach($this->Recipients as $Index => $Recipient)      
+    foreach($this->Recipients as $Index => $Recipient)
     {
       if($Recipient['Type'] == 'SendCombined')
@@ -127 +127 @@
     }
     if($To == '') throw new Exception('Mail: Need at least one recipient address');
-    
+
     $this->Headers['Mime-Version'] = '1.0';
-    
+
     if($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
     if($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
@@ -135 +135 @@
 
     $Headers = '';
-    foreach($this->Headers as $Header => $Value) 
+    foreach($this->Headers as $Header => $Value)
     {
       if(($Header != 'Subject') and ($Value != '')) $Headers .= $Header.': '.$Value."\n";
-    }   
+    }
 
     $this->Subject = strtr($this->Subject, "\r\n", '  ');
 
     if($this->Subject == '') throw new Exception('Mail: Missing Subject');
-    
+
 
     $res = mail($To, $this->Subject, $Body, $Headers);
@@ -152 +152 @@
   {
     if(ereg(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
-    if(ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address)) 
+    if(ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
       return(true);
       else return(false);
@@ -159 +159 @@
   function CheckAdresses($Addresses)
   {
-    foreach($Addresses as $Address) 
-    {
-      if(!$this->ValidEmail($Address)) 
-        throw new Exception('Mail: Invalid address '.$Address);
-    }
-  } 
-  
+    foreach($Addresses as $Address)
+    {
+      if(!$this->ValidEmail($Address))
+  throw new Exception('Mail: Invalid address '.$Address);
+    }
+  }
+
   private function ContentEncoding($Charset)
   {
@@ -175 +175 @@
   {
     if(count($this->Attachments) > 0)
-    {        
+    {
       $this->Headers['Content-Type'] = "multipart/mixed;\n boundary=\"PHP-mixed-".$this->Boundary."\"";
       $Result = "This is a multi-part message in MIME format.\n".
-        "--PHP-mixed-".$this->Boundary."\n";    
+        "--PHP-mixed-".$this->Boundary."\n";
       $Result .= $Body;
-    
-      foreach($this->Attachments as $Attachment) 
+
+      foreach($this->Attachments as $Attachment)
       {
         $FileName = $Attachment['FileName'];
@@ -189 +189 @@
         if($Attachment['Type'] == 'File')
         {
-          if(!file_exists($FileName)) 
+          if(!file_exists($FileName))
             throw new Exception('Mail: Attached file '.$FileName.' can\'t be found');
           $Data = file_get_contents($FileName);
-        } else 
+        } else
         if($Attachment['Type'] == 'Data') $Data = $Attachment['Data'];
           else $Data = '';
-                
+
         $Result .= "\n".'--PHP-mixed-'.$this->Boundary."\n".
           "Content-Type: ".$ContentType."; name=\"".$BaseName."\"\n".
@@ -203 +203 @@
       }
     } else $Result = $Body;
-    return($Result);    
-  }
-  
+    return($Result);
+  }
+
   private function BuildBody()
   {
     $Result = '';
-    if(count($this->Bodies) > 1) 
+    if(count($this->Bodies) > 1)
     {
       $this->Headers['Content-Type'] = 'multipart/alternative; boundary="PHP-alt-'.$this->Boundary.'"';
       $Result .= 'Content-Type: multipart/alternative; boundary="PHP-alt-'.$this->Boundary.'"'.
         "\n\n";
-    } else 
+    } else
     {
       $this->Headers['Content-Type'] = $this->Bodies[0]['Type'].'; charset='.$this->Bodies[0]['Charset'];
@@ -220 +220 @@
     }
 
-        
+
     foreach($this->Bodies as $Body)
     {
-      if(count($this->Bodies) > 1) $Result .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";           
+      if(count($this->Bodies) > 1) $Result .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";
       $Result .= 'Content-Type: '.$Body['Type'].'; charset='.$Body['Charset'].
-        "\nContent-Transfer-Encoding: ".$this->ContentEncoding($Body['Charset'])."\n\n".$Body['Content']."\n";          
+        "\nContent-Transfer-Encoding: ".$this->ContentEncoding($Body['Charset'])."\n\n".$Body['Content']."\n";
     }
     return($Result);
-  }  
+  }
 }
 

trunk/Common/NetworkAddress.php

@@ -60 +60 @@
 class NetworkAddressIPv6
 {
-        var $Address;
-        var $Prefix;
+  var $Address;
+  var $Prefix;
 
-        function __construct()
-        {
-                $this->Address = 0;
-                $this->Prefix = 0;
-        }
+  function __construct()
+  {
+    $this->Address = 0;
+    $this->Prefix = 0;
+  }
 
   function AddressToString()
   {
-        return(inet_ntop($this->Address));
+    return(inet_ntop($this->Address));
   }
 
   function AddressFromString($Value)
   {
-        $this->Address = inet_pton($Value);
+    $this->Address = inet_pton($Value);
   }
 
   function GetOctets()
   {
-        $Result = array();
-        $Data = array_reverse(unpack('C*', $this->Address));
-        foreach($Data as $Item)
-        {
+    $Result = array();
+    $Data = array_reverse(unpack('C*', $this->Address));
+    foreach($Data as $Item)
+    {
 
-                $Result[] = dechex($Item & 15);
-                $Result[] = dechex(($Item >> 4) & 15);
-        }
-        return($Result);
+      $Result[] = dechex($Item & 15);
+      $Result[] = dechex(($Item >> 4) & 15);
+    }
+    return($Result);
   }
 
   function EncodeMAC($MAC)
   {
-        $MAC = explode(':', $MAC);
-        $Data = unpack('C*', $this->Address);
-        $Data[9] = hexdec($MAC[0]) ^ 0x02;
-        $Data[10] = hexdec($MAC[1]);
-        $Data[11] = hexdec($MAC[2]);
-        $Data[12] = 0xff;
-        $Data[13] = 0xfe;
-        $Data[14] = hexdec($MAC[3]);
-        $Data[15] = hexdec($MAC[4]);
-        $Data[16] = hexdec($MAC[5]);
-        $this->Address = pack_array('C*', $Data);
+    $MAC = explode(':', $MAC);
+    $Data = unpack('C*', $this->Address);
+    $Data[9] = hexdec($MAC[0]) ^ 0x02;
+    $Data[10] = hexdec($MAC[1]);
+    $Data[11] = hexdec($MAC[2]);
+    $Data[12] = 0xff;
+    $Data[13] = 0xfe;
+    $Data[14] = hexdec($MAC[3]);
+    $Data[15] = hexdec($MAC[4]);
+    $Data[16] = hexdec($MAC[5]);
+    $this->Address = pack_array('C*', $Data);
   }
 

trunk/Common/Page.php

@@ -15 +15 @@
   var $Encoding;
   var $Style;
-  
+
   function __construct($System)
   {
     parent::__construct($System);
-    
+
     $this->FormatHTML = false;
     $this->ShowRuntimeInfo = false;
     $this->Encoding = 'utf-8';
     $this->Style = 'new';
-    
+
     // TODO: Move to external code
     if(isset($this->System->Config['Web']['FormatHTML']))
@@ -35 +35 @@
       $this->Style = $this->System->Config['Web']['Style'];
   }
-  
+
   function Show()
   {
-        return('');
+    return('');
   }
 
   function SystemMessage($Title, $Text)
-  { 
+  {
     return('<table align="center"><tr><td><div class="SystemMessage"><h3>'.$Title.'</h3><div>'.$Text.'</div></div></td></tr></table>');
     //ShowFooter();
@@ -50 +50 @@
   function ShowHeader($Title, $Path)
   {
-        if(array_key_exists('REQUEST_URI', $_SERVER))
+    if(array_key_exists('REQUEST_URI', $_SERVER))
       $ScriptName = $_SERVER['REQUEST_URI'];
-          else $ScriptName = '';
+      else $ScriptName = '';
     while(strpos($ScriptName, '//') !== false)
       $ScriptName = str_replace('//', '/', $ScriptName);
@@ -62 +62 @@
     $Navigation = '';
     while($Page)
-    { 
+    {
       $Navigation = ' &gt; <a href="'.$this->System->Link($ScriptName).'/">'.$Page->ShortTitle.'</a>'.$Navigation;
-     
+
       if(class_exists($Page->ParentClass))
       {
@@ -71 +71 @@
         $ScriptName = substr($ScriptName, 0, strrpos($ScriptName, '/'));
       } else $Page = null;
-    } 
+    }
     $Navigation = substr($Navigation, 6);
 
@@ -89 +89 @@
       //$Output .= '<div class="MainTitle">'.$Title.'</div>';
       $Output .= '<div class="MainTitle"><span class="MenuItem"><strong>Navigace :: </strong> '.$Navigation.'</span><div class="MenuItem2">';
-        foreach($this->System->Bars['Top'] as $BarItem)
-        $Output .= call_user_func($BarItem);
+      foreach($this->System->Bars['Top'] as $BarItem)
+        $Output .= call_user_func($BarItem);
       $Output .= '</div></div>';
     }
@@ -99 +99 @@
   {
     global $ScriptTimeStart, $Revision, $ReleaseTime;
-    
+
     $Time = round(GetMicrotime() - $ScriptTimeStart, 2);
     $Output = '';
@@ -112 +112 @@
     }
     $Output .= '</body></html>';
-    return($Output); 
+    return($Output);
   }
 
@@ -122 +122 @@
     //  $Output = 'Chyba: '.$E->getMessage();
     //}
-    if($this->ClearPage == false) 
+    if($this->ClearPage == false)
     {
       $Output = $this->ShowHeader($this->FullTitle, $this->ShortTitle).$Output;
@@ -130 +130 @@
     echo($Output);
   }
-  
+
   function NewPage($ClassName)
   {
@@ -156 +156 @@
       }
       $line = trim(substr($s, $start, $end + 1));
-      if(strlen($line) > 0) 
+      if(strlen($line) > 0)
       if($line[0] == '<')
       {
-        if($s[$start + 1] == '/') 
+        if($s[$start + 1] == '/')
         {
           $n = $n - 2;
           $nn = $n;
-        } else 
+        } else
         {
           if(strpos($line, ' ')) $cmd = substr($line, 1, strpos($line, ' ') - 1);
@@ -169 +169 @@
           //echo('['.$cmd.']');
           if(strpos($s, '</'.$cmd.'>')) $n = $n + 2;
-        }   
+        }
       }// else $line = '['.$line.']';
       //if($line != '') echo(htmlspecialchars(str_repeat(' ',$nn).$line."\n"));

trunk/Common/RSS.php

@@ -1 +1 @@
 <?php
 
-class RSS 
+class RSS
 {
   var $Charset;
@@ -9 +9 @@
   var $WebmasterEmail;
   var $Items;
-  
+
   function __construct()
   {
@@ -17 +17 @@
 
   function Generate()
-  { 
+  {
     $Result = '<?xml version="1.0" encoding="'.$this->Charset.'" ?>'."\n". //<?
   '<rss version="2.0">'."\n".
@@ -26 +26 @@
   "    <language>cs</language>\n".
   "    <webMaster>".$this->WebmasterEmail."</webMaster>\n".
-  "    <pubDate>".date('r')."</pubDate>\n".  
+  "    <pubDate>".date('r')."</pubDate>\n".
   "    <ttl>20</ttl>\n";
     foreach($this->Items as $Item)
@@ -33 +33 @@
         '      <title>'.htmlspecialchars($Item['Title'])."</title>\n".
         '      <description>'.htmlspecialchars($Item['Description'])."</description>\n".
-        '      <pubDate>'.date('r',$Item['Time'])."</pubDate>\n".
-        '      <link>'.$Item['Link']."</link>\n".
+  '      <pubDate>'.date('r',$Item['Time'])."</pubDate>\n".
+  '      <link>'.$Item['Link']."</link>\n".
         "    </item>\n";
     }

trunk/Common/Setup/FullInstall.php

@@ -9 +9 @@
 CREATE DEFINER=`centrala`@`localhost` FUNCTION `CompareNetworkPrefix`(Address1 INT(11) UNSIGNED, Address2 INT(11) UNSIGNED, Size INT(11)) RETURNS tinyint(1)
 RETURN Address1 & (-1 << (32 - Size)) = Address2 & (-1 << (32 - Size));
-      
+
 --
 -- Struktura tabulky `ChatHistory`
@@ -2033 +2033 @@
   $Manager->Execute("INSERT INTO `SystemVersion` (`Id`, `Revision`) VALUES
 (1, 495);");
-  
+
 }
 

trunk/Common/Setup/Setup.php

@@ -69 +69 @@
   function Show()
   {
-          global $ConfigDefinition, $DatabaseRevision, $Config, $Updates;
-
-          $this->UpdateManager = $this->System->Setup->UpdateManager;
-          $DefaultConfig = new DefaultConfig();
-          $this->ConfigDefinition = $DefaultConfig->Get();
-          $this->DatabaseRevision = $DatabaseRevision;
-          $this->Config = &$Config;
-
-          $Output = '';
+    global $ConfigDefinition, $DatabaseRevision, $Config, $Updates;
+
+    $this->UpdateManager = $this->System->Setup->UpdateManager;
+    $DefaultConfig = new DefaultConfig();
+    $this->ConfigDefinition = $DefaultConfig->Get();
+    $this->DatabaseRevision = $DatabaseRevision;
+    $this->Config = &$Config;
+
+    $Output = '';
     if(isset($this->Config))
     {
@@ -105 +105 @@
             $Output .= $this->System->Setup->Upgrade();
           } catch (Exception $E) {
-                  $Output .= $this->SystemMessage('Chyba aktualizace', 'Došlo k chybě v SQL dotazu při aktualizaci: <br/>'.$E->getMessage());
-            }
-                $Output .= $this->ControlPanel();
+            $Output .= $this->SystemMessage('Chyba aktualizace', 'Došlo k chybě v SQL dotazu při aktualizaci: <br/>'.$E->getMessage());
+          }
+          $Output .= $this->ControlPanel();
         } else
         if($Action == 'install')
@@ -353 +353 @@
 class PageSetupRedirect extends Page
 {
-        function Show()
-        {
-          $Output = '';
-          if(!$this->Database->Connected()) $Output .= 'Nelze se připojit k databázi.<br>';
-          else {
-            if(!$this->System->Setup->UpdateManager->IsInstalled())
-              $Output .= 'Systém vyžaduje instalaci databáze.<br>';
-            else
-            if(!$this->System->Setup->UpdateManager->IsUpToDate())
-              $Output .= 'Systém vyžaduje aktualizaci databáze.<br>';
-          }
-          $Output .= 'Pokračujte <a href="'.$this->System->Link('/setup/').'">zde</a>';
-                return($Output);
-        }
+  function Show()
+  {
+    $Output = '';
+    if(!$this->Database->Connected()) $Output .= 'Nelze se připojit k databázi.<br>';
+    else {
+      if(!$this->System->Setup->UpdateManager->IsInstalled())
+        $Output .= 'Systém vyžaduje instalaci databáze.<br>';
+      else
+      if(!$this->System->Setup->UpdateManager->IsUpToDate())
+        $Output .= 'Systém vyžaduje aktualizaci databáze.<br>';
+    }
+    $Output .= 'Pokračujte <a href="'.$this->System->Link('/setup/').'">zde</a>';
+    return($Output);
+  }
 }
 
@@ -404 +404 @@
   function Install()
   {
-        global $DatabaseRevision;
+    global $DatabaseRevision;
 
     $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemVersion` (

trunk/Common/Setup/Update.php

@@ -9 +9 @@
   var $Database;
   var $InstallMethod;
-  
+
   function __construct()
   {
-          $this->Revision = 0;
-          $this->Trace = array();
-          $this->VersionTable = 'SystemVersion';
-          $this->InstallMethod = 'FullInstall';
-          $this->InsertSampleDataMethod = 'InsertSampleData';
+    $this->Revision = 0;
+    $this->Trace = array();
+    $this->VersionTable = 'SystemVersion';
+    $this->InstallMethod = 'FullInstall';
+    $this->InsertSampleDataMethod = 'InsertSampleData';
   }
-  
+
   function GetDbVersion()
   {
-          $DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');
-          $Version = $DbResult->fetch_assoc();   
+    $DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');
+    $Version = $DbResult->fetch_assoc();
     return($Version['Revision']);
   }
-  
+
   function IsInstalled()
-  {      
+  {
     debug_backtrace();
-          $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
-    return($DbResult->num_rows > 0);    
+    $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
+    return($DbResult->num_rows > 0);
   }
 
   function IsUpToDate()
   {
-          return($this->Revision <= $this->GetDbVersion());
+    return($this->Revision <= $this->GetDbVersion());
   }
-  
+
   function Upgrade()
   {
-          $DbRevision = $this->GetDbVersion();
-        $Output = 'Počáteční revize databáze: '.$DbRevision.'<br/>'; 
-          while($this->Revision > $DbRevision)
+    $DbRevision = $this->GetDbVersion();
+    $Output = 'Počáteční revize databáze: '.$DbRevision.'<br/>';
+    while($this->Revision > $DbRevision)
     {
-            $TraceItem = $this->Trace[$DbRevision];
-            $Output .= 'Aktualizace na verzi '.$TraceItem['Revision'].':<br/>';
-            // Show applied SQL queries immediatelly 
-            echo($Output);
-            $Output = '';
-            $RevUpdate = $TraceItem['Function'];
+      $TraceItem = $this->Trace[$DbRevision];
+      $Output .= 'Aktualizace na verzi '.$TraceItem['Revision'].':<br/>';
+      // Show applied SQL queries immediatelly
+      echo($Output);
+      $Output = '';
+      $RevUpdate = $TraceItem['Function'];
       $RevUpdate($this);
-            $DbRevision = $TraceItem['Revision'];
-            $this->Database->query('UPDATE `'.$this->VersionTable.'` SET `Revision`= '.
-                $TraceItem['Revision'].' WHERE `Id`=1');
-          }
-          return($Output);       
+      $DbRevision = $TraceItem['Revision'];
+      $this->Database->query('UPDATE `'.$this->VersionTable.'` SET `Revision`= '.
+        $TraceItem['Revision'].' WHERE `Id`=1');
+    }
+    return($Output);
   }
-  
+
   function Install()
-  {     
-        $InstallMethod = $this->InstallMethod; 
-        $InstallMethod($this);
-        $this->Update();
+  {
+    $InstallMethod = $this->InstallMethod;
+    $InstallMethod($this);
+    $this->Update();
   }
-  
+
   function Uninstall()
   {
-    
+
   }
-  
+
   function InsertSampleData()
-  {     
-        $InstallMethod = $this->InsertSampleDataMethod; 
-        $InstallMethod($this);
+  {
+    $InstallMethod = $this->InsertSampleDataMethod;
+    $InstallMethod($this);
   }
-  
+
   function Execute($Query)
   {
-          echo($Query.';<br/>');
-          flush();
-          return($this->Database->query($Query));
+    echo($Query.';<br/>');
+    flush();
+    return($this->Database->query($Query));
   }
 }

trunk/Common/Setup/Updates.php

@@ -538 +538 @@
 function UpdateTo627($Manager)
 {
-        $Manager->Execute('ALTER TABLE `FinanceInvoice` CHANGE `TimeCreation` `Time` DATETIME NOT NULL DEFAULT "0000-00-00 00:00:00";');
-        $Manager->Execute('ALTER TABLE `FinanceYear` ADD `Closed` INT NOT NULL ;');
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` CHANGE `TimeCreation` `Time` DATETIME NOT NULL DEFAULT "0000-00-00 00:00:00";');
+  $Manager->Execute('ALTER TABLE `FinanceYear` ADD `Closed` INT NOT NULL ;');
 }
 
 function UpdateTo632($Manager)
 {
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `FinanceInvoiceOperationRel` (
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `FinanceInvoiceOperationRel` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
   `Invoice` int(11) NOT NULL,
@@ -559 +559 @@
 function UpdateTo633($Manager)
 {
-        $Manager->Execute('ALTER TABLE `UserOnline` ADD `StayLoggedHash` VARCHAR( 40 ) NOT NULL ;');
+  $Manager->Execute('ALTER TABLE `UserOnline` ADD `StayLoggedHash` VARCHAR( 40 ) NOT NULL ;');
 }
 
 function UpdateTo645($Manager)
 {
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `FinanceVATType` (
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `FinanceVATType` (
   `Id` int(11) NOT NULL,
   `Name` varchar(255) NOT NULL,
@@ -578 +578 @@
 function UpdateTo646($Manager)
 {
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `Contract` (
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `Contract` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
   `BillCode` varchar(255) NOT NULL,
@@ -614 +614 @@
 function UpdateTo647($Manager)
 {
-        $Manager->Execute('ALTER TABLE `EmployeeSalary` ADD FOREIGN KEY ( `Employee` ) REFERENCES `Employee` (
+  $Manager->Execute('ALTER TABLE `EmployeeSalary` ADD FOREIGN KEY ( `Employee` ) REFERENCES `Employee` (
 `Id`
 ) ON DELETE RESTRICT ON UPDATE RESTRICT ;');
@@ -649 +649 @@
 function UpdateTo656($Manager)
 {
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `Measure` (
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `Measure` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
   `Name` varchar(255) NOT NULL,
@@ -708 +708 @@
 function UpdateTo657($Manager)
 {
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkInterfaceUpDown` (
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkInterfaceUpDown` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
   `Time` datetime NOT NULL,
@@ -873 +873 @@
   if($DbResult->num_rows > 0)
   {
-        $DbRow = $DbResult->fetch_assoc();
+    $DbRow = $DbResult->fetch_assoc();
     $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
       "VALUES (NULL , 'Oblíbené položky nabídky', ".$DbRow['Id'].", '".$ActionId."', '1');");
@@ -887 +887 @@
 function UpdateTo688($Manager)
 {
-        // Convert monthly plus payment for consumption to regular service
+  // Convert monthly plus payment for consumption to regular service
   $DbResult = $Manager->Execute('SELECT `MonthlyPlus`, `Member` FROM `MemberPayment` WHERE `MonthlyPlus` > 0');
   while($DbRow = $DbResult->fetch_assoc)
@@ -935 +935 @@
 
 function UpdateTo710($Manager)
-{       
+{
   $Manager->Execute('RENAME TABLE `StockItem` TO `StockSerialNumber`;');
   $Manager->Execute('UPDATE `Action` SET `URL`="/is/?t=StockSerialNumber&a=list",`Title`="Sériová čísla" WHERE `URL`="/is/?t=StockItem&a=list";');
-  
+
   // StockMove
   $Manager->Execute('CREATE TABLE IF NOT EXISTS `StockMove` (
@@ -949 +949 @@
   `File` int(11) DEFAULT NULL
   ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
-    
+
   $Manager->Execute('ALTER TABLE `StockMove`
   ADD PRIMARY KEY (`Id`), ADD KEY `DocumentLine` (`DocumentLine`), ADD KEY `StockFrom` (`StockFrom`), ADD KEY `StockTo` (`StockTo`), ADD KEY `File` (`File`);');
-    
+
   $Manager->Execute('ALTER TABLE `StockMove`
   MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
-  
+
   $Manager->Execute('ALTER TABLE `StockMove`
   ADD CONSTRAINT `StockMove_ibfk_1` FOREIGN KEY (`StockFrom`) REFERENCES `Stock` (`Id`),
   ADD CONSTRAINT `StockMove_ibfk_2` FOREIGN KEY (`StockTo`) REFERENCES `Stock` (`Id`),
   ADD CONSTRAINT `StockMove_ibfk_3` FOREIGN KEY (`DocumentLine`) REFERENCES `DocumentLine` (`Id`);');
-  
+
   // StockMoveItem
   $Manager->Execute('CREATE TABLE IF NOT EXISTS `StockMoveItem` (
@@ -970 +970 @@
   `UnitPrice` int(11) NOT NULL
   ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
-  
+
   $Manager->Execute('ALTER TABLE `StockMoveItem`
   ADD PRIMARY KEY (`Id`), ADD KEY `Product` (`Product`), ADD KEY `StockMove` (`StockMove`);');
-  
+
   $Manager->Execute('ALTER TABLE `StockMoveItem`
   MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
@@ -979 +979 @@
   $Manager->Execute('ALTER TABLE `StockMoveItem`
   ADD CONSTRAINT `StockMoveItem_ibfk_2` FOREIGN KEY (`Product`) REFERENCES `Product` (`Id`),
-  ADD CONSTRAINT `StockMoveItem_ibfk_1` FOREIGN KEY (`StockMove`) REFERENCES `StockMove` (`Id`);');  
+  ADD CONSTRAINT `StockMoveItem_ibfk_1` FOREIGN KEY (`StockMove`) REFERENCES `StockMove` (`Id`);');
 
   // IS menu item
@@ -989 +989 @@
   if($DbResult->num_rows > 0)
   {
-        $DbRow = $DbResult->fetch_assoc();
+    $DbRow = $DbResult->fetch_assoc();
     $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
       "VALUES (NULL , 'Skladové pohyby', ".$DbRow['Id'].", '".$ActionId."', '1');");
@@ -997 +997 @@
 function UpdateTo715($Manager)
 {
-        $Manager->Execute('ALTER TABLE `StockSerialNumber` DROP FOREIGN KEY `StockSerialNumber_ibfk_6`;');
-        $Manager->Execute('ALTER TABLE `StockSerialNumber` DROP `Segment`');
-        $Manager->Execute('ALTER TABLE `Member` DROP `NetworkSegment`');
-        $Manager->Execute('DROP TABLE `NetworkSegment`');
-        $Manager->Execute('DELETE FROM `MenuItem` WHERE `Name`="Úseky sítě"');
-        $Manager->Execute('DELETE FROM `Action` WHERE `Title`="Úseky sítě"');
+  $Manager->Execute('ALTER TABLE `StockSerialNumber` DROP FOREIGN KEY `StockSerialNumber_ibfk_6`;');
+  $Manager->Execute('ALTER TABLE `StockSerialNumber` DROP `Segment`');
+  $Manager->Execute('ALTER TABLE `Member` DROP `NetworkSegment`');
+  $Manager->Execute('DROP TABLE `NetworkSegment`');
+  $Manager->Execute('DELETE FROM `MenuItem` WHERE `Name`="Úseky sítě"');
+  $Manager->Execute('DELETE FROM `Action` WHERE `Title`="Úseky sítě"');
 }
 
 function UpdateTo718($Manager)
-{       
+{
   $Manager->Execute('CREATE TABLE IF NOT EXISTS `Company` (
 `Id` int(11) NOT NULL,
@@ -1027 +1027 @@
   if($DbResult->num_rows > 0)
   {
-        $DbRow = $DbResult->fetch_assoc();
+    $DbRow = $DbResult->fetch_assoc();
     $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
       "VALUES (NULL , 'Firmy', ".$DbRow['Id'].", '".$ActionId."', '1');");
@@ -1034 +1034 @@
 
 function UpdateTo719($Manager)
-{       
+{
   $Manager->Execute('ALTER TABLE `FinanceOperation` ADD `Direction` INT NOT NULL AFTER `Cash`;');
   $Manager->Execute('UPDATE `FinanceOperation` SET `Direction` = 1 WHERE `Value` >= 0 ;');
   $Manager->Execute('UPDATE `FinanceOperation` SET `Direction` = -1 WHERE `Value` < 0 ;');
   $Manager->Execute('UPDATE `FinanceOperation` SET `Value` = -`Value` WHERE `Value` < 0 ;');
-  // Set missing FinanceOperation DocumentLine according BillCode 
+  // Set missing FinanceOperation DocumentLine according BillCode
   $Manager->Execute('UPDATE `FinanceOperation` SET `DocumentLine` = 1 WHERE (`BillCode` LIKE "PP%") AND (`DocumentLine` IS NULL)');
   $Manager->Execute('UPDATE `FinanceOperation` SET `DocumentLine` = 2 WHERE (`BillCode` LIKE "VP%") AND (`DocumentLine` IS NULL)');
   $Manager->Execute('UPDATE `FinanceOperation` SET `DocumentLine` = 3 WHERE (`BillCode` LIKE "BV%") AND (`DocumentLine` IS NULL)');
   $Manager->Execute('UPDATE `FinanceOperation` SET `DocumentLine` = 4 WHERE (`BillCode` LIKE "PR%") AND (`DocumentLine` IS NULL)');
-  
+
   // IS menu item
   $DbResult = $Manager->Execute('SELECT `Id` FROM `MenuItem` WHERE `Name`="Příjmy a výdaje"');
   if($DbResult->num_rows > 0)
   {
-        $DbRow = $DbResult->fetch_assoc();
+    $DbRow = $DbResult->fetch_assoc();
     $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
     `Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
     NULL , "", "Příjem do pokladny", "1", "/is/?t=FinanceTreasuryIn&a=list", NULL , NULL , NULL , "1");');
     $ActionId = $Manager->Database->insert_id;
-        $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
       "VALUES (NULL , 'Příjem do pokladny', ".$DbRow['Id'].", '".$ActionId."', '1');");
     $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
@@ -1060 +1060 @@
     NULL , "", "Výdej z pokladny", "1", "/is/?t=FinanceTreasuryOut&a=list", NULL , NULL , NULL , "1");');
     $ActionId = $Manager->Database->insert_id;
-        $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
       "VALUES (NULL , 'Výdej z pokladny', ".$DbRow['Id'].", '".$ActionId."', '1');");
     $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
@@ -1066 +1066 @@
     NULL , "", "Příjem na účet", "1", "/is/?t=FinanceAccountIn&a=list", NULL , NULL , NULL , "1");');
     $ActionId = $Manager->Database->insert_id;
-        $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
       "VALUES (NULL , 'Příjem na účet', ".$DbRow['Id'].", '".$ActionId."', '1');");
     $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
@@ -1072 +1072 @@
     NULL , "", "Výdej z účtu", "1", "/is/?t=FinanceAccountOut&a=list", NULL , NULL , NULL , "1");');
     $ActionId = $Manager->Database->insert_id;
-        $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
       "VALUES (NULL , 'Výdej z účtu', ".$DbRow['Id'].", '".$ActionId."', '1');");
   }
@@ -1079 +1079 @@
 function UpdateTo720($Manager)
 {
-        $Manager->Execute('ALTER TABLE `FinanceInvoice` ADD `Direction` INT NOT NULL AFTER `TimePayment`;');
-        $Manager->Execute('UPDATE `FinanceInvoice` SET `Direction` = 1 WHERE `Value` >= 0 ;');
-        $Manager->Execute('UPDATE `FinanceInvoice` SET `Direction` = -1 WHERE `Value` < 0 ;');
-        $Manager->Execute('UPDATE `FinanceInvoice` SET `Value` = -`Value` WHERE `Value` < 0 ;');
-        // Set missing FinanceInvoice DocumentLine according BillCode
-        $Manager->Execute('UPDATE `FinanceInvoice` SET `DocumentLine` = 5 WHERE (`BillCode` LIKE "PF%") AND (`DocumentLine` IS NULL)');
-        $Manager->Execute('UPDATE `FinanceInvoice` SET `DocumentLine` = 6 WHERE (`BillCode` LIKE "VF%") AND (`DocumentLine` IS NULL)');
-        
-        // IS menu item
-        $DbResult = $Manager->Execute('SELECT `Id` FROM `MenuItem` WHERE `Name`="Závazky a pohledávky"');
-        if($DbResult->num_rows > 0)
-        {
-                $DbRow = $DbResult->fetch_assoc();
-                $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
+  $Manager->Execute('ALTER TABLE `FinanceInvoice` ADD `Direction` INT NOT NULL AFTER `TimePayment`;');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Direction` = 1 WHERE `Value` >= 0 ;');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Direction` = -1 WHERE `Value` < 0 ;');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Value` = -`Value` WHERE `Value` < 0 ;');
+  // Set missing FinanceInvoice DocumentLine according BillCode
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `DocumentLine` = 5 WHERE (`BillCode` LIKE "PF%") AND (`DocumentLine` IS NULL)');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `DocumentLine` = 6 WHERE (`BillCode` LIKE "VF%") AND (`DocumentLine` IS NULL)');
+
+  // IS menu item
+  $DbResult = $Manager->Execute('SELECT `Id` FROM `MenuItem` WHERE `Name`="Závazky a pohledávky"');
+  if($DbResult->num_rows > 0)
+  {
+    $DbRow = $DbResult->fetch_assoc();
+    $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
     `Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
     NULL , "", "Příjaté", "1", "/is/?t=FinanceInvoiceIn&a=list", NULL , NULL , NULL , "1");');
-                $ActionId = $Manager->Database->insert_id;
-                $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
-                                "VALUES (NULL , 'Přijaté', ".$DbRow['Id'].", '".$ActionId."', '1');");
-                
-                $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
+    $ActionId = $Manager->Database->insert_id;
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+        "VALUES (NULL , 'Přijaté', ".$DbRow['Id'].", '".$ActionId."', '1');");
+
+    $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
     `Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
     NULL , "", "Vydané", "1", "/is/?t=FinanceInvoiceOut&a=list", NULL , NULL , NULL , "1");');
-                $ActionId = $Manager->Database->insert_id;
-                $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
-                                "VALUES (NULL , 'Vydané', ".$DbRow['Id'].", '".$ActionId."', '1');");
-        }
+    $ActionId = $Manager->Database->insert_id;
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+        "VALUES (NULL , 'Vydané', ".$DbRow['Id'].", '".$ActionId."', '1');");
+  }
 }
 
 function UpdateTo722($Manager)
 {
-        $Manager->Execute('ALTER TABLE `Service` DROP `CustomerCount`;');
+  $Manager->Execute('ALTER TABLE `Service` DROP `CustomerCount`;');
 }
 
 function UpdateTo725($Manager)
 {
-        // Text column of invoices is not used. Text from invoice items is taken instead.
-        $DbResult = $Manager->Execute('ALTER TABLE `FinanceInvoice` DROP `Text`;');
-        
-        $SearchText = 'Připojení k síti'; 
-        $DbResult = $Manager->Execute('SELECT * FROM `FinanceInvoiceItem` WHERE `Description` LIKE "'.$SearchText.' za období%";');
-        while($DbRow = $DbResult->fetch_assoc())
-        {
-                $Text = trim(substr($DbRow['Description'], strlen($SearchText.' za období') + 1));
-                $Text = explode('-', $Text);            
-                $PeriodFrom = explode('.', trim($Text[0]));
-                $PeriodFrom = $PeriodFrom[2].'-'.$PeriodFrom[1].'-'.$PeriodFrom[0];
-                $PeriodTo = explode('.', trim($Text[1]));
-                $PeriodTo = $PeriodTo[2].'-'.$PeriodTo[1].'-'.$PeriodTo[0];
-                $Manager->Execute('UPDATE `FinanceInvoice` SET `PeriodFrom`="'.$PeriodFrom.'", `PeriodTo`="'.$PeriodTo.'" WHERE `Id`='.$DbRow['FinanceInvoice']);
-        }
-        $DbResult = $Manager->Execute('UPDATE `FinanceInvoiceItem` SET `Description` = "'.$SearchText.'" WHERE `Description` LIKE "'.$SearchText.' za období%";');
-        
-        $SearchText = 'Připojení k Internetu'; 
-        $DbResult = $Manager->Execute('SELECT * FROM `FinanceInvoiceItem` WHERE `Description` LIKE "'.$SearchText.' za období%";');
-        while($DbRow = $DbResult->fetch_assoc())
-        {
-                $Text = trim(substr($DbRow['Description'], strlen($SearchText.' za období') + 1));
-                $Text = explode('-', $Text);            
-                $PeriodFrom = explode('.', trim($Text[0]));
-                $PeriodFrom = $PeriodFrom[2].'-'.$PeriodFrom[1].'-'.$PeriodFrom[0];
-                $Text[1] = trim($Text[1]);
-                if(strpos($Text[1], ' ') !== false) $Text[1] = substr($Text[1], 0, strpos($Text[1], ' '));
-                $PeriodTo = explode('.', trim($Text[1]));
-                $PeriodTo = $PeriodTo[2].'-'.$PeriodTo[1].'-'.$PeriodTo[0];
-                $Manager->Execute('UPDATE `FinanceInvoice` SET `PeriodFrom`="'.$PeriodFrom.'", `PeriodTo`="'.$PeriodTo.'" WHERE `Id`='.$DbRow['FinanceInvoice']);
-        }
-        $DbResult = $Manager->Execute('UPDATE `FinanceInvoiceItem` SET `Description` = "'.$SearchText.'" WHERE `Description` LIKE "'.$SearchText.' za období%";');
+  // Text column of invoices is not used. Text from invoice items is taken instead.
+  $DbResult = $Manager->Execute('ALTER TABLE `FinanceInvoice` DROP `Text`;');
+
+  $SearchText = 'Připojení k síti';
+  $DbResult = $Manager->Execute('SELECT * FROM `FinanceInvoiceItem` WHERE `Description` LIKE "'.$SearchText.' za období%";');
+  while($DbRow = $DbResult->fetch_assoc())
+  {
+    $Text = trim(substr($DbRow['Description'], strlen($SearchText.' za období') + 1));
+    $Text = explode('-', $Text);
+    $PeriodFrom = explode('.', trim($Text[0]));
+    $PeriodFrom = $PeriodFrom[2].'-'.$PeriodFrom[1].'-'.$PeriodFrom[0];
+    $PeriodTo = explode('.', trim($Text[1]));
+    $PeriodTo = $PeriodTo[2].'-'.$PeriodTo[1].'-'.$PeriodTo[0];
+    $Manager->Execute('UPDATE `FinanceInvoice` SET `PeriodFrom`="'.$PeriodFrom.'", `PeriodTo`="'.$PeriodTo.'" WHERE `Id`='.$DbRow['FinanceInvoice']);
+  }
+  $DbResult = $Manager->Execute('UPDATE `FinanceInvoiceItem` SET `Description` = "'.$SearchText.'" WHERE `Description` LIKE "'.$SearchText.' za období%";');
+
+  $SearchText = 'Připojení k Internetu';
+  $DbResult = $Manager->Execute('SELECT * FROM `FinanceInvoiceItem` WHERE `Description` LIKE "'.$SearchText.' za období%";');
+  while($DbRow = $DbResult->fetch_assoc())
+  {
+    $Text = trim(substr($DbRow['Description'], strlen($SearchText.' za období') + 1));
+    $Text = explode('-', $Text);
+    $PeriodFrom = explode('.', trim($Text[0]));
+    $PeriodFrom = $PeriodFrom[2].'-'.$PeriodFrom[1].'-'.$PeriodFrom[0];
+    $Text[1] = trim($Text[1]);
+    if(strpos($Text[1], ' ') !== false) $Text[1] = substr($Text[1], 0, strpos($Text[1], ' '));
+    $PeriodTo = explode('.', trim($Text[1]));
+    $PeriodTo = $PeriodTo[2].'-'.$PeriodTo[1].'-'.$PeriodTo[0];
+    $Manager->Execute('UPDATE `FinanceInvoice` SET `PeriodFrom`="'.$PeriodFrom.'", `PeriodTo`="'.$PeriodTo.'" WHERE `Id`='.$DbRow['FinanceInvoice']);
+  }
+  $DbResult = $Manager->Execute('UPDATE `FinanceInvoiceItem` SET `Description` = "'.$SearchText.'" WHERE `Description` LIKE "'.$SearchText.' za období%";');
 }
 
 function UpdateTo726($Manager)
 {
-        $Manager->Execute('ALTER TABLE `ServiceCustomerRel` CHANGE `Action` `ChangeAction` ENUM("add","modify","remove") CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;');
-        $Manager->Execute('ALTER TABLE `ServiceCustomerRel` ADD `ChangeTime` DATETIME NULL AFTER `ChangeAction`;');
-        $Manager->Execute('ALTER TABLE `ServiceCustomerRel` DROP FOREIGN KEY `ServiceCustomerRel_ibfk_4`;');
-        $Manager->Execute('ALTER TABLE `ServiceCustomerRel` CHANGE `ReplaceId` `ChangeReplaceId` INT(11) NULL DEFAULT NULL;');
-        $Manager->Execute('ALTER TABLE `ServiceCustomerRel` ADD FOREIGN KEY (`ChangeReplaceId`) REFERENCES `ServiceCustomerRel`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
-
-        $Manager->Execute('ALTER TABLE `Service` CHANGE `Action` `ChangeAction` ENUM("add","modify","remove") CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;');
-        $Manager->Execute('ALTER TABLE `Service` ADD `ChangeTime` DATETIME NULL AFTER `ChangeAction`;');
-        $Manager->Execute('ALTER TABLE `Service` DROP FOREIGN KEY `Service_ibfk_2`;');
-        $Manager->Execute('ALTER TABLE `Service` CHANGE `ReplaceId` `ChangeReplaceId` INT(11) NULL DEFAULT NULL;');
-        $Manager->Execute('ALTER TABLE `Service` ADD FOREIGN KEY (`ChangeReplaceId`) REFERENCES `Service`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
-
-        $Manager->Execute('ALTER TABLE `FinanceCharge` CHANGE `Action` `ChangeAction` ENUM("add","modify","remove") CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;');
-        $Manager->Execute('ALTER TABLE `FinanceCharge` ADD `ChangeTime` DATETIME NULL AFTER `ChangeAction`;');
-        $Manager->Execute('ALTER TABLE `FinanceCharge` DROP FOREIGN KEY `FinanceCharge_ibfk_1`;');
-        $Manager->Execute('ALTER TABLE `FinanceCharge` CHANGE `ReplaceId` `ChangeReplaceId` INT(11) NULL DEFAULT NULL;');
-        $Manager->Execute('ALTER TABLE `FinanceCharge` ADD FOREIGN KEY (`ChangeReplaceId`) REFERENCES `FinanceCharge`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
-        
-        $Manager->Execute('ALTER TABLE `MemberPayment` DROP `NetworkDevice`;');
+  $Manager->Execute('ALTER TABLE `ServiceCustomerRel` CHANGE `Action` `ChangeAction` ENUM("add","modify","remove") CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;');
+  $Manager->Execute('ALTER TABLE `ServiceCustomerRel` ADD `ChangeTime` DATETIME NULL AFTER `ChangeAction`;');
+  $Manager->Execute('ALTER TABLE `ServiceCustomerRel` DROP FOREIGN KEY `ServiceCustomerRel_ibfk_4`;');
+  $Manager->Execute('ALTER TABLE `ServiceCustomerRel` CHANGE `ReplaceId` `ChangeReplaceId` INT(11) NULL DEFAULT NULL;');
+  $Manager->Execute('ALTER TABLE `ServiceCustomerRel` ADD FOREIGN KEY (`ChangeReplaceId`) REFERENCES `ServiceCustomerRel`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+
+  $Manager->Execute('ALTER TABLE `Service` CHANGE `Action` `ChangeAction` ENUM("add","modify","remove") CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;');
+  $Manager->Execute('ALTER TABLE `Service` ADD `ChangeTime` DATETIME NULL AFTER `ChangeAction`;');
+  $Manager->Execute('ALTER TABLE `Service` DROP FOREIGN KEY `Service_ibfk_2`;');
+  $Manager->Execute('ALTER TABLE `Service` CHANGE `ReplaceId` `ChangeReplaceId` INT(11) NULL DEFAULT NULL;');
+  $Manager->Execute('ALTER TABLE `Service` ADD FOREIGN KEY (`ChangeReplaceId`) REFERENCES `Service`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+
+  $Manager->Execute('ALTER TABLE `FinanceCharge` CHANGE `Action` `ChangeAction` ENUM("add","modify","remove") CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;');
+  $Manager->Execute('ALTER TABLE `FinanceCharge` ADD `ChangeTime` DATETIME NULL AFTER `ChangeAction`;');
+  $Manager->Execute('ALTER TABLE `FinanceCharge` DROP FOREIGN KEY `FinanceCharge_ibfk_1`;');
+  $Manager->Execute('ALTER TABLE `FinanceCharge` CHANGE `ReplaceId` `ChangeReplaceId` INT(11) NULL DEFAULT NULL;');
+  $Manager->Execute('ALTER TABLE `FinanceCharge` ADD FOREIGN KEY (`ChangeReplaceId`) REFERENCES `FinanceCharge`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+
+  $Manager->Execute('ALTER TABLE `MemberPayment` DROP `NetworkDevice`;');
 }
 
@@ -1175 +1175 @@
 {
  $Manager->Execute('ALTER TABLE `FinanceBankAccount` ADD `AutoImport` INT NOT NULL ;');
-  
+
   $Manager->Execute('CREATE TABLE IF NOT EXISTS `Scheduler` (
   `Id` int(11) NOT NULL,
@@ -1189 +1189 @@
   $Manager->Execute('ALTER TABLE `Scheduler`
  ADD PRIMARY KEY (`Id`);');
-  
+
   $Manager->Execute('ALTER TABLE `Scheduler`
 MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
@@ -1201 +1201 @@
   if($DbResult->num_rows > 0)
   {
-        $DbRow = $DbResult->fetch_assoc();
+    $DbRow = $DbResult->fetch_assoc();
     $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
       "VALUES (NULL , 'Plánovač', ".$DbRow['Id'].", '".$ActionId."', '1');");
   }
-  
+
   $Manager->Execute('INSERT INTO `Module` (`Id`, `Name`, `Title`) VALUES (NULL, "Plánovač", "Scheduler");');
 }
@@ -1211 +1211 @@
 function UpdateTo730($Manager)
 {
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `SchedulerAction` (
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `SchedulerAction` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
   `Name` varchar(255) NOT NULL,
   `Class` varchar(255) NOT NULL,
-        PRIMARY KEY (`Id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');      
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
   $Manager->Execute('ALTER TABLE `Scheduler` CHANGE `Class` `Action` INT(11) NOT NULL;');
   $Manager->Execute("ALTER TABLE `Scheduler` ADD INDEX ( `Action` ) ");
@@ -1226 +1226 @@
 function UpdateTo731($Manager)
 {
-        // NetworkDomain
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkDomain` (
+  // NetworkDomain
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkDomain` (
 `Id` int(11) NOT NULL,
 `Name` varchar(255) NOT NULL,
@@ -1252 +1252 @@
   if($DbResult->num_rows > 0)
   {
-        $DbRow = $DbResult->fetch_assoc();
-        $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
-                "VALUES (NULL , 'Síťová doména', ".$DbRow['Id'].", '".$ActionId."', '1');");
-  }  
-        
-        // Model additions
-        $Manager->Execute('ALTER TABLE `Model` ADD `Title` VARCHAR(255) NOT NULL , '.
-                'ADD `Query` VARCHAR(255) NOT NULL , '.
-                'ADD `DefaultSortColumn` VARCHAR(255) NOT NULL , '.
-                'ADD `DefaultSortOrder` INT NOT NULL ;');
-        
-        // ModelField
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `ModelField` (
-        `Id` int(11) NOT NULL,
-        `Name` varchar(255) NOT NULL,
-        `Model` int(11) NOT NULL,
-        `Query` varchar(255) NOT NULL,
-        `Type` varchar(255) NOT NULL,
-        `Title` varchar(255) NOT NULL,
-        `DefaultValue` varchar(255) NOT NULL,
-        `IsNull` int(11) NOT NULL,
-        `Suffix` varchar(255) NOT NULL
-        ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
-        
-        $Manager->Execute('ALTER TABLE `ModelField`
-        ADD PRIMARY KEY (`Id`), ADD KEY `Model` (`Model`);');
-        
-        $Manager->Execute('ALTER TABLE `ModelField`
-        MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
-        
-        $Manager->Execute('ALTER TABLE `ModelField`
-        ADD CONSTRAINT `ModelField_ibfk_1` FOREIGN KEY (`Model`) REFERENCES `Model` (`Id`);');
-        
-        // Module additions
-        $Manager->Execute('ALTER TABLE `Module` ADD `Version` VARCHAR(255) NOT NULL , '.
-                'ADD `Creator` VARCHAR(255) NOT NULL , '.
-                'ADD `License` VARCHAR(255) NOT NULL , '.
-                'ADD `Installed` INT NOT NULL , '.
-                'ADD `HomePage` VARCHAR(255) NOT NULL , '.
-                'ADD `Description` TEXT NOT NULL ;');
-        
-        // ModuleLink
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `ModuleLink` (
+    $DbRow = $DbResult->fetch_assoc();
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+      "VALUES (NULL , 'Síťová doména', ".$DbRow['Id'].", '".$ActionId."', '1');");
+  }
+
+  // Model additions
+  $Manager->Execute('ALTER TABLE `Model` ADD `Title` VARCHAR(255) NOT NULL , '.
+    'ADD `Query` VARCHAR(255) NOT NULL , '.
+    'ADD `DefaultSortColumn` VARCHAR(255) NOT NULL , '.
+    'ADD `DefaultSortOrder` INT NOT NULL ;');
+
+  // ModelField
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `ModelField` (
+  `Id` int(11) NOT NULL,
+  `Name` varchar(255) NOT NULL,
+  `Model` int(11) NOT NULL,
+  `Query` varchar(255) NOT NULL,
+  `Type` varchar(255) NOT NULL,
+  `Title` varchar(255) NOT NULL,
+  `DefaultValue` varchar(255) NOT NULL,
+  `IsNull` int(11) NOT NULL,
+  `Suffix` varchar(255) NOT NULL
+  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `ModelField`
+  ADD PRIMARY KEY (`Id`), ADD KEY `Model` (`Model`);');
+
+  $Manager->Execute('ALTER TABLE `ModelField`
+  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
+
+  $Manager->Execute('ALTER TABLE `ModelField`
+  ADD CONSTRAINT `ModelField_ibfk_1` FOREIGN KEY (`Model`) REFERENCES `Model` (`Id`);');
+
+  // Module additions
+  $Manager->Execute('ALTER TABLE `Module` ADD `Version` VARCHAR(255) NOT NULL , '.
+    'ADD `Creator` VARCHAR(255) NOT NULL , '.
+    'ADD `License` VARCHAR(255) NOT NULL , '.
+    'ADD `Installed` INT NOT NULL , '.
+    'ADD `HomePage` VARCHAR(255) NOT NULL , '.
+    'ADD `Description` TEXT NOT NULL ;');
+
+  // ModuleLink
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `ModuleLink` (
 `Id` int(11) NOT NULL,
   `Module` int(11) NOT NULL,
@@ -1305 +1305 @@
 
   $Manager->Execute('ALTER TABLE `ModuleLink`
-        MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
+    MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
 }
 
 function UpdateTo735($Manager)
 {
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkFreeAccess` (
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkFreeAccess` (
 `Id` int(11) NOT NULL,
 `IPAddress` varchar(255) NOT NULL,
 `Time` datetime NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
-        
-        $Manager->Execute('ALTER TABLE `NetworkFreeAccess`
-        ADD PRIMARY KEY (`Id`);');
-        
-        $Manager->Execute('ALTER TABLE `NetworkFreeAccess`
-        MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=1;');
-        
-        $Manager->Execute('ALTER TABLE `NetworkFreeAccess` ADD `Configured` INT NOT NULL ;');
-        $DbResult = $Manager->Execute('INSERT INTO `SchedulerAction` (`Id`, `Name`, `Class`) VALUES '.
-                '(NULL, "Konfigurace internetu zdarma", "ScheduleConfigureFreeAccess");');
-        $ActionId = $Manager->Database->insert_id;
-        $Manager->Execute('INSERT INTO `Scheduler` (`Id`, `Name`, `Enabled`, `Action`, 
-                `Log`, `LastExecutedTime`, `ScheduledTime`, `Period`) VALUES (NULL, "Internet zdarma", 
-                1, '.$ActionId.', "", NULL, "", 5);');
-        $Manager->Execute('ALTER TABLE `Scheduler` CHANGE `ScheduledTime` `ScheduledTime` DATETIME NULL;');
+
+  $Manager->Execute('ALTER TABLE `NetworkFreeAccess`
+  ADD PRIMARY KEY (`Id`);');
+
+  $Manager->Execute('ALTER TABLE `NetworkFreeAccess`
+  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=1;');
+
+  $Manager->Execute('ALTER TABLE `NetworkFreeAccess` ADD `Configured` INT NOT NULL ;');
+  $DbResult = $Manager->Execute('INSERT INTO `SchedulerAction` (`Id`, `Name`, `Class`) VALUES '.
+    '(NULL, "Konfigurace internetu zdarma", "ScheduleConfigureFreeAccess");');
+  $ActionId = $Manager->Database->insert_id;
+  $Manager->Execute('INSERT INTO `Scheduler` (`Id`, `Name`, `Enabled`, `Action`,
+    `Log`, `LastExecutedTime`, `ScheduledTime`, `Period`) VALUES (NULL, "Internet zdarma",
+    1, '.$ActionId.', "", NULL, "", 5);');
+  $Manager->Execute('ALTER TABLE `Scheduler` CHANGE `ScheduledTime` `ScheduledTime` DATETIME NULL;');
 }
 
 function UpdateTo736($Manager)
 {
-        $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkLinkType` (
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkLinkType` (
 `Id` int(11) NOT NULL,
 `Name` varchar(255) NOT NULL
@@ -1399 +1399 @@
       697 => array('Revision' => 707, 'Function' => 'UpdateTo707'),
       707 => array('Revision' => 710, 'Function' => 'UpdateTo710'),
-        710 => array('Revision' => 715, 'Function' => 'UpdateTo715'),
+      710 => array('Revision' => 715, 'Function' => 'UpdateTo715'),
       715 => array('Revision' => 718, 'Function' => 'UpdateTo718'),
       718 => array('Revision' => 719, 'Function' => 'UpdateTo719'),
-        719 => array('Revision' => 720, 'Function' => 'UpdateTo720'),
-        720 => array('Revision' => 722, 'Function' => 'UpdateTo722'),
-        722 => array('Revision' => 725, 'Function' => 'UpdateTo725'),
-        725 => array('Revision' => 726, 'Function' => 'UpdateTo726'),
-        726 => array('Revision' => 729, 'Function' => 'UpdateTo729'),
-        729 => array('Revision' => 730, 'Function' => 'UpdateTo730'),
-        730 => array('Revision' => 731, 'Function' => 'UpdateTo731'),
-        731 => array('Revision' => 735, 'Function' => 'UpdateTo735'),
-        735 => array('Revision' => 736, 'Function' => 'UpdateTo736'),
+      719 => array('Revision' => 720, 'Function' => 'UpdateTo720'),
+      720 => array('Revision' => 722, 'Function' => 'UpdateTo722'),
+      722 => array('Revision' => 725, 'Function' => 'UpdateTo725'),
+      725 => array('Revision' => 726, 'Function' => 'UpdateTo726'),
+      726 => array('Revision' => 729, 'Function' => 'UpdateTo729'),
+      729 => array('Revision' => 730, 'Function' => 'UpdateTo730'),
+      730 => array('Revision' => 731, 'Function' => 'UpdateTo731'),
+      731 => array('Revision' => 735, 'Function' => 'UpdateTo735'),
+      735 => array('Revision' => 736, 'Function' => 'UpdateTo736'),
     ));
   }

trunk/Common/Table.php

@@ -1 +1 @@
 <?php
 
-class Control 
+class Control
 {
-        var $Name;
-        
+  var $Name;
+
   function Show()
   {
-          return('');
+    return('');
   }
 }
@@ -13 +13 @@
 class Table
 {
-        function GetCell($Y, $X)
-        {
-                return('');
-        }
+  function GetCell($Y, $X)
+  {
+    return('');
+  }
 
-        function BeginRead()
-        {
-        }
-        
-        function EndRead()
-        {
-        }
-        
+  function BeginRead()
+  {
+  }
+
+  function EndRead()
+  {
+  }
+
   function RowsCount()
   {
-        return(0);
+    return(0);
   }
 }
@@ -34 +34 @@
 class TableMemory extends Table
 {
-        var $Cells;
-        
-        function GetCell($Y, $X)
-        {
-                return($this->Cells[$Y][$X]);
-        }
+  var $Cells;
+
+  function GetCell($Y, $X)
+  {
+    return($this->Cells[$Y][$X]);
+  }
 
   function RowsCount()
   {
-        return(count($this->Cells));
+    return(count($this->Cells));
   }
 }
@@ -49 +49 @@
 class TableSQL extends Table
 {
-        var $Query;
-        var $Database;
-        var $Cells;     
-        
-        function GetCell($Y, $X)
-        {
-                return($this->Cells[$Y][$X]);
-        }
-        
-        function BeginRead()
-        {
-                $this->Cells = array();
-                $DbResult = $this->Database->query($this->Query);
-                while($DbRow = $DbResult->fetch_row())
-                {
-                        $this->Cells[] = $DbRow;
-                }
-        }
-        
-        function EndRead()
-        {
-                $this->Cells = array();
-        }
+  var $Query;
+  var $Database;
+  var $Cells;
+
+  function GetCell($Y, $X)
+  {
+    return($this->Cells[$Y][$X]);
+  }
+
+  function BeginRead()
+  {
+    $this->Cells = array();
+    $DbResult = $this->Database->query($this->Query);
+    while($DbRow = $DbResult->fetch_row())
+    {
+      $this->Cells[] = $DbRow;
+    }
+  }
+
+  function EndRead()
+  {
+    $this->Cells = array();
+  }
 
   function RowsCount()
   {
-        return(count($this->Cells));
+    return(count($this->Cells));
   }
 }
@@ -81 +81 @@
 class TableColumn
 {
-        var $Name;
-        var $Title;
+  var $Name;
+  var $Title;
 }
 
@@ -96 +96 @@
   var $DefaultOrder;
   var $Table;
-  
+
   function __construct()
   {
-        global $System;
-        
-        $this->Columns = array();
-        $this->Table = new TableMemory();
+    global $System;
+
+    $this->Columns = array();
+    $this->Table = new TableMemory();
     $this->OrderDirSQL = array('ASC', 'DESC');
-    $this->OrderArrowImage = array($System->Link('/images/sort_asc.png'), 
+    $this->OrderArrowImage = array($System->Link('/images/sort_asc.png'),
       $System->Link('/images/sort_desc.png'));
     $this->DefaultOrder = 0;
   }
-  
+
   function SetColumns($Columns)
   {
-        $this->Columns = array();
-        foreach($Columns as $Column)
-        {
-                $NewCol = new TableColumn();
-                $NewCol->Name = $Column['Name'];
-                $NewCol->Title = $Column['Title'];
-                $this->Columns[] = $NewCol;
-        }
-        if(count($this->Columns) > 0)
-          $this->DefaultColumn = $this->Columns[0]->Name;
-          else $this->DefaultColumn = '';
+    $this->Columns = array();
+    foreach($Columns as $Column)
+    {
+      $NewCol = new TableColumn();
+      $NewCol->Name = $Column['Name'];
+      $NewCol->Title = $Column['Title'];
+      $this->Columns[] = $NewCol;
+    }
+    if(count($this->Columns) > 0)
+      $this->DefaultColumn = $this->Columns[0]->Name;
+      else $this->DefaultColumn = '';
   }
-  
+
   function Show()
   {
-          $Output = '<table class="WideTable">';
-          $Output .= $this->GetOrderHeader();
-          $this->Table->BeginRead();
-        for($Y = 0; $Y < $this->Table->RowsCount(); $Y++)
-        {
-            $Output .= '<tr>';
-            
-            for($X = 0; $X < count($this->Columns); $X++)
-            {
-                $Cell = $this->Table->GetCell($Y, $X);
-                if($Cell == '') $Output .= '<td>&nbsp;</td>'; 
-                    else $Output .= '<td>'.$Cell.'</td>';
-            }       
-            $Output .= '</tr>';
-          }
-          $this->Table->EndRead();
-          $Output .= '</table>';
+    $Output = '<table class="WideTable">';
+    $Output .= $this->GetOrderHeader();
+    $this->Table->BeginRead();
+    for($Y = 0; $Y < $this->Table->RowsCount(); $Y++)
+    {
+      $Output .= '<tr>';
+
+      for($X = 0; $X < count($this->Columns); $X++)
+      {
+        $Cell = $this->Table->GetCell($Y, $X);
+        if($Cell == '') $Output .= '<td>&nbsp;</td>';
+          else $Output .= '<td>'.$Cell.'</td>';
+      }
+      $Output .= '</tr>';
+    }
+    $this->Table->EndRead();
+    $Output .= '</table>';
     return($Output);
   }
-  
+
   function GetOrderHeader()
   {
@@ -152 +152 @@
     if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $this->DefaultColumn;
     if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $this->DefaultOrder;
-  
+
     // Check OrderCol
     $Found = false;
@@ -159 +159 @@
       if($Column->Name == $_SESSION['OrderCol'])
       {
-        $Found = true;    
+        $Found = true;
         break;
       }
@@ -169 +169 @@
     }
     // Check OrderDir
-    if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) 
+    if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1))
       $_SESSION['OrderDir'] = 0;
-  
+
     $Result = '';
     $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
@@ -178 +178 @@
       $QueryItems['OrderCol'] = $Column->Name;
       $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-      if($Column->Name == $_SESSION['OrderCol']) 
+      if($Column->Name == $_SESSION['OrderCol'])
         $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.$this->OrderArrowImage[$_SESSION['OrderDir']].'" alt="order arrow">';
         else $ArrowImage = '';
@@ -187 +187 @@
     $this->OrderColumn = $_SESSION['OrderCol'];
     $this->OrderDirection = $_SESSION['OrderDir'];
- 
+
     return($Result);
   }

trunk/Common/UTF8.php

@@ -21 +21 @@
   ISO8859-1: iso1
   Windows1257: win1257
-  
+
   example:  $new_string=to_utf8($some_string,"win1250");
 */
@@ -28 +28 @@
 /*
   translation table - actually, it's array where key is hexadecimal number of
-  character in ISO8859-2/Windows1250 and value is its two byte representation in UTF-8 
+  character in ISO8859-2/Windows1250 and value is its two byte representation in UTF-8
 */
 
-class Encoding 
+class Encoding
 {
   function __construct()
   {
-        $this->CharTable = array(
+    $this->CharTable = array(
   'iso2' => array(
-        0x80=>"\xc2\x80",
-        0x81=>"\xc2\x81",
-        0x82=>"\xc2\x82",
-        0x83=>"\xc2\x83",
-        0x84=>"\xc2\x84",
-        0x85=>"\xc2\x85",
-        0x86=>"\xc2\x86",
-        0x87=>"\xc2\x87",
-        0x88=>"\xc2\x88",
-        0x89=>"\xc2\x89",
-        0x8A=>"\xc2\x8a",
-        0x8B=>"\xc2\x8b",
-        0x8C=>"\xc2\x8c",
-        0x8D=>"\xc2\x8d",
-        0x8E=>"\xc2\x8e",
-        0x8F=>"\xc2\x8f",
-        0x90=>"\xc2\x90",
-        0x91=>"\xc2\x91",
-        0x92=>"\xc2\x92",
-        0x93=>"\xc2\x93",
-        0x94=>"\xc2\x94",
-        0x95=>"\xc2\x95",
-        0x96=>"\xc2\x96",
-        0x97=>"\xc2\x97",
-        0x98=>"\xc2\x98",
-        0x99=>"\xc2\x99",
-        0x9A=>"\xc2\x9a",
-        0x9B=>"\xc2\x9b",
-        0x9C=>"\xc2\x9c",
-        0x9D=>"\xc2\x9d",
-        0x9E=>"\xc2\x9e",
-        0x9F=>"\xc2\x9f",
-        0xA0=>"\xc2\xa0",
-        0xA1=>"\xc4\x84",
-        0xA2=>"\xcb\x98",
-        0xA3=>"\xc5\x81",
-        0xA4=>"\xc2\xa4",
-        0xA5=>"\xc4\xbd",
-        0xA6=>"\xc5\x9a",
-        0xA7=>"\xc2\xa7",
-        0xA8=>"\xc2\xa8",
-        0xA9=>"\xc5\xa0",
-        0xAA=>"\xc5\x9e",
-        0xAB=>"\xc5\xa4",
-        0xAC=>"\xc5\xb9",
-        0xAD=>"\xc2\xad",
-        0xAE=>"\xc5\xbd",
-        0xAF=>"\xc5\xbb",
-        0xB0=>"\xc2\xb0",
-        0xB1=>"\xc4\x85",
-        0xB2=>"\xcb\x9b",
-        0xB3=>"\xc5\x82",
-        0xB4=>"\xc2\xb4",
-        0xB5=>"\xc4\xbe",
-        0xB6=>"\xc5\x9b",
-        0xB7=>"\xcb\x87",
-        0xB8=>"\xc2\xb8",
-        0xB9=>"\xc5\xa1",
-        0xBA=>"\xc5\x9f",
-        0xBB=>"\xc5\xa5",
-        0xBC=>"\xc5\xba",
-        0xBD=>"\xcb\x9d",
-        0xBE=>"\xc5\xbe",
-        0xBF=>"\xc5\xbc",
-        0xC0=>"\xc5\x94",
-        0xC1=>"\xc3\x81",
-        0xC2=>"\xc3\x82",
-        0xC3=>"\xc4\x82",
-        0xC4=>"\xc3\x84",
-        0xC5=>"\xc4\xb9",
-        0xC6=>"\xc4\x86",
-        0xC7=>"\xc3\x87",
-        0xC8=>"\xc4\x8c",
-        0xC9=>"\xc3\x89",
-        0xCA=>"\xc4\x98",
-        0xCB=>"\xc3\x8b",
-        0xCC=>"\xc4\x9a",
-        0xCD=>"\xc3\x8d",
-        0xCE=>"\xc3\x8e",
-        0xCF=>"\xc4\x8e",
-        0xD0=>"\xc4\x90",
-        0xD1=>"\xc5\x83",
-        0xD2=>"\xc5\x87",
-        0xD3=>"\xc3\x93",
-        0xD4=>"\xc3\x94",
-        0xD5=>"\xc5\x90",
-        0xD6=>"\xc3\x96",
-        0xD7=>"\xc3\x97",
-        0xD8=>"\xc5\x98",
-        0xD9=>"\xc5\xae",
-        0xDA=>"\xc3\x9a",
-        0xDB=>"\xc5\xb0",
-        0xDC=>"\xc3\x9c",
-        0xDD=>"\xc3\x9d",
-        0xDE=>"\xc5\xa2",
-        0xDF=>"\xc3\x9f",
-        0xE0=>"\xc5\x95",
-        0xE1=>"\xc3\xa1",
-        0xE2=>"\xc3\xa2",
-        0xE3=>"\xc4\x83",
-        0xE4=>"\xc3\xa4",
-        0xE5=>"\xc4\xba",
-        0xE6=>"\xc4\x87",
-        0xE7=>"\xc3\xa7",
-        0xE8=>"\xc4\x8d",
-        0xE9=>"\xc3\xa9",
-        0xEA=>"\xc4\x99",
-        0xEB=>"\xc3\xab",
-        0xEC=>"\xc4\x9b",
-        0xED=>"\xc3\xad",
-        0xEE=>"\xc3\xae",
-        0xEF=>"\xc4\x8f",
-        0xF0=>"\xc4\x91",
-        0xF1=>"\xc5\x84",
-        0xF2=>"\xc5\x88",
-        0xF3=>"\xc3\xb3",
-        0xF4=>"\xc3\xb4",
-        0xF5=>"\xc5\x91",
-        0xF6=>"\xc3\xb6",
-        0xF7=>"\xc3\xb7",
-        0xF8=>"\xc5\x99",
-        0xF9=>"\xc5\xaf",
-        0xFA=>"\xc3\xba",
-        0xFB=>"\xc5\xb1",
-        0xFC=>"\xc3\xbc",
-        0xFD=>"\xc3\xbd",
-        0xFE=>"\xc5\xa3",
-        0xFF=>"\xcb\x99"
+  0x80=>"\xc2\x80",
+  0x81=>"\xc2\x81",
+  0x82=>"\xc2\x82",
+  0x83=>"\xc2\x83",
+  0x84=>"\xc2\x84",
+  0x85=>"\xc2\x85",
+  0x86=>"\xc2\x86",
+  0x87=>"\xc2\x87",
+  0x88=>"\xc2\x88",
+  0x89=>"\xc2\x89",
+  0x8A=>"\xc2\x8a",
+  0x8B=>"\xc2\x8b",
+  0x8C=>"\xc2\x8c",
+  0x8D=>"\xc2\x8d",
+  0x8E=>"\xc2\x8e",
+  0x8F=>"\xc2\x8f",
+  0x90=>"\xc2\x90",
+  0x91=>"\xc2\x91",
+  0x92=>"\xc2\x92",
+  0x93=>"\xc2\x93",
+  0x94=>"\xc2\x94",
+  0x95=>"\xc2\x95",
+  0x96=>"\xc2\x96",
+  0x97=>"\xc2\x97",
+  0x98=>"\xc2\x98",
+  0x99=>"\xc2\x99",
+  0x9A=>"\xc2\x9a",
+  0x9B=>"\xc2\x9b",
+  0x9C=>"\xc2\x9c",
+  0x9D=>"\xc2\x9d",
+  0x9E=>"\xc2\x9e",
+  0x9F=>"\xc2\x9f",
+  0xA0=>"\xc2\xa0",
+  0xA1=>"\xc4\x84",
+  0xA2=>"\xcb\x98",
+  0xA3=>"\xc5\x81",
+  0xA4=>"\xc2\xa4",
+  0xA5=>"\xc4\xbd",
+  0xA6=>"\xc5\x9a",
+  0xA7=>"\xc2\xa7",
+  0xA8=>"\xc2\xa8",
+  0xA9=>"\xc5\xa0",
+  0xAA=>"\xc5\x9e",
+  0xAB=>"\xc5\xa4",
+  0xAC=>"\xc5\xb9",
+  0xAD=>"\xc2\xad",
+  0xAE=>"\xc5\xbd",
+  0xAF=>"\xc5\xbb",
+  0xB0=>"\xc2\xb0",
+  0xB1=>"\xc4\x85",
+  0xB2=>"\xcb\x9b",
+  0xB3=>"\xc5\x82",
+  0xB4=>"\xc2\xb4",
+  0xB5=>"\xc4\xbe",
+  0xB6=>"\xc5\x9b",
+  0xB7=>"\xcb\x87",
+  0xB8=>"\xc2\xb8",
+  0xB9=>"\xc5\xa1",
+  0xBA=>"\xc5\x9f",
+  0xBB=>"\xc5\xa5",
+  0xBC=>"\xc5\xba",
+  0xBD=>"\xcb\x9d",
+  0xBE=>"\xc5\xbe",
+  0xBF=>"\xc5\xbc",
+  0xC0=>"\xc5\x94",
+  0xC1=>"\xc3\x81",
+  0xC2=>"\xc3\x82",
+  0xC3=>"\xc4\x82",
+  0xC4=>"\xc3\x84",
+  0xC5=>"\xc4\xb9",
+  0xC6=>"\xc4\x86",
+  0xC7=>"\xc3\x87",
+  0xC8=>"\xc4\x8c",
+  0xC9=>"\xc3\x89",
+  0xCA=>"\xc4\x98",
+  0xCB=>"\xc3\x8b",
+  0xCC=>"\xc4\x9a",
+  0xCD=>"\xc3\x8d",
+  0xCE=>"\xc3\x8e",
+  0xCF=>"\xc4\x8e",
+  0xD0=>"\xc4\x90",
+  0xD1=>"\xc5\x83",
+  0xD2=>"\xc5\x87",
+  0xD3=>"\xc3\x93",
+  0xD4=>"\xc3\x94",
+  0xD5=>"\xc5\x90",
+  0xD6=>"\xc3\x96",
+  0xD7=>"\xc3\x97",
+  0xD8=>"\xc5\x98",
+  0xD9=>"\xc5\xae",
+  0xDA=>"\xc3\x9a",
+  0xDB=>"\xc5\xb0",
+  0xDC=>"\xc3\x9c",
+  0xDD=>"\xc3\x9d",
+  0xDE=>"\xc5\xa2",
+  0xDF=>"\xc3\x9f",
+  0xE0=>"\xc5\x95",
+  0xE1=>"\xc3\xa1",
+  0xE2=>"\xc3\xa2",
+  0xE3=>"\xc4\x83",
+  0xE4=>"\xc3\xa4",
+  0xE5=>"\xc4\xba",
+  0xE6=>"\xc4\x87",
+  0xE7=>"\xc3\xa7",
+  0xE8=>"\xc4\x8d",
+  0xE9=>"\xc3\xa9",
+  0xEA=>"\xc4\x99",
+  0xEB=>"\xc3\xab",
+  0xEC=>"\xc4\x9b",
+  0xED=>"\xc3\xad",
+  0xEE=>"\xc3\xae",
+  0xEF=>"\xc4\x8f",
+  0xF0=>"\xc4\x91",
+  0xF1=>"\xc5\x84",
+  0xF2=>"\xc5\x88",
+  0xF3=>"\xc3\xb3",
+  0xF4=>"\xc3\xb4",
+  0xF5=>"\xc5\x91",
+  0xF6=>"\xc3\xb6",
+  0xF7=>"\xc3\xb7",
+  0xF8=>"\xc5\x99",
+  0xF9=>"\xc5\xaf",
+  0xFA=>"\xc3\xba",
+  0xFB=>"\xc5\xb1",
+  0xFC=>"\xc3\xbc",
+  0xFD=>"\xc3\xbd",
+  0xFE=>"\xc5\xa3",
+  0xFF=>"\xcb\x99"
   ),
   'win1250' => array(
-        0x80=>"\xc2\x80",
-        0x81=>"\xc2\x81",
-        0x82=>"\xe2\x80\x9a",
-        0x83=>"\xc2\x83",
-        0x84=>"\xe2\x80\x9e",
-        0x85=>"\xe2\x80\xa6",
-        0x86=>"\xe2\x80\xa0",
-        0x87=>"\xe2\x80\xa1",
-        0x88=>"\xc2\x88",
-        0x89=>"\xe2\x80\xb0",
-        0x8a=>"\xc5\xa0",
-        0x8b=>"\xe2\x80\xb9",
-        0x8c=>"\xc5\x9a",
-        0x8d=>"\xc5\xa4",
-        0x8e=>"\xc5\xbd",
-        0x8f=>"\xc5\xb9",
-        0x90=>"\xc2\x90",
-        0x91=>"\xe2\x80\x98",
-        0x92=>"\xe2\x80\x99",
-        0x93=>"\xe2\x80\x9c",
-        0x94=>"\xe2\x80\x9d",
-        0x95=>"\xe2\x80\xa2",
-        0x96=>"\xe2\x80\x93",
-        0x97=>"\xe2\x80\x94",
-        0x98=>"\xe2\x80\x98",
-        0x99=>"\xe2\x84\xa2",
-        0x9a=>"\xc5\xa1",
-        0x9b=>"\xe2\x80\xba",
-        0x9c=>"\xc5\x9b",
-        0x9d=>"\xc5\xa5",
-        0x9e=>"\xc5\xbe",
-        0x9f=>"\xc5\xba",
-        0xa0=>"\xc2\xa0",
-        0xa1=>"\xcb\x87",
-        0xa2=>"\xcb\x98",
-        0xa3=>"\xc5\x81",
-        0xa4=>"\xc2\xa4",
-        0xa5=>"\xc4\x84",
-        0xa6=>"\xc2\xa6",
-        0xa7=>"\xc2\xa7",
-        0xa8=>"\xc2\xa8",
-        0xa9=>"\xc2\xa9",
-        0xaa=>"\xc5\x9e",
-        0xab=>"\xc2\xab",
-        0xac=>"\xc2\xac",
-        0xad=>"\xc2\xad",
-        0xae=>"\xc2\xae",
-        0xaf=>"\xc5\xbb",
-        0xb0=>"\xc2\xb0",
-        0xb1=>"\xc2\xb1",
-        0xb2=>"\xcb\x9b",
-        0xb3=>"\xc5\x82",
-        0xb4=>"\xc2\xb4",
-        0xb5=>"\xc2\xb5",
-        0xb6=>"\xc2\xb6",
-        0xb7=>"\xc2\xb7",
-        0xb8=>"\xc2\xb8",
-        0xb9=>"\xc4\x85",
-        0xba=>"\xc5\x9f",
-        0xbb=>"\xc2\xbb",
-        0xbc=>"\xc4\xbd",
-        0xbd=>"\xcb\x9d",
-        0xbe=>"\xc4\xbe",
-        0xbf=>"\xc5\xbc",
-        0xc0=>"\xc5\x94",
-        0xc1=>"\xc3\x81",
-        0xc2=>"\xc3\x82",
-        0xc3=>"\xc4\x82",
-        0xc4=>"\xc3\x84",
-        0xc5=>"\xc4\xb9",
-        0xc6=>"\xc4\x86",
-        0xc7=>"\xc3\x87",
-        0xc8=>"\xc4\x8c",
-        0xc9=>"\xc3\x89",
-        0xca=>"\xc4\x98",
-        0xcb=>"\xc3\x8b",
-        0xcc=>"\xc4\x9a",
-        0xcd=>"\xc3\x8d",
-        0xce=>"\xc3\x8e",
-        0xcf=>"\xc4\x8e",
-        0xd0=>"\xc4\x90",
-        0xd1=>"\xc5\x83",
-        0xd2=>"\xc5\x87",
-        0xd3=>"\xc3\x93",
-        0xd4=>"\xc3\x94",
-        0xd5=>"\xc5\x90",
-        0xd6=>"\xc3\x96",
-        0xd7=>"\xc3\x97",
-        0xd8=>"\xc5\x98",
-        0xd9=>"\xc5\xae",
-        0xda=>"\xc3\x9a",
-        0xdb=>"\xc5\xb0",
-        0xdc=>"\xc3\x9c",
-        0xdd=>"\xc3\x9d",
-        0xde=>"\xc5\xa2",
-        0xdf=>"\xc3\x9f",
-        0xe0=>"\xc5\x95",
-        0xe1=>"\xc3\xa1",
-        0xe2=>"\xc3\xa2",
-        0xe3=>"\xc4\x83",
-        0xe4=>"\xc3\xa4",
-        0xe5=>"\xc4\xba",
-        0xe6=>"\xc4\x87",
-        0xe7=>"\xc3\xa7",
-        0xe8=>"\xc4\x8d",
-        0xe9=>"\xc3\xa9",
-        0xea=>"\xc4\x99",
-        0xeb=>"\xc3\xab",
-        0xec=>"\xc4\x9b",
-        0xed=>"\xc3\xad",
-        0xee=>"\xc3\xae",
-        0xef=>"\xc4\x8f",
-        0xf0=>"\xc4\x91",
-        0xf1=>"\xc5\x84",
-        0xf2=>"\xc5\x88",
-        0xf3=>"\xc3\xb3",
-        0xf4=>"\xc3\xb4",
-        0xf5=>"\xc5\x91",
-        0xf6=>"\xc3\xb6",
-        0xf7=>"\xc3\xb7",
-        0xf8=>"\xc5\x99",
-        0xf9=>"\xc5\xaf",
-        0xfa=>"\xc3\xba",
-        0xfb=>"\xc5\xb1",
-        0xfc=>"\xc3\xbc",
-        0xfd=>"\xc3\xbd",
-        0xfe=>"\xc5\xa3",
-        0xff=>"\xcb\x99"
+  0x80=>"\xc2\x80",
+  0x81=>"\xc2\x81",
+  0x82=>"\xe2\x80\x9a",
+  0x83=>"\xc2\x83",
+  0x84=>"\xe2\x80\x9e",
+  0x85=>"\xe2\x80\xa6",
+  0x86=>"\xe2\x80\xa0",
+  0x87=>"\xe2\x80\xa1",
+  0x88=>"\xc2\x88",
+  0x89=>"\xe2\x80\xb0",
+  0x8a=>"\xc5\xa0",
+  0x8b=>"\xe2\x80\xb9",
+  0x8c=>"\xc5\x9a",
+  0x8d=>"\xc5\xa4",
+  0x8e=>"\xc5\xbd",
+  0x8f=>"\xc5\xb9",
+  0x90=>"\xc2\x90",
+  0x91=>"\xe2\x80\x98",
+  0x92=>"\xe2\x80\x99",
+  0x93=>"\xe2\x80\x9c",
+  0x94=>"\xe2\x80\x9d",
+  0x95=>"\xe2\x80\xa2",
+  0x96=>"\xe2\x80\x93",
+  0x97=>"\xe2\x80\x94",
+  0x98=>"\xe2\x80\x98",
+  0x99=>"\xe2\x84\xa2",
+  0x9a=>"\xc5\xa1",
+  0x9b=>"\xe2\x80\xba",
+  0x9c=>"\xc5\x9b",
+  0x9d=>"\xc5\xa5",
+  0x9e=>"\xc5\xbe",
+  0x9f=>"\xc5\xba",
+  0xa0=>"\xc2\xa0",
+  0xa1=>"\xcb\x87",
+  0xa2=>"\xcb\x98",
+  0xa3=>"\xc5\x81",
+  0xa4=>"\xc2\xa4",
+  0xa5=>"\xc4\x84",
+  0xa6=>"\xc2\xa6",
+  0xa7=>"\xc2\xa7",
+  0xa8=>"\xc2\xa8",
+  0xa9=>"\xc2\xa9",
+  0xaa=>"\xc5\x9e",
+  0xab=>"\xc2\xab",
+  0xac=>"\xc2\xac",
+  0xad=>"\xc2\xad",
+  0xae=>"\xc2\xae",
+  0xaf=>"\xc5\xbb",
+  0xb0=>"\xc2\xb0",
+  0xb1=>"\xc2\xb1",
+  0xb2=>"\xcb\x9b",
+  0xb3=>"\xc5\x82",
+  0xb4=>"\xc2\xb4",
+  0xb5=>"\xc2\xb5",
+  0xb6=>"\xc2\xb6",
+  0xb7=>"\xc2\xb7",
+  0xb8=>"\xc2\xb8",
+  0xb9=>"\xc4\x85",
+  0xba=>"\xc5\x9f",
+  0xbb=>"\xc2\xbb",
+  0xbc=>"\xc4\xbd",
+  0xbd=>"\xcb\x9d",
+  0xbe=>"\xc4\xbe",
+  0xbf=>"\xc5\xbc",
+  0xc0=>"\xc5\x94",
+  0xc1=>"\xc3\x81",
+  0xc2=>"\xc3\x82",
+  0xc3=>"\xc4\x82",
+  0xc4=>"\xc3\x84",
+  0xc5=>"\xc4\xb9",
+  0xc6=>"\xc4\x86",
+  0xc7=>"\xc3\x87",
+  0xc8=>"\xc4\x8c",
+  0xc9=>"\xc3\x89",
+  0xca=>"\xc4\x98",
+  0xcb=>"\xc3\x8b",
+  0xcc=>"\xc4\x9a",
+  0xcd=>"\xc3\x8d",
+  0xce=>"\xc3\x8e",
+  0xcf=>"\xc4\x8e",
+  0xd0=>"\xc4\x90",
+  0xd1=>"\xc5\x83",
+  0xd2=>"\xc5\x87",
+  0xd3=>"\xc3\x93",
+  0xd4=>"\xc3\x94",
+  0xd5=>"\xc5\x90",
+  0xd6=>"\xc3\x96",
+  0xd7=>"\xc3\x97",
+  0xd8=>"\xc5\x98",
+  0xd9=>"\xc5\xae",
+  0xda=>"\xc3\x9a",
+  0xdb=>"\xc5\xb0",
+  0xdc=>"\xc3\x9c",
+  0xdd=>"\xc3\x9d",
+  0xde=>"\xc5\xa2",
+  0xdf=>"\xc3\x9f",
+  0xe0=>"\xc5\x95",
+  0xe1=>"\xc3\xa1",
+  0xe2=>"\xc3\xa2",
+  0xe3=>"\xc4\x83",
+  0xe4=>"\xc3\xa4",
+  0xe5=>"\xc4\xba",
+  0xe6=>"\xc4\x87",
+  0xe7=>"\xc3\xa7",
+  0xe8=>"\xc4\x8d",
+  0xe9=>"\xc3\xa9",
+  0xea=>"\xc4\x99",
+  0xeb=>"\xc3\xab",
+  0xec=>"\xc4\x9b",
+  0xed=>"\xc3\xad",
+  0xee=>"\xc3\xae",
+  0xef=>"\xc4\x8f",
+  0xf0=>"\xc4\x91",
+  0xf1=>"\xc5\x84",
+  0xf2=>"\xc5\x88",
+  0xf3=>"\xc3\xb3",
+  0xf4=>"\xc3\xb4",
+  0xf5=>"\xc5\x91",
+  0xf6=>"\xc3\xb6",
+  0xf7=>"\xc3\xb7",
+  0xf8=>"\xc5\x99",
+  0xf9=>"\xc5\xaf",
+  0xfa=>"\xc3\xba",
+  0xfb=>"\xc5\xb1",
+  0xfc=>"\xc3\xbc",
+  0xfd=>"\xc3\xbd",
+  0xfe=>"\xc5\xa3",
+  0xff=>"\xcb\x99"
   ),
   'iso1' => array(
-        0xA0=>"\xc2\xa0",
-        0xA1=>"\xc2\xa1",
-        0xA2=>"\xc2\xa2",
-        0xA3=>"\xc2\xa3",
-        0xA4=>"\xc2\xa4",
-        0xA5=>"\xc2\xa5",
-        0xA6=>"\xc2\xa6",
-        0xA7=>"\xc2\xa7",
-        0xA8=>"\xc2\xa8",
-        0xA9=>"\xc2\xa9",
-        0xAA=>"\xc2\xaa",
-        0xAB=>"\xc2\xab",
-        0xAC=>"\xc2\xac",
-        0xAD=>"\xc2\xad",
-        0xAE=>"\xc2\xae",
-        0xAF=>"\xc2\xaf",
-        0xB0=>"\xc2\xb0",
-        0xB1=>"\xc2\xb1",
-        0xB2=>"\xc2\xb2",
-        0xB3=>"\xc2\xb3",
-        0xB4=>"\xc2\xb4",
-        0xB5=>"\xc2\xb5",
-        0xB6=>"\xc2\xb6",
-        0xB7=>"\xc2\xb7",
-        0xB8=>"\xc2\xb8",
-        0xB9=>"\xc2\xb9",
-        0xBA=>"\xc2\xba",
-        0xBB=>"\xc2\xbb",
-        0xBC=>"\xc2\xbc",
-        0xBD=>"\xc2\xbd",
-        0xBE=>"\xc2\xbe",
-        0xBF=>"\xc2\xbf",
-        0xC0=>"\xc3\x80",
-        0xC1=>"\xc3\x81",
-        0xC2=>"\xc3\x82",
-        0xC3=>"\xc3\x83",
-        0xC4=>"\xc3\x84",
-        0xC5=>"\xc3\x85",
-        0xC6=>"\xc3\x86",
-        0xC7=>"\xc3\x87",
-        0xC8=>"\xc3\x88",
-        0xC9=>"\xc3\x89",
-        0xCA=>"\xc3\x8a",
-        0xCB=>"\xc3\x8b",
-        0xCC=>"\xc3\x8c",
-        0xCD=>"\xc3\x8d",
-        0xCE=>"\xc3\x8e",
-        0xCF=>"\xc3\x8f",
-        0xD0=>"\xc3\x90",
-        0xD1=>"\xc3\x91",
-        0xD2=>"\xc3\x92",
-        0xD3=>"\xc3\x93",
-        0xD4=>"\xc3\x94",
-        0xD5=>"\xc3\x95",
-        0xD6=>"\xc3\x96",
-        0xD7=>"\xc3\x97",
-        0xD8=>"\xc3\x98",
-        0xD9=>"\xc3\x99",
-        0xDA=>"\xc3\x9a",
-        0xDB=>"\xc3\x9b",
-        0xDC=>"\xc3\x9c",
-        0xDD=>"\xc3\x9d",
-        0xDE=>"\xc3\x9e",
-        0xDF=>"\xc3\x9f",
-        0xE0=>"\xc3\xa0",
-        0xE1=>"\xc3\xa1",
-        0xE2=>"\xc3\xa2",
-        0xE3=>"\xc3\xa3",
-        0xE4=>"\xc3\xa4",
-        0xE5=>"\xc3\xa5",
-        0xE6=>"\xc3\xa6",
-        0xE7=>"\xc3\xa7",
-        0xE8=>"\xc3\xa8",
-        0xE9=>"\xc3\xa9",
-        0xEA=>"\xc3\xaa",
-        0xEB=>"\xc3\xab",
-        0xEC=>"\xc3\xac",
-        0xED=>"\xc3\xad",
-        0xEE=>"\xc3\xae",
-        0xEF=>"\xc3\xaf",
-        0xF0=>"\xc3\xb0",
-        0xF1=>"\xc3\xb1",
-        0xF2=>"\xc3\xb2",
-        0xF3=>"\xc3\xb3",
-        0xF4=>"\xc3\xb4",
-        0xF5=>"\xc3\xb5",
-        0xF6=>"\xc3\xb6",
-        0xF7=>"\xc3\xb7",
-        0xF8=>"\xc3\xb8",
-        0xF9=>"\xc3\xb9",
-        0xFA=>"\xc3\xba",
-        0xFB=>"\xc3\xbb",
-        0xFC=>"\xc3\xbc",
-        0xFD=>"\xc3\xbd",
-        0xFE=>"\xc3\xbe"
+  0xA0=>"\xc2\xa0",
+  0xA1=>"\xc2\xa1",
+  0xA2=>"\xc2\xa2",
+  0xA3=>"\xc2\xa3",
+  0xA4=>"\xc2\xa4",
+  0xA5=>"\xc2\xa5",
+  0xA6=>"\xc2\xa6",
+  0xA7=>"\xc2\xa7",
+  0xA8=>"\xc2\xa8",
+  0xA9=>"\xc2\xa9",
+  0xAA=>"\xc2\xaa",
+  0xAB=>"\xc2\xab",
+  0xAC=>"\xc2\xac",
+  0xAD=>"\xc2\xad",
+  0xAE=>"\xc2\xae",
+  0xAF=>"\xc2\xaf",
+  0xB0=>"\xc2\xb0",
+  0xB1=>"\xc2\xb1",
+  0xB2=>"\xc2\xb2",
+  0xB3=>"\xc2\xb3",
+  0xB4=>"\xc2\xb4",
+  0xB5=>"\xc2\xb5",
+  0xB6=>"\xc2\xb6",
+  0xB7=>"\xc2\xb7",
+  0xB8=>"\xc2\xb8",
+  0xB9=>"\xc2\xb9",
+  0xBA=>"\xc2\xba",
+  0xBB=>"\xc2\xbb",
+  0xBC=>"\xc2\xbc",
+  0xBD=>"\xc2\xbd",
+  0xBE=>"\xc2\xbe",
+  0xBF=>"\xc2\xbf",
+  0xC0=>"\xc3\x80",
+  0xC1=>"\xc3\x81",
+  0xC2=>"\xc3\x82",
+  0xC3=>"\xc3\x83",
+  0xC4=>"\xc3\x84",
+  0xC5=>"\xc3\x85",
+  0xC6=>"\xc3\x86",
+  0xC7=>"\xc3\x87",
+  0xC8=>"\xc3\x88",
+  0xC9=>"\xc3\x89",
+  0xCA=>"\xc3\x8a",
+  0xCB=>"\xc3\x8b",
+  0xCC=>"\xc3\x8c",
+  0xCD=>"\xc3\x8d",
+  0xCE=>"\xc3\x8e",
+  0xCF=>"\xc3\x8f",
+  0xD0=>"\xc3\x90",
+  0xD1=>"\xc3\x91",
+  0xD2=>"\xc3\x92",
+  0xD3=>"\xc3\x93",
+  0xD4=>"\xc3\x94",
+  0xD5=>"\xc3\x95",
+  0xD6=>"\xc3\x96",
+  0xD7=>"\xc3\x97",
+  0xD8=>"\xc3\x98",
+  0xD9=>"\xc3\x99",
+  0xDA=>"\xc3\x9a",
+  0xDB=>"\xc3\x9b",
+  0xDC=>"\xc3\x9c",
+  0xDD=>"\xc3\x9d",
+  0xDE=>"\xc3\x9e",
+  0xDF=>"\xc3\x9f",
+  0xE0=>"\xc3\xa0",
+  0xE1=>"\xc3\xa1",
+  0xE2=>"\xc3\xa2",
+  0xE3=>"\xc3\xa3",
+  0xE4=>"\xc3\xa4",
+  0xE5=>"\xc3\xa5",
+  0xE6=>"\xc3\xa6",
+  0xE7=>"\xc3\xa7",
+  0xE8=>"\xc3\xa8",
+  0xE9=>"\xc3\xa9",
+  0xEA=>"\xc3\xaa",
+  0xEB=>"\xc3\xab",
+  0xEC=>"\xc3\xac",
+  0xED=>"\xc3\xad",
+  0xEE=>"\xc3\xae",
+  0xEF=>"\xc3\xaf",
+  0xF0=>"\xc3\xb0",
+  0xF1=>"\xc3\xb1",
+  0xF2=>"\xc3\xb2",
+  0xF3=>"\xc3\xb3",
+  0xF4=>"\xc3\xb4",
+  0xF5=>"\xc3\xb5",
+  0xF6=>"\xc3\xb6",
+  0xF7=>"\xc3\xb7",
+  0xF8=>"\xc3\xb8",
+  0xF9=>"\xc3\xb9",
+  0xFA=>"\xc3\xba",
+  0xFB=>"\xc3\xbb",
+  0xFC=>"\xc3\xbc",
+  0xFD=>"\xc3\xbd",
+  0xFE=>"\xc3\xbe"
   ),
   'win1257' => array(
-        0x80=>"\xe2\x82\xac",
-        0x81=>"\xc0\x4",
-        0x82=>"\xe2\x80\x9a",
-        0x83=>"\xc0\x4",
-        0x84=>"\xe2\x80\x9e",
-        0x85=>"\xe2\x80\xa6",
-        0x86=>"\xe2\x80\xa0",
-        0x87=>"\xe2\x80\xa1",
-        0x88=>"\xc0\x4",
-        0x89=>"\xe2\x80\xb0",
-        0x8A=>"\xc0\x4",
-        0x8B=>"\xe2\x80\xb9",
-        0x8C=>"\xc0\x4",
-        0x8D=>"\xc2\xa8",
-        0x8E=>"\xcb\x87",
-        0x8F=>"\xc2\xb8",
-        0x90=>"\xc0\x4",
-        0x91=>"\xe2\x80\x98",
-        0x92=>"\xe2\x80\x99",
-        0x93=>"\xe2\x80\x9c",
-        0x94=>"\xe2\x80\x9d",
-        0x95=>"\xe2\x80\xa2",
-        0x96=>"\xe2\x80\x93",
-        0x97=>"\xe2\x80\x94",
-        0x98=>"\xc0\x4",
-        0x99=>"\xe2\x84\xa2",
-        0x9A=>"\xc0\x4",
-        0x9B=>"\xe2\x80\xba",
-        0x9C=>"\xc0\x4",
-        0x9D=>"\xc2\xaf",
-        0x9E=>"\xcb\x9b",
-        0x9F=>"\xc0\x4",
-        0xA0=>"\xc2\xa0",
-        0xA1=>"\xc0\x4",
-        0xA2=>"\xc2\xa2",
-        0xA3=>"\xc2\xa3",
-        0xA4=>"\xc2\xa4",
-        0xA5=>"\xc0\x4",
-        0xA6=>"\xc2\xa6",
-        0xA7=>"\xc2\xa7",
-        0xA8=>"\xc3\x98",
-        0xA9=>"\xc2\xa9",
-        0xAA=>"\xc5\x96",
-        0xAB=>"\xc2\xab",
-        0xAC=>"\xc2\xac",
-        0xAD=>"\xc2\xad",
-        0xAE=>"\xc2\xae",
-        0xAF=>"\xc3\x86",
-        0xB0=>"\xc2\xb0",
-        0xB1=>"\xc2\xb1",
-        0xB2=>"\xc2\xb2",
-        0xB3=>"\xc2\xb3",
-        0xB4=>"\xc2\xb4",
-        0xB5=>"\xc2\xb5",
-        0xB6=>"\xc2\xb6",
-        0xB7=>"\xc2\xb7",
-        0xB8=>"\xc3\xb8",
-        0xB9=>"\xc2\xb9",
-        0xBA=>"\xc5\x97",
-        0xBB=>"\xc2\xbb",
-        0xBC=>"\xc2\xbc",
-        0xBD=>"\xc2\xbd",
-        0xBE=>"\xc2\xbe",
-        0xBF=>"\xc3\xa6",
-        0xC0=>"\xc4\x84",
-        0xC1=>"\xc4\xae",
-        0xC2=>"\xc4\x80",
-        0xC3=>"\xc4\x86",
-        0xC4=>"\xc3\x84",
-        0xC5=>"\xc3\x85",
-        0xC6=>"\xc4\x98",
-        0xC7=>"\xc4\x92",
-        0xC8=>"\xc4\x8c",
-        0xC9=>"\xc3\x89",
-        0xCA=>"\xc5\xb9",
-        0xCB=>"\xc4\x96",
-        0xCC=>"\xc4\xa2",
-        0xCD=>"\xc4\xb6",
-        0xCE=>"\xc4\xaa",
-        0xCF=>"\xc4\xbb",
-        0xD0=>"\xc5\xa0",
-        0xD1=>"\xc5\x83",
-        0xD2=>"\xc5\x85",
-        0xD3=>"\xc3\x93",
-        0xD4=>"\xc5\x8c",
-        0xD5=>"\xc3\x95",
-        0xD6=>"\xc3\x96",
-        0xD7=>"\xc3\x97",
-        0xD8=>"\xc5\xb2",
-        0xD9=>"\xc5\x81",
-        0xDA=>"\xc5\x9a",
-        0xDB=>"\xc5\xaa",
-        0xDC=>"\xc3\x9c",
-        0xDD=>"\xc5\xbb",
-        0xDE=>"\xc5\xbd",
-        0xDF=>"\xc3\x9f",
-        0xE0=>"\xc4\x85",
-        0xE1=>"\xc4\xaf",
-        0xE2=>"\xc4\x81",
-        0xE3=>"\xc4\x87",
-        0xE4=>"\xc3\xa4",
-        0xE5=>"\xc3\xa5",
-        0xE6=>"\xc4\x99",
-        0xE7=>"\xc4\x93",
-        0xE8=>"\xc4\x8d",
-        0xE9=>"\xc3\xa9",
-        0xEA=>"\xc5\xba",
-        0xEB=>"\xc4\x97",
-        0xEC=>"\xc4\xa3",
-        0xED=>"\xc4\xb7",
-        0xEE=>"\xc4\xab",
-        0xEF=>"\xc4\xbc",
-        0xF0=>"\xc5\xa1",
-        0xF1=>"\xc5\x84",
-        0xF2=>"\xc5\x86",
-        0xF3=>"\xc3\xb3",
-        0xF4=>"\xc5\x8d",
-        0xF5=>"\xc3\xb5",
-        0xF6=>"\xc3\xb6",
-        0xF7=>"\xc3\xb7",
-        0xF8=>"\xc5\xb3",
-        0xF9=>"\xc5\x82",
-        0xFA=>"\xc5\x9b",
-        0xFB=>"\xc5\xab",
-        0xFC=>"\xc3\xbc",
-        0xFD=>"\xc5\xbc",
-        0xFE=>"\xc5\xbe",
-        0xFF=>"\xcb\x99"
+  0x80=>"\xe2\x82\xac",
+  0x81=>"\xc0\x4",
+  0x82=>"\xe2\x80\x9a",
+  0x83=>"\xc0\x4",
+  0x84=>"\xe2\x80\x9e",
+  0x85=>"\xe2\x80\xa6",
+  0x86=>"\xe2\x80\xa0",
+  0x87=>"\xe2\x80\xa1",
+  0x88=>"\xc0\x4",
+  0x89=>"\xe2\x80\xb0",
+  0x8A=>"\xc0\x4",
+  0x8B=>"\xe2\x80\xb9",
+  0x8C=>"\xc0\x4",
+  0x8D=>"\xc2\xa8",
+  0x8E=>"\xcb\x87",
+  0x8F=>"\xc2\xb8",
+  0x90=>"\xc0\x4",
+  0x91=>"\xe2\x80\x98",
+  0x92=>"\xe2\x80\x99",
+  0x93=>"\xe2\x80\x9c",
+  0x94=>"\xe2\x80\x9d",
+  0x95=>"\xe2\x80\xa2",
+  0x96=>"\xe2\x80\x93",
+  0x97=>"\xe2\x80\x94",
+  0x98=>"\xc0\x4",
+  0x99=>"\xe2\x84\xa2",
+  0x9A=>"\xc0\x4",
+  0x9B=>"\xe2\x80\xba",
+  0x9C=>"\xc0\x4",
+  0x9D=>"\xc2\xaf",
+  0x9E=>"\xcb\x9b",
+  0x9F=>"\xc0\x4",
+  0xA0=>"\xc2\xa0",
+  0xA1=>"\xc0\x4",
+  0xA2=>"\xc2\xa2",
+  0xA3=>"\xc2\xa3",
+  0xA4=>"\xc2\xa4",
+  0xA5=>"\xc0\x4",
+  0xA6=>"\xc2\xa6",
+  0xA7=>"\xc2\xa7",
+  0xA8=>"\xc3\x98",
+  0xA9=>"\xc2\xa9",
+  0xAA=>"\xc5\x96",
+  0xAB=>"\xc2\xab",
+  0xAC=>"\xc2\xac",
+  0xAD=>"\xc2\xad",
+  0xAE=>"\xc2\xae",
+  0xAF=>"\xc3\x86",
+  0xB0=>"\xc2\xb0",
+  0xB1=>"\xc2\xb1",
+  0xB2=>"\xc2\xb2",
+  0xB3=>"\xc2\xb3",
+  0xB4=>"\xc2\xb4",
+  0xB5=>"\xc2\xb5",
+  0xB6=>"\xc2\xb6",
+  0xB7=>"\xc2\xb7",
+  0xB8=>"\xc3\xb8",
+  0xB9=>"\xc2\xb9",
+  0xBA=>"\xc5\x97",
+  0xBB=>"\xc2\xbb",
+  0xBC=>"\xc2\xbc",
+  0xBD=>"\xc2\xbd",
+  0xBE=>"\xc2\xbe",
+  0xBF=>"\xc3\xa6",
+  0xC0=>"\xc4\x84",
+  0xC1=>"\xc4\xae",
+  0xC2=>"\xc4\x80",
+  0xC3=>"\xc4\x86",
+  0xC4=>"\xc3\x84",
+  0xC5=>"\xc3\x85",
+  0xC6=>"\xc4\x98",
+  0xC7=>"\xc4\x92",
+  0xC8=>"\xc4\x8c",
+  0xC9=>"\xc3\x89",
+  0xCA=>"\xc5\xb9",
+  0xCB=>"\xc4\x96",
+  0xCC=>"\xc4\xa2",
+  0xCD=>"\xc4\xb6",
+  0xCE=>"\xc4\xaa",
+  0xCF=>"\xc4\xbb",
+  0xD0=>"\xc5\xa0",
+  0xD1=>"\xc5\x83",
+  0xD2=>"\xc5\x85",
+  0xD3=>"\xc3\x93",
+  0xD4=>"\xc5\x8c",
+  0xD5=>"\xc3\x95",
+  0xD6=>"\xc3\x96",
+  0xD7=>"\xc3\x97",
+  0xD8=>"\xc5\xb2",
+  0xD9=>"\xc5\x81",
+  0xDA=>"\xc5\x9a",
+  0xDB=>"\xc5\xaa",
+  0xDC=>"\xc3\x9c",
+  0xDD=>"\xc5\xbb",
+  0xDE=>"\xc5\xbd",
+  0xDF=>"\xc3\x9f",
+  0xE0=>"\xc4\x85",
+  0xE1=>"\xc4\xaf",
+  0xE2=>"\xc4\x81",
+  0xE3=>"\xc4\x87",
+  0xE4=>"\xc3\xa4",
+  0xE5=>"\xc3\xa5",
+  0xE6=>"\xc4\x99",
+  0xE7=>"\xc4\x93",
+  0xE8=>"\xc4\x8d",
+  0xE9=>"\xc3\xa9",
+  0xEA=>"\xc5\xba",
+  0xEB=>"\xc4\x97",
+  0xEC=>"\xc4\xa3",
+  0xED=>"\xc4\xb7",
+  0xEE=>"\xc4\xab",
+  0xEF=>"\xc4\xbc",
+  0xF0=>"\xc5\xa1",
+  0xF1=>"\xc5\x84",
+  0xF2=>"\xc5\x86",
+  0xF3=>"\xc3\xb3",
+  0xF4=>"\xc5\x8d",
+  0xF5=>"\xc3\xb5",
+  0xF6=>"\xc3\xb6",
+  0xF7=>"\xc3\xb7",
+  0xF8=>"\xc5\xb3",
+  0xF9=>"\xc5\x82",
+  0xFA=>"\xc5\x9b",
+  0xFB=>"\xc5\xab",
+  0xFC=>"\xc3\xbc",
+  0xFD=>"\xc5\xbc",
+  0xFE=>"\xc5\xbe",
+  0xFF=>"\xcb\x99"
   ),
 );
@@ -529 +529 @@
   {
     $Result = '';
-    for($I = 0; $I < strlen($String); $I++) 
+    for($I = 0; $I < strlen($String); $I++)
     {
        if(ord($String[$I]) < 128) $Result .= $String[$I];

trunk/Common/VCL/Database.php

@@ -58 +58 @@
       if(method_exists($this->OnRowDraw[0], $this->OnRowDraw[1]))
         $DbRow = call_user_func($this->OnRowDraw, $DbRow);
-        $this->Rows[] = $DbRow;
+      $this->Rows[] = $DbRow;
       $VisibleItemCount = $VisibleItemCount + 1;
     }