Changeset 871 for trunk

Timestamp:

Apr 6, 2020, 9:19:50 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Show DateTime form field type with null value as unchecked checkbox.
• Fixed: Add form action error for fields with default null value.
• Added: Show Service form field NetworkSubnet.
• Modified: Code formatting.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Form.php (modified) (4 diffs)
• Common/Form/Types/DateTime.php (modified) (8 diffs)
• Modules/Customer/Customer.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (46 diffs)
• Modules/Network/Network.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 870; // Subversion revision
+$Revision = 871; // Subversion revision
 $DatabaseRevision = 870; // SQL structure revision
-$ReleaseTime = strtotime('2020-04-03');
+$ReleaseTime = strtotime('2020-04-06');

trunk/Common/Form/Form.php

@@ -43 +43 @@
   function LoadDefaults()
   {
-    foreach($this->Definition['Items'] as $Index => $Item)
-    if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
-    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
-    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
-    {
-      if(!array_key_exists($Index, $this->Values) and isset($Item['Default']))
-        $this->Values[$Index] = $Item['Default'];
+    foreach ($this->Definition['Items'] as $Index => $Item)
+    {
+      if (!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
+      (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
+      ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+      {
+        if (!array_key_exists($Index, $this->Values))
+          $this->Values[$Index] = $Item['Default'];
+      }
     }
   }
@@ -128 +130 @@
       'Rows' => array(),
     );
-    if($Context != '') $Context = $Context.'-';
-    foreach($this->Definition['Items'] as $Index => $Item)
-    {
-      if(!array_key_exists('ReadOnly', $Item)) $Item['ReadOnly'] = false;
-    if($Item['ReadOnly'] == false)
-    if(!array_key_exists('Hidden', $Item) or ($Item['Hidden'] == false))
-    if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
-    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
-    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
-    {
+    if ($Context != '') $Context = $Context.'-';
+    foreach ($this->Definition['Items'] as $Index => $Item)
+    {
+      if (!array_key_exists('ReadOnly', $Item)) $Item['ReadOnly'] = false;
+      if ($Item['ReadOnly'] == false)
+      if (!array_key_exists('Hidden', $Item) or ($Item['Hidden'] == false))
+      if (!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
+      (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
+      ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+      {
         $Parameters = array('Value' => $this->Values[$Index], 'Name' => $Index,
-            'Type' => $Item['Type'], 'Values' => $this->Values);
-        if(array_key_exists('Null', $Item)) $Parameters['Null'] = $Item['Null'];
+          'Type' => $Item['Type'], 'Values' => $this->Values);
+        if (array_key_exists('Null', $Item)) $Parameters['Null'] = $Item['Null'];
           else unset($Parameters['Null']);
-        if(array_key_exists('OnPreset', $Item)) $Parameters['OnPreset'] = $Item['OnPreset'];
+        if (array_key_exists('OnPreset', $Item)) $Parameters['OnPreset'] = $Item['OnPreset'];
           else unset($Parameters['OnPreset']);
 
-        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
-        {
-          if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList))
+        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')
+          if ($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference')
           {
             $UseType = 'OneToMany';
-          } else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration')
+          } else if ($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration')
             $UseType = 'Enumeration';
         } else $UseType = $Item['Type'];
         $Edit = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnEdit', $Parameters);
-        if(array_key_exists('Suffix', $Item)) $Edit .= $Item['Suffix'];
-
-      $Caption = $Item['Caption'].':';
-      if(array_key_exists($Index, $this->ValuesValidate) and
-        $this->ValuesValidate[$Index]) {
+        if (array_key_exists('Suffix', $Item)) $Edit .= $Item['Suffix'];
+
+        $Caption = $Item['Caption'].':';
+        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>';
+          if ($Format != '') $Caption .= '<br/><small>'.$Format.'</small>';
           $Caption = '<span style="color:red;">'.$Caption.'</span>';
         }
-      if(!$this->FormManager->Type->IsHidden($UseType))
+        if (!$this->FormManager->Type->IsHidden($UseType))
           array_push($Table['Rows'], array($Caption, $Edit));
-      else $Hidden .= $Edit;
-    }
+        else $Hidden .= $Edit;
+      }
     }
     $Output = '<fieldset><legend>'.$this->Definition['Title'].'</legend>'.Table($Table).
     $Hidden.'</fieldset>';
-    return($Output);
+    return $Output;
   }
 
@@ -270 +273 @@
   function LoadValuesFromFormBlock($Context = '')
   {
-    if($Context != '') $Context = $Context.'-';
+    if ($Context != '') $Context = $Context.'-';
     $Values = array();
+    foreach ($this->Definition['Items'] as $Index => $Item)
+    {
+      if (!array_key_exists('Hidden', $Item) or ($Item['Hidden'] == false))
+      {
+        if ((!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
+        (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
+        ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne'))) and
+        (!array_key_exists('ReadOnly', $Item) or
+        (array_key_exists('ReadOnly', $Item) and
+        ($Item['ReadOnly'] != true))))
+        {
+          //if (array_key_exists($Context.$Index, $_POST))
+          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']]);
+            $CustomType = $this->FormManager->FormTypes[$Item['Type']]['Type'];
+            if ($CustomType == 'Reference')
+              $UseType = 'OneToMany';
+            else if ($CustomType == 'Enumeration')
+              $UseType = 'Enumeration';
+          } else $UseType = $Item['Type'];
+          $Parameters = array('Name' => $Index, 'Type' => $Item['Type'], 'Values' => $this->Values);
+          if (array_key_exists('Null', $Item)) $Parameters['Null'] = $Item['Null'];
+            else unset($Parameters['Null']);
+          $Values[$Index] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnLoad',
+            $Parameters);
+        }
+      } else
+      {
+        if (isset($Item['Default'])) {
+          if (isset($Item['Null']) and ($Item['Null'] == true))
+            $Values[$Index] = null;
+          else $Values[$Index] = $Item['Default'];
+        }
+      }
+    }
+    return($Values);
+  }
+
+  function Validate()
+  {
+    $Valid = true;
     foreach($this->Definition['Items'] as $Index => $Item)
-    if(!array_key_exists('Hidden', $Item) or ($Item['Hidden'] == false))
-    {
     if((!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
     (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
@@ -294 +339 @@
             $UseType = 'Enumeration';
         } else $UseType = $Item['Type'];
-        $Parameters = array('Name' => $Index, 'Type' => $Item['Type'], 'Values' => $this->Values);
-        if(array_key_exists('Null', $Item)) $Parameters['Null'] = $Item['Null'];
-          else unset($Parameters['Null']);
-        $Values[$Index] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnLoad',
-          $Parameters);
-    }
-    } else
-    {
-      if(isset($Item['Default'])) {
-        if(isset($Item['Null']) and ($Item['Null'] == true))
-          $Values[$Index] = null;
-        else $Values[$Index] = $Item['Default'];
-      }
-    }
-    return($Values);
-  }
-
-  function Validate()
-  {
-    $Valid = true;
-    foreach($this->Definition['Items'] as $Index => $Item)
-    if((!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
-    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
-    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne'))) and
-    (!array_key_exists('ReadOnly', $Item) or
-    (array_key_exists('ReadOnly', $Item) and
-    ($Item['ReadOnly'] != true))))
-    {
-        //if(array_key_exists($Context.$Index, $_POST))
-        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']]);
-          $CustomType = $this->FormManager->FormTypes[$Item['Type']]['Type'];
-          if($CustomType == 'Reference')
-            $UseType = 'OneToMany';
-          else if($CustomType == 'Enumeration')
-            $UseType = 'Enumeration';
-        } else $UseType = $Item['Type'];
 
         $Parameters = array('Value' => $this->Values[$Index]);

trunk/Common/Form/Types/DateTime.php

@@ -11 +11 @@
     global $MonthNames;
 
-    if($Item['Value'] == 0) return('');
-    if((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
+    if ($Item['Value'] == 0) return '';
+    if ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == '')) $Item['Value'] = time();
     $Parts = getdate($Item['Value']);
     $Output = $Parts['mday'].'.'.$Parts['mon'].'.'.$Parts['year'].' '.
       sprintf('%02d', $Parts['hours']).':'.sprintf('%02d', $Parts['minutes']).':'.sprintf('%02d', $Parts['seconds']);
-    return($Output);
+    return $Output;
   }
 
@@ -23 +23 @@
     global $MonthNames;
 
-    if(($Item['Value'] !== null) and ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == ''))) $Item['Value'] = time();
+    if (($Item['Value'] == null) or (($Item['Value'] !== null) and ((strtolower($Item['Value']) == 'now') or (strtolower($Item['Value']) == ''))))
+    {
+      $Item['Value'] = time();
+      $IsNull = true;
+    } else $IsNull = false;
     $Parts = getdate($Item['Value']);
 
     $Output = '';
     $Style = '';
-    if(array_key_exists('Null', $Item) and $Item['Null'])
+    if (array_key_exists('Null', $Item) and $Item['Null'])
     {
-      if($Item['Value'] != null)
+      if (!$IsNull)
       {
         $Checked = ' checked="1"';
@@ -46 +50 @@
     // Hour
     $Output .= '<select name="'.$Item['Name'].'-hour" id="'.$Item['Name'].'-hour" '.$Style.'>';
-    for($I = 1; $I <= 24; $I++)
+    for ($I = 1; $I <= 24; $I++)
     {
-      if($Parts['hours'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['hours'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -54 +58 @@
     // Minute
     $Output .= '<select name="'.$Item['Name'].'-minute" id="'.$Item['Name'].'-minute" '.$Style.'>';
-    for($I = 1; $I <= 60; $I++)
+    for ($I = 1; $I <= 60; $I++)
     {
-      if($Parts['minutes'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['minutes'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -62 +66 @@
     // Second
     $Output .= '<select name="'.$Item['Name'].'-second" id="'.$Item['Name'].'-second" '.$Style.'>';
-    for($I = 1; $I <= 60; $I++)
+    for ($I = 1; $I <= 60; $I++)
     {
-      if($Parts['seconds'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['seconds'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -70 +74 @@
     // Day
     $Output .= ' <select name="'.$Item['Name'].'-day" id="'.$Item['Name'].'-day" '.$Style.'>';
-    for($I = 1; $I <= 31; $I++)
+    for ($I = 1; $I <= 31; $I++)
     {
-      if($Parts['mday'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['mday'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -78 +82 @@
     // Month
     $Output .= '<select name="'.$Item['Name'].'-month"  id="'.$Item['Name'].'-month" '.$Style.'>';
-    for($I = 1; $I <= 12; $I++)
+    for ($I = 1; $I <= 12; $I++)
     {
-      if($Parts['mon'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['mon'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$MonthNames[$I].'</option>';
     }
@@ -86 +90 @@
     // Year
     $Output .= '<select name="'.$Item['Name'].'-year" id="'.$Item['Name'].'-year" '.$Style.'>';
-    for($I = 1900; $I < 2100; $I++)
+    for ($I = 1900; $I < 2100; $I++)
     {
-      if($Parts['year'] == $I) $Selected = ' selected="1"'; else $Selected = '';
+      if ($Parts['year'] == $I) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
     $Output .= '</select>';
-    return($Output);
+    return $Output;
   }
 
   function OnLoad($Item)
   {
-    if(!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return(null);
-      else return(mktime($_POST[$Item['Name'].'-hour'], $_POST[$Item['Name'].'-minute'], $_POST[$Item['Name'].'-second'],
-        $_POST[$Item['Name'].'-month'], $_POST[$Item['Name'].'-day'], $_POST[$Item['Name'].'-year']));
+    if (!array_key_exists($Item['Name'].'-null', $_POST) and array_key_exists('Null', $Item) and ($Item['Null'] == true)) return null;
+      else return mktime($_POST[$Item['Name'].'-hour'], $_POST[$Item['Name'].'-minute'], $_POST[$Item['Name'].'-second'],
+        $_POST[$Item['Name'].'-month'], $_POST[$Item['Name'].'-day'], $_POST[$Item['Name'].'-year']);
   }
 
   function OnLoadDb($Item)
   {
-    return(MysqlDateTimeToTime($Item['Value']));
+    return MysqlDateTimeToTime($Item['Value']);
   }
 
   function OnSaveDb($Item)
   {
-    if($Item['Value'] == null) return(null);
-      else return(date('Y-m-d H:i:s', $Item['Value']));
+    if ($Item['Value'] == null) return null;
+      else return date('Y-m-d H:i:s', $Item['Value']);
   }
 
   function DatabaseEscape($Value)
   {
-    return('"'.addslashes($Value).'"');
+    return '"'.addslashes($Value).'"';
   }
 }

trunk/Modules/Customer/Customer.php

@@ -106 +106 @@
         'SpeedLimit' => array('Type' => 'TNetworkSpeedLimit', 'Caption' => 'Omezení rychlosti', 'Default' => null, 'Null' => true),
         'Devices' => array('Type' => 'TNetworkDeviceListService', 'Caption' => 'Zařízení', 'Default' => ''),
+        'Subnets' => array('Type' => 'TNetworkSubnetListService', 'Caption' => 'Podsítě', 'Default' => ''),
         'ChangeAction' => array('Type' => 'TActionEnum', 'Caption' => 'Změna - akce', 'Default' => '', 'Null' => true),
         'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true, 'NotInList' => true),
@@ -142 +143 @@
       'Type' => 'ManyToOne',
       'Table' => 'NetworkDevice',
+      'Id' => 'Id',
+      'Ref' => 'Service',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkSubnetListService', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkSubnet',
       'Id' => 'Id',
       'Ref' => 'Service',

trunk/Modules/IS/IS.php

@@ -22 +22 @@
   function Show()
   {
-    if(!$this->System->User->CheckPermission('IS', 'Manage'))
-      return('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('IS', 'Manage'))
+      return 'Nemáte oprávnění';
     $this->System->FormManager->ShowRelation = true;
 
     // a - action
-    if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+    if (array_key_exists('a', $_GET)) $Action = $_GET['a'];
       else $Action = '';
     // t - table
-    if(array_key_exists('t', $_GET)) $Table = $_GET['t'];
+    if (array_key_exists('t', $_GET)) $Table = $_GET['t'];
       else $Table = '';
     // i - index of item
-    if(array_key_exists('i', $_GET)) $ItemId = $_GET['i'];
+    if (array_key_exists('i', $_GET)) $ItemId = $_GET['i'];
       else $ItemId = 0;
     // fc - preset colum
-    if(array_key_exists('fn', $_GET)) $FilterName = $_GET['fn'];
+    if (array_key_exists('fn', $_GET)) $FilterName = $_GET['fn'];
       else $FilterName = '';
-    if(array_key_exists('fv', $_GET)) $FilterValue = $_GET['fv'];
+    if (array_key_exists('fv', $_GET)) $FilterValue = $_GET['fv'];
       else $FilterValue = '';
-    if(array_key_exists('menutype', $_COOKIE)) $MenuType = $_COOKIE['menutype'];
+    if (array_key_exists('menutype', $_COOKIE)) $MenuType = $_COOKIE['menutype'];
       else $MenuType = 0;
-    if(array_key_exists('menutype', $_GET)) $MenuType = $_GET['menutype'] * 1;
+    if (array_key_exists('menutype', $_GET)) $MenuType = $_GET['menutype'] * 1;
     setcookie('menutype', $MenuType, time() + 60 * 60 * 24 * 365);
 
-    if($Action == 'list') {
-      if($FilterName == '') $Content = $this->ShowList($Table);
+    if ($Action == 'list') {
+      if ($FilterName == '') $Content = $this->ShowList($Table);
         else $Content = $this->ShowList($Table, '', '', $FilterName, $FilterValue);
     }
-    else if($Action == 'select') $Content = $this->ShowSelect($Table);
-    else if($Action == 'mapselect') $Content = $this->ShowMapSelect($Table);
-    else if($Action == 'edit') $Content = $this->ShowEdit($Table, $ItemId);
-    else if($Action == 'add') $Content = $this->ShowAdd($Table);
-    else if($Action == 'addsub') $Content = $this->ShowAddSub($Table);
-    else if($Action == 'view') $Content = $this->ShowView($Table, $ItemId);
-    else if($Action == 'delete') $Content = $this->ShowDelete($Table, $ItemId);
-    else if($Action == 'fav_add') $Content = $this->ShowFavoriteAdd($Table, $ItemId);
-    else if($Action == 'fav_del') $Content = $this->ShowFavoriteDel($Table, $ItemId);
+    else if ($Action == 'select') $Content = $this->ShowSelect($Table);
+    else if ($Action == 'mapselect') $Content = $this->ShowMapSelect($Table);
+    else if ($Action == 'edit') $Content = $this->ShowEdit($Table, $ItemId);
+    else if ($Action == 'add') $Content = $this->ShowAdd($Table);
+    else if ($Action == 'addsub') $Content = $this->ShowAddSub($Table);
+    else if ($Action == 'view') $Content = $this->ShowView($Table, $ItemId);
+    else if ($Action == 'delete') $Content = $this->ShowDelete($Table, $ItemId);
+    else if ($Action == 'fav_add') $Content = $this->ShowFavoriteAdd($Table, $ItemId);
+    else if ($Action == 'fav_del') $Content = $this->ShowFavoriteDel($Table, $ItemId);
     else $Content = $this->Dashboard();
-    if($this->HideMenu == false)
+    if ($this->HideMenu == false)
     {
       $Output = '<table style="width: 100%"><tr><td style="width: 20%; vertical-align: top;">';
       $MenuTypeText = '<a href="?menutype=0">Nabídka</a>';
-      if($MenuType == 0) $MenuTypeText = '<strong>'.$MenuTypeText.'</strong>';
+      if ($MenuType == 0) $MenuTypeText = '<strong>'.$MenuTypeText.'</strong>';
       $Output .= $MenuTypeText.' ';
       $MenuTypeText = '<a href="?menutype=1">Oblíbené</a>';
-      if($MenuType == 1) $MenuTypeText = '<strong>'.$MenuTypeText.'</strong>';
+      if ($MenuType == 1) $MenuTypeText = '<strong>'.$MenuTypeText.'</strong>';
       $Output .= $MenuTypeText.' ';
-      if($MenuType == 0) $Output .= $this->ShowMenu();
-      if($MenuType == 1) $Output .= $this->ShowFavorites();
+      if ($MenuType == 0) $Output .= $this->ShowMenu();
+      if ($MenuType == 1) $Output .= $this->ShowFavorites();
       $Output .= '</td><td style="width: 80%; vertical-align: top;">';
       $Output .= $Content;
@@ -75 +75 @@
     } else $Output = $Content;
 
-    return($Output);
+    return $Output;
   }
 
@@ -81 +81 @@
   {
     $Output = '<strong>Nástěnka:</strong><br/>';
-    foreach($this->System->ModuleManager->Modules['IS']->DashboardItems as $Item)
-    {
-      if(is_string($Item['Callback'][0]))
+    foreach ($this->System->ModuleManager->Modules['IS']->DashboardItems as $Item)
+    {
+      if (is_string($Item['Callback'][0]))
       {
         $Class = new $Item['Callback'][0]($this->System);
@@ -96 +96 @@
   {
     $DbResult = $this->Database->select('MenuItemFavorite', 'Id', '(`MenuItem`='.($_GET['i'] * 1).') AND (`User`='.$this->System->User->User['Id'].')');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Output = $this->SystemMessage('Oblíbené', 'Již existuje v oblíbených');
-    } else {
+    } else
+    {
       $this->Database->insert('MenuItemFavorite', array('MenuItem' => ($_GET['i'] * 1), 'User' => $this->System->User->User['Id']));
       $Output = $this->SystemMessage('Oblíbené', 'Přidáno do oblíbených');
     }
     $Output .= $this->ShowList($Table);
-    return($Output);
+    return $Output;
   }
 
@@ -110 +111 @@
   {
     $DbResult = $this->Database->select('MenuItemFavorite', 'Id', '(`MenuItem`='.($_GET['i'] * 1).') AND (`User`='.$this->System->User->User['Id'].')');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
       $this->Database->delete('MenuItemFavorite', '`Id`= '.$DbRow['Id']);
       $Output = $this->SystemMessage('Oblíbené', 'Odstraněno z oblíbených');
-    } else {
+    } else
+    {
       $Output = $this->SystemMessage('Oblíbené', 'Nenalezeno v oblíbených');
     }
     $Output .= $this->ShowList($Table);
-    return($Output);
+    return $Output;
   }
 
@@ -127 +129 @@
     // Compare old values loaded from database with new values in Form variable
     $NewValues = $Form->Values;
-    if($OldId != 0)
+    if ($OldId != 0)
     {
       $FormOld = new Form($this->System->FormManager);
@@ -134 +136 @@
       $OldValues = $FormOld->Values;
       // Keep only changes values
-      foreach($NewValues as $Index => $Value)
-      {
-        if($OldValues[$Index] != $NewValues[$Index])
+      foreach ($NewValues as $Index => $Value)
+      {
+        if ($OldValues[$Index] != $NewValues[$Index])
         {
           $Values .= $Index.': '.$FormOld->GetValue($Index);
-          if($NewId != 0) $Values .= ' => '.$Form->GetValue($Index);
+          if ($NewId != 0) $Values .= ' => '.$Form->GetValue($Index);
           $Values .= "\n";
         }
       }
-    } else {
-      foreach($NewValues as $Index => $Value)
+    } else
+    {
+      foreach ($NewValues as $Index => $Value)
       {
         $Values .= $Index.': '.$Form->GetValue($Index)."\n";
@@ -155 +158 @@
   {
     $Output = '';
-    if(!array_key_exists($Table, $this->System->FormManager->Classes))
-      return($this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena'));
-    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
-      return($this->SystemMessage('Oprávnění', 'Nemáte oprávnění'));
-    if(array_key_exists('o', $_GET))
-    {
-      if($_GET['o'] == 'save')
-      {
-        if(!array_key_exists('submit', $_POST))
-          return($this->SystemMessage('Formulář', 'Formulář nebyl řádně odeslán. Vraťte se zpět a odešlete formulář znovu.'));
+    if (!array_key_exists($Table, $this->System->FormManager->Classes))
+      return $this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena');
+    if (defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
+      return $this->SystemMessage('Oprávnění', 'Nemáte oprávnění');
+    if (array_key_exists('o', $_GET))
+    {
+      if ($_GET['o'] == 'save')
+      {
+        if (!array_key_exists('submit', $_POST))
+          return $this->SystemMessage('Formulář', 'Formulář nebyl řádně odeslán. Vraťte se zpět a odešlete formulář znovu.');
         $Form = new Form($this->System->FormManager);
         $Form->SetClass($Table);
         $Form->LoadValuesFromForm();
         $this->ShortTitle .= ' - '.$Form->Definition['Title'].' úprava';
-        try {
+        try
+        {
           $Form->Validate();
-          if(array_key_exists('BeforeModify', $Form->Definition))
+          if (array_key_exists('BeforeModify', $Form->Definition))
           {
             $Class = $Form->Definition['BeforeModify'][0];
@@ -181 +185 @@
           $Output .= $this->SystemMessage('Úprava položky', 'Položka upravena');
           $Output .= $this->ShowView($Table, $Id);
-          if(array_key_exists('AfterModify', $Form->Definition))
+          if (array_key_exists('AfterModify', $Form->Definition))
           {
             $Class = $Form->Definition['AfterModify'][0];
@@ -219 +223 @@
       $Output .= '</ul>';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -225 +229 @@
   {
     $Output = '';
-    if(!array_key_exists($Table, $this->System->FormManager->Classes))
-      return($this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena'));
+    if (!array_key_exists($Table, $this->System->FormManager->Classes))
+      return $this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena');
     $FormClass = $this->System->FormManager->Classes[$Table];
-    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
-      return('Nemáte oprávnění');
+    if (defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
+      return 'Nemáte oprávnění';
     $DbResult = $this->Database->select($Table, '*', '`Id`='.$Id);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
-      try {
+      try
+      {
         $Form = new Form($this->System->FormManager);
         $Form->SetClass($Table);
         $Form->LoadValuesFromDatabase($Id);
         $this->ShortTitle .= ' - '.$Form->Definition['Title'].' odstranění';
-        if(array_key_exists('BeforeDelete', $Form->Definition))
+        if (array_key_exists('BeforeDelete', $Form->Definition))
         {
           call_user_func($Form->Definition['BeforeDelete'], $Form, $Id);
@@ -246 +251 @@
         $this->Database->delete($Table, '`Id`='.$Id);
         $Output .= $this->SystemMessage('Smazání položky', 'Položka odstraněna');
-        if(array_key_exists('AfterDelete', $Form->Definition))
+        if (array_key_exists('AfterDelete', $Form->Definition))
         {
           $Class = $Form->Definition['AfterDelete'][0];
@@ -258 +263 @@
     } else $Output .= $this->SystemMessage('Smazání položky', 'Položka nenalezena');
     $Output .= $this->ShowList($Table);
-    return($Output);
+    return $Output;
   }
 
@@ -264 +269 @@
   {
     $Output = '';
-    if(!array_key_exists($Table, $this->System->FormManager->Classes))
-      return($this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena'));
-    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
-      return('Nemáte oprávnění');
-    if(array_key_exists('o', $_GET))
-    {
-      if($_GET['o'] == 'save')
+    if (!array_key_exists($Table, $this->System->FormManager->Classes))
+      return $this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena');
+    if (defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
+      return 'Nemáte oprávnění';
+    if (array_key_exists('o', $_GET))
+    {
+      if ($_GET['o'] == 'save')
       {
         $Form = new Form($this->System->FormManager);
@@ -276 +281 @@
         $Form->LoadValuesFromForm();
         $this->ShortTitle .= ' - '.$Form->Definition['Title'].' přidání';
-        try {
+        try
+        {
           $Form->Validate();
-          if(array_key_exists('BeforeInsert', $Form->Definition))
+          if (array_key_exists('BeforeInsert', $Form->Definition))
           {
             $Class = $Form->Definition['BeforeInsert'][0];
@@ -290 +296 @@
           $Output .= $this->SystemMessage('Přidání položky', 'Nová položka vytvořena');
           $Output .= $this->ShowView($Table, $Id, $_GET['a'] == 'addsub');
-          if(array_key_exists('AfterInsert', $Form->Definition))
+          if (array_key_exists('AfterInsert', $Form->Definition))
           {
             $Class = $Form->Definition['AfterInsert'][0];
@@ -297 +303 @@
           }
           // Add action to update caller form
-          if($_GET['a'] == 'addsub')
+          if ($_GET['a'] == 'addsub')
           {
             $Type = $this->System->FormManager->FormTypes[$_GET['rt']];
@@ -326 +332 @@
       $this->ShortTitle .= ' - '.$Form->Definition['Title'].' přidání';
       // Load presets from URL
-      foreach($_GET as $Key => $Value)
-      if(substr($Key, 0, 6) == 'preset')
-      {
-        $Key = substr($Key, 6);
-        if(($Key != '') and array_key_exists($Key, $Form->Values))
-          $Form->Values[$Key] = $Value;
-      }
-      if(array_key_exists('r', $_GET)) $URL = '&amp;r='.$_GET['r'].'&amp;rt='.$_GET['rt'];
+      foreach ($_GET as $Key => $Value)
+      {
+        if (substr($Key, 0, 6) == 'preset')
+        {
+          $Key = substr($Key, 6);
+          if (($Key != '') and array_key_exists($Key, $Form->Values))
+            $Form->Values[$Key] = $Value;
+        }
+      }
+      if (array_key_exists('r', $_GET)) $URL = '&amp;r='.$_GET['r'].'&amp;rt='.$_GET['rt'];
         else $URL = '';
       $Form->OnSubmit = '?a='.$_GET['a'].'&amp;t='.$Table.'&amp;o=save'.$URL;
@@ -341 +349 @@
     }
     $Output .= '<ul class="ActionMenu">';
-    foreach($Actions as $Action)
+    foreach ($Actions as $Action)
     {
       $Output .= '<li>'.$Action.'</li>';
     }
     $Output .= '</ul>';
-    return($Output);
+    return $Output;
   }
 
   function ShowAddSub($Table, $Filter = '', $Title = '')
   {
-    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
-      return('Nemáte oprávnění');
+    if (defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
+      return 'Nemáte oprávnění';
     $this->BasicHTML = true;
     $this->HideMenu = true;
     $Output = $this->ShowAdd($Table);
-    return($Output);
+    return $Output;
   }
 
@@ -364 +372 @@
     $QueryItems['a'] = 'view';
 
-    if(array_key_exists($QueryParamName, $_GET)) $TabIndex = $_GET[$QueryParamName];
+    if (array_key_exists($QueryParamName, $_GET)) $TabIndex = $_GET[$QueryParamName];
       else $TabIndex = 0;
 
     $Output = '<div class="Tab">'.
       '<ul>';
-    foreach($Tabs as $Index => $Tab)
+    foreach ($Tabs as $Index => $Tab)
     {
       $QueryItems[$QueryParamName] = $Index;
-      if($Index == $TabIndex) $Selected = ' id="selected"';
+      if ($Index == $TabIndex) $Selected = ' id="selected"';
         else $Selected = '';
       $Output .= '<li'.$Selected.'><a href="?'.SetQueryStringArray($QueryItems).'">'.$Tab.'</a></li>';
     }
     $Output .= '</ul></div><div class="TabContent">'.$TabContent.'</div>';
-    return($Output);
+    return $Output;
   }
 
   function ShowView($Table, $Id, $WithoutActions = false)
   {
-    if(!array_key_exists($Table, $this->System->FormManager->Classes))
-      return($this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena'));
+    if (!array_key_exists($Table, $this->System->FormManager->Classes))
+      return $this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena');
     $FormClass = $this->System->FormManager->Classes[$Table];
-    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
-      return('Nemáte oprávnění');
+    if (defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
+      return 'Nemáte oprávnění';
 
     $FormClass = $this->System->FormManager->Classes[$Table];
-    if(array_key_exists('BaseTable', $FormClass)) $TableModify = $FormClass['BaseTable'];
+    if (array_key_exists('BaseTable', $FormClass)) $TableModify = $FormClass['BaseTable'];
       else $TableModify = $Table;
 
@@ -398 +406 @@
     $Form->OnSubmit = '?a=view';
     $Output = $Form->ShowViewForm();
-    if($WithoutActions == false)
+    if ($WithoutActions == false)
     {
       $Actions = array(
@@ -410 +418 @@
           $this->System->Link('/images/add.png'))
       );
-      if(array_key_exists('ItemActions', $FormClass))
-      {
-        foreach($FormClass['ItemActions'] as $Action)
+      if (array_key_exists('ItemActions', $FormClass))
+      {
+        foreach ($FormClass['ItemActions'] as $Action)
         {
           $URL = str_replace('#RowId', $Id, $this->System->Link($Action['URL']));
@@ -420 +428 @@
       }
       $Output .= '<ul class="ActionMenu">';
-      foreach($Actions as $Action)
+      foreach ($Actions as $Action)
       {
         $Output .= '<li>'.$Action.'</li>';
@@ -429 +437 @@
     // Show ManyToOne relations
     $Tabs = array();
-    foreach($Form->Definition['Items'] as $Index => $Item)
-    if((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
+    foreach ($Form->Definition['Items'] as $Index => $Item)
+    if ((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
     ($this->System->FormManager->FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
     {
@@ -436 +444 @@
     }
     $Tabs[] = 'Vše';
-    if(array_key_exists('tab', $_GET)) $TabIndex = $_GET['tab'];
+    if (array_key_exists('tab', $_GET)) $TabIndex = $_GET['tab'];
       else $TabIndex = 0;
 
     $TabContent = '';
     $I = 0;
-    foreach($Form->Definition['Items'] as $Index => $Item)
-    if((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
+    foreach ($Form->Definition['Items'] as $Index => $Item)
+    if ((array_key_exists($Item['Type'], $this->System->FormManager->FormTypes) and
     ($this->System->FormManager->FormTypes[$Item['Type']]['Type'] == 'ManyToOne')))
     {
@@ -462 +470 @@
 
     $Output .= $this->ShowTabs($Tabs, 'tab', $TabContent);
-    return($Output);
+    return $Output;
   }
 
   function ShowTable($Table, $Filter = '', $Title = '', $RowActions = array(), $ExcludeColumn = '')
   {
-    if(!array_key_exists($Table, $this->System->FormManager->Classes))
-      return($this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena'));
+    if (!array_key_exists($Table, $this->System->FormManager->Classes))
+      return $this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena');
     $FormClass = $this->System->FormManager->Classes[$Table];
 
-    if(array_key_exists('SQL', $FormClass))
+    if (array_key_exists('SQL', $FormClass))
       $SourceTable = '('.$FormClass['SQL'].') AS `TX`';
       else $SourceTable = '`'.$FormClass['Table'].'` AS `TX`';
@@ -480 +488 @@
     // Build form type filter
     $TypeFilter = '';
-    foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-    if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
+    foreach ($FormClass['Items'] as $ItemIndex => $FormItem)
+    if (!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
     (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
     ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
-    if(array_key_exists('Filter', $FormItem) and ($FormItem['Filter'] == true))
-    {
-      if($TypeFilter != '') $TypeFilter .= ' AND ';
+    if (array_key_exists('Filter', $FormItem) and ($FormItem['Filter'] == true))
+    {
+      if ($TypeFilter != '') $TypeFilter .= ' AND ';
       $TypeFilter .= '(`'.$ItemIndex.'` = "'.$FormItem['Default'].'")';
     }
-    if($TypeFilter != '')
-    {
-      if($HavingFilter != '') $HavingFilter = ' AND';
+    if ($TypeFilter != '')
+    {
+      if ($HavingFilter != '') $HavingFilter = ' AND';
       $HavingFilter .= ' '.$TypeFilter;
     }
@@ -498 +506 @@
     $UserFilter = '';
     $Columns = array('Id' => '`Id`');
-    if(array_key_exists('filter', $_GET) and ($_GET['filter'] == 1))
-    {
-      foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-      if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
-      if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
+    if (array_key_exists('filter', $_GET) and ($_GET['filter'] == 1))
+    {
+      foreach ($FormClass['Items'] as $ItemIndex => $FormItem)
+      if (!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
+      if (!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
       (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
       ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
       {
         $UseType = $UseType = $FormItem['Type'];
-        if(array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes))
-        {
-          if(!array_key_exists($FormItem['Type'], $this->System->FormManager->Type->TypeDefinitionList))
+        if (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes))
+        {
+          if (!array_key_exists($FormItem['Type'], $this->System->FormManager->Type->TypeDefinitionList))
             $this->System->FormManager->Type->RegisterType($FormItem['Type'], '',
               $this->System->FormManager->FormTypes[$FormItem['Type']]);
-          if($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Reference')
+          if ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Reference')
           $UseType = 'OneToMany';
           else
-          if($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Enumeration')
+          if ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Enumeration')
           $UseType = 'Enumeration';
         }
         $FilterName = $this->System->FormManager->Type->ExecuteTypeEvent($UseType, 'OnFilterName',
           array('Name' => $ItemIndex, 'Type' => $FormItem['Type']));
-        if(array_key_exists('Filter'.$ItemIndex, $_POST) and ($_POST['Filter'.$ItemIndex] != ''))
-        {
-          if($UserFilter != '') $UserFilter .= ' AND ';
+        if (array_key_exists('Filter'.$ItemIndex, $_POST) and ($_POST['Filter'.$ItemIndex] != ''))
+        {
+          if ($UserFilter != '') $UserFilter .= ' AND ';
           $UserFilter .= '('.$FilterName.' LIKE "%'.$_POST['Filter'.$ItemIndex].'%")';
         }
       }
     }
-    if($UserFilter != '')
-    {
-      if($HavingFilter != '') $HavingFilter .= ' AND';
+    if ($UserFilter != '')
+    {
+      if ($HavingFilter != '') $HavingFilter .= ' AND';
       $HavingFilter .= ' '.$UserFilter;
     }
-    if($WhereFilter != '') $Filter = ' WHERE '.$WhereFilter;
-    if($HavingFilter != '') $Filter = ' HAVING '.$HavingFilter;
-
-
-    foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-      if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
+    if ($WhereFilter != '') $Filter = ' WHERE '.$WhereFilter;
+    if ($HavingFilter != '') $Filter = ' HAVING '.$HavingFilter;
+
+
+    foreach ($FormClass['Items'] as $ItemIndex => $FormItem)
+      if (!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
       (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
       ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
       {
-        if($ExcludeColumn != $ItemIndex)
-        if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
-        if(!array_key_exists('NotInList', $FormItem) or ($FormItem['NotInList'] == false))
+        if ($ExcludeColumn != $ItemIndex)
+        if (!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
+        if (!array_key_exists('NotInList', $FormItem) or ($FormItem['NotInList'] == false))
           $TableColumns[] = array('Name' => $ItemIndex, 'Title' => $FormItem['Caption']);
         $UseType = $UseType = $FormItem['Type'];
-        if(array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes))
-        {
-          if(!array_key_exists($FormItem['Type'], $this->System->FormManager->Type->TypeDefinitionList))
+        if (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes))
+        {
+          if (!array_key_exists($FormItem['Type'], $this->System->FormManager->Type->TypeDefinitionList))
             $this->System->FormManager->Type->RegisterType($FormItem['Type'], '',
                 $this->System->FormManager->FormTypes[$FormItem['Type']]);
-          if($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Reference')
+          if ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Reference')
             $UseType = 'OneToMany';
           else
-            if($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Enumeration')
+            if ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Enumeration')
             $UseType = 'Enumeration';
         }
-        if(array_key_exists('Filter'.$ItemIndex, $_POST) and ($_POST['Filter'.$ItemIndex] != ''))
+        if (array_key_exists('Filter'.$ItemIndex, $_POST) and ($_POST['Filter'.$ItemIndex] != ''))
           $Value = $_POST['Filter'.$ItemIndex];
           else $Value = '';
-        if($ItemIndex == 'Id') unset($Columns['Id']);
-
-        if(!array_key_exists('SQL', $FormItem)) $FormItem['SQL'] = '';
+        if ($ItemIndex == 'Id') unset($Columns['Id']);
+
+        if (!array_key_exists('SQL', $FormItem)) $FormItem['SQL'] = '';
           else $FormItem['SQL'] = str_replace('#Id', '`TX`.`Id`', $FormItem['SQL']);
         $Columns[] = $this->System->FormManager->Type->ExecuteTypeEvent($UseType, 'OnFilterNameQuery',
@@ -577 +585 @@
     // Get total filtered item count in database
     $Columns = implode(',', $Columns);
-    if($Filter != '')
+    if ($Filter != '')
     {
       $Query = 'SELECT COUNT(*) FROM (SELECT '.$Columns.' FROM '.$SourceTable.' '.$Filter.') AS `TS`';
@@ -590 +598 @@
 
     $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
-    if(!array_key_exists('DefaultSortColumn', $FormClass))
+    if (!array_key_exists('DefaultSortColumn', $FormClass))
       $FormClass['DefaultSortColumn'] = 'Id';
-    if(!array_key_exists('DefaultSortOrder', $FormClass))
+    if (!array_key_exists('DefaultSortOrder', $FormClass))
       $FormClass['DefaultSortOrder'] = 0;
     $Order = GetOrderTableHeader($Table, $TableColumns, $FormClass['DefaultSortColumn'], $FormClass['DefaultSortOrder']);
@@ -598 +606 @@
 
     // Show search fields
-    if(array_key_exists('r', $_GET)) $Addition = '&amp;r='.$_GET['r'];
+    if (array_key_exists('r', $_GET)) $Addition = '&amp;r='.$_GET['r'];
       else $Addition = '';
     $Output .= '<tr><form action="?a='.$_GET['a'].'&amp;t='.$Table.'&amp;filter=1'.$Addition.'" method="post">';
-    foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-    if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
-    if(!array_key_exists('NotInList', $FormItem) or ($FormItem['NotInList'] == false))
-    if((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
+    foreach ($FormClass['Items'] as $ItemIndex => $FormItem)
+    if (!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
+    if (!array_key_exists('NotInList', $FormItem) or ($FormItem['NotInList'] == false))
+    if ((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
     (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
     ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne'))) and
     ($ExcludeColumn != $ItemIndex))
     {
-      if(array_key_exists('Filter'.$ItemIndex, $_POST) and ($_POST['Filter'.$ItemIndex] != ''))
+      if (array_key_exists('Filter'.$ItemIndex, $_POST) and ($_POST['Filter'.$ItemIndex] != ''))
         $Value = $_POST['Filter'.$ItemIndex];
         else $Value = '';
@@ -621 +629 @@
     $VisibleItemCount = 0;
     $DbResult = $this->Database->query($Query);
-    while($Row = $DbResult->fetch_assoc())
+    while ($Row = $DbResult->fetch_assoc())
     {
       $Output .= '<tr>';
-      foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-      if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
-      if(!array_key_exists('NotInList', $FormItem) or ($FormItem['NotInList'] == false))
-      if((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
+      foreach ($FormClass['Items'] as $ItemIndex => $FormItem)
+      if (!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
+      if (!array_key_exists('NotInList', $FormItem) or ($FormItem['NotInList'] == false))
+      if ((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
       (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
       ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne'))) and
@@ -634 +642 @@
         //$Output .= '<td>'.$Row[$ItemIndex].'</td>';
         $UseType = $UseType = $FormItem['Type'];
-        if(array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes))
-        {
-          if(!array_key_exists($FormItem['Type'], $this->System->FormManager->Type->TypeDefinitionList))
+        if (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes))
+        {
+          if (!array_key_exists($FormItem['Type'], $this->System->FormManager->Type->TypeDefinitionList))
             $this->System->FormManager->Type->RegisterType($FormItem['Type'], '',
               $this->System->FormManager->FormTypes[$FormItem['Type']]);
-          if($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Reference')
+          if ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Reference')
           $UseType = 'OneToMany';
           else
-          if($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Enumeration')
+          if ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] == 'Enumeration')
           $UseType = 'Enumeration';
         }
@@ -651 +659 @@
           array('Value' => $Row[$ItemIndex], 'Name' => $ItemIndex,
           'Type' => $FormItem['Type'], 'Filter' => $Row[$ItemIndex.'_Filter']));
-        if($Value == '') $Value = '&nbsp;';
+        if ($Value == '') $Value = '&nbsp;';
         $Output .= '<td>'.$Value.'</td>';
       }
@@ -658 +666 @@
     }
     $Output .= '<tr><td colspan="'.count($TableColumns).'" style="text-align: right;">Zobrazeno <strong>'.$VisibleItemCount.'</strong>';
-    if($UserFilter != '') $Output .= ' z filtrovaných <strong>'.$TotalFilteredCount.'</strong>';
+    if ($UserFilter != '') $Output .= ' z filtrovaných <strong>'.$TotalFilteredCount.'</strong>';
     $Output .= ' z celkem <strong>'.$TotalCount.'</strong></td></tr>';
     $Output .= '</table>';
     $Output .= $PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
   function ShowSelect($Table, $Filter = '', $Title = '')
   {
-    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
-      return('Nemáte oprávnění');
+    if (defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
+      return 'Nemáte oprávnění';
     $this->BasicHTML = true;
     $this->HideMenu = true;
@@ -675 +683 @@
       $this->System->Link('/images/select.png').'"/></a>';
     $Output = $this->ShowTable($Table, $Filter, $Title, $RowActions);
-    return($Output);
+    return $Output;
   }
 
   function ShowMapSelect($Table, $Filter = '', $Title = '')
   {
-    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
-      return('Nemáte oprávnění');
+    if (defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
+      return 'Nemáte oprávnění';
     $Map = new MapOpenStreetMaps($this->System);
     $Map->Position = array('Lat' => $this->System->Config['Map']['DefaultLatitude'],
@@ -690 +698 @@
     //$MapApi->ShowMarker = true;
     $Output = $Map->ShowPage($this);
-    return($Output);
+    return $Output;
   }
 
@@ -696 +704 @@
   {
     $Output = '';
-    if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
-      return('Nemáte oprávnění');
+    if (defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
+      return 'Nemáte oprávnění';
     if(!array_key_exists($Table, $this->System->FormManager->Classes))
-      return($this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena'));
+      return $this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena');
     $FormClass = $this->System->FormManager->Classes[$Table];
-    if(array_key_exists('BaseTable', $FormClass)) $TableModify = $FormClass['BaseTable'];
+    if (array_key_exists('BaseTable', $FormClass)) $TableModify = $FormClass['BaseTable'];
       else $TableModify = $Table;
 
@@ -710 +718 @@
       '<a href="?a=delete&amp;t='.$Table.'&amp;i=#RowId"><img alt="Smazat" title="Smazat" src="'.
       $this->System->Link('/images/delete.png').'" onclick="return confirmAction(\'Opravdu smazat položku?\');"/></a>';
-    if(($Table != '') and (array_key_exists($Table, $this->System->FormManager->Classes)))
+    if (($Table != '') and (array_key_exists($Table, $this->System->FormManager->Classes)))
       $FormClass = $this->System->FormManager->Classes[$Table];
-      else return($this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena'));
-    if($ExcludeColumn == '') $this->ShortTitle .= ' - '.$FormClass['Title'];
-    if(array_key_exists('ItemActions', $FormClass))
-    {
-      foreach($FormClass['ItemActions'] as $Action)
+      else return $this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena');
+    if ($ExcludeColumn == '') $this->ShortTitle .= ' - '.$FormClass['Title'];
+    if (array_key_exists('ItemActions', $FormClass))
+    {
+      foreach ($FormClass['ItemActions'] as $Action)
       {
         $URL = $this->System->Link($Action['URL']);
@@ -728 +736 @@
     $Output .= '<li>'.$this->ShowAction('Seznam', '?a=list&amp;t='.$Table, $this->System->Link('/images/list.png')).'</li>';
     $MI = 0;
-    if(array_key_exists('mi', $_GET))
+    if (array_key_exists('mi', $_GET))
     {
       $DbResult = $this->Database->select('MenuItemFavorite', 'Id', '(`MenuItem`='.($_GET['mi'] * 1).') AND (`User`='.$this->System->User->User['Id'].')');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $DbRow = $DbResult->fetch_assoc();
@@ -740 +748 @@
           $this->System->Link('/images/Favorite-Add.png')).'</li>';
     }
-    if(array_key_exists('Actions', $FormClass))
-    {
-      foreach($FormClass['Actions'] as $Action)
+    if (array_key_exists('Actions', $FormClass))
+    {
+      foreach ($FormClass['Actions'] as $Action)
+      {
         $Output .= '<li>'.$this->ShowAction($Action['Caption'], $this->System->Link($Action['URL']),
-            $this->System->Link('/images/action.png')).'</li>';
+          $this->System->Link('/images/action.png')).'</li>';
+      }
     }
     $Output .= '</ul>';
     $Output .= $this->ShowTable($Table, $Filter, $Title, $RowActions, $ExcludeColumn);
-    return($Output);
+    return $Output;
   }
 
@@ -760 +770 @@
       'WHERE `MenuItemFavorite`.`User`='.$this->System->User->User['Id'].' '.
       'ORDER BY `MenuItem`.`Parent`,`MenuItem`.`Name`');
-    while($DbRow = $DbResult->fetch_assoc())
-    {
-      //if($DbRow['Permission'] != '')
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
+      //if ($DbRow['Permission'] != '')
       $this->MenuItems[$DbRow['Id']] = $DbRow;
     }
-    return($this->ShowMenuItem('', true));
+    return $this->ShowMenuItem('', true);
   }
 
@@ -776 +786 @@
       'WHERE `MenuItem`.`Menu`=1 '.
       'ORDER BY `MenuItem`.`Parent`,`MenuItem`.`Name`');
-    while($DbRow = $DbResult->fetch_assoc())
-    {
-      //if($DbRow['Permission'] != '')
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
+      //if ($DbRow['Permission'] != '')
       $this->MenuItems[$DbRow['Id']] = $DbRow;
     }
-    return($this->ShowMenuItem(''));
+    return $this->ShowMenuItem('');
   }
 
@@ -787 +797 @@
   {
     $Output = '<ul style="list-style: none; margin-left:1em; padding-left:0em;">';
-    foreach($this->MenuItems as $MenuItem)
-    if(($MenuItem['Parent'] == $Parent) or $All)
-    {
-      $LinkTitle = $MenuItem['Name'];
-      if($MenuItem['URL'] != '')
-      {
-        $Icon = 'Device.png';
-        if(substr($MenuItem['URL'], 0, 4) != 'http') $MenuItem['URL'] = $this->System->Link($MenuItem['URL']);
-        $LinkTitle = MakeLink($MenuItem['URL'].'&amp;mi='.$MenuItem['Id'], $LinkTitle);
-      } else $Icon = 'Folder.png';
-      if($MenuItem['IconName'] != '') $Image = '<img src="'.$this->System->Link('/images/favicons/'.$MenuItem['IconName']).'"/>&nbsp;';
-        else $Image = '<img src="'.$this->System->Link('/images/favicons/'.$Icon).'"/>&nbsp;';
-      //if($this->System->User->CheckPermission($this->TableToModule($Table), 'Write') or !defined('NEW_PERMISSION'))
-        $Output .= '<li>'.$Image.$LinkTitle.'</li>';
-      if($All == false) $Output .= $this->ShowMenuItem($MenuItem['Id']);
+    foreach ($this->MenuItems as $MenuItem)
+    {
+      if (($MenuItem['Parent'] == $Parent) or $All)
+      {
+        $LinkTitle = $MenuItem['Name'];
+        if ($MenuItem['URL'] != '')
+        {
+          $Icon = 'Device.png';
+          if (substr($MenuItem['URL'], 0, 4) != 'http') $MenuItem['URL'] = $this->System->Link($MenuItem['URL']);
+          $LinkTitle = MakeLink($MenuItem['URL'].'&amp;mi='.$MenuItem['Id'], $LinkTitle);
+        } else $Icon = 'Folder.png';
+        if ($MenuItem['IconName'] != '') $Image = '<img src="'.$this->System->Link('/images/favicons/'.$MenuItem['IconName']).'"/>&nbsp;';
+          else $Image = '<img src="'.$this->System->Link('/images/favicons/'.$Icon).'"/>&nbsp;';
+        //if ($this->System->User->CheckPermission($this->TableToModule($Table), 'Write') or !defined('NEW_PERMISSION'))
+          $Output .= '<li>'.$Image.$LinkTitle.'</li>';
+        if ($All == false) $Output .= $this->ShowMenuItem($MenuItem['Id']);
+      }
     }
     $Output .= '</ul>';
-    return($Output);
+    return $Output;
   }
 
@@ -811 +823 @@
     $DbResult = $this->Database->query('SELECT (SELECT `Name` FROM `Module` '.
       'WHERE `Module`.`Id`=`Model`.`Module`) AS `Name` FROM `Model` WHERE `Name`="'.$Table.'"');
-    if($DbResult->num_rows == 1)
+    if ($DbResult->num_rows == 1)
     {
       $DbRow = $DbResult->fetch_assoc();
-      return($DbRow['Name']);
-    } else return('');
+      return $DbRow['Name'];
+    } else return '';
   }
 
@@ -822 +834 @@
     $Output = '<img alt="'.$Name.'" title="'.$Name.'" src="'.
       $Icon.'"/>';
-    if($this->ShowActionName) $Output .= $Name;
-    if($Confirm != '')
+    if ($this->ShowActionName) $Output .= $Name;
+    if ($Confirm != '')
       $Confirm = ' onclick="return confirmAction(\''.$Confirm.'\');"';
     $Output = '<a href="'.$Target.'"'.$Confirm.'>'.$Output.'</a>';
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Network/Network.php

@@ -265 +265 @@
         'NTP' => array('Type' => 'String', 'Caption' => 'NTP', 'Default' => ''),
         'Member' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => '', 'Null' => true),
+        'Service' => array('Type' => 'TServiceCustomerRel', 'Caption' => 'Služba', 'Default' => '', 'Null' => true),
         'ExtAddressRange' => array('Type' => 'String', 'Caption' => 'Vnější rozsah adres', 'Default' => ''),
         'ExtMask' => array('Type' => 'String', 'Caption' => 'Vnější prefix', 'Default' => ''),