Skip to content
GitLab
Commit b8f81913 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:ambulance: fix(opsi): Do not search for empty macAddress 

This was causing PHP errors and bad behavior from OPSI tab

issue #5765
parent 86fb8f6a
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 13 deletions
+16 -13
opsi/admin/systems/opsi/class_opsiClient.inc
+ 16
− 13
View file @ b8f81913
......@@ -312,20 +312,23 @@ class opsiClient extends simplePlugin
);
return FALSE;
}
$infos = $s_daemon->append_call('OPSI.host_getObjects', $macAddress, array('args' => array(array('lastSeen', 'hardwareAddress'), array('hardwareAddress' => $this->getMacAddresses()))));
if ($s_daemon->is_error()) {
$this->lastSeen = sprintf(_('Failed to contact OPSI server: %s'), $s_daemon->get_error());
} elseif (count($infos) == 0) {
$this->lastSeen = _('Never');
} else {
if (!$this->editing_group() && ($this->initialOpsiId === NULL)) {
$this->initialOpsiId = reset($infos)['id'];
}
$text = '';
foreach ($infos as $info) {
$text .= htmlentities(sprintf('%s - %s', $info['id'], $info['lastSeen']), ENT_COMPAT, 'UTF-8')."<br/>\n";
$macAddresses = $this->getMacAddresses();
if (!empty($macAddresses)) {
$infos = $s_daemon->append_call('OPSI.host_getObjects', $macAddress, array('args' => array(array('lastSeen', 'hardwareAddress'), array('hardwareAddress' => $macAddresses))));
if ($s_daemon->is_error()) {
$this->lastSeen = sprintf(_('Failed to contact OPSI server: %s'), $s_daemon->get_error());
} elseif (count($infos) == 0) {
$this->lastSeen = _('Never');
} else {
if (!$this->editing_group() && ($this->initialOpsiId === NULL)) {
$this->initialOpsiId = reset($infos)['id'];
}
$text = '';
foreach ($infos as $info) {
$text .= htmlentities(sprintf('%s - %s', $info['id'], $info['lastSeen']), ENT_COMPAT, 'UTF-8')."<br/>\n";
}
$this->lastSeen = $text;
}
$this->lastSeen = $text;
}
if (!isset($this->products[$this->fdOpsiServerDn])) {
$opsi_args = array('id','name','setupScript','alwaysScript','onceScript','customScript','userLoginScript','updateScript','productVersion','packageVersion');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment