Changeset 735

Timestamp:

Apr 6, 2015, 1:03:33 PM (9 years ago)

Author:

chronos

Message:

• Added: Support for Internet free access. Unregistered users are redirected to activation page where they can found useful information and activate free access for 24 hours.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/FinanceBankAPI/FinanceBankAPI.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (2 diffs)
• Modules/Scheduler/Scheduler.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 731; // Subversion revision
-$DatabaseRevision = 731; // SQL structure revision
-$ReleaseTime = strtotime('2015-01-14');
+$Revision = 735; // Subversion revision
+$DatabaseRevision = 735; // SQL structure revision
+$ReleaseTime = strtotime('2015-04-06');

trunk/Common/Setup/Updates.php

@@ -1306 +1306 @@
   $Manager->Execute('ALTER TABLE `ModuleLink`
         MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
+}
+
+function UpdateTo735($Manager)
+{
+        $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkFreeAccess` (
+`Id` int(11) NOT NULL,
+`IPAddress` varchar(255) NOT NULL,
+`Time` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+        
+        $Manager->Execute('ALTER TABLE `NetworkFreeAccess`
+        ADD PRIMARY KEY (`Id`);');
+        
+        $Manager->Execute('ALTER TABLE `NetworkFreeAccess`
+        MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=1;');
+        
+        $Manager->Execute('ALTER TABLE `NetworkFreeAccess` ADD `Configured` INT NOT NULL ;');
+        $DbResult = $Manager->Execute('INSERT INTO `SchedulerAction` (`Id`, `Name`, `Class`) VALUES '.
+                '(NULL, "Konfigurace internetu zdarma", "ScheduleConfigureFreeAccess");');
+        $ActionId = $Manager->Database->insert_id;
+        $Manager->Execute('INSERT INTO `Scheduler` (`Id`, `Name`, `Enabled`, `Action`, 
+                `Log`, `LastExecutedTime`, `ScheduledTime`, `Period`) VALUES (NULL, "Internet zdarma", 
+                1, '.$ActionId.', "", NULL, "", 5);');
+        $Manager->Execute('ALTER TABLE `Scheduler` CHANGE `ScheduledTime` `ScheduledTime` DATETIME NULL;');
 }
 
@@ -1372 +1396 @@
         729 => array('Revision' => 730, 'Function' => 'UpdateTo730'),
         730 => array('Revision' => 731, 'Function' => 'UpdateTo731'),
+        731 => array('Revision' => 735, 'Function' => 'UpdateTo735'),
     ));
   }

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -88 +88 @@
         {
                 $Output = '';
-                $DbResult = $this->Database->select('FinanceBankAccount', 'Id', '(`AutoImport`=1) AND ((`TimeEnd` IS NULL) OR (`TimeEnd` > NOW()))');
+                $DbResult = $this->Database->select('FinanceBankAccount', 'Id, Comment', 
+                        '(`AutoImport`=1) AND ((`TimeEnd` IS NULL) OR (`TimeEnd` > NOW()))');
                 while($DbRow = $DbResult->fetch_assoc())
                 {                       

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php

@@ -133 +133 @@
 // Slow free internet
 $PacketMark = GetMarkByComment('free-out');
-$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-out', 'passthrough' => 'no');
+$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface, 
+  'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-out', 'passthrough' => 'yes');
 $PacketMark = GetMarkByComment('free-in');
-$ItemsFirewall[] = array('chain' => 'inet-1-in', 'in-interface' => $InetInterface, 'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-in', 'passthrough' => 'no');
-
+$ItemsFirewall[] = array('chain' => 'inet-1-in', 'in-interface' => $InetInterface, 
+        'action' => 'mark-packet', 'new-packet-mark' => $PacketMark, 'comment' => 'free-in', 'passthrough' => 'no');
+// Unregistred clients add to address list
+$ItemsFirewall[] = array('chain' => 'inet-1-out', 'out-interface' => $InetInterface, 'src-address' => '10.145.0.0/16', 
+        'action' => 'add-src-to-address-list', 'address-list' => 'unregistred', 'timeout' => '1d', 
+        'comment' => 'unregistred-clients');
 
 //print_r($ItemsFirewall);

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -109 +109 @@
 $Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'udp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
 
-
 // Chain for local interface
 $Items[] = array('chain' => 'srcnat', 'out-interface' => $LocalInterface, 'action' => 'jump', 'jump-target' => 'local-out', 'comment' => 'local-out');
 $Items[] = array('chain' => 'dstnat', 'in-interface' => $LocalInterface, 'action' => 'jump', 'jump-target' => 'local-in', 'comment' => 'local-in');
+
+// 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');
+// 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, 
+        'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 82, 'comment' => 'Redirect_unregistred');
 
 /*

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -28 +28 @@
   function DoStart()
   {
+        $this->System->Pages['zdarma'] = 'PageFreeAccess';
     $this->System->FormManager->RegisterClass('NetworkInterfaceUpDown', array(
       'Title' => 'Změny stavu rozhraní',
@@ -42 +43 @@
   }
 }
+
+class PageFreeAccess extends Page 
+{
+  var $FullTitle = 'Přístup zdarma k Internetu';
+  var $ShortTitle = 'Internet zdarma';
+  var $ParentClass = 'PagePortal';
+  var $AddressList = 'free-access';
+  var $Timeout;
+  
+  function __construct($System)
+  {
+        parent::__construct($System);
+        $this->Timeout = 24 * 60 * 60;
+  }
+  
+        function Show()
+        {
+                $IPAddress = GetRemoteAddress();
+                if(IsInternetAddr($IPAddress)) 
+                        return('<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>');  
+                $Time = time();
+        
+                $DbResult = $this->Database->select('NetworkFreeAccess', '*', '(IPAddress="'.$IPAddress.
+                        '") ORDER BY Time DESC LIMIT 1');
+                if($DbResult->num_rows > 0) 
+                {
+                        $DbRow = $DbResult->fetch_assoc();
+                        $ActivationTime = MysqlDateTimeToTime($DbRow['Time']); 
+      if(($ActivationTime + $this->Timeout) < $Time) 
+      {
+        $Activated = false;
+      } else $Activated = true;                 
+                } else $Activated = false;
+                
+                if(array_key_exists('a', $_GET)) 
+                {
+                  if($_GET['a'] == 'activate') 
+                  {
+                        if($Activated == false) 
+                        {
+                                $DbResult = $this->Database->insert('NetworkFreeAccess', 
+                                        array('IPAddress' => $IPAddress, 'Time' => TimeToMysqlDateTime(time()), 
+                                        'Configured' => 0));
+                                $ActivationTime = $Time;
+                                $Activated = true;
+                        }
+                  }     
+                }
+                $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 .= '<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>';
+                $Output .= '<p>Pokud jste platícím zákazníkem a přesto se vám zobrazuje tato stránka, tak pravděpodobně nemáte registrovano v síti vaše klientské zařízení.</p>';
+                
+                $PrefixMultiplier = new PrefixMultiplier();
+                if($Activated) $Output .= 'Aktivováno. Vyprší za '.$PrefixMultiplier->Add($ActivationTime + $this->Timeout - $Time, '', 4, 'Time');
+                  else $Output .= '<a href="?a=activate">Aktivovat</a>';
+                
+                return($Output);
+  }
+}
+
+class ScheduleConfigureFreeAccess extends SchedulerTask
+{
+        function Execute()
+        {
+                $Output = '';
+                $Commands = array();
+                $DbResult = $this->Database->select('NetworkFreeAccess', '`Id`, `IPAddress`', '(`Configured`=0)');
+                while($DbRow = $DbResult->fetch_assoc())
+                {
+                        $Commands[] = '/ip firewall address-list add address='.$DbRow['IPAddress'].
+                        ' list=free-access timeout=1d';
+                }
+                $DbResult = $this->Database->update('NetworkFreeAccess', '`Configured`=0', array('Configured' => 1));
+                
+                $Routerboard = new Routerboard($this->System->Config['MainRouter']['HostName']);
+                $Routerboard->UserName = $this->System->Config['MainRouter']['UserName'];
+                $Routerboard->Timeout = $this->System->Config['MainRouter']['ConnectTimeout'];
+                $Routerboard->Debug = true;
+                $Routerboard->ExecuteBatch(implode(';', $Commands));
+                                        
+                return($Output);
+        }
+}

trunk/Modules/Scheduler/Scheduler.php

@@ -64 +64 @@
           $DbResult = $this->Database->query('SELECT `Scheduler`.*, `SchedulerAction`.`Class` AS `Class` FROM `Scheduler` '.
                 'LEFT JOIN `SchedulerAction` ON `SchedulerAction`.`Id` = `Scheduler`.`Action` '.
-                'WHERE (`Scheduler`.`Enabled`=1) AND (`Scheduler`.`ScheduledTime` > `Scheduler`.`LastExecutedTime`)');
+                'WHERE (`Scheduler`.`Enabled`=1) AND (((`Scheduler`.`ScheduledTime` < "'.TimeToMysqlDateTime(time()).'") AND '.
+                ' (`Scheduler`.`LastExecutedTime` < `Scheduler`.`ScheduledTime`)) OR '. 
+                '(`Scheduler`.`ScheduledTime` IS NULL))');
           while($DbRow = $DbResult->fetch_assoc())
           {
@@ -76 +78 @@
                           $this->Database->update('Scheduler', 'Id='.$DbRow['Id'], 
                           array('Log' => $Output, 'LastExecutedTime' => 'NOW()'));
+                          if($DbRow['ScheduledTime'] == '') $NewScheduledTime = time() + $DbRow['Period'];
+                            else $NewScheduledTime = MysqlDateTimeToTime($DbRow['ScheduledTime']) + $DbRow['Period'];  
                         if($DbRow['Period'] != '') $this->Database->update('Scheduler', 'Id='.$DbRow['Id'],
-                                array('ScheduledTime' => TimeToMysqlDateTime((MysqlDateTimeToTime($DbRow['ScheduledTime']) + $DbRow['Period']))));                        
+                                array('ScheduledTime' => TimeToMysqlDateTime($NewScheduledTime)));                        
           }     
           echo('.');