Skip to content

Commit

Permalink
Merge pull request #16 from jocafamaka/developing
Browse files Browse the repository at this point in the history
Release v1.6.2 (stable).
  • Loading branch information
jocafamaka authored Nov 18, 2018
2 parents 9a4067c + 2ee11b5 commit b4dfdd1
Show file tree
Hide file tree
Showing 23 changed files with 804 additions and 484 deletions.
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ NagMap Reborn is based on NagMap project developed by [Marcel Hecko](https://git
* Updating hosts status without refresh on page.
* Support for multiple languages.
* System of last occurrences (ChangesBar).
* Content filter. <sup>(NEW)</sup>
* Content filter.
* System of sound warning.
* Notification system on the page.
* Almost total control of page characteristics.
Expand All @@ -28,7 +28,10 @@ NagMap Reborn is based on NagMap project developed by [Marcel Hecko](https://git
* Font size.
* Used date format.
* ChangesBar mode.
* Show content filter. <sup>(NEW)</sup>
* History.
* Alert.
* Alert lite. <sup>(NEW)</sup>
* Show content filter.
* Use system of sound warning.
* Show lines between hosts and their parents.
* Time to update hosts status.
Expand Down Expand Up @@ -90,4 +93,4 @@ Contribution are always **welcome and recommended**! Here is how:

* By using this API Implementation, your are agreeing to be bound by Leaflet, OpenStreetMap and Google's Terms of Use.
* This app uses the OpenStreetMap's tiles. [See here](https://wiki.osmfoundation.org/wiki/Privacy_Policy) the privacy policy.
* This app uses the Google Maps API. [See here](https://cloud.google.com/maps-platform/terms/) Google privacy policy. - [See here](https://developers.google.com/maps/documentation/javascript/usage) Google Maps usage quotas.
* This app uses the Google Maps API. [See here](https://cloud.google.com/maps-platform/terms/) Google privacy policy. - [See here](https://developers.google.com/maps/documentation/javascript/usage) Google Maps usage quotas.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.1
1.6.2
8 changes: 6 additions & 2 deletions config.php.example
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ $nagMapR_ChangesBar = 1;
// Select ChangesBar mode
// 1 = History mode. (Displays all occurrences sequentially with date and time)
// 2 = Alert mode. (Shows only hosts who are DOWN, CRITICAL or in WARNING, with the elapsed time)
// 3 = Alert mode lite. (The same as the previous, but in the form of iframe using less resources of
// the browser/machine.) Mode 3 has some limitations such as: It is not able to open infoWindows directly
// from ChangesBar and is not able to capture the hostname of infoWindows for filtering.
$nagMapR_ChangesBarMode = 2;

// Percentage size occupied by the ChangesBar on the screen. (use only numbers)
Expand All @@ -109,7 +112,8 @@ $nagMapR_ChangesBarSize = 15;
// Font size in pixels used in ChangesBar. (use only numbers)
$nagMapR_FontSize = 15;

//Includes a field at the top of ChanesBar to filter the information displayed regardless of usage mode.
// Includes a field at the top of ChanesBar to filter the information displayed regardless of usage mode.
// Useful when there are a lot of hosts.
// 1 = YES.
// 0 = NO.
$nagMapR_BarFilter = 1;
Expand Down Expand Up @@ -151,7 +155,7 @@ $nagMapR_Reporting = 1;
# SECURITY INFORMATION #
####################################################################################################
// Security key to protect data from external requests (use only letters and numbers)
$nagMapR_key = 'ELsV7OqefspxiVIPvzOqGzYJShz5TxoKYkZGa0ecfMGj4e3pzAmCho6CQqfuJ3qI3i0J0OiWdFyKkJp2aHANUa8BKUdKXmBO';
$nagMapR_key = 'O9CJ16er3XsjI5Bj1CHmGnS6Yv4xQuBuGhx3h9fa2ZU0SuOkhBIVR8MtkLhyG0SiMJr3YCG98hz1eh99vVLZ0b3NbTUKLs4M';

// User used for authentication.
$nagMapR_User = "ngradmin";
Expand Down
6 changes: 5 additions & 1 deletion config.php.example_pt-BR
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ $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)
// 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
// da ChangesBar e nao e capaz de capturar o nome do host da infoWindows para filtragem.
$nagMapR_ChangesBarMode = 2;

// Tamanho em porcentagem ocupado pela ChangesBar na tela. (use somente numeros)
Expand All @@ -116,6 +119,7 @@ $nagMapR_FontSize = 15;
$nagMapR_DateFormat = 1;

// Inclui um campo no topo da ChanesBar para filtrar as informacoes exibidas, independente do modo de utilizacao.
// Útil quando existe uma grande quantidade de hosts.
// 1 = SIM.
// 0 = NAO.
$nagMapR_BarFilter = 1;
Expand Down Expand Up @@ -151,7 +155,7 @@ $nagMapR_Reporting = 1;
# INFORMACAO DE SEGURANCA #
####################################################################################################
// Chave de seguranca, protege de requisicoes externas. (use somente numeros e letras)
$nagMapR_key = 'ELsV7OqefspxiVIPvzOqGzYJShz5TxoKYkZGa0ecfMGj4e3pzAmCho6CQqfuJ3qI3i0J0OiWdFyKkJp2aHANUa8BKUdKXmBO';
$nagMapR_key = 'O9CJ16er3XsjI5Bj1CHmGnS6Yv4xQuBuGhx3h9fa2ZU0SuOkhBIVR8MtkLhyG0SiMJr3YCG98hz1eh99vVLZ0b3NbTUKLs4M';

// Usuario utilizado na autenticacao.
$nagMapR_User = "ngradmin";
Expand Down
2 changes: 1 addition & 1 deletion debugInfo/debugInfo.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
error_reporting(E_ERROR | E_WARNING | E_PARSE);

$key = $_GET['key'];
$key = $_POST['key'];

include('../config.php');
include("../langs/$nagMapR_Lang.php");
Expand Down
Loading

0 comments on commit b4dfdd1

Please sign in to comment.