diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/plugins/src/centreon.pm centreon-2.0-fhs/plugins/src/centreon.pm --- centreon-2.0-better-installation-procedure/plugins/src/centreon.pm 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/plugins/src/centreon.pm 2009-07-16 00:23:31.000000000 +0200 @@ -55,14 +55,13 @@ our @EXPORT_OK = qw(get_parameters); our @EXPORT = @EXPORT_OK; -my $params_file = "centreon.conf"; my @ds = ("a","b","c","d","e","f","g","h","i","j","k","l"); ############################################################################### # Get all parameters from the ini file ############################################################################### sub get_parameters { - $params_file = "@NAGIOS_PLUGINS@/$params_file"; + my $params_file = "/etc/centreon/plugins.conf"; unless (-e $params_file) { print "Unknown - In centreon.pm :: $params_file :: $!\n"; exit $ERRORS{'UNKNOWN'}; diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/eventLogs/GetCSVLog.php centreon-2.0-fhs/www/include/eventLogs/GetCSVLog.php --- centreon-2.0-better-installation-procedure/www/include/eventLogs/GetCSVLog.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/eventLogs/GetCSVLog.php 2009-07-16 00:23:31.000000000 +0200 @@ -59,7 +59,7 @@ } else get_error('need session identifiant !'); - require_once $centreon_path . "www/class/other.class.php"; + require_once $classdir . "other.class.php"; require_once $centreon_path . "www/include/common/common-Func.php"; require_once $centreon_path . "www/include/common/common-Func-ACL.php"; @@ -98,4 +98,4 @@ echo $line->date.";".$line->time.";".$line->host_name.";".$line->service_description.";".$line->status.";".$line->type.";".$line->retry.";".$line->output.";".$line->contact.";".$line->contact_cmd."\n"; } - ?> \ Pas de fin de ligne à la fin du fichier. + ?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/home/pie-svc.php centreon-2.0-fhs/www/include/home/pie-svc.php --- centreon-2.0-better-installation-procedure/www/include/home/pie-svc.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/home/pie-svc.php 2009-07-16 00:23:31.000000000 +0200 @@ -36,14 +36,14 @@ * */ - require_once ("../../class/Session.class.php"); - require_once ("../../class/Oreon.class.php"); + include_once "@CENTREON_ETC@/centreon.conf.php"; + require_once ("$classdir/Session.class.php"); + require_once ("$classdir/Oreon.class.php"); Session::start(); $oreon =& $_SESSION["oreon"]; require_once "DB.php" ; - include_once "@CENTREON_ETC@/centreon.conf.php"; /* * Connect to oreon DB @@ -156,4 +156,4 @@ $g->set_tool_tip( '#val#%' ); $g->title( _('Services'), '{font-size:18px; color: #424242}' ); echo $g->render(); -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/home/tacticalOverview/tacticalOverview.php centreon-2.0-fhs/www/include/home/tacticalOverview/tacticalOverview.php --- centreon-2.0-better-installation-procedure/www/include/home/tacticalOverview/tacticalOverview.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/home/tacticalOverview/tacticalOverview.php 2009-07-16 00:23:31.000000000 +0200 @@ -55,7 +55,7 @@ } // Including files and dependences - require_once './class/other.class.php'; + require_once "$classdir/other.class.php"; require_once './include/common/common-Func.php'; require_once './include/common/common-Func-ACL.php'; require_once './DBconnect.php'; @@ -514,4 +514,4 @@ */ $tpl->display("tacticalOverview.ihtml"); } - ?> \ Pas de fin de ligne à la fin du fichier. + ?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/makeXMLForOneHost.php centreon-2.0-fhs/www/include/monitoring/engine/makeXMLForOneHost.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/makeXMLForOneHost.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/makeXMLForOneHost.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ $buffer = ''; include_once "@CENTREON_ETC@/centreon.conf.php"; - include_once $centreon_path . "www/class/other.class.php"; + include_once $classdir . "other.class.php"; include_once $centreon_path . "www/DBconnect.php"; include_once $centreon_path . "www/DBNDOConnect.php"; include_once $centreon_path . "www/include/common/common-Func-ACL.php"; @@ -218,4 +218,4 @@ * Print Buffer */ echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/makeXMLForOneService.php centreon-2.0-fhs/www/include/monitoring/engine/makeXMLForOneService.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/makeXMLForOneService.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/makeXMLForOneService.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ $buffer = ''; include_once "@CENTREON_ETC@/centreon.conf.php"; - include_once $centreon_path . "www/class/other.class.php"; + include_once $classdir . "other.class.php"; include_once $centreon_path . "www/DBconnect.php"; include_once $centreon_path . "www/DBNDOConnect.php"; include_once $centreon_path . "www/include/common/common-Func-ACL.php"; @@ -216,4 +216,4 @@ echo '<'.'?xml version="1.0" ?'.">\n"; echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/makeXMLMetaService.php centreon-2.0-fhs/www/include/monitoring/engine/makeXMLMetaService.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/makeXMLMetaService.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/makeXMLMetaService.php 2009-07-16 00:23:31.000000000 +0200 @@ -43,7 +43,7 @@ include("DB.php"); include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path."www/class/other.class.php"); + include_once($classdir."other.class.php"); include_once($centreon_path."www/DBconnect.php"); include_once($centreon_path."www/DBOdsConnect.php"); include_once($centreon_path."www/DBNDOConnect.php"); @@ -290,4 +290,4 @@ $buffer .= '</reponse>'; header('Content-Type: text/xml'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_hostGroup.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_hostGroup.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_hostGroup.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_hostGroup.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ $buffer = ''; include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path . "www/class/other.class.php"); + include_once($classdir . "other.class.php"); include_once($centreon_path . "www/DBconnect.php"); include_once($centreon_path . "www/DBNDOConnect.php"); include_once($centreon_path . "www/include/common/common-Func-ACL.php"); @@ -263,4 +263,4 @@ header('Cache-Control: no-cache, must-revalidate'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_host.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_host.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_host.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_host.php 2009-07-16 00:23:31.000000000 +0200 @@ -47,7 +47,7 @@ include_once("@CENTREON_ETC@/centreon.conf.php"); include_once($centreon_path . "www/DBconnect.php"); include_once($centreon_path . "www/DBNDOConnect.php"); - include_once($centreon_path . "www/class/other.class.php"); + include_once($classdir . "other.class.php"); include_once($centreon_path . "www/include/common/common-Func-ACL.php"); include_once($centreon_path . "www/include/common/common-Func.php"); @@ -247,4 +247,4 @@ header('Expires: 0'); header('Cache-Control: no-cache, must-revalidate'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceGridByHG.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceGridByHG.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceGridByHG.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceGridByHG.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ $buffer = ''; include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path . "www/class/other.class.php"); + include_once($classdir . "other.class.php"); include_once($centreon_path . "www/DBconnect.php"); include_once($centreon_path . "www/DBNDOConnect.php"); include_once($centreon_path . "www/include/monitoring/engine/common-Func.php"); @@ -281,4 +281,4 @@ header('Cache-Control: no-cache, must-revalidate'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceGridBySG.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceGridBySG.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceGridBySG.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceGridBySG.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ $buffer = ''; include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path."www/class/other.class.php"); + include_once($classdir."other.class.php"); include_once($centreon_path."www/DBconnect.php"); include_once($centreon_path."www/DBNDOConnect.php"); include_once($centreon_path."www/include/monitoring/engine/common-Func.php"); @@ -269,4 +269,4 @@ header('Cache-Control: no-cache, must-revalidate'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceGrid.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceGrid.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceGrid.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceGrid.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ $buffer = ''; include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path . "www/class/other.class.php"); + include_once($classdir . "other.class.php"); include_once($centreon_path . "www/DBconnect.php"); include_once($centreon_path . "www/DBNDOConnect.php"); include_once($centreon_path . "www/include/common/common-Func-ACL.php"); @@ -263,4 +263,4 @@ echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_service.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_service.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_service.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_service.php 2009-07-16 00:23:31.000000000 +0200 @@ -50,7 +50,7 @@ include("DB.php"); include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path."www/class/other.class.php"); + include_once($classdir."other.class.php"); include_once($centreon_path."www/DBconnect.php"); include_once($centreon_path."www/DBOdsConnect.php"); include_once($centreon_path."www/DBNDOConnect.php"); @@ -364,4 +364,4 @@ header('Cache-Control: no-cache, must-revalidate'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceSchedule.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceSchedule.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceSchedule.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceSchedule.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ $buffer = ''; include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path . "www/class/other.class.php"); + include_once($classdir . "other.class.php"); include_once($centreon_path . "www/DBconnect.php"); include_once($centreon_path . "www/DBNDOConnect.php"); include_once($centreon_path . "www/include/common/common-Func-ACL.php"); @@ -323,4 +323,4 @@ header('Cache-Control: no-cache, must-revalidate'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryByHG.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryByHG.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryByHG.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryByHG.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ $buffer = ''; include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path . "www/class/other.class.php"); + include_once($classdir . "other.class.php"); include_once($centreon_path . "www/DBconnect.php"); include_once($centreon_path . "www/DBNDOConnect.php"); include_once($centreon_path . "www/include/monitoring/engine/common-Func.php"); @@ -280,4 +280,4 @@ header('Cache-Control: no-cache, must-revalidate'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryBySG.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryBySG.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryBySG.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryBySG.php 2009-07-16 00:23:31.000000000 +0200 @@ -46,7 +46,7 @@ $buffer = ''; include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path."www/class/other.class.php"); + include_once($classdir."other.class.php"); include_once($centreon_path."www/DBconnect.php"); include_once($centreon_path."www/DBNDOConnect.php"); include_once($centreon_path."www/include/monitoring/engine/common-Func.php"); @@ -286,4 +286,4 @@ header('Cache-Control: no-cache, must-revalidate'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceSummary.php centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceSummary.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/engine/MakeXML_Ndo_serviceSummary.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/engine/MakeXML_Ndo_serviceSummary.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ $buffer = ''; include_once("@CENTREON_ETC@/centreon.conf.php"); - include_once($centreon_path . "www/class/other.class.php"); + include_once($classdir . "other.class.php"); include_once($centreon_path . "www/DBconnect.php"); include_once($centreon_path . "www/DBNDOConnect.php"); include_once($centreon_path . "www/include/monitoring/engine/common-Func.php"); @@ -223,4 +223,4 @@ header('Cache-Control: no-cache, must-revalidate'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/status/monitoringHost.php centreon-2.0-fhs/www/include/monitoring/status/monitoringHost.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/status/monitoringHost.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/status/monitoringHost.php 2009-07-16 00:23:31.000000000 +0200 @@ -39,7 +39,7 @@ if (!isset($oreon)) exit(); - require_once './class/other.class.php'; + require_once "$classdir/other.class.php"; include_once("./include/monitoring/common-Func.php"); include_once("./include/monitoring/external_cmd/cmd.php"); @@ -90,4 +90,4 @@ } } } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/monitoring/status/monitoringService.php centreon-2.0-fhs/www/include/monitoring/status/monitoringService.php --- centreon-2.0-better-installation-procedure/www/include/monitoring/status/monitoringService.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/monitoring/status/monitoringService.php 2009-07-16 00:23:31.000000000 +0200 @@ -39,7 +39,7 @@ if (!isset($oreon)) exit(); - require_once './class/other.class.php'; + require_once "$classdir/other.class.php"; include_once("./include/monitoring/common-Func.php"); include_once("./include/monitoring/external_cmd/cmd.php"); @@ -170,4 +170,4 @@ break; } } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/options/centStorage/manageData.php centreon-2.0-fhs/www/include/options/centStorage/manageData.php --- centreon-2.0-better-installation-procedure/www/include/options/centStorage/manageData.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/options/centStorage/manageData.php 2009-07-16 00:23:31.000000000 +0200 @@ -40,7 +40,7 @@ include("./include/common/autoNumLimit.php"); - require_once './class/other.class.php'; + require_once "$classdir/other.class.php"; include_once("./include/monitoring/common-Func.php"); #Pear library @@ -65,4 +65,4 @@ case "msvc" : require_once($path."viewMetrics.php"); break; default : require_once($path."viewData.php"); break; } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/csvExport/csv_HostGroupLogs.php centreon-2.0-fhs/www/include/reporting/dashboard/csvExport/csv_HostGroupLogs.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/csvExport/csv_HostGroupLogs.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/csvExport/csv_HostGroupLogs.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ include_once($centreon_path . "www/DBOdsConnect.php"); include_once($centreon_path . "www/include/common/common-Func.php"); include_once($centreon_path . "www/include/reporting/dashboard/common-Func.php"); - require_once $centreon_path . "www/class/other.class.php"; + require_once $classdir . "other.class.php"; require_once $centreon_path . "www/include/common/common-Func-ACL.php"; include_once($centreon_path . "www/include/reporting/dashboard/DB-Func.php"); @@ -146,4 +146,4 @@ $row["DOWN_MP"]."%;".$row["DOWNnbEvent"].";". $row["UNREACHABLE_MP"]."%;".$row["UNREACHABLEnbEvent"].";\n"; } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/csvExport/csv_HostLogs.php centreon-2.0-fhs/www/include/reporting/dashboard/csvExport/csv_HostLogs.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/csvExport/csv_HostLogs.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/csvExport/csv_HostLogs.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ include_once($centreon_path . "www/DBOdsConnect.php"); include_once($centreon_path . "www/include/common/common-Func.php"); include_once($centreon_path . "www/include/reporting/dashboard/common-Func.php"); - require_once $centreon_path . "www/class/other.class.php"; + require_once $classdir . "other.class.php"; require_once $centreon_path . "www/include/common/common-Func-ACL.php"; include_once($centreon_path . "www/include/reporting/dashboard/DB-Func.php"); /* @@ -133,4 +133,4 @@ $row["DOWNTimeScheduled"].";".$row["DOWN_MP"]."%;".$row["DOWNnbEvent"].";". $row["UNREACHABLETimeScheduled"].";".$row["UNREACHABLE_MP"]."%;".$row["UNREACHABLEnbEvent"].";\n"; } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/csvExport/csv_ServiceGroupLogs.php centreon-2.0-fhs/www/include/reporting/dashboard/csvExport/csv_ServiceGroupLogs.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/csvExport/csv_ServiceGroupLogs.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/csvExport/csv_ServiceGroupLogs.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ include_once($centreon_path . "www/DBOdsConnect.php"); include_once($centreon_path . "www/include/common/common-Func.php"); include_once($centreon_path . "www/include/reporting/dashboard/common-Func.php"); - require_once $centreon_path."www/class/other.class.php"; + require_once $classdir."other.class.php"; require_once $centreon_path."www/include/common/common-Func-ACL.php"; include_once($centreon_path . "www/include/reporting/dashboard/DB-Func.php"); @@ -145,4 +145,4 @@ $row["CRITICAL_MP"]."%;".$row["CRITICALnbEvent"].";\n"; } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/csvExport/csv_ServiceLogs.php centreon-2.0-fhs/www/include/reporting/dashboard/csvExport/csv_ServiceLogs.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/csvExport/csv_ServiceLogs.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/csvExport/csv_ServiceLogs.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ include_once($centreon_path . "www/DBOdsConnect.php"); include_once($centreon_path . "www/include/common/common-Func.php"); include_once($centreon_path . "www/include/reporting/dashboard/common-Func.php"); - require_once $centreon_path . "www/class/other.class.php"; + require_once $classdir . "other.class.php"; require_once $centreon_path . "www/include/common/common-Func-ACL.php"; include_once($centreon_path . "www/include/reporting/dashboard/DB-Func.php"); @@ -119,4 +119,4 @@ $row["UNKNOWNTimeScheduled"].";".$row["UNKNOWN_MP"]."%;".$row["UNKNOWNnbEvent"].";". $row["CRITICALTimeScheduled"].";".$row["CRITICAL_MP"]."%;".$row["CRITICALnbEvent"].";\n"; } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/imagesGenerations/pie-charts.php centreon-2.0-fhs/www/include/reporting/dashboard/imagesGenerations/pie-charts.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/imagesGenerations/pie-charts.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/imagesGenerations/pie-charts.php 2009-07-16 00:23:31.000000000 +0200 @@ -37,8 +37,8 @@ */ include_once "@CENTREON_ETC@/centreon.conf.php"; - require_once $centreon_path."www/class/Session.class.php"; - require_once $centreon_path."www/class/Oreon.class.php"; + require_once $classdir."Session.class.php"; + require_once $classdir."Oreon.class.php"; Session::start(); $oreon =& $_SESSION["oreon"]; @@ -86,4 +86,4 @@ $g->title( $_GET["host_name"], '{font-size:18px; color: #424242}' ); echo $g->render(); -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/initReport.php centreon-2.0-fhs/www/include/reporting/dashboard/initReport.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/initReport.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/initReport.php 2009-07-16 00:23:31.000000000 +0200 @@ -45,7 +45,7 @@ */ require_once 'HTML/QuickForm.php'; require_once 'HTML/QuickForm/Renderer/ArraySmarty.php'; - require_once './class/other.class.php'; + require_once "$classdir/other.class.php"; require_once './include/reporting/dashboard/common-Func.php'; require_once './include/reporting/dashboard/DB-Func.php'; require_once './include/common/common-Func.php'; @@ -187,4 +187,4 @@ $formPeriod->addElement('button', "endD", _("Modify"), array("onclick"=>"displayDatePicker('end')")); $formPeriod->addElement('submit', 'submit', _("View")); $formPeriod->setDefaults(array('period' => $period, "start" => $get_date_start, "end" => $get_date_end)); -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/xmlInformations/GetXmlHostGroup.php centreon-2.0-fhs/www/include/reporting/dashboard/xmlInformations/GetXmlHostGroup.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/xmlInformations/GetXmlHostGroup.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/xmlInformations/GetXmlHostGroup.php 2009-07-16 00:23:31.000000000 +0200 @@ -41,7 +41,7 @@ require_once "@CENTREON_ETC@/centreon.conf.php"; require_once $centreon_path.'www/include/reporting/dashboard/common-Func.php'; - require_once $centreon_path.'www/class/other.class.php'; + require_once $classdir.'other.class.php'; require_once $centreon_path.'www/include/reporting/dashboard/xmlInformations/common-Func.php'; /* * Definition of status @@ -95,4 +95,4 @@ $buffer .= '</data>'; header('Content-Type: text/xml'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/xmlInformations/GetXmlHost.php centreon-2.0-fhs/www/include/reporting/dashboard/xmlInformations/GetXmlHost.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/xmlInformations/GetXmlHost.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/xmlInformations/GetXmlHost.php 2009-07-16 00:23:31.000000000 +0200 @@ -40,7 +40,7 @@ require_once "@CENTREON_ETC@/centreon.conf.php"; require_once $centreon_path.'www/include/reporting/dashboard/common-Func.php'; - require_once $centreon_path.'www/class/other.class.php'; + require_once $classdir.'other.class.php'; require_once $centreon_path.'www/include/reporting/dashboard/xmlInformations/common-Func.php'; $buffer = null; @@ -81,4 +81,4 @@ $buffer .= '</data>'; header('Content-Type: text/xml'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/xmlInformations/GetXmlServiceGroup.php centreon-2.0-fhs/www/include/reporting/dashboard/xmlInformations/GetXmlServiceGroup.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/xmlInformations/GetXmlServiceGroup.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/xmlInformations/GetXmlServiceGroup.php 2009-07-16 00:23:31.000000000 +0200 @@ -39,7 +39,7 @@ require_once 'DB.php'; require_once "@CENTREON_ETC@/centreon.conf.php"; require_once $centreon_path.'www/include/reporting/dashboard/common-Func.php'; - require_once $centreon_path.'www/class/other.class.php'; + require_once $classdir.'other.class.php'; require_once $centreon_path.'www/include/reporting/dashboard/xmlInformations/common-Func.php'; $buffer = null; @@ -91,4 +91,4 @@ header('Content-Type: text/xml'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/xmlInformations/GetXmlService.php centreon-2.0-fhs/www/include/reporting/dashboard/xmlInformations/GetXmlService.php --- centreon-2.0-better-installation-procedure/www/include/reporting/dashboard/xmlInformations/GetXmlService.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/reporting/dashboard/xmlInformations/GetXmlService.php 2009-07-16 00:23:31.000000000 +0200 @@ -39,7 +39,7 @@ require_once 'DB.php'; require_once "@CENTREON_ETC@/centreon.conf.php"; require_once $centreon_path.'www/include/reporting/dashboard/common-Func.php'; - require_once $centreon_path.'www/class/other.class.php'; + require_once $classdir.'other.class.php'; require_once $centreon_path.'www/include/reporting/dashboard/xmlInformations/common-Func.php'; @@ -76,4 +76,4 @@ $buffer .= '</data>'; header('Content-Type: text/xml'); echo $buffer; -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/views/graphs/graphODS/generateImages/generateODSImage.php centreon-2.0-fhs/www/include/views/graphs/graphODS/generateImages/generateODSImage.php --- centreon-2.0-better-installation-procedure/www/include/views/graphs/graphODS/generateImages/generateODSImage.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/views/graphs/graphODS/generateImages/generateODSImage.php 2009-07-16 00:23:31.000000000 +0200 @@ -46,8 +46,8 @@ require_once 'DB.php'; require_once './DB-Func.php'; - require_once $centreon_path."www/class/Session.class.php"; - require_once $centreon_path."www/class/Oreon.class.php"; + require_once $classdir."Session.class.php"; + require_once $classdir."Oreon.class.php"; Session::start(); $oreon =& $_SESSION["oreon"]; @@ -335,4 +335,4 @@ print $str; } } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/views/graphs/graphODS/generateImages/generateODSImageZoom.php centreon-2.0-fhs/www/include/views/graphs/graphODS/generateImages/generateODSImageZoom.php --- centreon-2.0-better-installation-procedure/www/include/views/graphs/graphODS/generateImages/generateODSImageZoom.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/views/graphs/graphODS/generateImages/generateODSImageZoom.php 2009-07-16 00:23:31.000000000 +0200 @@ -55,8 +55,8 @@ require_once 'DB.php'; require_once './DB-Func.php'; - require_once $centreon_path."www/class/Session.class.php"; - require_once $centreon_path."www/class/Oreon.class.php"; + require_once $classdir."Session.class.php"; + require_once $classdir."Oreon.class.php"; Session::start(); $oreon =& $_SESSION["oreon"]; @@ -318,4 +318,4 @@ print $str; } } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/views/graphs/graphODS/generateImages/generateODSMetricImage.php centreon-2.0-fhs/www/include/views/graphs/graphODS/generateImages/generateODSMetricImage.php --- centreon-2.0-better-installation-procedure/www/include/views/graphs/graphODS/generateImages/generateODSMetricImage.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/views/graphs/graphODS/generateImages/generateODSMetricImage.php 2009-07-16 00:23:31.000000000 +0200 @@ -46,8 +46,8 @@ require_once 'DB.php'; require_once './DB-Func.php'; - require_once $centreon_path."www/class/Session.class.php"; - require_once $centreon_path."www/class/Oreon.class.php"; + require_once $classdir."Session.class.php"; + require_once $classdir."Oreon.class.php"; Session::start(); $oreon =& $_SESSION["oreon"]; @@ -302,4 +302,4 @@ print $str; } } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/include/views/graphs/statusGraphs/displayServiceStatus.php centreon-2.0-fhs/www/include/views/graphs/statusGraphs/displayServiceStatus.php --- centreon-2.0-better-installation-procedure/www/include/views/graphs/statusGraphs/displayServiceStatus.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/include/views/graphs/statusGraphs/displayServiceStatus.php 2009-07-16 00:23:31.000000000 +0200 @@ -43,8 +43,8 @@ require_once 'DB.php'; require_once "@CENTREON_ETC@/centreon.conf.php"; require_once $centreon_path."www/DBconnect.php"; - require_once $centreon_path."www/class/Session.class.php"; - require_once $centreon_path."www/class/Oreon.class.php"; + require_once $classdir."Session.class.php"; + require_once $classdir."Oreon.class.php"; Session::start(); $oreon =& $_SESSION["oreon"]; @@ -216,4 +216,4 @@ print $str; } } -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/install/setup.php centreon-2.0-fhs/www/install/setup.php --- centreon-2.0-better-installation-procedure/www/install/setup.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/install/setup.php 2009-07-16 00:23:31.000000000 +0200 @@ -36,7 +36,7 @@ * */ - include_once ("../class/Session.class.php"); + include_once ("/usr/share/centreon/class/Session.class.php"); include_once ("DB-Func.php"); Session::start(); ini_set("track_errors",true); diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/install/steps/step10.php centreon-2.0-fhs/www/install/steps/step10.php --- centreon-2.0-better-installation-procedure/www/install/steps/step10.php 2009-07-16 00:23:04.000000000 +0200 +++ centreon-2.0-fhs/www/install/steps/step10.php 2009-07-16 00:23:31.000000000 +0200 @@ -106,7 +106,7 @@ $file[23] = "\$conf_centreon['dbcstg'] = \"". $_SESSION["nameOdsDB"] . "\";\n"; $file[24] = "\n\n"; $file[25] = "/* path to classes */\n"; - $file[26] = "\$classdir='./class';\n"; + $file[26] = "\$classdir='/usr/share/centreon/class/';\n"; $file[27] = "/* Centreon Path */\n"; $file[28] = "\$centreon_path='".$conf_centreon["centreon_dir"]."';\n"; $file[29] = "\$centreon_version='2.0';\n"; diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/install/steps/step11.php centreon-2.0-fhs/www/install/steps/step11.php --- centreon-2.0-better-installation-procedure/www/install/steps/step11.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/install/steps/step11.php 2009-07-16 00:23:31.000000000 +0200 @@ -118,7 +118,7 @@ if (!$return_false){ print '<tr><td><b>Database ’'.$_SESSION["nameOreonDB"].'’ : Schema Creation</b></td>'; $mysql_msg = ''; - $file_sql = file("./createTables.sql"); + $file_sql = file("@CENTREON_PATH@/sql/setup/createTables.sql"); $str = NULL; for ($i = 0; $i <= count($file_sql) - 1; $i++){ $line = $file_sql[$i]; @@ -159,7 +159,7 @@ if (!$return_false){ print '<tr><td><b>Database ’'.$_SESSION["nameOdsDB"].'’ : Schema Creation</b></td>'; $mysql_msg = ''; - $file_sql = file("./createTablesCentstorage.sql"); + $file_sql = file("@CENTREON_PATH@/sql/setup/createTablesCentstorage.sql"); $str = NULL; for ($i = 0; $i <= count($file_sql) - 1; $i++){ $line = $file_sql[$i]; @@ -198,7 +198,7 @@ if (!$return_false){ print '<tr><td><b>Database ’'.$_SESSION["nameOreonDB"].'’ : Macros Creation</b></td>'; $mysql_msg = ''; - $file_sql = file("./insertMacros.sql"); + $file_sql = file("@CENTREON_PATH@/sql/setup/insertMacros.sql"); $str = NULL; for ($i = 0; $i <= count($file_sql) - 1; $i++){ $line = $file_sql[$i]; @@ -224,7 +224,7 @@ if (!$return_false){ print '<tr><td><b>Database ’'.$_SESSION["nameOreonDB"].'’ : Insert Commands</b></td>'; $mysql_msg = ''; - $file_sql = file("./insertCmd-Tps.sql"); + $file_sql = file("@CENTREON_PATH@/sql/setup/insertCmd-Tps.sql"); $str = NULL; for ($i = 0; $i <= count($file_sql) - 1; $i++){ $line = $file_sql[$i]; @@ -250,7 +250,7 @@ if (!$return_false){ print '<tr><td><b>Database ’'.$_SESSION["nameOreonDB"].'’ : Topology Insertion</b></td>'; $mysql_msg = ''; - $file_sql = file("./insertTopology.sql"); + $file_sql = file("@CENTREON_PATH@/sql/setup/insertTopology.sql"); $str = NULL; for ($i = 0; $i <= count($file_sql) - 1; $i++){ $line = $file_sql[$i]; @@ -276,7 +276,7 @@ if (!$return_false){ print '<tr><td><b>Database ’'.$_SESSION["nameOreonDB"].'’ : Insert Basic Configuration</b></td>'; $mysql_msg = ''; - $file_sql = file("./insertBaseConf.sql"); + $file_sql = file("@CENTREON_PATH@/sql/setup/insertBaseConf.sql"); $str = NULL; for ($i = 0; $i <= count($file_sql) - 1; $i++){ $line = $file_sql[$i]; @@ -368,4 +368,4 @@ $str .= " />"; print $str; aff_footer(); -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/install/step_upgrade/step3.php centreon-2.0-fhs/www/install/step_upgrade/step3.php --- centreon-2.0-better-installation-procedure/www/install/step_upgrade/step3.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/install/step_upgrade/step3.php 2009-07-16 00:23:31.000000000 +0200 @@ -54,7 +54,7 @@ <td align="right"> <select name="mysqlscript"> <?php - chdir('sql'); + chdir('@CENTREON_PATH@/sql/upgrade'); foreach (glob("Update-CSTG-".$version["value"]."_to_*.sql") as $filename) { echo '<option value="'.$filename.'">'.$filename.'</option>'; } ?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/install/step_upgrade/step5.php centreon-2.0-fhs/www/install/step_upgrade/step5.php --- centreon-2.0-better-installation-procedure/www/install/step_upgrade/step5.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/install/step_upgrade/step5.php 2009-07-16 00:23:31.000000000 +0200 @@ -54,7 +54,7 @@ <td align="right"> <select name="mysqlscript"> <?php - chdir('sql'); + chdir('@CENTREON_PATH@/sql/upgrade'); foreach (glob("Update-DB-".$version["value"]."_to_*.sql") as $filename) { echo '<option value="'.$filename.'">'.$filename.'</option>'; } ?> @@ -66,4 +66,4 @@ aff_middle(); print "<input class='button' type='submit' name='goto-B' value='Back' /><input class='button' type='submit' name='goto' value='Next' id='button_next' />"; aff_footer(); -?> \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur --exclude '*.orig' centreon-2.0-better-installation-procedure/www/install/upgrade.php centreon-2.0-fhs/www/install/upgrade.php --- centreon-2.0-better-installation-procedure/www/install/upgrade.php 2009-07-16 00:22:52.000000000 +0200 +++ centreon-2.0-fhs/www/install/upgrade.php 2009-07-16 00:23:31.000000000 +0200 @@ -39,7 +39,7 @@ // configuration include_once ("@CENTREON_ETC@/centreon.conf.php"); include_once ("./step_upgrade/functions.php"); - include_once ("../class/Session.class.php"); + include_once ("/usr/share/centreon/class/Session.class.php"); Session::start();