jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix storing mail settings

Browse source
This commit is contained in:
Michael 2022-03-05 13:08:09 +00:00
parent e351122cc5
commit 421dd028ce
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/settings.php
View file

@ -108,7 +108,7 @@ function settings_post(App $a)
'port' => $mail_port,
'ssltype' => $mail_ssl,
'user' => $mail_user,
`action` => $mail_action,
'action' => $mail_action,
'movetofolder' => $mail_movetofolder,
'mailbox' => 'INBOX',
'reply_to' => $mail_replyto,

29
src/Protocol/Email.php
View file

@ -27,6 +27,7 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Model\Item;
use Friendica\Util\Strings;
use \IMAP\Connection;
/**
* Email class
@ -37,7 +38,7 @@ class Email
* @param string $mailbox The mailbox name
* @param string $username The username
* @param string $password The password
* @return resource
* @return Connection
* @throws \Exception
*/
public static function connect($mailbox, $username, $password)
@ -50,7 +51,7 @@ class Email
$errors = imap_errors();
if (!empty($errors)) {
Logger::notice('IMAP Errors occured', ['errora' => $errors]);
Logger::notice('IMAP Errors occured', ['errors' => $errors]);
}
$alerts = imap_alerts();
@ -62,8 +63,8 @@ class Email
}
/**
* @param resource $mbox mailbox
* @param string $email_addr email
* @param Connection $mbox mailbox
* @param string $email_addr email
* @return array
* @throws \Exception
*/
@ -112,8 +113,8 @@ class Email
}
/**
* @param resource $mbox mailbox
* @param integer $uid user id
* @param Connection $mbox mailbox
* @param integer $uid user id
* @return mixed
*/
public static function messageMeta($mbox, $uid)
@ -123,9 +124,9 @@ class Email
}
/**
* @param resource $mbox mailbox
* @param integer $uid user id
* @param string $reply reply
* @param Connection $mbox mailbox
* @param integer $uid user id
* @param string $reply reply
* @return array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
@ -210,11 +211,11 @@ class Email
/**
* fetch the specified message part number with the specified subtype
*
* @param resource $mbox mailbox
* @param integer $uid user id
* @param object $p parts
* @param integer $partno part number
* @param string $subtype sub type
* @param Connection $mbox mailbox
* @param integer $uid user id
* @param object $p parts
* @param integer $partno part number
* @param string $subtype sub type
* @return string
*/
private static function messageGetPart($mbox, $uid, $p, $partno, $subtype)