Commit a1cef1bf authored by Guillaume28's avatar Guillaume28 Committed by GitHub

Master mon 2467 v2 (#6117)

* Prepare 2.8.8 release.

* fix(Conflict): Header conflict

* * fix knowledge cron compatibility php < 5.4 and check api configuration

* Update documentation

* fix(instance): Export with filter

* fix(HTPL): Export with filters

* fix(HTPL): Export with filters(trap)

* fix(Engine): cfg export with filter

* fix(export): add dependency injector

* fix(brokercfg): export with filter

* Correct make html warning/error for EN documentation

* fix(login): Remove duplicate $_GET["autologin"] in test

* Allow to use "min" in url with autologin - #5338

* fix(style): Coding style

* fix(filters): Filters on HG and CG export

* Fix typos in Enabled/Disabled filters (#5251)

* fix(export): Wrong parameters for several exports

* fix(export): wrong parameter for export HG

* Clarify documentation of centreon clapi authentication

* 5611 improve centreon documentation (#5612)

* Add notice label to restart server after disabled selinux

* Move installation documentation chapters in correct order

* Fix french typo in install chapter

* fix(doc): Add Launch services

* Activate services at system startup

* fix(doc): Reset installing poller

* fix(useless): Remove useless construct

* Add release note for Centreon Web 2.8.15

* fix(RtDowntime): Missing instantiation of objects host and service

* Correct typo

* fix(PDO): Missing colon for PDO

* fix(listHost): Wrong parameter

* doc(release note) : Add empty release note for the 2.8.18

* Add missing paragraph in documentation of installation for Centreon ISO el7 FR

* fix(form): JQuery function forget

* Add release note for Centreon Web 2.8.18

* Add notice for ISO availability
parent 51978ff8
......@@ -23,7 +23,10 @@ All actions in Centreon CLAPI will require authentication, so your commands will
# cd /usr/share/centreon/bin
# ./centreon -u admin -p centreon [...]
Obviously, the **-u** option is for the username and the **-p** option is for the password. If your passwords
are encoded with SHA1 in database, use the **-s** option::
Obviously, the **-u** option is for the username and the **-p** option is for the password.
The password can be in clear or the encrypted in the database.
.. note::
If your passwords are encoded with SHA1 in database (MD5 by default), use the **-s** option::
# ./centreon -u admin -p centreon -s [...]
......@@ -34,6 +34,8 @@ General information
* The **Host / Service Notification Period** field serves to choose the time period in which notifications are sent.
* The **Host / Service Notification Command** field serves to choose the notification command to a host or a service.
.. _autologin:
***********************
Centreon authentication
***********************
......
.. _pollers_basic_conf:
======
Poller
======
......
.. _widgets_user_guide:
============
Custom views
============
......
......@@ -4,6 +4,9 @@
Using Centreon ISO el7
======================
.. note::
The ISO image will be available in the coming days.
.. note::
Installation from Centreon el6 ISO is available :ref:`here<installisoel6>`
......
......@@ -18,8 +18,8 @@ SELinux should be disabled; for this, you have to modify the file */etc/selinux/
SELINUX=disabled
After saving the file, please reboot your operating system to apply the changes.
.. note::
After saving the file, please reboot your operating system to apply the changes.
******************
Repository install
......@@ -51,26 +51,22 @@ For CentOS 7.
The repository is now installed.
***************
Package install
***************
Installing a central server
---------------------------
************************
Install a central server
************************
The chapter describes the installation of a Centreon central server.
Perform the command:
::
::
$ yum install centreon-base-config-centreon-engine centreon
:ref:`After this step you should connect to Centreon to finalise the installation process <installation_web_ces>`.
Installing a poller
-------------------
--------------------
This chapter describes the installation of a collector.
......@@ -97,6 +93,7 @@ Copy this key on the collector:
$ ssh-copy-id centreon@your_poller_ip
Installing MySQL on the same server
-----------------------------------
......@@ -104,20 +101,16 @@ This chapter describes the installation of MySQL on a server including Centreon.
Perform the command:
::
::
$ yum install MariaDB-server
$ service mysql restart
******************
Post-package steps
******************
PHP timezone
------------
PHP timezone should be set; go to /etc/php.d directory and create a file named php-timezone.ini who contain the following line :
PHP timezone should be set; go to /etc/php.d directory and create a file named php-timezone.ini which contains the following line :
::
......@@ -164,7 +157,7 @@ Enable the automatically start of services during the system startup.
Execute these commands on central server.
* **CentOS v6** ::
**CentOS v6** ::
# chkconfig httpd on
# chkconfig snmpd on
......
......@@ -37,7 +37,7 @@ Support for multiple LDAP servers
=================================
The LDAP authentication system is much more robust than before.
Indeed, it is now possible to have :ref:`multiple LDAP configurations <ldap>` on
Indeed, it is now possible to have :ref:`multiple LDAP configurations <ldapconfiguration>` on
top of the failover system. The LDAP import form will let you choose the
LDAP server to import from.
......@@ -70,7 +70,7 @@ Communication with pollers
The default system user used by *Centcore* to communicate with pollers
has changed from ``nagios`` to ``centreon``. See
:ref:`ces:pollers_basic_conf` for more information.
:ref:`pollers_basic_conf` for more information.
Plugins
......
......@@ -2,8 +2,32 @@
Centreon Web 2.8.15
###################
Important notice
================
This version include a fix for the calculation of downtimes with daylight saving
time (DST). The downtime end will be calculate with the new hour.
For example, if you put a downtime from 1 AM to 5 AM, the duration of the
downtime will be 5 hours if during the DST you get 1 hour more (3 AM come back
to 2 AM).
Enhancements
============
* [Documentation] Improve api documentation (url) #5792
* [Downtimes] Manage downtimes with dst (recurrent and realtime) #5780
Bugfix
======
* [Install] Fix foreign key upgrade of traps_group table PR #5752
* [CLAPI] Fix duplicate ldap serverPR #5769
* [CLAPI] Fix duplicate htpl in stpl #5774
* [CLAPI] Fix duplicate on stpl #5775
* [Chart] Add unit on y axis
* [Chart] Fix extra legend on period change
* [Chart] Fix export with empty metric
* [Configuration] Add obsess_over_hosts parameter in main centengine configuration PR #5746
* [Monitoring] Ranking of ascending / descending guests NOK #5695 PR #5744
* [Monitoring] fix variable name in centreontrapd.pm
###################
Centreon Web 2.8.18
###################
Enhancements
============
* [Administration] Add more actions and logging for ACL management - PR #5841
* [API] Validate input parameters - PR #5958
* [API] Check illegal char in add function for CLAPI - PR #5948
* [API] Improve error message - PR #5972
* [API] Get multiple parameters for host - PR #5946
* [Configuration] Add form to configure Centreon Broker generic stream connectors - PR #6024 #6053 #6052 #6042 (beta)
* [Documentation] Add new chapter for Centreon ISO el7 installation - PR #6019
* [Documentation] Describe get parameters for hosts #5783 - PR #5924
* [Knowledge-Base] Add option to disable SSL certificate - PR #6027
Bug Fixes
=========
* [Administration] Define default value for Broker - #6029 PR #6033
* [Configuration] Change low limit of EventMaxQueueSize for Centreon Broker configuration - PR #6013
* [Configuration] Avoid php notice when poller has no timezone - PR #6031
* [Install] Compatibility with PHP version 5.3 - PR #5976
* [Meta-service] Do not duplicate them on update - PR #5982
* [Meta-service] Possibility for user with ACL to display chart - PR #5952
* [Monitoring] Top Counter with ACL really slow - #5974 PR #5992
* [Monitoring] Centreon UI freezes when access to "View contact Notification" - #5760 PR #5954
* [Monitoring] Replace dot character in command line for better display - PR #5945
* [Monitoring] Fix add downtime on hostgroup or poller with ACL - PR #6023
......@@ -8,3 +8,4 @@ Bug Fixes
* Fix Centreon Engine configuration form
* Fix custom view sharing
* Fix Knowledge Base script compatibility with PHP < 5.4
......@@ -20,3 +20,5 @@ Please find here the releases notes of the last major versions :
It is very important when you update your system to refer to this section in order to learn about behavior changes or major changes that have been made on this version. This will let you know the impact of the installation of these versions on the features you use or the specific developments that you have built on your platform (modules, widgets, plugins).
If you have any questions relating to the content of the notes, you can ask your questions on our `github <https://github.com/centreon/centreon>`_.
To resolve viewing issues for all widgets, you must clear your cache.
......@@ -23,7 +23,10 @@ All actions in Centreon CLAPI will require authentication, so your commands will
# cd /usr/share/centreon/bin
# ./centreon -u admin -p centreon [...]
Obviously, the **-u** option is for the username and the **-p** option is for the password. If your passwords
are encoded with SHA1 in database, use the **-s** option::
Obviously, the **-u** option is for the username and the **-p** option is for the password.
The password can be in clear or the encrypted in the database.
.. note::
If your passwords are encoded with SHA1 in database (MD5 by default), use the **-s** option::
# ./centreon -u admin -p centreon -s [...]
......@@ -4,6 +4,9 @@
A partir de Centreon ISO el7
============================
.. note::
L'image ISO sera disponible dans les jours à venir.
.. note::
L'installation à partir de l'image ISO el6 est décrite :ref:`ici<installisoel6>`
......@@ -71,7 +74,7 @@ Sélectionnez le disque dur et l'option **I will configure partitioning** puis c
:align: center
:scale: 65%
A l'aide du bouton **+** créerz votre partitionnement suivant les :ref:`prérequis de la documentation<diskspace>` puis cliquez sur **Done** :
A l'aide du bouton **+** créez votre partitionnement suivant les :ref:`prérequis de la documentation<diskspace>` puis cliquez sur **Done** :
.. image :: /images/guide_utilisateur/07_partitioning_filesystem.png
:align: center
......@@ -230,25 +233,100 @@ Effectuez l'opération ci-dessous :
::
/etc/my.cnf
/etc/my.cnf
3. Ajoutez la ligne suivante au fichier
::
[mysqld]
innodb_file_per_table=1
[mysqld]
innodb_file_per_table=1
4. Redémarrez le service mysql
::
service mysql restart
# service mysql restart
5. Cliquez sur **Refresh**
L'assistant de fin d'installation configure les bases de données, cliquez sur **Next**.
.. image :: /images/guide_utilisateur/adbconf.png
:align: center
:scale: 65%
L’installation est terminée, cliquez sur **Finish**.
À cette étape une publicité permet de connaitre les dernières nouveautés
de Centreon. Si votre plate-forme est connectée à Internet vous disposez
des dernières informations, sinon l’information présente dans cette version
sera proposée.
.. image :: /images/guide_utilisateur/aendinstall.png
:align: center
:scale: 65%
Vous pouvez maintenant vous connecter.
.. image :: /images/guide_utilisateur/aconnection.png
:align: center
:scale: 65%
Configuration de base
=====================
Dans un premier temps, il est nécessaire de passer l'interface en version française. Pour cela :
1. Connectez-vous avec l'utilisateur 'root' sur votre serveur
2. Installez le paquet de traduction en langue française avec la commande suivante
::
# yum -y install centreon-lang-fr_FR
3. Rendez-vous dans le menu **Administration** ==> **Options**
4. Dans le menu de gauche cliquez sur **My Account**
5. Dans le champ **Language**, remplacez **en_US** par **fr_FR.UTF-8**
6. Cliquez sur **Save**
.. image :: /images/guide_utilisateur/alanguage.png
:align: center
Démarrer la supervision
=======================
Pour démarrer l'ordonnanceur de supervision :
1. Sur l'interface web, rendez-vous dans le menu **Configuration** ==> **Moteur de supervision**
2. Laissez les options par défaut, et cliquez sur **Exporter**
3. Décochez **Générer les fichiers de configuration** et **Lancer le débogage du moteur de supervision (-v)**
4. Cochez **Déplacer les fichiers générés** ainsi que **Redémarrer l'ordonnanceur**
5. Cliquez à nouveau sur **Exporter**
6. Connectez-vous avec l'utilisateur 'root' sur votre serveur
7. Démarrez le composant Centreon Broker
::
# service cbd start
8. Démarrez Centreon Engine
::
# service centengine start
9. Démarrez centcore
::
# service centcore start
La supervision est maintenant opérationnelle.
Découverte de l'interface web
=============================
L'interface web de Centreon est composée de plusieurs menus, chaque menu a une fonction bien précise :
.. image :: /images/guide_utilisateur/amenu.png
......@@ -287,7 +365,7 @@ License Manager en tant que dépendance.
::
$ yum install centreon-pp-manager
# yum install centreon-pp-manager
Installation web
......
......@@ -20,8 +20,8 @@ SELinux doit être désactivé. Pour cela vous devez modifier le fichier */etc/s
SELINUX=disabled
Après avoir sauvegardé le fichier, veuillez redémarrer votre système d'exploitation pour prendre en compte les changements.
.. note::
Après avoir sauvegardé le fichier, veuillez redémarrer votre système d'exploitation pour prendre en compte les changements.
***********************
Installation des dépôts
......@@ -50,26 +50,22 @@ Pour CentOS 7.
Le dépôt est maintenant installé.
************************
Installation des paquets
************************
Installer un serveur central
----------------------------
*******************************
Installation du serveur central
*******************************
Ce chapitre décrit l'installation d'un serveur central Centreon.
Exécutez la commande :
::
::
$ yum install centreon-base-config-centreon-engine centreon
:ref:`A la fin de cette étape, connectez-vous à Centreon pour finaliser le processus d'installation <installation_web_ces>`.
Installer un collecteur
-----------------------
------------------------
Ce chapitre décrit l'installation d'un collecteur.
......@@ -103,16 +99,11 @@ Ce chapitre décrit l'installation de MySQL sur un serveur comprenant Centreon.
Exécutez la commande :
::
::
$ yum install MariaDB-server
$ service mysql restart
*******************
Étapes post-paquets
*******************
Fuseau horaire PHP
------------------
......@@ -146,7 +137,7 @@ Système de gestion de base de données
La base de données MySQL doit être disponible pour pouvoir continuer l'installation (localement ou non). Pour information nous recommandons MariaDB.
Pour les système CentOS / RHEL en verison 7, il est nécessaire de modifidier la limitation **LimitNOFILE**.
Pour les systèmes CentOS / RHEL en version 7, il est nécessaire de modifier la limitation **LimitNOFILE**.
Changer cette option dans /etc/my.cnf NE fonctionnera PAS.
::
......@@ -155,7 +146,7 @@ Changer cette option dans /etc/my.cnf NE fonctionnera PAS.
# echo -ne "[Service]\nLimitNOFILE=32000\n" | tee /etc/systemd/system/mariadb.service.d/limits.conf
# systemctl daemon-reload
# service mysqld restart
Lancer les services au démarrage
--------------------------------
......@@ -181,7 +172,7 @@ Lancer les commandes suivantes sur le serveur Central.
Terminer l'installation
-----------------------
:ref:`Clicquer ici pour finaliser le processus d'installation <installation_web_ces>`.
:ref:`Cliquer ici pour finaliser le processus d'installation <installation_web_ces>`.
Installer un collecteur
-----------------------
......@@ -210,4 +201,3 @@ Vous devez copier cette clé sur le collecteur :
::
$ ssh-copy-id centreon@your_poller_ip
......@@ -2,8 +2,32 @@
Centreon Web 2.8.15
###################
Important notice
================
This version include a fix for the calculation of downtimes with daylight saving
time (DST). The downtime end will be calculate with the new hour.
For example, if you put a downtime from 1 AM to 5 AM, the duration of the
downtime will be 5 hours if during the DST you get 1 hour more (3 AM come back
to 2 AM).
Enhancements
============
* [Documentation] Improve api documentation (url) #5792
* [Downtimes] Manage downtimes with dst (recurrent and realtime) #5780
Bugfix
======
* [Install] Fix foreign key upgrade of traps_group table PR #5752
* [CLAPI] Fix duplicate ldap serverPR #5769
* [CLAPI] Fix duplicate htpl in stpl #5774
* [CLAPI] Fix duplicate on stpl #5775
* [Chart] Add unit on y axis
* [Chart] Fix extra legend on period change
* [Chart] Fix export with empty metric
* [Configuration] Add obsess_over_hosts parameter in main centengine configuration PR #5746
* [Monitoring] Ranking of ascending / descending guests NOK #5695 PR #5744
* [Monitoring] fix variable name in centreontrapd.pm
###################
Centreon Web 2.8.18
###################
Enhancements
============
* [Administration] Add more actions and logging for ACL management - PR #5841
* [API] Validate input parameters - PR #5958
* [API] Check illegal char in add function for CLAPI - PR #5948
* [API] Improve error message - PR #5972
* [API] Get multiple parameters for host - PR #5946
* [Configuration] Add form to configure Centreon Broker generic stream connectors - PR #6024 #6053 #6052 #6042 (beta)
* [Documentation] Add new chapter for Centreon ISO el7 installation - PR #6019
* [Documentation] Describe get parameters for hosts #5783 - PR #5924
* [Knowledge-Base] Add option to disable SSL certificate - PR #6027
Bug Fixes
=========
* [Administration] Define default value for Broker - #6029 PR #6033
* [Configuration] Change low limit of EventMaxQueueSize for Centreon Broker configuration - PR #6013
* [Configuration] Avoid php notice when poller has no timezone - PR #6031
* [Install] Compatibility with PHP version 5.3 - PR #5976
* [Meta-service] Do not duplicate them on update - PR #5982
* [Meta-service] Possibility for user with ACL to display chart - PR #5952
* [Monitoring] Top Counter with ACL really slow - #5974 PR #5992
* [Monitoring] Centreon UI freezes when access to "View contact Notification" - #5760 PR #5954
* [Monitoring] Replace dot character in command line for better display - PR #5945
* [Monitoring] Fix add downtime on hostgroup or poller with ACL - PR #6023
......@@ -19,3 +19,5 @@ Voici les différentes notes de versions pour les versions majeures :
Il est très important lorsque vous souhaitez mettre à jour votre système de vous reporter à cette section afin de connaître les changements de comportement ou les changements majeurs qui ont été opérés sur cette version. Cela vous permettra de connaître l'impact de l'installation de ces versions sur les fonctionnalités que vous utilisez ou sur les développements spécifiques que vous avez intégrés sur votre plateforme (modules, widgets, plugins).
Si vous avez des questions ou besoins de compléments relatifs au contenu des notes, vous pouvez poser vos questions sur notre `github <https://github.com/centreon/centreon>`_.
Afin de régler les problèmes de vue concernant toutes les widgets vous devez vider votre cache.
......@@ -6,7 +6,7 @@ Mise à jour
Ce chapitre décrit le processus de mise à jour d'une plate-forme Centreon.
La procédure dépend de de la méthode d'installation de votre plate-forme Centreon.
La procédure dépend de la méthode d'installation de votre plate-forme Centreon.
Sélectionner **Mise à jour RPM** si vous avez installé Centreon à partir de l'ISO
ou des RPMS, sinon sélectionner **A partir des sources**. Avant de mettre à jour
réaliser une sauvegarde.
......
......@@ -695,7 +695,6 @@ class CentreonCentbrokerCfg extends CentreonObject
*/
public function export($filters = null)
{
$elements = $this->object->getList("*", -1, 0, null, null, $filters, "AND");
foreach ($elements as $element) {
$addStr = $this->action . $this->delim . "ADD" .
......
......@@ -281,7 +281,6 @@ class CentreonHostGroup extends CentreonObject
public function export($filters = null)
{
parent::export($filters);
$relObj = new \Centreon_Object_Relation_Host_Group_Host($this->dependencyInjector);
$hostObj = new \Centreon_Object_Host($this->dependencyInjector);
......
......@@ -165,7 +165,7 @@ class CentreonInstance extends CentreonObject
$elements = $this->object->getList($params, -1, 0, null, null, $filters);
foreach ($elements as $tab) {
if (isset($pollerState[$tab["id"]])) {
$tab["ns_status"] = $poller[$tab["id"]];
$tab["ns_status"] = $pollerState[$tab["id"]];
} else {
$tab["ns_status"] = '-';
}
......
......@@ -407,7 +407,7 @@ abstract class CentreonObject
/**
* Export data
*
* @param string $parameters
* @param string $filters
* @return void
*/
public function export($filters = null)
......
......@@ -84,6 +84,8 @@ class CentreonRtDowntime extends CentreonObject
parent::__construct($dependencyInjector);
$this->object = new \Centreon_Object_RtDowntime($dependencyInjector);
$this->hgObject = new \CentreonHostgroups($this->db);
$this->hostObject = new \CentreonClapi\CentreonHost($this->db);
$this->serviceObject = new \CentreonClapi\CentreonService($this->db);
$this->hostObject = new \CentreonClapi\CentreonHost($dependencyInjector);
$this->serviceObject = new \CentreonClapi\CentreonService($dependencyInjector);
$this->sgObject = new \CentreonServiceGroups($this->db);
......
......@@ -1025,7 +1025,7 @@ class CentreonServiceTemplate extends CentreonObject
"AND"
);
foreach ($telements as $telement) {
$this->api->export_filter('TRAP', $element['traps_id'], $element['traps_name']);
$this->api->export_filter('TRAP', $telement['traps_id'], $telement['traps_name']);
echo $this->action . $this->delim
. "addtrap" . $this->delim
. $telement['service_description'] . $this->delim
......@@ -1049,6 +1049,7 @@ class CentreonServiceTemplate extends CentreonObject
"AND"
);
foreach ($helements as $helement) {
$this->api->export_filter('HOST', $helement['host_id'], $helement['host_name']);
echo $this->action . $this->delim
. "addhosttemplate" . $this->delim
. $helement['service_description'] . $this->delim
......
......@@ -98,7 +98,11 @@ class WikiApi
$version = $result['query']['general']['generator'];
$version = explode(' ', $version);
return (float)$version[1];
if (isset($version[1])) {
return (float)$version[1];
} else {
throw new \Exception("An error occured, please check your Knowledge base configuration");
}
}
public function login()
......
......@@ -254,7 +254,7 @@ $queryStatName = "SELECT config_name, cache_directory "
. "AND ns_nagios_server = :id";
try {
$stmt = $pearDB->prepare($queryStatName);
$stmt->bindParam(':id', $selectedPoller, PDO:PARAM_INT);
$stmt->bindParam(':id', $selectedPoller, PDO::PARAM_INT);
$stmt->execute();
if (!$stmt->rowCount()) {
$tpl->assign('msg_err', _('No statistics file defined for this poller'));
......
......@@ -171,7 +171,7 @@ uniqueType["{$block.id}"] = false;
});
clonifyTableFields('parentGroup', 'displaynamegroup');
addCollapse();
addCollapse(id_name);
openNewElem(id_name);
jQuery('#' + id_name).centreonValidate();
......@@ -221,6 +221,12 @@ uniqueType["{$block.id}"] = false;
if(tab == "tab4"){
clonifyTableFields('parentGroup','displaynamegroup');
}
jQuery(function() {
jQuery.each(jQuery('[data-ontab-fn]'), function () {
window[jQuery(this).attr('data-ontab-fn')].onLoad(this, jQuery(this).attr('data-ontab-arg'))();
});
});
initCollapsebyTab(tab);
}
function purgeHideInput(tab) {
......
......@@ -124,10 +124,9 @@ $centreon->template = $template;
/*
* Status Filter
*/
$statusFilter = "<option value=''" . (($status == -1) ? " selected" : "") . "> </option>";
$statusFilter .= "<option value='1'" . (($status == 1) ? " selected" : "") . ">" . _("Enable") . "</option>";
$statusFilter .= "<option value='0'"
. (($status == 0 && $status != '') ? " selected" : "") . ">" . _("Disable") . "</option>";
$statusFilter = "<option value=''".(($status == -1) ? " selected" : "")."> </option>";
$statusFilter .= "<option value='1'".(($status == 1) ? " selected" : "").">"._("Enabled")."</option>";
$statusFilter .= "<option value='0'".(($status == 0 && $status != '') ? " selected" : "").">"._("Disabled")."</option>";
$sqlFilterCase = "";
if ($status == 1) {
......@@ -275,12 +274,12 @@ for ($i = 0; $host = $DBRESULT->fetchRow(); $i++) {
if ($host["host_activate"]) {
$moptions = "<a href='main.php?p=" . $p . "&host_id=" . $host['host_id'] . "&o=u&limit=" . $limit
. "&num=" . $num . "&search=" . $search
. "&num=" . $num . "&searchH=" . $search
. "'><img src='img/icons/disabled.png' class='ico-14 margin_right' border='0' alt='"
. _("Disabled") . "'></a>";
} else {
$moptions = "<a href='main.php?p=" . $p . "&host_id=" . $host['host_id'] . "&o=s&limit=" . $limit
. "&num=" . $num . "&search=" . $search
. "&num=" . $num . "&searchH=" . $search
. "'><img src='img/icons/enabled.png' class='ico-14 margin_right' border='0' alt='"
. _("Enabled") . "'></a>";
}
......
......@@ -121,10 +121,9 @@ $DBRESULT->closeCursor();
/*
* Status Filter
*/
$statusFilter = "<option value=''" . (($status == -1) ? " selected" : "") . "> </option>";
$statusFilter .= "<option value='1'" . (($status == 1) ? " selected" : "") . ">" . _("Enable") . "</option>";
$statusFilter .= "<option value='0'" . (($status == 0 && $status != '') ? " selected" : "") . ">" .
_("Disable") . "</option>";
$statusFilter = "<option value=''".(($status == -1) ? " selected" : "")."> </option>";
$statusFilter .= "<option value='1'".(($status == 1) ? " selected" : "").">"._("Enabled")."</option>";
$statusFilter .= "<option value='0'".(($status == 0 && $status != '') ? " selected" : "").">"._("Disabled")."</option>";
$sqlFilterCase = "";
if ($status == 1) {
......
......@@ -105,10 +105,10 @@ $DBRESULT->closeCursor();
/*
* Status Filter
*/
$statusFilter = "<option value=''" . (($status == -1) ? " selected" : "") . "> </option>";
$statusFilter .= "<option value='1'" . (($status == 1) ? " selected" : "") . ">" . _("Enable") . "</option>";
$statusFilter .= "<option value='0'" . (($status == 0 && $status != '') ? " selected" : "") . ">" .
_("Disable") . "</option>";
$statusFilter = "<option value=''".(($status == -1) ? " selected" : "")."> </option>";
;
$statusFilter .= "<option value='1'".(($status == 1) ? " selected" : "").">"._("Enabled")."</option>";
$statusFilter .= "<option value='0'".(($status == 0 && $status != '') ? " selected" : "").">"._("Disabled")."</option>";
$sqlFilterCase = "";
if ($status == 1) {
......
......@@ -37,7 +37,6 @@ require_once _CENTREON_PATH_ . 'bootstrap.php';
if (isset($_POST["centreon_token"])
|| (isset($_GET["autologin"]) &&
$_GET["autologin"] &&
$_GET["autologin"] &&
isset($generalOptions["enable_autologin"]) &&
$generalOptions["enable_autologin"])
......@@ -54,6 +53,10 @@ if (isset($_POST["centreon_token"])
if (isset($_POST['p'])) {
$_GET["p"] = $_POST["p"];
}
if (isset($_POST['min'])) {