Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.

support glpi 10 #249

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support glpi 10 #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e52848b
glpi 10 first try
delcroip Feb 4, 2023
d842674
other updates
delcroip Feb 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ajax/counterComponents.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
WHERE `plugin_monitoring_componentscalalog_id`='".$_POST['id']."'
ORDER BY `glpi_plugin_monitoring_components`.`name`";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$elements[$data['id']] = $data['name'];
}

Expand Down
2 changes: 1 addition & 1 deletion ajax/dropdownComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
Session::checkLoginUser();

// Display dropdown of components of the catalog
$a_data = getAllDatasFromTable(
$a_data = getAllDataFromTable(
'glpi_plugin_monitoring_componentscatalogs_components',
'`plugin_monitoring_componentscalalog_id`="'.$_POST['plugin_monitoring_componentscalalog_id'].'"');

Expand Down
4 changes: 2 additions & 2 deletions ajax/dropdownDevices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
if ($DB->numrows($result)) {
$prev = -1;

while ($data =$DB->fetch_array($result)) {
while ($data =$DB->fetchArray($result)) {
$ID = $data['id'];
$level = $data['level'];
$output = $data['name'];
Expand Down Expand Up @@ -467,7 +467,7 @@
if ($DB->numrows($result)) {
$prev = -1;

while ($data =$DB->fetch_array($result)) {
while ($data =$DB->fetchArray($result)) {
$output = $data[$field];

if ($displaywith) {
Expand Down
2 changes: 1 addition & 1 deletion ajax/dropdownServiceHost.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
AND `items_id`='".$_POST['hosts']."'
ORDER BY `".getTableForItemType("PluginMonitoringService")."`.`name`";
$result = $DB->query($query);
while ($data = $DB->fetch_array($result)) {
while ($data = $DB->fetchArray($result)) {
$a_services[$data['id']] = $data['name'];
}

Expand Down
2 changes: 1 addition & 1 deletion ajax/dropdownServiceHostType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
$result = $DB->query($query);
$a_hosts = array();
$a_hosts[0] = Dropdown::EMPTY_VALUE;
while ($data = $DB->fetch_array($result)) {
while ($data = $DB->fetchArray($result)) {
$a_hosts[$data['id']] = $data['name'];
}
$rand = Dropdown::showFromArray("hosts", $a_hosts);
Expand Down
2 changes: 1 addition & 1 deletion ajax/gaugeComponents.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
WHERE `plugin_monitoring_componentscalalog_id`='".$_POST['id']."'
ORDER BY `glpi_plugin_monitoring_components`.`name`";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$elements[$data['id']] = $data['name'];
}

Expand Down
2 changes: 1 addition & 1 deletion hook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ function plugin_monitoring_searchOptionsValues($item) {
$use_ajax = false;

if ($CFG_GLPI["use_ajax"]) {
$nb = countElementsInTable("glpi_plugin_monitoring_componentscatalogs_hosts", "`itemtype`='Computer'");
$nb = countElementsInTable("glpi_plugin_monitoring_componentscatalogs_hosts", ["itemtype"=>"Computer"]);
if ($nb > $CFG_GLPI["ajax_limit_count"]) {
$use_ajax = true;
}
Expand Down
6 changes: 3 additions & 3 deletions inc/businessrule.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ function showForm($servicescatalogs_id, $options=array()) {
WHERE `plugin_monitoring_servicescatalogs_id`='".$servicescatalogs_id."'
ORDER BY `name`";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$pMonitoringBusinessrulegroup->showForm($data['id'], $servicescatalogs_id);
}
return;
Expand All @@ -238,7 +238,7 @@ function showForm($servicescatalogs_id, $options=array()) {
WHERE `plugin_monitoring_servicescatalogs_id`='".$servicescatalogs_id."'
ORDER BY `group`";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
echo "<tr class='tab_bg_1'>";
echo "<td>";
echo "<input type='checkbox'/>";
Expand Down Expand Up @@ -357,7 +357,7 @@ static function removeBusinessruleonDeletegroup($item) {
$query = "SELECT * FROM `glpi_plugin_monitoring_businessrules`
WHERE `plugin_monitoring_businessrulegroups_id`='".$item->fields["id"]."'";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$pmBusinessrule->delete($data);
}
}
Expand Down
4 changes: 2 additions & 2 deletions inc/businessrule_component.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function replayDynamicServices($plugin_monitoring_businessrulegroups_id) {
. " = '".$pmComponentscatalog_Component->fields['plugin_monitoring_components_id']."' ".
$restrict_entities;
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$a_services[$data['id']] = $data['id'];
}
}
Expand Down Expand Up @@ -117,7 +117,7 @@ function replayDynamicServices($plugin_monitoring_businessrulegroups_id) {
. " WHERE `plugin_monitoring_businessrulegroups_id`='".$plugin_monitoring_businessrulegroups_id."'"
. " AND `is_dynamic`=1";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
// Update if yet in DB
if (isset($a_services[$data['plugin_monitoring_services_id']])) {
unset($a_services[$data['plugin_monitoring_services_id']]);
Expand Down
33 changes: 17 additions & 16 deletions inc/canvas.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ function getNetworkEquipments($networkequipments_id) {




function getState($itemtype, $items_id) {
global $DB;

Expand All @@ -133,21 +134,21 @@ function getState($itemtype, $items_id) {
WHERE `itemtype`='".$itemtype."'
AND `items_id`='".$items_id."'";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
$critical += countElementsInTable("glpi_plugin_monitoring_services",
"(`state`='DOWN' OR `state`='UNREACHABLE' OR `state`='CRITICAL' OR `state`='DOWNTIME')
AND `state_type`='HARD'
AND `plugin_monitoring_componentscatalogs_hosts_id`='".$data['id']."'");

$warning += countElementsInTable("glpi_plugin_monitoring_services",
"(`state`='WARNING' OR `state`='UNKNOWN' OR `state`='RECOVERY' OR `state`='FLAPPING' OR `state` IS NULL)
AND `state_type`='HARD'
AND `plugin_monitoring_componentscatalogs_hosts_id`='".$data['id']."'");

$ok += countElementsInTable("glpi_plugin_monitoring_services",
"(`state`='OK' OR `state`='UP')
AND `state_type`='HARD'
AND `plugin_monitoring_componentscatalogs_hosts_id`='".$data['id']."'");
while ($data=$DB->fetchArray($result)) {
$critical += countElementsInTable("glpi_plugin_monitoring_services",[
'state' => PLUGIN_MONITORING_STATE_CRITICAL,
"state_type"=>'HARD',
"plugin_monitoring_componentscatalogs_hosts_id"=>$data['id']]);

$warning += countElementsInTable("glpi_plugin_monitoring_services",[
'state' => PLUGIN_MONITORING_STATE_WARNING,
"state_type"=>'HARD',
"plugin_monitoring_componentscatalogs_hosts_id"=>$data['id']]);

$ok += countElementsInTable("glpi_plugin_monitoring_services",[
'state' => PLUGIN_MONITORING_STATE_OK,
"state_type"=>'HARD',
"plugin_monitoring_componentscatalogs_hosts_id"=>$data['id']]);
}
$output = array();
$output['ok'] = $ok;
Expand All @@ -166,7 +167,7 @@ function getHostState($itemtype, $items_id) {
AND `items_id`='".$items_id."'
LIMIT 1";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
if ($data['state_type'] == 'SOFT') {
return 'ok';
}
Expand Down
5 changes: 3 additions & 2 deletions inc/command.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,9 +545,10 @@ function convertPostdata($data) {
$data['arguments'] = exportArrayToDB($a_arguments);


$where = "`command_name`='".$data['command_name']."'";
$where = ["command_name" => $data['command_name']];

if (isset($data['id'])) {
$where .= " AND `id` != '".$data['id']."'";
$where[]= ["NOT" => ["id" => $data['id']]];
}
$num_com = countElementsInTable("glpi_plugin_monitoring_commands", $where);
if ($num_com > 0) {
Expand Down
32 changes: 14 additions & 18 deletions inc/componentscatalog.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) {
**/
static function countForStaticHosts(PluginMonitoringComponentscatalog $item) {

$restrict = "`plugin_monitoring_componentscalalog_id` = '".$item->getField('id') ."'
AND `is_static`='1'";
$restrict = ["plugin_monitoring_componentscalalog_id" => $item->getField('id'), "is_static" => '1'];

return countElementsInTable('glpi_plugin_monitoring_componentscatalogs_hosts', $restrict);
}
Expand All @@ -147,9 +146,7 @@ static function countForStaticHosts(PluginMonitoringComponentscatalog $item) {
* @param $item PluginMonitoringComponentscatalog object
**/
static function countForDynamicHosts(PluginMonitoringComponentscatalog $item) {

$restrict = "`plugin_monitoring_componentscalalog_id` = '".$item->getField('id') ."'
AND `is_static`='0'";
$restrict = ["plugin_monitoring_componentscalalog_id" => $item->getField('id'), "is_static" => '0'];

return countElementsInTable('glpi_plugin_monitoring_componentscatalogs_hosts', $restrict);
}
Expand All @@ -161,7 +158,7 @@ static function countForDynamicHosts(PluginMonitoringComponentscatalog $item) {
**/
static function countForRules(PluginMonitoringComponentscatalog $item) {

$restrict = "`plugin_monitoring_componentscalalog_id` = '".$item->getField('id') ."'";
$restrict = ["plugin_monitoring_componentscalalog_id" => $item->getField('id')];

return countElementsInTable('glpi_plugin_monitoring_componentscatalogs_rules', $restrict);
}
Expand All @@ -173,7 +170,7 @@ static function countForRules(PluginMonitoringComponentscatalog $item) {
**/
static function countForComponents(PluginMonitoringComponentscatalog $item) {

$restrict = "`plugin_monitoring_componentscalalog_id` = '".$item->getField('id') ."'";
$restrict = ["plugin_monitoring_componentscalalog_id" => $item->getField('id')];

return countElementsInTable('glpi_plugin_monitoring_componentscatalogs_components', $restrict);
}
Expand All @@ -185,8 +182,7 @@ static function countForComponents(PluginMonitoringComponentscatalog $item) {
**/
static function countForContacts(PluginMonitoringComponentscatalog $item) {

$restrict = "`items_id` = '".$item->getField('id') ."'"
. " AND `itemtype`='PluginMonitoringComponentscatalog'";
$restrict = ["itemtype" => "PluginMonitoringComponentscatalog", "items_id" => $item->getField('id')];

return countElementsInTable('glpi_plugin_monitoring_contacts_items', $restrict);
}
Expand Down Expand Up @@ -328,7 +324,7 @@ function prepareInputForUpdate($input) {
}


function displaySpecificTypeField($ID, $field=array()) {
function displaySpecificTypeField($ID, $field=array(), $option=array()) {


switch ($field['type']) {
Expand Down Expand Up @@ -452,7 +448,7 @@ function toggleEntity(idEntity) {

static function replayRulesCatalog($item) {

$datas = getAllDatasFromTable("glpi_plugin_monitoring_componentscatalogs_rules",
$datas = getAllDataFromTable("glpi_plugin_monitoring_componentscatalogs_rules",
"`plugin_monitoring_componentscalalog_id`='".$item->getID()."'");
$pmComponentscatalog_rule = new PluginMonitoringComponentscatalog_rule();
foreach($datas as $data) {
Expand All @@ -473,14 +469,14 @@ static function removeCatalog($item) {
WHERE `plugin_monitoring_componentscalalog_id`='".$item->fields["id"]."'
AND `is_static`='1'";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$pmComponentscatalog_Host->delete($data);
}

$query = "SELECT * FROM `glpi_plugin_monitoring_componentscatalogs_rules`
WHERE `plugin_monitoring_componentscalalog_id`='".$item->fields["id"]."'";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$pmComponentscatalog_rule->delete($data);
}
}
Expand Down Expand Up @@ -856,7 +852,7 @@ function getInfoOfCatalog($componentscatalogs_id) {
// Toolbox::logInFile("pm", "query : $query\n");

$result = $DB->query($query);
while ($dataComponentscatalog_Host=$DB->fetch_array($result)) {
while ($dataComponentscatalog_Host=$DB->fetchArray($result)) {
$ressources = array();
$fakeService = array();
$host_overall_state_ok = false;
Expand Down Expand Up @@ -906,7 +902,7 @@ function getInfoOfCatalog($componentscatalogs_id) {
ORDER BY `glpi_plugin_monitoring_services`.`name` ASC;";
// Toolbox::logInFile("pm", "query services - $queryService\n");
$resultService = $DB->query($queryService);
while ($dataService=$DB->fetch_array($resultService)) {
while ($dataService=$DB->fetchArray($resultService)) {
$nb_ressources++;

$pmService->getFromDB($dataService["serviceId"]);
Expand Down Expand Up @@ -992,7 +988,7 @@ function getRessources($componentscatalogs_id, $state, $state_type='HARD') {
AND `state_type` LIKE '".$state_type."'
ORDER BY `name`";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$pmService->getFromDB($dataService["id"]);
if ($pmService->getShortState()) {
// if (PluginMonitoringHost::getState($data['state'],
Expand Down Expand Up @@ -1363,7 +1359,7 @@ function generateReport($array, $pdf=TRUE) {
AND `plugin_monitoring_components_id`='".$components_id."'";
$result = $DB->query($query);
$rownb = true;
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$itemtype = $data['itemtype'];
$item = new $itemtype();
$item->getFromDB($data['items_id']);
Expand Down Expand Up @@ -1528,7 +1524,7 @@ function generateSyntheseReport($array, $pdf=TRUE) {
AND `plugin_monitoring_components_id`='".$components_id."'";
$result = $DB->query($query);
$rownb = true;
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$itemtype = $data['itemtype'];
$item = new $itemtype();
$item->getFromDB($data['items_id']);
Expand Down
14 changes: 7 additions & 7 deletions inc/componentscatalog_component.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function showComponents($componentscatalogs_id) {
$query = "SELECT * FROM `".$this->getTable()."`
WHERE `plugin_monitoring_componentscalalog_id`='".$componentscatalogs_id."'";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$used[] = $data['plugin_monitoring_components_id'];
$pmComponent->getFromDB($data['plugin_monitoring_components_id']);
echo "<tr>";
Expand Down Expand Up @@ -148,7 +148,7 @@ function addComponent($componentscatalogs_id) {
$query = "SELECT * FROM `".$this->getTable()."`
WHERE `plugin_monitoring_componentscalalog_id`='".$componentscatalogs_id."'";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$used[] = $data['plugin_monitoring_components_id'];
}

Expand Down Expand Up @@ -188,7 +188,7 @@ function addComponentToItems($componentscatalogs_id, $components_id) {
$query = "SELECT * FROM `glpi_plugin_monitoring_componentscatalogs_hosts`
WHERE `plugin_monitoring_componentscalalog_id`='".$componentscatalogs_id."'";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$itemtype = $data['itemtype'];
$item = new $itemtype();
$item->getFromDB($data['items_id']);
Expand All @@ -207,7 +207,7 @@ function addComponentToItems($componentscatalogs_id, $components_id) {
WHERE `plugin_monitoring_components_id`='".$components_id."'
AND `plugin_monitoring_componentscatalogs_hosts_id`='".$data['id']."'";
$results = $DB->query($querys);
while ($datas=$DB->fetch_array($results)) {
while ($datas=$DB->fetchArray($results)) {
$a_services_created[$datas['networkports_id']] = $datas['id'];
}

Expand Down Expand Up @@ -246,12 +246,12 @@ function removeComponentToItems($componentscatalogs_id, $components_id) {
$query = "SELECT * FROM `glpi_plugin_monitoring_componentscatalogs_hosts`
WHERE `plugin_monitoring_componentscalalog_id`='".$componentscatalogs_id."'";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
$querys = "SELECT * FROM `glpi_plugin_monitoring_services`
WHERE `plugin_monitoring_componentscatalogs_hosts_id`='".$data['id']."'
AND `plugin_monitoring_components_id`='".$components_id."'";
$results = $DB->query($querys);
while ($datas=$DB->fetch_array($results)) {
while ($datas=$DB->fetchArray($results)) {
$_SESSION['plugin_monitoring_hosts'] = $data;
$pmService->delete(array('id'=>$datas['id']));
}
Expand All @@ -278,7 +278,7 @@ static function listForComponents($components_id) {
WHERE `plugin_monitoring_components_id`='".$components_id."'
ORDER BY `glpi_plugin_monitoring_componentscatalogs`.`name`";
$result = $DB->query($query);
while ($data=$DB->fetch_array($result)) {
while ($data=$DB->fetchArray($result)) {
echo "<tr class='tab_bg_1'>";
echo "<td>";
$pmComponentscatalog->getFromDB($data['id']);
Expand Down
Loading