Alex/freescout
1
0
Fork 0
mirror of https://github.com/freescout-helpdesk/freescout.git synced 2024-11-25 03:43:33 +01:00
Code Issues Releases Wiki Activity

Removing INBOX as default IMAP folder

Browse Source
This commit is contained in:
Rohit Singhal 2020-03-09 08:07:12 +05:30
parent 180380339d
commit a51189e6f6
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Console/Commands/FetchEmails.php
View File

@ -107,14 +107,7 @@ class FetchEmails extends Command
// Connect to the Server
$client->connect();
// Get INBOX folder
$folders = [];
$folder = $client->getFolder('INBOX');
if (!$folder) {
throw new \Exception('Could not get mailbox folder: INBOX', 1);
}
$folders[] = $folder;
// Fetch emails from custom IMAP folders.
if ($mailbox->in_protocol == Mailbox::IN_PROTOCOL_IMAP) {

8
app/Http/Controllers/MailboxesController.php
View File

@ -255,7 +255,7 @@ class MailboxesController extends Controller
// Sometimes background job continues to use old connection settings.
\Helper::queueWorkRestart();
\Session::flash('flash_success_floating', __('Connection settings saved!'));
return redirect()->route('mailboxes.connection', ['id' => $id]);
@ -325,9 +325,7 @@ class MailboxesController extends Controller
// Save all custom folders except INBOX.
$in_imap_folders = [];
foreach ($request->in_imap_folders as $imap_folder) {
if (mb_strtolower($imap_folder) != 'inbox') {
$in_imap_folders[] = $imap_folder;
}
$in_imap_folders[] = $imap_folder;
}
$mailbox->setInImapFolders($in_imap_folders);
@ -537,7 +535,7 @@ class MailboxesController extends Controller
$response['msg'] = __(':host is not available on :port port. Make sure that :host address is correct and that outgoing port :port on YOUR server is open.', ['host' => '<strong>'.$mailbox->in_server.'</strong>', 'port' => '<strong>'.$mailbox->in_port.'</strong>']);
}
}
if (!$response['msg']) {
$test_result = false;

3
resources/views/mailboxes/connection_incoming.blade.php
View File

@ -126,7 +126,6 @@
<div class="col-sm-6 flexy">
<select id="in_imap_folders" class="form-control input-sized" name="in_imap_folders[]" multiple>
<option value="INBOX" selected="selected">INBOX</option>
@foreach ($mailbox->getInImapFolders() as $imap_folder)
<option value="{{ $imap_folder }}" selected="selected">{{ $imap_folder }}</option>
@endforeach
@ -180,4 +179,4 @@
@parent
mailboxConnectionInit('{{ App\Mailbox::OUT_METHOD_SMTP }}');
mailboxConnectionIncomingInit();
@endsection
@endsection