lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix norsh

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-21 20:07:22 +01:00
parent 432a37522b
commit c9b79c8aa1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/emailcollector_card.php
View File

@ -435,6 +435,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
{ {
print $e->getMessage(); print $e->getMessage();
} }
$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
} }
else else
{ {

8
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -667,16 +667,20 @@ class EmailCollector extends CommonObject
/** /**
* Return the connectstring to use with IMAP connection function * Return the connectstring to use with IMAP connection function
* *
* @param int $norsh Add /norsh to connectstring
* @return string * @return string
*/ */
public function getConnectStringIMAP() public function getConnectStringIMAP($ssl = 1, $norsh = 0)
{ {
global $conf;
// Connect to IMAP // Connect to IMAP
$flags = '/service=imap'; // IMAP $flags = '/service=imap'; // IMAP
$flags .= '/ssl'; // '/tls' if ($ssl) $flags .= '/ssl'; // '/tls'
$flags .= '/novalidate-cert'; $flags .= '/novalidate-cert';
//$flags.='/readonly'; //$flags.='/readonly';
//$flags.='/debug'; //$flags.='/debug';
if ($norsh || ! empty($conf->global->IMPA_FORCE_NORSH)) $flags .= '/norsh';
$connectstringserver = '{'.$this->host.':993'.$flags.'}'; $connectstringserver = '{'.$this->host.':993'.$flags.'}';