Commit 93120954 authored by remi's avatar remi

GLPI_ROOT is now defined in include.php, fixed #4179

parent d15878bb
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkCentralAccess();
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkCentralAccess();
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -32,8 +32,7 @@
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -31,8 +31,7 @@
* @brief show choices for network reports
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -34,8 +34,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -33,8 +33,7 @@
* @since version 0.84
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -33,8 +33,7 @@
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
......
......@@ -31,8 +31,8 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reports", "r");
Html::header(Report::getTypeName(2), $_SERVER['PHP_SELF'], "utils", "report");
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$dropdown = new RequestType();
include (GLPI_ROOT . "/front/dropdown.common.form.php");
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$dropdown = new RequestType();
include (GLPI_ROOT . "/front/dropdown.common.php");
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkRight("reservation_helpdesk", "1");
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkLoginUser();
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkCentralAccess();
Session::checkRight("reservation_central", "w");
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkSeveralRightsOr(array("reservation_central" => "r",
"reservation_helpdesk" => "1"));
......
......@@ -32,8 +32,7 @@
* @since version 0.84
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
if (!isset($_GET["id"])) {
$_GET["id"] = "";
......
......@@ -32,8 +32,7 @@
* @since version 0.84
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkCentralAccess();
......
......@@ -32,8 +32,7 @@
*/
if (!defined('GLPI_ROOT')) {
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
}
Session::checkCentralAccess();
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkCentralAccess();
......
......@@ -31,8 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
Session::checkCentralAccess();
......
......@@ -32,8 +32,7 @@
*/
if (!defined('GLPI_ROOT')) {
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
}
Session::checkCentralAccess();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryComputerModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryComputerModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryComputerTypeCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryComputerTypeCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryManufacturerCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryManufacturerCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryMonitorModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryMonitorModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryMonitorTypeCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryMonitorTypeCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryNetworkEquipmentModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryNetworkEquipmentModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryNetworkEquipmentTypeCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryNetworkEquipmentTypeCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryOperatingSystemCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryOperatingSystemCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryOperatingSystemServicePackCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryOperatingSystemServicePackCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryOperatingSystemVersionCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryOperatingSystemVersionCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryPeripheralModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryPeripheralModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryPeripheralTypeCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryPeripheralTypeCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryPhoneModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryPhoneModelCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');
$rulecollection = new RuleDictionnaryPhoneTypeCollection();
......
......@@ -31,9 +31,7 @@
* @brief
*/
define('GLPI_ROOT', realpath('..'));
include (GLPI_ROOT . "/inc/includes.php");
include ('../inc/includes.php');