Changeset 901 for trunk/Modules/File

Timestamp:

Feb 17, 2021, 9:27:32 PM (4 years ago)

Author:

chronos

Message:

• Added: Documents section accessible from users panel.
• Added: Contract model moved to separate module Contract.
• Added: New action to generate PDF from Contract.
• Fixed: Allow users to download files only by hash instead of direct id.
• Added: Support for SHA1 as allowed mysql function.

File:

• trunk/Modules/File/File.php (modified) (4 diffs)

trunk/Modules/File/File.php

@@ -20 +20 @@
     $Desc->AddReference('Directory', FileDirectory::GetClassName(), true);
     $Desc->AddDateTime('Time');
+    $Desc->AddString('Hash');
+    $Desc->AddBoolean('Generate');
     return $Desc;
   }
@@ -59 +61 @@
   }
 
-  function Download(string $Id): void
-  {
-    $DbResult = $this->Database->select('File', '*', 'Id='.addslashes($Id));
+  function DownloadHash(string $Hash): void
+  {
+    $this->Download('Hash="'.addslashes($Hash).'"');
+  }
+
+  function DownloadId(string $Id): void
+  {
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('File', 'DownloadById'))
+      echo('Nemáte oprávnění');
+    $this->Download('Id='.addslashes($Id));
+  }
+
+  function Download(string $Where): void
+  {
+    $DbResult = $this->Database->select('File', '*', $Where);
     if ($DbResult->num_rows > 0)
     {
@@ -105 +119 @@
   function Show(): string
   {
-    if (array_key_exists('id', $_GET)) $Id = $_GET['id'];
-    else if (array_key_exists('i', $_GET)) $Id = $_GET['i'];
+    if (array_key_exists('h', $_GET))
+    {
+      $Hash = $_GET['h'];
+      $this->ClearPage = true;
+      ModuleFile::Cast($this->System->GetModule('File'))->File->DownloadHash($Hash);
+      return '';
+    }
+    else if (array_key_exists('i', $_GET))
+    {
+      $Id = $_GET['i'] * 1;
+      $this->ClearPage = true;
+      ModuleFile::Cast($this->System->GetModule('File'))->File->DownloadId($Id);
+    }
     else return $this->SystemMessage('Chyba', 'Nezadáno id souboru');
-    $this->ClearPage = true;
-    $Output = ModuleFile::Cast($this->System->GetModule('File'))->File->Download($Id);
-    return $Output;
+    return '';
   }
 }
@@ -208 +231 @@
         'Size' => array('Type' => 'Integer', 'Caption' => 'Velikost', 'Default' => ''),
         'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas vytvoření', 'Default' => ''),
+        'Hash' => array('Type' => 'String', 'Caption' => 'Haš', 'Default' => ''),
         'Invoices' => array('Type' => 'TFinanceInvoiceListFile', 'Caption' => 'Faktury', 'Default' => ''),
         'Operations' => array('Type' => 'TFinanceOperationListFile', 'Caption' => 'Operace', 'Default' => ''),