From 2be346f45fb5fc7a48b7c190d91c1d26da8af116 Mon Sep 17 00:00:00 2001
From: riclolsen <olsen.ricardo@gmail.com>
Date: Sat, 19 Feb 2022 16:05:13 -0300
Subject: [PATCH] Version 6.26.

---
 htdocs/timepntserver.php    |  7 +++++--
 i18n/messages_i18n-en_us.js |  2 +-
 i18n/messages_i18n-pt_br.js |  2 +-
 i18n/messages_i18n-uk_ua.js |  2 +-
 i18n/messages_i18n.js       |  2 +-
 installer/README.txt        | 13 +++++++++++++
 installer/oshmi.nsi         |  6 +++---
 installer/release_notes.txt | 13 +++++++++++++
 8 files changed, 38 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 htdocs/timepntserver.php

diff --git a/htdocs/timepntserver.php b/htdocs/timepntserver.php
old mode 100755
new mode 100644
index 422352c..2447159
--- a/htdocs/timepntserver.php
+++ b/htdocs/timepntserver.php
@@ -134,10 +134,13 @@
                               WHERE
                                     (nponto = '$pnt' or 
                                      nponto in (select nponto from dumpdb where id='$pnt')) and 
-                                    data = (select data from hist where nponto=$pnt and data<=$FILTDH  
+                                    data = (select data from hist where nponto=
+                                      (select nponto from dumpdb where id='$pnt' or nponto='$pnt' limit 1)
+                                    AND data<=$FILTDH  
                               ORDER BY
                                     data desc limit 1) ";
         }
+      
       $uni = " UNION ";
       $cntsql++;
       if ( $cntsql > 50 )
@@ -200,7 +203,7 @@
     $dbpnt->exec ( "PRAGMA synchronous = NORMAL" );
     $dbpnt->exec ( "PRAGMA journal_mode = WAL" );
     $dbpnt->exec ( "PRAGMA locking_mode = NORMAL" );
-    $sql = "SELECT NPONTO, LIMS, LIMI from dumpdb where nponto = $pnt" ;
+    $sql = "SELECT NPONTO, LIMS, LIMI from dumpdb where nponto = (select nponto from dumpdb where id='$pnt' or nponto='$pnt' limit 1)" ;
     foreach ( $dbpnt->query( $sql ) as $row )
       {
       $nponto = $row['NPONTO'];
diff --git a/i18n/messages_i18n-en_us.js b/i18n/messages_i18n-en_us.js
index 8b2097b..dd7fad3 100755
--- a/i18n/messages_i18n-en_us.js
+++ b/i18n/messages_i18n-en_us.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: 'OSHMI',
-VersaoProduto: '6.24',
+VersaoProduto: '6.26',
 
 NomeVisorTelas:       'Screen Viewer',
 NomeVisorEventos:     'Events Viewer',
diff --git a/i18n/messages_i18n-pt_br.js b/i18n/messages_i18n-pt_br.js
index 5ee5cc0..264031e 100755
--- a/i18n/messages_i18n-pt_br.js
+++ b/i18n/messages_i18n-pt_br.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: 'OSHMI',
-VersaoProduto: '6.24',
+VersaoProduto: '6.26',
 
 NomeVisorTelas:       'Visor de Telas',
 NomeVisorEventos:     'Visor de Eventos',
diff --git a/i18n/messages_i18n-uk_ua.js b/i18n/messages_i18n-uk_ua.js
index c4d8d3e..c3bab64 100755
--- a/i18n/messages_i18n-uk_ua.js
+++ b/i18n/messages_i18n-uk_ua.js
@@ -4,7 +4,7 @@
 var Msg =
 {
     NomeProduto: 'OSHMI',
-    VersaoProduto: '6.24',
+    VersaoProduto: '6.26',
 
     NomeVisorTelas: 'Перегляд ',
     NomeVisorEventos: 'Події',
diff --git a/i18n/messages_i18n.js b/i18n/messages_i18n.js
index 5ee5cc0..264031e 100644
--- a/i18n/messages_i18n.js
+++ b/i18n/messages_i18n.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: 'OSHMI',
-VersaoProduto: '6.24',
+VersaoProduto: '6.26',
 
 NomeVisorTelas:       'Visor de Telas',
 NomeVisorEventos:     'Visor de Eventos',
diff --git a/installer/README.txt b/installer/README.txt
index b704a90..f1500e7 100644
--- a/installer/README.txt
+++ b/installer/README.txt
@@ -186,6 +186,19 @@ Inkscape+SAGE:
 
 -------------------------------------------------------------------
 
+Notes for version 6.26:
+
+Screen Viewer:
+ - Fixed problem with Time Machine.
+
+Chromium:
+ - Updated to version 98.0.4758.102.
+
+SQLite:
+ - Updated to version 3.37.2.
+
+-------------------------------------------------------------------
+
 Notes for version 6.25:
 
 Chromium:
diff --git a/installer/oshmi.nsi b/installer/oshmi.nsi
index 58f27b8..fde50c7 100755
--- a/installer/oshmi.nsi
+++ b/installer/oshmi.nsi
@@ -11,8 +11,8 @@ RequestExecutionLevel user
 
 ;--------------------------------
 
-!define VERSION "v.6.24"
-!define VERSION_ "6.24.0.0"
+!define VERSION "v.6.26"
+!define VERSION_ "6.26.0.0"
 
 Function .onInit
  System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexOshmiInstall") i .r1 ?e'
@@ -46,7 +46,7 @@ VIProductVersion ${VERSION_}
 VIAddVersionKey ProductName "OSHMI (Open Substation HMI)"
 VIAddVersionKey Comments "SCADA HMI Software"
 VIAddVersionKey CompanyName "Ricardo Olsen"
-VIAddVersionKey LegalCopyright "Copyright 2008-2020 Ricardo L. Olsen"
+VIAddVersionKey LegalCopyright "Copyright 2008-2022 Ricardo L. Olsen"
 VIAddVersionKey FileDescription "OSHMI Installer"
 VIAddVersionKey FileVersion ${VERSION}
 VIAddVersionKey ProductVersion ${VERSION}
diff --git a/installer/release_notes.txt b/installer/release_notes.txt
index b704a90..f1500e7 100644
--- a/installer/release_notes.txt
+++ b/installer/release_notes.txt
@@ -186,6 +186,19 @@ Inkscape+SAGE:
 
 -------------------------------------------------------------------
 
+Notes for version 6.26:
+
+Screen Viewer:
+ - Fixed problem with Time Machine.
+
+Chromium:
+ - Updated to version 98.0.4758.102.
+
+SQLite:
+ - Updated to version 3.37.2.
+
+-------------------------------------------------------------------
+
 Notes for version 6.25:
 
 Chromium: