From b5f39ce6a91ea9beec510016cfa846e649467210 Mon Sep 17 00:00:00 2001 From: Till Date: Thu, 20 Jun 2024 11:34:39 +0200 Subject: [PATCH] Fixed PHP warnings in mail_user_edit.php --- interface/web/mail/mail_user_edit.php | 13 ++++++++----- interface/web/mail/templates/mail_domain_edit.htm | 2 -- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index 011267b115..644b04cfb3 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -157,10 +157,14 @@ class page_action extends tform_actions { $app->uses('quota_lib'); $clientid = $app->db->queryOneRecord('SELECT `client_id` FROM `sys_group` WHERE `groupid` = ?', $this->dataRecord['sys_groupid']); $monitor_data = $app->quota_lib->get_mailquota_data($clientid, FALSE, $this->dataRecord['email']); - if ($this->dataRecord['quota'] != 0) { - $app->tpl->setVar("used_percentage", round($monitor_data['used'] * 100 / $this->dataRecord['quota'])); - } - $app->tpl->setVar('used', $app->functions->formatBytes($monitor_data['used'], 0)); + if(!empty($monitor_data) && is_array($monitor_data)) { + if ($this->dataRecord['quota'] != 0 && isset($monitor_data['used'])) { + $app->tpl->setVar("used_percentage", round($monitor_data['used'] * 100 / $this->dataRecord['quota'])); + } + if(isset($monitor_data['used'])) { + $app->tpl->setVar('used', $app->functions->formatBytes($monitor_data['used'], 0)); + } + } # Get addresses for this account. $addresses = $app->db->queryAllRecords("SELECT source, type FROM mail_forwarding WHERE destination = ? AND ".$app->tform->getAuthSQL('r'), $email); @@ -345,7 +349,6 @@ class page_action extends tform_actions { $disablesmtp = ($this->dataRecord["disablesmtp"])?'y':'n'; $disabledeliver = ($this->dataRecord["disabledeliver"])?'y':'n'; - $app->db->query($sql, $disableimap, $disableimap, $disablepop3, $disablesmtp, $disabledeliver, $disabledeliver, $this->id); $sql = "UPDATE mail_user SET disableimap = ?, disablesieve = ?, disablepop3 = ?, disablesmtp = ?, disabledeliver = ?, disablelda = ?, disablelmtp = ? WHERE mailuser_id = ?"; $app->db->query($sql, $disableimap, $disableimap, $disablepop3, $disablesmtp, $disabledeliver, $disabledeliver, $disabledeliver, $this->id); } diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm index 2d8d14536c..f29b241050 100644 --- a/interface/web/mail/templates/mail_domain_edit.htm +++ b/interface/web/mail/templates/mail_domain_edit.htm @@ -135,8 +135,6 @@ - -
-- GitLab