diff program/include/rcmail.php @ 27:c32b53434b47

more compensation for deprecated empty cases
author Charlie Root
date Sun, 18 Jan 2026 14:20:29 -0500
parents 303b85d5b561
children
line wrap: on
line diff
--- a/program/include/rcmail.php	Sat Oct 18 12:24:31 2025 -0400
+++ b/program/include/rcmail.php	Sun Jan 18 14:20:29 2026 -0500
@@ -200,6 +200,7 @@
     public function get_address_book($id, $writeable = false)
     {
         $contacts    = null;
+	$default = false;
         $ldap_config = (array)$this->config->get('ldap_public');
 
         // 'sql' is the alias for '0' used by autocomplete
@@ -1496,7 +1497,7 @@
             $currentFolder = substr($folder, 0, $pos);
 
             // sometimes folder has a delimiter as the last character
-            if (!strlen($subFolders)) {
+            if (empty($subFolders)) {
                 $virtual = false;
             }
             else if (!isset($arrFolders[$currentFolder])) {
@@ -2428,8 +2429,8 @@
 
             // create a per-folder UIDs array
             foreach ((array)$_uid as $uid) {
-                list($uid, $mbox) = explode('-', $uid, 2);
-                if (!strlen($mbox)) {
+	      list($uid, $mbox) = array_pad(explode('-', $uid, 2), 2, "");
+                if (empty($mbox)) {
                     $mbox = $_mbox;
                 }
                 else {