Update to 1.3.1

README.md

@@ -1,5 +1,5 @@
 # Services
-GLPI ITIL Services project
+GLPI Services project
 
 The goal of this plugin is to associate servers, devices, printers, ... to a specific service based on ITIL concepts.  
 

ajax/dropdownTypeServices.php

@@ -27,13 +27,13 @@
  --------------------------------------------------------------------------
  */
 
-if (strpos($_SERVER['PHP_SELF'],"dropdownTypeServices.php")) {
-   include ('../../../inc/includes.php');
+if (strpos($_SERVER['PHP_SELF'], "dropdownTypeServices.php")) {
+   include('../../../inc/includes.php');
    header("Content-Type: text/html; charset=UTF-8");
    Html::header_nocache();
 }
-Session::checkLoginUser();
-//Session::checkCentralAccess();
+//Session::checkLoginUser();
+Session::checkCentralAccess();
 
 // Make a select box
 if (isset($_POST["servicetype"])) {
@@ -43,21 +43,20 @@
    if (isset($_POST['used']) && is_array($_POST['used']) && (count($_POST['used']) > 0)) {
       $query = "SELECT `id`
                 FROM `glpi_plugin_services_services`
-                WHERE `id` IN (".implode(',',$_POST['used']).")
-                      AND `plugin_services_servicetypes_id` = '".$_POST["servicetype"]."'";
+                WHERE `id` IN (" . implode(',', $_POST['used']) . ")
+                      AND `plugin_services_servicetypes_id` = '" . $_POST["servicetype"] . "'";
 
       foreach ($DB->request($query) AS $data) {
          $used[$data['id']] = $data['id'];
       }
    }
 
    Dropdown::show('PluginServicesService',
-                  array('name'      => $_POST['myname'],
+                  ['name'      => $_POST['myname'],
                         'used'      => $used,
                         'width'     => '50%',
                         'entity'    => $_POST['entity'],
                         'rand'      => $_POST['rand'],
-                        'condition' => "glpi_plugin_services_services.plugin_services_servicetypes_id='".$_POST["servicetype"]."'"));
+			'condition' => ["glpi_plugin_services_services.plugin_services_servicetypes_id"=>$_POST["servicetype"]]]);
 
 }
-?>

front/service.form.php

@@ -41,6 +41,15 @@
 
 if (isset($_POST["add"])) {
    $web->check(-1,CREATE,$_POST);
+	   	if (isset($_POST['plugin_services_services_id']) && $_POST['plugin_services_services_id'] != '0') {
+		// copy parent's value to child
+		$web->getFromDB($_POST['plugin_services_services_id']);
+		foreach ($web->fields as $key => $value) {
+			if ($key != 'id' && !isset($_POST[$key])) {
+				$_POST[$key] = $value;
+			}
+		}
+	}
    $newID= $web->add($_POST);
    if ($_SESSION['glpibackcreated']) {
       Html::redirect($web->getFormURL()."?id=".$newID);
@@ -109,4 +118,4 @@
    Html::footer();
 }
 
-?>
+?>

front/service.php

@@ -2,40 +2,39 @@
 /*
  * @version $Id: HEADER 15930 2011-10-30 15:47:55Z tsmr $
  -------------------------------------------------------------------------
- Services plugin for GLPI
- Copyright (C) 2003-2011 by the Services Development Team.
+ webapplications plugin for GLPI
+ Copyright (C) 2009-2016 by the services Development Team.
 
- https://forge.indepnet.net/projects/services
+ https://github.com/InfotelGLPI/services
  -------------------------------------------------------------------------
 
  LICENSE
-
- This file is part of Services.
 
- Services is free software; you can redistribute it and/or modify
+ This file is part of services.
+
+ services 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.
 
- Services is distributed in the hope that it will be useful,
+ services 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 Services. If not, see <http://www.gnu.org/licenses/>.
+ along with services. If not, see <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------
  */
 
-include ('../../../inc/includes.php');
+include('../../../inc/includes.php');
 
 //check environment meta-plugin installation for change header
 $plugin = new Plugin();
 if ($plugin->isActivated("environment")) {
-   Html::header(PluginServicesService::getTypeName(2)
-                  ,'',"plugins","pluginenvironmentdisplay","services");
-}else {
-   Html::header(PluginServicesService::getTypeName(2), '', "plugins","pluginservicesmenu");
+   Html::header(PluginServicesService::getTypeName(2), '', "assets", "pluginenvironmentdisplay", "services");
+} else {
+   Html::header(PluginServicesService::getTypeName(2), '', "plugins", "pluginservicesmenu");
 }
 
 $web = new PluginServicesService();
@@ -45,9 +44,7 @@
    Search::show("PluginServicesService");
 
 } else {
-   
+
    Html::displayRightError();
 }
 Html::footer();
-
-?>

front/servicedrsolutiontype.form.php

@@ -0,0 +1,35 @@
+<?php
+/*
+ * @version $Id: HEADER 15930 2011-10-30 15:47:55Z tsmr $
+ -------------------------------------------------------------------------
+ Services plugin for GLPI
+ Copyright (C) 2003-2011 by the Services Development Team.
+
+ https://forge.indepnet.net/projects/services
+ -------------------------------------------------------------------------
+
+ LICENSE
+
+ This file is part of Services.
+
+ Services 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.
+
+ Services 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 Services. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ */
+
+include ('../../../inc/includes.php');
+
+$dropdown = new PluginServicesServiceDrSolutionType();
+include (GLPI_ROOT . "/front/dropdown.common.form.php");
+
+?>

front/servicedrsolutiontype.php

@@ -0,0 +1,35 @@
+<?php
+/*
+ * @version $Id: HEADER 15930 2011-10-30 15:47:55Z tsmr $
+ -------------------------------------------------------------------------
+ Services plugin for GLPI
+ Copyright (C) 2003-2011 by the Services Development Team.
+
+ https://forge.indepnet.net/projects/services
+ -------------------------------------------------------------------------
+
+ LICENSE
+
+ This file is part of Services.
+
+ Services 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.
+
+ Services 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 Services. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ */
+
+include ('../../../inc/includes.php');
+
+$dropdown = new PluginServicesServiceDrSolutionType();
+include (GLPI_ROOT . "/front/dropdown.common.php");
+
+?>

front/servicedrtesttype.form.php

@@ -0,0 +1,35 @@
+<?php
+/*
+ * @version $Id: HEADER 15930 2011-10-30 15:47:55Z tsmr $
+ -------------------------------------------------------------------------
+ Services plugin for GLPI
+ Copyright (C) 2003-2011 by the Services Development Team.
+
+ https://forge.indepnet.net/projects/services
+ -------------------------------------------------------------------------
+
+ LICENSE
+
+ This file is part of Services.
+
+ Services 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.
+
+ Services 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 Services. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ */
+
+include ('../../../inc/includes.php');
+
+$dropdown = new PluginServicesServiceDrTestType();
+include (GLPI_ROOT . "/front/dropdown.common.form.php");
+
+?>

front/servicedrtesttype.php

@@ -0,0 +1,35 @@
+<?php
+/*
+ * @version $Id: HEADER 15930 2011-10-30 15:47:55Z tsmr $
+ -------------------------------------------------------------------------
+ Services plugin for GLPI
+ Copyright (C) 2003-2011 by the Services Development Team.
+
+ https://forge.indepnet.net/projects/services
+ -------------------------------------------------------------------------
+
+ LICENSE
+
+ This file is part of Services.
+
+ Services 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.
+
+ Services 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 Services. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ */
+
+include ('../../../inc/includes.php');
+
+$dropdown = new PluginServicesServiceDrTestType();
+include (GLPI_ROOT . "/front/dropdown.common.php");
+
+?>

front/serviceitowner.form.php

@@ -0,0 +1,35 @@
+<?php
+/*
+ * @version $Id: HEADER 15930 2011-10-30 15:47:55Z tsmr $
+ -------------------------------------------------------------------------
+ Services plugin for GLPI
+ Copyright (C) 2003-2011 by the Services Development Team.
+
+ https://forge.indepnet.net/projects/services
+ -------------------------------------------------------------------------
+
+ LICENSE
+
+ This file is part of Services.
+
+ Services 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.
+
+ Services 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 Services. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ */
+
+include ('../../../inc/includes.php');
+
+$dropdown = new PluginServicesServiceItowner();
+include (GLPI_ROOT . "/front/dropdown.common.form.php");
+
+?>

front/serviceitowner.php

@@ -0,0 +1,35 @@
+<?php
+/*
+ * @version $Id: HEADER 15930 2011-10-30 15:47:55Z tsmr $
+ -------------------------------------------------------------------------
+ Services plugin for GLPI
+ Copyright (C) 2003-2011 by the Services Development Team.
+
+ https://forge.indepnet.net/projects/services
+ -------------------------------------------------------------------------
+
+ LICENSE
+
+ This file is part of Services.
+
+ Services 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.
+
+ Services 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 Services. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ */
+
+include ('../../../inc/includes.php');
+
+$dropdown = new PluginServicesServiceItowner();
+include (GLPI_ROOT . "/front/dropdown.common.php");
+
+?>