Changeset 500 for trunk/Common

Timestamp:

Mar 10, 2013, 10:08:23 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Bankovní účty se nyní odkazují do seznamu existujících bank. Z nich se pak přiřazuje kód banky.
• Upraveno: Pro import plateb z banky bude nově použit samostatný modul FinanceBankAPI.
• Upraveno: Zkušební podpora formulářového typu soubor (File).
• Upraveno: Kód PrefixMultiplier přesunut do samostatného souboru.

Location:

trunk/Common

Files:

• Forms.php (modified) (1 diff)
• Global.php (modified) (5 diffs)
• PrefixMultiplier.php (added)
• Types/File/File.php (modified) (4 diffs)
• Types/Type.php (modified) (1 diff)
• Version.php (modified) (1 diff)

trunk/Common/Forms.php

@@ -54 +54 @@
   {
     if(!array_key_exists('SubmitText', $this->Definition)) $this->Definition['SubmitText'] = 'Uložit';
-    $Output = '<form class="Form" action="'.$this->OnSubmit.'" method="post">'.$this->ShowEditBlock().
+    $Output = '<form enctype="multipart/form-data" class="Form" action="'.$this->OnSubmit.'" method="post">'.$this->ShowEditBlock().
       '<div><input type="submit" value="'.$this->Definition['SubmitText'].'" /> '.
       '<input type="button" value="Zrušit" onclick="location.href=\'?\'"/></div></form>';

trunk/Common/Global.php

@@ -39 +39 @@
 include_once(dirname(__FILE__).'/../Modules/WebCam/WebCam.php');
 include_once(dirname(__FILE__).'/../Modules/User/User.php');
-
-$PrefixMultipliers = array
-(
-  'Binary' => array
-  (
-    'BaseIndex' => 0,
-    'Definition' => array
-    (
-      array('', '', pow(2, 0)),
-      array('Ki', 'kibi', pow(2, 10)),
-      array('Mi', 'mebi', pow(2, 20)),
-      array('Gi', 'gibi', pow(2, 30)),
-      array('Ti', 'tebi', pow(2, 40)),
-      array('Pi', 'pebi', pow(2, 50)),
-      array('Ei', 'exbi', pow(2, 60)),
-      array('Zi', 'zebi', pow(2, 70)),
-      array('Yi', 'yobi', pow(2, 80)),
-    ),
-  ),
-  'Decimal' => array
-  (
-    'BaseIndex' => 8,
-    'Definition' => array
-    (
-      array('y', 'yocto', pow(10, -24)),
-      array('z', 'zepto', pow(10, -21)),
-      array('a', 'atto', pow(10, -18)),
-      array('f', 'femto', pow(10, -15)),
-      array('p', 'piko', pow(10, -12)),
-      array('n', 'nano', pow(10, -9)),
-      array('u', 'mikro', pow(10, -6)),
-      array('m', 'mili', pow(10, -3)),
-      array('', '', pow(10, 0)),
-      array('k', 'kilo', pow(10, 3)),
-      array('M', 'mega', pow(10, 6)),
-      array('G', 'giga', pow(10, 9)),
-      array('T', 'tera', pow(10, 12)),
-      array('P', 'peta', pow(10, 15)),
-      array('E', 'exa', pow(10, 18)),
-      array('Z', 'zetta', pow(10, 21)),
-      array('Y', 'yotta', pow(10, 24)),
-    ),
-  ),
-  'Time' => array
-  (
-    'BaseIndex' => 8,
-    'Definition' => array
-    (
-      array('ys', 'yoctosekunda', pow(10, -24)),
-      array('zs', 'zeptosekunda', pow(10, -21)),
-      array('as', 'attosekunda', pow(10, -18)),
-      array('fs', 'femtosekunda', pow(10, -15)),
-      array('ps', 'pikosekunda', pow(10, -12)),
-      array('ns', 'nanosekunda', pow(10, -9)),
-      array('us', 'mikrosekunda', pow(10, -6)),
-      array('ms', 'milisekunda', pow(10, -3)),
-      array('s', 'sekunda', 1),
-      array('minut', 'minuta', 60),
-      array('hodin', 'hodina', 60 * 60) ,
-      array('dnů', 'den', 24 * 60 * 60),
-      array('týdnů', 'týden', 7 * 24 * 60 * 60),
-      array('měsíců', 'měsíc', 30 * 24 * 60 * 60),
-      array('roků', 'rok', 364 * 24 * 60 * 60),
-      array('desetiletí', 'desetiletí', 10 * 364 * 24 * 60 * 60),
-      array('stalatí', 'staletí', 100 * 364 * 24 * 60 * 60),
-      array('tisíciletí', 'tisiciletí', 10000 * 364 * 24 * 60 * 60),
-    ),
-  ),
-);
+include_once(dirname(__FILE__).'/../Modules/Finance/Finance.php');
+include_once(dirname(__FILE__).'/../Modules/FinanceBankAPI/FinanceBankAPI.php');
 
 class System extends Module
@@ -143 +76 @@
       {
         array_shift($PathItems);
-        return(SearchPage($PathItems, $Path[$PathItem]));
-      } else return($this->Pages[$PathItem]);
+        return($this->SearchPage($PathItems, $Pages[$PathItem]));
+      } else return($Pages[$PathItem]);
     } else return('');
   }
@@ -215 +148 @@
     return(date('j.n.Y', $Time));
   }
-
-  function TruncateDigits($Value, $Digits = 4)
-  {
-    for($II = 2; $II > -6; $II--)
-    {
-      if($Value >= pow(10, $II))
-      {
-        if($Digits < ($II + 1)) $RealDigits = $II + 1; else $RealDigits = $Digits;
-        $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
-        break;
-      }
-    }
-    return($Value);
-  }
-
-  function AddPrefixMultipliers($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal')
-  {
-    global $PrefixMultipliers;
-
-    $Negative = ($Value < 0);
-    $Value = abs($Value);
-    if(($Unit == '') and ($PrefixType != 'Time'))
-      return($this->TruncateDigits($Value, $Digits));
-
-    $I = $PrefixMultipliers[$PrefixType]['BaseIndex'];
-    if($Value == 0) return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
-     
-    if($Value > 1) 
-    {
-      while((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
-        $I = $I + 1;
-    } else 
-    if($Value < 1)
-    {
-      while((($I - 1) >= 0) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2]) < 1))
-        $I = $I - 1;
-    }
-    $Value = $Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2];
-    
-    // Truncate digits count
-    $Value = $this->TruncateDigits($Value, $Digits);
-    if($Negative) $Value = -$Value;
-    return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
-  }
   
   function Link($Target)
@@ -323 +212 @@
   $System->ModuleManager->RegisterModule(new ModuleWebCam($System));
   $System->ModuleManager->RegisterModule(new ModuleUser($System));
+  $System->ModuleManager->RegisterModule(new ModuleFinance($System));
+  $System->ModuleManager->RegisterModule(new ModuleFinanceBankAPI($System));
   $System->ModuleManager->StartAll();
 }
@@ -633 +524 @@
     else $PathString = '';
   if(substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
-  //echo('"'.$QueryString.'"');
   $PathItems = explode('/', $PathString);
   if(strpos($_SERVER['REQUEST_URI'], '?') !== false)

trunk/Common/Types/File/File.php

@@ -1 +1 @@
 <?php
 
-class TypeFile
+class TypeFile extends TypeBase
 {
+  var $UploadFileFolder;
+  var $FileDownloadURL;
+  var $DirectoryId;
+  
+  function __construct()
+  {
+    $this->FileDownloadURL = 'File.php';
+    $this->DirectoryId = null;
+  }
+  
   function OnView($Item)
   {
@@ -11 +21 @@
     {
       $DbRow = $DbResult->fetch_assoc();
-      return('<a href="types/File/FileDownload.php?Id='.$Item['Value'].'">'.$DbRow['Name'].'</a> ('.HumanSize($DbRow['Size']).')');
+      return('<a href="'.$this->FileDownloadURL.'?Id='.$Item['Value'].'">'.$DbRow['Name'].'</a> ('.HumanSize($DbRow['Size']).')');
     } else return('');
   }
@@ -29 +39 @@
 
     $Result = 0;
-    //print_r($_FILES);
+    print_r($_FILES);
+    print_r($_POST);
     if(array_key_exists($Item['Name'], $_FILES) and ($_FILES[$Item['Name']]['name'] != ''))
     {
@@ -35 +46 @@
       {
         $FileName = substr($_FILES[$Item['Name']]['name'], strrpos($_FILES[$Item['Name']]['name'], '/'));
-        $Database->query('INSERT INTO SystemFile (`Name`, `Size`) VALUES ("'.$FileName.'", '.filesize($_FILES[$Item['Name']]['tmp_name']).')');
+        $Database->insert('File', array('Name' => $FileName, 'Size' => filesize($_FILES[$Item['Name']]['tmp_name']),
+           'Directory' => $this->DirectoryId));
         $Result = $Database->insert_id;
-        if(!move_uploaded_file($_FILES[$Item['Name']]['tmp_name'], $Config['UploadFileFolder'].'/'.$Result)) SystemMessage('Nahrání souboru', 'Cílová složka není dostupná!');
+        if(!move_uploaded_file($_FILES[$Item['Name']]['tmp_name'], $this->UploadFileFolder.'/'.$Result)) 
+          SystemMessage('Nahrání souboru', 'Cílová složka není dostupná!');
       }
     }

trunk/Common/Types/Type.php

@@ -98 +98 @@
 }
 
-
 ?>

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 499; // Subversion revision
-$DatabaseRevision = 499; 
+$Revision = 500; // Subversion revision
+$DatabaseRevision = 500; 
 $ReleaseTime = '2013-03-03';