Changeset 885 for trunk

Timestamp:

Sep 8, 2020, 5:57:23 PM (4 years ago)

Author:

chronos

Message:

• Fixed: MimeTypes for file download was not working as global variable with newer PHP 7.4.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/File/File.php (modified) (1 diff)
• Modules/File/MimeTypes.php (modified) (2 diffs)

trunk/Application/UpdateTrace.php

@@ -2128 +2128 @@
 {
   $Manager->Execute('ALTER TABLE `FinanceMonthlyOverall` CHANGE `Investment` `Investment` INT(11) NOT NULL DEFAULT "0";');
+}
+
+function UpdateTo885($Manager)
+{
+  $Manager->Execute('ALTER TABLE `FinanceOperation` CHANGE `Value` `Value` FLOAT NOT NULL DEFAULT "0";');
 }
 
@@ -2233 +2238 @@
       878 => array('Revision' => 880, 'Function' => 'UpdateTo880'),
       880 => array('Revision' => 882, 'Function' => 'UpdateTo882'),
+      882 => array('Revision' => 885, 'Function' => 'UpdateTo885'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 884; // Subversion revision
-$DatabaseRevision = 882; // SQL structure revision
+$Revision = 885; // Subversion revision
+$DatabaseRevision = 885; // SQL structure revision
 $ReleaseTime = strtotime('2020-09-08');

trunk/Modules/File/File.php

@@ -43 +43 @@
   function DetectMimeType($FileName)
   {
-    global $MimeTypes;
-
-    $Result = $MimeTypes[pathinfo($FileName, PATHINFO_EXTENSION)][0];
+    $MimeTypes = GetMimeTypes();
+    $MimeType = pathinfo($FileName, PATHINFO_EXTENSION);
+    $Result = $MimeTypes[$MimeType][0];
     return $Result;
   }

trunk/Modules/File/MimeTypes.php

@@ -1 +1 @@
 <?php
 
-$MimeTypes = array(
+function GetMimeTypes()
+{
+  return array(
   '7z'    => array('application/x-7z-compressed'),
   'ai'    => array('application/postscript'),
@@ -123 +125 @@
   'xsl'   => array('text/xml'),
   'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed')
-);
+  );
+}