Changeset 657

Timestamp:

May 25, 2014, 8:29:03 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Záznam změn online stavu dostupnosti rozhraní do tabulky.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (1 diff)
• Application/System.php (modified) (14 diffs)
• Application/Version.php (modified) (1 diff)
• Common/AppModule.php (modified) (2 diffs)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (1 diff)

trunk/Application/FormClasses.php

@@ -760 +760 @@
     'Filter' => '1',
   ),
-  'TFinanceInvoiceItemListInvoice' => array(
+  'TNetworkInterfaceUpDown' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'NetworkInterfaceUpDown',
+    'Id' => 'Id',
+    'Ref' => 'Interface',
+    'Filter' => '1',
+  ),
+        'TFinanceInvoiceItemListInvoice' => array(
     'Type' => 'ManyToOne',
     'Table' => 'FinanceInvoiceItem',

trunk/Application/System.php

@@ -13 +13 @@
   /** @var Database */
   var $Database;
-  var $Modules; 
+  var $Modules;
   /** @var Type */
   var $Type;
@@ -38 +38 @@
     if(substr($this->RootURLFolder, -10, 10) == '/index.php')
       $this->RootURLFolder = substr($this->RootURLFolder, 0, -10);
-  }  
-  
+  }
+
   function RegisterPage($Path, $Handler)
   {
@@ -48 +48 @@
       foreach($Path as $PathItem)
       {
-        $Page = &$Page[$PathItem];       
+        $Page = &$Page[$PathItem];
       }
       if(!is_array($Page)) $Page = array('' => $Page);
@@ -54 +54 @@
     } else $this->Pages[$Path] = $Handler;
   }
-  
+
   function UnregisterPage($Path)
   {
-    unset($this->Pages[$Path]);  
-  }
-  
+    unset($this->Pages[$Path]);
+  }
+
   function SearchPage($PathItems, $Pages)
   {
@@ -66 +66 @@
     if(array_key_exists($PathItem, $Pages))
     {
-      if(is_array($Pages[$PathItem])) 
+      if(is_array($Pages[$PathItem]))
       {
         array_shift($PathItems);
@@ -73 +73 @@
     } else return('');
   }
-  
+
   function PageNotFound()
   {
     return('Page '.implode('/', $this->PathItems).' not found.');
   }
-  
+
   function ShowPage()
   {
         /* @var $Page Page */
-    $ClassName = $this->SearchPage($this->PathItems, $this->Pages);     
-    if($ClassName != '') 
+    $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
+    if($ClassName != '')
     {
       $Page = new $ClassName($this);
@@ -92 +92 @@
     }
   }
-  
+
   function ModulePresent($Name)
   {
@@ -103 +103 @@
     $this->Modules[get_class($Module)] = $Module;
   }
-  
+
   function HumanDate($Time)
   {
     return(date('j.n.Y', $Time));
   }
-  
+
   function Link($Target)
   {
     return($this->RootURLFolder.$Target);
   }
-  
+
   function ShowAction($Id)
   {
@@ -136 +136 @@
         global $Database, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
       $DatabaseRevision, $Config;
-  
+
     date_default_timezone_set('Europe/Prague');
     mb_internal_encoding("UTF-8");
     $ScriptTimeStart = GetMicrotime();
-  
+
     // SQL injection hack protection
     foreach($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
@@ -147 +147 @@
     if(isset($_SERVER['REMOTE_ADDR'])) session_start();
 
-    $ConfigFileName = dirname(__FILE__).'/../config.php';     
-    if(file_exists($ConfigFileName)) 
+    $ConfigFileName = dirname(__FILE__).'/../config.php';
+    if(file_exists($ConfigFileName))
       $this->ConfigManager->LoadFromFile($ConfigFileName);
     //$this->Config = $this->ConfigManager->GetAsArray();
     $this->Config = &$Config;
-    
-    try { 
-      $this->Database->Connect($this->Config['Database']['Host'], $this->Config['Database']['User'], 
+
+    try {
+      $this->Database->Connect($this->Config['Database']['Host'], $this->Config['Database']['User'],
         $this->Config['Database']['Password'], $this->Config['Database']['Database']);
       $this->Database->Prefix = $this->Config['Database']['Prefix'];
@@ -166 +166 @@
       $this->RootURLFolder = $this->Config['Web']['RootFolder'];
     $this->FormManager->Root = $this->RootURLFolder;
-  
+
     $this->RegisterPageBar('Top');
-  
-    $Database = $this->Database; 
-    RegisterFormClasses($this->FormManager);  
-  
+
+    $Database = $this->Database;
+    RegisterFormClasses($this->FormManager);
+
     // Register and start existing modules
     $this->Setup = new Setup($this);
@@ -183 +183 @@
       $this->PathItems = ProcessURL();
       $this->ShowPage();
-    }   
-  }
-  
+    }
+  }
+
   function RegisterPageBar($Name)
   {
@@ -206 +206 @@
   var $FullTitle = 'Stránka nenalezena';
   var $ShortTitle = 'Stránka nenalezena';
-  
+
   function __construct($System)
   {
@@ -215 +215 @@
   function Show()
   {
-    Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found'); 
+    Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
     return('<h3 align="center">Požadovaná stránka neexistuje.</h3>');
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 656; // Subversion revision
-$DatabaseRevision = 656; // SQL structure revision
-$ReleaseTime = strtotime('2014-05-16');
+$Revision = 657; // Subversion revision
+$DatabaseRevision = 657; // SQL structure revision
+$ReleaseTime = strtotime('2014-05-25');

trunk/Common/AppModule.php

@@ -335 +335 @@
   function LoadModulesFromDir($Directory)
   {
-    $List = scandir($Directory);
+        $List = scandir($Directory);     
     foreach($List as $Item)
     {
@@ -349 +349 @@
   function LoadModules()
   {
-    if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
+        if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
       $this->OnLoadModules();
     else $this->LoadModulesFromDir(dirname(__FILE__).'/../Modules');

trunk/Common/Setup/Updates.php

@@ -706 +706 @@
 }
 
+function UpdateTo657($Manager)
+{
+        $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkInterfaceUpDown` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Time` datetime NOT NULL,
+  `Interface` int(11) NOT NULL,
+  `State` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Interface` (`Interface`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
+  $Manager->Execute('ALTER TABLE `NetworkInterfaceUpDown`
+    ADD CONSTRAINT `NetworkInterfaceUpDown_ibfk_1` FOREIGN KEY (`Interface`) REFERENCES `NetworkInterface` (`Id`);');
+  $Manager->Execute("INSERT INTO `Action` (
+`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,`Group` ,`Icon` ,`PermissionOperation` ,
+`Enable`) VALUES (NULL , '', 'Změny stavu rozhraní', '1', '/is/?t=NetworkInterfaceUpDown&a=list', NULL , NULL , NULL , '1'
+);");
+  $ActionId = $Manager->Database->insert_id;
+  $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    "VALUES (NULL , 'Změny stavu rozhraní', 4, '".$ActionId."', '1');");
+}
+
 class Updates
 {
@@ -745 +766 @@
       645 => array('Revision' => 646, 'Function' => 'UpdateTo646'),
       646 => array('Revision' => 647, 'Function' => 'UpdateTo647'),
+      647 => array('Revision' => 657, 'Function' => 'UpdateTo657'),
     ));
   }

trunk/Modules/Network/Network.php

@@ -230 +230 @@
         'Links1' => array('Type' => 'TNetworkLinkListInterface1', 'Caption' => 'Propojení 1', 'Default' => ''),
         'Links2' => array('Type' => 'TNetworkLinkListInterface2', 'Caption' => 'Propojení 2', 'Default' => ''),
+        'UpDown' => array('Type' => 'TNetworkInterfaceUpDown', 'Caption' => 'Změny stavu', 'Default' => ''),
       ),
     ));

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -15 +15 @@
 
   // Load netwatch status from all DHCP routers 
-  $DbResult3 = $System->Database->query('SELECT DHCP, AddressRange, Mask FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
+  $DbResult3 = $System->Database->query('SELECT `DHCP`, `AddressRange`, `Mask` FROM `NetworkSubnet` '.
+                'WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
   while($Subnet = $DbResult3->fetch_assoc())
   {
@@ -26 +27 @@
     foreach($List as $Properties)
     {
-      if($Properties['status'] == 'up')
+      if($Properties['status'] == 'up') $Online = 1;
+        else $Online = 0;
+        
+      $DbResult = $System->Database->select('NetworkInterface', 'Online', '`LocalIP` = "'.$Properties['host'].'";');
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        $LastOnline = $DbRow['Online'];
+        $Interface = $DbRow['NetworkInterface']; 
+        
+        // Record state changes
+        if($Online != $LastOnline)
+        {      
+          $System->Database->insert('NetworkInterfaceUpDown', array(
+                  'Interface' => $Interface, 'State' => $Online, 'Time' => TimeToMysqlDateTime($StartTime)));
+        }
+      };
+        
+      if($Online)
       {
         $DbResult = $System->Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', 

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -27 +27 @@
   function DoStart()
   {
+    $this->System->FormManager->RegisterClass('NetworkInterfaceUpDown', array(
+      'Title' => 'Změny stavu rozhraní',
+      'Table' => 'NetworkInterfaceUpDown',
+      'Items' => array(
+        'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => '', 'ReadOnly' => true),
+        'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => '', 'ReadOnly' => true),
+        'State' => array('Type' => 'Boolean', 'Caption' => 'Stav', 'Default' => '', 'ReadOnly' => true),
+      ),
+    ));
   }
 }