added padding in popup. fix mysql query in acquiring log list

diff --git a/doc/Changes.html b/doc/Changes.html
index d87fddb..d5f3d20 100644 (file)
--- a/doc/Changes.html
+++ b/doc/Changes.html
@@ -275,9 +275,9 @@ OpengateM History</H3>
        </DT><DD>
         Modified code to prevent inflation of Databases (drop table macippair/sessionmd:MySQL, delete old records of macmodify:MySQL and macinfo:SQLite3).
        </DD>
-       <DT>Ver.1.1.1 at 2016.6.24
+       <DT>Ver.1.1.1 at 2016.6.25
        </DT><DD>
-        Restored table sessionmd in management db (It holds the log expired after 1 month. Saving-log can be disabled in opengatemd.conf).
+        Restored table sessionmd in management db (It holds the log expired after 1 month. Log-saving can be disabled in opengatemd.conf).
        </DD>
 </DL>
 <P>

diff --git a/html/showlog.js b/html/showlog.js
index 0a2a465..80e9e17 100644 (file)
--- a/html/showlog.js
+++ b/html/showlog.js
@@ -43,7 +43,8 @@ function onmouseoverHandler(element, logItemNo) {
                // popup style\r
                popup.style.position = "fixed"; \r
                popup.style.left = e.clientX+20; \r
-               popup.style.top  = e.clientY+10; \r
+               popup.style.top  = e.clientY+10;\r
+               popup.style.padding  = 20;\r
                popup.style.background = colorList["popup"]; \r
                popup.style.display = "block";\r
 \r

diff --git a/mngsrc/managementdb.c b/mngsrc/managementdb.c
index 6e19c58..a14c5af 100644 (file)
--- a/mngsrc/managementdb.c
+++ b/mngsrc/managementdb.c
@@ -502,7 +502,7 @@ int getNextUsageLogFromMngDb(char* userId, char* extraId, char* macAddr, char* d
             " gatewayName "
             " from macaddrs, sessionmd "
             " where macaddrs.macAddress=sessionmd.macAddress "
-            " and entryDate < openTime and openTime < limitDate "
+            " and entryDate <= openTime and openTime <= limitDate "
             " and (%s<closeTime or closeTime=0) "
             " and userId='%s' and extraId='%s'",
             GetConfValue("ShowLogAfter"), userId, extraId);