Release v1.6.3 stable.

Merge pull request #17 from jocafamaka/developing
jocafamaka · Dec 30, 2018 · e76b6a3 · e76b6a3
2 parents b4dfdd1 + 34bc091
commit e76b6a3
Show file tree

Hide file tree

Showing 26 changed files with 914 additions and 607 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 config.php
 migrate.php
+random.php
 keys.txt
-random*
-tests/*
-features/*
+check.php
+tests/
+features/
diff --git a/README.md b/README.md
@@ -30,13 +30,14 @@ NagMap Reborn is based on NagMap project developed by [Marcel Hecko](https://git
   * ChangesBar mode.
     * History.
     * Alert.
-    * Alert lite. <sup>(NEW)</sup>
+    * Alert lite.
   * Show content filter.
 * Use system of sound warning.
 * Show lines between hosts and their parents.
 * Time to update hosts status.
 * Icons style.
-* Which API to use. 
+* Which API to use.
+* Use or not access control. <sup>(NEW)</sup>
 
 ## Compatibility
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.6.2
+1.6.3
diff --git a/config.php.example b/config.php.example
@@ -28,7 +28,7 @@ $nagMapR_IsNagios = 1;
 $nagMapR_MapAPI = 1;
 
 // Set to the centre of your map (lat,long)
-$nagMapR_MapCentre = '-6.469293, -50.913464';
+$nagMapR_MapCentre = "-6.469293, -50.913464";
 
 // Default zoom level of the map
 $nagMapR_MapZoom = 6.2;
@@ -45,7 +45,8 @@ $nagMapR_MapZoom = 6.2;
 // How to use the Mapbox styles:
 // https://github.com/jocafamaka/nagmapReborn/wiki/How-to-use-the-Mapbox-styles%3F
 // Leave blank to use the default.
-$nagMapR_LeafletStyle = '';  //For example: https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}{r}.png
+// For example: https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}{r}.png
+$nagMapR_LeafletStyle = "";
 
 ########################################################
 #               IF USING GOOGLE MAPS API               #
@@ -55,43 +56,44 @@ $nagMapR_LeafletStyle = '';  //For example: https://cartodb-basemaps-{s}.global.
 // SATELLITE
 // HYBRID
 // TERRAIN
-$nagMapR_MapType = 'ROADMAP';
+$nagMapR_MapType = "ROADMAP";
 
 // Enter your private Google Maps API key here
 // See here how to get an API private key: 
 // (https://developers.google.com/maps/documentation/javascript/get-api-key)
-$nagMapR_Mapkey = '';
+$nagMapR_Mapkey = "";
 
 // Google Maps custom styles
 // If used, this option overlaps the map type defined in ($nagMapR_MapType)
 // This option should contain the name of the .json file in the styles folder.
 // Custom styles can be created in: (https://mapstyle.withgoogle.com/)
 // Look in the styles folder, for ready styles.
 // Leave empty if you do not want to use custom style.
-$nagMapR_Style = '';  //For example: ($nagMapR_Style = 'Dark';) To use de Dark.json style.
+// For example: ($nagMapR_Style = "Dark";) To use de Dark.json style.
+$nagMapR_Style = "";
 
 ####################################################################################################
 #                                      NAGMAP REBORN FEATURES                                      #
 ####################################################################################################
 // Sets the translation file name.
-// See the folder 'langs' for available translations.
+// See the folder "langs" for available translations.
 // You can create your own translation by copying and renaming one of the files and making the
 // necessary changes.
-$nagMapR_Lang = 'en-US';
+$nagMapR_Lang = "en-US";
 
 // Hostgroup filter - only show hosts from this hostgroup
 // Leave empty for not filtering
-$nagMapR_FilterHostgroup  = '';
+$nagMapR_FilterHostgroup  = "";
 
 // Service filter - Use the status of a specific service as the primary. The service that will be used
 // to set the status on the map. Useful when there is more than one service per host.
-// More than one service can be used in the filter (using ';' as a separator), as long a single host
+// More than one service can be used in the filter (using ";" as a separator), as long a single host
 // does not contain more than one of the filtered services.
 // It is not necessary to indicate the full name of the service, but a single part that sets it apart
 // from others is enough.
 // Services are filtered by service_description.
 // Leave empty for not filtering
-$nagMapR_FilterService  = '';
+$nagMapR_FilterService  = "";
 
 // Show ChangesBar? (Bar with information about the hosts) 
 // 1 = YES.
@@ -125,7 +127,7 @@ $nagMapR_BarFilter = 1;
 $nagMapR_DateFormat = 1;
 
 // Play alert when a server's status changes to down?
-// To change the alert sound, simply replace the file 'Beep.mp3' in the resources folder
+// To change the alert sound, simply replace the file "Beep.mp3" in the resources folder
 // In some browsers it is necessary for user to interact with the page before it emits a sound, 
 // so an initial interaction is required for the alert to be played.
 // 1 = YES.
@@ -155,11 +157,16 @@ $nagMapR_Reporting = 1;
 #                                       SECURITY INFORMATION                                       #
 ####################################################################################################
 // Security key to protect data from external requests (use only letters and numbers)
-$nagMapR_key = 'O9CJ16er3XsjI5Bj1CHmGnS6Yv4xQuBuGhx3h9fa2ZU0SuOkhBIVR8MtkLhyG0SiMJr3YCG98hz1eh99vVLZ0b3NbTUKLs4M';
+$nagMapR_key = "AHgRux3iIEMLnh60v7CMUlHlYqM2AtFsHausnSUn63NJEtp7glX3ClkHS12Mc7ASiVu5wqePXNNAwzYAE0pOcfnRvbn4zClb";
+
+// Request authentication when accessing the page?
+// 1 = YES (Strongly recommended).
+// 0 = NO.
+$nagMapR_useAuth = 1;
 
 // User used for authentication.
 $nagMapR_User = "ngradmin";
 
 // Password used for authentication.
 $nagMapR_UserKey = "ngradmin";
-?>
+?>
diff --git a/config.php.example_pt-BR b/config.php.example_pt-BR
@@ -28,7 +28,7 @@ $nagMapR_IsNagios = 1;
 $nagMapR_MapAPI = 1;
 
 // Defina o centro do mapa (latitude, longitude)
-$nagMapR_MapCentre = '-4.018935, -52.607260';
+$nagMapR_MapCentre = "-4.018935, -52.607260";
 
 // Nivel padrao de zoom no mapa.
 $nagMapR_MapZoom = 6.2;
@@ -45,7 +45,8 @@ $nagMapR_MapZoom = 6.2;
 // Como usar o estilos do Mapbox:
 // https://github.com/jocafamaka/nagmapReborn/wiki/Como-usar-o-estilos-do-Mapbox%3F
 // Deixe em branco para utilizar o padrão.
-$nagMapR_LeafletStyle = '';  //Por exemplo: https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}{r}.png
+// Por exemplo: https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}{r}.png
+$nagMapR_LeafletStyle = "";
 
 ########################################################
 #            SE UTILIZANDO GOOGLE MAPS API             #
@@ -55,43 +56,44 @@ $nagMapR_LeafletStyle = '';  //Por exemplo: https://cartodb-basemaps-{s}.global.
 // SATELLITE
 // HYBRID
 // TERRAIN
-$nagMapR_MapType = 'ROADMAP';
+$nagMapR_MapType = "ROADMAP";
 
 // Insira sua chave privada de API.
 // Veja aqui como conseguir uma chave privada de API (EM INGLES):
 // https://developers.google.com/maps/documentation/javascript/get-api-key
-$nagMapR_Mapkey = '';
+$nagMapR_Mapkey = "";
 
 // Estilos personalizados do Google Maps
 // Se utilizado, essa opcao sobrepoem o tipo de mapa definido em ($nagMapR_MapType)
-// Essa opcao deve conter o nome do arquivo .json presente na pasta 'styles'.
+// Essa opcao deve conter o nome do arquivo .json presente na pasta "styles".
 // Estilos personalizados podem ser criados aqui: (https://mapstyle.withgoogle.com/)
-// Veja na pasta 'styles' os estilos prontos para uso.
+// Veja na pasta "styles" os estilos prontos para uso.
 // Deixe em branco para nao utilizar estilos personalizados.
-$nagMapR_Style = '';  //Por exemplo: ($nagMapR_Style = 'Dark';) Para usar o estilo Dark.json
+//Por exemplo: ($nagMapR_Style = "Dark";) Para usar o estilo Dark.json
+$nagMapR_Style = "";
 
 ####################################################################################################
 #                                 CARACTERISTICAS DO NAGMAP REBORN                                 #
 ####################################################################################################
 // Define o nome do arquivo de traducao.
-// Veja na pasta 'langs' as traducoes disponiveis.
+// Veja na pasta "langs" as traducoes disponiveis.
 // Voce pode criar sua propria traducao, basta somente copiar e renomear um dos arquivos existentes
 // e fazer as mudanças necessarias
-$nagMapR_Lang = 'pt-BR';
+$nagMapR_Lang = "pt-BR";
 
 // Filtro de Hostgroup, mostra somente os host pertecentes a esse hostgroup.
 // Deixe em branco para não filtrar.
-$nagMapR_FilterHostgroup  = '';
+$nagMapR_FilterHostgroup  = "";
 
 // Filtro de servicos - Usa o status de um servico especifico como primario. O servico que sera
 // usado para definir o status no mapa. Util quando existem mais de um servico por host.
-// Pode ser utilizado mais de um servico no filtro (utilizando ';' como separador), desde que um
+// Pode ser utilizado mais de um servico no filtro (utilizando ";" como separador), desde que um
 // um unico host nao contenha mais de um dos servicos filtrados.
 // Nao e necessario informar o nome completo do servico, mas uma parte unica que diferencie o servico
 // dos demais ja e o suficiente.
 // Os servicos sao filtrados pelo service_description.
 // Deixe em branco para não filtrar.
-$nagMapR_FilterService  = '';
+$nagMapR_FilterService  = "";
 
 // Exibir ChangesBar? (Barra com informãcoes sobre os hosts) 
 // 1 = SIM.
@@ -125,7 +127,7 @@ $nagMapR_DateFormat = 1;
 $nagMapR_BarFilter = 1;
 
 // Tocar um alerta sonoro quando o status de um host mudar para down?
-// Para mudar o alerta tocado, basta somente substituir o arquivo 'Beep.mp3' na pasta resources.
+// Para mudar o alerta tocado, basta somente substituir o arquivo "Beep.mp3" na pasta resources.
 // Em alguns browsers e necessario que usuario interaja com a pagina antes que ela emita algum som,
 // sendo assim e necessario uma interacao inicial para que o alerta seja tocado.
 // 1 = SIM.
@@ -155,11 +157,16 @@ $nagMapR_Reporting = 1;
 #                                     INFORMACAO DE SEGURANCA                                      #
 ####################################################################################################
 // Chave de seguranca, protege de requisicoes externas. (use somente numeros e letras)
-$nagMapR_key = 'O9CJ16er3XsjI5Bj1CHmGnS6Yv4xQuBuGhx3h9fa2ZU0SuOkhBIVR8MtkLhyG0SiMJr3YCG98hz1eh99vVLZ0b3NbTUKLs4M';
+$nagMapR_key = "AHgRux3iIEMLnh60v7CMUlHlYqM2AtFsHausnSUn63NJEtp7glX3ClkHS12Mc7ASiVu5wqePXNNAwzYAE0pOcfnRvbn4zClb";
+
+// Solicitar autenticacao para acessar a pagina?
+// 1 = SIM (Fortemente recomendado).
+// 0 = NAO.
+$nagMapR_useAuth = 1;
 
 // Usuario utilizado na autenticacao.
 $nagMapR_User = "ngradmin";
 
 // Senha utilizada na autenticacao.
 $nagMapR_UserKey = "ngradmin";
-?>
+?>
diff --git a/debugInfo/debugInfo.php b/debugInfo/debugInfo.php
@@ -6,7 +6,7 @@
 include('../config.php');
 include("../langs/$nagMapR_Lang.php");
 
-if($key == $nagMapR_key){
+if($key == $nagMapR_key  && $nagMapR_Debug == 1){
 	if (!file_exists($nagios_status_dat_file)) {
 		die("</script>$nagios_status_dat_file $file_not_find_error");
 	}