Changeset 860 for trunk/Modules/NetworkConfigRouterOS/Generators

Timestamp:

May 8, 2019, 8:22:45 PM (6 years ago)

Author:

chronos

Message:

• Modified: Made some links to follow http/https protocol.
• Modified: Simplified .htaccess.

Location:

trunk/Modules/NetworkConfigRouterOS/Generators

Files:

• DHCP.php (modified) (1 diff)
• FirewallNAT.php (modified) (1 diff)
• NetwatchImport.php (modified) (2 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

@@ -28 +28 @@
         $Name = $Interface['DeviceName'];
         if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-        $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name);
+        $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name, 'lease-time' => '24h');
       }
 

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -110 +110 @@
 
     // Accept free-access clients
-    $Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
-        'src-address-list' => 'free-access', 'in-interface' => $LocalInterface,
-        'action' => 'accept', 'comment' => 'Free_access');
+    //$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
+    //    'src-address-list' => 'free-access', 'in-interface' => $LocalInterface,
+    //    'action' => 'accept', 'comment' => 'Free_access');
     // Redirect unregistred clients to free access activation page
-    $Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
-        'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface, 'protocol' => 'tcp',
-        'action' => 'dst-nat', 'to-addresses' => '10.145.64.70', 'to-ports' => 8080, 'comment' => 'Redirect_unregistred');
+    //$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',
+    //    'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface, 'protocol' => 'tcp',
+    //    'action' => 'dst-nat', 'to-addresses' => '10.145.64.70', 'to-ports' => 8080, 'comment' => 'Redirect_unregistred');
 
     // Masquerade hosts without public ip

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -65 +65 @@
       }
     }
+    echo("transakce\n");
     $this->Database->Transaction($Queries);
+    echo("done\n");
 
     // Set offline all interfaces which were not updated as online
@@ -90 +92 @@
     }
     $Queries[] = $this->Database->GetUpdate('NetworkDevice', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));
+    echo("Transakce 2\n");
     $this->Database->Transaction($Queries);
+    echo("done\n");
   }