Changeset 860 for trunk/Modules/NetworkConfigRouterOS

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

Files:

• Generators/DHCP.php (modified) (1 diff)
• Generators/FirewallNAT.php (modified) (1 diff)
• Generators/NetwatchImport.php (modified) (2 diffs)
• NetworkConfigRouterOS.php (modified) (2 diffs)
• Routerboard.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");
   }
 

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -69 +69 @@
   {
     $IPAddress = GetRemoteAddress();
-    if(IsInternetAddr($IPAddress))
-      return('<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>');
+    $Output = 'Vaše IP adresa je: '.$IPAddress.'<br/>';
+    if(IsInternetAddr($IPAddress)) {
+      $Output .= '<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>';
+      return($Output);
+    }
     $Time = time();
 
@@ -99 +102 @@
       }
     }
-    $Output = '<div style="text-align:center;"><h3>Vítejte v síti ZděchovNET</h3></div>';
-    //$Output .= 'Vaše adresa IP je: '.GetRemoteAddress().'<br/>';
+    $Output .= '<div style="text-align:center;"><h3>Vítejte v síti ZděchovNET</h3></div>';
     $Output .= '<p>Pro přístup k Internetu zdarma sdílenou rychlostí 128/128 kbit/s klikněte na odkaz níže.
       Internet bude zpřístupněn po dobu 24 hodin. Po uplynutí této doby je potřeba provést novou aktivaci.</p>';

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -8 +8 @@
   var $UserName;
   var $Password;
-  var $PrivateKey = '~/.ssh/id_dsa';
+  var $PrivateKey = '~/.ssh/id_rsa';
   var $MaxBurstLineCount = 100;
   var $Debug = false;
@@ -52 +52 @@
       $Commands = str_replace('$', '\$', $Commands);
       //$Commands = str_replace(' ', '\ ', $Commands);
-      $Command = $this->SSHPath.' -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.' -o HostKeyAlgorithms=+ssh-dss -o KexAlgorithms=diffie-hellman-group14-sha1 -i '.$this->PrivateKey.' '.$this->HostName.' "'.$Commands.'"';
+      if ($this->PrivateKey != '') $PrivKey = ' -i '.$this->PrivateKey;
+        else $PrivKey = '';
+
+      $Command = $this->SSHPath.' -oBatchMode=no -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.
+        $PrivKey.' '.$this->HostName.' "'.$Commands.'"';
       if($this->Debug) echo($Command);
       $Output = array();