Changeset 340 for trunk

Timestamp:

Jan 16, 2012, 9:59:18 PM (13 years ago)

Author:

chronos

Message:

• Přidáno: Moduk pro správu projektů.
• Některé staré moduly přesunuty do podsložky Modules.

Location:

trunk

Files:

• Modules (added)
• Modules/Module.php (added)
• Modules/Project (added)
• Modules/Project/Project.php (added)
• Modules/User (added)
• Modules/User/user.php (added)
• Modules/log.php (added)
• Modules/page.php (added)
• aktuality/news.php (modified) (1 diff)
• file.php (modified) (1 diff)
• finance/bills.php (modified) (1 diff)
• finance/finance.php (modified) (5 diffs)
• finance/manage.php (modified) (2 diffs)
• global.php (modified) (3 diffs)
• log.php (deleted)
• module.php (modified) (1 diff)
• page.php (deleted)
• user.php (deleted)
• webcam/webcam.php (modified) (1 diff)

trunk/aktuality/news.php

@@ -7 +7 @@
 }
 
-class News extends Module
+class News extends OldModule
 {
   var $Dependencies = array('User', 'Log');

trunk/file.php

@@ -1 +1 @@
 <?php
 
-class File extends Module
+class File extends OldModule
 {
   function __construct($Database) 

trunk/finance/bills.php

@@ -1 +1 @@
 <?php
 
-class Bill extends Module
+class Bill extends OldModule
 {
   var $SpecificSymbol = 1; // počítačová sít

trunk/finance/finance.php

@@ -1 +1 @@
 <?php
 
-class Finance extends Module
+class Finance extends OldModule
 {
   var $kWh;
@@ -108 +108 @@
     $this->BaseTariffPrice = $Row['BaseTariffPrice'];
 
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Member');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Member`');
     $Row = $DbResult->fetch_row();
     $this->InternetUsers = $Row[0];
     
     $this->SpravaUsers = $this->InternetUsers;
-    $DbResult = $this->Database->query('SELECT SUM(consumption) FROM network_segments');
+    $DbResult = $this->Database->query('SELECT SUM(`consumption`) FROM `network_segments`');
     $TotalConsumption = $DbResult->fetch_array();
     $this->TotalConsumption = $TotalConsumption[0];
@@ -135 +135 @@
     {
       // Get latest year
-      $DbResult = $this->Database->select('FinanceYear', '*', '1 ORDER BY Year DESC LIMIT 1');
+      $DbResult = $this->Database->select('FinanceYear', '*', '1 ORDER BY `Year` DESC LIMIT 1');
     } else $DbResult = $this->Database->select('FinanceYear', '*', 'Id='.$FinanceYear);
     $FinanceYear = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->query('SELECT Shortcut, Id FROM DocumentLine WHERE Id='.$Id);
+    $DbResult = $this->Database->query('SELECT `Shortcut`, `Id` FROM `DocumentLine` WHERE `Id`='.$Id);
     $DocumentLine = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->query('SELECT * FROM DocumentLineSequence WHERE DocumentLine='.$Id.' AND FinanceYear='.$FinanceYear['Id']);
+    $DbResult = $this->Database->query('SELECT * FROM `DocumentLineSequence` WHERE (`DocumentLine`='.$Id.') AND (`FinanceYear`='.$FinanceYear['Id'].')');
     $Sequence = $DbResult->fetch_assoc();
     
@@ -150 +150 @@
     } else $Result = $DocumentLine['Shortcut'].$Sequence['NextNumber'];
         
-    $this->Database->query('UPDATE DocumentLineSequence SET NextNumber = NextNumber + 1 WHERE DocumentLine='.$Id.' AND FinanceYear='.$FinanceYear['Id']);
+    $this->Database->query('UPDATE `DocumentLineSequence` SET `NextNumber` = `NextNumber` + 1 WHERE (`DocumentLine`='.$Id.') AND (`FinanceYear`='.$FinanceYear['Id'].')');
     return($Result);
   }
@@ -157 +157 @@
   {
     $Output = 'Aktualizuji finance členů...<br />';
-    $this->Database->query('TRUNCATE TABLE MemberPayment');
-    $DbResult = $this->Database->query('SELECT * FROM Member');
+    $this->Database->query('TRUNCATE TABLE `MemberPayment`');
+    $DbResult = $this->Database->query('SELECT * FROM `Member`');
     while($Member = $DbResult->fetch_assoc())
     {

trunk/finance/manage.php

@@ -104 +104 @@
     if(array_key_exists('generate', $_GET))
     {
-      $Output .= $this->System->Modules['Bill']->CreateBill(1, array(array('Description' => 'Poplatek za připojení k síti', 'Price' => 1000, 'Quantity' => 1)), time(), time());
+      $Output .= $this->System->Modules['Bill']->CreateBill(1, array(array('Description' => 'Poplatek za služby', 'Price' => 1000, 'Quantity' => 1)), time(), time());
     } else 
     {
@@ -352 +352 @@
           $BillCode = $Finance->GetNextDocumentLineNumber(6); // Faktury vydané
           $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], array(array('Description' => 'Připojení k síti', 'Price' => $PayPerPeriod, 'Quantity' => 1)), time(), time() + 3600 * 24 * 15, $BillCode);
-          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 'TimeDue' => 'DATE_ADD(NOW(), INTERVAL 15 DAY)', 'Text' => 'Připojení k síti za období '.$TimePeriodText, 'Bill' => $BillId, 'BillCode' => $BillCode));
+          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 'TimeDue' => 'DATE_ADD(NOW(), INTERVAL 15 DAY)', 'Text' => 'Služby za období '.$TimePeriodText, 'Bill' => $BillId, 'BillCode' => $BillCode));
           $Output .= $this->SendPaymentEmail($Member['Id']);
           $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));

trunk/global.php

@@ -5 +5 @@
 if(file_exists($ConfigFileName)) include_once($ConfigFileName);
   else die('Nenalezen konfigurační soubor '.$ConfigFileName.'!');
+  
 include_once('database.php');
 //include('error.php');
@@ -10 +11 @@
 include_once('module.php');
 include_once('forms.php');
-include_once('page.php');
+include_once('Modules/page.php');
 include_once('file.php');
-include_once('log.php');
-include_once('user.php');
+include_once('Modules/log.php');
 include_once('aktuality/news.php');
 include_once('webcam/webcam.php');
 include_once('finance/bills.php');
 include_once('finance/finance.php');
+include_once('Modules/Module.php');
+include_once('Modules/User/user.php');
+include_once('Modules/Project/Project.php');
   
 $PrefixMultipliers = array
@@ -88 +91 @@
 );
 
-class System extends Module
+class System extends OldModule
 {
   var $Modules = array(); 

trunk/module.php

@@ -1 +1 @@
 <?php
 
-class Module
+class OldModule
 {
   var $Database;

trunk/webcam/webcam.php

@@ -1 +1 @@
 <?php
 
-class Webcam extends Module
+class Webcam extends OldModule
 {
   var $ImageFileName = 'webcam.jpg';