YakumoLabs/user_external
4
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #83 from sshambar/master

Browse Source 
Fix Issue #56: Undefined Indices in Logs
This commit is contained in:
violoncello.ch
2019-06-27 12:19:28 +02:00
committed by GitHub
parent b196e0198a 386ed12d2f
commit 138973d588
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/imap.php
View File

@@ -86,9 +86,8 @@ class OC_User_IMAP extends \OCA\user_external\Base {
$params = ["port"=>$this->port, "timeout"=>10];
if ($this->sslmode !== null){
$params["ssl_mode"] = $this->sslmode;
}
$params["ssl_mode"] = $this->sslmode ? $this->sslmode : null;
$params["force_caps"] = false;
$canconnect = $rcube->connect(
$this->mailbox,
$username,

24
lib/imap/imap_rcube.changes2upstream Normal file
View File

@@ -0,0 +1,24 @@
commit 97dc6583c41605beda7eced3ba05fc578cfd6111
Author: Scott Shambarger <devel@shambarger.net>
Date: Wed May 29 20:07:18 2019 -0700
Fix Issue #56: Undefined Indices in Logs
Add ssl_mode and force_caps to connection params, and correctly handle
AUTHENTICATE PLAIN in putLineC to reduce warnings in logs.
Signed-off-by: Scott Shambarger <devel@shambarger.net>
diff --git a/lib/imap/imap_rcube.php b/lib/imap/imap_rcube.php
index f5b5b79..ceec1e5 100644
--- a/lib/imap/imap_rcube.php
+++ b/lib/imap/imap_rcube.php
@@ -146,7 +146,7 @@ class imap_rcube
$res = 0;
if ($parts = preg_split('/(\{[0-9]+\}\r\n)/m', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) {
for ($i=0, $cnt=count($parts); $i<$cnt; $i++) {
- if (preg_match('/^\{([0-9]+)\}\r\n$/', $parts[$i+1], $matches)) {
+ if (isset($parts[$i+1]) && preg_match('/^\{([0-9]+)\}\r\n$/', $parts[$i+1], $matches)) {
// LITERAL+ support
if ($this->prefs['literal+']) {
$parts[$i+1] = sprintf("{%d+}\r\n", $matches[1]);

2
lib/imap/imap_rcube.php
View File

@@ -146,7 +146,7 @@ class imap_rcube
$res = 0;
if ($parts = preg_split('/(\{[0-9]+\}\r\n)/m', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) {
for ($i=0, $cnt=count($parts); $i<$cnt; $i++) {
if (preg_match('/^\{([0-9]+)\}\r\n$/', $parts[$i+1], $matches)) {
if (isset($parts[$i+1]) && preg_match('/^\{([0-9]+)\}\r\n$/', $parts[$i+1], $matches)) {
// LITERAL+ support
if ($this->prefs['literal+']) {
$parts[$i+1] = sprintf("{%d+}\r\n", $matches[1]);