Add Twig form IP Reservation

Author: tsmr

ajax/addressing.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * @version $Id$
  -------------------------------------------------------------------------
@@ -27,17 +28,25 @@
  --------------------------------------------------------------------------
  */
 
-
 use GlpiPlugin\Addressing\Filter;
 use GlpiPlugin\Addressing\Ping_Equipment;
 use GlpiPlugin\Addressing\ReserveIp;
+use function Safe\json_encode;
 
 Session::checkRight('plugin_addressing', UPDATE);
 
 Html::header_nocache();
 header("Content-Type: text/html; charset=UTF-8");
 
-if (isset($_POST['action']) && $_POST['action'] == 'viewFilter') {
+if (isset($_GET['action']) && $_GET['action'] == 'isName') {
+    $item = new $_GET['type']();
+    $datas = $item->find(['name' => ['LIKE', $_GET['name']]]);
+    if (count($datas) > 0) {
+        echo json_encode(true);
+    } else {
+        echo json_encode(false);
+    }
+} else if (isset($_POST['action']) && $_POST['action'] == 'viewFilter') {
     if (isset($_POST['items_id'])
        && isset($_POST["id"])) {
         $filter = new Filter();
@@ -46,15 +55,19 @@
         echo __('Access denied');
     }
 } elseif (isset($_POST['action']) && $_POST['action'] == 'entities_networkip') {
+
     IPNetwork::showIPNetworkProperties($_POST['entities_id']);
 } elseif (isset($_POST['action']) && $_POST['action'] == 'entities_location') {
+
+    echo __('Location');
     Dropdown::show('Location', ['name'   => "locations_id",
-                               'value'  => $_POST["value"],
-                               'entity' => $_POST['entities_id']]);
+        'value'  => $_POST["value"],
+        'entity' => $_POST['entities_id']]);
 } elseif (isset($_POST['action']) && $_POST['action'] == 'entities_fqdn') {
+    echo __('FQDN');
     Dropdown::show('FQDN', ['name'   => "fqdns_id",
-                           'value'  => $_POST["value"],
-                           'entity' => $_POST['entities_id']]);
+        'value'  => $_POST["value"],
+        'entity' => $_POST['entities_id']]);
 } elseif ($_GET['action'] == 'ping') {
     Html::popHeader(__s('IP ping', 'addressing'), $_SERVER['PHP_SELF']);
 
@@ -64,7 +77,7 @@
     }
     Html::popFooter();
 } else {
-    Html::popHeader(__s('IP reservation', 'addressing'), $_SERVER['PHP_SELF']);
+    Html::popHeader(ReserveIp::getTypeName());
 
     if (filter_var($_GET["ip"], FILTER_VALIDATE_IP)) {
         $ReserveIp = new ReserveIp();

ajax/ipcomment.php

@@ -33,6 +33,7 @@
 
 
 use GlpiPlugin\Addressing\IpComment;
+use function Safe\json_encode;
 
 Session::checkRight('plugin_addressing', UPDATE);
 

front/addressing.php

@@ -35,24 +35,13 @@
 
 $Addressing = new Addressing();
 
-if (isset($_GET['action']) && $_GET['action'] == 'isName') {
-    if ($Addressing->canView() || Session::haveRight("config", UPDATE)) {
-        $item = new $_GET['type']();
-        $datas = $item->find(['name' => ['LIKE', $_GET['name']]]);
-        if (count($datas) > 0) {
-            echo json_encode(true);
-        } else {
-            echo json_encode(false);
-        }
-    }
+Html::header(Addressing::getTypeName(2), '', "tools", Addressing::class);
+
+if ($Addressing->canView() || Session::haveRight("config", UPDATE)) {
+    Search::show(Addressing::class);
 } else {
-    Html::header(Addressing::getTypeName(2), '', "tools", Addressing::class);
+    throw new AccessDeniedHttpException();
+}
 
-    if ($Addressing->canView() || Session::haveRight("config", UPDATE)) {
-        Search::show(Addressing::class);
-    } else {
-        throw new AccessDeniedHttpException();
-    }
+Html::footer();
 
-    Html::footer();
-}

front/reserveip.form.php

@@ -43,10 +43,4 @@
     echo __("The address has been reserved", "addressing");
     echo "</div>";
     Html::popFooter();
-} else {
-    Html::header(ReserveIp::getTypeName(), '', "tools", Addressing::class);
-    if (filter_var($_REQUEST["ip"], FILTER_VALIDATE_IP)) {
-        $reserveip->showReservationForm($_REQUEST["ip"], $_REQUEST["id_addressing"], $_REQUEST['rand']);
-    }
-    Html::footer();
 }

public/addressing.js

@@ -79,7 +79,6 @@ function plugin_init_addressing()
         if (isset($_SESSION['glpiactiveprofile']['interface'])
             && $_SESSION['glpiactiveprofile']['interface'] == 'central') {
             $PLUGIN_HOOKS[Hooks::ADD_CSS]['addressing']        = "addressing.css";
-            $PLUGIN_HOOKS[Hooks::ADD_JAVASCRIPT]['addressing'] = 'addressing.js';
         }
     }
 }

setup.php

@@ -48,9 +48,7 @@ class Config extends CommonDBTM
 
     public function showForm($ID, $options = [])
     {
-
-        $this->getFromDB($ID);
-
+        $this->initForm($ID, $options);
         TemplateRenderer::getInstance()->display(
             '@addressing/config.html.twig',
             [

src/Config.php

@@ -96,14 +96,8 @@ public function getForbiddenStandardMassiveAction()
     public function showForm($ID, $options = [])
     {
 
-        if ($ID > 0) {
-            $this->check($ID, READ);
-        } else {
-            $this->check(-1, CREATE, $options);
-        }
-
+        $this->initForm($ID, $options);
         $options['colspan'] = 1;
-
         $options['types'] = Addressing::dropdownItemtype();
         TemplateRenderer::getInstance()->display('@addressing/filter.html.twig', [
             'item' => $this,