From 1b4e0b1c6e332b6b74448d8cca6598a4c9ec0441 Mon Sep 17 00:00:00 2001
From: Loic Laurent <loic.lau@gmail.com>
Date: Thu, 28 Jul 2016 11:25:27 +0200
Subject: [PATCH] update link
---
cron/centKnowledgeSynchronizer.php | 4 ++--
.../procedures_Proxy.class.php | 3 ++-
.../configKnowledge/display-hostTemplates.php | 1 -
.../configKnowledge/display-hosts.php | 1 -
.../display-serviceTemplates.php | 1 -
.../configKnowledge/display-services.php | 1 -
.../configuration/configKnowledge/header.php | 11 ---------
.../configKnowledge/pagination.php | 11 ++++-----
.../configuration/configKnowledge/popup.php | 17 ++++++++-----
.../configKnowledge/popup_form.php | 10 ++++----
.../configKnowledge/proxy/proxy.php | 4 ++--
.../configKnowledge/templates/display.ihtml | 18 +++++++-------
.../templates/pagination-2.7.ihtml | 15 ------------
.../templates/pagination.ihtml | 24 +++++++++----------
14 files changed, 48 insertions(+), 73 deletions(-)
delete mode 100644 www/include/configuration/configKnowledge/header.php
rename proxy/proxyKB.php => www/include/configuration/configKnowledge/proxy/proxy.php (94%)
delete mode 100644 www/include/configuration/configKnowledge/templates/pagination-2.7.ihtml
diff --git a/cron/centKnowledgeSynchronizer.php b/cron/centKnowledgeSynchronizer.php
index 23ae70a413..cd5fd6cb75 100644
--- a/cron/centKnowledgeSynchronizer.php
+++ b/cron/centKnowledgeSynchronizer.php
@@ -171,7 +171,7 @@ function editLinkForHost($dbConnector, $hostName)
$resHost = $dbConnector->query($querySelect);
$tuple = $resHost->fetchRow();
- $valueToAdd = _CENTREONURL_.'/../proxy/proxyKB.php?host_name=$HOSTNAME$';
+ $valueToAdd = _CENTREONURL_.'/include/configuration/configKnowledge/proxy/proxy.php?host_name=$HOSTNAME$';
$queryUpdate = "UPDATE extended_host_information "
."SET ehi_notes_url = '$valueToAdd' "
."WHERE host_host_id = '".$tuple['host_id']."'";
@@ -205,7 +205,7 @@ function editLinkForService($dbConnector, $objName)
$resService = $dbConnector->query($querySelect);
$tuple = $resService->fetchRow();
- $valueToAdd = _CENTREONURL_.'/../proxy/proxyKB.php?host_name=$HOSTNAME$&service_description=$SERVICEDESC$';
+ $valueToAdd = _CENTREONURL_.'/include/configuration/configKnowledge/proxy/proxy.php?host_name=$HOSTNAME$&service_description=$SERVICEDESC$';
$queryUpdate = "UPDATE extended_service_information "
."SET esi_notes_url = '$valueToAdd' "
."WHERE service_service_id = '".$tuple['service_id']."'";
diff --git a/www/class/centreon-knowledge/procedures_Proxy.class.php b/www/class/centreon-knowledge/procedures_Proxy.class.php
index df83c02642..788bbc6118 100644
--- a/www/class/centreon-knowledge/procedures_Proxy.class.php
+++ b/www/class/centreon-knowledge/procedures_Proxy.class.php
@@ -26,7 +26,8 @@ class procedures_Proxy {
$this->hflag = 0;
$this->sflag = 0;
- require_once "../../../config/wiki.conf.php";
+ $centreon_path = realpath(dirname(__FILE__) . '/../../../');
+ require_once $centreon_path."/config/wiki.conf.php";
require_once "$etc_centreon/centreon.conf.php";
$this->wikiURL = $WikiURL;
diff --git a/www/include/configuration/configKnowledge/display-hostTemplates.php b/www/include/configuration/configKnowledge/display-hostTemplates.php
index 2a4c4e6bf8..5d4934b90a 100644
--- a/www/include/configuration/configKnowledge/display-hostTemplates.php
+++ b/www/include/configuration/configKnowledge/display-hostTemplates.php
@@ -40,7 +40,6 @@
exit();
$modules_path = $centreon_path . "www/include/configuration/configKnowledge/";
- require_once $modules_path . 'header.php';
require_once $modules_path . 'functions.php';
diff --git a/www/include/configuration/configKnowledge/display-hosts.php b/www/include/configuration/configKnowledge/display-hosts.php
index e526856a6f..4d796586d1 100644
--- a/www/include/configuration/configKnowledge/display-hosts.php
+++ b/www/include/configuration/configKnowledge/display-hosts.php
@@ -40,7 +40,6 @@
exit();
$modules_path = $centreon_path . "www/include/configuration/configKnowledge/";
- require_once $modules_path . 'header.php';
require_once $modules_path . 'functions.php';
diff --git a/www/include/configuration/configKnowledge/display-serviceTemplates.php b/www/include/configuration/configKnowledge/display-serviceTemplates.php
index d5532678ca..5bb684fa8f 100644
--- a/www/include/configuration/configKnowledge/display-serviceTemplates.php
+++ b/www/include/configuration/configKnowledge/display-serviceTemplates.php
@@ -40,7 +40,6 @@
exit();
$modules_path = $centreon_path . "www/include/configuration/configKnowledge/";
- require_once $modules_path . 'header.php';
require_once $modules_path . 'functions.php';
if (!isset($limit) || !$limit)
diff --git a/www/include/configuration/configKnowledge/display-services.php b/www/include/configuration/configKnowledge/display-services.php
index 24a5344270..5715909de4 100644
--- a/www/include/configuration/configKnowledge/display-services.php
+++ b/www/include/configuration/configKnowledge/display-services.php
@@ -41,7 +41,6 @@ if (!isset($oreon)) {
}
$modules_path = $centreon_path . "www/include/configuration/configKnowledge/";
-require_once $modules_path . 'header.php';
require_once $modules_path . 'functions.php';
diff --git a/www/include/configuration/configKnowledge/header.php b/www/include/configuration/configKnowledge/header.php
deleted file mode 100644
index 871cc672cc..0000000000
--- a/www/include/configuration/configKnowledge/header.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-if (zend_loader_file_encoded() == true) {
- $licenseValidity = zend_loader_install_license ($centreon_path . "www/modules/centreon-knowledgebase/license/merethis_lic.zl", true);
- if ($licenseValidity == false) {
- echo "<div class='msg' align='center'>"._("The license is not valid. Please contact your administator for more information.")."</div>";
- echo "</td></tr></table></div>";
- include("./footer.php");
- exit(0);
- }
-}
-?>
\ No newline at end of file
diff --git a/www/include/configuration/configKnowledge/pagination.php b/www/include/configuration/configKnowledge/pagination.php
index e213d84bb4..ddcf2c13ad 100644
--- a/www/include/configuration/configKnowledge/pagination.php
+++ b/www/include/configuration/configKnowledge/pagination.php
@@ -105,7 +105,7 @@
/*
* Smarty template Init
*/
- $tpl = initSmartyTpl($path, new Smarty(), "./modules/centreon-knowledgebase/core/display/");
+ $tpl = initSmartyTpl($path, new Smarty(), "./include/configuration/configKnowledge/");
$page_max = ceil($rows / $limit);
if ($num >= $page_max && $rows) {
@@ -223,9 +223,8 @@
$tpl->assign("order", $_GET["order"]);
$tpl->assign("tab_order", $tab_order);
$tpl->assign('form', $renderer->toArray());
- if ($bNewChart) {
- $tpl->display("templates/pagination-2.7.ihtml");
- } else {
- $tpl->display("templates/pagination.ihtml");
- }
+
+
+ $tpl->display("templates/pagination.ihtml");
+
?>
diff --git a/www/include/configuration/configKnowledge/popup.php b/www/include/configuration/configKnowledge/popup.php
index 51493ec0dc..c9566268cc 100644
--- a/www/include/configuration/configKnowledge/popup.php
+++ b/www/include/configuration/configKnowledge/popup.php
@@ -43,21 +43,26 @@
/*
* Add paths
*/
- require_once "../../wiki.conf.php";
- require_once "$etc_centreon/centreon.conf.php";
- require_once $centreon_path.'www/modules/centreon-knowledgebase/core/header.php';
+ $centreon_path = realpath(dirname(__FILE__) . '/../../../../');
+ require_once $centreon_path."/config/wiki.conf.php";
+ require_once "$etc_centreon/centreon.conf.php";
- set_include_path(get_include_path() . PATH_SEPARATOR . $centreon_path . "www/modules/centreon-knowledgebase/". PATH_SEPARATOR . $centreon_path."www/class/");
+ set_include_path(get_include_path() . PATH_SEPARATOR . $centreon_path . "config/". PATH_SEPARATOR . $centreon_path."www/class/");
require_once "DB.php";
require_once "wiki.conf.php";
- require_once "core/class/procedures_DB_Connector.class.php";
- require_once "core/class/procedures.class.php";
+ require_once "centreon-knowledge/procedures_DB_Connector.class.php";
+ require_once "centreon-knowledge/procedures.class.php";
require_once "centreonLog.class.php";
require_once "centreonDB.class.php";
+
+
+
+
+
/*
* Connect to centreon DB
*/
diff --git a/www/include/configuration/configKnowledge/popup_form.php b/www/include/configuration/configKnowledge/popup_form.php
index 959e397ff9..4fe8c55d62 100644
--- a/www/include/configuration/configKnowledge/popup_form.php
+++ b/www/include/configuration/configKnowledge/popup_form.php
@@ -36,10 +36,10 @@
*
*/
- require_once "../../wiki.conf.php";
+ require_once $centreon_path."/config/wiki.conf.php";
require_once "$etc_centreon/centreon.conf.php";
- set_include_path(get_include_path() . PATH_SEPARATOR . $centreon_path . "www/modules/centreon-knowledgebase/".PATH_SEPARATOR . $centreon_path."www/");
+ set_include_path(get_include_path() . PATH_SEPARATOR . $centreon_path . "www/include/configuration/configKnowledge/".PATH_SEPARATOR . $centreon_path."www/class/".PATH_SEPARATOR . $centreon_path."www/");
require_once "DB.php";
require_once "include/common/common-Func.php";
@@ -50,9 +50,9 @@
$pearDB = new CentreonDB();
if (isset($_GET["session_id"]) && $_GET["session_id"] != "") {
$path = "core/display/";
- require_once "wiki.conf.php";
- require_once "core/class/procedures_DB_Connector.class.php";
- require_once "core/class/procedures.class.php";
+ require_once $centreon_path."/config/wiki.conf.php";
+ require_once "centreon-knowledge/procedures_DB_Connector.class.php";
+ require_once "centreon-knowledge/procedures.class.php";
/*
* Init procedures Object
diff --git a/proxy/proxyKB.php b/www/include/configuration/configKnowledge/proxy/proxy.php
similarity index 94%
rename from proxy/proxyKB.php
rename to www/include/configuration/configKnowledge/proxy/proxy.php
index fd96e5a42d..7f3614da5a 100644
--- a/proxy/proxyKB.php
+++ b/www/include/configuration/configKnowledge/proxy/proxy.php
@@ -37,8 +37,8 @@
*/
ini_set("display_errors", "On");
-
- require_once "../config/wiki.conf.php";
+ $centreon_path = realpath(dirname(__FILE__) . '/../../../../../');
+ require_once $centreon_path."/config/wiki.conf.php";
global $etc_centreon, $db_prefix;
require_once $etc_centreon."/centreon.conf.php";
diff --git a/www/include/configuration/configKnowledge/templates/display.ihtml b/www/include/configuration/configKnowledge/templates/display.ihtml
index c648943325..c41f6e7da8 100644
--- a/www/include/configuration/configKnowledge/templates/display.ihtml
+++ b/www/include/configuration/configKnowledge/templates/display.ihtml
@@ -69,7 +69,7 @@
<table class="ToolbarTable table">
<tr class="ToolbarTR">
{php}
- include('./modules/centreon-knowledgebase/core/display/pagination.php');
+ include('./include/configuration/configKnowledge/pagination.php');
{/php}
</tr>
</table>
@@ -97,13 +97,13 @@
{foreach key=elem from=$content item=stt}
<tr class="{php} global $line; print $line[$l%2]; {/php}">
<td class="ListColCenter"><img class="ico-14" src="./img/icons/service.png"></td>
- <td class="ListColLeft"><a href="./modules/centreon-knowledgebase/core/proxy/proxy.php?host_name={$services.$elem.h}" target="_blank" title="Show Wiki Page"><img class="ico-14" src="./img/icons/link.png"></a> {if $services.$elem.h != $hostname}{$services.$elem.h}{else} {/if}</td>
- <td class="ListColLeft"><a href="./modules/centreon-knowledgebase/core/proxy/proxy.php?host_name={$services.$elem.h}&service_description={$services.$elem.svc}" target="_blank" title="Show Wiki Page"><img class="ico-14" src="./img/icons/link.png"></a> {$services.$elem.svc}</td>
+ <td class="ListColLeft"><a href="./include/configuration/configKnowledge/proxy/proxy.php?host_name={$services.$elem.h}" target="_blank" title="Show Wiki Page"><img class="ico-14" src="./img/icons/link.png"></a> {if $services.$elem.h != $hostname}{$services.$elem.h}{else} {/if}</td>
+ <td class="ListColLeft"><a href="./include/configuration/configKnowledge/proxy/proxy.php?host_name={$services.$elem.h}&service_description={$services.$elem.svc}" target="_blank" title="Show Wiki Page"><img class="ico-14" src="./img/icons/link.png"></a> {$services.$elem.svc}</td>
<td class="ListColRight">{$templateHostArray.$elem}</td>
<td class="ListColCenter">{$status[$stt]}</td>
<td class="ListColCenter">
{if $stt == 0}
- <a name="Create wiki page" href='./modules/centreon-knowledgebase/core/display/popup.php?session_id={php}print session_id();{/php}&object=Service:{$elem}&type={$selection}' target='_blank'>Create wiki page</a>
+ <a name="Create wiki page" href='./include/configuration/configKnowledge/popup.php?session_id={php}print session_id();{/php}&object=Service:{$elem}&type={$selection}' target='_blank'>Create wiki page</a>
{$line}
{/if}
{if $stt == 1}
@@ -128,7 +128,7 @@
{else}
<img class="ico-14" src="{$icone[$elem]}"></td>
{/if}
- <td class="ListColLeft">{if $selection == 0}<a href="./modules/centreon-knowledgebase/core/proxy/proxy.php?host_name={$elem}" target="_blank" title="Show Wiki Page"><img class="ico-14" src="./img/icons/link.png"></a> {/if}{$elem}</td>
+ <td class="ListColLeft">{if $selection == 0}<a href="./include/configuration/configKnowledge/proxy/proxy.php?host_name={$elem}" target="_blank" title="Show Wiki Page"><img class="ico-14" src="./img/icons/link.png"></a> {/if}{$elem}</td>
{if $selection == 1}
<td class="ListColLeft">{$content[$elem].svc}</td>
{/if}
@@ -137,11 +137,11 @@
<td class="ListColCenter">
{if $stt == 0}
{if $selection == 3}
- <a name="Create wiki page" href='./modules/centreon-knowledgebase/core/display/popup.php?session_id={php}print session_id();{/php}&object=Service-Template:{$elem}&type={$selection}' target='_blank'>Create wiki page</a>
+ <a name="Create wiki page" href='./include/configuration/configKnowledge/popup.php?session_id={php}print session_id();{/php}&object=Service-Template:{$elem}&type={$selection}' target='_blank'>Create wiki page</a>
{elseif $selection == 2}
- <a name="Create wiki page" href='./modules/centreon-knowledgebase/core/display/popup.php?session_id={php}print session_id();{/php}&object=Host-Template:{$elem}&type={$selection}' target='_blank'>Create wiki page</a>
+ <a name="Create wiki page" href='./include/configuration/configKnowledge/popup.php?session_id={php}print session_id();{/php}&object=Host-Template:{$elem}&type={$selection}' target='_blank'>Create wiki page</a>
{else}
- <a name="Create wiki page" href='./modules/centreon-knowledgebase/core/display/popup.php?session_id={php}print session_id();{/php}&object=Host:{$elem}&type={$selection}' target='_blank'>Create wiki page</a>
+ <a name="Create wiki page" href='./include/configuration/configKnowledge/popup.php?session_id={php}print session_id();{/php}&object=Host:{$elem}&type={$selection}' target='_blank'>Create wiki page</a>
{/if}
{/if}
{if $stt == 1}
@@ -177,7 +177,7 @@
<table class="ToolbarTable table">
<tr class="ToolbarTR">
{php}
- include('./modules/centreon-knowledgebase/core/display/pagination.php');
+ include('./include/configuration/configKnowledge/pagination.php');
{/php}
</tr>
</table>
diff --git a/www/include/configuration/configKnowledge/templates/pagination-2.7.ihtml b/www/include/configuration/configKnowledge/templates/pagination-2.7.ihtml
deleted file mode 100644
index eea67d5534..0000000000
--- a/www/include/configuration/configKnowledge/templates/pagination-2.7.ihtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<td class="ToolbarPagination" align="center">
- {if $firstPage} <a href="{$firstPage}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icons/first_rewind.png" title='{$first}'></a>{/if}
- {if $pagePrev} <a href="{$pagePrev}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icons/rewind.png" title='{$previous}'></a>{/if}
- {foreach key=key item=item from=$pageArr }
- {if $pageArr[$key].num != $num}
- <a href="{$pageArr[$key].url_page}{if $host_name}&host_name={$host_name}{/if}" class="otherPageNumber">{$pageArr[$key].label_page}</a>
- {else}
- <b class="currentPageNumber">{$pageArr[$key].label_page}</b>
- {/if}
- {/foreach}
- {if $pageNext} <a href="{$pageNext}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icons/fast_forward.png" title='{$next}'></a>{/if}
- {if $lastPage} <a href="{$lastPage}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icons/end_forward.png" title='{$last}'></a>{/if}
-</td>
-<td class="Toolbar_pagelimit">{$form.l.html}</td>
-{$form.hidden}
diff --git a/www/include/configuration/configKnowledge/templates/pagination.ihtml b/www/include/configuration/configKnowledge/templates/pagination.ihtml
index 336eebf0a3..a1b48fae91 100644
--- a/www/include/configuration/configKnowledge/templates/pagination.ihtml
+++ b/www/include/configuration/configKnowledge/templates/pagination.ihtml
@@ -1,15 +1,15 @@
-<td class="ToolbarPagination">
- {if $firstPage} <a href="{$firstPage}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icones/16x16/arrow_left_blue_double.gif" title='{$first}'></a>{/if}
- {if $pagePrev} <a href="{$pagePrev}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icones/16x16/arrow_left_blue.gif" title='{$previous}'></a>{/if}
+<td class="ToolbarPagination" align="center">
+ {if $firstPage} <a href="{$firstPage}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icons/first_rewind.png" title='{$first}'></a>{/if}
+ {if $pagePrev} <a href="{$pagePrev}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icons/rewind.png" title='{$previous}'></a>{/if}
{foreach key=key item=item from=$pageArr }
- {if $pageArr[$key].num != $num}
- <a href="{$pageArr[$key].url_page}{if $host_name}&host_name={$host_name}{/if}" class="otherPageNumber">{$pageArr[$key].label_page}</a>
- {else}
- <b class="currentPageNumber">{$pageArr[$key].label_page}</b>
- {/if}
+ {if $pageArr[$key].num != $num}
+ <a href="{$pageArr[$key].url_page}{if $host_name}&host_name={$host_name}{/if}" class="otherPageNumber">{$pageArr[$key].label_page}</a>
+ {else}
+ <b class="currentPageNumber">{$pageArr[$key].label_page}</b>
+ {/if}
{/foreach}
- {if $pageNext} <a href="{$pageNext}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icones/16x16/arrow_right_blue.gif" title='{$next}'></a>{/if}
- {if $lastPage} <a href="{$lastPage}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icones/16x16/arrow_right_blue_double.gif" title='{$last}'></a>{/if}
+ {if $pageNext} <a href="{$pageNext}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icons/fast_forward.png" title='{$next}'></a>{/if}
+ {if $lastPage} <a href="{$lastPage}{if $host_name}&host_name={$host_name}{/if}"><img src="./img/icons/end_forward.png" title='{$last}'></a>{/if}
</td>
-<td class="Toolbar_pagelimit">{$form.l.label}</b> {$form.l.html} {$pagin_page} {$pageNumber}</td>
-{$form.hidden}
\ No newline at end of file
+<td class="Toolbar_pagelimit">{$form.l.html}</td>
+{$form.hidden}
--
GitLab