Mercurial > hg > rc2

comparison program/steps/addressbook/func.inc @ 21:73124dd49283

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More cleaning up php8 Warnings/deprecations, noticed that setting non-my-Dates mailboxes to sort on Date isn't sticky over ctrl-R
author Charlie Root
date Thu, 09 Oct 2025 11:31:41 -0400
parents 4681f974d28b
children
comparison
equal deleted inserted replaced
20:4aec5e272733 21:73124dd49283
99 99
100 $CONTACTS = rcmail_contact_source($source, true); 100 $CONTACTS = rcmail_contact_source($source, true);
101 } 101 }
102 102
103 // remove undo information... 103 // remove undo information...
104 if ($undo = $_SESSION['contact_undo']) { 104 if ($undo = ($_SESSION['contact_undo']??null)) {
105 // ...after timeout 105 // ...after timeout
106 $undo_time = $RCMAIL->config->get('undo_timeout', 0); 106 $undo_time = $RCMAIL->config->get('undo_timeout', 0);
107 if ($undo['ts'] < time() - $undo_time) 107 if ($undo['ts'] < time() - $undo_time)
108 $RCMAIL->session->remove('contact_undo'); 108 $RCMAIL->session->remove('contact_undo');
109 } 109 }
943 943
944 if (is_array($cid)) { 944 if (is_array($cid)) {
945 return $cid; 945 return $cid;
946 } 946 }
947 947
948 if (!preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid)) { 948 if (!preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/',
949 ($cid??''))) {
949 return array(); 950 return array();
950 } 951 }
951 952
952 $cid = explode(',', $cid); 953 $cid = explode(',', $cid);
953 $got_source = strlen($source); 954 $got_source = strlen($source);