Changeset 976

Timestamp:

Jun 30, 2025, 3:24:41 PM (7 hours ago)

Author:

chronos

Message:

• Fixed: Autocreate missing DocumentSequenceNumber records for new years.
• Fixed: Wrong page index selection.
• Fixed: RSS feed formatting variable reference.
• Fixed: Do not parse RouterOS signal import if not connected to the remote host.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Document/Document.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (1 diff)
• Modules/NetworkTopology/NetworkTopology.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (3 diffs)
• Packages/Common/Base.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 975; // Subversion revision
+$Revision = 976; // Subversion revision
 $DatabaseRevision = 970; // SQL structure revision
 $ReleaseTime = strtotime('2025-06-30');

trunk/Modules/Document/Document.php

@@ -120 +120 @@
     $DbResult = $this->Database->query('SELECT * FROM `DocumentLineSequence` WHERE '.
       '`DocumentLine`='.$Id.' AND `FinanceYear`='.$FinanceYear['Id']);
-    $Sequence = $DbResult->fetch_assoc();
+    if ($DbResult->num_rows > 0)
+    {
+      $Sequence = $DbResult->fetch_assoc();
+    } else 
+    {
+      $Sequence = array('DocumentLine' => $Id, 'FinanceYear' => $FinanceYear['Id'], 
+        'NextNumber' => 1, 'YearPrefix' => 1);
+      $Sequence['Id'] = $this->Database->insert('DocumentLineSequence', $Sequence);
+    }
 
     if ($Sequence['YearPrefix'] == 1)
     {
       $Result = $DocumentLine['Shortcut'].$Sequence['NextNumber'].'/'.$FinanceYear['Year'];
-    } else $Result = $DocumentLine['Shortcut'].$Sequence['NextNumber'];
+    } else
+    {
+      $Result = $DocumentLine['Shortcut'].$Sequence['NextNumber'];
+    }
 
     $this->Database->query('UPDATE `DocumentLineSequence` SET `NextNumber` = `NextNumber` + 1 '.

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -21 +21 @@
       //$Routerboard->Port = 8729;
       $Routerboard->Connect($Device['LocalIP'], $this->System->Config['API']['UserName'], $this->System->Config['API']['Password']);
-      if (!$Routerboard->Connected) continue;
-
-      $Queries = array_merge($Queries, $this->ReadWireless($Device, $Routerboard));
-      $Queries = array_merge($Queries, $this->ReadWireless60G($Device, $Routerboard));
+      if ($Routerboard->Connected) 
+      {
+        $Queries = array_merge($Queries, $this->ReadWireless($Device, $Routerboard));
+        $Queries = array_merge($Queries, $this->ReadWireless60G($Device, $Routerboard));
+      }
       echo("\n");
     }

trunk/Modules/NetworkTopology/NetworkTopology.php

@@ -25 +25 @@
   function ShowImage(): string
   {
-    $this->SimplePage = true;
-    $this->FormatHTML = false;
+    $this->RawPage = true;
+    Core::Cast($this->System)->BaseView->FormatHTML = false;
 
     if (array_key_exists('debug', $_GET)) $debug = $_GET['debug'];

trunk/Modules/News/NewsPage.php

@@ -252 +252 @@
       $RowTotal = $DbResult->fetch_array();
       $PageMax = $RowTotal[0];
-      if (array_key_exists('page', $_GET)) $Page = $_GET['page'];
-        else $Page = 0; //round($PageMax/$PerPage);
+      if (array_key_exists('page', $_GET) and is_numeric($_GET['page'])) $Page = $_GET['page'] * 1;
+        else $Page = 0;
       $Output .= '<strong>Seznam aktualit kategorie '.$Category['Caption'].':</strong><div style="font-size: small;">';
       $Output .= PagesList('?category='.$Category['Id'].'&amp;page=', $Page, $PageMax, $PerPage);
@@ -400 +400 @@
   {
     $this->RawPage = true;
-    $this->FormatHTML = false;
+    Core::Cast($this->System)->BaseView->FormatHTML = false;
     Header('Content-Type: text/xml');
 
@@ -424 +424 @@
         if (strlen($Where) > 2) $Where = substr($Where, 2);
           else $Where = 1;
-      } else $Where = 1;      
+      } else $Where = 1;
     } else $Where = 1;
 

trunk/Packages/Common/Base.php

@@ -18 +18 @@
 
   public function __debugInfo()
-  {   
-    $Vars = get_object_vars($this);    
+  {
+    $Vars = get_object_vars($this);
     unset($Vars['System'], $Vars['Database']);
     return $Vars;