Changeset 948

Timestamp:

Apr 10, 2023, 7:44:01 PM (21 months ago)

Author:

chronos

Message:

• Fixed: IP address database field size in News table for IPv6.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (4 diffs)
• Application/Version.php (modified) (1 diff)
• Common/Form/Form.php (modified) (10 diffs)
• Modules/NetworkConfigLinux/Generators/DNS.php (modified) (1 diff)

trunk/Application/UpdateTrace.php

@@ -2184 +2184 @@
   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
   $Manager->Execute('ALTER TABLE `NetworkMac` ADD PRIMARY KEY (`Id`), ADD KEY `MAC` (`MAC`);');
-  $Manager->Execute('ALTER TABLE `NetworkMac` MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');  
+  $Manager->Execute('ALTER TABLE `NetworkMac` MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
 
   // Convert NetworkSignal MAC from string into reference
@@ -2220 +2220 @@
 
 function UpdateTo939(UpdateManager $Manager): void
-{  
+{
   $Manager->Execute('ALTER TABLE `Member` ADD `PaymentEmailTime` DATETIME NULL DEFAULT NULL AFTER `Contract`;');
   $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 1 MONTH) WHERE BillingPeriod=2 AND BillingPeriodLastDate<>"0000-00-00"');
@@ -2227 +2227 @@
   $Manager->Execute('UPDATE `Member` SET `PaymentEmailTime`=DATE_SUB(`BillingPeriodLastDate`, INTERVAL 12 MONTH) WHERE BillingPeriod=5 AND BillingPeriodLastDate<>"0000-00-00"');
   $Manager->Execute('ALTER TABLE `UserOnline` ENGINE = InnoDB;');
+}
+
+function UpdateTo948(UpdateManager $Manager): void
+{
+  $Manager->Execute('ALTER TABLE `News` CHANGE `IP` `IP` VARCHAR(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;');
 }
 
@@ -2339 +2344 @@
       921 => array('Revision' => 933, 'Function' => 'UpdateTo933'),
       933 => array('Revision' => 939, 'Function' => 'UpdateTo939'),
+      939 => array('Revision' => 948, 'Function' => 'UpdateTo948'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 945; // Subversion revision
-$DatabaseRevision = 939; // SQL structure revision
+$Revision = 948; // Subversion revision
+$DatabaseRevision = 948; // SQL structure revision
 $ReleaseTime = strtotime('2022-12-06');

trunk/Common/Form/Form.php

@@ -82 +82 @@
   {
     $Item = $this->Definition['Items'][$Index];
-    $UseType = $this->GetItemType($Item);    
+    $UseType = $this->GetItemType($Item);
     
     $Result = $this->FormManager->Type->ExecuteTypeEvent($UseType, $Event,
@@ -175 +175 @@
 
   function GetItemType($Item): string
-  {    
+  {
     if (array_key_exists($Item['Type'], $this->FormManager->FormTypes))
     {
@@ -186 +186 @@
         $UseType = 'Enumeration';
     } else $UseType = $Item['Type'];
-    
+
     return $UseType;
   }
@@ -197 +197 @@
       (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
       ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
-      {      
+      {
         $UseType = $this->GetItemType($Item);
         if (!array_key_exists('SQL', $Item)) $Item['SQL'] = '';
@@ -217 +217 @@
       ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
       {
-        $UseType = $this->GetItemType($Item);      
+        $UseType = $this->GetItemType($Item);
         $this->Values[$Index] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnLoadDb',
           array('Value' => $DbRow[$Index], 'Name' => $Index,
@@ -256 +256 @@
 
     foreach ($this->Definition['Items'] as $Index => $Item)
-    {      
+    {
       if (!array_key_exists('ReadOnly', $Item)) $Item['ReadOnly'] = false;
       if ($Item['ReadOnly'] == false)
@@ -268 +268 @@
           array('Value' => $this->Values[$Index], 'Name' => $Index,
           'Type' => $Item['Type'], 'Values' => $this->Values,
-          'Filter' => $this->Values[$Index])))        
-        {          
+          'Filter' => $this->Values[$Index])))
+        {
           $Result = false;
           break;
         }
-      }      
+      }
     }
 
@@ -309 +309 @@
       } else
       {
-        if (isset($Item['Default'])) 
+        if (isset($Item['Default']))
         {
           if (isset($Item['Null']) and ($Item['Null'] == true))
@@ -339 +339 @@
           else $Parameters['Null'] = false;
         if (!$this->FormManager->Type->ExecuteTypeEvent($UseType, 'Validate',
-          $Parameters)) 
+          $Parameters))
         {
           $this->ValuesValidate[$Index] = true;
@@ -345 +345 @@
         }
       }
-    } 
+    }
     if ($Valid == false) throw new Exception('not validated');
     return $Valid;

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -97 +97 @@
         }
       $File = fopen($DNS['BaseDir'].$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
-      fputs($File, $Output);      
+      fputs($File, $Output);
       fclose($File);
     }