Changeset 738 for trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (4 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -21 +21 @@
   // 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');
+    'WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
   while($Subnet = $DbResult3->fetch_assoc())
   {
@@ -54 +54 @@
         array('LastOnline' => TimeToMysqlDateTime($StartTime)));
 
-        if($Interface['Online'] != $Interface['NewOnline'])
+    if($Interface['Online'] != $Interface['NewOnline'])
     {
-        // Online state changed
+      // Online state changed
       $DbResult = $System->Database->query('INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
-        `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
+        `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
          TimeToMysqlDateTime($StartTime).'", NULL)');
       // Update previous record duration in UpDown table
@@ -64 +64 @@
       '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
       'AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
-        'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Interface['Id'].')');
+      'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Interface['Id'].')');
       $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
         array('Online' => $Interface['NewOnline']));
@@ -75 +75 @@
   while($DbRow = $DbResult->fetch_assoc())
   {
-        echo('IP '.$DbRow['LocalIP'].' online but time not updated.'."\n");
+    echo('IP '.$DbRow['LocalIP'].' online but time not updated.'."\n");
   }
   $DbResult = $System->Database->select('NetworkInterface', '*', '(`Online` = 0) AND '.