Fix getting IMAP vendor name (#9654)

pabzm · alecpl · commit 8cc559a6f057 · 2024-09-29T11:51:53.000+02:00
In some cases, the array's keys where upper case, and the previous code
produced a warning and resulted in an empty string, even though the
name was present.
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
@@ -658,8 +658,8 @@ public function get_vendor()
             $ident = null;
         }
 
-        $vendor  = (string) (!empty($ident) ? $ident['name'] : '');
-        $ident   = strtolower($vendor . ' ' . $this->conn->data['GREETING']);
+        $vendor = (string) ($ident['name'] ?? $ident['NAME'] ?? '');
+        $ident = strtolower($vendor . ' ' . $this->conn->data['GREETING']);
         $vendors = ['cyrus', 'dovecot', 'uw-imap', 'gimap', 'hmail', 'greenmail'];
 
         foreach ($vendors as $v) {

Original file line number	Diff line number	Diff line change
`@@ -658,8 +658,8 @@ public function get_vendor()`
`658`	`658`	`$ident = null;`
`659`	`659`	`}`
`660`	`660`
`661`		`- $vendor = (string) (!empty($ident) ? $ident['name'] : '');`
`662`		`- $ident = strtolower($vendor . ' ' . $this->conn->data['GREETING']);`
	`661`	`+ $vendor = (string) ($ident['name'] ?? $ident['NAME'] ?? '');`
	`662`	`+ $ident = strtolower($vendor . ' ' . $this->conn->data['GREETING']);`
`663`	`663`	`$vendors = ['cyrus', 'dovecot', 'uw-imap', 'gimap', 'hmail', 'greenmail'];`
`664`	`664`
`665`	`665`	`foreach ($vendors as $v) {`