Changeset 769

Timestamp:

Nov 24, 2015, 9:56:00 PM (9 years ago)

Author:

chronos

Message:

• Added: More DNS related tables to replace fixed DNS configuration.
• Modified: All icons should now have transparency. This is useful if user have set dark backround in its browser.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (4 diffs)
• images/favicons/apple.png (modified) ( previous)
• images/favicons/chart.png (modified) ( previous)
• images/favicons/comp.png (modified) ( previous)
• images/favicons/discus.png (modified) ( previous)
• images/favicons/gallery.png (modified) ( previous)
• images/favicons/money.png (modified) ( previous)
• images/favicons/obec_zdechov.png (modified) ( previous)
• images/favicons/pocasi.png (modified) ( previous)
• images/favicons/prohledavac_sdileni.png (modified) ( previous)
• images/favicons/satellite.png (modified) ( previous)
• images/favicons/socer.png (modified) ( previous)
• images/favicons/tv.png (modified) ( previous)
• images/favicons/www_computershop_cz.png (modified) ( previous)
• images/favicons/www_snbzdechov_com.png (modified) ( previous)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 767; // Subversion revision
-$DatabaseRevision = 765; // SQL structure revision
-$ReleaseTime = strtotime('2015-11-22');
+$Revision = 768; // Subversion revision
+$DatabaseRevision = 768; // SQL structure revision
+$ReleaseTime = strtotime('2015-11-23');

trunk/Common/Setup/Updates.php

@@ -1633 +1633 @@
         "VALUES (NULL , 'Zákazická podpora', ".$DbRow['Id'].", '".$ActionId."', '1');");
   }
+}
+
+function UpdateTo768($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkDomainAlias` ADD `Domain` INT NOT NULL AFTER `Comment`;');
+  $Manager->Execute('ALTER TABLE `NetworkDomainAlias` ADD KEY `Domain` (`Domain`);');
+  $Manager->Execute('UPDATE `NetworkDomainAlias` SET `Domain`=1');
+  $Manager->Execute('ALTER TABLE `NetworkDomainAlias` ADD FOREIGN KEY (`Domain`) REFERENCES `NetworkDomain`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkAddressCategory` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkDomainItemFilter` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `Domain` int(11) NOT NULL,
+  `AddressCategory` int(11) NOT NULL,
+  `Suffix` varchar(255) NOT NULL,
+  `View` int(11) NOT NULL,
+  `AddressRange` varchar(255) NOT NULL
+  PRIMARY KEY (`Id`),
+  KEY `Domain` (`Domain`),
+  KEY `View` (`View`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkDomainView` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Domain` int(11) NOT NULL,
+  `AddressRange` varchar(255) NOT NULL,
+  `Name` varchar(255) NOT NULL,
+  `SysName` varchar(255) NOT NULL
+  PRIMARY KEY (`Id`),
+  KEY `Domain` (`Domain`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `NetworkDomainItemFilter`
+  ADD CONSTRAINT `NetworkDomainItemFilter_ibfk_1` FOREIGN KEY (`Domain`) REFERENCES `NetworkDomain` (`Id`);');
+  $Manager->Execute('ALTER TABLE `NetworkDomainItemFilter`
+  ADD FOREIGN KEY (`Domain`) REFERENCES `NetworkDomainView`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  $Manager->Execute('ALTER TABLE `NetworkDomainView`
+  ADD FOREIGN KEY (`Domain`) REFERENCES `NetworkDomainView`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
 }
 
@@ -1713 +1753 @@
       762 => array('Revision' => 763, 'Function' => 'UpdateTo763'),
       763 => array('Revision' => 765, 'Function' => 'UpdateTo765'),
+      765 => array('Revision' => 768, 'Function' => 'UpdateTo768'),
     ));
   }

trunk/Modules/Network/Network.php

@@ -138 +138 @@
         'Target' => array('Type' => 'String', 'Caption' => 'Cíl', 'Default' => ''),
         'Comment' => array('Type' => 'String', 'Caption' => 'Komentář', 'Default' => ''),
-      ),
+        'Domain' => array('Type' => 'TNetworkDomain', 'Caption' => 'Síťová doména', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDomainAliasListDomain', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDomainAlias',
+      'Id' => 'Id',
+      'Ref' => 'Domain',
+      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterClass('NetworkDevice', array(
@@ -267 +275 @@
       ),
     ));
+    $this->System->FormManager->RegisterClass('NetworkAddressCategory', array(
+      'Title' => 'Kategorie síťové adresy',
+      'Table' => 'NetworkAddressCategory',
+      'DefaultSortColumn' => 'Name',
+      'DefaultSortOrder' => 1,
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkAddressCategory', array(
+      'Type' => 'Reference',
+      'Table' => 'NetworkAddressCategory',
+      'Id' => 'Id',
+      'Name' => 'Name',
+      'Filter' => '1',
+    ));
     $this->System->FormManager->RegisterClass('NetworkDeviceConfig', array(
       'Title' => 'Nastavení zařízení',
@@ -295 +319 @@
         'TTL' => array('Type' => 'Integer', 'Caption' => 'TTL', 'Default' => '86400', 'Suffix' => 'sekund'),
         'Servers' => array('Type' => 'TNetworkDomainServerList', 'Caption' => 'Servery', 'Default' => ''),
+        'Views' => array('Type' => 'TNetworkDomainViewListDomain', 'Caption' => 'Pohledy', 'Default' => ''),
+        'ItemFilters' => array('Type' => 'TNetworkDomainItemFilterListDomain', 'Caption' => 'Filtry položek', 'Default' => ''),
+        'Aliases' => array('Type' => 'TNetworkDomainAliasListDomain', 'Caption' => 'Aliasy', 'Default' => ''),
       ),
     ));
@@ -320 +347 @@
       'Id' => 'Id',
       'Ref' => 'Domain',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterClass('NetworkDomainView', array(
+      'Title' => 'Pohled síťové domény',
+      'Table' => 'NetworkDomainView',
+      'DefaultSortColumn' => 'Name',
+      'DefaultSortOrder' => 1,
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+        'SysName' => array('Type' => 'String', 'Caption' => 'Systémové jméno', 'Default' => ''),
+        'Domain' => array('Type' => 'TNetworkDomain', 'Caption' => 'Doména', 'Default' => ''),
+        'AddressRange' => array('Type' => 'String', 'Caption' => 'Rozsah adres', 'Default' => ''),
+        'ItemFilters' => array('Type' => 'TNetworkDomainItemFilterListView', 'Caption' => 'Filtry položek', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDomainView', array(
+      'Type' => 'Reference',
+      'Table' => 'NetworkDomainView',
+      'Id' => 'Id',
+      'Name' => 'Name',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDomainViewListDomain', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDomainView',
+      'Id' => 'Id',
+      'Ref' => 'Domain',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterClass('NetworkDomainItemFilter', array(
+      'Title' => 'Filtr doménových položek',
+      'Table' => 'NetworkDomainItemFilter',
+      'DefaultSortColumn' => 'Name',
+      'DefaultSortOrder' => 1,
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+        'Domain' => array('Type' => 'TNetworkDomain', 'Caption' => 'Domén', 'Default' => ''),
+        'AddressCategory' => array('Type' => 'TNetworkAddressCategory', 'Caption' => 'Kategorie adresy', 'Default' => ''),
+        'Suffix' => array('Type' => 'String', 'Caption' => 'Přípona jména položek', 'Default' => ''),
+        'View' => array('Type' => 'TNetworkDomainView', 'Caption' => 'Pohled', 'Default' => ''),
+        'AddressRange' => array('Type' => 'String', 'Caption' => 'Rozsah adres', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDomainItemFilterListDomain', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDomainItemFilter',
+      'Id' => 'Id',
+      'Ref' => 'Domain',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDomainItemFilterListView', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDomainItemFilter',
+      'Id' => 'Id',
+      'Ref' => 'View',
       'Filter' => '1',
     ));