Changeset 272 for trunk

Timestamp:

Jan 10, 2010, 5:02:00 PM (15 years ago)

Author:

george

Message:

• Upraveno: Zobrazení výpisů finančních operací klientů dle roků.
• Přidáno: Skript pro periodickou kontrolu adres DHCP serverů a zajištění přenositelnosti IP adres klientů.

Location:

trunk

Files:

• finance/user_state.php (modified) (5 diffs)
• sql/updates/272.sql (added)
• system/generators/address_portability.php (added)
• system/generators/firewall_mangle.php (modified) (1 diff)
• system/generators/firewall_nat.php (modified) (3 diffs)

trunk/finance/user_state.php

@@ -10 +10 @@
   function Show()
   {
-          $Finance = &$this->System->Modules['Finance'];
-          $this->System->Modules['Finance']->LoadTariffs(1);
+    $Finance = &$this->System->Modules['Finance'];
+    $this->System->Modules['Finance']->LoadTariffs(1);
 
     if(array_key_exists('old', $_GET))
-          {
-            $MemberId = GetMemberByIP(GetRemoteAddress());
+    {
+      $MemberId = GetMemberByIP(GetRemoteAddress());
       if($MemberId != '')
       {
@@ -21 +21 @@
         $Subject = $DbResult->fetch_assoc();
       } else die('Nemáte oprávnění');
-          } else
+    } else
     if(array_key_exists('Subject', $_GET))
-          {
-            if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
+    {
+      if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
       $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id='.$_GET['Subject']);
       $Subject = $DbResult->fetch_assoc();
     } else
-          {
-            if(!$this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
+    {
+      if(!$this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
       $UserId = $this->System->Modules['User']->User['Id'];
       $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id=(SELECT Subject FROM Member WHERE Id=(SELECT Member FROM User WHERE Id='.$UserId.'))');
       $Subject = $DbResult->fetch_assoc();
-          }
+    }
     
     if(!array_key_exists('show', $_GET)) $_GET['show'] = '';
@@ -39 +39 @@
     $Member = $DbResult->fetch_assoc();
     $TarifName = $Finance->Tariffs[$Member['InternetTariffCurrentMonth']]['Name'];
-          $TarifPrice = $Finance->Tariffs[$Member['InternetTariffCurrentMonth']]['Price'];
+    $TarifPrice = $Finance->Tariffs[$Member['InternetTariffCurrentMonth']]['Price'];
     $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';
 
+    if(array_key_exists('year', $_GET))
+    {
+      $DbResult = $this->Database->query('SELECT * FROM FinanceYear WHERE Id='.$_GET['year']);
+    } else 
+    {
+      $DbResult = $this->Database->query('SELECT * FROM FinanceYear ORDER BY Year DESC LIMIT 1');
+    }
+    $FinanceYearSelected = $DbResult->fetch_assoc();
+    $YearWhere = ' WHERE (Time >= "'.$FinanceYearSelected['DateStart'].'") AND (Time <= "'.$FinanceYearSelected['DateEnd'].'")';
+
+    $Output .= 'Roky: ';
+    $DbResult = $this->Database->query('SELECT * FROM FinanceYear');
+    while($FinanceYear = $DbResult->fetch_assoc())
+    {
+      $Year = '<a href="?year='.$FinanceYear['Id'].'">'.$FinanceYear['Year'].'</a> ';
+      if($FinanceYear['Id'] == $FinanceYearSelected['Id']) $Output .= '<strong>'.$Year.'</strong>';
+        else $Output .= $Year;
+    }
+    $Output .= '<br/><br/>';   
+    
     $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
       '(SELECT Text, TimeCreation as Time, -Value as Value, Bill FROM FinanceClaimsLiabilities WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
-    $DbResult = $this->Database->query('SELECT SUM(T1.Value) AS Total FROM '.$UserOperationTableQuery);
+    $DbResult = $this->Database->query('SELECT SUM(T1.Value) AS Total FROM '.$UserOperationTableQuery.$YearWhere);
     $DbRow = $DbResult->fetch_array();
     $Total = $DbRow['Total'];
     $Output .= 'Stav účtu: <strong>'.$Total.' Kč</strong<br /><br />';
 
+    
     // Tabulka operaci
     $Output .= 'Výpis operací pro subjekt '.$Subject['Name'].':<br />';
     $Output .= '<table style="font-size: smaller;" class="WideTable"><tr><th>Datum</th><th>Popis</th><th>Částka</th><th>Doklad</th></tr>';
     $Operations = array();
-    $DbResult = $this->Database->query('SELECT T1.* FROM '.$UserOperationTableQuery);
+    $DbResult = $this->Database->query('SELECT T1.* FROM '.$UserOperationTableQuery.$YearWhere);
     while($DbRow = $DbResult->fetch_array())
       $Operations[] = $DbRow;
@@ -69 +90 @@
     $Output .= 'Variabilní symbol pro platby: <strong>'.$Subject['Id'].'</strong><br><br>';
 
-          $Total = 0;
+    $Total = 0;
     $Output .= 'Rozpis měsíčního poplatku:<br><table class="WideTable">'.
       '<tr><th>Část</th><th>Cena [Kč]</th></tr>'.
       '<tr><td>Internet - tarif '.$TarifName.'</td><td>'.$TarifPrice.'</td></tr>';
     $Total += $TarifPrice;
-          if($Member['Hire'] != 0)
+    if($Member['Hire'] != 0)
     {
       $Output .= '<tr><td>Nájem</td><td>'.(-$Member['Hire']).'</td></tr>';
-            $Total -= $Member['Hire'];
+      $Total -= $Member['Hire'];
     }
-          if($Member['MonthlyPlus'] != 0)
+    if($Member['MonthlyPlus'] != 0)
     {
       $Output .= '<tr><td>Příjem za spotřebu</td><td>'.(-$Member['MonthlyPlus']).'</td></tr>';
-            $Total -= $Member['MonthlyPlus'];
+      $Total -= $Member['MonthlyPlus'];
     }
     $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$Total.'</strong></td></tr></table>';
@@ -103 +124 @@
       $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$TotalW.'</strong></td><td><strong>'.$TotalPrice.'</strong></td></tr>';
       $Output .= '</table>';
-        }
+  }
     $Output .= '</td></tr></table>';
     return($Output);

trunk/system/generators/firewall_mangle.php

@@ -117 +117 @@
 
 print_r($ItemsFirewall);
-//$Routerboard->ListUpdate($PathFirewall, array('chain', 'dst-address', 'in-interface', 'action', 'new-packet-mark', 'passthrough', 'comment', 'out-interface', 'src-address', 'jump-target'), $ItemsFirewall, array(), true);
+$Routerboard->ListUpdate($PathFirewall, array('chain', 'dst-address', 'in-interface', 'action', 'new-packet-mark', 'passthrough', 'comment', 'out-interface', 'src-address', 'jump-target'), $ItemsFirewall, array(), true);
 
 ?>

trunk/system/generators/firewall_nat.php

@@ -26 +26 @@
     $Name = RouterOSIdent($Name);
     echo($Name.'('.$Interface['LocalIP'].'), ');
-    $Items[] = array('chain' => 'srcnat', 'src-address' => $Interface['LocalIP'], 'out-interface' => $InetInterface, 'action' => 'src-nat',  'to-addresses' => $Interface['ExternalIP'], 'comment' => $Name);
-    $Items[] = array('chain' => 'dstnat', 'dst-address' => $Interface['ExternalIP'], 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name);
+    $Items[] = array('chain' => 'srcnat', 'src-address' => $Interface['LocalIP'], 'out-interface' => $InetInterface, 'action' => 'src-nat',  'to-addresses' => $Interface['ExternalIP'], 'comment' => $Name.'-out');
+    $Items[] = array('chain' => 'dstnat', 'dst-address' => $Interface['ExternalIP'], 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => $Interface['LocalIP'], 'comment' => $Name.'-in');
   }
 
@@ -41 +41 @@
     if($Subnet['Mask'] == 32) $Src = $Subnet['AddressRange'];
       else $Src = $Subnet['AddressRange'].'/'.$Subnet['Mask'];
-    $Items[] = array('chain' => 'srcnat', 'src-address' => $Src, 'out-interface' => $InetInterface, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name']);
+    $Items[] = array('chain' => 'srcnat', 'src-address' => $Src, 'out-interface' => $InetInterface, 'action' => 'src-nat', 'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-out');
     
     $Range = CIDRToAddressRange($Subnet['AddressRange'], $Subnet['Mask']);
@@ -48 +48 @@
     if($Subnet['ExtMask'] == 32) $Dest = $Subnet['ExtAddressRange'];
       else $Dest = $Subnet['ExtAddressRange'].'/'.$Subnet['ExtMask'];
-    $Items[] = array('chain' => 'dstnat', 'dst-address' => $Dest, 'in-interface' => $InetInterface, 'action' => 'dst-nat',  'to-addresses' => $Range, 'comment' => $Subnet['Name']);
+    $Items[] = array('chain' => 'dstnat', 'dst-address' => $Dest, 'in-interface' => $InetInterface, 'action' => 'dst-nat',  'to-addresses' => $Range, 'comment' => $Subnet['Name'].'-in');
   }
   echo("\n");