holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix broken token/syntax, if no metadata yet

Browse Source
This commit is contained in:
Ralf Becker 2020-07-24 16:36:42 +02:00
parent 6d4aaade1b
commit 6007fb5363
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/Mail/Imap.php
View File

@ -1438,7 +1438,7 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\PushIface
{ {
if (!isset($token)) $token = ((string)$account_id === '0' ? Tokens::instance() : Tokens::user($account_id)); if (!isset($token)) $token = ((string)$account_id === '0' ? Tokens::instance() : Tokens::user($account_id));
return self::METADATA_PREFIX.$GLOBALS['egw_info']['user']['account_id'].'::'.$this->acc_id.';'. return $GLOBALS['egw_info']['user']['account_id'].'::'.$this->acc_id.';'.
$token . '@' . Api\Header\Http::host(); $token . '@' . Api\Header\Http::host();
} }
@ -1455,8 +1455,8 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\PushIface
return false; return false;
} }
try { try {
$metadata = explode(self::METADATA_SEPARATOR, $metadata = ($m = $this->getMetadata(self::METADATA_MAILBOX, [self::METADATA_NAME])[self::METADATA_MAILBOX][self::METADATA_NAME]) ?
$this->getMetadata(self::METADATA_MAILBOX, [self::METADATA_NAME])[self::METADATA_MAILBOX][self::METADATA_NAME]) ?: []; explode(self::METADATA_SEPARATOR, substr($m, strlen(self::METADATA_PREFIX))) : [];
$my_token = $this->pushToken($account_id); $my_token = $this->pushToken($account_id);
$my_token_preg = '/^'.$this->pushToken($account_id, '[^@]+').'$/'; $my_token_preg = '/^'.$this->pushToken($account_id, '[^@]+').'$/';
foreach($metadata as $key => $token) foreach($metadata as $key => $token)
@ -1474,7 +1474,7 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\PushIface
// add my token and send it to Dovecot // add my token and send it to Dovecot
$metadata[] = $my_token; $metadata[] = $my_token;
$this->setMetadata(self::METADATA_MAILBOX, [ $this->setMetadata(self::METADATA_MAILBOX, [
self::METADATA_NAME => implode(self::METADATA_SEPARATOR, $metadata), self::METADATA_NAME => self::METADATA_PREFIX.implode(self::METADATA_SEPARATOR, $metadata),
]); ]);
} }
catch (Horde_Imap_Client_Exception $e) { catch (Horde_Imap_Client_Exception $e) {