Release v1.6.4

Merge pull request #19 from jocafamaka/developing

README.md

@@ -37,7 +37,7 @@ NagMap Reborn is based on NagMap project developed by [Marcel Hecko](https://git
 * Time to update hosts status.
 * Icons style.
 * Which API to use.
-* Use or not access control. <sup>(NEW)</sup>
+* Use or not access control.
 
 ## Compatibility
 
@@ -67,13 +67,16 @@ Undecided about which API to use? Here are some differences between them:
 [See here](https://jocafamaka.github.io) the NagMap Reborn live preview:
 [![NagMap Reborn live preview](https://i.imgur.com/Mc26Pn5.png)](https://jocafamaka.github.io)
 
-## Under development
+## Hiatus notice
 
-The master branch will always contain the code referring to the latest stable version.
+From 03/2019 the project will go into hiatus to add features.
 
-See [here](https://github.com/jocafamaka/nagmapReborn/tree/developing) the version in development, this version contains the latest modifications and new features.
+This decision was taken so that all attention is focused on the development of the [v2.0.0](https://github.com/jocafamaka/nagmapReborn/tree/v2.0.0), which will bring many benefits.
 
-It should be noted that this version may contain features that are still being tested and should **NOT** be used in production under any circumstances!
+### Important Notes:
+* This version will continue to receive support.
+* Version 1.6.4 will be the last stable version until release of v2.0.0(alpha/rc/final).
+* There is no prediction yet for release of the new version.
 
 ## Support
 

VERSION

@@ -1 +1 @@
-1.6.3
+1.6.4

config.php.example_pt-BR

@@ -101,7 +101,7 @@ $nagMapR_FilterService  = "";
 $nagMapR_ChangesBar = 1;
 
 // Seelecione o modo de operacao da ChangesBar
-// 1 = Modo historico mode. (Exibe todas as ocorrencias de forma sequencial com a data e hora)
+// 1 = Modo historico. (Exibe todas as ocorrencias de forma sequencial com data e hora)
 // 2 = Modo alerta. (Exibe somente os hosts que estao DOWN, CRITICAL ou em WARNING, com o tempo decorrido)
 // 3 = Modo alerta leve. (O mesmo que o anterior, porem em forma de iframe utilizando menos recursos do
 // navegador/maquina.) O modo 3 tem algumas limitacoes, tais como: Nao e capaz de abrir a infoWindows diretamente
@@ -140,7 +140,7 @@ $nagMapR_PlaySound = 1;
 // 2 = Com bordas sem sombra.
 $nagMapR_IconStyle = 1;
 
-// Mostrar linha entre hosts e seus parentes?.
+// Mostrar linha entre hosts e seus parentes?
 // 1 = SIM.
 // 0 = NAO.
 $nagMapR_Lines = 1;

debugInfo/index.php

@@ -208,11 +208,14 @@ function fileHash($file){
           echo('
             <div class="alert alert-success">
             '. $reportOk .'
-            </div>
 
-            <div id="reportCount"></div>
+            <hr>
+
+            '.$reportDataRequestP1 . ' <button type="button" id="token" class="btn btn-primary btn-sm" data-container="body" data-toggle="popover" title="'. $yourRToken .'" data-placement="right" data-content="'. $waiting .'.">' . $reportDataRequestP2 . '</button>.' . $reportDataRequestP3.'
+
+            </div>
 
-            '.$reportDataRequestP1 . ' <button type="button" id="token" class="btn btn-primary btn-sm" data-container="body" data-toggle="popover" title="'. $yourRToken .'" data-placement="right" data-content="'. $waiting .'.">' . $reportDataRequestP2 . '</button>.' . $reportDataRequestP3.'<br><br>');
+            <div id="reportCount"></div>');
         }
         else{
           echo('
@@ -540,7 +543,7 @@ function load(){
                       newDivs = newDivs.concat("<h4 class=\"my-0 font-weight-bold\">" + serv + "</h4></div><div class=\"card-body\">");
 
 
-                      newDivs = newDivs.concat("<table class=\"table table-hover\"><tr><td><?php echo ($cs); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_CS +"</td></tr><tr><td><?php echo ($lhs); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LHS +"</td></tr><tr><td><?php echo ($lsc); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LSC +"</td></tr><tr><td><?php echo ($lhsc); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LHSC +"</td></tr><tr><td><?php echo ($lto); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LTO +"</td></tr><tr><td><?php echo ($ltw); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LTW +"</td></tr><tr><td><?php echo ($ltunk); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LTUNK +"</td></tr><tr><td><?php echo ($ltc); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LTC +"</td></tr></table></div></div>");
+                      newDivs = newDivs.concat("<table class=\"table table-hover\"><tr><td><?php echo ($cs); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_CS +"</td></tr><tr><td><?php echo ($lhs); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LHS +"</td></tr><tr><td><?php echo ($lsc); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LSC +"</td></tr><tr><td><?php echo ($lhsc); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LHSC +"</td></tr><tr><td><?php echo ($lto); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LTO +"</td></tr><tr><td><?php echo ($ltw); ?></td><td> : </td><td>"+ arrayInfo[i]['services'][serv].servStatus_LTW +"</td></tr><tr><td><?php echo ($ltunk); ?></td><td> : </td><td>"+arrayInfo[i]['services'][serv].servStatus_LTUNK +"</td></tr><tr><td><?php echo ($ltc); ?></td><td> : </td><td>"+arrayInfo[i]['services'][serv].servStatus_LTC +"</td></tr></table></div></div>");
                     }
                   }
                   newDivs = newDivs.concat("</div></div></div>");