Changeset 731

Timestamp:

Jan 17, 2015, 9:24:47 PM (10 years ago)

Author:

chronos

Message:

• Added: NetworkDomain table for managing multiple network domains. It is not completed and linked to real functionality yet.
• Added: ModuleLinks and Model tables as preparation for better modules and models in-database representation.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/AppModule.php (modified) (2 diffs)
• Common/Setup/Setup.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (4 diffs)
• Modules/System/System.php (modified) (12 diffs)
• Modules/VPS/VPS.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 730; // Subversion revision
-$DatabaseRevision = 730; // SQL structure revision
-$ReleaseTime = strtotime('2015-01-12');
+$Revision = 731; // Subversion revision
+$DatabaseRevision = 731; // SQL structure revision
+$ReleaseTime = strtotime('2015-01-14');

trunk/Common/AppModule.php

@@ -38 +38 @@
   var $Id;
   var $Name;
+  var $Title;
   var $Version;
   var $License; 
@@ -65 +66 @@
     $this->Enabled = false;
     $this->Running = false;
+    $this->HomePage = '';
+    $this->License = '';
+    $this->Version = '';
+    $this->Creator = '';
+    $this->Description = '';
     $this->Dependencies = array();
     $this->Type = ModuleType::Normal;

trunk/Common/Setup/Setup.php

@@ -208 +208 @@
     $Output = '';
     
-    $Pageing = new Pageing();
+    $Pageing = new Paging();
     $Pageing->TotalCount = count($this->System->ModuleManager->Modules);
     $Table = new VisualTable();

trunk/Common/Setup/Updates.php

@@ -1222 +1222 @@
   $Manager->Execute('ALTER TABLE `Scheduler` ADD CONSTRAINT `Schedule_ibfk_2` FOREIGN KEY (`Action`) REFERENCES `SchedulerAction` (`Id`);');
   $Manager->Execute('INSERT INTO `SchedulerAction` (`Id`, `Name`, `Class`) VALUES (NULL, "Import bankovních účtů", "ScheduleBankImport");');  
+}
+
+function UpdateTo731($Manager)
+{
+        // NetworkDomain
+        $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkDomain` (
+`Id` int(11) NOT NULL,
+`Name` varchar(255) NOT NULL,
+`Parent` int(11) DEFAULT NULL,
+`Serial` int(11) NOT NULL,
+`Refresh` int(11) NOT NULL,
+`Expire` int(11) NOT NULL,
+`Retry` int(11) NOT NULL,
+`Minimum` int(11) NOT NULL,
+`TTL` int(11) NOT NULL,
+`Description` varchar(255) NOT NULL
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `NetworkDomain` ADD PRIMARY KEY (`Id`);');
+
+  $Manager->Execute('ALTER TABLE `NetworkDomain`
+  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=1;');
+
+  $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
+`Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
+NULL , "", "Síťová doména", "1", "/is/?t=NetworkDomain&a=list", NULL , NULL , NULL , "1");');
+  $ActionId = $Manager->Database->insert_id;
+  $DbResult = $Manager->Execute('SELECT `Id` FROM `MenuItem` WHERE `Name`="Síť"');
+  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` (
+`Id` int(11) NOT NULL,
+  `Module` int(11) NOT NULL,
+  `LinkedModule` int(11) NOT NULL,
+  `Type` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `ModuleLink`
+ ADD PRIMARY KEY (`Id`), ADD KEY `Module` (`Module`), ADD KEY `LinkedModule` (`LinkedModule`);');
+
+  $Manager->Execute('ALTER TABLE `ModuleLink`
+        MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
 }
 
@@ -1287 +1371 @@
         726 => array('Revision' => 729, 'Function' => 'UpdateTo729'),
         729 => array('Revision' => 730, 'Function' => 'UpdateTo730'),
+        730 => array('Revision' => 731, 'Function' => 'UpdateTo731'),
     ));
   }

trunk/Modules/IS/IS.php

@@ -756 +756 @@
   {
     parent::__construct($System);
-    $this->Name = 'Information system';
+    $this->Name = 'IS';
+    $this->Title = 'Information system';
     $this->Version = '1.0';
     $this->Creator = 'Chronos';

trunk/Modules/Network/Network.php

@@ -15 +15 @@
   function Show()
   {
-        // http://en.wikipedia.org/wiki/List_of_WLAN_channels
-        //$ChannelList = array(2412 => 1, 2417 => 2, 2422 => 3, 2427 => 4, 2432 => 5, 2437 => 6, 2442 => 7, 2447 => 8, 2452 => 9, 2457 => 10, 2462 => 11, 2467 => 12, 2472 => 13, 5200 => 40, 5205 => 41, 5210 => 42, 5215 => 43, 5220 => 44, 5225 => 45, 5230 => 46, 5235 => 47, 5240 => 48, 5245 => 49, 5250 => 50, 5255 => 51, 5260 => 52, 5265 => 53, 5270 => 54, 5275 => 55, 5280 => 56, 5285 => 57, 5290 => 58, 5295 => 59, 5300 => 60, 5500 => 100, 5520 => 104, 5540 => 108, 5560 => 112, 5580 => 116, 5600 => 120, 5620 => 124, 5640 => 128, 5660 => 132, 5700 => 140, 5720 => 144);
-        $Output = '<div align="center">'.
-        '<a href="?section=obsazeni_wifi_kanalu&range=a">Pásmo 2,4 GHz (a)</a> '.
-        '<a href="?section=obsazeni_wifi_kanalu&amp;range=bc">Pásmo 5 GHz dolní (b, c)</a> '.
-        '<a href="?section=obsazeni_wifi_kanalu&amp;range=d">Pásmo 5 GHz horní (d)</a> '.
-        '<a href="http://www.ctu.cz/1/download/Opatreni%20obecne%20povahy/VO_R_12_08_2005_34.pdf">VO_R_12_08_2005_34</a><br/>'.
-        '<strong>Seznam známých AP a obsazení kmitočtových pásem:</strong></div>'.
-        '<table class="WideTable">'.
-        '<tr><th/><br/>SSID<br/><br/></th>';
-        $ChannelList = array();
-        if(!array_key_exists('range', $_GET)) $_GET['range'] = 'a';
-        if($_GET['range'] == 'a')
-        {
-          $Where = '(Frequency < 5000)';
-          for($Freq = 2402; $Freq <= 2482; $Freq = $Freq + 5) $ChannelList[] = $Freq;
-        }
-        if($_GET['range'] == 'bc')
-        {
-          $Where = '(Frequency >= 5000) AND (Frequency <= 5350)';
-          for($Freq = 5150; $Freq <= 5350; $Freq = $Freq + 5) $ChannelList[] = $Freq;
-        }
-        if($_GET['range'] == 'd')
-        {
-          $Where = '(Frequency >= 5470)';
-          for($Freq = 5470; $Freq <= 5725; $Freq = $Freq + 5) $ChannelList[] = $Freq;
-        }
-
+    // http://en.wikipedia.org/wiki/List_of_WLAN_channels
+    //$ChannelList = array(2412 => 1, 2417 => 2, 2422 => 3, 2427 => 4, 2432 => 5, 2437 => 6, 2442 => 7, 2447 => 8, 2452 => 9, 2457 => 10, 2462 => 11, 2467 => 12, 2472 => 13, 5200 => 40, 5205 => 41, 5210 => 42, 5215 => 43, 5220 => 44, 5225 => 45, 5230 => 46, 5235 => 47, 5240 => 48, 5245 => 49, 5250 => 50, 5255 => 51, 5260 => 52, 5265 => 53, 5270 => 54, 5275 => 55, 5280 => 56, 5285 => 57, 5290 => 58, 5295 => 59, 5300 => 60, 5500 => 100, 5520 => 104, 5540 => 108, 5560 => 112, 5580 => 116, 5600 => 120, 5620 => 124, 5640 => 128, 5660 => 132, 5700 => 140, 5720 => 144);
+    $Output = '<div align="center">'.
+    '<a href="?section=obsazeni_wifi_kanalu&range=a">Pásmo 2,4 GHz (a)</a> '.
+    '<a href="?section=obsazeni_wifi_kanalu&amp;range=bc">Pásmo 5 GHz dolní (b, c)</a> '.
+    '<a href="?section=obsazeni_wifi_kanalu&amp;range=d">Pásmo 5 GHz horní (d)</a> '.
+    '<a href="http://www.ctu.cz/1/download/Opatreni%20obecne%20povahy/VO_R_12_08_2005_34.pdf">VO_R_12_08_2005_34</a><br/>'.
+    '<strong>Seznam známých AP a obsazení kmitočtových pásem:</strong></div>'.
+    '<table class="WideTable">'.
+    '<tr><th/><br/>SSID<br/><br/></th>';
+    $ChannelList = array();
+    if(!array_key_exists('range', $_GET)) $_GET['range'] = 'a';
+    if($_GET['range'] == 'a')
+    {
+      $Where = '(Frequency < 5000)';
+      for($Freq = 2402; $Freq <= 2482; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+    }
+    if($_GET['range'] == 'bc')
+    {
+      $Where = '(Frequency >= 5000) AND (Frequency <= 5350)';
+      for($Freq = 5150; $Freq <= 5350; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+    }
+    if($_GET['range'] == 'd')
+    {
+      $Where = '(Frequency >= 5470)';
+      for($Freq = 5470; $Freq <= 5725; $Freq = $Freq + 5) $ChannelList[] = $Freq;
+    }
+
+    foreach($ChannelList as $Frequency)
+    {
+      $Output .= '<th><div class="RotatedHeader">'.$Frequency.'<div></th>';
+    }
+    $Output .= '</tr>';
+    $DbResult = $this->Database->query('SELECT `Frequency` FROM `NetworkInterfaceWireless` WHERE '.$Where.' AND (`Mode`=0) GROUP BY `Frequency`');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $DbResult2 = $this->Database->query('SELECT * FROM `NetworkInterfaceWireless` WHERE (`Frequency`='.$DbRow['Frequency'].') AND '.$Where);
+      while($DbRow2 = $DbResult2->fetch_assoc())
+      {
+        $LowFrequency = $DbRow['Frequency'] - $DbRow2['ChannelWidth'] / 2 - $DbRow2['ChannelWidthLower'];
+        $HighFrequency = $DbRow['Frequency'] + $DbRow2['ChannelWidth'] / 2 + $DbRow2['ChannelWidthUpper'];
+        $Output .= '<tr><td>'.$DbRow2['SSID'].'</td>';
         foreach($ChannelList as $Frequency)
         {
-          $Output .= '<th><div class="RotatedHeader">'.$Frequency.'<div></th>';
+          if(($DbRow2['Frequency'] == $Frequency)) $Color = '#000000';
+            else if(($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#808080';
+            else if(($LowFrequency == $Frequency) or ($HighFrequency == $Frequency)) $Color = '#c0c0c0';
+            else $Color = '#ffffff';
+          $Output .= '<td style="background-color: '.$Color.';">&nbsp;</td>';
         }
-        $Output .= '</tr>';
-        $DbResult = $this->Database->query('SELECT `Frequency` FROM `NetworkInterfaceWireless` WHERE '.$Where.' AND (`Mode`=0) GROUP BY `Frequency`');
-        while($DbRow = $DbResult->fetch_assoc())
-        {
-          $DbResult2 = $this->Database->query('SELECT * FROM `NetworkInterfaceWireless` WHERE (`Frequency`='.$DbRow['Frequency'].') AND '.$Where);
-          while($DbRow2 = $DbResult2->fetch_assoc())
-          {
-            $LowFrequency = $DbRow['Frequency'] - $DbRow2['ChannelWidth'] / 2 - $DbRow2['ChannelWidthLower'];
-            $HighFrequency = $DbRow['Frequency'] + $DbRow2['ChannelWidth'] / 2 + $DbRow2['ChannelWidthUpper'];
-            $Output .= '<tr><td>'.$DbRow2['SSID'].'</td>';
-            foreach($ChannelList as $Frequency)
-            {
-              if(($DbRow2['Frequency'] == $Frequency)) $Color = '#000000';
-                else if(($LowFrequency <= ($Frequency - 2.5)) and ($HighFrequency >= ($Frequency + 2.5))) $Color = '#808080';
-                else if(($LowFrequency == $Frequency) or ($HighFrequency == $Frequency)) $Color = '#c0c0c0';
-
-                else $Color = '#ffffff';
-              $Output .= '<td style="background-color: '.$Color.';">&nbsp;</td>';
-            }
-
-            $Output .= '</tr>';
-          }
-        }
-        $Output .= '</table>';
+                    
+        $Output .= '</tr>';        
+      }
+    }
+    $Output .= '</table>';
     return($Output);
   }
@@ -250 +249 @@
       ),
     ));
-    $this->System->FormManager->RegisterClass('NetworkDeviceConfig',array(
+    $this->System->FormManager->RegisterClass('NetworkDeviceConfig', array(
       'Title' => 'Nastavení zařízení',
       'Table' => 'NetworkDeviceConfig',
@@ -261 +260 @@
         'ConfigCompact' => array('Type' => 'Text', 'Caption' => 'Rozdílové nastavení', 'Default' => ''),
       ),
+    ));
+    $this->System->FormManager->RegisterClass('NetworkDomain', array(
+      'Title' => 'Síťová doména',
+      'Table' => 'NetworkDomain',
+      'DefaultSortColumn' => 'Name',
+      'DefaultSortOrder' => 1,
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+        'Description' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => ''),
+        'Parent' => array('Type' => 'TNetworkDomain', 'Caption' => 'Nadřazená doména', 'Default' => '', 'Null' => true),
+        'Serial' => array('Type' => 'Integer', 'Caption' => 'Sériové číslo', 'Default' => '1'),
+        'Minimum' => array('Type' => 'Integer', 'Caption' => 'Minimum', 'Default' => '10800'),
+        'Retry' => array('Type' => 'Integer', 'Caption' => 'Opakování', 'Default' => '7200'),
+        'Expire' => array('Type' => 'Integer', 'Caption' => 'Čas vypršení', 'Default' => '2419200'),
+        'Refresh' => array('Type' => 'Integer', 'Caption' => 'Obnovení', 'Default' => '28800'),
+        'TTL' => array('Type' => 'Integer', 'Caption' => 'TTL', 'Default' => '86400', 'Suffix' => 'sekund'),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDomain', array(
+      'Type' => 'Reference',
+      'Table' => 'NetworkDomain',
+      'Id' => 'Id',
+      'Name' => 'Name',
+      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterClass('DeviceAPIType', array(
@@ -358 +381 @@
         'Name' => 'Name',
         'Filter' => '1',
-    ));    
+    ));
     $this->System->FormManager->RegisterFormType('TDeviceList', array(
       'Type' => 'ManyToOne',

trunk/Modules/System/System.php

@@ -14 +14 @@
   {
     $Output = '';
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `SystemModule`');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Module`');
     $DbRow = $DbResult->fetch_row();
     $PageList = GetPageList($DbRow[0]);
@@ -22 +22 @@
      
     $TableColumns = array(
-        array('Name' => 'Name', 'Title' => 'Jméno'),
-        array('Name' => 'Creator', 'Title' => 'Tvůrce'),
-        array('Name' => 'Version', 'Title' => 'Verze'),
-        array('Name' => 'License', 'Title' => 'Licence'),
-        array('Name' => 'Installed', 'Title' => 'Instalováno'),
-        array('Name' => 'Description', 'Title' => 'Popis'),
-        array('Name' => 'Dependencies', 'Title' => 'Závislosti'),
-        array('Name' => '', 'Title' => 'Akce'),
+      array('Name' => 'Name', 'Title' => 'Jméno'),
+      array('Name' => 'Creator', 'Title' => 'Tvůrce'),
+      array('Name' => 'Version', 'Title' => 'Verze'),
+      array('Name' => 'License', 'Title' => 'Licence'),
+      array('Name' => 'Installed', 'Title' => 'Instalováno'),
+      array('Name' => 'Description', 'Title' => 'Popis'),
+      array('Name' => 'Dependencies', 'Title' => 'Závislosti'),
+      array('Name' => '', 'Title' => 'Akce'),
     );
     $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
     $Output .= $Order['Output'];
-    $Query = 'SELECT *, (SELECT GROUP_CONCAT(`T1`.`Name` SEPARATOR ", ") FROM `SystemModuleDependency` '.
-        'LEFT JOIN `SystemModule` AS `T1` ON `T1`.`Id` = `SystemModuleDependency`.`DependencyModule` '.
-        'WHERE `SystemModuleDependency`.`Module` = `SystemModule`.`Id`) AS `Dependencies` '.
-        'FROM `SystemModule` '.$Order['SQL'].$PageList['SQLLimit'];
+    $Query = 'SELECT *, (SELECT GROUP_CONCAT(`T1`.`Name` SEPARATOR ", ") FROM `ModuleLink` '.
+        'LEFT JOIN `Module` AS `T1` ON `T1`.`Id` = `ModuleLink`.`LinkedModule` '.
+        'WHERE `ModuleLink`.`Module` = `Module`.`Id`) AS `Dependencies` '.
+        'FROM `Module` '.$Order['SQL'].$PageList['SQLLimit'];
     
     $DbResult = $this->Database->query($Query);
@@ -69 +69 @@
       if($_GET['A'] == 'SaveToDb') 
       {
-        $this->System->ModuleManager->Modules['System']->SaveToDatabase();
+        $Output .= $this->System->ModuleManager->Modules['System']->SaveToDatabase();
         $Output .= $this->SystemMessage('Načtení modulů', 'Seznam modulů v databázi zaktualizován');    
       } else
@@ -225 +225 @@
                 'Name' => array('Type' => 'String', 'Caption' => 'Systémové jméno', 'Default' => ''),
                   'Title' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+                'Description' => array('Type' => 'Text', 'Caption' => 'Popis', 'Default' => ''),
+                'Version' => array('Type' => 'String', 'Caption' => 'Verze', 'Default' => ''),
+                'License' => array('Type' => 'String', 'Caption' => 'Licence', 'Default' => ''),
+                'Creator' => array('Type' => 'String', 'Caption' => 'Tvůrce', 'Default' => ''),
+        'HomePage' => array('Type' => 'Hyperlink', 'Caption' => 'Domovské stránky', 'Default' => ''),           
+                'Installed' => array('Type' => 'Boolean', 'Caption' => 'Instalováno', 'Default' => '', 'ReadOnly' => true),
+                'Models' => array('Type' => 'TModelListModule', 'Caption' => 'Modely', 'Default' => ''),
+                'Links' => array('Type' => 'TModuleLinkListModule', 'Caption' => 'Vazby', 'Default' => ''),
+          ),
+        'Actions' => array(
+                array('Caption' => 'Aktualizovat z disku', 'URL' => '/module/?A=SaveToDb'),
+          ),
+    ));
+    $this->System->FormManager->RegisterFormType('TModule', array(
+        'Type' => 'Reference',
+        'Table' => 'Module',
+        'Id' => 'Id',
+        'Name' => 'Title',
+        'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TModelListModule', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'Model',
+      'Id' => 'Id',
+      'Ref' => 'Module',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterClass('Model', array(
+        'Title' => 'Modely',
+          'Table' => 'Model',
+          'Items' => array(
+                'Name' => array('Type' => 'String', 'Caption' => 'Systémové jméno', 'Default' => ''),
+                  'Title' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+                'Module' => array('Type' => 'TModule', 'Caption' => 'Module', 'Default' => ''),
+            'Query' => array('Type' => 'String', 'Caption' => 'SQL dotaz', 'Default' => ''),
+                'DefaultSortColumn' => array('Type' => 'String', 'Caption' => 'Výchozí sloupce řazení', 'Default' => ''),
+                'DefaultSortOrder' => array('Type' => 'Text', 'Caption' => 'Výchozí směr řazení', 'Default' => ''),
+                'Fields' => array('Type' => 'TModelFieldListModel', 'Caption' => 'Pole', 'Default' => ''),
+          ),
+    ));
+    $this->System->FormManager->RegisterFormType('TModel', array(
+        'Type' => 'Reference',
+        'Table' => 'Model',
+        'Id' => 'Id',
+        'Name' => 'Title',
+        'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TModelFieldListModel', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'ModelField',
+      'Id' => 'Id',
+      'Ref' => 'Model',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterClass('ModelField', array(
+        'Title' => 'Pole modelu',
+          'Table' => 'ModelField',
+          'Items' => array(
+                'Name' => array('Type' => 'String', 'Caption' => 'Systémové jméno', 'Default' => ''),
+                  'Title' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+                'Model' => array('Type' => 'TModel', 'Caption' => 'Model', 'Default' => ''),
+            'Query' => array('Type' => 'String', 'Caption' => 'SQL dotaz', 'Default' => ''),
+                'Type' => array('Type' => 'String', 'Caption' => 'Typ', 'Default' => ''),
+                'DefaultValue' => array('Type' => 'String', 'Caption' => 'Výchozí hodnota', 'Default' => ''),
+                'IsNull' => array('Type' => 'Boolean', 'Caption' => 'Také nulová hodnota', 'Default' => ''),
+                'Suffix' => array('Type' => 'String', 'Caption' => 'Text za', 'Default' => ''),
+          ),
+    ));
+    $this->System->FormManager->RegisterFormType('TModuleLink', array(
+        'Type' => 'Reference',
+        'Table' => 'ModuleLink',
+        'Id' => 'Id',
+        'Name' => 'Module',
+        'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TModuleLinkListModule', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'ModuleLink',
+      'Id' => 'Id',
+      'Ref' => 'Module',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterClass('ModuleLink', array(
+        'Title' => 'Vazby modulu',
+          'Table' => 'ModuleLink',
+          'Items' => array(
+                'Module' => array('Type' => 'TModule', 'Caption' => 'Modul', 'Default' => ''),
+                'LinkedModule' => array('Type' => 'TModule', 'Caption' => 'Vázaný modul', 'Default' => ''),
+            'Type' => array('Type' => 'String', 'Caption' => 'Typ vazby', 'Default' => ''),
           ),
     ));
@@ -232 +321 @@
           'DefaultSortColumn' => 'Name',
           'Items' => array(
-                'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+                'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),                     
           ),
     ));
@@ -337 +426 @@
       if($Module->IsInstalled()) $Installed = 1;
         else $Installed = 0; 
-      $this->Database->query('UPDATE `SystemModule` SET `Installed`=1 WHERE `Name`="'.$Module->Name.'"');
+      $this->Database->query('UPDATE `Module` SET `Installed`=1 WHERE `Name`="'.$Module->Name.'"');
     }
   }
@@ -345 +434 @@
     //DebugLog('Loading modules...');
     $this->Modules = array();
-    $Query = 'SELECT `Id`, `Name`,`Installed` FROM `SystemModule`';
+    $Query = 'SELECT `Id`, `Name`,`Installed` FROM `Module`';
     $DbResult = $this->Database->query($Query);
     while($Module = $DbResult->fetch_array())
@@ -361 +450 @@
   function SaveToDatabase()
   {
+        $Output = '';
     $Modules = array();
-    $DbResult = $this->Database->query('SELECT * FROM `SystemModule`');
+    $DbResult = $this->Database->query('SELECT * FROM `Module`');
     while($DbRow = $DbResult->fetch_assoc())
     {
@@ -375 +465 @@
       if(!array_key_exists($Module->Name, $Modules))
       {
-        $this->Database->insert('SystemModule', array('Name' => $Module->Name, 
-          'Version' => $Module->Version, 'Creator' => $Module->Creator, 
+        $this->Database->insert('Module', array('Name' => $Module->Name, 
+          'Version' => $Module->Version, 'Creator' => $Module->Creator,
+                'HomePage' => $Module->HomePage, 'Title' => $Module->Title,
           'Description' => $Module->Description, 'License' => $Module->License,
           'Installed' => $Module->Installed));
         $this->System->ModuleManager->Modules[$Module->Name]->Id = $this->Database->insert_id;
       }
-      else $this->Database->update('SystemModule', 'Name = "'.$Module->Name.'"', array(
-        'Version' => $Module->Version, 'Creator' => $Module->Creator, 
+      else $this->Database->update('Module', 'Name = "'.$Module->Name.'"', array(
+        'Version' => $Module->Version, 'Creator' => $Module->Creator,
+        'HomePage' => $Module->HomePage, 'Title' => $Module->Title,
         'Description' => $Module->Description, 'License' => $Module->License,
         'Installed' => $Module->Installed));
@@ -391 +483 @@
     if(!$this->System->ModuleManager->ModulePresent($Module['Name']))
     {
-      DebugLog('Removing module '.$Module['Name'].' from list');
-      $this->Database->query('DELETE FROM `SystemModule` WHERE `Id` = '.$Module['Id']);
+      $Output .= 'Removing module '.$Module['Name'].' from list</br/>';
+      $this->Database->query('DELETE FROM `ModuleLink` WHERE `Module` = '.$Module['Id']);
+      $this->Database->query('DELETE FROM `ModuleLink` WHERE `LinkedModule` = '.$Module['Id']);
+      $DbResult = $this->Database->query('SELECT Id FROM `PermissionOperation` WHERE `Module` = '.$Module['Id']);
+      while($DbRow = $DbResult->fetch_assoc()) 
+      {
+        $this->Database->query('DELETE FROM `PermissionGroupAssignment` WHERE `AssignedOperation` = '.$DbRow['Id']);
+        $this->Database->query('DELETE FROM `PermissionUserAssignment` WHERE `AssignedOperation` = '.$DbRow['Id']);
+      }
+      $this->Database->query('DELETE FROM `PermissionOperation` WHERE `Module` = '.$Module['Id']);
+      $this->Database->query('DELETE FROM `Model` WHERE `Module` = '.$Module['Id']);
+      $DbResult = $this->Database->query('SELECT Id FROM `Model` WHERE `Module` = '.$Module['Id']);
+      while($DbRow = $DbResult->fetch_assoc())
+        $this->Database->query('DELETE FROM `ModelField` WHERE `Model` = '.$DbRow['Id']);
+      $this->Database->query('DELETE FROM `Module` WHERE `Id` = '.$Module['Id']);
     }   
     
     // Reload dependencies
     $DbDependency = array();
-    $DbResult = $this->Database->query('SELECT * FROM `SystemModuleDependency`');
+    $DbResult = $this->Database->query('SELECT * FROM `ModuleLink`');
     while($DbRow = $DbResult->fetch_assoc())
-      $DbDependency[$DbRow['Module']][] = $DbRow['DependencyModule'];
+      $DbDependency[$DbRow['Module']][] = $DbRow['LinkedModule'];
     
     foreach($this->System->ModuleManager->Modules as $Module)
@@ -412 +517 @@
             $DependencyId = $this->System->ModuleManager->Modules[$Dependency]->Id;
             else throw new Exception('Dependent module '.$Dependency.' not found');
-          $this->Database->insert('SystemModuleDependency', array('Module' => $Module->Id, 
-            'DependencyModule' => $DependencyId));
+          $this->Database->insert('ModuleLink', array('Module' => $Module->Id, 
+            'LinkedModule' => $DependencyId, 'Type' => 'DependOn'));
         }        
       }
@@ -423 +528 @@
         $DepModName = $this->System->ModuleManager->SearchModuleById($Dep);
         if(!in_array($DepModName, $Module->Dependencies))
-        $this->Database->query('DELETE FROM `SystemModuleDependency` WHERE `Module` = '.
-          $Module->Id.' AND DependencyModule='.$Dep);
+        $this->Database->query('DELETE FROM `ModuleLink` WHERE `Module` = '.
+          $Module->Id.' AND LinkedModule='.$Dep);
       }      
     }
+    return($Output);
   } 
 }

trunk/Modules/VPS/VPS.php

@@ -7 +7 @@
     parent::__construct($System);
     $this->Name = 'VPS';
+    $this->Title = 'VPS';
     $this->Version = '1.0';
     $this->Creator = 'Chronos';
@@ -12 +13 @@
     $this->Description = 'VPS(Virtual Private Server) hosting management';
     $this->Dependencies = array('User');
+    $this->Modules = array();
   }