Changeset 157 for www

Timestamp:

Feb 18, 2009, 11:19:12 AM (16 years ago)

Author:

george

Message:

• Upraveno: Soubor include.php ve financích přepracován na třídy ve finance.php.

Location:

www

Files:

• finance/bills.php (modified) (2 diffs)
• finance/bills_manage.php (deleted)
• finance/clenove.php (modified) (3 diffs)
• finance/finance.php (modified) (1 diff)
• finance/include.php (deleted)
• finance/index.php (modified) (8 diffs)
• finance/inventory.php (modified) (1 diff)
• finance/manage.php (modified) (3 diffs)
• finance/monthly_overall.php (modified) (2 diffs)
• finance/prepocet.php (modified) (1 diff)
• finance/spotreba.php (modified) (2 diffs)
• finance/tarify.php (modified) (6 diffs)
• finance/user_state.php (modified) (4 diffs)
• finance/user_state_ip.php (modified) (4 diffs)
• finance/zarizeni.php (modified) (1 diff)
• finance/zivnost.php (modified) (2 diffs)
• global.php (modified) (1 diff)
• module.php (modified) (1 diff)

www/finance/bills.php

@@ -120 +120 @@
   }
 
-  function CreateBill($SubjectId, $Items, $TimeFrom, $TimeTo, $BillCode, $Type)
-  {
-    $this->Database->insert('FinanceBills', array('TimeCreate' => TimeToMysqlDateTime(time()), 'Subject' => $SubjectId, 'TimeFrom' => TimeToMysqlDateTime($TimeFrom), 'TimeTo' => TimeToMysqlDateTime($TimeTo), 'TimeDue' => TimeToMysqlDateTime($TimeFrom + 15*24*3600), 'BillCode' => $BillCode, 'Type' => 'invoice'));
+  function CreateBill($SubjectId, $Items, $TimeFrom, $TimeTo, $BillCode = '', $Type = 'invoice')
+  {
+    $this->Database->insert('FinanceBills', array('TimeCreate' => TimeToMysqlDateTime(time()), 'Subject' => $SubjectId, 'TimeFrom' => TimeToMysqlDateTime($TimeFrom), 'TimeTo' => TimeToMysqlDateTime($TimeTo), 'TimeDue' => TimeToMysqlDateTime($TimeFrom + 15 * 24 * 3600), 'BillCode' => $BillCode, 'Type' => $Type));
     $BillId = $this->Database->insert_id;
     foreach($Items as $Item)
@@ -192 +192 @@
   function HtmlToPdf($HtmlCode)
   {
-    $Output = shell_exec('echo "'.addslashes(from_utf8($HtmlCode)).'"|htmldoc --no-numbered --webpage --charset 8859-2 -t pdf -');
+    $Output = shell_exec('echo "'.addslashes(FromUTF8($HtmlCode)).'"|htmldoc --no-numbered --webpage --charset 8859-2 -t pdf -');
     return($Output);
   }

www/finance/clenove.php

@@ -1 +1 @@
 <?php
 include('../global.php');
-include('include.php');
-RecalculateTariffs(1);
 
 class FinanceUserList extends Page
@@ -11 +9 @@
   function Show()
   {
-    global $Tarify;
-
-    if($this->System->Modules['User']->CheckPermission('Finance', 'SubjectList'))
+    $Finance = $this->System->Modules['Finance'];
+        $this->System->Modules['Finance']->RecalculateTariffs(1);
+        if($this->System->Modules['User']->CheckPermission('Finance', 'SubjectList'))
     {
       // Seznam členů
@@ -43 +41 @@
         $TotalCash += $Row['Cash'];
         if($Row['Cash'] < 0) $Row['Cash'] = '<span style="color: red;">'.$Row['Cash'].'</span>';
-        $Tarif = $Tarify[$Row['inet_tarif_now']]['name'];
-        $PristiTarif = $Tarify[$Row['inet_tarif_next']]['name'];
+        $Tarif = $Finance->Tarify[$Row['inet_tarif_now']]['name'];
+        $PristiTarif = $Finance->Tarify[$Row['inet_tarif_next']]['name'];
         $Output .= '<tr><td><a href="user_state.php?id='.$Row['id'].'">'.$Row['Fullname'].'</a></td>';
         //<td align="right">'.$Row['network_device'].'</td>

www/finance/finance.php

@@ -3 +3 @@
 class Finance extends Module
 {
+  var $kWh;
+  var $Internet;
+  var $Sprava;
+  var $DatumOdecteni;
+  var $InternetUsers;
+  var $SpravaUsers;
+  var $InternetSegmentId = 21;
+  var $MaxSpeed;
+  var $RealMaxSpeed;
+  var $SpeedReserve;
+  var $BaseSpeedElement;
+  var $TotalConsumption;
+  var $UserIdNetwork = 46;
+  var $BaseTariffPrice;
+  var $TopTariffPrice;
+  var $TotalPaid;
+  var $TotalInternetPaid;
+  var $Tarify;
+  
+  function RecalculateTariffs($Period = 1)
+  {
+    $ResidualPrice = $this->Internet;
+    $ResidualSpeed = $this->MaxSpeed;
+  
+    $Tarify = array();
+    $DbResult = $this->Database->select('finance_tariffs', '*', 'period='.$Period.' ORDER BY id,speed_factor');
+    while($Tariff = $DbResult->fetch_array())
+    {
+      $Tarify[$Tariff['id']] = $Tariff;
+    }  
 
+    if($Period == 0) $Column = 'now'; else $Column = 'next';
+    $TotalUserCount = 0;
+    $TotalUnits = 0;
+    $TotalTarifUnits = 0;
+    $TotalTarifSpeedUnits = 0;
+    foreach($Tarify as $Index => $Tarif)
+    {
+      $DbResult = $this->Database->select('users', 'COUNT(*)', 'inet_tarif_'.$Column.'='.$Index.' AND inet=1 AND role=2');
+      $Row = $DbResult->fetch_array();
+      $Tarify[$Index]['user_count'] = $Row[0];    
+      switch($Tarif['group_id'])
+      {
+        case 1:
+          $TotalUserCount = $TotalUserCount + $Tarify[$Index]['user_count'];
+          $Tarify[$Index]['total_units'] = $Tarify[$Index]['price_units'] * $Tarify[$Index]['user_count'];
+          $TotalTarifUnits = $TotalTarifUnits + $Tarify[$Index]['total_units'];
+    
+          if($Index == 3) // Zarizeni site v tarifu 3 neplati penize, ale ma internet
+            $Tarify[$Index]['total_speed_factor'] = $Tarify[$Index]['speed_factor'] * ($Tarify[$Index]['user_count']+1);
+            else $Tarify[$Index]['total_speed_factor'] = $Tarify[$Index]['speed_factor'] * $Tarify[$Index]['user_count'];
+          $TotalTarifSpeedUnits = $TotalTarifSpeedUnits + $Tarify[$Index]['total_speed_factor'];
+          break;
+        case 2:
+          $ResidualPrice -= $Tarif['price'] * $Tarify[$Index]['user_count'];
+          $ResidualSpeed -= $Tarif['min_speed'] * $Tarify[$Index]['user_count'];
+          $Tarify[$Index]['total_units'] = $Tarify[$Index]['price_units'] * $Tarify[$Index]['user_count'];
+          break;
+        case 3:
+          $Tarify[$Index]['total_units'] = $Tarify[$Index]['price_units'] * $Tarify[$Index]['user_count'];
+          break;
+      }
+    }
+    //$PricePerUnit = $TopTariffPrice / ;  // $ResidualPrice / $TotalTarifUnits;
+    $SpeedPerUnit = $ResidualSpeed * 1024 / $TotalTarifSpeedUnits;
+  
+    // Recalculate price
+    foreach($Tarify as $Index => $Tarif)
+    {
+      switch($Tarif['group_id'])
+      {
+        case 1:
+          $Tarify[$Index]['price'] = $this->BaseTariffPrice + round($this->TopTariffPrice * $Tarif['price_units'] / 10) * 10;
+          $Tarify[$Index]['min_speed'] = round($Tarif['speed_factor'] * $SpeedPerUnit);
+          $Tarify[$Index]['max_speed'] = round($Tarify[$Index]['speed_factor'] * $this->BaseSpeedElement * 1024);
+          break;
+        case 2:
+          $Tarify[$Index]['min_speed'] = $Tarify[$Index]['min_speed'] * 1024;
+          $Tarify[$Index]['max_speed'] = $Tarify[$Index]['max_speed'] * 1024;
+          break;
+        case 3:
+          $Tarify[$Index]['price'] = $this->BaseTariffPrice + round($this->TopTariffPrice * $Tarif['price_units']);
+          $Tarify[$Index]['min_speed'] = $Tarify[$Index]['min_speed'] * 1024;
+          $Tarify[$Index]['max_speed'] = $Tarify[$Index]['max_speed'] * 1024;
+          break;
+      }
+      $Tarify[$Index]['aggregation'] = '1:'.round($Tarify[$Index]['max_speed'] / $Tarify[$Index]['min_speed']);
+    }
+        $this->Tarify = $Tarify;
+  }
+
+  function LoadMonthParameters($Period = 1) // 0 - now, 1 - next month
+  {   
+    $DbResult = $this->Database->query("SELECT * FROM finance_charge WHERE period=".$Period);
+    $Row = $DbResult->fetch_array();
+    $this->kWh = $Row['kWh'];
+    $this->Internet = $Row['internet'];
+    $this->Sprava = $Row['administration_per_user'];
+    $this->RealMaxSpeed = $Row['internet_speed'];
+    $this->SpeedReserve = $Row['internet_speed_reserve'];
+    $this->BaseSpeedElement = $Row['base_speed_element'];
+    $this->MaxSpeed = $this->RealMaxSpeed - $this->SpeedReserve;
+    $this->TopTariffPrice = $Row['TopTariffPrice'];
+    $this->BaseTariffPrice = $Row['BaseTariffPrice'];
+
+    $DbResult = $this->Database->query("SELECT COUNT(*) FROM users WHERE inet=1 AND role=2");
+    $Row = $DbResult->fetch_array();
+    $this->InternetUsers = $Row[0];
+ 
+    $DbResult = $this->Database->query("SELECT COUNT(*) FROM users WHERE overheads=1 AND role=2");
+    $SpravaUsers = $DbResult->fetch_array();
+    $this->SpravaUsers = $SpravaUsers[0];
+    $DbResult = $this->Database->query("SELECT SUM(consumption) FROM network_segments");
+    $TotalConsumption = $DbResult->fetch_array();
+    $this->TotalConsumption = $TotalConsumption[0];
+
+    $DbResult = $this->Database->query("SELECT SUM(`monthly`) as `internet`, SUM(`monthly` - `plus`) as `real` FROM users WHERE role=2");
+    $Row = $DbResult->fetch_array();
+    $this->TotalInternetPaid = $Row['internet'];
+    $this->TotalPaid = $Row['real'];
+  
+    $this->RecalculateTariffs($Period);
+  }
+
+  function W2Kc($Spotreba)
+  {
+    return(round($Spotreba * 0.72 * $this->kWh));
+  }
+
+  function GetNextDocumentLineNumber($Id)
+  {    
+    $DbResult = $this->Database->query('SELECT Shortcut, NextNumber FROM DocumentLine WHERE Id='.$Id);
+    $DbRow = $DbResult->fetch_assoc();
+    $Result = $DbRow['Shortcut'].$DbRow['NextNumber'];
+    $this->Database->query('UPDATE DocumentLine SET NextNumber = NextNumber + 1 WHERE Id='.$Id);
+    return($Result);
+  }
 }
 

www/finance/index.php

@@ -1 +1 @@
 <?php
 include_once('../global.php');
-include_once('include.php');
 
 class FinanceOverview extends Page
@@ -10 +9 @@
   function Show()
   {
-    global $Config, $RealMaxSpeed, $Internet, $InternetUsers, $kWh, $TotalInternetPaid, $SpravaUsers, $Sprava, $UserIdNetwork;
-
-    $Output = '<table><tr><td valign="top">';
+    $Finance = $this->System->Modules['Finance'];
+        $Output = '<table><tr><td valign="top">';
 
     if(GetMemberByIP(GetRemoteAddress()) > 0) $Output .= '<a href="user_state_ip.php">Vaše finanční operace</a> (Tato volba je také přístupná po přihlášení do systému v uživatelském menu).<br /><br /><br />';
@@ -21 +19 @@
     if($this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) $Output .= '<a href="clenove.php">Seznam členů</a><br />';
     $Output .= '<a href="spotreba.php">Spotřeba energie</a><br />';
-    $Output .= '<a href="'.$Config['Web']['RootFolder'].'/aktuality/index.php?category=9">Investice v síti</a><br />';
+    $Output .= '<a href="'.$this->System->Config['Web']['RootFolder'].'/aktuality/index.php?category=9">Investice v síti</a><br />';
     //$Output .= '<a href="faktury/">Faktury za internet</a><br />';
     //$Output .= '<a href="inventory.php">Výpis skladových zásob</a><br />';
@@ -29 +27 @@
     $DbResult = $this->Database->query("SELECT * FROM finance_monthly_overall ORDER BY date DESC LIMIT 0,1");
     $Row = $DbResult->fetch_array();
-    $Output .= 'Platba za internetovou linku ('.$RealMaxSpeed.'/'.$RealMaxSpeed.' kbit/s): <strong>'.$Internet.' Kč</strong><br />';
+    $Output .= 'Platba za internetovou linku ('.$Finance->RealMaxSpeed.'/'.$Finance->RealMaxSpeed.' kbit/s): <strong>'.$Finance->Internet.' Kč</strong><br />';
 
     $DbResult = $this->Database->query("SELECT COUNT(*) FROM users WHERE role=2");
@@ -42 +40 @@
     $Row4 = $DbResult->fetch_array();
     $Output .= 'Celkem peněz na účtech: <strong>'.$Row4[0].' Kč</strong><br />';
-    $Output .= 'Stanovená cena jedné kWh: <strong>'.$kWh.' Kč</strong><br />';
+    $Output .= 'Stanovená cena jedné kWh: <strong>'.$Finance->kWh.' Kč</strong><br />';
     //echo('Komunitou stanovený poplatek za správu sítě pro jednoho uživatele: <strong>'.$Sprava.' Kč</strong><br />');
     $DbResult = $this->Database->query("SELECT SUM(family) FROM users WHERE role=2");
@@ -55 +53 @@
     $Output .= '</td><td valign="top">';
 
-    $UsersPayment = $TotalInternetPaid;
-    $NetworkManagement = $Sprava * $SpravaUsers;
+    $UsersPayment = $Finance->TotalInternetPaid;
+    $NetworkManagement = $Finance->Sprava * $Finance->SpravaUsers;
     $TotalGain = 0;
     $TotalExpense = 0;
     $DbResult = $this->Database->query("SELECT SUM(consumption) FROM network_devices WHERE used=1");
     $Row = $DbResult->fetch_array();
-    $TotalConsumption = W2Kc($Row[0]);
+    $TotalConsumption = $this->System->Modules['Finance']->W2Kc($Row[0]);
 
     $Output .= 'Měsíční vyúčtování:<br />
@@ -70 +68 @@
     $TotalGain += $UsersPayment;
     $Output .= '<tr><td><strong>Celkem</strong></td><td align="right"><strong>'.$TotalGain.'</strong></td></tr>';
-    $Output .= '<tr><th colspan="2">Výdaje</th></tr><tr><td>Internet</td><td align="right">'.$Internet.'</td></tr>';
-    $TotalExpense += $Internet;
+    $Output .= '<tr><th colspan="2">Výdaje</th></tr><tr><td>Internet</td><td align="right">'.$Finance->Internet.'</td></tr>';
+    $TotalExpense += $Finance->Internet;
     $Output .= '<tr><td>Správa sítě</td><td align="right">'.$NetworkManagement.'</td></tr>';
     $TotalExpense += $NetworkManagement;
@@ -81 +79 @@
     $Output .= '<tr><td>Převod do dalšího měsíce</td><td align="right">'.($TotalGain - $TotalExpense).'</td></tr>';
     $Output .= '</table><br />';
-    $DbResult = $this->Database->select('users', 'cash', 'id='.$UserIdNetwork);
+    $DbResult = $this->Database->select('users', 'cash', 'id='.$Finance->UserIdNetwork);
     $Row = $DbResult->fetch_array();
     $NetworkCash = $Row['cash'];
-    $Output .= 'Stav účtu sítě: '.$NetworkCash.' Kč<br /><a href="clenove.php?show=user&amp;id='.$UserIdNetwork.'">Výpis účtu</a><br />';
+    $Output .= 'Stav účtu sítě: '.$NetworkCash.' Kč<br /><a href="clenove.php?show=user&amp;id='.$Finance->UserIdNetwork.'">Výpis účtu</a><br />';
 
     $Output .= '</td></tr></table>';

www/finance/inventory.php

@@ -1 +1 @@
 <?php
 include_once('../global.php');
-include_once('include.php');
 
 class FinanceStoragePage extends Page

www/finance/manage.php

@@ -1 +1 @@
 <?php
 include_once('../global.php');
-include_once('include.php');
 
 class FinanceManagePage extends Page
@@ -10 +9 @@
   function Show()
   {
-    //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í');
 
     if(array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation']; else $Operation = '';
+        //$Operation = 'ImportOldData';
     switch($Operation)
     {
@@ -56 +56 @@
         $Output .= '<a href="?Operation=ConvertPDFToFile">Převést data z databáze do souborů</a><br>';
         $Output .= '<a href="?Operation=Bills">Správa dokladů</a><br>';
+                $Output .= '<a href="prepocet.php">Přepočet financí</a><br>';
     }
     return($Output);

www/finance/monthly_overall.php

@@ -1 +1 @@
 <?php
 include_once('../global.php');
-include_once('include.php');
 
 class FinanceMonthlyOverallPage extends Page
@@ -12 +11 @@
     global $MonthNames;
 
-    $Output = '<table cellspacing="0" cellpadding="2" border="1"><tr><th>Rok</th><th>Měsíc</th><th>Internet [Kč]</th><th>Účastníků</th><th>Správa [Kč/účastníka]</th><th>Správa [Kč]</th><th>Spotřeba [Kč/kWh]</th><th>Spotřeba [Kč]</th><th>Obrat [Kč]</th><th>Průměrná cena [Kč/účastníka]</th><th align="center">Investice [Kč]</th></tr>';
+    $Output = '<table class="WideTable"><tr><th>Rok</th><th>Měsíc</th><th>Internet [Kč]</th><th>Účastníků</th><th>Správa [Kč/účastníka]</th><th>Správa [Kč]</th><th>Spotřeba [Kč/kWh]</th><th>Spotřeba [Kč]</th><th>Obrat [Kč]</th><th>Průměrná cena [Kč/účastníka]</th><th align="center">Investice [Kč]</th></tr>';
     $Total = array('money' => 0, 'administration_total' => 0, 'consumption_total' => 0, 'total_paid' => 0, 'investment' => 0);
     $DbResult = $this->Database->select('finance_monthly_overall', '*', '1 ORDER BY date DESC');

www/finance/prepocet.php

@@ -1 +1 @@
 <?php
-include('../style.php');
-include('include.php');
-include('bills.php');
-
-ShowHeader('Přepočet financí', 'Přepočet financí');
-
-function RecalculateUsersFinance()
+include_once('../global.php');
+
+class FinanceRecalculatePage extends Page
 {
-  global $InternetSegmentId, $Tarify, $Sprava, $Database, $UserIdNetwork; 
-
-  echo("Aktualizuju finance uživatelů...<br>\n");
-  $DbResult = $Database->query("SELECT * FROM users WHERE role=2 OR id=".$UserIdNetwork);  // Select network members only
-  while($Row = $DbResult->fetch_array())
-  {
-    $DbResult2 = $Database->query("SELECT SUM(money) FROM finance_operations WHERE user=".$Row['id']);  // Account state 
-    $Row3 = $DbResult2->fetch_array();
-    $DbResult2 = $Database->query("SELECT SUM(consumption) FROM network_devices WHERE user=".$Row['id']." AND used=1");
-    $Row4 = $DbResult2->fetch_array();
-
-    $Price = 0;
-    $Consumption = 0;
-    $ID = $Row['network_segment'];
-    while($ID != 0)
-    {
-      $DbResult2 = $Database->query("SELECT * FROM network_segments WHERE id=".$ID);
+  var $FullTitle = 'Přepočet financí';
+  var $ShortTitle = 'Přepočet financí';
+  
+  function RecalculateUsersFinance()
+  {
+    $Finance = &$this->System->Modules['Finance'];
+    $Output = 'Aktualizuju finance uživatelů...<br />';
+    $DbResult = $this->Database->query('SELECT * FROM users WHERE role=2 OR id='.$Finance->UserIdNetwork);  // Select network members only
+    while($Row = $DbResult->fetch_array())
+    {
+      $DbResult2 = $this->Database->query('SELECT SUM(money) FROM finance_operations WHERE user='.$Row['id']);  // Account state 
+      $Row3 = $DbResult2->fetch_array();
+      $DbResult2 = $this->Database->query('SELECT SUM(consumption) FROM network_devices WHERE user='.$Row['id'].' AND used=1');
+      $Row4 = $DbResult2->fetch_array();
+
+      $Price = 0;
+      $Consumption = 0;
+      $ID = $Row['network_segment'];
+      while($ID != 0)
+      {
+        $DbResult2 = $this->Database->query('SELECT * FROM network_segments WHERE id='.$ID);
+        $Row2 = $DbResult2->fetch_array();
+        if(!(($Row['inet_hw'] == 0) and ($ID == $Finance->InternetSegmentId)))
+        {
+          $Price += $Row2['price'] / $Row2['users'];
+          $Consumption += $Row2['consumption'] / $Row2['users_overheads'];
+        }
+        //echo($ID.' '.$InternetSegment.' '.$InternetSegmentId.' '.$Row['inet_hw'].' '.$Price.'<br>');
+        $ID = $Row2['parent'];
+      }
+      $Monthly = 0;
+      $MonthlyInet = $Finance->Tarify[$Row['inet_tarif_next']]['price'];
+      if($Row['inet'] == 1) $Monthly += $MonthlyInet; 
+      //if($Row['overheads'] == 1) $Monthly += $Sprava; // + W2Kc($Consumption); 
+      //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
+      $Monthly = round($Monthly);
+      //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
+      $this->Database->update('users', 'id='.$Row['id'], array('network_device' => $Price, 'monthly_inet' => $MonthlyInet, 'monthly' => $Monthly, 'consumption' => $this->System->Modules['Finance']->W2Kc($Consumption), 'cash' => $Row3[0], 'plus' => $Finance->W2Kc($Row4[0])));
+    }
+        return($Output);
+  }
+
+  function RecalculateSegmentParameters()
+  {
+    $Finance = &$this->System->Modules['Finance'];
+        $Output = 'Aktualizuju parametry segmentů...<br />';
+    $this->Database->query('UPDATE network_segments SET users = 0, users_overheads = 0');               // Vynulovat počty uživatelů
+    $DbResult = $this->Database->query('SELECT * FROM network_segments');
+    while($Row = $DbResult->fetch_array())
+    {
+      //echo('Segment '.$Row['name'].'<br>');
+      $DbResult2 = $this->Database->query('SELECT users FROM network_segments WHERE id='.$Row['id']);
+      $RowP = $DbResult2->fetch_array();
+      $DbResult2 = $this->Database->query("SELECT users_overheads FROM network_segments WHERE id=".$Row['id']);
+      $RowP2 = $DbResult2->fetch_array();
+
+      $DbResult2 = $this->Database->query("SELECT SUM(price) as Price, SUM(consumption) as Consumption FROM network_devices WHERE segment=".$Row['id']." AND used=1");
       $Row2 = $DbResult2->fetch_array();
-      if(!(($Row['inet_hw'] == 0) and ($ID == $InternetSegmentId)))
-      {
-        $Price += $Row2['price'] / $Row2['users'];
-        $Consumption += $Row2['consumption'] / $Row2['users_overheads'];
-      }
-      //echo($ID.' '.$InternetSegment.' '.$InternetSegmentId.' '.$Row['inet_hw'].' '.$Price.'<br>');
-      $ID = $Row2['parent'];
-    }
-    $Monthly = 0;
-    $MonthlyInet = $Tarify[$Row['inet_tarif_next']]['price'];
-    if($Row['inet'] == 1) $Monthly += $MonthlyInet; 
-    //if($Row['overheads'] == 1) $Monthly += $Sprava; // + W2Kc($Consumption); 
-    //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
-    $Monthly = round($Monthly);
-    //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
-    $Database->update('users', 'id='.$Row['id'], array('network_device' => $Price, 'monthly_inet' => $MonthlyInet, 'monthly' => $Monthly, 'consumption' => W2Kc($Consumption), 'cash' => $Row3[0], 'plus' => W2Kc($Row4[0])));
+      $DbResult2 = $this->Database->query("SELECT COUNT(*) FROM users WHERE network_segment=".$Row['id'].' AND hw=1');
+      $Row3 = $DbResult2->fetch_array();
+      $DbResult2 = $this->Database->query("SELECT COUNT(*) FROM users WHERE network_segment=".$Row['id'].' AND overheads=1');
+      $Row5 = $DbResult2->fetch_array();
+      $ID = $Row['parent'];
+      while($ID != 0)
+      {
+        //echo($ID.', ');
+        $DbResult2 = $this->Database->query("SELECT * FROM network_segments WHERE id=".$ID);
+        $Row4 = $DbResult2->fetch_array();
+        $this->Database->update('network_segments', 'id='.$Row4['id'], array('users' => ($Row4['users'] + $Row3[0]), 'users_overheads' => ($Row4['users_overheads'] + $Row5[0])));
+        $ID = $Row4['parent'];
+      }
+      //echo('Pocet '.$Row3[0].','.$Row['hosts'].'<br>');
+      $this->Database->update('network_segments', 'id='.$Row['id'], array('price' => $Row2['Price'], 'users' => ($Row3[0] + $RowP['users']), 'consumption' => $Row2['Consumption'], 'users_overheads' => ($Row5[0] + $RowP2['users_overheads'])));
+    }
+
+    // Zkorigovat segment Internet
+    $DbResult = $this->Database->select('users', 'COUNT(*)', 'inet_hw=1');
+    $Row = $DbResult->fetch_array();
+    $DbResult = $this->Database->select('users', 'COUNT(*)', 'inet=1');
+    $Row2 = $DbResult->fetch_array();
+    $DbResult = $this->Database->update('network_segments','id='.$Finance->InternetSegmentId, array('users' => $Row[0], 'users_overheads' => $Row2[0]));
+    return($Output);
+  }
+
+  function CreateMonthlyOverallBill()
+  {
+    global $Sprava, $SpravaUsers, $TotalConsumption, $UserIdNetwork, $Internet, $TotalInternetPaid;
+
+    $TotalConsumptionPrice = $this->System->Modules['Finance']->W2Kc($TotalConsumption);
+ 
+    $Output .= "Spotřeba energie: ".-$TotalConsumptionPrice."<br />";
+    $Output .= "Správa sítě: ".-($Sprava * $SpravaUsers)."<br>";
+    $Output .= "Internet: ".-$Internet."<br>";
+    $Output .= "Poplatky učástníků: ".$TotalInternetPaid."<br>";
+
+    $this->Database->insert('finance_operations', array('money' => -$TotalConsumptionPrice, 'user' => $UserIdNetwork, 'type' => 2, 'date' => 'NOW()', 'comment' => 'Spotřeba energie', 'group' => 2));
+    $this->Database->insert('finance_operations', array('money' => -($Sprava * $SpravaUsers), 'user' => $UserIdNetwork, 'type' => 2, 'date' => 'NOW()', 'comment' => 'Správa sítě', 'group' => 2));
+    $this->Database->insert('finance_operations', array('money' => -$Internet, 'user' => $UserIdNetwork, 'type' => 2, 'date' => 'NOW()', 'comment' => 'Internet', 'group' => 2));
+    $this->Database->insert('finance_operations', array('money' => $TotalInternetPaid, 'user' => $UserIdNetwork, 'type' => 2, 'date' => 'NOW()', 'comment' => 'Poplatky učástníků', 'group' => 2));
+        return($Output);
+  }
+
+  function DiscountNetworkDevicePrice()
+  {
+        $Output = '';
+    $DbResult = $this->Database->query("SELECT *,CONCAT(second_name, ' ', first_name) as fullname FROM users WHERE role=2");
+    while($Row = $DbResult->fetch_array())
+    {
+      $Output .= $Row['fullname'].': '.($Row['network_device'])."<br />";
+      $this->Database->insert('finance_operations', array('money' => (-$Row['network_device']), 'user' => $Row['id'], 'type' => 2, 'date' => 'NOW()', 'comment' => 'Jednorázový poplatek za společné zařízení', 'group' => 1));
+    //echo($Database->LastQuery."<br>\n");
+    }
+        return($Output);
+  }
+
+
+  function Show()
+  {
+    if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
+        $Output = '';
+
+    $Finance = &$this->System->Modules['Finance'];
+        
+    // Načti poslední měsíční přehled a nastavení
+    $DbResult = $this->Database->select('finance_monthly_overall', '*', '1 ORDER BY date DESC LIMIT 1');
+    $Overall = $DbResult->fetch_array();
+
+    $Output -= 'Datum: '.date('j.n.Y')."<br />";
+    
+    $Datum = explode('-', $Overall['date']);
+    $Mesic = date("m") + 0;
+
+    $Output .= $this->RecalculateSegmentParameters();
+    $Output .= $Finance->RecalculateTariffs();
+    //DiscountNetworkDevicePrice();
+    //$InvoiceGenerator->CustomGenerate();
+    $Output .= $this->RecalculateUsersFinance();
+
+    // Celkovy prehled
+    $DbResult = $this->Database->query("SELECT SUM(price) FROM network_devices WHERE used=1");
+    $Row4 = $DbResult->fetch_array();
+    $Output .= "Celková cena zařízení: Zařízení(".$Row4[0];
+    $DbResult = $this->Database->query("SELECT SUM(price) FROM network_segments");
+    $Row = $DbResult->fetch_array();
+    $Output .= "), Segmenty(".$Row[0];
+    $DbResult = $this->Database->query("SELECT SUM(network_device) FROM users");
+    $Row5 = $DbResult->fetch_array();
+    $Output .= "), Uživatelé(".$Row5[0].")<br>\n";
+    $DbResult = $this->Database->query("SELECT SUM(cash) FROM users WHERE role=2");
+    $Row6 = $DbResult->fetch_array();
+    $Output .= "Stav pokladny: Uživatelé(".$Row6[0].")";
+    $DbResult = $this->Database->query("SELECT SUM(money) FROM finance_operations WHERE `group`=1"); // Položky uživatelů
+    $Row2 = $DbResult->fetch_array();
+    $Output .= ", Operace-Zařízení(".($Row2[0] - $Row4[0]).")<br>\n";
+    $Output .= "Rozdíl peněz v operacích: ".($Row2[0] - $Row6[0] - $Row4[0])." <br>\n";
+
+
+    $DbResult = $this->Database->query("SELECT SUM(consumption) FROM network_devices WHERE used=1");
+    $Row = $DbResult->fetch_array();
+    $CelkemSpotreba = $Finance->W2Kc($Row[0]);
+
+    $SpravaCelkem = $Finance->Sprava * $Finance->SpravaUsers;
+    $Output .= "Kontrola placení (Zaplaceno-Sprava-Internet): ".$Finance->TotalPaid."-".$SpravaCelkem."-".$Finance->Internet."=".($Finance->TotalPaid - $SpravaCelkem - $Finance->Internet)."<br>\n\n";
+
+    // Zkontrolovat odečtení měsíčního poplatku
+    //$Mesic = '1';
+    $Output .= 'Kontrola odečtení poplatků: Poslední měsíc-'.round($Datum[1]).' Aktuální měsíc-'.$Mesic."<br>\n";
+    if($Mesic != $Datum[1])
+    {
+      $Output .= "Odečítám měsíční poplatek...<br>\n";
+
+      $BillingPeriodMonthCount = array('never' => 0, 'monthly' => 1, 'quarterly' => 3, 'half-yearly' => 6, 'yearly' => 12);
+
+      // Generuj účetní položky
+      $DbResult = $this->Database->query("SELECT *, CONCAT(second_name, ' ', first_name) as fullname FROM users WHERE (role = 2)");
+      while($User = $DbResult->fetch_array())
+      {
+        $Output .= $User['fullname'].': ';
+        $MonthCount = $BillingPeriodMonthCount[$User['BillingPeriod']];
+        if(($MonthCount > 0) and (((($Mesic - 1) % 12) % $MonthCount) == 0) and ($User['inet_tarif_now'] != 6))
+        {
+          //echo($Mesic.'%'.$MonthCount.'='.($Mesic % $MonthCount).' ');
+          $PayPerMonth = -($User['plus'] - $User['monthly']);
+          $PayPerPeriod = $PayPerMonth * $MonthCount;
+          $PeriodFrom = mktime(0, 0, 0, date('n'), 1, date('Y'));
+          $PeriodTo = mktime(0, 0, 0, date('n') + $MonthCount - 1, date('t', mktime(0, 0, 0, date('n') + $MonthCount - 1, 1, date('Y'))) , date('Y'));
+          $TimePeriodText = date('j.n.Y', $PeriodFrom).' - '.date('j.n.Y', $PeriodTo);
+          $Output .= $TimePeriodText.': '.$PayPerMonth." * ".$MonthCount." = ".$PayPerPeriod."<br />\n";
+          $BillCode = $Finance->GetNextDocumentLineNumber(6); // Faktury vydané
+          $BillId = $this->System->Modules['Bill']->CreateBill($User['id'], array(array('Description' => 'Připojení k síti', 'Price' => $PayPerPeriod, 'Quantity' => 1)), $PeriodFrom, $PeriodTo, $BillCode);
+          $this->Database->insert('finance_operations', array('money' => -$PayPerPeriod, 'user' => $User['id'], 'type' => 2, 'date' => 'NOW()', 'comment' => 'Připojení k síti za období '.$TimePeriodText, 'group' => 1, 'bill_id' => $BillId, 'BillCode' => $BillCode));
+        } else $Output .= ("<br />");
+      }
+      $Output .= 'Měním aktuální parametry sítě...<br>\n';
+
+      // Update finance charge
+      $this->Database->delete('finance_charge', 'period=0');
+      $DbResult = $this->Database->select('finance_charge', '*', 'period=1');
+      $Charge = $DbResult->fetch_array();
+      //print_r($Charge);
+      $DbResult = $this->Database->insert('finance_charge', array('period' => 0, 'internet' => $Charge['internet'], 'internet_speed' => $Charge['internet_speed'], 'internet_speed_reserve' => $Charge['internet_speed_reserve'], 'administration_per_user' => $Charge['administration_per_user'], 'kWh' => $Charge['kWh'], 'base_speed_element' => $Charge['base_speed_element'], 'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice']));
+
+      $Output .= "Přidávám měsíční přehled...<br>\n";
+
+      $this->Database->insert('finance_monthly_overall', array('date' => 'NOW()', 'money' => $Finance->Internet, 'kWh' => $Finance->kWh, 'administration' => $Finance->Sprava, 'administration_total' => $SpravaCelkem, 'consumption_total' => $CelkemSpotreba, 'total_paid' => $Finance->TotalPaid, 'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice'], 'member_count' => $Finance->InternetUsers));
+
+      $Output .= "Měním aktuální tarify....<br>\n";
+
+      // Update tarrifs
+      $this->Database->delete('finance_tariffs', 'period=0');
+      $DbResult = $this->Database->select('finance_tariffs', '*', 'period=1');
+      while($Tariff = $DbResult->fetch_array())
+      {
+        $this->Database->insert('finance_tariffs', array('period' => 0, 'name' => $Tariff['name'], 'id' => $Tariff['id'],'speed_factor' => $Tariff['speed_factor'], 'price_units' => $Tariff['price_units'], 'group_id' => $Tariff['group_id'], 'min_speed' => $Tariff['min_speed'], 'max_speed' => $Tariff['max_speed'], 'price' => $Tariff['price']));
+      }
+
+      $Output .= "Měním aktuální tarify uživatelů...<br>\n";
+
+      // Update tariff user selection
+      $DbResult = $this->Database->query("SELECT id,inet_tarif_next FROM users WHERE role=2");
+      while($User = $DbResult->fetch_array())
+      {
+        $this->Database->update('users', 'id='.$User['id'], array('inet_tarif_now' => $User['inet_tarif_next']));
+      }
+
+      $Output .= $this->System->Modules['Finance']->RecalculateTariffs();
+          $this->RecalculateUsersFinance();
+      //CreateMonthlyOverallBill();
+      $this->RecalculateUsersFinance();
+
+      // Restart traffic shaping
+      $this->Database->update('services_restart', 'id=3', array('changed' => 1));
+    }
+        return($Output);
   }
 }
 
-function RecalculateSegmentParameters()
-{
-  global $Database, $InternetSegmentId;
-
-  echo("Aktualizuju parametry segmentů...<br>\n");
-  $Database->query("UPDATE network_segments SET users = 0, users_overheads = 0");               // Vynulovat počty uživatelů
-  $DbResult = $Database->query("SELECT * FROM network_segments");
-  while($Row = $DbResult->fetch_array())
-  {
-    //echo('Segment '.$Row['name'].'<br>');
-    $DbResult2 = $Database->query("SELECT users FROM network_segments WHERE id=".$Row['id']);
-    $RowP = $DbResult2->fetch_array();
-    $DbResult2 = $Database->query("SELECT users_overheads FROM network_segments WHERE id=".$Row['id']);
-    $RowP2 = $DbResult2->fetch_array();
-
-    $DbResult2 = $Database->query("SELECT SUM(price) as Price, SUM(consumption) as Consumption FROM network_devices WHERE segment=".$Row['id']." AND used=1");
-    $Row2 = $DbResult2->fetch_array();
-    $DbResult2 = $Database->query("SELECT COUNT(*) FROM users WHERE network_segment=".$Row['id'].' AND hw=1');
-    $Row3 = $DbResult2->fetch_array();
-    $DbResult2 = $Database->query("SELECT COUNT(*) FROM users WHERE network_segment=".$Row['id'].' AND overheads=1');
-    $Row5 = $DbResult2->fetch_array();
-    $ID = $Row['parent'];
-    while($ID != 0)
-    {
-      //echo($ID.', ');
-      $DbResult2 = $Database->query("SELECT * FROM network_segments WHERE id=".$ID);
-      $Row4 = $DbResult2->fetch_array();
-      $Database->update('network_segments', 'id='.$Row4['id'], array('users' => ($Row4['users'] + $Row3[0]), 'users_overheads' => ($Row4['users_overheads'] + $Row5[0])));
-      $ID = $Row4['parent'];
-    }
-    //echo('Pocet '.$Row3[0].','.$Row['hosts'].'<br>');
-    $Database->update('network_segments', 'id='.$Row['id'], array('price' => $Row2['Price'], 'users' => ($Row3[0] + $RowP['users']), 'consumption' => $Row2['Consumption'], 'users_overheads' => ($Row5[0] + $RowP2['users_overheads'])));
-  }
-
-  // Zkorigovat segment Internet
-  $DbResult = $Database->select('users', 'COUNT(*)', 'inet_hw=1');
-  $Row = $DbResult->fetch_array();
-  $DbResult = $Database->select('users', 'COUNT(*)', 'inet=1');
-  $Row2 = $DbResult->fetch_array();
-  $DbResult = $Database->update('network_segments','id='.$InternetSegmentId, array('users' => $Row[0], 'users_overheads' => $Row2[0]));
-}
-
-function CreateMonthlyOverallBill()
-{
-  global $Database, $Sprava, $SpravaUsers, $TotalConsumption, $UserIdNetwork, $Internet, $TotalInternetPaid;
-
-  $TotalConsumptionPrice = W2Kc($TotalConsumption);
- 
-  echo("Spotřeba energie: ".-$TotalConsumptionPrice."<br>\n");
-  echo("Správa sítě: ".-($Sprava * $SpravaUsers)."<br>\n");
-  echo("Internet: ".-$Internet."<br>\n");
-  echo("Poplatky učástníků: ".$TotalInternetPaid."<br>\n");
-
-  $Database->insert('finance_operations', array('money' => -$TotalConsumptionPrice, 'user' => $UserIdNetwork, 'type' => 2, 'date' => 'NOW()', 'comment' => 'Spotřeba energie', 'group' => 2));
-  $Database->insert('finance_operations', array('money' => -($Sprava * $SpravaUsers), 'user' => $UserIdNetwork, 'type' => 2, 'date' => 'NOW()', 'comment' => 'Správa sítě', 'group' => 2));
-  $Database->insert('finance_operations', array('money' => -$Internet, 'user' => $UserIdNetwork, 'type' => 2, 'date' => 'NOW()', 'comment' => 'Internet', 'group' => 2));
-  $Database->insert('finance_operations', array('money' => $TotalInternetPaid, 'user' => $UserIdNetwork, 'type' => 2, 'date' => 'NOW()', 'comment' => 'Poplatky učástníků', 'group' => 2));
-}
-
-function DiscountNetworkDevicePrice()
-{
-  global $Database;
-  $DbResult = $Database->query("SELECT *,CONCAT(second_name, ' ', first_name) as fullname FROM users WHERE role=2");
-  while($Row = $DbResult->fetch_array())
-  {
-    echo($Row['fullname'].': '.($Row['network_device'])."<br>\n");
-    $Database->insert('finance_operations', array('money' => (-$Row['network_device']), 'user' => $Row['id'], 'type' => 2, 'date' => 'NOW()', 'comment' => 'Jednorázový poplatek za společné zařízení', 'group' => 1));
-    //echo($Database->LastQuery."<br>\n");
-  }
-}
-
-// Načti poslední měsíční přehled a nastavení
-$DbResult = $Database->select('finance_monthly_overall', '*', '1 ORDER BY date DESC LIMIT 1');
-$Overall = $DbResult->fetch_array();
-
-echo('Datum: '.date('j.n.Y')."<br>");
-$Mesice = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
-$Datum = explode('-', $Overall['date']);
-$Mesic = date("m") + 0;
-
-RecalculateSegmentParameters();
-RecalculateTariffs();
-//DiscountNetworkDevicePrice();
-//$InvoiceGenerator->CustomGenerate();
-RecalculateUsersFinance();
-
-// Celkovy prehled
-$DbResult = $Database->query("SELECT SUM(price) FROM network_devices WHERE used=1");
-$Row4 = $DbResult->fetch_array();
-echo("Celková cena zařízení: Zařízení(".$Row4[0]);
-$DbResult = $Database->query("SELECT SUM(price) FROM network_segments");
-$Row = $DbResult->fetch_array();
-echo("), Segmenty(".$Row[0]);
-$DbResult = $Database->query("SELECT SUM(network_device) FROM users");
-$Row5 = $DbResult->fetch_array();
-echo("), Uživatelé(".$Row5[0].")<br>\n");
-$DbResult = $Database->query("SELECT SUM(cash) FROM users WHERE role=2");
-$Row6 = $DbResult->fetch_array();
-echo("Stav pokladny: Uživatelé(".$Row6[0].")");
-$DbResult = $Database->query("SELECT SUM(money) FROM finance_operations WHERE `group`=1"); // Položky uživatelů
-$Row2 = $DbResult->fetch_array();
-echo(", Operace-Zařízení(".($Row2[0] - $Row4[0]).")<br>\n");
-echo("Rozdíl peněz v operacích: ".($Row2[0] - $Row6[0] - $Row4[0])." <br>\n");
-
-
-$DbResult = $Database->query("SELECT SUM(consumption) FROM network_devices WHERE used=1");
-$Row = $DbResult->fetch_array();
-$CelkemSpotreba = W2Kc($Row[0]);
-
-$SpravaCelkem = $Sprava * $SpravaUsers;
-echo("Kontrola placení (Zaplaceno-Sprava-Internet): ".$TotalPaid."-".$SpravaCelkem."-".$Internet."=".($TotalPaid - $SpravaCelkem - $Internet)."<br>\n\n");
-
-// Zkontrolovat odečtení měsíčního poplatku
-//$Mesic = '1';
-echo('Kontrola odečtení poplatků: Poslední měsíc-'.round($Datum[1]).' Aktuální měsíc-'.$Mesic."<br>\n");
-if($Mesic != $Datum[1])
-{
-  echo("Odečítám měsíční poplatek...<br>\n");
-
-  $BillingPeriodMonthCount = array('never' => 0, 'monthly' => 1, 'quarterly' => 3, 'half-yearly' => 6, 'yearly' => 12);
-
-  // Generuj účetní položky
-  $DbResult = $Database->query("SELECT *, CONCAT(second_name, ' ', first_name) as fullname FROM users WHERE (role = 2)");
-  while($User = $DbResult->fetch_array())
-  {
-    echo($User['fullname'].': ');
-    $MonthCount = $BillingPeriodMonthCount[$User['BillingPeriod']];
-    if(($MonthCount > 0) and (((($Mesic - 1) % 12) % $MonthCount) == 0) and ($User['inet_tarif_now'] != 6))
-    {
-      //echo($Mesic.'%'.$MonthCount.'='.($Mesic % $MonthCount).' ');
-      $PayPerMonth = -($User['plus'] - $User['monthly']);
-      $PayPerPeriod = $PayPerMonth * $MonthCount;
-      $PeriodFrom = mktime(0, 0, 0, date('n'), 1, date('Y'));
-      $PeriodTo = mktime(0, 0, 0, date('n') + $MonthCount - 1, date('t', mktime(0, 0, 0, date('n') + $MonthCount - 1, 1, date('Y'))) , date('Y'));
-      $TimePeriodText = date('j.n.Y', $PeriodFrom).' - '.date('j.n.Y', $PeriodTo);
-      echo($TimePeriodText.': '.$PayPerMonth." * ".$MonthCount." = ".$PayPerPeriod."\n");
-      $BillCode = GetNextDocumentLineNumber(6); // Faktury vydané
-      $BillId = $Bill->CreateBill($User['id'], array(array('description' => 'Připojení k síti', 'price' => $PayPerPeriod, 'quantity' => 1)), $PeriodFrom, $PeriodTo, $BillCode);
-      $Database->insert('finance_operations', array('money' => -$PayPerPeriod, 'user' => $User['id'], 'type' => 2, 'date' => 'NOW()', 'comment' => 'Připojení k síti za období '.$TimePeriodText, 'group' => 1, 'bill_id' => $BillId, 'BillCode' => $BillCode));
-    } else echo("\n");
-  }
-  echo('Měním aktuální parametry sítě...<br>\n');
-
-  // Update finance charge
-  $Database->delete('finance_charge', 'period=0');
-  $DbResult = $Database->select('finance_charge', '*', 'period=1');
-  $Charge = $DbResult->fetch_array();
-  //print_r($Charge);
-  $DbResult = $Database->insert('finance_charge', array('period' => 0, 'internet' => $Charge['internet'], 
-    'internet_speed' => $Charge['internet_speed'], 'internet_speed_reserve' => $Charge['internet_speed_reserve'], 'administration_per_user' => $Charge['administration_per_user'], 'kWh' => $Charge['kWh'], 'base_speed_element' => $Charge['base_speed_element'], 'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice']));
-
-  echo("Přidávám měsíční přehled...<br>\n");
-
-  $Database->insert('finance_monthly_overall', array('date' => 'NOW()', 'money' => $Internet, 'kWh' => $kWh, 'administration' => $Sprava, 'administration_total' => $SpravaCelkem, 'consumption_total' => $CelkemSpotreba, 'total_paid' => $TotalPaid, 'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice'], 'member_count' => $InternetUsers));
-
-  echo("Měním aktuální tarify....<br>\n");
-
-  // Update tarrifs
-  $Database->delete('finance_tariffs', 'period=0');
-  $DbResult = $Database->select('finance_tariffs', '*', 'period=1');
-  while($Tariff = $DbResult->fetch_array())
-  {
-    $Database->insert('finance_tariffs', array('period' => 0, 'name' => $Tariff['name'], 'id' => $Tariff['id'],
-      'speed_factor' => $Tariff['speed_factor'], 'price_units' => $Tariff['price_units'], 'group_id' => $Tariff['group_id'], 'min_speed' => $Tariff['min_speed'], 'max_speed' => $Tariff['max_speed'], 'price' => $Tariff['price']));
-  }
-
-  echo("Měním aktuální tarify uživatelů...<br>\n");
-
-  // Update tariff user selection
-  $DbResult = $Database->query("SELECT id,inet_tarif_next FROM users WHERE role=2");
-  while($User = $DbResult->fetch_array())
-  {
-    $Database->update('users', 'id='.$User['id'], array('inet_tarif_now' => $User['inet_tarif_next']));
-  }
-
-  RecalculateTariffs();
-  RecalculateUsersFinance();
-  //CreateMonthlyOverallBill();
-  RecalculateUsersFinance();
-
-  // Restart traffic shaping
-  $Database->update('services_restart', 'id=3', array('changed' => 1));
-}
-
-ShowFooter();
+$System->AddModule(new FinanceRecalculatePage());
+$System->Modules['FinanceRecalculatePage']->GetOutput();
 
 ?>

www/finance/spotreba.php

@@ -1 +1 @@
 <?php
 include_once('../global.php');
-include_once('include.php');
 
 class FinanceConsumption extends Page
@@ -21 +20 @@
       $Row2 = $DbResult2->fetch_array();
       $CelkovaSpotreba = $CelkovaSpotreba + $Row2[0];
-      $Output .= '<tr><td>'.$Row['name'].'</td><td align="right">'.$Row2[0].'</td><td align="right">'.W2Kc($Row2[0]).'</td></tr>';
+      $Output .= '<tr><td>'.$Row['name'].'</td><td align="right">'.$Row2[0].'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($Row2[0]).'</td></tr>';
     }
-    $Output .= '<tr style="font-weight: Bold;"><td><strong>Celkem</strong></td><td align="right">'.$CelkovaSpotreba.'</td><td align="right">'.W2Kc($CelkovaSpotreba).'</td></tr>';
+    $Output .= '<tr style="font-weight: Bold;"><td><strong>Celkem</strong></td><td align="right">'.$CelkovaSpotreba.'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($CelkovaSpotreba).'</td></tr>';
     $Output .= '</table><br />';
     $Output .= 'Dohodnutá cena za jednu kWh: <strong>'.$kWh.' Kč</strong><br />';

www/finance/tarify.php

@@ -1 +1 @@
 <?php
 include_once('../global.php');
-include_once('include.php');
 
 class FinanceTarrifsPage extends Page
@@ -10 +9 @@
   function TariffTable()
   {
-    global $Tarify, $Internet, $InternetUsers, $RealMaxSpeed, $SpeedReserve, $MaxSpeed;
-
-    $Output = 'Poplatek za společný internet: <strong>'.$Internet.' Kč</strong><br />';
-    $Output .= 'Rychlost společné linky: <strong>'.$RealMaxSpeed.' kbit/s</strong><br />';
-    $Output .= 'Rezerva (nevyužitá kapacita pro zlepšení odezvy sítě): <strong>'.$SpeedReserve.' kbit/s</strong><br />';
-    $Output .= 'Maximální dostupná kapacita pro použití: <strong>'.$MaxSpeed.' kbit/s</strong><br />';
+    $Finance = &$this->System->Modules['Finance'];
+        
+    $Output = 'Poplatek za společný internet: <strong>'.$Finance->Internet.' Kč</strong><br />';
+    $Output .= 'Rychlost společné linky: <strong>'.$Finance->RealMaxSpeed.' kbit/s</strong><br />';
+    $Output .= 'Rezerva (nevyužitá kapacita pro zlepšení odezvy sítě): <strong>'.$Finance->SpeedReserve.' kbit/s</strong><br />';
+    $Output .= 'Maximální dostupná kapacita pro použití: <strong>'.$Finance->MaxSpeed.' kbit/s</strong><br />';
     $Output .= '<br />';
 
@@ -22 +21 @@
     $TotalPrice = 0;
     $TotalUnits = 0;
-    foreach($Tarify as $Index => $Tarif)
+    foreach($Finance->Tarify as $Index => $Tarif)
     {
       $Output .= '<tr><td style="color: blue;">'.$Tarif['name'].'</td><td align="center">'.round($Tarif['min_speed'] / 1024).'</td><td align="center" style="color: blue;">'.round($Tarif['max_speed'] / 1024).'</td><td align="center">'.$Tarif['aggregation'].'</td><td align="center">'.$Tarif['price_units'].'</td><td align="center">'.$Tarif['user_count'].'</td><td align="center">'.
@@ -29 +28 @@
       $TotalUnits = $TotalUnits + $Tarif['total_units'];
     }
-    $Output .= '<tr><td>Součty</td><td colspan="4">&nbsp;</td><td align="center">'.$InternetUsers.'</td><td align="center">'.$TotalUnits.'</td><td>&nbsp;</td><td align="center">'.$TotalPrice.'</td></tr>';
+    $Output .= '<tr><td>Součty</td><td colspan="4">&nbsp;</td><td align="center">'.$Finance->InternetUsers.'</td><td align="center">'.$TotalUnits.'</td><td>&nbsp;</td><td align="center">'.$TotalPrice.'</td></tr>';
     $Output .= '</table>';
     return($Output);
@@ -36 +35 @@
   function Show()
   {
-    global $Tarify, $Internet, $InternetUsers, $RealMaxSpeed, $SpeedReserve, $MaxSpeed;
-    $Output = 'Počet členů s internetovým připojením: <strong>'.$InternetUsers.'</strong><br /><br />';
+        $Finance = &$this->System->Modules['Finance'];
+    $Output = 'Počet členů s internetovým připojením: <strong>'.$Finance->InternetUsers.'</strong><br /><br />';
     $Output .= '<table><tr><td valign="top">';
 
-    NactiMesicniParametry(0);
+    $Finance->LoadMonthParameters(0);
     $Output .= '<strong>Stav pro aktuální měsíc:</strong><br />';
     $Output .= $this->TariffTable();
@@ -46 +45 @@
     $Output .= '<br /></td></tr><tr><td valign="top">';
 
-    NactiMesicniParametry(1);
+    $Finance->LoadMonthParameters(1);
     $Output .= '<strong>Stav pro další měsíc:</strong><br />';
     $Output .= $this->TariffTable();

www/finance/user_state.php

@@ -2 +2 @@
 
 include_once('../global.php');
-include_once('include.php');
-RecalculateTariffs(1);
 
 class FinanceUserState extends Page
@@ -16 +14 @@
     if(!$this->System->Modules['User']->CheckPermission('Finance', 'DisplaySubjectState')) return('Nemáte oprávnění');
 
+        $this->System->Modules['Finance']->RecalculateTariffs(1);
     $UserId = $this->System->Modules['User']->User['Id'];
     if(!array_key_exists('show', $_GET)) $_GET['show'] = '';
@@ -56 +55 @@
     $DbResult = $this->Database->query('SELECT SUM(consumption) AS Total FROM network_devices WHERE user='.$UserId.' AND used=1');
         $ConsumptionBonus = $DbResult->fetch_assoc();
-        $ConsumptionBonus = W2Kc($ConsumptionBonus['Total']);
+        $ConsumptionBonus = $this->System->Modules['Finance']->W2Kc($ConsumptionBonus['Total']);
 
         $Total = 0;
@@ -79 +78 @@
       while($Row = $DbResult->fetch_assoc())
       {
-        $Output .= '<tr><td>'.$Row['name'].'</td><td>'.$Row['consumption'].'</td><td>'.W2Kc($Row['consumption']).'</td></tr>';
+        $Output .= '<tr><td>'.$Row['name'].'</td><td>'.$Row['consumption'].'</td><td>'.$this->System->Modules['Finance']->W2Kc($Row['consumption']).'</td></tr>';
         $TotalW += $Row['consumption'];
-        $TotalPrice += W2Kc($Row['consumption']);
+        $TotalPrice += $this->System->Modules['Finance']->W2Kc($Row['consumption']);
       }
       $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$TotalW.'</strong></td><td><strong>'.$TotalPrice.'</strong></td></tr>';

www/finance/user_state_ip.php

@@ -2 +2 @@
 
 include_once('../global.php');
-include_once('include.php');
-RecalculateTariffs(1);
 
 class FinanceUserState extends Page
@@ -14 +12 @@
     global $Tarify, $Sprava;
 
-        $UserId = GetMemberByIP(GetRemoteAddress());
+        $this->System->Modules['Finance']->RecalculateTariffs(1);
+
+    $UserId = GetMemberByIP(GetRemoteAddress());
 
     if(!array_key_exists('show', $_GET)) $_GET['show'] = '';
@@ -55 +55 @@
     $DbResult = $this->Database->query('SELECT SUM(consumption) AS Total FROM network_devices WHERE user='.$UserId.' AND used=1');
         $ConsumptionBonus = $DbResult->fetch_assoc();
-        $ConsumptionBonus = W2Kc($ConsumptionBonus['Total']);
+        $ConsumptionBonus = $this->System->Modules['Finance']->W2Kc($ConsumptionBonus['Total']);
 
         $Total = 0;
@@ -78 +78 @@
       while($Row = $DbResult->fetch_assoc())
       {
-        $Output .= '<tr><td>'.$Row['name'].'</td><td>'.$Row['consumption'].'</td><td>'.W2Kc($Row['consumption']).'</td></tr>';
+        $Output .= '<tr><td>'.$Row['name'].'</td><td>'.$Row['consumption'].'</td><td>'.$this->System->Modules['Finance']->W2Kc($Row['consumption']).'</td></tr>';
         $TotalW += $Row['consumption'];
-        $TotalPrice += W2Kc($Row['consumption']);
+        $TotalPrice += $this->System->Modules['Finance']->W2Kc($Row['consumption']);
       }
       $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$TotalW.'</strong></td><td><strong>'.$TotalPrice.'</strong></td></tr>';

www/finance/zarizeni.php

@@ -1 +1 @@
 <?php
 include_once('../global.php');
-include_once('include.php');
 
 class FinanceDeviceListPage extends Page

www/finance/zivnost.php

@@ -1 +1 @@
 <?php
 include_once('../global.php');
-include_once('include.php');
 
 class FinanceTaxFilingPage extends Page
@@ -31 +30 @@
   function Show()
   {
-    RecalculateTariffs(1);
+    $this->System->Modules['Finance']->RecalculateTariffs(1);
     //TransformFinance();
 

www/global.php

@@ -52 +52 @@
 include_once('finance/finance.php');
 $System->AddModule(new Finance());
+$System->Modules['Finance']->LoadMonthParameters(0);
 
 $MonthNames = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');

www/module.php

@@ -12 +12 @@
   {
   }
-
 }