diff --git a/webui/config.php b/webui/config.php index 2302b86..da56b51 100644 --- a/webui/config.php +++ b/webui/config.php @@ -101,6 +101,7 @@ // enable authentication against an imap server (disabled by default) $config['ENABLE_IMAP_AUTH'] = 0; +$config['RESTORE_OVER_IMAP'] = 0; $config['IMAP_HOST'] = 'mail.yourdomain.com'; $config['IMAP_PORT'] = 993; $config['IMAP_SSL'] = true; diff --git a/webui/controller/message/bulkrestore.php b/webui/controller/message/bulkrestore.php index 8301e51..6d84bb2 100644 --- a/webui/controller/message/bulkrestore.php +++ b/webui/controller/message/bulkrestore.php @@ -46,7 +46,7 @@ $this->data['restored'] = 0; - if(ENABLE_IMAP_AUTH == 1) { + if(RESTORE_OVER_IMAP == 1) { require_once 'Zend/Mail/Protocol/Imap.php'; require_once 'Zend/Mail/Storage/Imap.php'; @@ -82,7 +82,7 @@ $msg = $this->model_search_message->get_raw_message($piler_id); $this->model_search_message->remove_journal($msg); - if(ENABLE_IMAP_AUTH == 1) { + if(RESTORE_OVER_IMAP == 1) { if($imap_ok) { $x = $this->imap->append('INBOX', $msg); } @@ -107,7 +107,7 @@ $this->model_search_message->disconnect_from_pilergetd(); - if(ENABLE_IMAP_AUTH == 1) { $this->model_mail_mail->disconnect_imap(); } + if(RESTORE_OVER_IMAP == 1) { $this->model_mail_mail->disconnect_imap(); } $this->render(); diff --git a/webui/controller/message/restore.php b/webui/controller/message/restore.php index 753660a..e70b104 100644 --- a/webui/controller/message/restore.php +++ b/webui/controller/message/restore.php @@ -25,7 +25,7 @@ $rcpt = array(); - if(ENABLE_IMAP_AUTH == 1) { + if(RESTORE_OVER_IMAP == 1) { require_once 'Zend/Mail/Protocol/Imap.php'; require_once 'Zend/Mail/Storage/Imap.php'; } @@ -71,7 +71,7 @@ $this->model_search_message->remove_journal($msg); - if(ENABLE_IMAP_AUTH == 1) { + if(RESTORE_OVER_IMAP == 1) { if($this->model_mail_mail->connect_imap()) { $x = $this->imap->append('INBOX', $msg); $this->model_mail_mail->disconnect_imap();