diff --git a/modules/Settings/MailConverter/handlers/MailBox.php b/modules/Settings/MailConverter/handlers/MailBox.php index 178df8828f8598ec67b6dc055afed23729d88409..d02a8e9ec7582a640c4e861ea8916ed8a84005bc 100644 --- a/modules/Settings/MailConverter/handlers/MailBox.php +++ b/modules/Settings/MailConverter/handlers/MailBox.php @@ -92,8 +92,8 @@ class Vtiger_MailBox { } if(!$imap) { - $connectString = '{'. "$mailboxsettings[server]:$mailboxsettings[port]/$mailboxsettings[protocol]/$mailboxsettings[ssltype]/$mailboxsettings[sslmethod]" .$mailboxsettings[readonly] ."}"; - $connectStringShort = '{'. "$mailboxsettings[server]/$mailboxsettings[protocol]:$mailboxsettings[port]" .$mailboxsettings[readonly] ."}"; + $connectString = '{'. $mailboxsettings['server'].':'.$mailboxsettings['port'].'/'.$mailboxsettings['protocol'].'/'.$mailboxsettings['ssltype'].'/'.$mailboxsettings['sslmethod'] .$mailboxsettings['readonly'] ."}"; + $connectStringShort = '{'. $mailboxsettings['server'].'/'.$mailboxsettings['protocol'].':'.$mailboxsettings['port'] .$mailboxsettings['readonly'] ."}"; $this->log("Trying to connect using $connectString$folder", true); if(!$imap = @imap_open("$connectString$folder", $mailboxsettings["username"], $mailboxsettings["password"])) { diff --git a/vtlib/Vtiger/Filter.php b/vtlib/Vtiger/Filter.php index ee97c0a17e5c864744e56c3d329496d10ffd93c3..fb58cabaab775eb4e2d4b0f6f3203bbc14d4fda1 100644 --- a/vtlib/Vtiger/Filter.php +++ b/vtlib/Vtiger/Filter.php @@ -49,7 +49,7 @@ class Vtiger_Filter { function initialize($valuemap, $moduleInstance=false) { $this->id = $valuemap['cvid']; $this->name= $valuemap['viewname']; - $this->module=$moduleInstance? $moduleInstance: Vtiger_Module::getInstance($valuemap[tabid]); + $this->module=$moduleInstance? $moduleInstance: Vtiger_Module::getInstance($valuemap['tabid']); } /** diff --git a/vtlib/Vtiger/Mailer.php b/vtlib/Vtiger/Mailer.php index 1ce65258497108be0b1215bc6c76febde1137126..44eba735574a0cd7d86977878878dc3a7d245039 100644 --- a/vtlib/Vtiger/Mailer.php +++ b/vtlib/Vtiger/Mailer.php @@ -261,10 +261,10 @@ class Vtiger_Mailer extends PHPMailer { $emails = $adb->pquery('SELECT * FROM vtiger_mailer_queueinfo WHERE id=?', Array($queueid)); for($eidx = 0; $eidx < $adb->num_rows($emails); ++$eidx) { $email_record = $adb->fetch_array($emails, $eidx); - if($email_record[type] == 'TO') $mailer->AddAddress($email_record[email], $email_record[name]); - else if($email_record[type] == 'CC')$mailer->AddCC($email_record[email], $email_record[name]); - else if($email_record[type] == 'BCC')$mailer->AddBCC($email_record[email], $email_record[name]); - else if($email_record[type] == 'RPLYTO')$mailer->AddReplyTo($email_record[email], $email_record[name]); + if($email_record['type'] == 'TO') $mailer->AddAddress($email_record['email'], $email_record['name']); + else if($email_record['type'] == 'CC')$mailer->AddCC($email_record['email'], $email_record['name']); + else if($email_record['type'] == 'BCC')$mailer->AddBCC($email_record['email'], $email_record['name']); + else if($email_record['type'] == 'RPLYTO')$mailer->AddReplyTo($email_record['email'], $email_record['name']); } $attachments = $adb->pquery('SELECT * FROM vtiger_mailer_queueattachments WHERE id=?', Array($queueid));