Fix for marketplace

add index files
pluginsGLPI · Dec 13, 2021 · 6b5ab48 · 6b5ab48
1 parent 2de8dad
commit 6b5ab48
Show file tree

Hide file tree

Showing 16 changed files with 195 additions and 400 deletions.
diff --git a/addressing.js b/addressing.js
@@ -126,7 +126,7 @@ function nameIsThere(params) {
     var typeElm = $('select[name="type"]');
     var divNameItemElm = $('div[id="nameItem"]');
     $.ajax({
-         url: root_doc + '/plugins/addressing/front/addressing.php',
+         url: root_doc + '/front/addressing.php',
          type: "GET",
          dataType: "json",
          data: {

diff --git a/addressing.xml b/addressing.xml
@@ -27,6 +27,10 @@
       <author>Nelly Mahu-Lasson</author>
    </authors>
    <versions>
+        <version>
+           <num>2.9.1</num>
+           <compatibility>9.5</compatibility>
+       </version>
         <version>
            <num>2.9.0</num>
            <compatibility>9.5</compatibility>

diff --git a/ajax/index.php b/ajax/index.php
@@ -0,0 +1,28 @@
+<?php
+/*
+ * @version $Id$
+ -------------------------------------------------------------------------
+ addressing plugin for GLPI
+ Copyright (C) 2009-2016 by the addressing Development Team.
+
+ https://github.com/pluginsGLPI/addressing
+ -------------------------------------------------------------------------
+
+ LICENSE
+
+ This file is part of addressing.
+
+ addressing is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ addressing is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with addressing. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ */
diff --git a/front/index.php b/front/index.php
@@ -0,0 +1,28 @@
+<?php
+/*
+ * @version $Id$
+ -------------------------------------------------------------------------
+ addressing plugin for GLPI
+ Copyright (C) 2009-2016 by the addressing Development Team.
+
+ https://github.com/pluginsGLPI/addressing
+ -------------------------------------------------------------------------
+
+ LICENSE
+
+ This file is part of addressing.
+
+ addressing is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ addressing is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with addressing. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ */
diff --git a/hook.php b/hook.php
@@ -30,68 +30,68 @@
 function plugin_addressing_install() {
    global $DB;
 
-   include_once(GLPI_ROOT . "/plugins/addressing/inc/profile.class.php");
+   include_once(PLUGIN_ADDRESSING_DIR . "/inc/profile.class.php");
 
    $update = false;
    if (!$DB->tableExists("glpi_plugin_addressing_display")
        && !$DB->tableExists("glpi_plugin_addressing")
        && !$DB->tableExists("glpi_plugin_addressing_configs")) {
 
-      $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/empty-3.0.0.sql");
+      $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/empty-3.0.0.sql");
 
    } else {
 
       if (!$DB->tableExists("glpi_plugin_addressing_profiles")
           && $DB->tableExists("glpi_plugin_addressing_display")
           && !$DB->fieldExists("glpi_plugin_addressing_display", "ipconf1")) {//1.4
          $update = true;
-         $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/update-1.4.sql");
+         $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/update-1.4.sql");
       }
 
       if (!$DB->tableExists("glpi_plugin_addressing")
           && $DB->tableExists("glpi_plugin_addressing_display")
           && $DB->fieldExists("glpi_plugin_addressing_display", "ipconf1")) {
          $update = true;
-         $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/update-1.5.sql");
+         $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/update-1.5.sql");
 
       }
 
       if ($DB->tableExists("glpi_plugin_addressing_display")
           && !$DB->fieldExists("glpi_plugin_addressing", "ipdeb")) {
          $update = true;
-         $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/update-1.6.sql");
+         $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/update-1.6.sql");
 
       }
 
       if ($DB->tableExists("glpi_plugin_addressing_profiles")
           && $DB->fieldExists("glpi_plugin_addressing_profiles", "interface")) {
          $update = true;
-         $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/update-1.7.0.sql");
+         $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/update-1.7.0.sql");
 
       }
 
       if (!$DB->tableExists("glpi_plugin_addressing_configs")) {
-         $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/update-1.8.0.sql");
+         $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/update-1.8.0.sql");
          $update = true;
       }
 
       if ($DB->tableExists("glpi_plugin_addressing_profiles")
           && !$DB->fieldExists("glpi_plugin_addressing_profiles", "use_ping_in_equipment")) {
-         $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/update-1.9.0.sql");
+         $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/update-1.9.0.sql");
          $update = true;
       }
       //Version 2.4.0
       if (!$DB->tableExists("glpi_plugin_addressing_filters")) {
-         $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/update-2.4.0.sql");
+         $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/update-2.4.0.sql");
       }
 
       //Version 2.5.0
       if (!$DB->fieldExists("glpi_plugin_addressing_addressings", "locations_id") && !$DB->fieldExists("glpi_plugin_addressing_addressings", "fqdns_id")) {
-         $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/update-2.5.0.sql");
+         $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/update-2.5.0.sql");
       }
       //Version 2.9.1
       if (!$DB->tableExists("glpi_plugin_addressing_pinginfos")) {
-         $DB->runFile(GLPI_ROOT . "/plugins/addressing/sql/update-2.9.1.sql");
+         $DB->runFile(PLUGIN_ADDRESSING_DIR . "/sql/update-2.9.1.sql");
       }
 
    }
@@ -143,8 +143,8 @@ function plugin_addressing_install() {
 function plugin_addressing_uninstall() {
    global $DB;
 
-   include_once(GLPI_ROOT . "/plugins/addressing/inc/profile.class.php");
-   include_once(GLPI_ROOT . "/plugins/addressing/inc/menu.class.php");
+   include_once(PLUGIN_ADDRESSING_DIR . "/inc/profile.class.php");
+   include_once(PLUGIN_ADDRESSING_DIR . "/inc/menu.class.php");
 
    $migration = new Migration("2.5.0");
    $tables    = ["glpi_plugin_addressing_addressings",

diff --git a/inc/addressing.class.php b/inc/addressing.class.php
@@ -814,7 +814,7 @@ function showReport($params) {
                           
                              $('#ajax_loader').show();
                              $.ajax({
-                                url: '" . $CFG_GLPI["root_doc"] . PLUGIN_ADDRESSING_DIR_NOFULL . "/ajax/updatepinginfo.php',
+                                url: '" . PLUGINADDRESSING_WEBDIR . "/ajax/updatepinginfo.php',
                                    type: 'POST',
                                    data: {'addressing_id' : addressing_id},
                                    success: function(response){

diff --git a/inc/filter.class.php b/inc/filter.class.php
@@ -270,7 +270,7 @@ static function showList($item, $options = []) {
             'items_id'   => $item_id,
             'id'         => -1];
          Ajax::updateItemJsCode("viewfilter" . $item_id . "$rand",
-                                $CFG_GLPI["root_doc"] . "/plugins/addressing/ajax/addressing.php",
+                                PLUGINADDRESSING_WEBDIR . "/ajax/addressing.php",
                                 $params);
          echo "};";
          echo "</script>\n";
@@ -363,7 +363,7 @@ function showMinimalFilterForm($item, $filter, $canedit, $rand) {
             'items_id'   => $item["id"],
             'id'         => $filter['id']];
          Ajax::updateItemJsCode("viewfilter" . $item["id"] . "$rand",
-                                $CFG_GLPI["root_doc"] . "/plugins/addressing/ajax/addressing.php",
+                                PLUGINADDRESSING_WEBDIR. "/ajax/addressing.php",
                                 $params);
          echo "};";
          echo "</script>\n";

diff --git a/inc/index.php b/inc/index.php
@@ -0,0 +1,28 @@
+<?php
+/*
+ * @version $Id$
+ -------------------------------------------------------------------------
+ addressing plugin for GLPI
+ Copyright (C) 2009-2016 by the addressing Development Team.
+
+ https://github.com/pluginsGLPI/addressing
+ -------------------------------------------------------------------------
+
+ LICENSE
+
+ This file is part of addressing.
+
+ addressing is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ addressing is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with addressing. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ */
diff --git a/inc/menu.class.php b/inc/menu.class.php
@@ -41,8 +41,6 @@ static function getMenuContent() {
 
       $menu          = [];
       $menu['title'] = self::getMenuName();
-      $menu['page']  = "/plugins/addressing/front/addressing.php";
-
       $menu['title']           = PluginAddressingAddressing::getTypeName(2);
       $menu['page']            = PluginAddressingAddressing::getSearchURL(false);
       $menu['links']['search'] = PluginAddressingAddressing::getSearchURL(false);
@@ -71,7 +69,7 @@ static function getMenuContent() {
    }
 
    static function getIcon() {
-      return "fas fa-map-pin";
+      return "ti ti-map-pin";
    }
 
    static function removeRightsFromSession() {

diff --git a/inc/ping_equipment.class.php b/inc/ping_equipment.class.php
@@ -99,7 +99,7 @@ function showPingForm($itemtype, $items_id)
       echo "</table>";
 
       echo Html::scriptBlock("$(document).on('click', '#ping_ip', function(event) {
-         $('#ping_response').load('" . $CFG_GLPI["root_doc"] . "/plugins/addressing/ajax/ping.php', {
+         $('#ping_response').load('" . PLUGINADDRESSING_WEBDIR . "/ajax/ping.php', {
             'ip': $('#ip').val(),
             'itemtype': '$itemtype',
             'items_id': '$items_id'