diff options
| author | Camilo Sperberg <me+github@unreal4u.com> | 2022-11-11 15:14:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-11 15:14:59 +0300 |
| commit | 0bfd9a4dc7d50b606630ce8f8785fad516c20aa1 (patch) | |
| tree | c2e38b9be9d86b66bd9942d024d1c8d97a63a998 | |
| parent | c08e59033f09e3cee6b9408890bd2dfb2b3c80d5 (diff) | |
Address most common warnings in PHP >= 8.0.0 (#8769)
| -rw-r--r-- | program/actions/mail/check_recent.php | 3 | ||||
| -rw-r--r-- | program/actions/mail/compose.php | 2 | ||||
| -rw-r--r-- | program/actions/mail/mark.php | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/program/actions/mail/check_recent.php b/program/actions/mail/check_recent.php index 52bb8601a..3b3609f35 100644 --- a/program/actions/mail/check_recent.php +++ b/program/actions/mail/check_recent.php @@ -52,7 +52,7 @@ class rcmail_action_mail_check_recent extends rcmail_action_mail_index if ($check_all) { $a_mailboxes = $rcmail->storage->list_folders_subscribed('', '*', 'mail'); } - else if ($search_request && is_object($_SESSION['search'][1])) { + else if ($search_request && isset($_SESSION['search'][1]) && is_object($_SESSION['search'][1])) { $a_mailboxes = (array) $_SESSION['search'][1]->get_parameters('MAILBOX'); } else { @@ -74,6 +74,7 @@ class rcmail_action_mail_check_recent extends rcmail_action_mail_index $is_current = $mbox_name == $current || ( !empty($search_request) + && isset($_SESSION['search'][1]) && is_object($_SESSION['search'][1]) && in_array($mbox_name, (array)$_SESSION['search'][1]->get_parameters('MAILBOX')) ); diff --git a/program/actions/mail/compose.php b/program/actions/mail/compose.php index 385dea390..836e75ff9 100644 --- a/program/actions/mail/compose.php +++ b/program/actions/mail/compose.php @@ -1093,7 +1093,7 @@ class rcmail_action_mail_compose extends rcmail_action_mail_index continue; } - $idx = $part->content_id ? ('cid:' . $part->content_id) : $part->content_location; + $idx = $part->content_id ? ('cid:' . $part->content_id) : $part->content_location ?? null; if ($idx && isset(self::$CID_MAP[$idx]) && strpos($message_body, self::$CID_MAP[$idx]) !== false) { $replace = self::$CID_MAP[$idx]; diff --git a/program/actions/mail/mark.php b/program/actions/mail/mark.php index 1501d52e3..4fcfbb534 100644 --- a/program/actions/mail/mark.php +++ b/program/actions/mail/mark.php @@ -46,10 +46,9 @@ class rcmail_action_mail_mark extends rcmail_action_mail_index $flag = self::imap_flag($flag); $old_count = 0; - if ($flag == 'DELETED' && $skip_deleted && $_POST['_from'] != 'show') { + if ($flag == 'DELETED' && $skip_deleted && (!isset($_POST['_from']) || $_POST['_from'] != 'show')) { // count messages before changing anything $old_count = $rcmail->storage->count(null, $threading ? 'THREADS' : 'ALL'); - $old_pages = ceil($old_count / $rcmail->storage->get_pagesize()); } if ($folders == 'all') { |