Changeset 880

Timestamp:

Sep 4, 2020, 9:30:13 AM (4 years ago)

Author:

chronos

Message:

• Fixed: Allow to store IPv6 in IpAddress database field originally designed for IPv4.
• Fixed: Check if AppModule OnLoadModules method is defined as array.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Install/deb/debian/conf/apache.conf (modified) (1 diff)
• Packages/Common/AppModule.php (modified) (2 diffs)

trunk/Application/UpdateTrace.php

@@ -2116 +2116 @@
   $Manager->Execute('ALTER TABLE `NewsImport` ADD PRIMARY KEY (`Id`);');
   $Manager->Execute('ALTER TABLE `NewsImport` MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
+}
+
+function UpdateTo880($Manager)
+{
+  $Manager->Execute('ALTER TABLE `UserOnline` CHANGE `IpAddress` `IpAddress` VARCHAR(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';');
+  $Manager->Execute('ALTER TABLE `User` CHANGE `LastIpAddress` `LastIpAddress` VARCHAR(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';');
+  $Manager->Execute('ALTER TABLE `Log` CHANGE `IPAddress` `IPAddress` VARCHAR(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
 }
 
@@ -2219 +2226 @@
       869 => array('Revision' => 870, 'Function' => 'UpdateTo870'),
       870 => array('Revision' => 878, 'Function' => 'UpdateTo878'),
+      878 => array('Revision' => 880, 'Function' => 'UpdateTo880'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 879; // Subversion revision
-$DatabaseRevision = 878; // SQL structure revision
-$ReleaseTime = strtotime('2020-07-24');
+$Revision = 880; // Subversion revision
+$DatabaseRevision = 880; // SQL structure revision
+$ReleaseTime = strtotime('2020-09-04');

trunk/Install/deb/debian/conf/apache.conf

@@ -6 +6 @@
     DirectoryIndex index.php
     AllowOverride All
+    Require all granted
 </Directory>

trunk/Packages/Common/AppModule.php

@@ -363 +363 @@
         'Version' => $Module->Version, 'Installed' => $Module->Installed);
     }
-    file_put_contents($this->FileName, "<?php \n\n\$ConfigModules = ".var_export($Data, true).";\n");
+    if (file_put_contents($this->FileName, "<?php \n\n\$ConfigModules = ".var_export($Data, true).";\n") === FALSE)
+    {
+      echo($this->FileName.' is not writeable.');
+    }
   }
 
@@ -394 +397 @@
   function LoadModules()
   {
-    if (method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
+    if (is_array($this->OnLoadModules) and (count($this->OnLoadModules) == 2) and method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
       $this->OnLoadModules();
     else $this->LoadModulesFromDir($this->ModulesDir);