";
echo "
" . __s('Close') . "";
@@ -1436,6 +1432,7 @@ class_exists('PluginGenericobjectType')
}
}
}
+
return $todisplay;
}
@@ -1450,11 +1447,12 @@ public static function showLogResults($models_id)
$nblines = 0;
// Prépare le résumé
- foreach ($logresults as $status => $results) {
+ foreach ($logresults as $results) {
foreach ($results as $result) {
if (!isset($resume[$result['status']][$result['type']])) {
$resume[$result['status']][$result['type']] = 0;
}
+
$resume[$result['status']][$result['type']]++;
$nblines++;
}
@@ -1545,6 +1543,7 @@ public static function exportAsPDF($models_id)
}
}
}
+
$pdf->render();
}
}
diff --git a/inc/modelcsv.class.php b/inc/modelcsv.class.php
index 93000163..c643bf00 100644
--- a/inc/modelcsv.class.php
+++ b/inc/modelcsv.class.php
@@ -61,11 +61,14 @@
class PluginDatainjectionModelcsv extends CommonDBChild
{
public static $rightname = "plugin_datainjection_model";
+
public $specific_fields;
// From CommonDBChild
public static $itemtype = 'PluginDatainjectionModel';
+
public static $items_id = 'models_id';
+
public $dohistory = true;
diff --git a/inc/monitorinjection.class.php b/inc/monitorinjection.class.php
index 1227327c..79d07ee6 100644
--- a/inc/monitorinjection.class.php
+++ b/inc/monitorinjection.class.php
@@ -110,6 +110,7 @@ public function addSpecificNeededFields($primary_type, $values)
if (isset($values[$primary_type]['is_global'])) {
$fields['is_global'] = empty($values[$primary_type]['is_global']) ? 0 : $values[$primary_type]['is_global'];
}
+
return $fields;
}
}
diff --git a/inc/networknameinjection.class.php b/inc/networknameinjection.class.php
index 4d56937b..95746eed 100644
--- a/inc/networknameinjection.class.php
+++ b/inc/networknameinjection.class.php
@@ -101,11 +101,7 @@ public function addOrUpdateObject($values = [], $options = [])
**/
public function addSpecificNeededFields($primary_type, $values)
{
-
- $fields['items_id'] = $values['NetworkPort']['id'];
- $fields['itemtype'] = "NetworkPort";
-
- return $fields;
+ return ['items_id' => $values['NetworkPort']['id'], 'itemtype' => "NetworkPort"];
}
diff --git a/inc/networkportinjection.class.php b/inc/networkportinjection.class.php
index cdb391a7..79e722e5 100644
--- a/inc/networkportinjection.class.php
+++ b/inc/networkportinjection.class.php
@@ -135,6 +135,7 @@ public function addSpecificNeededFields($primary_type, $values)
} else {
$fields['instantiation_type'] = "NetworkPortEthernet";
}
+
return $fields;
}
@@ -155,6 +156,7 @@ public function showAdditionalInformation($info = [], $option = [])
$instantiations[$inst_type] = call_user_func([$inst_type, 'getTypeName']);
}
}
+
Dropdown::showFromArray(
'instantiation_type',
$instantiations,
@@ -240,13 +242,11 @@ public function checkParameters($fields_toinject, $options)
/**
- * Build where sql request to look for a network port
- *
- * @param array $fields_toinject array the fields to insert into DB
- * @param array $options array
- *
- * @return array
- **/
+ * Build where sql request to look for a network port
+ *
+ * @param array $fields_toinject array the fields to insert into DB
+ * @param array $options array
+ **/
public function getUnicityRequest($fields_toinject = [], $options = []): array
{
$where = [];
@@ -330,12 +330,15 @@ public function processAfterInsertOrUpdate($values, $add = true, $rights = [])
if ($use_name) {
$sql .= " AND `glpi_networkequipments`.`name` = '" . $values['NetworkPort']["netname"] . "'";
}
+
if ($use_logical_number) {
$sql .= " AND `glpi_networkports`.`logical_number` = '" . $values['NetworkPort']["netport"] . "'";
}
+
if ($use_mac) {
$sql .= " AND `glpi_networkports`.`mac` = '" . $values['NetworkPort']["netmac"] . "'";
}
+
$res = $DB->doQuery($sql);
//if at least one parameter is given
@@ -352,5 +355,6 @@ public function processAfterInsertOrUpdate($values, $add = true, $rights = [])
$netport_netport->add($tmp);
}
} //TODO add injection warning if no port found or more than one
+ return null;
}
}
diff --git a/inc/notepadinjection.class.php b/inc/notepadinjection.class.php
index f5333b76..40726f33 100644
--- a/inc/notepadinjection.class.php
+++ b/inc/notepadinjection.class.php
@@ -76,6 +76,7 @@ public function getOptions($primary_type = '')
} else {
$option['linkfield'] = $option['field'];
}
+
$searchoptions[$option['id']] = $option;
}
}
@@ -109,9 +110,6 @@ public function addOrUpdateObject($values = [], $options = [])
**/
public function addSpecificNeededFields($primary_type, $values)
{
-
- $fields['items_id'] = $values[$primary_type]['id'];
- $fields['itemtype'] = $primary_type;
- return $fields;
+ return ['items_id' => $values[$primary_type]['id'], 'itemtype' => $primary_type];
}
}
diff --git a/inc/peripheralinjection.class.php b/inc/peripheralinjection.class.php
index 1fec9d8a..d40b6fd8 100644
--- a/inc/peripheralinjection.class.php
+++ b/inc/peripheralinjection.class.php
@@ -108,6 +108,7 @@ public function addSpecificNeededFields($primary_type, $values)
if (isset($values[$primary_type]['is_global'])) {
$fields['is_global'] = empty($values[$primary_type]['is_global']) ? 0 : $values[$primary_type]['is_global'];
}
+
return $fields;
}
}
diff --git a/inc/phoneinjection.class.php b/inc/phoneinjection.class.php
index 756945a1..57e59bbe 100644
--- a/inc/phoneinjection.class.php
+++ b/inc/phoneinjection.class.php
@@ -109,6 +109,7 @@ public function addSpecificNeededFields($primary_type, $values)
if (isset($values[$primary_type]['is_global'])) {
$fields['is_global'] = empty($values[$primary_type]['is_global']) ? 0 : $values[$primary_type]['is_global'];
}
+
return $fields;
}
}
diff --git a/inc/printerinjection.class.php b/inc/printerinjection.class.php
index 226329d0..caadd3ad 100644
--- a/inc/printerinjection.class.php
+++ b/inc/printerinjection.class.php
@@ -111,6 +111,7 @@ public function addSpecificNeededFields($primary_type, $values)
if (isset($values[$primary_type]['is_global'])) {
$fields['is_global'] = empty($values[$primary_type]['is_global']) ? 0 : $values[$primary_type]['is_global'];
}
+
return $fields;
}
@@ -139,6 +140,7 @@ public function processDictionnariesIfNeeded(&$values)
if (isset($res_rule['_ignore_import']) && $res_rule['_ignore_import']) {
return false;
}
+
if (isset($res_rule['is_global'])) {
$values['Printer']['is_global'] = $res_rule['is_global'];
}
@@ -152,6 +154,7 @@ public function processDictionnariesIfNeeded(&$values)
= Dropdown::getDropdownName('glpi_suppliers', $res_rule['supplier']);
}
}
+
return true;
}
}
diff --git a/inc/profile.class.php b/inc/profile.class.php
index 8ad92d4b..d2f913da 100644
--- a/inc/profile.class.php
+++ b/inc/profile.class.php
@@ -35,7 +35,7 @@ class PluginDatainjectionProfile extends Profile
public static function getAllRights()
{
- $rights = [
+ return [
['itemtype' => 'PluginDatainjectionModel',
'label' => __('Model management', 'datainjection'),
'field' => 'plugin_datainjection_model',
@@ -46,7 +46,6 @@ public static function getAllRights()
'rights' => [READ => __('Read')],
],
];
- return $rights;
}
/**
@@ -59,7 +58,7 @@ public function cleanProfiles($ID)
/** @var DBmysql $DB */
global $DB;
$query = "DELETE FROM `glpi_profiles`
- WHERE `profiles_id`='$ID'
+ WHERE `profiles_id`='{$ID}'
AND `name` LIKE '%plugin_datainjection%'";
$DB->doQuery($query);
}
@@ -71,8 +70,10 @@ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
if ($item->fields['interface'] == 'central') {
return self::createTabEntry(__('Data injection', 'datainjection'), 0, $item::getType(), 'ti ti-download');
}
+
return '';
}
+
return '';
}
@@ -90,6 +91,7 @@ public static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $
);
$profile->showForm($ID);
}
+
return true;
}
@@ -161,6 +163,7 @@ public static function migrateProfiles()
$value = 0;
break;
}
+
self::addDefaultProfileInfos($id, ['plugin_datainjection_model' => $value]);
if ($value > 0) {
self::addDefaultProfileInfos($id, ['plugin_datainjection_use' => READ]);
@@ -169,6 +172,7 @@ public static function migrateProfiles()
}
}
}
+ return null;
}
public function showForm($ID, $options = [])
@@ -199,6 +203,7 @@ public function showForm($ID, $options = [])
echo "