Changeset 887 for trunk/Common/Form/Types/File.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (3 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

File:

• trunk/Common/Form/Types/File.php (modified) (12 diffs)

trunk/Common/Form/Types/File.php

@@ -3 +3 @@
 class DbFile
 {
-  var $Id;
-  var $FileName;
-  var $Size;
-  var $Directory;
-  var $DirectoryId;
-  var $TempName;
+  public string $Id;
+  public string $FileName;
+  public int $Size;
+  public string $Directory;
+  public string $DirectoryId;
+  public string $TempName;
 
-  function DetectMimeType()
+  function DetectMimeType(): string
   {
     // For proper mime-type detection php-pecl-Fileinfo package should be installed on *nix systems
@@ -19 +19 @@
   }
 
-  function GetSize($Item)
+  function GetSize($Item): int
   {
     $FileName = $this->GetFullName($Item);
@@ -27 +27 @@
   }
 
-  function GetFullName()
+  function GetFullName(): string
   {
+    $Path = '';
     $ParentId = $this->Directory;
     while ($ParentId != null)
@@ -37 +38 @@
       $ParentId = $DbRow['Parent'];
     }
-    $Result = $this->UploadFileFolder.'/'.$Path.$File->Name;
+    $Result = $this->UploadFileFolder.'/'.$Path.$this->FileName;
     return $Result;
   }
 
-  function GetExt()
+  function GetExt(): string
   {
     return substr($this->Name, 0, strpos($this->Name, '.') - 1);
   }
 
-  function Delete()
+  function Delete(): void
   {
     if (file_exists($this->GetFullName())) unlink($this->GetFullName());
   }
 
-  function GetContent()
+  function GetContent(): string
   {
     if ($this->TempName != '') $Content = file_get_contents($this->TempName);
@@ -61 +62 @@
 class TypeFile extends TypeBase
 {
-  var $UploadFileFolder;
-  var $FileDownloadURL;
-  var $DirectoryId;
+  public string $UploadFileFolder;
+  public string $FileDownloadURL;
+  public string $DirectoryId;
 
-  function __construct($FormManager)
+  function __construct(FormManager $FormManager)
   {
     parent::__construct($FormManager);
@@ -72 +73 @@
   }
 
-  function OnView($Item)
+  function OnView(array $Item): ?string
   {
     $File = &$Item['Value'];
@@ -79 +80 @@
   }
 
-  function OnEdit($Item)
+  function OnEdit(array $Item): string
   {
     // Check max value of upload_max_filesize
@@ -89 +90 @@
   }
 
-  function OnLoad($Item)
+  function OnLoad(array $Item): ?string
   {
     if (!is_object($Item['Value'])) $Item['Value'] = new DbFile();
@@ -106 +107 @@
   }
 
-  function OnLoadDb($Item)
+  function OnLoadDb(array $Item): ?string
   {
     if (!is_object($Item['Value'])) $Item['Value'] = new DbFile();
     $File = &$Item['Value'];
     $DbResult = $this->Database->select('File', '*', 'Id='.$File->Id);
-    if ($DbResult->num_rows() > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
@@ -121 +122 @@
   }
 
-  function OnSaveDb($Item)
+  function OnSaveDb(array $Item): ?string
   {
     if (!is_object($Item['Value'])) $Item['Value'] = new DbFile();
@@ -128 +129 @@
       'Size' => $File->GetSize(), 'Directory' => $File->Directory);
     $DbResult = $this->Database->select('File', '*', 'Id='.$File->Id);
-    if ($DbResult->num_rows() > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
@@ -143 +144 @@
     }
     if (!move_uploaded_file($File->TempName, $FileName))
-      SystemMessage('Nahrání souboru', 'Cílová složka není dostupná!');
+      $this->System->SystemMessage('Nahrání souboru', 'Cílová složka není dostupná!');
+    return '';
   }