Skip to content

Commit 3199e77

Browse files
committed
Fix URL
1 parent 1d73308 commit 3199e77

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

inc/addressing.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ function showReport($params) {
814814
815815
$('#ajax_loader').show();
816816
$.ajax({
817-
url: '" . PLUGINADDRESSING_WEBDIR . "/ajax/updatepinginfo.php',
817+
url: '" . PLUGIN_ADDRESSING_WEBDIR . "/ajax/updatepinginfo.php',
818818
type: 'POST',
819819
data: {'addressing_id' : addressing_id},
820820
success: function(response){

inc/filter.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ static function showList($item, $options = []) {
270270
'items_id' => $item_id,
271271
'id' => -1];
272272
Ajax::updateItemJsCode("viewfilter" . $item_id . "$rand",
273-
PLUGINADDRESSING_WEBDIR . "/ajax/addressing.php",
273+
PLUGIN_ADDRESSING_WEBDIR . "/ajax/addressing.php",
274274
$params);
275275
echo "};";
276276
echo "</script>\n";
@@ -363,7 +363,7 @@ function showMinimalFilterForm($item, $filter, $canedit, $rand) {
363363
'items_id' => $item["id"],
364364
'id' => $filter['id']];
365365
Ajax::updateItemJsCode("viewfilter" . $item["id"] . "$rand",
366-
PLUGINADDRESSING_WEBDIR. "/ajax/addressing.php",
366+
PLUGIN_ADDRESSING_WEBDIR. "/ajax/addressing.php",
367367
$params);
368368
echo "};";
369369
echo "</script>\n";

inc/ping_equipment.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ function showPingForm($itemtype, $items_id)
9999
echo "</table>";
100100

101101
echo Html::scriptBlock("$(document).on('click', '#ping_ip', function(event) {
102-
$('#ping_response').load('" . PLUGINADDRESSING_WEBDIR . "/ajax/ping.php', {
102+
$('#ping_response').load('" . PLUGIN_ADDRESSING_WEBDIR . "/ajax/ping.php', {
103103
'ip': $('#ip').val(),
104104
'itemtype': '$itemtype',
105105
'items_id': '$items_id'

inc/pinginfo.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ static function getPingResponseForItem($params) {
205205
'items_id' => $items_id,
206206
'itemtype' => $itemtype];
207207
Ajax::updateItemJsCode("ping_item",
208-
PLUGINADDRESSING_WEBDIR . "/ajax/seePingTab.php",
208+
PLUGIN_ADDRESSING_WEBDIR . "/ajax/seePingTab.php",
209209
$params);
210210
echo "};";
211211
echo "</script>\n";

inc/report.class.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ function displayReport(&$result, $PluginAddressingAddressing, $ping_status = [])
267267
echo Search::showItem($output_type, "$reserv ", $item_num, $row_num, "style='background-color:#e0e0e0' class='center'");
268268
if (isset($params) && count($params) > 0) {
269269
echo Ajax::createIframeModalWindow('reservation'.$rand,
270-
PLUGINADDRESSING_WEBDIR . "/ajax/addressing.php?action=showForm&ip=" . $params['ip'] . "&id_addressing=" . $params['id_addressing'] . "&rand=" . $params['rand'],
270+
PLUGIN_ADDRESSING_WEBDIR . "/ajax/addressing.php?action=showForm&ip=" . $params['ip'] . "&id_addressing=" . $params['id_addressing'] . "&rand=" . $params['rand'],
271271
['title' => __s('IP reservation', 'addressing'),
272272
'display' => false]);
273273
}
@@ -302,7 +302,7 @@ function displayReport(&$result, $PluginAddressingAddressing, $ping_status = [])
302302
echo Search::showItem($output_type, "$reserv ", $item_num, $row_num, "style='background-color:#e0e0e0' class='center'");
303303
if (isset($params) && count($params) > 0) {
304304
echo Ajax::createIframeModalWindow('reservation'.$rand,
305-
PLUGINADDRESSING_WEBDIR . "/ajax/addressing.php?action=showForm&ip=" . $params['ip'] . "&id_addressing=" . $params['id_addressing'] . "&rand=" . $params['rand'],
305+
PLUGIN_ADDRESSING_WEBDIR . "/ajax/addressing.php?action=showForm&ip=" . $params['ip'] . "&id_addressing=" . $params['id_addressing'] . "&rand=" . $params['rand'],
306306
['title' => __s('IP reservation', 'addressing'),
307307
'display' => false]);
308308
}
@@ -342,7 +342,7 @@ function displayReport(&$result, $PluginAddressingAddressing, $ping_status = [])
342342
<i class='fas fa-clipboard fa-2x pointer' style='color: #d56f15' title='" . __("Reserve IP", 'addressing') . "'></i></a>";
343343
if (isset($params) && count($params) > 0) {
344344
echo Ajax::createIframeModalWindow('reservation'.$rand,
345-
PLUGINADDRESSING_WEBDIR . "/ajax/addressing.php?action=showForm&ip=" . $params['ip'] . "&id_addressing=" . $params['id_addressing'] . "&rand=" . $params['rand'],
345+
PLUGIN_ADDRESSING_WEBDIR . "/ajax/addressing.php?action=showForm&ip=" . $params['ip'] . "&id_addressing=" . $params['id_addressing'] . "&rand=" . $params['rand'],
346346
['title' => __s('IP reservation', 'addressing'),
347347
'display' => false]);
348348
}
@@ -435,7 +435,7 @@ function displayReport(&$result, $PluginAddressingAddressing, $ping_status = [])
435435
<i class='fas fa-clipboard fa-2x pointer' style='color: #d56f15' title='" . __("Reserve IP", 'addressing') . "'></i></a>";
436436
if (isset($params) && count($params) > 0) {
437437
echo Ajax::createIframeModalWindow('reservation'.$rand,
438-
PLUGINADDRESSING_WEBDIR . "/ajax/addressing.php?action=showForm&ip=" . $params['ip'] . "&id_addressing=" . $params['id_addressing'] . "&rand=" . $params['rand'],
438+
PLUGIN_ADDRESSING_WEBDIR . "/ajax/addressing.php?action=showForm&ip=" . $params['ip'] . "&id_addressing=" . $params['id_addressing'] . "&rand=" . $params['rand'],
439439
['title' => __s('IP reservation', 'addressing'),
440440
'display' => false]);
441441
}

inc/reserveip.class.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,19 +213,19 @@ function showReservationForm($ip, $id_addressing, $rand) {
213213

214214
$params = ['action' => 'entities_networkip', 'entities_id' => '__VALUE__'];
215215
Ajax::updateItemOnEvent("dropdown_entities_id" . $rand, 'entities_networkip',
216-
PLUGINADDRESSING_WEBDIR . "/ajax/addressing.php",
216+
PLUGIN_ADDRESSING_WEBDIR . "/ajax/addressing.php",
217217
$params);
218218

219219
$params = ['action' => 'entities_location', 'entities_id' => '__VALUE__',
220220
'value' => $addressing->fields["locations_id"]];
221221
Ajax::updateItemOnEvent("dropdown_entities_id" . $rand, 'entities_location',
222-
PLUGINADDRESSING_WEBDIR . "/ajax/addressing.php",
222+
PLUGIN_ADDRESSING_WEBDIR . "/ajax/addressing.php",
223223
$params);
224224

225225
$params = ['action' => 'entities_fqdn', 'entities_id' => '__VALUE__',
226226
'value' => $addressing->fields["fqdns_id"]];
227227
Ajax::updateItemOnEvent("dropdown_entities_id" . $rand, 'entities_fqdn',
228-
PLUGINADDRESSING_WEBDIR . "/ajax/addressing.php",
228+
PLUGIN_ADDRESSING_WEBDIR . "/ajax/addressing.php",
229229
$params);
230230

231231
echo "</td><td></td>";
@@ -250,12 +250,12 @@ function showReservationForm($ip, $id_addressing, $rand) {
250250
<td>";
251251
$types = PluginAddressingAddressing::dropdownItemtype();
252252
Dropdown::showFromArray('type', $types,
253-
['on_change' => "nameIsThere(\"" .PLUGINADDRESSING_WEBDIR . "\");"]);
253+
['on_change' => "nameIsThere(\"" .PLUGIN_ADDRESSING_WEBDIR . "\");"]);
254254
echo "</td><td></td>";
255255
echo "</tr>";
256256
echo "<tr class='tab_bg_1'>
257257
<td>" . __("Name") . " : </td><td>";
258-
$option = ['onChange' => "nameIsThere(\"" . PLUGINADDRESSING_WEBDIR . "\");", 'id' => 'name_reserveip'];
258+
$option = ['onChange' => "nameIsThere(\"" . PLUGIN_ADDRESSING_WEBDIR . "\");", 'id' => 'name_reserveip'];
259259
echo Html::input('name_reserveip', $option);
260260
echo "</td><td><div style=\"display: none;\" id='nameItem'>";
261261
echo "<i class='fas fa-exclamation-triangle fa-2x' style='color:orange'></i>&nbsp;";

setup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
if (!defined("PLUGIN_ADDRESSING_DIR")) {
3333
define("PLUGIN_ADDRESSING_DIR", Plugin::getPhpDir("addressing"));
3434
define("PLUGIN_ADDRESSING_DIR_NOFULL", Plugin::getPhpDir("addressing",false));
35-
define("PLUGINADDRESSING_WEBDIR", Plugin::getWebDir("addressing"));
35+
define("PLUGIN_ADDRESSING_WEBDIR", Plugin::getWebDir("addressing"));
3636
}
3737

3838
// Init the hooks of the plugins -Needed

0 commit comments

Comments
 (0)