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

remove checks for not longer used PEAR Mail_Mime and Mail_mimeDecode classes

Browse Source
This commit is contained in:
Ralf Becker 2014-12-15 08:26:24 +00:00
parent ef90797b7e
commit 6b2c47a98e
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/inc/class.mail_activesync.inc.php
View File

@ -429,12 +429,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
debugLog("IMAP-SendMail: " . (isset($rfc822) ? $rfc822 : ""). "task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : ""));
if ($this->debugLevel>0) debugLog("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
// if we cannot decode the mail in question, fail
if (class_exists('Mail_mimeDecode',false)==false && (@include_once 'Mail/mimeDecode.php') === false)
{
debugLog("IMAP-SendMail: Could not find Mail_mimeDecode.");
return false;
}
// initialize our mail_bo
if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
$activeMailProfiles = $this->mail->getAccountIdentities(self::$profileID);

7
mail/setup/setup.inc.php
View File

@ -61,13 +61,6 @@ $setup_info['mail']['check_install'] = array(
'func' => 'pear_check',
'version' => '1.6.0', // otherwise install of Mail_Mime fails!
),
'Mail_Mime' => array(
'func' => 'pear_check',
'version' => '1.4.1',
),
'Mail_mimeDecode' => array(
'func' => 'pear_check',
),
'magic_quotes_gpc' => array(
'func' => 'php_ini_check',
'value' => 0,