Changeset 514

Timestamp:

Apr 8, 2013, 10:40:40 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Detekce typu stahovaných souborů se nyní provádí přímo přes pole MIME typů.
• Opraveno: Chyba dělení nulou při zobrazení tarifů a počítání agregace rychlosti.
• Opraveno: Řazení služeb v tabulce dle jména a až pak dle rychlosti stahování.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/File/File.php (modified) (2 diffs)
• Modules/File/MimeTypes.php (added)
• finance/finance.php (modified) (1 diff)
• finance/tarify.php (modified) (1 diff)
• form_classes.php (modified) (1 diff)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 513; // Subversion revision
+$Revision = 514; // Subversion revision
 $DatabaseRevision = 507; 
 $ReleaseTime = '2013-04-08';

trunk/Modules/File/File.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/MimeTypes.php');
 
 class File extends Module
@@ -41 +43 @@
   function DetectMimeType($FileName)
   {
-    // For proper mime-type detection php-pecl-Fileinfo package should be installed on *nix systems
-    $FileInfo = new finfo(FILEINFO_MIME, '/usr/share/misc/magic');
-    $Result = $FileInfo->file($FileName);
-    //$FileInfo->close();
+        global $MimeTypes;
+        
+    $Result = $MimeTypes[pathinfo($FileName, PATHINFO_EXTENSION)][0];
     return($Result);
   }

trunk/finance/finance.php

@@ -33 +33 @@
   {
     $this->Tariffs = array();
-    $DbResult = $this->Database->select('Service', '*', '`ReplaceId` IS NULL ORDER BY `InternetSpeedMax`');
+    $DbResult = $this->Database->select('Service', '*', '`ReplaceId` IS NULL ORDER BY `Name`, `InternetSpeedMax`');
     while($Tariff = $DbResult->fetch_array())
     {

trunk/finance/tarify.php

@@ -24 +24 @@
     foreach($Finance->Tariffs as $Index => $Tariff)
     {
-      $Tariff['Aggregation'] = '1:'.round($Tariff['InternetSpeedMax'] / $Tariff['InternetSpeedMin']);
+      if($Tariff['InternetSpeedMin'] != 0) 
+        $Tariff['Aggregation'] = '1:'.round($Tariff['InternetSpeedMax'] / $Tariff['InternetSpeedMin']);
+        else $Tariff['Aggregation'] = '1:1';
       $Output .= '<tr><td style="color: blue;">'.$Tariff['Name'].'</td><td align="center">'.round($Tariff['InternetSpeedMin'] / 1000).'</td><td align="center" style="color: blue;">'.round($Tariff['InternetSpeedMax'] / 1000).'</td><td align="center">'.$Tariff['Aggregation'].'</td><td align="center">'.$Tariff['CustomerCount'].'</td><td align="center" style="color: blue;">'.$Tariff['Price'].'</td><td align="center">'.$Tariff['CustomerCount'] * $Tariff['Price'].'</td></tr>';
       $TotalPrice = $TotalPrice + $Tariff['Price'] * $Tariff['CustomerCount'];

trunk/form_classes.php

@@ -148 +148 @@
       'Directory' => array('Type' => 'TDirectory', 'Caption' => 'Adresář', 'Default' => '', 'Null' => true),
       'Size' => array('Type' => 'Integer', 'Caption' => 'Velikost', 'Default' => ''),
+      'Time' => array('Type' => 'Time', 'Caption' => 'Čas vytvoření', 'Default' => ''),
     ),
     'ItemActions' => array(