Merge branch 'master' of github.com:freescout-helpdesk/freescout into dist

Fix Spanish translation

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.json]
+insert_final_newline = false

.env.example

@@ -9,23 +9,39 @@
 # Application URL
 APP_URL=https://example.com
 
-# Use HTTP protocol and redirect to HTTPS
-#APP_FORCE_HTTPS=true
+# If you are using HTTPS, feel free to uncomment this line to improve security
+#SESSION_SECURE_COOKIE=true
+
+# Enter your proxy address here if freescout.net is not available from your server
+# (access to freescout.net is required to obtain official modules)
+#APP_PROXY=
+
+# Custom headers to add to all outgoing emails.
+#APP_CUSTOM_MAIL_HEADERS="IsTransactional:True;X-Custom-Header:value"
+
+# Uncomment if you have many folders and you are experiencing performance issues
+#APP_UPDATE_FOLDER_COUNTERS_IN_BACKGROUND=true
 
 # Timezones: https://github.com/freescout-helpdesk/freescout/wiki/PHP-Timezones
 # Comment it to use default timezone from php.ini
 #APP_TIMEZONE=Europe/London
 
+# Comma separated list of trusted proxies for proper IP detection in FreeScout.
+# To trust all proxies that connect to your server use single asterisk: *
+# To trust ALL proxies, including those that are in a chain of forwarding use double asterisk: **
+#APP_TRUSTED_PROXIES=192.168.1.1,192.168.1.2,192.168.1.3
+
 DB_CONNECTION=mysql
 DB_HOST=localhost
 DB_PORT=3306
-DB_DATABASE=freescout
-DB_USERNAME=freescout
-DB_PASSWORD=XXX
+DB_DATABASE=
+DB_USERNAME=
+# Maximum password length is 50 characters
+DB_PASSWORD=
 
 # Run the following console command to generate the key: php artisan key:generate
 # Otherwise application will show the following error: "Whoops, looks like something went wrong"
 APP_KEY=
 
 # Uncomment to see errors in your browser, don't forget to comment it back when debugging finished
-#APP_DEBUG=true
+#APP_DEBUG=true

.github/ISSUE_TEMPLATE/general_help_request.md

@@ -0,0 +1,25 @@
+---
+name: General Help Request
+about: Create a general help request
+
+---
+<!--
+* If you have some error the first thing you should do is to check "Manage » Logs » App Logs"! If there are any errors there - make sure to provide them in the issue.
+* Have you read FAQ? https://github.com/freescout-helpdesk/freescout/wiki/FAQ
+* If you have "Whoops something went wrong" error see: https://github.com/freescout-helpdesk/freescout/wiki/Installation-Guide#11-troubleshooting
+* Before creating an issue try to disable all non-official modules and remove all custom code from your FreeScout and see if the issue still persists.
+* Feature requests for modules should be posted here: https://freescout.net/request-feature/
+* Docker questions should go here: https://github.com/tiredofit/docker-freescout/issues
+* Create separate issues for different topics - no need to mix all your problems into one issue.
+* Questions on issues with payments for modules should be sent by email: https://freescout.net/contact-us/
+* Don't forget that you are not the project manager. Try to be humble, polite, friendly and positive. Otherwise your account may be banned (and it can't be undone).
+* Mentioning how much you've spent on modules is also the way to be banned.
+
+Still here? Well clean this out and go ahead :)
+-->
+
+PHP version: 
+FreeScout version: 
+Database: MySQL / PostgreSQL
+Are you using CloudFlare: Yes / No
+Are you using non-official modules: Yes / No

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,3 @@
+Keep in mind that pull requests should be sent to the `master` branch! See https://github.com/freescout-helpdesk/freescout/wiki/Development-Guide#github-workflow
+
+Now you can delete this text and type the description of your pull request...

.github/workflows/lint-php.yml

@@ -0,0 +1,20 @@
+name: PHP Code Sniffer
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Lint PHP
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          tools: phpcs
+
+      - name: Run check
+        run: phpcs

.github/workflows/test-pgsql.yml

@@ -0,0 +1,59 @@
+name: Test App (PostgreSQL)
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Test App (PostgreSQL)
+    runs-on: ubuntu-latest
+
+    env:
+      DB_CONNECTION: testing_pgsql
+
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: freescout-test
+          POSTGRES_PASSWORD: freescout-test
+          POSTGRES_DB: freescout-test
+        ports:
+          - 5432:5432
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    strategy:
+      matrix:
+        php: ['7.3', '7.4', '8.0', '8.1', '8.2']
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: pgsql, mbstring, xml, imap, zip, gd, curl, intl, json
+
+      - name: Install composer dependencies
+        run: composer install --ignore-platform-reqs --no-interaction
+
+      - name: Migrate and seed the database
+        run: |
+          php${{ matrix.php }} artisan migrate --force -n --database=testing_pgsql
+          php${{ matrix.php }} artisan db:seed --force -n --database=testing_pgsql
+        env:
+          DB_PORT: ${{ job.services.postgres.ports[5432] }}
+
+      - name: Run PHP tests
+        run: php${{ matrix.php }} ./vendor/bin/phpunit
+        env:
+          DB_PORT: ${{ job.services.postgres.ports[5432] }}

.github/workflows/test.yml

@@ -0,0 +1,45 @@
+name: Test App (MySQL)
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Test App (MySQL)
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: ['7.3', '7.4', '8.0', '8.1', '8.2']
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mysql, mbstring, xml, imap, zip, gd, curl, intl, json
+
+      - name: Start MySQL
+        run: |
+          sudo systemctl start mysql
+
+      - name: Setup database
+        run: |
+          mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS `freescout-test`;'
+          mysql -uroot -proot -e "CREATE USER 'freescout-test'@'localhost' IDENTIFIED WITH mysql_native_password BY 'freescout-test';"
+          mysql -uroot -proot -e "GRANT ALL ON \`freescout-test\`.* TO 'freescout-test'@'localhost';"
+          mysql -uroot -proot -e 'FLUSH PRIVILEGES;'
+
+      - name: Install composer dependencies
+        run: composer install --ignore-platform-reqs --no-interaction
+
+      - name: Migrate and seed the database
+        run: |
+          php${{ matrix.php }} artisan migrate --force -n --database=testing
+          php${{ matrix.php }} artisan db:seed --force -n --database=testing
+
+      - name: Run PHP tests
+        run: php${{ matrix.php }} ./vendor/bin/phpunit

.gitignore

@@ -14,7 +14,7 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .env
-
+app/Console/Commands/Test*
 /bootstrap/compiled.php
 composer.phar
 #composer.lock
@@ -27,6 +27,10 @@ Thumbs.db
 /Modules
 /Modules/**/.git
 /public/modules
+/public/docs
 /storage/.ignore_locales
 /storage/.installed
-/tools
+/tools
+.well-known
+/resources/lang/module.*
+.phpunit.result.cache

.htaccess

@@ -1,4 +1,10 @@
 # On some hostings it is impossible to change web root directory
 # so we rewrite all web requests into /public folder
-RewriteEngine on
-RewriteRule (.*) /public/$1 [L]
+<IfModule mod_rewrite.c>
+	RewriteEngine on
+	# On some hostings it does not work as "public/$1", but works as "/public/$1".
+	# But we can't write it as "/public/$1" because in this case it does not work
+	# when application is installed in subdirectory.
+	RewriteCond %{REQUEST_URI} !/\.well\-known/?.*
+	RewriteRule (.*) public/$1 [L]
+</IfModule>

.travis.yml

@@ -3,10 +3,13 @@ language: php
 php:
   - 7.0
   - 7.2
+  - 7.4
+  - 8.0
 
 before_script:
   - cp .env.travis .env
   - mysql -e 'create database homestead_test;'
 
-script:
-  - vendor/bin/phpunit
+# phpunit testing is disabled as dist vendor is cleared by removing unneeded files
+#script:
+#  - vendor/bin/phpunit

LICENSE

@@ -522,7 +522,7 @@ contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
 
   Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
+any implied license or other defences to infringement that may
 otherwise be available to you under applicable patent law.
 
   12. No Surrender of Others' Freedom.

README.md

@@ -2,73 +2,123 @@
 
 <div align="center">
 
-<img src="https://raw.githubusercontent.com/freescout-helpdesk/freescout/master/public/img/logo-300.png" width="180" height="180" />
+<img src="https://raw.githubusercontent.com/freescout-help-desk/freescout/master/public/img/logo-300.png" width="180" height="180" />
 <br/><br/>
 
-[![PHP version](https://freescout-helpdesk.github.io/img/badges/PHP-7.0%2B-blue.svg)](https://github.com/freescout-helpdesk/freescout#requirements) [![Laravel version](https://freescout-helpdesk.github.io/img/badges/Laravel-5.5-blue.svg)](https://github.com/freescout-helpdesk/freescout#requirements) 
-[![Build Status](https://travis-ci.org/freescout-helpdesk/freescout.svg?branch=dist)](https://freescout-helpdesk.github.io/img/badges/travis.svg) [![Join the chat at https://gitter.im/freescout-helpdesk/Lobby](https://badges.gitter.im/freescout-helpdesk/Lobby.svg)](https://gitter.im/freescout-helpdesk/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![HitCount](http://hits.dwyl.io/freescout-helpdesk/freescout.svg)](http://hits.dwyl.io/freescout-helpdesk/freescout)
+[![PHP version](https://freescout-helpdesk.github.io/img/badges/PHP-7.1%2B-blue.svg)](https://github.com/freescout-help-desk/freescout#requirements) [![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Ffreescout-helpdesk%2Ffreescout&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://hits.seeyoufarm.com)
 
 </div>
 
-**FreeScout** is the super lightweight free open source help desk and shared inbox written in PHP7 (Laravel 5.5 framework) – self hosted clone of HelpScout. Now you can enjoy [free Zendesk & Help Scout](https://freescout.net) without giving up privacy or locking yourself into a service you don't control.
+**FreeScout** is the super lightweight and powerful free open source help desk and shared inbox built with PHP (Laravel framework). Now you can enjoy free Zendesk & Help Scout without giving up privacy or locking yourself into a service you don't control. FreeScout has been developed from scratch and is not using any copyrighted Help Scout or Zendesk materials.
 
-FreeScout has been developed from scratch and is not using any copyrighted Help Scout materials to comply with GitHub's [DMCA Policy](https://help.github.com/articles/dmca-takedown-policy/) (trademark, logos, icons, CSS, JS, HTML files are copyrighted; idea, look and feel cannot be copyrighted).
+If you want to support the project feel free to **star this repository**. It helps to increase the visibility of the project and let people know that it is valuable. Thanks for your support!
 
 ![FreeScout](https://freescout-helpdesk.github.io/img/screenshots/screenshot.png)
 
 ## Table of Contents
+   * [Demo](#demo)
    * [Features](#features)
+   * [Mobile Apps](#mobile-apps)
    * [Requirements](#requirements)
-   * [News & Updates](#news--updates)
    * [Installation](#installation)
+   * [Cloud Hosted](#cloud-hosted)
    * [Modules](#modules)
+   * [Tools & Integrations](#tools--integrations)
+   * [News & Updates](#news--updates)
    * [Contributing](#contributing)
    * [Screenshots](#screenshots)
 
+## Demo
+
+**[Live Demo](https://demo.freescout.net)**
+
 ## Features
 
-![FreeScout](https://raw.githubusercontent.com/freescout-helpdesk/freescout/master/public/img/banner.png)
-
+  * No limitations on the number of users, tickets, mailboxes, etc.
   * 100% Mobile-friendly.
-  * Multilingual.
+  * Multilingual: English, Chinese, Croatian, Czech, Danish, Dutch, Finnish, French, German, Italian, Japanese, Kazakh, Korean, Norwegian, Persian, Polish, Portuguese, Russian, Spanish, Slovak, Swedish, Turkish.
+  * Seamless email integration.
+  * Supports modern Microsoft Exchange authentication.
+  * Fully supports screen readers (for visually impaired).
+  * Built with strong focus on [security](https://freescout.net/security).
+  * Web installer & updater.
   * Starred conversations.
+  * Forwarding conversations.
+  * Merging conversations.
+  * Moving conversations between mailboxes.
+  * Phone conversations.
+  * Sending new conversations to multiple recipients at once.
+  * Collision detection – notice is shown when two agents open the same conversation.
   * Push notifications.
+  * Following a conversation.
   * Auto reply.
-  * Notes.
+  * Internal notes.
+  * Automatic refreshing of the conversations list without the need to reload the page.
   * Pasting screenshots from the clipboard into the reply area.
-  * Dragging images into the reply area.
+  * Configuring notifications on a per user basis.
   * Open tracking.
+  * Editing threads.
   * Search.
-  * Edit/hide threads.
+  * And more…
 
-Need anything else? Suggest features [here](https://feedback.userreport.com/25a3cb5f-e4bd-4470-b6f3-79fcfaa8e90f/#ideas/popular)
+Need anything else? Suggest features [here](https://freescout.net/request-feature/).
+
+## Mobile Apps
+
+Mobile apps support the same functionality and modules as the web version of your FreeScout installation. Both support agents and administrators can use mobile apps.
+
+<a href="https://freescout.net/android-app/" target="_blank" rel="nofollow"><img alt="Android App" src="https://freescout-helpdesk.github.io/img/apps/android.png" width="200px" /></a> <a href="https://freescout.net/ios-app/" target="_blank" rel="nofollow"><img alt="iOS App" src="https://freescout-helpdesk.github.io/img/apps/ios.png?v=1" width="200px" /></a>
 
 ## Requirements
 
-FreeScout is a pure PHP/MySQL application, so it can be easily deployed even on a shared hosting.
+FreeScout is a pure PHP/MySQL application, so it can be easily deployed even on a [shared hosting](https://2ly.link/20rhd).
 
   * Nginx / Apache / IIS
-  * PHP 7.0+
-  * MySQL/MariaDB 5.0+
+  * PHP 7.1 - 8.x
+  * MySQL 5.0+ / MariaDB 5.0+ / PostgreSQL
 
-## News & Updates
-
-If you would like to be notified about new releases, news and updates you can subscribe [here](https://feedburner.google.com/fb/a/mailverify?uri=freescout)
+There are no minimum system requirements (CPU / RAM) – FreeScout will run on any system.
 
 ## Installation
 
-[Installation Guide](https://github.com/freescout-helpdesk/freescout/wiki/Installation-Guide)
+[Installation Guide](https://github.com/freescout-help-desk/freescout/wiki/Installation-Guide)
+
+Images & one-click installs:
+
+* [Docker Image](http://freescout.net/docker/)
+* [Softaculous](http://www.softaculous.com/apps/customersupport/FreeScout) (cPanel, Plesk, ISPmanager, H-Sphere, DirectAdmin, InterWorx)
+* [Fantastico](http://ff3.netenberg.com/visitors/scripts/freescout/view) (cPanel, DirectAdmin, ISP Manager, ISP Config)
+* [Cloudron](https://cloudron.io/store/net.freescout.cloudronapp.html)
+* [Ubuntu](https://github.com/freescout-help-desk/freescout/wiki/Installation-Guide#interactive-installation-bash-script-ubuntu) (bash script)
+
+## Cloud Hosted
+
+[Cloud Hosted FreeScout](https://freescout.net/cloud-hosted/)
 
 ## Modules
 
-FreeScout [Modules](https://github.com/freescout-helpdesk/freescout/wiki/FreeScout-Modules)
+* [Official Modules](https://freescout.net/modules/)
+* [Community Modules](https://freescout.net/community-modules/)
+
+## Tools & Integrations
+  
+  * [API](https://api-docs.freescout.net/)
+  * [Migrate to FreeScout](http://freescout.net/migrate/) (from any help desk)
+  * [Zapier](https://freescout.net/zapier/)
+  * [Make](https://freescout.net/make-integration/) (Integromat)
+
+## News & Updates
+
+Don't miss news, updates and new modules!
+
+[Email Newsletter](https://freescout.net/subscribe/) | [Facebook](https://freescout.net/facebook/) | [Twitter](https://freescout.net/twitter/) | [YouTube](https://freescout.net/youtube/) | [Telegram](https://freescout.net/telegram/) | [RSS](https://freescout.net/feed/)
 
 ## Contributing
 
-* [Development Guide](https://github.com/freescout-helpdesk/freescout/wiki/Development-Guide)
-* [Todo list](https://github.com/freescout-helpdesk/freescout/projects/1)
-* [Translate](https://github.com/freescout-helpdesk/freescout/wiki/Translate)
-* [Support project by leaving a feedback](https://github.com/freescout-helpdesk/freescout/wiki#support-project)
+* [Support the project by leaving a feedback](https://github.com/freescout-help-desk/freescout/issues/288)
+* [Development Guide](https://github.com/freescout-help-desk/freescout/wiki/Development-Guide)
+* [Todo list](https://github.com/freescout-help-desk/freescout/labels/help%20wanted)
+* [Translate](https://github.com/freescout-help-desk/freescout/wiki/Translate)
 
 ## Screenshots
 

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Email at support@freescout.net

app/ActivityLog.php

@@ -13,6 +13,15 @@ class ActivityLog extends Activity
     const NAME_SYSTEM = 'system';
     const NAME_APP_LOGS = 'app';
 
+    public static $available_logs = [
+        self::NAME_USER,
+        self::NAME_OUT_EMAILS,
+        self::NAME_EMAILS_SENDING,
+        self::NAME_EMAILS_FETCHING,
+        self::NAME_SYSTEM,
+        self::NAME_APP_LOGS,
+    ];
+
     const DESCRIPTION_USER_LOGIN = 'login';
     const DESCRIPTION_USER_LOGOUT = 'logout';
     const DESCRIPTION_USER_REGISTER = 'register';
@@ -55,7 +64,7 @@ class ActivityLog extends Activity
             case self::DESCRIPTION_EMAILS_SENDING_ERROR_ALERT:
                 return __('Error sending alert');
             case self::DESCRIPTION_EMAILS_SENDING_WRONG_EMAIL:
-                return __('Error sending email to the user who replied to notiication from wrong email');
+                return __('Error sending email to the user who replied to notification from wrong email');
             case self::DESCRIPTION_EMAILS_FETCHING_ERROR:
                 return __('Error fetching email');
             case self::DESCRIPTION_SYSTEM_ERROR:
@@ -87,7 +96,7 @@ class ActivityLog extends Activity
             case self::NAME_APP_LOGS:
                 return __('App Logs');
             default:
-                return ucfirst($log_name);
+                return ucwords(str_replace('_', ' ', $log_name));
         }
     }
 
@@ -95,6 +104,32 @@ class ActivityLog extends Activity
     {
         $col = str_replace('_', ' ', $col);
         $col = ucfirst($col);
+
         return $col;
     }
+
+    /**
+     * Get log names.
+     *
+     * @return [type] [description]
+     */
+    public static function getLogNames()
+    {
+        return self::select('log_name')->distinct()->pluck('log_name')->toArray();
+    }
+
+    /**
+     * Get available log names.
+     *
+     * @return [type] [description]
+     */
+    public static function getAvailableLogs($check_existing = true)
+    {
+        $available_logs = self::$available_logs;
+        if ($check_existing) {
+            $available_logs = array_merge($available_logs, self::getLogNames());
+        }
+
+        return array_unique(\Eventy::filter('activity_log.available_logs', self::$available_logs));
+    }
 }

app/Attachment.php

@@ -19,6 +19,10 @@ class Attachment extends Model
 
     const DIRECTORY = 'attachment';
 
+    CONST DISK = 'private';
+
+    CONST MIME_TYPE_MAX_LENGTH = 127;
+
     // https://github.com/Webklex/laravel-imap/blob/master/src/IMAP/Attachment.php
     public static $types = [
         'message'     => self::TYPE_MESSAGE,
@@ -32,13 +36,8 @@ class Attachment extends Model
         'other'       => self::TYPE_OTHER,
     ];
 
-    /**
-     * Files with such extensions are being renamed on upload.
-     */
-    public static $restricted_extensions = [
-        'php.*',
-        'sh',
-        'pl',
+    public static $type_extensions = [
+        self::TYPE_VIDEO => ['flv', 'mp4', 'm3u8', 'ts', '3gp', 'mov', 'avi', 'wmv']
     ];
 
     public $timestamps = false;
@@ -60,30 +59,84 @@ class Attachment extends Model
             return false;
         }
 
-        // Check extension.
-        $extension = strtolower(pathinfo($file_name, PATHINFO_EXTENSION));
-        if (preg_match('/('.implode('|', self::$restricted_extensions).')/', $extension)) {
-            // Add underscore to the extension if file has restricted extension.
-            $file_name = $file_name.'_';
+        // Sanitize mime type.
+        // https://github.com/freescout-helpdesk/freescout/issues/3048
+        $mime_duplicate = strpos($mime_type, "application/vnd.openxmlformats", 1);
+        if ($mime_duplicate) {
+            $mime_type = substr($mime_type, $mime_duplicate);
         }
+        $mime_type = substr($mime_type, 0, self::MIME_TYPE_MAX_LENGTH);
+
+        $orig_extension = pathinfo($file_name, PATHINFO_EXTENSION);
+
+        // Add underscore to the extension if file has restricted extension.
+        $file_name = \Helper::sanitizeUploadedFileName($file_name, $uploaded_file, $content);
 
         // Replace some symbols in file name.
         // Gmail can not load image if it contains spaces.
-        $file_name = str_replace(' ', '-', $file_name);
+        $file_name = preg_replace('/[ #\/]/', '_', $file_name);
+        // Replace soft hyphens.
+        $file_name = str_replace(html_entity_decode('­'), '_', $file_name);
+
+        if (!$file_name) {
+            if (!$orig_extension) {
+                preg_match("/.*\/([^\/]+)$/", $mime_type, $m);
+                if (!empty($m[1])) {
+                    $orig_extension = $m[1];
+                }
+            }
+            $file_name = uniqid();
+            if ($orig_extension) {
+                $file_name .= '.'.$orig_extension;
+            }
+        }
+
+        // https://github.com/freescout-helpdesk/freescout/issues/2385
+        // Fix for webklex/php-imap.
+        if ($file_name == 'undefined' && $mime_type == 'message/rfc822') {
+            $file_name = 'RFC822.eml';
+        }
+
+        // https://github.com/freescout-helpdesk/freescout/issues/1412#issuecomment-1658881493
+        if ($file_name == 'undefined' && $mime_type == 'text/calendar') {
+            $file_name = 'calendar.ics';
+        }
+
+        if (strlen($file_name) > 255) {
+            $without_ext = pathinfo($file_name, PATHINFO_FILENAME);
+            $extension = pathinfo($file_name, PATHINFO_EXTENSION);
+            // 125 because file name may have unicode symbols.
+            $file_name = \Helper::substrUnicode($without_ext, 0, 125-strlen($extension)-1);
+            $file_name .= '.'.$extension;
+        }
 
         if (!$type) {
-            $type = self::detectType($mime_type);
+            $type = self::detectType($mime_type, $orig_extension);
         }
 
         $attachment = new self();
         $attachment->thread_id = $thread_id;
-        $attachment->user_id   = $user_id;
+        $attachment->user_id = $user_id;
         $attachment->file_name = $file_name;
         $attachment->mime_type = $mime_type;
-        $attachment->type      = $type;
-        $attachment->embedded  = $embedded;
+        $attachment->type = $type;
+        $attachment->embedded = $embedded;
         $attachment->save();
 
+        $file_info = self::saveFileToDisk($attachment, $file_name, $content, $uploaded_file);
+
+        $attachment->file_dir = $file_info['file_dir'];
+        $attachment->size = Storage::disk(self::DISK)->size($file_info['file_path']);
+        $attachment->save();
+
+        return $attachment;
+    }
+
+    /**
+     * Save file to the disk and return file_dir.
+     */
+    public static function saveFileToDisk($attachment, $file_name, $content, $uploaded_file)
+    {
         // Save file from content or copy file.
         // We have to keep file name as is, so if file exists we create extra folder.
         // Examples: 1/2/3
@@ -93,26 +146,31 @@ class Attachment extends Model
         do {
             $i++;
             $file_path = self::DIRECTORY.DIRECTORY_SEPARATOR.$file_dir.$i.DIRECTORY_SEPARATOR.$file_name;
-        } while (Storage::exists($file_path));
+        } while (Storage::disk(self::DISK)->exists($file_path));
 
         $file_dir .= $i.DIRECTORY_SEPARATOR;
 
-        if ($uploaded_file) {
-            $uploaded_file->storeAs(self::DIRECTORY.DIRECTORY_SEPARATOR.$file_dir, $file_name);
-        } else {
-            Storage::put($file_path, $content);
+        try {
+            if ($uploaded_file) {
+                $uploaded_file->storeAs(self::DIRECTORY.DIRECTORY_SEPARATOR.$file_dir, $file_name, ['disk' => self::DISK]);
+            } else {
+                Storage::disk(self::DISK)->put($file_path, $content);
+            }
+        } catch (\Exception $e) {
+            \Helper::logException($e, '[Attachment::saveFileToDisk()]');
         }
 
-        $attachment->file_dir = $file_dir;
-        $attachment->size = Storage::size($file_path);
-        $attachment->save();
+        \Helper::sanitizeUploadedFileData($file_path, \Helper::getPrivateStorage(), $content);
 
-        return $attachment;
+        return [
+            'file_dir'  => $file_dir,
+            'file_path' => $file_path,
+        ];
     }
 
     /**
      * Get file path.
-     * Examples: 1/2, 1/3
+     * Examples: 1/2, 1/3.
      *
      * @param int $id
      *
@@ -144,17 +202,23 @@ class Attachment extends Model
 
     /**
      * Detect attachment type by it's mime type.
-     * 
-     * @param  string $mime_type
+     *
+     * @param string $mime_type
+     *
      * @return int
      */
-    public static function detectType($mime_type)
+    public static function detectType($mime_type, $extension = '')
     {
         if (preg_match("/^text\//", $mime_type)) {
             return self::TYPE_TEXT;
         } elseif (preg_match("/^message\//", $mime_type)) {
             return self::TYPE_MESSAGE;
         } elseif (preg_match("/^application\//", $mime_type)) {
+            // This is tricky mime type.
+            // For .mp4 mime type can be application/octet-stream
+            if (!empty($extension) && in_array(strtolower($extension), self::$type_extensions[self::TYPE_VIDEO])) {
+                return self::TYPE_VIDEO;
+            }
             return self::TYPE_APPLICATION;
         } elseif (preg_match("/^audio\//", $mime_type)) {
             return self::TYPE_AUDIO;
@@ -170,7 +234,7 @@ class Attachment extends Model
     }
 
     /**
-     * Conver type name to integer.
+     * Convert type name to integer.
      */
     public static function typeNameToInt($type_name)
     {
@@ -188,7 +252,51 @@ class Attachment extends Model
      */
     public function url()
     {
-        return Storage::url($this->getStorageFilePath());
+        $file_path = $this->getStorageFilePath();
+
+        // URL must contain only forward slashes.
+        $file_path = str_replace(DIRECTORY_SEPARATOR, '/', $file_path);
+
+        $file_url = Storage::url($file_path);
+
+        // Fix percents.
+        // https://github.com/freescout-helpdesk/freescout/issues/3530
+        $file_url = str_replace('%', '%25', $file_url);
+
+        return $file_url.'?id='.$this->id.'&token='.$this->getToken();
+    }
+
+    /**
+     * Get hashed security token for the attachment.
+     */
+    public function getToken()
+    {
+        // \Hash::make() may contain . and / symbols which may cause problems.
+        return md5(config('app.key').$this->id.$this->size);
+    }
+
+    /**
+     * Outputs the current Attachment as download
+     */
+    public function download($view = false)
+    {
+        $headers = [];
+        // #533
+        //return $this->getDisk()->download($this->getStorageFilePath(), \Str::ascii($this->file_name));
+        if ($view) {
+            $headers['Content-Disposition'] = '';
+        }
+        $file_name = $this->file_name;
+
+        if ($file_name == "RFC822"){
+            $file_name = $file_name.'.eml';
+        }
+
+        return $this->getDisk()->download($this->getStorageFilePath(), $file_name, $headers);
+    }
+
+    private function getDisk() {
+        return Storage::disk(self::DISK);
     }
 
     /**
@@ -201,14 +309,32 @@ class Attachment extends Model
         return self::formatBytes($this->size);
     }
 
+    /**
+     * attachment/...
+     */
     public function getStorageFilePath()
     {
         return self::DIRECTORY.DIRECTORY_SEPARATOR.$this->file_dir.$this->file_name;
     }
 
-    public function getLocalFilePath()
+    /**
+     * /var/html/storage/app/attachment/...
+     */
+    public function getLocalFilePath($full = true)
     {
-        return Storage::path(self::DIRECTORY.DIRECTORY_SEPARATOR.$this->file_dir.$this->file_name);
+        if ($full) {
+            return $this->getDisk()->path(self::DIRECTORY.DIRECTORY_SEPARATOR.$this->file_dir.$this->file_name);
+        } else {
+            return DIRECTORY_SEPARATOR.'storage'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.self::DIRECTORY.DIRECTORY_SEPARATOR.$this->file_dir.$this->file_name;
+        }
+    }
+
+    /**
+     * Check if the attachment file actually exists on the disk.
+     */
+    public function fileExists()
+    {
+        return $this->getDisk()->exists(self::DIRECTORY.DIRECTORY_SEPARATOR.$this->file_dir.$this->file_name);
     }
 
     public static function formatBytes($size, $precision = 0)
@@ -227,23 +353,106 @@ class Attachment extends Model
     /**
      * Delete attachments from disk and DB.
      * Embeds are not taken into account.
-     * 
-     * @param  array $attachments 
+     *
+     * @param array $attachments
      */
     public static function deleteByIds($attachment_ids)
     {
         if (!count($attachment_ids)) {
             return;
         }
-        $attachments = Attachment::whereIn('id', $attachment_ids)->get();
+        $attachments = self::whereIn('id', $attachment_ids)->get();
 
+        // Delete from disk
+        self::deleteForever($attachments);
+    }
+
+    /**
+     * Delete attachments by thread IDs.
+     */
+    public static function deleteByThreadIds($thread_ids)
+    {
+        if (!count($thread_ids)) {
+            return;
+        }
+        $attachments = self::whereIn('thread_id', $thread_ids)->get();
+
+        // Delete from disk
+        self::deleteForever($attachments);
+    }
+
+    public static function deleteForever($attachments)
+    {
         // Delete from disk
         foreach ($attachments as $attachment) {
-            echo $attachment->getStorageFilePath().' ';
-            Storage::delete($attachment->getStorageFilePath());
+            $attachment->getDisk()->delete($attachment->getStorageFilePath());
         }
 
         // Delete from DB
-        Attachment::whereIn('id', $attachment_ids)->delete();
+        self::whereIn('id', $attachments->pluck('id')->toArray())->delete();
+    }
+
+    /**
+     * Delete attachments and update Thread & Conversation.
+     */
+    public static function deleteAttachments($attachments)
+    {
+        if (!$attachments instanceof \Illuminate\Support\Collection) { 
+            $attachments = collect($attachments);
+        }
+
+        foreach ($attachments as $attachment) {
+            if ($attachment->thread_id && $attachment->thread
+                && count($attachment->thread->attachments) <= 1
+            ) {
+                $attachment->thread->has_attachments = false;
+                $attachment->thread->save();
+                // Update conversation.
+                $conversation = $attachment->thread->conversation;
+                foreach ($conversation->threads as $thread) {
+                    if ($thread->has_attachments) {
+                        break 2;
+                    }
+                }
+                $conversation->has_attachments = false;
+                $conversation->save();
+            }
+        }
+        Attachment::deleteForever($attachments);
+    }
+
+    /**
+     * Create a copy of the attachment and it's file.
+     */
+    public function duplicate($thread_id = null)
+    {
+        $new_attachment = $this->replicate();
+        
+        $new_attachment->thread_id = $thread_id;
+
+        $new_attachment->save();
+
+        try {
+            $attachment_file = new \Illuminate\Http\UploadedFile(
+                $this->getLocalFilePath(), $this->file_name,
+                null, null, true
+            );
+
+            $file_info = Attachment::saveFileToDisk($new_attachment, $new_attachment->file_name, '', $attachment_file);
+
+            if (!empty($file_info['file_dir'])) {
+                $new_attachment->file_dir = $file_info['file_dir'];
+                $new_attachment->save();
+            }
+        } catch (\Exception $e) {
+            \Helper::logException($e);
+        }
+
+        return $new_attachment;
+    }
+
+    public function getFileContents()
+    {
+        return $this->getDisk()->get($this->getStorageFilePath());
     }
 }

app/Broadcasting/Broadcasters/PolycastBroadcaster.php

@@ -3,16 +3,13 @@
  * Created by PhpStorm.
  * User: leemason
  * Date: 31/10/15
- * Time: 00:20
+ * Time: 00:20.
  */
 
 namespace App\Broadcasting\Broadcasters;
 
-
 use Carbon\Carbon;
 use Illuminate\Broadcasting\Broadcasters\Broadcaster;
-use Illuminate\Foundation\Application;
-use Illuminate\Database\DatabaseManager;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
@@ -43,21 +40,22 @@ class PolycastBroadcaster extends Broadcaster
 
         // insert the new event
         \DB::table('polycast_events')->insert([
-            'channels' => json_encode($channels),
-            'event' => $event,
-            'payload' => json_encode($payload),
-            'created_at' => Carbon::now()->toDateTimeString()
+            'channels'   => json_encode($channels),
+            'event'      => $event,
+            'payload'    => json_encode($payload),
+            'created_at' => Carbon::now()->toDateTimeString(),
         ]);
     }
 
     /**
      * Authenticate the incoming request for a given channel.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return mixed
      */
-    public function auth($request) {
-
+    public function auth($request)
+    {
         // For connect request
         if (empty($request->channels)) {
             return true;
@@ -67,19 +65,20 @@ class PolycastBroadcaster extends Broadcaster
         foreach ($request->channels as $channel_name => $channel_info) {
             // Copied from Illuminate\Broadcasting\Broadcasters\PusherBroadcaster
             if (Str::startsWith($channel_name, ['private-', 'presence-']) &&
-                ! $request->user()) {
-                echo 1;
-                exit();
-                throw new AccessDeniedHttpException;
+                !$request->user()) {
+
+                throw new AccessDeniedHttpException();
             }
 
-            $channelName = Str::startsWith($channel_name, 'private-')
-                                ? Str::replaceFirst('private-', '', $channel_name)
-                                : Str::replaceFirst('presence-', '', $channel_name);
-            // This throws an exception
-            parent::verifyUserCanAccessChannel(
-                $request, $channelName
-            );
+            if (Str::startsWith($channel_name, ['private-', 'presence-'])) {
+                $channelName = Str::startsWith($channel_name, 'private-')
+                                    ? Str::replaceFirst('private-', '', $channel_name)
+                                    : Str::replaceFirst('presence-', '', $channel_name);
+                // This throws an exception if needed.
+                parent::verifyUserCanAccessChannel(
+                    $request, $channelName
+                );
+            }
         }
 
         return true;
@@ -88,11 +87,13 @@ class PolycastBroadcaster extends Broadcaster
     /**
      * Return the valid authentication response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  mixed  $result
+     * @param \Illuminate\Http\Request $request
+     * @param mixed                    $result
+     *
      * @return mixed
      */
-    public function validAuthenticationResponse($request, $result) {
+    public function validAuthenticationResponse($request, $result)
+    {
         // By some reason this is never called
         return false;
 
@@ -107,20 +108,20 @@ class PolycastBroadcaster extends Broadcaster
         // ]]);
     }
 
-     public function isDeferred()
-     {
+    public function isDeferred()
+    {
         return false;
-     }
+    }
 
-     /**
-      * Created as there was an error:
-      * "Call to undefined method App\Broadcasting\Broadcasters\PolycastBroadcaster::channel()"
-      *
-      * It is called from routes/channels.php
-      */
+    /*
+     * Created as there was an error:
+     * "Call to undefined method App\Broadcasting\Broadcasters\PolycastBroadcaster::channel()"
+     *
+     * It is called from routes/channels.php
+     */
      // public function channel($channel, callable $callback)
      // {
      //    return true;
      //    //return (int) $user->id === (int) $id;
      // }
-}
+}

app/Channels/RealtimeBroadcastChannel.php

@@ -3,19 +3,17 @@
 namespace App\Channels;
 
 use App\Events\RealtimeBroadcastNotificationCreated;
-use RuntimeException;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Notifications\Channels\BroadcastChannel;
-use Illuminate\Notifications\Messages\BroadcastMessage;
+use Illuminate\Notifications\Notification;
 
 class RealtimeBroadcastChannel extends BroadcastChannel
 {
     /**
      * Send the given notification immediately using non-quable event.
      *
-     * @param  mixed  $notifiable
-     * @param  \Illuminate\Notifications\Notification  $notification
+     * @param mixed                                  $notifiable
+     * @param \Illuminate\Notifications\Notification $notification
+     *
      * @return array|null
      */
     public function send($notifiable, Notification $notification)

app/Console/Commands/CheckConvViewers.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class CheckConvViewers extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:check-conv-viewers';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check if user finished viewing conversation';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        // Check dates in cache.
+        $cache_key = 'conv_view';
+        $cache_data = \Cache::get($cache_key);
+
+        if (empty($cache_data) || !is_array($cache_data)) {
+            return;
+        }
+
+        $now = Carbon::now();
+        $need_update = false;
+        foreach ($cache_data as $conversation_id => $conv_data) {
+            if (empty($conv_data) || !is_array($conv_data)) {
+                continue;
+            }
+            foreach ($conv_data as $user_id => $data) {
+
+                if (!isset($data['t']) || !isset($data['r'])) {
+                    continue;
+                }
+
+                $view_date = Carbon::createFromFormat('Y-m-d H:i:s', $data['t']);
+            
+                if ($view_date && $now->diffInSeconds($view_date) > 25) {
+                    // Remove user from viewers.
+                    unset($cache_data[$conversation_id][$user_id]);
+                    if (empty($cache_data[$conversation_id])) {
+                        unset($cache_data[$conversation_id]);
+                    }
+                    $need_update = true;
+
+                    \Cache::forget('conv_view_'.$user_id.'_'.$conversation_id);
+
+                    // Create event to let other users know that user finished viewing conversation.
+                    $notification_data = [
+                        'conversation_id' => $conversation_id,
+                        'user_id'         => $user_id,
+                    ];
+                    event(new \App\Events\RealtimeConvViewFinish($notification_data));
+
+                    \Eventy::action('conversation.view.finish', $conversation_id, $user_id, $now->diffInSeconds($view_date));
+                }
+            }
+        }
+
+        if ($need_update) {
+            // Update conversation cache data.
+            \Cache::put($cache_key, $cache_data, 20 /*minutes*/);
+        }
+        /*$cache_key = 'conv_view_'.$this->user_id.'_'.$this->conversation_id;
+        $cache_data = \Cache::get($cache_key);
+
+        if (!isset($cache_data['t']) || !isset($cache_data['r'])) {
+            return;
+        }
+
+        $view_date = Carbon::createFromFormat('Y-m-d H:i:s', $cache_data['t']);
+        $now = Carbon::now();
+
+        if ($view_date && $now->diffInSeconds($view_date) > 30) {
+            $cache_key = 'conv_view';
+            if (!empty($cache_data[$this->conversation_id]) && !empty($cache_data[$this->conversation_id][$this->user_id])) {
+                // Remove user from viewers.
+                unset($cache_data[$this->conversation_id][$this->user_id]);
+
+                // Update conversation cache data.
+                \Cache::put($cache_key, $cache_data, 1);
+            }
+
+            // Create event to let other users know that user finished viewing conversation.
+            $notification_data = [
+                'conversation_id' => $conversation->id,
+                'user_id'         => $user->id,
+            ];
+            event(new \App\Events\RealtimeConvViewFinish($notification_data));
+        }*/
+    }
+}

app/Console/Commands/CheckRequirements.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class CheckRequirements extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:check-requirements';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check console version of PHP';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        // PHP extensions.
+        $php_extensions = \Helper::checkRequiredExtensions();
+
+        $this->comment("PHP Version");
+        $this->line(' '.str_pad(phpversion(), 30, '.'). ' '.(version_compare(phpversion(), config('installer.core.minPhpVersion'), '>=') ? '<fg=green>OK</>' : '<fg=red>NOT FOUND</>'), false);
+
+        $this->comment("PHP Extensions");
+        $this->output($php_extensions);
+
+        // Functions.
+        $functions = \Helper::checkRequiredFunctions();
+
+        $this->comment("Functions");
+        $this->output($functions);
+        $this->line('');
+    }
+
+    public function output($items)
+    {
+        foreach ($items as $item => $status) {
+            $this->line(' '.str_pad($item, 30, '.'). ' '.($status ? '<fg=green>OK</>' : '<fg=red>NOT FOUND</>'), false);
+        }
+    }
+}

app/Console/Commands/CleanNotificationsTable.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class CleanNotificationsTable extends Command
+{
+    const PERIOD = '-6 months';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:clean-notifications-table';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete old read records from notifications table.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        \DB::table('notifications')->where('created_at', '<', \Carbon\Carbon::now()->modify(self::PERIOD))
+            ->whereNotNull('read_at')
+            ->delete();
+
+        $this->info('['.date('Y-m-d H:i:s').'] Deleted old read notifications for: '.self::PERIOD);
+    }
+}

app/Console/Commands/CleanSendLog.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class CleanSendLog extends Command
+{
+    const PERIOD = '-6 months';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:clean-send-log';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete old records from send log.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $logs = \App\SendLog::where('created_at', '<', \Carbon\Carbon::now()->modify(self::PERIOD))->delete();
+
+        $this->info('['.date('Y-m-d H:i:s').'] Deleted send logs: '.self::PERIOD);
+    }
+}

app/Console/Commands/CleanTmp.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+// When processing attachments FreeScout may create files in /tmp folder.
+// So it's good to clean this folder periodically.
+class CleanTmp extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:clean-tmp';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Remove from system temp folder FreeScout files older than 1 week to avoid "No space left on device"';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        \Helper::shellExec('find '.\Helper::getTempDir().' -mtime +7 -type f -name '.\Helper::getTempFilePrefix().'* -exec rm -r -f {} \;');
+
+        $this->comment("Done");
+    }
+}

app/Console/Commands/ClearCache.php

@@ -11,7 +11,7 @@ class ClearCache extends Command
      *
      * @var string
      */
-    protected $signature = 'freescout:clear-cache {--doNotCacheConfig}';
+    protected $signature = 'freescout:clear-cache {--doNotCacheConfig} {--doNotGenerateVars}';
 
     /**
      * The console command description.
@@ -44,6 +44,19 @@ class ClearCache extends Command
             $this->call('config:clear');
         } else {
             $this->call('config:cache');
+            // Laravel users `require` function to include config.php
+            // If opcache is being used for few seconds config.php is being cached.
+            if (function_exists('opcache_invalidate')) {
+                opcache_invalidate(app()->getCachedConfigPath());
+            }
+        }
+        // Regenerate vars to get new data from .env
+        if (!$this->option('doNotGenerateVars')) {
+            $this->call('freescout:generate-vars');
+        }
+        // This should not be done during installation.
+        if (\Helper::isInstalled()) {
+            \Helper::queueWorkerRestart();
         }
     }
 }

app/Console/Commands/CreateUser.php

@@ -12,7 +12,7 @@ class CreateUser extends Command
      *
      * @var string
      */
-    protected $signature = 'freescout:create-user';
+    protected $signature = 'freescout:create-user {--role=} {--firstName=} {--lastName=} {--email=} {--password=}';
 
     /**
      * The console command description.
@@ -46,40 +46,57 @@ class CreateUser extends Command
             ).'.model'
         );
         $user = new $class();
-        $fillables = ['role', 'first_name', 'last_name', 'email', 'password'];
-        foreach ($fillables as $key => $fillable) {
-            if ($fillable == 'password') {
-                $user->$fillable = \Hash::make($this->secret(($key + 1).'/'.count($fillables)." User $fillable"));
-            } elseif ($fillable == 'role') {
-                $user->$fillable = $this->ask(($key + 1).'/'.count($fillables)." User $fillable (admin/user)", 'admin');
-                if (!$user->$fillable) {
-                    $user->$fillable = 'admin';
-                }
 
-                while (!in_array($user->$fillable, User::$roles)) {
-                    $this->error('Incorrect role');
-                    $user->$fillable = $this->ask('Please enter valid role');
-                }
-                $user->$fillable = array_flip(User::$roles)[$user->$fillable];
-            } else {
-                $user->$fillable = $this->ask(($key + 1).'/'.count($fillables)." User $fillable");
-
-                if ($fillable == 'email') {
-                    while (!filter_var($user->$fillable, FILTER_VALIDATE_EMAIL)) {
-                        $this->error('Incorrect email address');
-                        $user->$fillable = $this->ask('Please enter valid email address');
-                    }
-                }
+        $user->role = $this->option('role');
+        if ($user->role ) {
+            if (!in_array($user->role , User::$roles)) {
+                $this->error('Invalid role');
+                return false;
+            }
+        } else {
+            $user->role = $this->ask('User role (admin/user)', 'admin');
+            while (!in_array($user->role, User::$roles)) {
+                $this->error('Invalid role');
+                $user->role = $this->ask('Please enter valid role');
             }
         }
+        $user->role = array_flip(User::$roles)[$user->role];
+
+        $user->first_name = $this->option('firstName') ? $this->option('firstName') : $this->ask('User first name');
+        $user->last_name = $this->option('lastName') ? $this->option('lastName') : $this->ask('User last name');
+
+        $user->email = $this->option('email');
+        if ($user->email) {
+            if (!filter_var($user->email, FILTER_VALIDATE_EMAIL)) {
+                $this->error('Invalid email address');
+                return false;
+            }
+        } else {
+            $user->email = $this->ask('User email address');
+            while (!filter_var($user->email, FILTER_VALIDATE_EMAIL)) {
+                $this->error('Incorrect email address');
+                $user->email = $this->ask('Please enter valid email address');
+            }
+        }
+
+        $user->password = \Hash::make($this->option('password') ? $this->option('password') : $this->secret('User password'));
+
         if ($this->confirm('Do you want to create the user?', true)) {
             if ($user->isAdmin()) {
                 $user->invite_state = User::INVITE_STATE_ACTIVATED;
             }
-            $user->save();
-            $this->info("User created (id: {$user->id})");
+
+            try {
+                $user->save();
+            } catch (\Exception $e) {
+                $this->line($e->getMessage());
+                $this->error('User already exists.');
+                return false;
+            }
         }
 
+        $this->info('User created with id: '.$user->id);
+
         return true;
     }
 }

app/Console/Commands/FetchMonitor.php

@@ -39,12 +39,16 @@ class FetchMonitor extends Command
     {
         $now = time();
 
-        $last_successful_run = \Option::get('fetch_emails_last_successful_run');
-        if ($last_successful_run && $last_successful_run < $now - \Option::get('alert_fetch_period')*60) {
+        $options = \Option::getOptions([
+            'alert_fetch_period',
+            'fetch_emails_last_successful_run',
+        ]);
 
+        $last_successful_run = $options['fetch_emails_last_successful_run'];
+        if ($last_successful_run && $last_successful_run < $now - ((config('app.fetch_schedule') * 60) + ($options['alert_fetch_period'] * 60))) {
             $mins_ago = floor(($now - $last_successful_run) / 60);
 
-            $text = 'There are some problems fetching emails: last time emails were successfully fetched <strong>'.$mins_ago.' minutes ago</strong>. Please check <a href="'.route('logs', ['name' => 'fetch_errors']).'">fetching logs</a> and <a href="'.route('system').'#cron">make sure</a> that the flollowing cron task is running: <code>php artisan schedule:run</code>';
+            $text = 'There are some problems fetching emails: last time emails were successfully fetched <strong>'.$mins_ago.' minutes ago</strong>. Please check <a href="'.route('logs', ['name' => 'fetch_errors']).'">fetching logs</a> and <a href="'.route('system').'#cron">make sure</a> that the following cron task is running: <code>php artisan schedule:run</code>';
 
             if (\Option::get('alert_fetch') && !\Option::get('alert_fetch_sent')) {
                 // We send alert only once

app/Console/Commands/GenerateVars.php

@@ -43,18 +43,33 @@ class GenerateVars extends Command
     {
         try {
             $params = [
-                'locales' => config('app.locales'),
+                'locales' => \Helper::getAllLocales(),
             ];
 
-            $filesystem = new Filesystem();
+            //$filesystem = new Filesystem();
 
-            $file_path = public_path('js/vars.js');
+            //$file_path = public_path('js/vars.js');
+            $file_path = storage_path('app/public/js/vars.js');
 
-            $compiled = view('js/vars', $params)->render();
+            $content = view('js/vars', $params)->render();
 
-            $filesystem->put($file_path, $compiled);
-
-            $this->info("Created: {$file_path}");
+            //$filesystem->put($file_path, $content);
+            // Save vars only if content changed
+            try {
+                if (\Storage::exists('js/vars.js')) {
+                    $old_content = \Storage::get('js/vars.js');
+                    if ($content != $old_content) {
+                        \Storage::put('js/vars.js', $content);
+                    }
+                } else {
+                    \Storage::put('js/vars.js', $content);
+                }
+                $this->info("Created: ".substr($file_path, strlen(base_path())+1));
+            } catch (\Exception $e) {
+                $msg = "Error occurred saving /storage/app/public/js/vars.js. ".\Helper::formatException($e);
+                \Log::error($msg);
+                $this->error($msg);
+            }
         } catch (\Exception $e) {
             $this->error($e->getMessage());
         }

app/Console/Commands/LogoutUsers.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class LogoutUsers extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:logout-users';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Logout all users';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        try {
+            // Remove files from storage/frameworks/sessions
+            $files = \File::files(storage_path('framework/sessions'));
+            
+            $count = 0;
+
+            foreach ($files as $file) {
+                try {
+                    $deleted = \File::delete($file->getPathname());
+                    if ($deleted) {
+                        $count++;
+                    }
+                } catch (\Exception $e) {
+                    $this->error($e->getMessage());
+                }
+            }
+            $this->line('Deleted sessions: '.$count);
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+        }
+    }
+}

app/Console/Commands/LogsMonitor.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class LogsMonitor extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:logs-monitor';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Send new log records by email';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $now = \Carbon\Carbon::now();
+
+        $options = \Option::getOptions([
+            'alert_logs_names',
+            'alert_logs_period',
+        ], [
+            'alert_logs_period' => config('app.alert_logs_period'),
+        ]);
+
+        if (!$options['alert_logs_names']) {
+            $this->error('['.date('Y-m-d H:i:s').'] No logs to monitor selected');
+
+            return;
+        }
+        if (!$options['alert_logs_period']) {
+            $this->error('['.date('Y-m-d H:i:s').'] No logs monitoring period set');
+
+            return;
+        }
+
+        $logs = \App\ActivityLog::whereIn('log_name', $options['alert_logs_names'])
+            ->where('created_at', '>=', \Carbon\Carbon::now()->modify('-1 '.$options['alert_logs_period'])->toDateTimeString())
+            ->where('created_at', '<', $now->toDateTimeString())
+            ->get();
+
+        if (!count($logs)) {
+            $this->line('['.date('Y-m-d H:i:s').'] No new log records found for the last '.$options['alert_logs_period']);
+
+            return;
+        }
+
+        $names = $logs->pluck('log_name')->unique()->toArray();
+        $text = 'Logs having new records for the last '.$options['alert_logs_period'].':<ul>';
+        foreach ($names as $name) {
+            $text .= '<li>';
+            $text .= '<strong>'.\App\ActivityLog::getLogTitle($name).'</strong>';
+            $text .= '</li>';
+        }
+        $text .= '</ul>';
+
+        foreach ($names as $name) {
+            $text .= '<br/><strong>'.\App\ActivityLog::getLogTitle($name).'</strong><br/>';
+            foreach ($logs as $log) {
+                if ($log->log_name != $name) {
+                    continue;
+                }
+                $text .= '● ['.$log->created_at.'] '.$log->getEventDescription().' <code>'.$log->properties.'</code><br/>';
+            }
+        }
+        // Send alert.
+        \MailHelper::sendAlertMail($text, 'Logs Monitoring');
+
+        $this->line($text);
+
+        $this->info('['.date('Y-m-d H:i:s').'] Monitoring finished');
+    }
+}

app/Console/Commands/ModuleBuild.php

@@ -52,6 +52,7 @@ class ModuleBuild extends Command
             }
             if (!$modules_aliases) {
                 $this->error('No modules found');
+
                 return;
             }
             $all = true;
@@ -70,6 +71,7 @@ class ModuleBuild extends Command
             $module = \Module::findByAlias($module_alias);
             if (!$module) {
                 $this->error('Module with the specified alias not found: '.$module_alias);
+
                 return;
             }
             $this->buildModule($module);
@@ -84,6 +86,7 @@ class ModuleBuild extends Command
         $public_symlink = public_path('modules').DIRECTORY_SEPARATOR.$module->alias;
         if (!file_exists($public_symlink)) {
             $this->error('Public symlink ['.$public_symlink.'] not found. Run module installation command first: php artisan freescout:module-install');
+
             return;
         }
 
@@ -108,7 +111,6 @@ class ModuleBuild extends Command
             }
 
             $this->info("Created: {$file_path}");
-
         } catch (\Exception $e) {
             $this->error($e->getMessage());
         }

app/Console/Commands/ModuleCheckLicenses.php

@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Misc\WpApi;
+use Illuminate\Console\Command;
+
+class ModuleCheckLicenses extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:module-check-licenses';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check licenses for modules';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        // Get active official modules and check validity of their licenses
+        $modules = \Module::getActive();
+
+        $this->info('Active modules found: '.count($modules));
+
+        $params = [
+            'url'          => \App\Module::getAppUrl(),
+            'data'          => [],
+        ];
+
+        foreach ($modules as $module) {
+            $license = $module->getLicense();
+        
+            if (!$module->isOfficial() || !$license) {
+                continue;
+            }
+
+            $data['license'] = $license;
+            $data['module_alias'] = $module->getAlias();
+
+            $params['data'][] = $data;
+        }
+
+        $result = WpApi::checkLicenses($params);
+
+        if (!empty($result['statuses'])) {
+            foreach ($modules as $module) {
+                $module_alias = $module->getAlias();
+
+                foreach ($result['statuses'] as $result_module_alias => $status) {
+                    if ($result_module_alias != $module_alias) {
+                        continue;
+                    }
+                    if (!empty($status) && $status != 'valid') {
+                        $msg = 'Module '.$module->getName().' has been deactivated due to invalid license: '.$status;
+
+                        $this->error($module->getName().': '.$msg);
+
+                        // Deactive module
+                        \App\Module::deactiveModule($module->getAlias(), true);
+
+                        // Inform admin
+                        \Log::error($msg);
+                        activity()
+                            ->withProperties([
+                                'error'    => $msg,
+                             ])
+                            ->useLog(\App\ActivityLog::NAME_SYSTEM)
+                            ->log(\App\ActivityLog::DESCRIPTION_SYSTEM_ERROR);
+                    } else {
+                        $this->info($module->getName().': OK');
+                    }
+                    continue 2;
+                }
+
+                $this->info($module->getName().': Unknown status');
+            }
+        }
+
+        $this->info('Checking licenses finished');
+    }
+}

app/Console/Commands/ModuleInstall.php

@@ -1,7 +1,8 @@
 <?php
 /**
- * php artisan freescout:module-install modulealias
+ * php artisan freescout:module-install modulealias.
  */
+
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
@@ -20,7 +21,7 @@ class ModuleInstall extends Command
      *
      * @var string
      */
-    protected $description = 'Install module or all modules (if module_alias is empty)';
+    protected $description = 'Install module or all modules (if module_alias is empty): run migrations and create a symlink';
 
     /**
      * Create a new command instance.
@@ -56,6 +57,7 @@ class ModuleInstall extends Command
             }
             if (!$modules_aliases) {
                 $this->error('No modules found');
+
                 return;
             }
             $install_all = $this->confirm('You have not specified a module alias, would you like to install all available modules ('.implode(', ', $modules_aliases).')?');
@@ -74,6 +76,7 @@ class ModuleInstall extends Command
             $module = \Module::findByAlias($module_alias);
             if (!$module) {
                 $this->error('Module with the specified alias not found: '.$module_alias);
+
                 return;
             }
             $this->call('module:migrate', ['module' => $module->getName(), '--force' => true]);
@@ -83,19 +86,53 @@ class ModuleInstall extends Command
         $this->call('freescout:clear-cache');
     }
 
+    // There is similar function in \App\Module.
     public function createModulePublicSymlink($module)
     {
         $from = public_path('modules').DIRECTORY_SEPARATOR.$module->alias;
         $to = $module->getExtraPath('Public');
 
-        if (file_exists($from)) {
-            return $this->info('Public symlink already exists');
-        }
-        
+        // file_exists() may throw "open_basedir restriction in effect".
         try {
-            symlink($to, $from);
+            // If module's Public is symlink.
+            if (is_link($to)) {
+                @unlink($to);
+            }
+            
+            // Symlimk may exist but lead to the module folder in a wrong case.
+            // So we need first try to remove it.
+            if (!file_exists($from) || !is_link($from)) {
+                if (is_dir($from)) {
+                    @rename($from, $from.'_'.date('YmdHis'));
+                } else {
+                    @unlink($from);
+                }
+            }
+
+            if (file_exists($from)) {
+                return $this->info('Public symlink already exists');
+            }
+
+            // Check target.
+            if (!file_exists($to)) {
+                // Try to create Public folder.
+                try {
+                    \File::makeDirectory($to, \Helper::DIR_PERMISSIONS);
+                } catch (\Exception $e) {
+                    // If it's a broken symlink.
+                    if (is_link($to)) {
+                        @unlink($to);
+                    }
+                }
+            }
+
+            try {
+                symlink($to, $from);
+            } catch (\Exception $e) {
+                $this->error('Error occurred creating ['.$from.' » '.$to.'] symlink: '.$e->getMessage());
+            }
         } catch (\Exception $e) {
-            $this->error('Error occured creating ['.$from.'] symlink: '.$e->getMessage());
+            $this->error('Error occurred creating ['.$from.' » '.$to.'] symlink: '.$e->getMessage());
         }
 
         $this->info('The ['.$from.'] symlink has been created');

app/Console/Commands/ModuleLaroute.php

@@ -2,9 +2,8 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-use Illuminate\Filesystem\Filesystem;
 use Axn\Laroute\Routes\Collection as Routes;
+use Illuminate\Console\Command;
 
 class ModuleLaroute extends Command
 {
@@ -22,6 +21,12 @@ class ModuleLaroute extends Command
      */
     protected $description = 'Generate a laravel routes JS-file for a module or all modules (if module_alias is empty)';
 
+    public $routes;
+    
+    public $config;
+    
+    public $generator;
+
     /**
      * Create a new command instance.
      *
@@ -31,8 +36,8 @@ class ModuleLaroute extends Command
     {
         $app = app();
 
-        $this->config     = $app['config'];
-        $this->generator  = $app->make('Lord\Laroute\Generators\GeneratorInterface');
+        $this->config = $app['config'];
+        $this->generator = $app->make('Lord\Laroute\Generators\GeneratorInterface');
 
         parent::__construct();
     }
@@ -58,6 +63,7 @@ class ModuleLaroute extends Command
             }
             if (!$modules_aliases) {
                 $this->error('No modules found');
+
                 return;
             }
             $all = true;
@@ -75,6 +81,7 @@ class ModuleLaroute extends Command
             $module = \Module::findByAlias($module_alias);
             if (!$module) {
                 $this->error('Module with the specified alias not found: '.$module_alias);
+
                 return;
             }
             $this->generateModuleRoutes($module);
@@ -88,6 +95,7 @@ class ModuleLaroute extends Command
         $public_symlink = public_path('modules').DIRECTORY_SEPARATOR.$module->getAlias();
         if (!file_exists($public_symlink)) {
             $this->error('Public symlink ['.$public_symlink.'] not found. Run module installation command first: php artisan freescout:module-install');
+
             return;
         }
 
@@ -123,16 +131,15 @@ class ModuleLaroute extends Command
      */
     protected function getTemplateData()
     {
-        $namespace  = $this->getOptionOrConfig('namespace');
-        $routes     = $this->routes->toJSON();
-        $absolute   = $this->config->get('laroute.absolute', false);
-        $rootUrl    = $this->config->get('app.url', '');
-        $prefix     = $this->config->get('laroute.prefix', '');
+        $namespace = $this->getOptionOrConfig('namespace');
+        $routes = $this->routes->toJSON();
+        $absolute = $this->config->get('laroute.absolute', false);
+        $rootUrl = $this->config->get('app.url', '');
+        $prefix = $this->config->get('laroute.prefix', '');
 
         return compact('namespace', 'routes', 'absolute', 'rootUrl', 'prefix');
     }
 
-
     /**
      * Get the path where the file will be generated.
      *
@@ -140,7 +147,7 @@ class ModuleLaroute extends Command
      */
     protected function getFileGenerationPath($module_alias)
     {
-        $path     = 'public/modules/'.$module_alias.'/js';
+        $path = 'public/modules/'.$module_alias.'/js';
         $filename = 'laroute'; //$this->getOptionOrConfig('filename');
 
         return "{$path}/{$filename}.js";

app/Console/Commands/ModuleUpdate.php

@@ -0,0 +1,169 @@
+<?php
+/**
+ * php artisan freescout:module-install modulealias.
+ */
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class ModuleUpdate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:module-update {module_alias?}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update all modules or a single module (if module_alias is set)';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $install_all = false;
+        $modules = [];
+
+        // We have to clear modules cache first to update modules cache
+        \Artisan::call('cache:clear');
+
+        // Create a symlink for the module (or all modules)
+        $module_alias = $this->argument('module_alias');
+        
+        $modules_directory = \WpApi::getModules();
+        if (\WpApi::$lastError) {
+            $this->error(__('Error occurred').': '.$lastError['message'].' ('.$lastError['code'].')');
+            return;
+        }
+
+        $installed_modules = \Module::all();
+
+        $counter = 0;
+        $found = false;
+        foreach ($modules_directory as $dir_module) {
+            // Update single module.
+            if ($module_alias && $dir_module['alias'] != $module_alias) {
+                continue;
+            }
+            
+            $found = true;
+
+            // Detect if new version is available.
+            foreach ($installed_modules as $module) {
+                if ($module->getAlias() != $dir_module['alias'] /*|| !$module->active()*/) {
+                    continue;
+                }
+                if (!empty($dir_module['version']) && version_compare($dir_module['version'], $module->get('version'), '>')) {
+
+                    $update_result = \App\Module::updateModule($dir_module['alias']);
+
+                    $this->info('['.$update_result['module_name'].' Module'.']');
+                    if ($update_result['status'] == 'success') {
+                        $this->line($update_result['msg_success']);
+                    } else {
+                        $msg = $update_result['msg'];
+                        if ($update_result['download_msg']) {
+                            $msg .= ' ('.$update_result['download_msg'].')';
+                        }
+                        $this->error('ERROR: '.$msg);
+                    }
+                    if (trim($update_result['output'])) {
+                        $this->line(preg_replace("#\n#", "\n> ", '> '.trim($update_result['output'])));
+                    }
+
+                    $counter++;
+                }
+            }
+        }
+
+        // Update custom modules.
+        // Loop through each installed module.
+        foreach ($installed_modules as $module) {
+            // Skip if the module is an official one
+            if (\App\Module::isOfficial($module->get('authorUrl'))) {
+                continue;
+            }
+
+            // Get the URL for the latest version of the module
+            $latest_version_number_url = $module->get('latestVersionUrl');
+            if (! $latest_version_number_url) {
+                continue;
+            }
+
+            // Create a new Guzzle HTTP client
+            $client = new \GuzzleHttp\Client();
+
+            try {
+                // Send a GET request to the latest version URL
+                $response = $client->request('GET', $latest_version_number_url, \Helper::setGuzzleDefaultOptions());
+
+                // Get the latest version number from the response body
+                $latest_version = trim((string) $response->getBody());
+
+                if (empty($latest_version)) {
+                    continue;
+                } else {
+                    // Get the current version of the module
+                    $current_version = $module->get('version');
+                }
+            } catch (\Exception $e) {
+                // If there's an exception, skip to the next iteration
+                continue;
+            }
+
+            // If the latest version is greater than the current version
+            if (version_compare($latest_version, $current_version, '>')) {
+                // Update the module
+                $update_result = \App\Module::updateModule($module->getAlias());
+
+                // Print the module name and status
+                $this->info('[' . $update_result['module_name'] . ' Module' . ']');
+                if ($update_result['status'] == 'success') {
+                    // If the update was successful, print the success message
+                    $this->line($update_result['msg_success']);
+                } else {
+                    // If the update failed, print the error message
+                    $msg = $update_result['msg'];
+                    if ($update_result['download_msg']) {
+                        $msg .= ' (' . $update_result['download_msg'] . ')';
+                    }
+                    $this->error('ERROR: ' . $msg);
+                }
+                // If there's any output from the update, print it
+                if (trim($update_result['output'])) {
+                    $this->line(preg_replace("#\n#", "\n> ", '> ' . trim($update_result['output'])));
+                }
+
+                // Increment the counter
+                $counter ++;
+            }
+        }
+
+        if ($module_alias && !$found) {
+            $this->error('Module with the following alias not found: '.$module_alias);
+        } elseif (!$counter) {
+            $this->line('All modules are up-to-date');
+        }
+
+        \Artisan::call('freescout:clear-cache');
+    }
+}

app/Console/Commands/ParseEml.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Mailbox;
+use Webklex\PHPIMAP\IMAP;
+use Webklex\PHPIMAP\Message;
+use Illuminate\Console\Command;
+
+
+class ParseEml extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * --mailbox Any mailbox able to connect via IMAP to its mail server.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:parse-eml {--mailbox=2}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Parse EML file';
+
+    /**
+     * Current mailbox.
+     *
+     * Used to process emails sent to multiple mailboxes.
+     */
+    public $mailbox;
+
+    /**
+     * Used to process emails sent to multiple mailboxes.
+     */
+    public $mailboxes;
+
+    public $extra_import = [];
+
+    /**
+     * Page size when requesting emails from mail server.
+     */
+    const PAGE_SIZE = 300;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $email = file_get_contents(storage_path('logs/email.eml'));
+
+        if (!str_contains($email, "\r\n")){
+            $email = str_replace("\n", "\r\n", $email);
+        }
+
+        $raw_header = substr($email, 0, strpos($email, "\r\n\r\n"));
+        $raw_body = substr($email, strlen($raw_header)+4);
+
+        $mailbox = Mailbox::find($this->option('mailbox'));
+
+        //\Config::set('app.new_fetching_library', 'true');
+        $client = \MailHelper::getMailboxClient($mailbox);
+        $client->openFolder("INBOX");
+
+        $message = Message::make(/*$this->option('uid')*/null, null, $client, $raw_header, $raw_body, [/*0 => "\\Seen"*/], IMAP::ST_UID);
+
+        $this->line('Headers: ');
+        $this->info($message->getHeader()->raw);
+        $this->line('From: ');
+        $this->info(json_encode($message->getFrom()[0] ?? [], JSON_UNESCAPED_UNICODE));
+        $this->line('Reply-To: ');
+        $this->info(json_encode($message->getReplyTo()[0] ?? [], JSON_UNESCAPED_UNICODE));
+        $this->line('In-Reply-To: ');
+        $this->info($message->getInReplyTo());
+        $this->line('References: ');
+        $this->info(json_encode(array_values(array_filter(preg_split('/[, <>]/', $message->getReferences() ?? ''))), JSON_UNESCAPED_UNICODE));
+        $this->line('Date: ');
+        $this->info($message->getDate());
+        $this->line('Subject: ');
+        $this->info($message->getSubject());
+        $this->line('Text Body: ');
+        $this->info($message->getTextBody());
+        $this->line('HTML Body: ');
+        $this->info($message->getHTMLBody(false));
+
+        $attachments = $message->getAttachments();
+        if (count($attachments)) {
+            $this->line('Attachments: ');
+            foreach ($attachments as $attachment) {
+                $this->info($attachment->getName());
+            }
+        }
+    }
+}

app/Console/Commands/SendMonitor.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Job;
+use Illuminate\Console\Command;
+
+class SendMonitor extends Command
+{
+    const CHECK_PERIOD = 12 * 3600; // 12 hours
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:send-monitor';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check if queue:work is processing emails queue and show an alert in the web interface if needed';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        // Get SendReplyToCustomer jobs.
+        $pending_jobs = \App\Job::where('queue', 'emails')
+            ->where('payload', 'like', '{"displayName":"App\\\\\\\\Jobs\\\\\\\\SendReplyToCustomer"%')
+            ->where('available_at', '<', time() - self::CHECK_PERIOD)
+            ->exists();
+
+        // Check failed_jobs.
+        // No need - it can be done via Manage > Alerts > Logs Monitoring
+        // if (!$pending_jobs) {
+        //     $pending_jobs = \App\FailedJob::where('queue', 'emails')
+        //         ->where('payload', 'like', '{"displayName":"App\\\\\\\\Jobs\\\\\\\\SendReplyToCustomer"%')
+        //         ->where('created_at', '<', time() - self::CHECK_PERIOD)
+        //         ->exists();
+        // }
+
+        if ($pending_jobs) {
+            \Option::set('send_emails_problem', '1');
+            $this->error('['.date('Y-m-d H:i:s').'] There are problems with emails queue processing');
+        } else {
+            \Option::remove('send_emails_problem');
+            $this->info('['.date('Y-m-d H:i:s').'] Emails queue processing is working');
+        }
+    }
+}

app/Console/Commands/Update.php

@@ -43,18 +43,19 @@ class Update extends Command
         if (!$this->confirmToProceed()) {
             return;
         }
-        
+
         @ini_set('memory_limit', '128M');
 
         if (\Updater::isNewVersionAvailable(config('app.version'))) {
             $this->info('Updating... This may take several minutes');
+
             try {
                 // Script may fail here and stop with the error:
                 // PHP Fatal error:  Allowed memory size of 94371840 bytes exhausted
                 \Updater::update();
                 $this->call('freescout:after-app-update');
             } catch (\Exception $e) {
-                $this->error('Error occured: '.$e->getMessage());
+                $this->error('Error occurred: '.$e->getMessage());
             }
         } else {
             $this->info('You have the latest version installed: '.config('app.version'));

app/Console/Commands/UpdateFolderCounters.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class UpdateFolderCounters extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'freescout:update-folder-counters';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update counters for all folders';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        foreach (\App\Folder::get() as $folder) {
+            $folder->updateCounters();
+            $this->line('Updated counters for folder: '.$folder->id);
+        }
+        $this->info('Updating finished');
+    }
+}

app/Console/Kernel.php

@@ -5,9 +5,13 @@ namespace App\Console;
 use Carbon\Carbon;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use App\Misc\Mail;
+use App\Option;
 
 class Kernel extends ConsoleKernel
 {
+    const FETCH_MAX_EXECUTION_TIME = 30; // minutes
+
     /**
      * The Artisan commands provided by your application.
      *
@@ -20,6 +24,7 @@ class Kernel extends ConsoleKernel
 
     /**
      * Define the application's command schedule.
+     * If --no-interaction flag is set the script will not run 'queue:work' daemon.
      *
      * @param \Illuminate\Console\Scheduling\Schedule $schedule
      *
@@ -27,9 +32,14 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
+        // https://github.com/freescout-helpdesk/freescout/issues/3970
+        if (!$this->isScheduleRun() && !\Helper::isRoute('system.cron')) {
+            return;
+        }
+
         // Remove failed jobs
         $schedule->command('queue:flush')
-            ->daily();
+            ->weekly();
 
         // Restart processing queued jobs (just in case)
         $schedule->command('queue:restart')
@@ -39,43 +49,220 @@ class Kernel extends ConsoleKernel
             ->everyMinute()
             ->withoutOverlapping();
 
-        // Fetch emails from mailboxes
-        $schedule->command('freescout:fetch-emails')
+        $schedule->command('freescout:send-monitor')
+            // Every 10 minutes.
+            ->cron('*/10 * * * *')
+            ->withoutOverlapping();
+
+        $schedule->command('freescout:update-folder-counters')
+            ->hourly();
+
+        $app_key = config('app.key');
+        if ($app_key) {
+            $crc = crc32($app_key);
+            $schedule->command('freescout:module-check-licenses')
+                ->cron((int)($crc % 59).' '.(int)($crc % 23).' * * *');
+        }
+
+        // Check if user finished viewing conversation.
+        $schedule->command('freescout:check-conv-viewers')
             ->everyMinute()
-            ->withoutOverlapping()
+            ->withoutOverlapping();
+
+        $schedule->command('freescout:clean-send-log')
+            ->monthly();
+
+        $schedule->command('freescout:clean-notifications-table')
+            ->weekly();
+
+        $schedule->command('freescout:clean-tmp')
+            ->daily();
+
+        // Logs monitoring.
+        $alert_logs_period = config('app.alert_logs_period');
+        if (config('app.alert_logs') && $alert_logs_period) {
+            $logs_cron = '';
+            switch ($alert_logs_period) {
+                case 'hour':
+                    $logs_cron = '0 * * * *';
+                    break;
+                case 'day':
+                    $logs_cron = '0 0 * * *';
+                    break;
+                case 'week':
+                    $logs_cron = '0 0 * * 0';
+                    break;
+                case 'month':
+                    $logs_cron = '0 0 1 * *';
+                    break;
+            }
+            if ($logs_cron) {
+                $schedule->command('freescout:logs-monitor')
+                    ->cron($logs_cron)
+                    ->withoutOverlapping();
+            }
+        }
+
+        $fetch_unseen = (int)config('app.fetch_unseen');
+        $fetch_command_identifier = \Helper::getWorkerIdentifier('freescout:fetch-emails');
+        $fetch_command_name = 'freescout:fetch-emails'
+            . ' --identifier='.$fetch_command_identifier
+            . ' --unseen='.$fetch_unseen;
+
+        // Kill fetch commands running for too long.
+        // In shedule:run this code is executed every time $schedule->command() in this function is executed.
+        if (function_exists('shell_exec')) {
+            $fetch_command_pids = \Helper::getRunningProcesses($fetch_command_identifier);
+
+            // The name of the command here must be exactly the same as below!
+            // Otherwise long fetching will be killed and won't run longer than 1 mintue.
+            // $schedule->command() creates a new mutex, so we need to store mutex name in cache.
+            // $mutex_name = $schedule->command($fetch_command_name)
+            //     ->everyMinute() - this also need to be set
+            //     ->skip(function () {
+            //         return true;
+            //     })
+            //     ->mutexName();
+
+            $mutex_name = \Cache::get('fetch_mutex_name') ?? '';
+
+            // If there is no cache mutext but there are running fetch commands 
+            // it means the mutex had expired after self::FETCH_MAX_EXECUTION_TIME
+            // and the existing command(s) is running longer than self::FETCH_MAX_EXECUTION_TIME.
+            if (count($fetch_command_pids) > 0 && !\Cache::get($mutex_name)) {
+                // Kill freescout:fetch-emails commands running for too long
+                shell_exec('kill '.implode(' | kill ', $fetch_command_pids));
+            } elseif (count($fetch_command_pids) == 0) {
+                // Make sure 'ps' command actually works.
+                $ps_works = \Helper::getRunningProcesses('schedule:run');
+
+                if (count($ps_works)) {
+                    // Previous freescout:fetch-emails may have been killed or errored and did not remove the mutex.
+                    // So here we are forcefully removing the mutex. Otherwise mutex will live for 24 hours.
+                    if (\Cache::has($mutex_name)) {
+                        \Cache::forget($mutex_name);
+                    }
+                }
+            }
+        }
+
+        // Fetch emails from mailboxes
+        $fetch_command = $schedule->command($fetch_command_name)
+            // withoutOverlapping() option creates a mutex in the cache 
+            // which by default expires in 24 hours.
+            // So we are passing an 'expiresAt' parameter to withoutOverlapping() to
+            // prevent fetching from not being executed when fetching command by some reason
+            // does not remove the mutex from the cache. 
+            ->withoutOverlapping($expiresAt = self::FETCH_MAX_EXECUTION_TIME /* minutes */)
             ->sendOutputTo(storage_path().'/logs/fetch-emails.log');
 
+        switch (config('app.fetch_schedule')) {
+            case Mail::FETCH_SCHEDULE_EVERY_FIVE_MINUTES:
+                $fetch_command->everyFiveMinutes();
+                break;
+            case Mail::FETCH_SCHEDULE_EVERY_TEN_MINUTES:
+                $fetch_command->everyTenMinutes();
+                break;
+            case Mail::FETCH_SCHEDULE_EVERY_FIFTEEN_MINUTES:
+                $fetch_command->everyFifteenMinutes();
+                break;
+            case Mail::FETCH_SCHEDULE_EVERY_THIRTY_MINUTES:
+                $fetch_command->everyThirtyMinutes();
+                break;
+            case Mail::FETCH_SCHEDULE_HOURLY:
+                $fetch_command->Hourly();
+                break;
+            default:
+                $fetch_command->everyMinute();
+                break;
+        }
+        \Cache::put('fetch_mutex_name', $fetch_command->mutexName(), self::FETCH_MAX_EXECUTION_TIME);
+
+        $schedule = \Eventy::filter('schedule', $schedule);
+
+        // If --no-daemonize flag is passed - do not run 'queue:work' daemon.
+        foreach ($_SERVER['argv'] ?? [] as $arg) {
+            if ($arg == '--no-interaction') {
+                return;
+            }
+        }
+
         // Command runs as subprocess and sets cache mutex. If schedule:run command is killed
         // subprocess does not clear the mutex and it stays in the cache until cache:clear is executed.
         // By default, the lock will expire after 24 hours.
-        // 
-        // cache:clear clears the mutex, but sometimes process continues running, so we need to kill it.
-        
+
+        $queue_work_params = Config('app.queue_work_params');
+        // Add identifier to avoid conflicts with other FreeScout instances on the same server.
+        $queue_work_params['--queue'] .= ','.\Helper::getWorkerIdentifier();
+
+        // $schedule->command('queue:work') command below has withoutOverlapping() option,
+        // which works via special mutex stored in the cache preventing several 'queue:work' to work at the same time.
+        // So when the cache is cleared the mutex indicating that the 'queue:work' is running is removed,
+        // and the second 'queue:work' command is launched by cron. When `artisan schedule:run` is executed it sees 
+        // that there are two 'queue:work' processes running and kills them.
+        // After one minute 'queue:work' is executed by cron via `artisan schedule:run` and works in the background.
         if (function_exists('shell_exec')) {
-            $running_commands = 0;
-            try {
-                $processes = preg_split("/[\r\n]/", shell_exec("ps aux | grep 'queue:work'"));
-                foreach ($processes as $process) {
-                    preg_match("/^[\S]+\s+([\d]+)\s+/", $process, $m);
-                    if (!preg_match("/(sh \-c|grep )/", $process) && !empty($m[1])) {
-                        $running_commands++;
+            $running_commands = \Helper::getRunningProcesses();
+
+            if (count($running_commands) > 1) {
+                // Stop all queue:work processes.
+                // queue:work command is stopped by settings a cache key
+                \Helper::queueWorkerRestart();
+                // Sometimes processes stuck and just continue running, so we need to kill them.
+                // Sleep to let processes stop.
+                sleep(1);
+                // Check processes again.
+                $worker_pids = \Helper::getRunningProcesses();
+                
+                if (count($worker_pids) > 1) {
+                    // Current process also has to be killed, as otherwise it "stucks"
+                    // $current_pid = getmypid();
+                    // foreach ($worker_pids as $i => $pid) {
+                    //     if ($pid == $current_pid) {
+                    //         unset($worker_pids[$i]);
+                    //         break;
+                    //     }
+                    // }
+                    shell_exec('kill '.implode(' | kill ', $worker_pids));
+                }
+            } elseif (count($running_commands) == 0) {
+                // Make sure 'ps' command actually works.
+                $ps_works = \Helper::getRunningProcesses('schedule:run');
+
+                if (count($ps_works)) {
+                    // Previous queue:work may have been killed or errored and did not remove the mutex.
+                    // So here we are forcefully removing the mutex.
+                    $mutex_name = $schedule->command('queue:work', $queue_work_params)
+                        ->skip(function () {
+                            return true;
+                        })
+                        ->mutexName();
+                    if (\Cache::get($mutex_name)) {
+                        \Cache::forget($mutex_name);
                     }
                 }
-            } catch (\Exception $e) {
-                // Do nothing
-            }
-            if ($running_commands > 1) {
-                // queue:work command is stopped by settings a cache key
-                \Cache::forever('illuminate:queue:restart', Carbon::now()->getTimestamp());
             }
         }
 
-        $schedule->command('queue:work', Config('app.queue_work_params'))
+        $schedule->command('queue:work', $queue_work_params)
             ->everyMinute()
             ->withoutOverlapping()
             ->sendOutputTo(storage_path().'/logs/queue-jobs.log');
     }
 
+    /**
+     * This function is needed because every time $schedule->command() is executed 
+     * the schedule() is executed also.
+     */
+    public function isScheduleRun()
+    {
+        if (\Helper::isConsole()) {
+            return true;
+        } else {
+            return !empty($_SERVER['argv']) && in_array('schedule:run', $_SERVER['argv']);
+        }
+    }
+
     /**
      * Register the commands for the application.
      *
@@ -85,6 +272,13 @@ class Kernel extends ConsoleKernel
     {
         $this->load(__DIR__.'/Commands');
 
+        // Swiftmailer uses $_SERVER['SERVER_NAME'] in transport_deps.php
+        // to set the host for EHLO command, if it is empty it uses [127.0.0.1].
+        // G Suite sometimes rejects emails with EHLO [127.0.0.1].
+        if (empty($_SERVER['SERVER_NAME'])) {
+            $_SERVER['SERVER_NAME'] = parse_url(config('app.url'), PHP_URL_HOST);
+        }
+
         require base_path('routes/console.php');
     }
 }

app/ConversationFolder.php

@@ -3,11 +3,10 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Input;
 
 class ConversationFolder extends Model
 {
-	/**
+    /**
      * The table associated with the model.
      *
      * @var string
@@ -15,4 +14,4 @@ class ConversationFolder extends Model
     protected $table = 'conversation_folder';
 
     protected $fillable = ['folder_id', 'conversation_id'];
-}
+}

app/CustomerChannel.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CustomerChannel extends Model
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'customer_channel';
+
+    public $timestamps = false;
+
+    /**
+     * Cached communication channels.
+     */
+    public static $channels = null;
+
+    public function customer()
+    {
+        return $this->belongsTo('App\Customer');
+    }
+
+    public static function create($customer_id, $channel, $channel_id)
+    {
+        try {
+            $customer_channel = new self();
+            $customer_channel->customer_id = $customer_id;
+            $customer_channel->channel     = $channel;
+            $customer_channel->channel_id  = $channel_id;
+            $customer_channel->save();
+
+            return $customer_channel;
+        } catch (\Exception $e) {
+            // Already exists.
+            return null;
+        }
+    }
+
+    public function getChannelName()
+    {
+        return \Eventy::filter('channel.name', '', $this->channel);
+    }
+
+    public static function getChannels()
+    {
+        if (self::$channels !== null) {
+            return self::$channels;
+        } else {
+            self::$channels = \Eventy::filter('channels.list', []);
+            return self::$channels;
+        }
+    }
+}

app/Email.php

@@ -3,9 +3,14 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Watson\Rememberable\Rememberable;
 
 class Email extends Model
 {
+    use Rememberable;
+    // This is obligatory.
+    public $rememberCacheDriver = 'array';
+    
     /**
      * Email types.
      */
@@ -47,11 +52,15 @@ class Email extends Model
         // Email validation is not recommended:
         // http://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address/201378#201378
         // So we just check for @
-        if (!preg_match('/@/', $email)) {
+        if (!preg_match('/^.+@.+$/', $email ?? '')) {
             return false;
         }
         $email = filter_var($email, FILTER_SANITIZE_EMAIL);
         $email = mb_strtolower($email, 'UTF-8');
+        // Remove trailing dots.
+        $email = preg_replace("/\.+$/", '', $email);
+        // Remove dot before @
+        $email = preg_replace("/\.+@/", '@', $email);
 
         return $email;
     }
@@ -60,4 +69,19 @@ class Email extends Model
     {
         return explode('@', $this->email)[0];
     }
+
+    public static function create($email, $customer_id, $type = self::TYPE_WORK)
+    {
+        try {
+            $email_obj = new Email();
+            $email_obj->email = $email;
+            $email_obj->type = array_key_exists($type, self::$types) ? $type : self::TYPE_WORK;
+            $email_obj->customer_id = $customer_id;
+            $email_obj->save();
+
+            return $email_obj;
+        } catch (\Exception $e) {
+            return null;
+        }
+    }
 }

app/Events/RealtimeBroadcastNotificationCreated.php

@@ -3,17 +3,15 @@
 namespace App\Events;
 
 use Illuminate\Broadcasting\Channel;
-use Illuminate\Queue\SerializesModels;
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Broadcasting\PresenceChannel;
-use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Queue\SerializesModels;
 
 class RealtimeBroadcastNotificationCreated implements ShouldBroadcastNow
 {
     use SerializesModels;
 
-/**
+    /**
      * The notifiable entity who received the notification.
      *
      * @var mixed
@@ -55,7 +53,7 @@ class RealtimeBroadcastNotificationCreated implements ShouldBroadcastNow
     {
         $channels = $this->notification->broadcastOn();
 
-        if (! empty($channels)) {
+        if (!empty($channels)) {
             return $channels;
         }
 
@@ -72,7 +70,7 @@ class RealtimeBroadcastNotificationCreated implements ShouldBroadcastNow
     public function broadcastWith()
     {
         return array_merge($this->data, [
-            'id' => $this->notification->id,
+            'id'   => $this->notification->id,
             'type' => get_class($this->notification),
         ]);
         // return [
@@ -95,4 +93,4 @@ class RealtimeBroadcastNotificationCreated implements ShouldBroadcastNow
 
         return $class.'.'.$this->notifiable->getKey();
     }
-}
+}

app/Events/RealtimeChat.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * Fefresh chats list when new thread created in mailbox.
+ */
+namespace App\Events;
+
+use App\Conversation;
+use App\Mailbox;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Queue\SerializesModels;
+
+class RealtimeChat implements ShouldBroadcastNow
+{
+    use SerializesModels;
+
+    /**
+     * The notification data.
+     *
+     * @var array
+     */
+    public $data = [];
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new \Illuminate\Broadcasting\Channel($this->channelName());
+    }
+
+    /**
+     * Get the data to broadcast.
+     *
+     * @return array
+     */
+    public function broadcastWith()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Get the broadcast channel name for the event.
+     *
+     * @return string
+     */
+    protected function channelName()
+    {
+        if (!empty($this->data['mailbox_id'])) {
+            return 'chat.'.$this->data['mailbox_id'];
+        } else {
+            return 'chat.0';
+        }
+    }
+
+    /**
+     * Helper funciton.
+     */
+    public static function dispatchSelf($mailbox_id)
+    {
+        if (!\Helper::isChatModeAvailable()) {
+            return;
+        }
+        $notification_data = [
+            'mailbox_id'      => $mailbox_id
+        ];
+        event(new \App\Events\RealtimeChat($notification_data));
+    }
+
+    public static function processPayload($payload)
+    {
+        $user = auth()->user();
+        $mailbox = Mailbox::rememberForever()->find($payload->mailbox_id);
+
+        // Check if user can listen to this event.
+        if (!$user || !$mailbox || !$user->can('viewCached', $mailbox)) {
+            return [];
+        }
+
+        // Chats are retrieved in the template.
+        $template_data = [
+            'mailbox' => $mailbox,
+        ];
+
+        $payload->chats_html = \View::make('mailboxes/partials/chat_list')->with($template_data)->render();
+
+        return $payload;
+    }
+}

app/Events/RealtimeConvNewThread.php

@@ -0,0 +1,118 @@
+<?php
+/**
+ * New thread created in conversation.
+ */
+namespace App\Events;
+
+use App\Conversation;
+use App\Mailbox;
+use App\Thread;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Queue\SerializesModels;
+
+class RealtimeConvNewThread implements ShouldBroadcastNow
+{
+    use SerializesModels;
+
+    /**
+     * The notification data.
+     *
+     * @var array
+     */
+    public $data = [];
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new \Illuminate\Broadcasting\Channel($this->channelName());
+    }
+
+    /**
+     * Get the data to broadcast.
+     *
+     * @return array
+     */
+    public function broadcastWith()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Get the broadcast channel name for the event.
+     *
+     * @return string
+     */
+    protected function channelName()
+    {
+        if (!empty($this->data['conversation_id'])) {
+            return 'conv.'.$this->data['conversation_id'];
+        } else {
+            return 'conv.0';
+        }
+    }
+
+    /**
+     * Helper funciton.
+     */
+    public static function dispatchSelf($thread)
+    {
+        if ($thread->state != Thread::STATE_PUBLISHED) {
+            return;
+        }
+        $notification_data = [
+            'thread_id'       => $thread->id,
+            'conversation_id' => $thread->conversation_id,
+            // conversation is prefetched in ThreadObserver.
+            'mailbox_id'      => $thread->conversation->mailbox_id,
+            //'user_id'         => $thread->created_by_user_id,
+        ];
+        event(new \App\Events\RealtimeConvNewThread($notification_data));
+    }
+
+    public static function processPayload($payload)
+    {
+        $user = auth()->user();
+        $mailbox = Mailbox::rememberForever()->find($payload->mailbox_id);
+
+        // Check if user can listen to this event.
+        if (!$user || !$mailbox || !$user->can('viewCached', $mailbox)) {
+            return [];
+        }
+
+        $thread = Thread::find($payload->thread_id);
+        if (!$thread) {
+            return $payload;
+        }
+
+        // Add thread html to the payload.
+        $template_data = [
+            'conversation' => $thread->conversation,
+            'mailbox'      => $thread->conversation->mailbox,
+            'threads'      => [$thread],
+        ];
+
+        $payload->thread_html = \View::make('conversations/partials/threads')->with($template_data)->render();
+        $payload->conversation_user_id = $thread->conversation->user_id;
+        $payload->conversation_status = $thread->conversation->status;
+        $payload->conversation_status_class = Conversation::$status_classes[$thread->conversation->status];
+        $payload->conversation_status_icon = Conversation::$status_icons[$thread->conversation->status];
+
+        return $payload;
+    }
+}

app/Events/RealtimeConvView.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+//use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Queue\SerializesModels;
+
+class RealtimeConvView implements ShouldBroadcastNow
+{
+    use SerializesModels;
+
+    /**
+     * The notifiable entity who received the notification.
+     *
+     * @var mixed
+     */
+    //public $notifiable;
+
+    /**
+     * The notification instance.
+     *
+     * @var \Illuminate\Notifications\Notification
+     */
+    //public $notification;
+
+    /**
+     * The notification data.
+     *
+     * @var array
+     */
+    public $data = [];
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(/*$notifiable, $notification,*/ $data)
+    {
+        $this->data = $data;
+        // $this->notifiable = $notifiable;
+        // $this->notification = $notification;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return Channel|array
+     */
+    public function broadcastOn()
+    {
+        // $channels = $this->notification->broadcastOn();
+
+        // if (!empty($channels)) {
+        //     return $channels;
+        // }
+
+        return new \Illuminate\Broadcasting\Channel($this->channelName());
+        //return [new PrivateChannel()];
+    }
+
+    /**
+     * Get the data to broadcast.
+     *
+     * @return array
+     */
+    public function broadcastWith()
+    {
+        return $this->data;
+
+        /*return array_merge($this->data, [
+            'id'   => $this->notification->id,
+            'type' => get_class($this->notification),
+        ]);*/
+    }
+
+    /**
+     * Get the broadcast channel name for the event.
+     *
+     * @return string
+     */
+    protected function channelName()
+    {
+        // if (method_exists($this->notifiable, 'receivesBroadcastNotificationsOn')) {
+        //     return $this->notifiable->receivesBroadcastNotificationsOn($this->notification);
+        // }
+
+        return 'conv';
+
+        // $class = str_replace('\\', '.', get_class($this->notifiable));
+
+        // return $class.'.'.$this->notifiable->getKey();
+    }
+
+    /**
+     * Helper funciton.
+     */
+    public static function dispatchSelf($conversation_id, $user, $replying = false)
+    {
+        $notification_data = [
+            'conversation_id' => $conversation_id,
+            'user_id'         => $user->id,
+            'user_photo_url'  => $user->getPhotoUrl(false),
+            // These has to be encoded to avoid "Unable to JSON encode payload. Error code: 5"
+            'user_initials'   => htmlentities($user->getInitials()),
+            'user_name'       => htmlentities($user->getFullName()),
+            'replying'        => (int)$replying,
+        ];
+        event(new \App\Events\RealtimeConvView($notification_data));
+    }
+}

app/Events/RealtimeConvViewFinish.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * User finished viewing conversatin.
+ */
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Queue\SerializesModels;
+
+class RealtimeConvViewFinish implements ShouldBroadcastNow
+{
+    use SerializesModels;
+
+    /**
+     * The notification data.
+     *
+     * @var array
+     */
+    public $data = [];
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new \Illuminate\Broadcasting\Channel($this->channelName());
+    }
+
+    /**
+     * Get the data to broadcast.
+     *
+     * @return array
+     */
+    public function broadcastWith()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Get the broadcast channel name for the event.
+     *
+     * @return string
+     */
+    protected function channelName()
+    {
+        return 'conv';
+    }
+}

app/Events/RealtimeMailboxNewThread.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * New thread created in mailbox.
+ */
+namespace App\Events;
+
+use App\Conversation;
+use App\Mailbox;
+use App\Folder;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Queue\SerializesModels;
+
+class RealtimeMailboxNewThread implements ShouldBroadcastNow
+{
+    use SerializesModels;
+
+    /**
+     * The notification data.
+     *
+     * @var array
+     */
+    public $data = [];
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new \Illuminate\Broadcasting\Channel($this->channelName());
+    }
+
+    /**
+     * Get the data to broadcast.
+     *
+     * @return array
+     */
+    public function broadcastWith()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Get the broadcast channel name for the event.
+     *
+     * @return string
+     */
+    protected function channelName()
+    {
+        if (!empty($this->data['mailbox_id'])) {
+            return 'mailbox.'.$this->data['mailbox_id'];
+        } else {
+            return 'mailbox.0';
+        }
+    }
+
+    /**
+     * Helper funciton.
+     */
+    public static function dispatchSelf($mailbox_id)
+    {
+        $notification_data = [
+            'mailbox_id'      => $mailbox_id
+        ];
+        event(new \App\Events\RealtimeMailboxNewThread($notification_data));
+    }
+
+    public static function processPayload($payload)
+    {
+        $user = auth()->user();
+        $mailbox = Mailbox::rememberForever()->find($payload->mailbox_id);
+
+        // Check if user can listen to this event.
+        if (!$user || !$mailbox || !$user->can('viewCached', $mailbox)) {
+            return [];
+        }
+
+        $folder = null;
+        $foler_id = Conversation::getFolderParam();
+        if ($foler_id) {
+            $folder = Folder::find($foler_id);
+        }
+        // Just in case.
+        if (!$folder) {
+            $folder = new Folder();
+        }
+        $template_data = [
+            'folders' => $mailbox->getAssesibleFolders(),
+            'folder'  => $folder,
+            'mailbox' => $mailbox,
+        ];
+
+        $payload->folders_html = \View::make('mailboxes/partials/folders')->with($template_data)->render();
+
+        return $payload;
+    }
+}

app/Events/UserDeleted.php

@@ -6,7 +6,7 @@ use App\User;
 
 class UserDeleted
 {
-    public $user;
+    public $by_user;
     public $deleted_user;
 
     /**
@@ -14,9 +14,11 @@ class UserDeleted
      *
      * @return void
      */
-    public function __construct(User $user, User $deleted_user)
+    public function __construct(User $deleted_user, User $by_user)
     {
-        $this->user = $user;
+        $this->by_user = $by_user;
         $this->deleted_user = $deleted_user;
+
+        \Eventy::action('user.deleted', $deleted_user, $by_user);
     }
 }

app/FailedJob.php

@@ -10,4 +10,27 @@ class FailedJob extends Model
      * Automatically converted into Carbon dates.
      */
     protected $dates = ['failed_at'];
+
+	public $payload_decoded = null;
+
+    public function getPayloadDecoded()
+    {
+    	if ($this->payload_decoded !== null) {
+    		return $this->payload_decoded;
+    	}
+
+    	$this->payload_decoded = json_decode($this->payload, true);
+
+    	return $this->payload_decoded;
+    }
+
+    public function getCommand()
+    {
+    	return \App\Job::getPayloadCommand($this->getPayloadDecoded());
+    }
+
+    public static function retry($job_id)
+    {
+        \Artisan::call('queue:retry', ['id' => $job_id]);
+    }
 }

app/Folder.php

@@ -17,18 +17,18 @@ class Folder extends Model
     const TYPE_DRAFTS = 30;
     const TYPE_ASSIGNED = 40;
     const TYPE_CLOSED = 60;
+    const TYPE_DELETED = 70;
     const TYPE_SPAM = 80;
-    const TYPE_DELETED = 110;
 
     public static $types = [
         self::TYPE_UNASSIGNED => 'Unassigned',
         self::TYPE_MINE       => 'Mine',
+        self::TYPE_STARRED    => 'Starred',
         self::TYPE_DRAFTS     => 'Drafts',
         self::TYPE_ASSIGNED   => 'Assigned',
         self::TYPE_CLOSED     => 'Closed',
         self::TYPE_SPAM       => 'Spam',
         self::TYPE_DELETED    => 'Deleted',
-        self::TYPE_STARRED    => 'Starred',
     ];
 
     /**
@@ -68,8 +68,16 @@ class Folder extends Model
         self::TYPE_STARRED,
     ];
 
+    // Counter mode.
+    const COUNTER_ACTIVE = 1;
+    const COUNTER_TOTAL  = 2;
+
     public $timestamps = false;
 
+    protected $casts = [
+        'meta' => 'array',
+    ];
+
     /**
      * Get the mailbox to which folder belongs.
      */
@@ -96,12 +104,32 @@ class Folder extends Model
 
     public function getTypeName()
     {
-        return __(self::$types[$this->type]);
+        // To make name translatable.
+        switch ($this->type) {
+            case self::TYPE_UNASSIGNED:
+                return __('Unassigned');
+            case self::TYPE_MINE:
+                return __('Mine');
+            case self::TYPE_DRAFTS:
+                return __('Drafts');
+            case self::TYPE_ASSIGNED:
+                return __('Assigned');
+            case self::TYPE_CLOSED:
+                return __('Closed');
+            case self::TYPE_SPAM:
+                return __('Spam');
+            case self::TYPE_DELETED:
+                return __('Deleted');
+            case self::TYPE_STARRED:
+                return __('Starred');
+            default:
+                return __(\Eventy::filter('folder.type_name', self::$types[$this->type] ?? '', $this));
+        }
     }
 
     public function getTypeIcon()
     {
-        return self::$type_icons[$this->type];
+        return \Eventy::filter('folder.type_icon', self::$type_icons[$this->type] ?? '', $this);
     }
 
     /**
@@ -124,7 +152,6 @@ class Folder extends Model
             case self::TYPE_STARRED:
                 $order_by[] = ['status' => 'asc'];
                 $order_by[] = ['last_reply_at' => 'desc'];
-                //$order_by = [['conversation_folder.id' => 'desc']];
                 break;
 
             case self::TYPE_DRAFTS:
@@ -133,6 +160,7 @@ class Folder extends Model
 
             case self::TYPE_CLOSED:
                 $order_by = [['closed_at' => 'desc']];
+                break;
 
             case self::TYPE_SPAM:
                 $order_by = [['last_reply_at' => 'desc']];
@@ -141,6 +169,30 @@ class Folder extends Model
             case self::TYPE_DELETED:
                 $order_by = [['user_updated_at' => 'desc']];
                 break;
+
+            default:
+                $order_by = \Eventy::filter('folder.conversations_order_by', $order_by, $this->type);
+                break;
+        }
+
+        // Process columns sorting.
+        $sorting = Conversation::getConvTableSorting();
+        if ($sorting['sort_by'] == 'date') {
+            if ($sorting['order'] != 'desc') {
+                 foreach ($order_by as $block_i => $block) {
+                    foreach ($block as $field => $order) {
+                        if ($field == 'status') {
+                            unset($order_by[$block_i][$field]);
+                        } else {
+                            if ($order == 'desc') {
+                                $order_by[$block_i][$field] = 'asc';
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            $order_by = [[$sorting['sort_by'] => $sorting['order']]];
         }
 
         return $order_by;
@@ -166,31 +218,49 @@ class Folder extends Model
      */
     public function isIndirect()
     {
-        return in_array($this->type, Folder::$indirect_types);
+        return in_array($this->type, self::$indirect_types);
     }
 
     public function updateCounters()
     {
-        if ($this->type == Folder::TYPE_MINE && $this->user_id) {
+        if (config('app.update_folder_counters_in_background')) {
+            if(!\Illuminate\Support\Facades\Cache::has("folder_update_lock_{$this->id}")) {
+                \App\Jobs\UpdateFolderCounters::dispatch($this);
+            }
+        } else {
+            $this->updateCountersNow();
+        }
+    }
+
+    public function updateCountersNow()
+    {
+        if (\Eventy::filter('folder.update_counters', false, $this)) {
+            return;
+        }
+        if ($this->type == self::TYPE_MINE && $this->user_id) {
             $this->active_count = Conversation::where('user_id', $this->user_id)
                 ->where('mailbox_id', $this->mailbox_id)
-                ->where('status', Conversation::STATUS_ACTIVE)
                 ->where('state', Conversation::STATE_PUBLISHED)
+                ->where('status', Conversation::STATUS_ACTIVE)
                 ->count();
             $this->total_count = Conversation::where('user_id', $this->user_id)
                 ->where('mailbox_id', $this->mailbox_id)
                 ->where('state', Conversation::STATE_PUBLISHED)
                 ->count();
-        } elseif ($this->type == Folder::TYPE_STARRED) {
+        } elseif ($this->type == self::TYPE_STARRED) {
             $this->active_count = count(Conversation::getUserStarredConversationIds($this->mailbox_id, $this->user_id));
             $this->total_count = $this->active_count;
-        } elseif ($this->type == Folder::TYPE_DELETED) {
+        } elseif ($this->type == self::TYPE_DELETED) {
             $this->active_count = $this->conversations()->where('state', Conversation::STATE_DELETED)
                 ->count();
             $this->total_count = $this->active_count;
         } elseif ($this->isIndirect()) {
             // Conversation are connected to folder via conversation_folder table.
-            $this->active_count = ConversationFolder::where('folder_id', $this->id)->count();
+            // Drafts.
+            $this->active_count = ConversationFolder::where('conversation_folder.folder_id', $this->id)
+                ->join('conversations', 'conversations.id', '=', 'conversation_folder.conversation_id')
+                //->where('state', Conversation::STATE_PUBLISHED)
+                ->count();
             $this->total_count = $this->active_count;
         } else {
             $this->active_count = $this->conversations()
@@ -204,19 +274,46 @@ class Folder extends Model
         $this->save();
     }
 
+    /**
+     * Get count to display in folders list.
+     *
+     * @param array $folders [description]
+     *
+     * @return [type] [description]
+     */
+    public function getCount($folders = [])
+    {
+        $counter = \Eventy::filter('folder.counter', self::COUNTER_ACTIVE, $this, $folders);
+
+        $count = \Eventy::filter('folder.count', false, $this, $counter, $folders);
+        if ($count !== false) {
+            return $count;
+        }
+
+        if ($counter == self::COUNTER_TOTAL || $this->type == self::TYPE_STARRED || $this->type == self::TYPE_DRAFTS) {
+            return $this->total_count;
+        } else {
+            return $this->getActiveCount($folders);
+        }
+    }
+
     /**
      * Get calculated number of active conversations.
      */
     public function getActiveCount($folders = [])
     {
         $active_count = $this->active_count;
-        if ($this->type == Folder::TYPE_ASSIGNED) {
-            if ($folders) {
-                $mine_folder = $folders->firstWhere('type', Folder::TYPE_MINE);
-            } else {
-                $mine_folder = $this->mailbox->folders()->where('type', Folder::TYPE_MINE)->first();
+        if ($this->type == self::TYPE_ASSIGNED) {
+            $mine_folder = \Eventy::filter('folder.active_count_mine_folder', null, $this, $folders);
+
+            if (!$mine_folder) {
+                if ($folders) {
+                    $mine_folder = $folders->firstWhere('type', self::TYPE_MINE);
+                } elseif ($this->mailbox_id) {
+                    $mine_folder = $this->mailbox->folders()->where('type', self::TYPE_MINE)->first();
+                }
             }
-            
+
             if ($mine_folder) {
                 $active_count = $active_count - $mine_folder->active_count;
                 if ($active_count < 0) {
@@ -227,4 +324,135 @@ class Folder extends Model
 
         return $active_count;
     }
+
+    /**
+     * Query for waiting since.
+     */
+    public function getWaitingSinceQuery()
+    {
+        $query = null;
+
+        if ($this->type == self::TYPE_MINE) {
+            // Assigned to user.
+            $query = Conversation::where('user_id', $this->user_id)
+                ->where('mailbox_id', $this->mailbox_id);
+        } elseif ($this->isIndirect()) {
+            // Via intermediate table.
+            $query = Conversation::join('conversation_folder', 'conversations.id', '=', 'conversation_folder.conversation_id')
+                    ->where('conversation_folder.folder_id', $this->id);
+        } else {
+            // All other conversations.
+            $query = $this->conversations();
+        }
+
+        return \Eventy::filter('folder.waiting_since_query', $query, $this);
+    }
+
+    /**
+     * Works for main folder only for now.
+     *
+     * @return [type] [description]
+     */
+    public function getWaitingSince()
+    {
+        // Get oldest active conversation.
+        $conversation = $this->getWaitingSinceQuery()
+            ->where('state', Conversation::STATE_PUBLISHED)
+            ->where('status', Conversation::STATUS_ACTIVE)
+            ->orderBy($this->getWaitingSinceField(), 'asc')
+            ->first();
+        if ($conversation) {
+            return $conversation->getWaitingSince($this);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Get conversation field used to detect waiting since time.
+     *
+     * @return [type] [description]
+     */
+    public function getWaitingSinceField()
+    {
+        if ($this->type == \App\Folder::TYPE_CLOSED) {
+            return 'closed_at';
+        } elseif ($this->type == \App\Folder::TYPE_DRAFTS) {
+            return 'updated_at';
+        } elseif ($this->type == \App\Folder::TYPE_DELETED) {
+            return 'user_updated_at';
+        } else {
+            return'last_reply_at';
+        }
+    }
+
+    public function url($mailbox_id)
+    {
+        return \Eventy::filter('folder.url', route('mailboxes.view.folder', ['id'=>$mailbox_id, 'folder_id'=>$this->id]), $mailbox_id, $this);
+    }
+
+    public static function create($data, $unique_per_user = true, $save = true)
+    {
+        if (!isset($data['mailbox_id']) || !isset($data['type'])) {
+            return null;
+        }
+        $folder = new Folder ();
+        $folder->mailbox_id = $data['mailbox_id'];
+        $folder->type = $data['type'];
+
+        if (!empty($data['user_id'])) {
+            if ($unique_per_user) {
+                $user_folder = Folder::where('mailbox_id', $data['mailbox_id'])
+                    ->where('user_id', $data['user_id'])
+                    ->where('type', $data['type'])
+                    ->first();
+                // User folder already exists.
+                if ($user_folder) {
+                    return $user_folder;
+                }
+            }
+            $folder->user_id = $data['user_id'];
+        }
+
+        if ($save) {
+            $folder->save();
+        }
+
+        return $folder;
+    }
+
+    /**
+     * Get meta value.
+     */
+    public function getMeta($key, $default = null)
+    {
+        $metas = $this->meta;
+        if (isset($metas[$key])) {
+            return $metas[$key];
+        } else {
+            return $default;
+        }
+    }
+
+    /**
+     * Set meta value.
+     */
+    public function setMeta($key, $value)
+    {
+        $metas = $this->meta;
+        $metas[$key] = $value;
+        $this->meta = $metas;
+    }
+
+    /**
+     * Unset thread meta value.
+     */
+    public function unsetMeta($key)
+    {
+        $metas = $this->meta;
+        if (isset($metas[$key])) {
+            unset($metas[$key]);
+            $this->meta = $metas;
+        }
+    }
 }

app/Follower.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Follower extends Model
+{
+    public $timestamps = false;
+}

app/Http/Controllers/Auth/LoginController.php

@@ -2,8 +2,10 @@
 
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Validation\ValidationException;
 
 class LoginController extends Controller
 {
@@ -25,7 +27,9 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/';
+    protected $redirectTo = '/home';
+
+    public $decayMinutes = 10; // minutes to lockout
 
     /**
      * Create a new controller instance.
@@ -36,4 +40,40 @@ class LoginController extends Controller
     {
         $this->middleware('guest')->except('logout');
     }
+
+    /**
+     * Handle a login request to the application.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
+     */
+    public function login(Request $request)
+    {
+        $this->validateLogin($request);
+
+        // If the class is using the ThrottlesLogins trait, we can automatically throttle
+        // the login attempts for this application. We'll key this by the username and
+        // the IP address of the client making these requests into this application.
+        if ($this->hasTooManyLoginAttempts($request)) {
+            $this->fireLockoutEvent($request);
+
+            return $this->sendLockoutResponse($request);
+        }
+
+        $custom_errors = \Eventy::filter('login.custom_check', [], $request);
+        if ($custom_errors) {
+            throw ValidationException::withMessages($custom_errors);
+        }
+
+        if ($this->attemptLogin($request)) {
+            return $this->sendLoginResponse($request);
+        }
+
+        // If the login attempt was unsuccessful we will increment the number of attempts
+        // to login and redirect the user back to the login form. Of course, when this
+        // user surpasses their maximum number of attempts they will get locked out.
+        $this->incrementLoginAttempts($request);
+
+        return $this->sendFailedLoginResponse($request);
+    }
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -4,6 +4,9 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Auth\Events\PasswordReset;
 
 class ResetPasswordController extends Controller
 {
@@ -36,4 +39,24 @@ class ResetPasswordController extends Controller
     {
         $this->middleware('guest');
     }
+
+    /**
+     * Reset the given user's password.
+     *
+     * @param  \Illuminate\Contracts\Auth\CanResetPassword  $user
+     * @param  string  $password
+     * @return void
+     */
+    protected function resetPassword($user, $password)
+    {
+        $user->password = Hash::make($password);
+
+        $user->setRememberToken(Str::random(60));
+
+        $user->save();
+
+        event(new PasswordReset($user));
+
+        //$this->guard()->login($user);
+    }
 }

app/Http/Controllers/CustomersController.php

@@ -6,7 +6,6 @@ use App\Conversation;
 use App\Customer;
 use App\Email;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use Validator;
 
 class CustomersController extends Controller
@@ -68,12 +67,26 @@ class CustomersController extends Controller
             //'emails'     => 'array|required_without:first_name',
             //'emails.1'   => 'nullable|email|required_without:first_name',
             'emails.*'   => 'nullable|email|distinct|required_without:first_name',
+            'photo_url'   => 'nullable|image|mimes:jpeg,png,jpg,gif',
         ]);
         $validator->setAttributeNames([
-            //'emails.1'   => __('Email'),
+            'photo_url'   => __('Photo'),
             'emails.*'   => __('Email'),
         ]);
-    
+
+        // Photo
+        $validator->after(function ($validator) use ($customer, $request) {
+            if ($request->hasFile('photo_url')) {
+                $path_url = $customer->savePhoto($request->file('photo_url')->getRealPath() ?: $request->file('photo_url')->getPathname(), $request->file('photo_url')->getMimeType());
+
+                if ($path_url) {
+                    $customer->photo_url = $path_url;
+                } else {
+                    $validator->errors()->add('photo_url', __('Error occurred processing the image. Make sure that PHP GD extension is enabled.'));
+                }
+            }
+        });
+
         if ($validator->fails()) {
             return redirect()->route('customers.update', ['id' => $id])
                         ->withErrors($validator)
@@ -96,12 +109,12 @@ class CustomersController extends Controller
         foreach ($new_emails as $new_email) {
             $email = Email::where('email', $new_email)->first();
             if ($email && $email->customer) {
-                // If customer whose email is removed does not have first name and other emails 
+                // If customer whose email is removed does not have first name and other emails
                 // we have to create first name for this customer
                 if (!$email->customer->first_name && count($email->customer->emails) == 1) {
                     if ($request->first_name) {
                         $email->customer->first_name = $request->first_name;
-                    } else if ($customer->first_name) {
+                    } elseif ($customer->first_name) {
                         $email->customer->first_name = $customer->first_name;
                     } else {
                         $email->customer->first_name = mb_ucfirst($email->getNameFromEmail());
@@ -110,15 +123,15 @@ class CustomersController extends Controller
                 }
 
                 $flash_message .= __('Email :tag_email_begin:email:tag_email_end has been moved from another customer:  :a_begin:customer:a_end.', [
-                    'email' => $email->email,
+                    'email'           => $email->email,
                     'tag_email_begin' => '<strong>',
-                    'tag_email_end' => '</strong>',
-                    'customer' => $email->customer->getFullName(),
-                    'a_begin' => '<strong><a href="'.$email->customer->url().'" target="_blank">',
-                    'a_end' => '</a></strong>',
+                    'tag_email_end'   => '</strong>',
+                    'customer'        => $email->customer->getFullName(),
+                    'a_begin'         => '<strong><a href="'.$email->customer->url().'" target="_blank">',
+                    'a_end'           => '</a></strong>',
                 ]).' ';
 
-                $new_emails_change_customer[] = $email->email;
+                $new_emails_change_customer[] = $email;
             }
         }
 
@@ -129,26 +142,37 @@ class CustomersController extends Controller
             }
         }
 
-        $customer->fill($request->all());
-        // Websites
-        if (!empty($request->websites)) {
-            $customer->setWebsites($request->websites);
+        $request_data = $request->all();
+
+        if (isset($request_data['photo_url'])) {
+            unset($request_data['photo_url']);
         }
+
+        $customer->setData($request_data);
+        // Websites
+        // if (!empty($request->websites)) {
+        //     $customer->setWebsites($request->websites);
+        // }
         $customer->save();
 
         $customer->syncEmails($request->emails);
 
-        // Update customer_id in all conversations to the current customer
+        // Update customer_id in all conversations added to the current customer.
         foreach ($new_emails_change_customer as $new_email) {
-            $conversations_to_change_customer = Conversation::where('customer_email', $new_email)->get();
+            if ($new_email->customer_id) {
+                $conversations_to_change_customer = Conversation::where('customer_id', $new_email->customer_id)->get();
+            } else {
+                // This does not work for phone conversations.
+                $conversations_to_change_customer = Conversation::where('customer_email', $new_email->email)->get();
+            }
             foreach ($conversations_to_change_customer as $conversation) {
                 // We have to pass user to create line item and let others know that customer has changed.
                 // Conversation may be even in other mailbox where user does not have an access.
-                $conversation->changeCustomer($new_email, $customer, auth()->user());
+                $conversation->changeCustomer($new_email->email, $customer, auth()->user());
             }
         }
 
-        // Update customer in conversations for removed emails
+        // Update customer in conversations for emails removed from current customer.
         foreach ($removed_emails as $removed_email) {
             $email = Email::where('email', $removed_email)->first();
             if ($email) {
@@ -159,8 +183,12 @@ class CustomersController extends Controller
             }
         }
 
+        \Eventy::action('customer.updated', $customer);
+
         $flash_message = __('Customer saved successfully.').' '.$flash_message;
         \Session::flash('flash_success_unescaped', $flash_message);
+        
+        \Session::flash('customer.updated', 1);
 
         return redirect()->route('customers.update', ['id' => $id]);
     }
@@ -189,7 +217,7 @@ class CustomersController extends Controller
         $user = User::findOrFail($id);
         $this->authorize('update', $user);
 
-        $user->mailboxes()->sync($request->mailboxes);
+        $user->mailboxes()->sync($request->mailboxes ?: []);
 
         \Session::flash('flash_success', __('Permissions saved successfully'));
 
@@ -207,12 +235,13 @@ class CustomersController extends Controller
 
         $conversations = $customer->conversations()
             ->where('customer_id', $customer->id)
+            ->whereIn('mailbox_id', auth()->user()->mailboxesIdsCanView())
             ->orderBy('created_at', 'desc')
             ->paginate(Conversation::DEFAULT_LIST_SIZE);
-                                
+
         return view('customers/conversations', [
             'customer'      => $customer,
-            'conversations' => $conversations
+            'conversations' => $conversations,
         ]);
     }
 
@@ -222,33 +251,113 @@ class CustomersController extends Controller
     public function ajaxSearch(Request $request)
     {
         $response = [
-            'results' => [],
-            'pagination' => ['more' => false]
+            'results'    => [],
+            'pagination' => ['more' => false],
         ];
 
         $q = $request->q;
 
-        $customers = Customer::select('customers.id', 'emails.email', 'first_name', 'last_name')
-            ->join('emails', 'customers.id', '=', 'emails.customer_id')
-            ->where('emails.email', 'like', '%'.$q.'%')
-            ->where('emails.email', '<>', $request->exclude_email)
-            ->orWhere('first_name', 'like', '%'.$q.'%')
-            ->orWhere('last_name', 'like', '%'.$q.'%')
-            ->paginate(20);
+        $user = auth()->user();
+        $limited_visibility = config('app.limit_user_customer_visibility') && !$user->isAdmin();
+
+        $join_emails = false;
+        if ($request->search_by == 'all' || $request->search_by == 'email' || $request->exclude_email) {
+            $join_emails = true;
+        }
+
+        $select_list = ['customers.id', 'first_name', 'last_name'];
+        if ($join_emails) {
+            $select_list[] = 'emails.email';
+        }
+        if ($request->show_fields == 'phone') {
+            $select_list[] = 'phones';
+        }
+        $customers_query = Customer::select($select_list);
+
+        if ($join_emails) {
+            if ($request->allow_non_emails) {
+                $customers_query->leftJoin('emails', 'customers.id', '=', 'emails.customer_id');
+            } else {
+                $customers_query->join('emails', 'customers.id', '=', 'emails.customer_id');
+            }
+        }
+
+        $customers_query->where(function ($query) use ($q, $request) {
+            if ($request->search_by == 'all' || $request->search_by == 'email') {
+                $query->where('emails.email', 'like', '%'.$q.'%');
+            }
+            if ($request->exclude_email) {
+                $query->where('emails.email', '<>', $request->exclude_email);
+            }
+            if ($request->search_by == 'all' || $request->search_by == 'name') {
+                $query->orWhere('first_name', 'like', '%'.$q.'%')
+                    ->orWhere('last_name', 'like', '%'.$q.'%');
+            }
+            if ($request->search_by == 'phone') {
+                $phone_numeric = \Helper::phoneToNumeric($q);
+                if (!$phone_numeric) {
+                    $phone_numeric = $q;
+                }
+                $query->where('customers.phones', 'like', '%'.$phone_numeric.'%');
+            }
+        });
+
+        if ($limited_visibility) {
+            $mailbox_ids = $user->mailboxesIdsCanView();
+            
+            $customers_query->join('conversations', 'conversations.customer_id', '=', 'customers.id');
+            $customers_query->whereIn('conversations.mailbox_id', $mailbox_ids);
+            $customers_query->groupby('customers.id');
+        }
+
+        $customers = $customers_query->paginate(20);
 
         foreach ($customers as $customer) {
-            $text = $customer->email;
-            if ($customer->getFullName()) {
-                $text .= ' ('.$customer->getFullName().')';
-            }
-            if (!empty($request->use_id)) {
-                $id = $customer->id;
+            $id = '';
+            $text = '';
+
+            if ($request->show_fields != 'all') {
+                switch ($request->show_fields) {
+                    case 'email':
+                        $text = $customer->email;
+                        break;
+                    case 'name':
+                        $text = $customer->getFullName();
+                        break;
+                    case 'phone':
+                        // Get phone which matches
+                        $phones = $customer->getPhones();
+                        foreach ($phones as $phone) {
+                            $phone_numeric = \Helper::phoneToNumeric($q);
+                            if (strstr($phone['value'], $q) || strstr($phone['n'] ?? '', $phone_numeric)) {
+                                $text = $phone['value'];
+                                if ($customer->getFullName()) {
+                                    $text .= ' — '.$customer->getFullName();
+                                }
+                                $id = $phone['value'];
+                                break;
+                            }
+                        }
+                        break;
+                    default:
+                        $text = $customer->getNameAndEmail();
+                        break;
+                }
             } else {
-                $id = $customer->email;
+                $text = $customer->getNameAndEmail();
+            }
+
+            if (!$id) {
+                if (!empty($request->use_id)) {
+                    $id = $customer->id;
+                } else {
+                    // https://github.com/freescout-helpdesk/freescout/issues/4057
+                    $id = $customer->email ?? $customer->getMainEmail();
+                }
             }
             $response['results'][] = [
-                'id' => $id,
-                'text' => $text
+                'id'   => $id,
+                'text' => $text,
             ];
         }
 
@@ -256,4 +365,76 @@ class CustomersController extends Controller
 
         return \Response::json($response);
     }
-}
+
+    /**
+     * Ajax controller.
+     */
+    public function ajax(Request $request)
+    {
+        $response = [
+            'status' => 'error',
+            'msg'    => '', // this is error message
+        ];
+
+        $user = auth()->user();
+
+        switch ($request->action) {
+
+            // Change conversation customer.
+            case 'create':
+                $validator_config = [
+                    'first_name' => 'required|string|max:255',
+                    'last_name'  => 'nullable|string|max:255',
+                    'email'      => 'required|email|unique:emails,email',
+                ];
+
+                $limited_visibility = config('app.limit_user_customer_visibility') && !$user->isAdmin();
+                if ($limited_visibility) {
+                    $validator_config['email'] = 'required|email';
+                }
+
+                // First name or email must be specified.
+                $validator = Validator::make($request->all(), $validator_config);
+
+                if ($validator->fails()) {
+                    foreach ($validator->errors()->getMessages()as $errors) {
+                        foreach ($errors as $field => $message) {
+                            $response['msg'] .= $message.' ';
+                        }
+                    }
+                }
+
+                if (!$response['msg']) {
+                   
+                    $customer = Customer::create($request->email, $request->all());
+                    if ($customer) {
+                        $response['email']  = $request->email;
+                        $response['status'] = 'success';
+                    }
+                }
+                break;
+
+            // Conversations navigation
+            case 'customers_pagination':
+            
+                $customers = app('App\Http\Controllers\ConversationsController')->searchCustomers($request, $user);
+
+                $response['status'] = 'success';
+
+                $response['html'] = view('customers/partials/customers_table', [
+                    'customers' => $customers,
+                ])->render();
+                break;
+
+            default:
+                $response['msg'] = 'Unknown action';
+                break;
+        }
+
+        if ($response['status'] == 'error' && empty($response['msg'])) {
+            $response['msg'] = 'Unknown error occurred';
+        }
+
+        return \Response::json($response);
+    }
+}

app/Http/Controllers/MailboxesController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Conversation;
 use App\Folder;
 use App\Mailbox;
+use App\MailboxUser;
 use App\Thread;
 use App\User;
 use Illuminate\Http\Request;
@@ -29,9 +30,17 @@ class MailboxesController extends Controller
      */
     public function mailboxes()
     {
-        //$this->authorize('create', 'App\Mailbox');
-        //$mailboxes = Mailbox::all();
-        $mailboxes = auth()->user()->mailboxesCanView();
+        $user = auth()->user();
+
+        $mailboxes = $user->mailboxesCanView();
+
+        if (!\Eventy::filter('user.can_view_mailbox_menu', false, $user)) {
+            foreach ($mailboxes as $i => $mailbox) {
+                if (!$user->canManageMailbox($mailbox->id)) {
+                    $mailboxes->forget($i);
+                }
+            }
+        }
 
         return view('mailboxes/mailboxes', ['mailboxes' => $mailboxes]);
     }
@@ -43,7 +52,7 @@ class MailboxesController extends Controller
     {
         $this->authorize('create', 'App\Mailbox');
 
-        $users = User::where('role', '!=', User::ROLE_ADMIN)->get();
+        $users = User::nonDeleted()->where('role', '!=', User::ROLE_ADMIN)->get();
 
         return view('mailboxes/create', ['users' => $users]);
     }
@@ -55,6 +64,8 @@ class MailboxesController extends Controller
      */
     public function createSave(Request $request)
     {
+        $invalid = false;
+
         $this->authorize('create', 'App\Mailbox');
 
         $validator = Validator::make($request->all(), [
@@ -64,7 +75,12 @@ class MailboxesController extends Controller
 
         // //event(new Registered($user = $this->create($request->all())));
 
-        if ($validator->fails()) {
+        if (Mailbox::userEmailExists($request->email)) {
+            $invalid = true;
+            $validator->errors()->add('email', __('There is a user with such email. Users and mailboxes can not have the same email addresses.'));
+        }
+
+        if ($invalid || $validator->fails()) {
             return redirect()->route('mailboxes.create')
                         ->withErrors($validator)
                         ->withInput();
@@ -72,9 +88,10 @@ class MailboxesController extends Controller
 
         $mailbox = new Mailbox();
         $mailbox->fill($request->all());
+
         $mailbox->save();
 
-        $mailbox->users()->sync($request->users);
+        $mailbox->users()->sync($request->users ?: []);
         $mailbox->syncPersonalFolders($request->users);
 
         \Session::flash('flash_success_floating', __('Mailbox created successfully'));
@@ -88,9 +105,29 @@ class MailboxesController extends Controller
     public function update($id)
     {
         $mailbox = Mailbox::findOrFail($id);
-        //$this->authorize('update', $mailbox);
-        if (!auth()->user()->can('update', $mailbox)) {
-            $accessible_route = \Eventy::filter('mailbox.accessible_settings_route', '', auth()->user(), $mailbox);
+        $user = auth()->user();
+        if (!$user->can('updateSettings', $mailbox) && !$user->can('updateEmailSignature', $mailbox)) {
+            $accessible_route = '';
+
+            $mailbox_settings = $user->mailboxSettings($mailbox->id);
+            
+            if (!is_array($mailbox_settings->access)) {
+                $access_permissions = json_decode($mailbox_settings->access ?? '');
+            } else {
+                $access_permissions = $mailbox_settings->access;
+            }
+
+            if ($access_permissions && is_array($access_permissions)) {
+                foreach ($access_permissions as $perm) {
+                    $accessible_route = Mailbox::getAccessPermissionRoute($perm);
+                    if ($accessible_route) {
+                        break;
+                    }
+                }
+            }
+            if (!$accessible_route) {
+                $accessible_route = \Eventy::filter('mailbox.accessible_settings_route', '', auth()->user(), $mailbox);
+            }
             if ($accessible_route) {
                 return redirect()->route($accessible_route, ['id' => $mailbox->id]);
             } else {
@@ -98,9 +135,17 @@ class MailboxesController extends Controller
             }
         }
 
+        $user = auth()->user();
+        $mailbox_user = $user->mailboxesWithSettings()->where('mailbox_id', $id)->first();
+        if (!$mailbox_user && $user->isAdmin()) {
+            // Admin may not be connected to the mailbox yet
+            $user->mailboxes()->attach($id);
+            $mailbox_user = $user->mailboxesWithSettings()->where('mailbox_id', $id)->first();
+        }
+
         //$mailboxes = Mailbox::all()->except($id);
 
-        return view('mailboxes/update', ['mailbox' => $mailbox, 'flashes' => $this->mailboxActiveWarning($mailbox)]);
+        return view('mailboxes/update', ['mailbox' => $mailbox, 'mailbox_user' => $mailbox_user, 'flashes' => $this->mailboxActiveWarning($mailbox)]);
     }
 
     /**
@@ -111,31 +156,72 @@ class MailboxesController extends Controller
      */
     public function updateSave($id, Request $request)
     {
+        $invalid = false;
         $mailbox = Mailbox::findOrFail($id);
 
-        $this->authorize('update', $mailbox);
-
-        $validator = Validator::make($request->all(), [
-            'name'             => 'required|string|max:40',
-            'email'            => 'required|string|email|max:128|unique:mailboxes,email,'.$id,
-            'aliases'          => 'nullable|string|max:255',
-            'from_name'        => 'required|integer',
-            'from_name_custom' => 'nullable|string|max:128',
-            'ticket_status'    => 'required|integer',
-            'template'         => 'required|integer',
-            'ticket_assignee'  => 'required|integer',
-            'signature'        => 'nullable|string',
-        ]);
-
-        //event(new Registered($user = $this->create($request->all())));
-
-        if ($validator->fails()) {
-            return redirect()->route('mailboxes.update', ['id' => $id])
-                        ->withErrors($validator)
-                        ->withInput();
+        $user = auth()->user();
+        
+        if (!$user->can('updateSettings', $mailbox) && !$user->can('updateEmailSignature', $mailbox)) {
+            \Helper::denyAccess();
         }
 
+        if ($user->can('updateSettings', $mailbox)) {
+
+            // Checkboxes
+            $request->merge([
+                'aliases_reply' => ($request->filled('aliases_reply') ?? false),
+            ]);
+
+            // if not admin, the text only fields don't pass so spike them into the request.
+            if (!auth()->user()->isAdmin()) {
+                $request->merge([
+                    'name' => $mailbox->name,
+                    'email' => $mailbox->email
+                ]);
+            }
+
+            $validator = Validator::make($request->all(), [
+                'name'             => 'required|string|max:40',
+                'email'            => 'required|string|email|max:128|unique:mailboxes,email,'.$id,
+                'aliases'          => 'nullable|string',
+                'from_name'        => 'required|integer',
+                'from_name_custom' => 'nullable|string|max:128',
+                'ticket_status'    => 'required|integer',
+                'template'         => 'required|integer',
+                'ticket_assignee'  => 'required|integer',
+            ]);
+
+            //event(new Registered($user = $this->create($request->all())));
+            if (Mailbox::userEmailExists($request->email)) {
+                $invalid = true;
+                $validator->errors()->add('email', __('There is a user with such email. Users and mailboxes can not have the same email addresses.'));
+            }
+
+            $validator = \Eventy::filter('mailbox.settings_validator', $validator, $mailbox, $request);
+
+            if ($invalid || count($validator->errors()) || $validator->fails()) {
+                return redirect()->route('mailboxes.update', ['id' => $id])
+                            ->withErrors($validator)
+                            ->withInput();
+            }
+        }
+
+        if ($user->can('updateEmailSignature', $mailbox)) {
+            $validator = Validator::make($request->all(), [
+                'signature'        => 'nullable|string',
+            ]);
+
+            if ($validator->fails()) {
+                return redirect()->route('mailboxes.email_signature', ['id' => $id])
+                    ->withErrors($validator)
+                    ->withInput();
+            }
+        }
+
+        \Eventy::action('mailbox.settings_before_save', $mailbox, $request);
+
         $mailbox->fill($request->all());
+        $mailbox->signature = \Helper::stripDangerousTags($mailbox->signature);
 
         $mailbox->save();
 
@@ -151,11 +237,25 @@ class MailboxesController extends Controller
     {
         $mailbox = Mailbox::findOrFail($id);
 
-        $this->authorize('update', $mailbox);
+        $this->authorize('updatePermissions', $mailbox);
 
-        $users = User::where('role', '!=', User::ROLE_ADMIN)->get();
+        $users = User::nonDeleted()->where('role', '!=', User::ROLE_ADMIN)->get();
+        $users = User::sortUsers($users);
 
-        return view('mailboxes/permissions', ['mailbox' => $mailbox, 'users' => $users, 'mailbox_users' => $mailbox->users]);
+        $managers = User::nonDeleted()
+            ->select(['users.*', 'mailbox_user.hide', 'mailbox_user.access'])
+            ->leftJoin('mailbox_user', function ($join) use ($mailbox) {
+                $join->on('mailbox_user.user_id', '=', 'users.id');
+                $join->where('mailbox_user.mailbox_id', $mailbox->id);
+            })->get();
+        $managers = User::sortUsers($managers);
+
+        return view('mailboxes/permissions', [
+            'mailbox' => $mailbox,
+            'users' => $users,
+            'managers' => $managers,
+            'mailbox_users' => $mailbox->users,
+        ]);
     }
 
     /**
@@ -167,11 +267,72 @@ class MailboxesController extends Controller
     public function permissionsSave($id, Request $request)
     {
         $mailbox = Mailbox::findOrFail($id);
-        $this->authorize('update', $mailbox);
+        $this->authorize('updatePermissions', $mailbox);
+
+        $user = auth()->user();
+        $user_ids = \Eventy::filter('mailbox.permission_users', $request->users ?? [], $id);
+
+        // Get pivot data from mailbox_user to pass to sync() not to loose values.
+        // https://github.com/freescout-help-desk/freescout/issues/4339
+        $users_with_settings = [];
+        $mailbox_users = MailboxUser::where('mailbox_id', $id)
+            //->whereIn('user_id', $user_ids)
+            ->get()
+            ->keyBy('user_id')
+            ->toArray();
+        foreach ($user_ids as $user_id) {
+            $users_with_settings[$user_id] = $mailbox_users[$user_id] ?? [];
+        }
+
+        // Settings for admins are being reset here.
+        // So we restore them below.
+        $mailbox->users()->sync($users_with_settings);
 
-        $mailbox->users()->sync($request->users);
         $mailbox->syncPersonalFolders($request->users);
 
+        // Save admins settings.
+        $admins = User::nonDeleted()->where('role', User::ROLE_ADMIN)->get();
+        foreach ($admins as $admin) {
+            $mailbox_user = $admin->mailboxesWithSettings()->where('mailbox_id', $id)->first();
+            if (!$mailbox_user) {
+                // Admin may not be connected to the mailbox yet
+                $admin->mailboxes()->attach($id);
+                $mailbox_user = $admin->mailboxesWithSettings()->where('mailbox_id', $id)->first();
+            }
+            // Restore settings for admins.
+            if (!empty($mailbox_users[$admin->id])) {
+                $admin_settings = $mailbox_users[$admin->id];
+                foreach (MailboxUser::$pivot_settings as $pivot_parameter) {
+                    if (isset($admin_settings[$pivot_parameter])) {
+                        $mailbox_user->settings->$pivot_parameter = $admin_settings[$pivot_parameter];
+                    }
+                }
+            }
+            $mailbox_user->settings->hide = (isset($request->managers[$admin->id]['hide']) ? (int)$request->managers[$admin->id]['hide'] : false);
+            $mailbox_user->settings->save();
+        }
+
+        // Sets the mailbox_user.access array
+        $mailbox_users = $mailbox->users;
+        foreach ($mailbox_users as $mailbox_user) {
+            $access = [];
+            $mailbox_with_settings = $mailbox_user->mailboxesWithSettings()->where('mailbox_id', $id)->first();
+
+            foreach (Mailbox::$access_permissions as $perm) {
+                if (!empty($request->managers[$mailbox_user->id]['access'][$perm])) {
+                    $access[] = $request->managers[$mailbox_user->id]['access'][$perm];
+                }
+            }
+
+            if ($user->id == $mailbox_user->id && !$user->isAdmin()) {
+                // User with Permission priv's can't edit their own additional priv's.
+            } else {
+                $mailbox_with_settings->settings->access = json_encode($access);
+            }
+            $mailbox_with_settings->settings->hide = (isset($request->managers[$mailbox_user->id]['hide']) ? (int)$request->managers[$mailbox_user->id]['hide'] : false);
+            $mailbox_with_settings->settings->save();
+        }
+
         \Session::flash('flash_success_floating', __('Mailbox permissions saved!'));
 
         return redirect()->route('mailboxes.permissions', ['id' => $id]);
@@ -183,7 +344,7 @@ class MailboxesController extends Controller
     public function connectionOutgoing($id)
     {
         $mailbox = Mailbox::findOrFail($id);
-        $this->authorize('update', $mailbox);
+        $this->authorize('admin', $mailbox);
 
         return view('mailboxes/connection', ['mailbox' => $mailbox, 'sendmail_path' => ini_get('sendmail_path'), 'flashes' => $this->mailboxActiveWarning($mailbox)]);
     }
@@ -194,14 +355,14 @@ class MailboxesController extends Controller
     public function connectionOutgoingSave($id, Request $request)
     {
         $mailbox = Mailbox::findOrFail($id);
-        $this->authorize('update', $mailbox);
+        $this->authorize('admin', $mailbox);
 
         if ($request->out_method == Mailbox::OUT_METHOD_SMTP) {
             $validator = Validator::make($request->all(), [
                 'out_server'          => 'required|string|max:255',
                 'out_port'            => 'required|integer',
-                'out_username'        => 'required|string|max:100',
-                'out_password'        => 'required|string|max:255',
+                'out_username'        => 'nullable|string|max:100',
+                'out_password'        => 'nullable|string|max:255',
                 'out_encryption'      => 'required|integer',
             ]);
 
@@ -212,9 +373,22 @@ class MailboxesController extends Controller
             }
         }
 
-        $mailbox->fill($request->all());
+        // Do not save dummy password.
+        if (preg_match("/^\*+$/", $request->out_password ?? '')) {
+            $params = $request->except(['out_password']);
+        } else {
+            $params = $request->all();
+        }
+        $mailbox->fill($params);
         $mailbox->save();
 
+        if (!empty($request->send_test_to)) {
+            \Option::set('send_test_to', $request->send_test_to);
+        }
+
+        // Sometimes background job continues to use old connection settings.
+        \Helper::queueWorkerRestart();
+
         \Session::flash('flash_success_floating', __('Connection settings saved!'));
 
         return redirect()->route('mailboxes.connection', ['id' => $id]);
@@ -223,12 +397,26 @@ class MailboxesController extends Controller
     /**
      * Mailbox incoming settings.
      */
-    public function connectionIncoming($id)
+    public function connectionIncoming($id, Request $request)
     {
         $mailbox = Mailbox::findOrFail($id);
-        $this->authorize('update', $mailbox);
+        $this->authorize('admin', $mailbox);
 
-        return view('mailboxes/connection_incoming', ['mailbox' => $mailbox, 'flashes' => $this->mailboxActiveWarning($mailbox)]);
+        $fields = [
+            'in_server'   => $mailbox->in_server ?? '',
+            'in_port'     => $mailbox->in_port ?? '',
+            'in_username' => $mailbox->in_username ?? '',
+            'in_password' => $mailbox->in_password ?? '',
+        ];
+
+        $validator = Validator::make($fields, [
+            'in_server'   => 'required',
+            'in_port'     => 'required',
+            'in_username' => 'required',
+            'in_password' => 'required',
+        ]);
+
+        return view('mailboxes/connection_incoming', ['mailbox' => $mailbox, 'flashes' => $this->mailboxActiveWarning($mailbox)])->withErrors($validator);
     }
 
     /**
@@ -237,22 +425,47 @@ class MailboxesController extends Controller
     public function connectionIncomingSave($id, Request $request)
     {
         $mailbox = Mailbox::findOrFail($id);
-        $this->authorize('update', $mailbox);
+        $this->authorize('admin', $mailbox);
 
-        $validator = Validator::make($request->all(), [
-            'in_server'   => 'required|string|max:255',
-            'in_port'     => 'required|integer',
-            'in_username' => 'required|string|max:100',
-            'in_password' => 'required|string|max:255',
+        // $validator = Validator::make($request->all(), [
+        //     'in_server'   => 'nullable|string|max:255',
+        //     'in_port'     => 'nullable|integer',
+        //     'in_username' => 'nullable|string|max:100',
+        //     'in_password' => 'nullable|string|max:255',
+        // ]);
+
+        // if ($validator->fails()) {
+        //     return redirect()->route('mailboxes.connection.incoming', ['id' => $id])
+        //                 ->withErrors($validator)
+        //                 ->withInput();
+        // }
+
+        // Checkboxes
+        $request->merge([
+            'in_validate_cert' => ($request->filled('in_validate_cert') ?? false),
         ]);
 
-        if ($validator->fails()) {
-            return redirect()->route('mailboxes.connection.incoming', ['id' => $id])
-                        ->withErrors($validator)
-                        ->withInput();
+        // Do not save dummy password.
+        if (preg_match("/^\*+$/", $request->in_password ?? '')) {
+            $params = $request->except(['in_password']);
+        } else {
+            $params = $request->all();
         }
 
-        $mailbox->fill($request->all());
+        \Eventy::action('mailbox.incoming_settings_before_save', $mailbox, $request);
+
+        $mailbox->fill($params);
+
+        // Save IMAP Folders.
+        // Save all custom folders except INBOX.
+        $in_imap_folders = [];
+        if (is_array($request->in_imap_folders)) {
+            foreach ($request->in_imap_folders as $imap_folder) {
+                $in_imap_folders[] = $imap_folder;
+            }
+        }
+        $mailbox->setInImapFolders($in_imap_folders);
+
         $mailbox->save();
 
         \Session::flash('flash_success_floating', __('Connection settings saved!'));
@@ -263,12 +476,12 @@ class MailboxesController extends Controller
     /**
      * View mailbox.
      */
-    public function view($id, $folder_id = null)
+    public function view(Request $request, $id, $folder_id = null)
     {
-        //auth()->guard()->attempt(['email' => '', 'password' => '']);
+        $user = auth()->user();
 
-        $mailbox = Mailbox::findOrFail($id);
-        $this->authorize('view', $mailbox);
+        $mailbox = Mailbox::findOrFailWithSettings($id, $user->id);
+        $this->authorize('viewCached', $mailbox);
 
         $folders = $mailbox->getAssesibleFolders();
 
@@ -287,10 +500,10 @@ class MailboxesController extends Controller
 
         $this->authorize('view', $folder);
 
-        $user = auth()->user();
-
         $query_conversations = Conversation::getQueryByFolder($folder, $user->id);
-        $conversations = $folder->queryAddOrderBy($query_conversations)->paginate(Conversation::DEFAULT_LIST_SIZE);
+        $conversations = $folder->queryAddOrderBy($query_conversations)->paginate(
+            Conversation::DEFAULT_LIST_SIZE, ['*'], 'page', $request->get('page')
+        );
 
         return view('mailboxes/view', [
             'mailbox'       => $mailbox,
@@ -304,7 +517,7 @@ class MailboxesController extends Controller
     {
         $flashes = [];
 
-        if ($mailbox) {
+        if ($mailbox && \Auth::user()->can('admin', $mailbox)) {
             if (Route::currentRouteName() != 'mailboxes.connection' && !$mailbox->isOutActive()) {
                 $flashes[] = [
                     'type'      => 'warning',
@@ -330,14 +543,14 @@ class MailboxesController extends Controller
     public function autoReply($id)
     {
         $mailbox = Mailbox::findOrFail($id);
-        $this->authorize('update', $mailbox);
+        $this->authorize('updateAutoReply', $mailbox);
 
         if (!$mailbox->auto_reply_subject) {
             $mailbox->auto_reply_subject = 'Re: {%subject%}';
         }
 
         return view('mailboxes/auto_reply', [
-            'mailbox' => $mailbox
+            'mailbox' => $mailbox,
         ]);
     }
 
@@ -348,10 +561,11 @@ class MailboxesController extends Controller
     {
         $mailbox = Mailbox::findOrFail($id);
 
-        $this->authorize('update', $mailbox);
- 
+//        $this->authorize('update', $mailbox);
+        $this->authorize('updateAutoReply', $mailbox);
+
         $request->merge([
-            'auto_reply_enabled'     => ($request->filled('auto_reply_enabled') ?? false)
+            'auto_reply_enabled'     => ($request->filled('auto_reply_enabled') ?? false),
         ]);
 
         if ($request->auto_reply_enabled) {
@@ -363,8 +577,8 @@ class MailboxesController extends Controller
             ]);
             $validator->setAttributeNames([
                 'auto_reply_subject' => __('Subject'),
-                'auto_reply_message' => __('Message')
-            ]); 
+                'auto_reply_message' => __('Message'),
+            ]);
 
             if ($validator->fails()) {
                 return redirect()->route('mailboxes.auto_reply', ['id' => $id])
@@ -374,6 +588,7 @@ class MailboxesController extends Controller
         }
 
         $mailbox->fill($request->all());
+        $mailbox->auto_reply_message = \Helper::stripDangerousTags($mailbox->auto_reply_message);
 
         $mailbox->save();
 
@@ -382,6 +597,24 @@ class MailboxesController extends Controller
         return redirect()->route('mailboxes.auto_reply', ['id' => $id]);
     }
 
+    /**
+     * Auto reply settings.
+     */
+    public function emailSignature($id)
+    {
+        $mailbox = Mailbox::findOrFail($id);
+        $this->authorize('updateAutoReply', $mailbox);
+
+        if (!$mailbox->auto_reply_subject) {
+            $mailbox->auto_reply_subject = 'Re: {%subject%}';
+        }
+
+        return view('mailboxes/email_signature', [
+            'mailbox' => $mailbox,
+        ]);
+    }
+
+
     /**
      * Users ajax controller.
      */
@@ -402,24 +635,37 @@ class MailboxesController extends Controller
 
                 if (!$mailbox) {
                     $response['msg'] = __('Mailbox not found');
-                } elseif (!$user->can('update', $mailbox)) {
+                } elseif (!$user->can('admin', $mailbox)) {
                     $response['msg'] = __('Not enough permissions');
                 } elseif (empty($request->to)) {
                     $response['msg'] = __('Please specify recipient of the test email');
                 }
 
+                // Check if outgoing port is open.
+                if (!$response['msg'] && $mailbox->out_method == Mailbox::OUT_METHOD_SMTP) {
+                    $test_result = \Helper::checkPort($mailbox->out_server, $mailbox->out_port);
+                    if (!$test_result) {
+                        $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->out_server.'</strong>', 'port' => '<strong>'.$mailbox->out_port.'</strong>']);
+                    }
+                }
+
                 if (!$response['msg']) {
-                    $test_result = false;
+                    $test_result = [
+                        'status' => 'error'
+                    ];
 
                     try {
-                        $test_result = \App\Misc\Mail::sendTestMail($request->to, $mailbox);
+                        $test_result = \MailHelper::sendTestMail($request->to, $mailbox);
                     } catch (\Exception $e) {
-                        $response['msg'] = $e->getMessage();
+                        $test_result['msg'] = $e->getMessage();
                     }
 
-                    if (!$test_result && !$response['msg']) {
-                        $response['msg'] = __('Error occurend sending email. Please check your mail server logs for more details.');
+                    if ($test_result['status'] == 'error') {
+                        $response['msg'] = $test_result['msg']
+                            ?: __('Error occurred sending email. Please check your mail server logs for more details.');
                     }
+
+                    $response['log'] = $test_result['log'] ?? '';
                 }
 
                 if (!$response['msg']) {
@@ -437,23 +683,98 @@ class MailboxesController extends Controller
                 $mailbox = Mailbox::find($request->mailbox_id);
 
                 if (!$mailbox) {
-                    $response['msg'] = __('Conversation not found');
-                } elseif (!$user->can('update', $mailbox)) {
+                    $response['msg'] = __('Mailbox not found');
+                } elseif (!$user->can('admin', $mailbox)) {
                     $response['msg'] = __('Not enough permissions');
                 }
 
-                if (!$response['msg']) {
+                $response = \Eventy::filter('mailbox.fetch_test', $response, $mailbox);
+
+                $tested = (isset($response['tested']) && $response['tested'] === true);
+
+                // Check if outgoing port is open.
+                if (!$response['msg'] && !$tested) {
+                    $test_result = \Helper::checkPort($mailbox->in_server, $mailbox->in_port);
+                    if (!$test_result) {
+                        $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'] && !$tested) {
                     $test_result = false;
 
+                    $test_result = \MailHelper::fetchTest($mailbox);
+
+                    $response['log'] = $test_result['log'] ?? '';
+
+                    if ($test_result['result'] != 'success' && $test_result['msg']) {
+                        $response['msg'] = $test_result['msg'];
+                    }
+                    if ($test_result['result'] != 'success' && !$response['msg']) {
+                        $response['msg'] = __('Error occurred connecting to the server');
+                    }
+                }
+
+                if (!$response['msg'] && !$tested) {
+                    $response['status'] = 'success';
+                }
+                break;
+
+            // Retrieve a list of available IMAP folders from server.
+            case 'imap_folders':
+                $mailbox = Mailbox::find($request->mailbox_id);
+
+                if (!$mailbox) {
+                    $response['msg'] = __('Mailbox not found');
+                } elseif (!$user->can('admin', $mailbox)) {
+                    $response['msg'] = __('Not enough permissions');
+                }
+
+                $response['folders'] = [];
+
+                if (!$response['msg']) {
+
                     try {
-                        $test_result = \App\Misc\Mail::fetchTest($mailbox);
+                        $client = \MailHelper::getMailboxClient($mailbox);
+                        $client->connect();
+
+                        $imap_folders = $client->getFolders();
+
+                        $response['folders'] = [];
+
+                        if (count($imap_folders)) {
+                            $response = $this->interateFolders($response, $imap_folders);
+                            $response['folders'] = array_values(array_unique($response['folders']));
+                        }
+
+                        if (count($response['folders'])) {
+
+                            // https://github.com/freescout-helpdesk/freescout/issues/3933
+                            // Exclude duplicate INBOX.Name and Name folders.
+                            // $folder_excluded = false;
+                            // foreach ($response['folders'] as $i => $folder_name) {
+                            //     if (\Str::startsWith($folder_name, 'INBOX.')) {
+                            //         foreach ($response['folders'] as $folder_name2) {
+                            //             if ($folder_name != $folder_name2 && $folder_name == 'INBOX.'.$folder_name2) {
+                            //                 unset($response['folders'][$i]);
+                            //                 $folder_excluded = true;
+                            //                 continue 2;
+                            //             }
+                            //         }
+                            //     }
+                            // }
+                            // if ($folder_excluded) {
+                            //     $response['folders'] = array_values($response['folders']);
+                            // }
+
+                            $response['msg_success'] = __('IMAP folders retrieved: '.implode(', ', $response['folders']));
+                        } else {
+                            $response['msg_success'] = __('Connected, but no IMAP folders found');
+                        }
+
                     } catch (\Exception $e) {
                         $response['msg'] = $e->getMessage();
                     }
-
-                    if (!$test_result && !$response['msg']) {
-                        $response['msg'] = __('Error occurend connecting to the server');
-                    }
                 }
 
                 if (!$response['msg']) {
@@ -467,22 +788,27 @@ class MailboxesController extends Controller
 
                 if (!$mailbox) {
                     $response['msg'] = __('Mailbox not found');
-                } elseif (!$user->can('update', $mailbox)) {
+                } elseif (!$user->can('admin', $mailbox)) {
                     $response['msg'] = __('Not enough permissions');
-                } elseif (!Hash::check($request->password, $user->password)) {
+                } elseif (!$user->isDummyPassword() && !Hash::check($request->password ?? '', $user->password)) {
                     $response['msg'] = __('Please double check your password, and try again');
                 }
 
                 if (!$response['msg']) {
 
-                    // Remove threads and conversations
-                    Thread::whereIn('conversation_id', $mailbox->conversations()->pluck('id')->toArray())
-                        ->delete();
+                    // Remove threads and conversations.
+                    $conversation_ids = $mailbox->conversations()->pluck('id')->toArray();
+                    
+                    for ($i=0; $i < ceil(count($conversation_ids) / \Helper::IN_LIMIT); $i++) { 
+                        $slice_ids = array_slice($conversation_ids, $i*\Helper::IN_LIMIT, \Helper::IN_LIMIT);
+                        Thread::whereIn('conversation_id', $slice_ids)->delete();
+                    }
+
                     $mailbox->conversations()->delete();
                     $mailbox->users()->sync([]);
                     $mailbox->folders()->delete();
                     // Maybe remove notifications on events in this mailbox?
-                    
+
                     $mailbox->delete();
 
                     \Session::flash('flash_success_floating', __('Mailbox deleted'));
@@ -491,15 +817,205 @@ class MailboxesController extends Controller
                 }
                 break;
 
+            // Mute notifications
+            case 'mute':
+                $mailbox = Mailbox::find($request->mailbox_id);
+
+                if (!$mailbox) {
+                    $response['msg'] = __('Mailbox not found');
+                }
+
+                if (!$response['msg']) {
+
+                    $mailbox_user = $user->mailboxesWithSettings()->where('mailbox_id', $mailbox->id)->first();
+                    if (!$mailbox_user) {
+                        // User may not be connected to the mailbox yet
+                        $user->mailboxes()->attach($mailbox->id);
+                        $mailbox_user = $user->mailboxesWithSettings()->where('mailbox_id', $mailbox->id)->first();
+                    }
+                    $mailbox_user->settings->mute = (bool)$request->mute;
+                    $mailbox_user->settings->save();
+
+                    $response['status'] = 'success';
+                }
+                break;
+
             default:
                 $response['msg'] = 'Unknown action';
                 break;
         }
 
         if ($response['status'] == 'error' && empty($response['msg'])) {
-            $response['msg'] = 'Unknown error occured';
+            $response['msg'] = 'Unknown error occurred';
         }
 
         return \Response::json($response);
     }
+
+    // Recursively interate over folders.
+    public function interateFolders($response, $imap_folders, $subfolder = false) {
+        foreach ($imap_folders as $imap_folder) {
+            if (!empty($imap_folder->name) && !$subfolder) {
+                $response['folders'][] = $imap_folder->name;
+            }
+
+            // Check for children and recurse.
+            if (!empty($imap_folder->children)) {
+                $response = $this->interateFolders($response, $imap_folder->children, true);
+            }
+
+            // Old library.
+            if (!empty($imap_folder->fullName)) {
+                $response['folders'][] = $imap_folder->fullName;
+            } elseif (!empty($imap_folder->full_name)) {
+                // New library.
+                $response['folders'][] = $imap_folder->full_name;
+            }
+        }
+
+        return $response;
+    }
+
+    public function oauth(Request $request)
+    {
+        $mailbox_id = $request->id ?? '';
+        $provider = $request->provider ?? '';
+        $in_out = $request->in_out ?? 'in';
+        
+        $state_data = [];
+        if (!empty($request->state)) {
+            $state_data = json_decode($request->state, true);
+            if (!empty($state_data['mailbox_id'])) {
+                $mailbox_id = $state_data['mailbox_id'];
+            }
+            if (!empty($state_data['provider'])) {
+                $provider = $state_data['provider'];
+            }
+            if (!empty($state_data['in_out'])) {
+                $in_out = $state_data['in_out'];
+            }
+        }
+
+        // MS Exchange.
+        if (!empty($request->error) && $request->error == 'invalid_request' && !empty($request->error_description)) {
+            return htmlspecialchars($request->error_description);
+        }
+
+        if (empty($provider)) {
+            return 'Invalid oAuth Provider';
+        }
+
+        $mailbox = Mailbox::findOrFail($mailbox_id);
+        $this->authorize('admin', $mailbox);
+
+        if (empty($mailbox)) {
+            return __('Mailbox not found').': '.$mailbox_id;
+        }
+        if ($in_out == 'in') {
+            $username = $mailbox->in_username;
+            $password = $mailbox->in_password;
+        } else {
+            $username = $mailbox->out_username;
+            $password = $mailbox->out_password;
+        }
+        if (empty($username)) {
+            return 'Enter oAuth Client ID as Username and save mailbox settings';
+        }
+        if (empty($password)) {
+            return 'Enter oAuth Client Secret as Password and save mailbox settings';
+        }
+
+        $session_data = [];
+        if (\Session::get('mailbox_oauth_'.$provider.'_'.$mailbox_id)) {
+            $session_data = \Session::get('mailbox_oauth_'.$provider.'_'.$mailbox_id);
+        }
+
+        if (empty($request->code)) {
+            // Start.
+            $state = [
+                'provider' => $provider,
+                'mailbox_id' => $mailbox_id,
+                'in_out' => $in_out,
+                'state' => crc32($username.$password),
+            ];
+            $url = \MailHelper::oauthGetAuthorizationUrl(\MailHelper::OAUTH_PROVIDER_MICROSOFT, [
+                'state' => json_encode($state),
+                'client_id' => $username,
+            ]);
+            if ($url) {
+                \Session::put('mailbox_oauth_'.$provider.'_'.$mailbox_id, $state);
+                //     [
+                //     'provider' => $request->provider,
+                //     'mailbox_id' => $request->mailbox_id,
+                //     'state' => $provider->getState(),
+                // ]);
+                return redirect()->away($url);
+            } else {
+                return 'Could not generate authorization URL: check Client ID (Username) and Client Secret (Password)';
+            }
+
+        // Check given state against previously stored one to mitigate CSRF attack
+        } elseif (empty($request->state) || ($state_data['state'] ?? '') !== ($session_data['state'] ?? '')) {
+            
+            \Session::forget('mailbox_oauth_'.$provider.'_'.$mailbox_id);
+            return 'Invalid oAuth state';
+
+        } else {
+            // state is set.
+            // Try to get an access token (using the authorization code grant)
+            $token_data = \MailHelper::oauthGetAccessToken(\MailHelper::OAUTH_PROVIDER_MICROSOFT, [
+                'client_id' => $username,
+                'client_secret' => $password,
+                'code' => $request->code,
+            ]);
+
+            if (!empty($token_data['a_token'])) {
+                // Set username and password for the oppozite in_out.
+                if ($in_out == 'in') {
+                    if (empty($mailbox->out_server) 
+                        || (trim($mailbox->out_server) == \MailHelper::OAUTH_MICROSOFT_SMTP 
+                            && (!$mailbox->out_username || $mailbox->out_username == $username))
+                    ) {
+                        $mailbox->out_username = $username;
+                        $mailbox->out_password = $password;
+                    }
+                    //$mailbox->out_method = Mailbox::OUT_METHOD_SMTP;
+                } else {
+                    $mailbox->in_username = $username;
+                    $mailbox->in_password = $password;
+                }
+                $mailbox->setMetaParam('oauth', $token_data, true);
+            } elseif (!empty($token_data['error'])) {
+                return __('Error occurred').': '.htmlspecialchars($token_data['error']);
+            }
+
+            if ($in_out == 'in') {
+                $route = 'mailboxes.connection.incoming';
+            } else {
+                $route = 'mailboxes.connection';
+            }
+            return redirect()->route($route, ['id' => $mailbox_id]);
+        }
+    }
+
+    public function oauthDisconnect(Request $request)
+    {
+        $mailbox_id = $request->id ?? '';
+        $provider = $request->provider ?? '';
+        $in_out = $request->in_out ?? 'in';
+
+        $mailbox = Mailbox::findOrFail($mailbox_id);
+        $this->authorize('admin', $mailbox);
+        
+        // oAuth Disconnect.
+        $mailbox->removeMetaParam('oauth', true);
+
+        if ($in_out == 'in') {
+            $route = 'mailboxes.connection.incoming';
+        } else {
+            $route = 'mailboxes.connection';
+        }
+
+        return \MailHelper::oauthDisconnect($provider, route($route, ['id' => $mailbox_id]));
+    }
 }

app/Http/Controllers/ModulesController.php

@@ -28,11 +28,18 @@ class ModulesController extends Controller
     {
         $installed_modules = [];
         $modules_directory = [];
-
+        $third_party_modules = [];
+        $all_modules = [];
         $flashes = [];
+        $updates_available = false;
+
         $flash = \Cache::get('modules_flash');
         if ($flash) {
-            $flashes[] = $flash;
+            if (is_array($flash) && !isset($flash['text'])) {
+                $flashes = $flash;
+            } else {
+                $flashes[] = $flash;
+            }
             \Cache::forget('modules_flash');
         }
 
@@ -52,22 +59,31 @@ class ModulesController extends Controller
         \Module::clearCache();
         $modules = \Module::all();
         foreach ($modules as $module) {
-            $img = '';
-            $installed_modules[] = [
-                'alias'              => $module->getAlias(),
-                'name'               => $module->getName(),
-                'description'        => $module->getDescription(),
-                'version'            => $module->get('version'),
-                'detailsUrl'         => $module->get('detailsUrl'),
-                'author'             => $module->get('author'),
-                'authorUrl'          => $module->get('authorUrl'),
-                'requiredAppVersion' => $module->get('requiredAppVersion'),
-                'img'                => $img,
-                'active'             => $module->active(), //\App\Module::isActive($module->getAlias()),
-                'installed'          => true,
-                'activated'          => \App\Module::isLicenseActivated($module->getAlias(), $module->get('authorUrl')),
-                'license'            => \App\Module::getLicense($module->getAlias()),
+            $module_data = [
+                'alias'                        => $module->getAlias(),
+                'name'                         => $module->getName(),
+                'description'                  => $module->getDescription(),
+                'version'                      => $module->get('version'),
+                'detailsUrl'                   => $module->get('detailsUrl'),
+                'author'                       => $module->get('author'),
+                'authorUrl'                    => $module->get('authorUrl'),
+                'requiredAppVersion'           => $module->get('requiredAppVersion'),
+                'requiredPhpExtensions'        => $module->get('requiredPhpExtensions'),
+                'requiredPhpExtensionsMissing' => \App\Module::getMissingExtensions($module->get('requiredPhpExtensions')),
+                'requiredModulesMissing'       => \App\Module::getMissingModules($module->get('requiredModules'), $modules),
+                'img'                          => $module->get('img'),
+                'active'                       => $module->active(), //\App\Module::isActive($module->getAlias()),
+                'installed'                    => true,
+                'activated'                    => \App\Module::isLicenseActivated($module->getAlias(), $module->get('authorUrl')),
+                'license'                      => \App\Module::getLicense($module->getAlias()),
+                // Update configuration for third party modules
+                'latestVersionNumberUrl'       => $module->get('latestVersionUrl'),
+                'latestVersionZipUrl'          => $module->get('latestVersionZipUrl'),
+                // Determined later
+                'new_version'        => '',
             ];
+            $module_data = \App\Module::formatModuleData($module_data);
+            $installed_modules[] = $module_data;
         }
 
         // No need, as we update modules list on each page load
@@ -79,12 +95,27 @@ class ModulesController extends Controller
         // Prepare directory modules
         if (is_array($modules_directory)) {
             foreach ($modules_directory as $i_dir => $dir_module) {
-                // Remove installed modules from modules directory
+
+                $modules_directory[$i_dir] = \App\Module::formatModuleData($dir_module);
+
+                // Remove modules without aliases
+                if (empty($dir_module['alias'])) {
+                    unset($modules_directory[$i_dir]);
+                }
+                $all_modules[$dir_module['alias']] = $dir_module['name'];
                 foreach ($installed_modules as $i_installed => $module) {
                     if ($dir_module['alias'] == $module['alias']) {
                         // Set image from director
                         $installed_modules[$i_installed]['img'] = $dir_module['img'];
+                        // Remove installed modules from modules directory.
                         unset($modules_directory[$i_dir]);
+
+                        // Detect if new version is available
+                        if (!empty($dir_module['version']) && version_compare($dir_module['version'], $module['version'], '>')) {
+                            $installed_modules[$i_installed]['new_version'] = $dir_module['version'];
+                            $updates_available = true;
+                        }
+
                         continue 2;
                     }
                 }
@@ -94,17 +125,81 @@ class ModulesController extends Controller
                     continue;
                 }
 
+                if (!empty($dir_module['requiredPhpExtensions'])) {
+                    $modules_directory[$i_dir]['requiredPhpExtensionsMissing'] = \App\Module::getMissingExtensions($dir_module['requiredPhpExtensions']);
+                }
                 $modules_directory[$i_dir]['active'] = \App\Module::isActive($dir_module['alias']);
                 $modules_directory[$i_dir]['activated'] = false;
+
+                // Do not show third-party modules in Modules Directory.
+                if (\App\Module::isThirdParty($dir_module)) {
+                    $third_party_modules[] = $modules_directory[$i_dir];
+                    unset($modules_directory[$i_dir]);
+                }
             }
         } else {
             $modules_directory = [];
         }
 
+        // Loop through each installed module
+        foreach ($installed_modules as $i_installed => $module) {
+            // Check if the module is an official one
+            if (\App\Module::isOfficial($module['authorUrl'])) {
+                continue;
+            }
+
+            // Get the URL for the latest version of the module
+            $latest_version_number_url = $module['latestVersionNumberUrl'] ?? null;
+            if (! $latest_version_number_url) {
+                continue;
+            }
+
+            // Create a new Guzzle HTTP client
+            $client = new \GuzzleHttp\Client();
+
+            try {
+                // Send a GET request to the latest version URL
+                $response = $client->request('GET', $latest_version_number_url, \Helper::setGuzzleDefaultOptions());
+
+                // Get the latest version number from the response body
+                $latest_version = trim((string) $response->getBody());
+
+                if (empty($latest_version)) {
+                    continue;
+                } else {
+                    // Get the current version of the module
+                    $current_version = $module['version'];
+                }
+            } catch (\Exception $e) {
+                // If there's an exception, skip to the next iteration
+                continue;
+            }
+
+            // If the latest version is greater than the current version
+            if (version_compare($latest_version, $current_version, '>')) {
+                // Update the installed module's version
+                $installed_modules[ $i_installed ]['new_version'] = $latest_version;
+                // Set the flag to indicate that updates are available
+                $updates_available = true;
+            }
+        }
+
+        // Check modules symlinks. Somestimes instead of symlinks folders with files appear.
+        $invalid_symlinks = \App\Module::checkSymlinks(
+            collect($installed_modules)->where('active', true)->pluck('alias')->toArray()
+        );
+
+        // Sort all modules.
+        asort($all_modules);
+
         return view('modules/modules', [
             'installed_modules' => $installed_modules,
             'modules_directory' => $modules_directory,
-            'flashes'           => $flashes
+            'third_party_modules' => $third_party_modules,
+            'flashes'           => $flashes,
+            'updates_available' => $updates_available,
+            'all_modules'       => $all_modules,
+            'invalid_symlinks'  => $invalid_symlinks,
         ]);
     }
 
@@ -123,7 +218,7 @@ class ModulesController extends Controller
             case 'install':
             case 'activate_license':
                 $license = $request->license;
-                $alias   = $request->alias;
+                $alias = $request->alias;
 
                 if (!$license) {
                     $response['msg'] = __('Empty license key');
@@ -133,31 +228,31 @@ class ModulesController extends Controller
                     $params = [
                         'license'      => $license,
                         'module_alias' => $alias,
-                        'url'          => $request->getHttpHost(),
+                        'url'          => \App\Module::getAppUrl(),
                     ];
                     $result = WpApi::activateLicense($params);
 
                     if (WpApi::$lastError) {
                         $response['msg'] = WpApi::$lastError['message'];
-                    } else if (!empty($result['code']) && !empty($result['message'])) {
+                    } elseif (!empty($result['code']) && !empty($result['message'])) {
                         $response['msg'] = $result['message'];
                     } else {
                         if (!empty($result['status']) && $result['status'] == 'valid') {
-
                             if ($request->action == 'install') {
                                 // Download and install module
                                 $license_details = WpApi::getVersion($params);
-                                
+
                                 if (WpApi::$lastError) {
                                     $response['msg'] = WpApi::$lastError['message'];
-                                } else if (!empty($license_details['code']) && !empty($license_details['message'])) {
+                                } elseif (!empty($license_details['code']) && !empty($license_details['message'])) {
                                     $response['msg'] = $license_details['message'];
                                 } elseif (!empty($license_details['download_link'])) {
                                     // Download module
                                     $module_archive = \Module::getPath().DIRECTORY_SEPARATOR.$alias.'.zip';
+
                                     try {
                                         \Helper::downloadRemoteFile($license_details['download_link'], $module_archive);
-                                    } catch(\Exception $e) {
+                                    } catch (\Exception $e) {
                                         $response['msg'] = $e->getMessage();
                                     }
 
@@ -168,7 +263,7 @@ class ModulesController extends Controller
                                         // Extract
                                         try {
                                             \Helper::unzip($module_archive, \Module::getPath());
-                                        } catch(\Exception $e) {
+                                        } catch (\Exception $e) {
                                             $response['msg'] = $e->getMessage();
                                         }
                                         // Check if extracted module exists
@@ -190,19 +285,17 @@ class ModulesController extends Controller
 
                                         \Session::flash('flash_success_floating', __('Module successfully installed!'));
                                         $response['status'] = 'success';
-
                                     } elseif ($download_error) {
-
                                         $response['reload'] = true;
 
                                         if ($response['msg']) {
                                             \Session::flash('flash_error_floating', $response['msg']);
                                         }
 
-                                        \Session::flash('flash_error_unescaped', __('Error occured downloading the module. Please :%a_being%download:%a_end% module manually and extract into :folder', ['%a_being%' => '<a href="'.$license_details['download_link'].'" target="_blank">', '%a_end%' => '</a>', 'folder' => '<strong>'.\Module::getPath().'</strong>']));
+                                        \Session::flash('flash_error_unescaped', __('Error occurred downloading the module. Please :%a_being%download:%a_end% module manually and extract into :folder', ['%a_being%' => '<a href="'.$license_details['download_link'].'" target="_blank">', '%a_end%' => '</a>', 'folder' => '<strong>'.\Module::getPath().'</strong>']));
                                     }
                                 } else {
-                                    $response['msg'] = __('Error occured, please try again later.');
+                                    $response['msg'] = __('Error occurred. Please try again later.');
                                 }
                             } else {
                                 // Just activate license
@@ -211,36 +304,10 @@ class ModulesController extends Controller
                                 \Session::flash('flash_success_floating', __('License successfully activated!'));
                                 $response['status'] = 'success';
                             }
-
                         } elseif (!empty($result['error'])) {
-                            switch ($result['error']) {
-                                case 'missing':
-                                    $response['msg'] = __('License key does not exist');
-                                    break;
-                                case 'license_not_activable':
-                                    $response['msg'] = __("You have to activate each bundle's module separately");
-                                    break;
-                                case 'disabled':
-                                    $response['msg'] = __("License key has been revoked");
-                                    break;
-                                case 'no_activations_left':
-                                    $response['msg'] = __("No activations left for this license key");
-                                    break;
-                                case 'expired':
-                                    $response['msg'] = __("License key has expired");
-                                    break;
-                                case 'key_mismatch':
-                                    $response['msg'] = __("License key belongs to another module");
-                                    break;
-                                case 'invalid_item_id':
-                                    $response['msg'] = __("Module not found in the modules directory");
-                                    break;
-                                default:
-                                    $response['msg'] = __('Error code:'.' '.$result['error']);
-                                    break;
-                            }
+                            $response['msg'] = \App\Module::getErrorMessage($result['error'], $result);
                         } else {
-                            $response['msg'] = __('Error occured, please try again later.');
+                            $response['msg'] = __('Error occurred. Please try again later.');
                         }
                     }
                 }
@@ -248,27 +315,142 @@ class ModulesController extends Controller
 
             case 'activate':
                 $alias = $request->alias;
-                \App\Module::setActive($alias, true);
+                $module = \Module::findByAlias($alias);
 
-                $outputLog = new BufferedOutput;
-                \Artisan::call('freescout:module-install', ['module_alias' => $alias], $outputLog);
+                if (!$module) {
+                    $response['msg'] = __('Module not found').': '.$alias;
+                }
+
+                // Check license
+                if (!$response['msg']) {
+                    if (!empty($module->get('authorUrl')) && $module->isOfficial()) {
+                        $params = [
+                            'license'      => $module->getLicense(),
+                            'module_alias' => $alias,
+                            'url'          => \App\Module::getAppUrl(),
+                        ];
+                        $license_result = WpApi::checkLicense($params);
+
+                        if (!empty($license_result['code']) && !empty($license_result['message'])) {
+                            // Remove remembered license key and deactivate license in DB
+                            \App\Module::deactivateLicense($alias, '');
+
+                            $response['msg'] = $license_result['message'];
+                        } elseif (!empty($license_result['status']) && $license_result['status'] != 'valid' && $license_result['status'] != 'inactive') {
+                            // Remove remembered license key and deactivate license in DB
+                            \App\Module::deactivateLicense($alias, '');
+
+                            switch ($license_result['status']) {
+                                case 'expired':
+                                    $response['msg'] = __('License key has expired');
+                                    break;
+                                case 'disabled':
+                                    $response['msg'] = __('License key has been revoked');
+                                    break;
+                                case 'inactive':
+                                    $response['msg'] = __('License key has not been activated yet');
+                                case 'site_inactive':
+                                    $response['msg'] = __('No activations left for this license key').' ('.__("Use 'Deactivate License' link above to transfer license key from another domain").')';
+                                    break;
+                            }
+                        } elseif (!empty($license_result['status']) && $license_result['status'] == 'inactive') {
+                            // Activate the license.
+                            $result = WpApi::activateLicense($params);
+                            if (WpApi::$lastError) {
+                                $response['msg'] = WpApi::$lastError['message'];
+                            } elseif (!empty($result['code']) && !empty($result['message'])) {
+                                $response['msg'] = $result['message'];
+                            } else {
+                                if (!empty($result['status']) && $result['status'] == 'valid') {
+                                    // Success.
+                                } elseif (!empty($result['error'])) {
+                                    $response['msg'] = \App\Module::getErrorMessage($result['error'], $result);
+                                } else {
+                                    // Some unknown error. Do nothing.
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (!$response['msg']) {
+                    \App\Module::setActive($alias, true);
+
+                    $outputLog = new BufferedOutput();
+                    \Artisan::call('freescout:module-install', ['module_alias' => $alias], $outputLog);
+                    $output = $outputLog->fetch();
+
+                    // Get module name
+                    $name = '?';
+                    if ($module) {
+                        $name = $module->getName();
+                    }
+
+                    $type = 'danger';
+                    $msg = __('Error occurred activating ":name" module', ['name' => $name]);
+                    if (session('flashes_floating') && is_array(session('flashes_floating'))) {
+                        // If there was any error, module has been deactivated via modules.register_error filter
+                        $msg = '';
+                        foreach (session('flashes_floating') as $flash) {
+                            $msg .= $flash['text'].' ';
+                        }
+                    } elseif (strstr($output, 'Configuration cached successfully')) {
+                        $type = 'success';
+                        $msg = __('":name" module successfully activated!', ['name' => $name]);
+                    } else {
+                        // Deactivate the module.
+                        \App\Module::setActive($alias, false);
+                        \Artisan::call('freescout:clear-cache');
+                    }
+
+                    // Check public folder.
+                    if ($module && file_exists($module->getPath().DIRECTORY_SEPARATOR.'Public')) {
+                        $symlink_path = public_path().\Module::getPublicPath($alias);
+                        if (!file_exists($symlink_path)) {
+                            $type = 'danger';
+                            $msg = 'Error occurred creating a module symlink ('.$symlink_path.'). Please check folder permissions.';
+                            \App\Module::setActive($alias, false);
+                            \Artisan::call('freescout:clear-cache');
+                        }
+                    }
+
+                    if ($type == 'success') {
+                        // Migrate again, in case migration did not work in the moment the module was activated.
+                        \Artisan::call('migrate', ['--force' => true]);
+                    }
+
+                    // \Session::flash does not work after BufferedOutput
+                    $flash = [
+                        'text'      => '<strong>'.$msg.'</strong><pre class="margin-top">'.$output.'</pre>',
+                        'unescaped' => true,
+                        'type'      => $type,
+                    ];
+                    \Cache::forever('modules_flash', $flash);
+                    $response['status'] = 'success';
+                }
+
+                break;
+
+            case 'deactivate':
+                $alias = $request->alias;
+                \App\Module::setActive($alias, false);
+
+                $outputLog = new BufferedOutput();
+                \Artisan::call('freescout:clear-cache', [], $outputLog);
                 $output = $outputLog->fetch();
 
+                // Get module name
+                $module = \Module::findByAlias($alias);
+                $name = '?';
+                if ($module) {
+                    $name = $module->getName();
+                }
+
                 $type = 'danger';
-                $msg = __('Error occured activating module');
-                if (session('flashes_floating') && is_array(session('flashes_floating'))) {
-                    // If there was any error, module has been deactivate via modules.register_error filter
-                    $msg = '';
-                    foreach (session('flashes_floating') as $flash) {
-                        $msg .= $flash['text'].' ';
-                    }
-                } elseif (strstr($output, 'Configuration cached successfully')) {
+                $msg = __('Error occurred deactivating :name module', ['name' => $name]);
+                if (strstr($output, 'Configuration cached successfully')) {
                     $type = 'success';
-                    $msg = __('Module successfully activated!');
-                } else {
-                    // Deactivate module
-                    \App\Module::setActive($alias, false);
-                    \Artisan::call('freescout:clear-cache');
+                    $msg = __('":name" module successfully Deactivated!', ['name' => $name]);
                 }
 
                 // \Session::flash does not work after BufferedOutput
@@ -281,29 +463,54 @@ class ModulesController extends Controller
                 $response['status'] = 'success';
                 break;
 
-            case 'deactivate':
+            case 'deactivate_license':
+                $license = $request->license;
                 $alias = $request->alias;
-                \App\Module::setActive($alias, false);
 
-                $outputLog = new BufferedOutput;
-                \Artisan::call('freescout:clear-cache', [], $outputLog);
-                $output = $outputLog->fetch();
-
-                $type = 'danger';
-                $msg = __('Error occured deactivating module');
-                if (strstr($output, 'Configuration cached successfully')) {
-                    $type = 'success';
-                    $msg = __('Module successfully deactivated!');
+                if (!$license) {
+                    $response['msg'] = __('Empty license key');
                 }
 
-                // \Session::flash does not work after BufferedOutput
-                $flash = [
-                    'text'      => '<strong>'.$msg.'</strong><pre class="margin-top">'.$output.'</pre>',
-                    'unescaped' => true,
-                    'type'      => $type,
-                ];
-                \Cache::forever('modules_flash', $flash);
-                $response['status'] = 'success';
+                if (!$response['msg']) {
+                    $params = [
+                        'license'      => $license,
+                        'module_alias' => $alias,
+                        'url'          => (!empty($request->any_url) ? '*' : \App\Module::getAppUrl()),
+                    ];
+                    $result = WpApi::deactivateLicense($params);
+
+                    if (WpApi::$lastError) {
+                        $response['msg'] = WpApi::$lastError['message'];
+                    } elseif (!empty($result['code']) && !empty($result['message'])) {
+                        $response['msg'] = $result['message'];
+                    } else {
+                        if (!empty($result['status']) && $result['status'] == 'success') {
+                            $db_module = \App\Module::getByAlias($alias);
+                            if ($db_module && trim($db_module->license ?? '') == trim($license ?? '')) {
+                                // Remove remembered license key and deactivate license in DB
+                                \App\Module::deactivateLicense($alias, '');
+
+                                // Deactivate module
+                                \App\Module::setActive($alias, false);
+                                \Artisan::call('freescout:clear-cache', []);
+                            }
+
+                            // Flash does not work here.
+                            $flash = [
+                                'text'      => '<strong>'.__('License successfully Deactivated!').'</strong>',
+                                'unescaped' => true,
+                                'type'      => 'success',
+                            ];
+                            \Cache::forever('modules_flash', $flash);
+
+                            $response['status'] = 'success';
+                        } elseif (!empty($result['error'])) {
+                            $response['msg'] = \App\Module::getErrorMessage($result['error'], $result);
+                        } else {
+                            $response['msg'] = __('Error occurred. Please try again later.');
+                        }
+                    }
+                }
                 break;
 
             case 'delete':
@@ -318,19 +525,92 @@ class ModulesController extends Controller
                     $module->delete();
                     \Session::flash('flash_success_floating', __('Module deleted'));
                 } else {
-                    $response['msg'] = __("Module not found").': '.$alias;
+                    $response['msg'] = __('Module not found').': '.$alias;
                 }
 
                 $response['status'] = 'success';
                 break;
 
+            case 'update':
+                $update_result = \App\Module::updateModule($request->alias);
+
+                if ($update_result['download_error']) {
+                    $response['reload'] = true;
+
+                    if ($update_result['msg']) {
+                        \Session::flash('flash_error_floating', $update_result['msg']);
+                    }
+
+                    if ($update_result['download_msg']) {
+                        \Session::flash('flash_error_unescaped', $update_result['download_msg']);
+                    }
+                }
+
+                // Install updated module.
+                if ($update_result['output'] || $update_result['status']) {
+
+                    $type = 'danger';
+                    $msg = $update_result['msg'];
+
+                    if ($update_result['status'] == 'success') {
+                        $type = 'success';
+                        $msg = $update_result['msg_success'];
+                    }
+
+                    // \Session::flash does not work after BufferedOutput
+                    $flash = [
+                        'text'      => '<strong>'.$msg.'</strong><pre class="margin-top">'.$update_result['output'].'</pre>',
+                        'unescaped' => true,
+                        'type'      => $type,
+                    ];
+                    \Cache::forever('modules_flash', $flash);
+                    $response['status'] = 'success';
+                }
+
+                break;
+
+            case 'update_all':
+                $update_all_flashes = [];
+
+                foreach ($request->aliases as $alias) {
+                    $update_result = \App\Module::updateModule($alias);
+
+                    $type = 'danger';
+                    $msg = $update_result['msg'];
+
+                    if ($update_result['status'] == 'success') {
+                        $type = 'success';
+                        $msg = $update_result['msg_success'];
+                    } elseif ($update_result['download_msg']) {
+                        $msg .= '<br/>'.$update_result['download_msg'];
+                    }
+
+                    $text = '<strong>'.$update_result['module_name'].':</strong> '.$msg;
+                    if (trim($update_result['output'])) {
+                        $text .= '<pre class="margin-top">'.$update_result['output'].'</pre>';
+                    }
+
+                    // \Session::flash does not work after BufferedOutput
+                    $update_all_flashes[] = [
+                        'text'      => $text,
+                        'unescaped' => true,
+                        'type'      => $type,
+                    ];
+                }
+                if ($update_all_flashes) {
+                    \Cache::forever('modules_flash', $update_all_flashes);
+                }
+                $response['status'] = 'success';
+
+                break;
+
             default:
                 $response['msg'] = 'Unknown action';
                 break;
         }
 
         if ($response['status'] == 'error' && empty($response['msg'])) {
-            $response['msg'] = 'Unknown error occured';
+            $response['msg'] = 'Unknown error occurred';
         }
 
         return \Response::json($response);

app/Http/Controllers/OpenController.php

@@ -0,0 +1,228 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Attachment;
+use App\Conversation;
+use App\Option;
+use App\Thread;
+use App\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Validator;
+
+class OpenController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Setup user from invitation.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function userSetup($hash)
+    {
+        if (auth()->user()) {
+            return redirect()->route('dashboard');
+        }
+        $user = User::where('invite_hash', $hash)->first();
+
+        if ($user && $user->locale) {
+            \Helper::setLocale($user->locale);
+        }
+
+        return view('open/user_setup', ['user' => $user]);
+    }
+
+    /**
+     * Save user from invitation.
+     */
+    public function userSetupSave($hash, Request $request)
+    {
+        if (auth()->user()) {
+            return redirect()->route('dashboard');
+        }
+        $user = User::where('invite_hash', $hash)->first();
+
+        if (!$user) {
+            abort(404);
+        }
+
+        $validator = Validator::make($request->all(), [
+            'email'       => 'required|string|email|max:100|unique:users,email,'.$user->id,
+            'password'    => 'required|string|min:8|confirmed',
+            'job_title'   => 'max:100',
+            'phone'       => 'max:60',
+            'timezone'    => 'required|string|max:255',
+            'time_format' => 'required',
+            'photo_url'   => 'nullable|image|mimes:jpeg,png,jpg,gif',
+        ]);
+        $validator->setAttributeNames([
+            'photo_url'   => __('Photo'),
+        ]);
+
+        // Photo
+        $validator->after(function ($validator) use ($user, $request) {
+            if ($request->hasFile('photo_url')) {
+                $path_url = $user->savePhoto($request->file('photo_url'));
+
+                if ($path_url) {
+                    $user->photo_url = $path_url;
+                } else {
+                    $validator->errors()->add('photo_url', __('Error occurred processing the image. Make sure that PHP GD extension is enabled.'));
+                }
+            }
+        });
+
+        if ($validator->fails()) {
+            return redirect()->route('user_setup', ['hash' => $hash])
+                        ->withErrors($validator)
+                        ->withInput();
+        }
+
+        $request_data = $request->all();
+        // Do not allow user to set his role
+        if (isset($request_data['role'])) {
+            unset($request_data['role']);
+        }
+        if (isset($request_data['photo_url'])) {
+            unset($request_data['photo_url']);
+        }
+        $user->fill($request_data);
+
+        $user->password = bcrypt($request->password);
+
+        $user->invite_state = User::INVITE_STATE_ACTIVATED;
+        $user->invite_hash = '';
+        
+        $user = \Eventy::filter('user.setup_save', $user, $request);
+        $user->save();
+
+        // Login user
+        Auth::guard()->login($user);
+
+        \Session::flash('flash_success_floating', __('Welcome to :company_name!', ['company_name' => Option::getCompanyName()]));
+
+        return redirect()->route('dashboard');
+    }
+
+    /*
+     * Set a thread as read by customer
+     */
+    public function setThreadAsRead($conversation_id, $thread_id)
+    {
+        $conversation = Conversation::findOrFail($conversation_id);
+        $thread = Thread::findOrFail($thread_id);
+
+        // We only track the first opening
+        if (empty($thread->opened_at)) {
+            $thread->opened_at = date('Y-m-d H:i:s');
+            $thread->save();
+            \Eventy::action('thread.opened', $thread, $conversation);
+        }
+
+        // Create a 1x1 ttransparent pixel and return it
+        $pixel = sprintf('%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c', 71, 73, 70, 56, 57, 97, 1, 0, 1, 0, 128, 255, 0, 192, 192, 192, 0, 0, 0, 33, 249, 4, 1, 0, 0, 0, 0, 44, 0, 0, 0, 0, 1, 0, 1, 0, 0, 2, 2, 68, 1, 0, 59);
+        $response = \Response::make($pixel, 200);
+        $response->header('Content-type', 'image/gif');
+        $response->header('Content-Length', 42);
+        $response->header('Cache-Control', 'private, no-cache, no-cache=Set-Cookie, proxy-revalidate');
+        $response->header('Expires', 'Wed, 11 Jan 2000 12:59:00 GMT');
+        $response->header('Last-Modified', 'Wed, 11 Jan 2006 12:59:00 GMT');
+        $response->header('Pragma', 'no-cache');
+
+        return $response;
+    }
+
+    /**
+     * Download an attachment.
+     */
+    public function downloadAttachment($dir_1, $dir_2, $dir_3, $file_name, Request $request)
+    {
+        $id = $request->query('id', '');
+        $token = $request->query('token', '');
+        $attachment = null;
+
+        // Old attachments can not be requested by id.
+        if (!$token && $id) {
+            return \Helper::denyAccess();
+        }
+
+        // Get attachment by id.
+        if ($id) {
+            $attachment = Attachment::findOrFail($id);
+        }
+        
+        if (!$attachment) {
+            $attachment = Attachment::where('file_dir', $dir_1.DIRECTORY_SEPARATOR.$dir_2.DIRECTORY_SEPARATOR.$dir_3.DIRECTORY_SEPARATOR)
+                ->where('file_name', $file_name)
+                ->firstOrFail();
+        }
+
+        // Only allow download if the attachment is public or if the token matches the hash of the contents
+        if ($token != $attachment->getToken() && (bool)$attachment->public !== true) {
+            return \Helper::denyAccess();
+        }
+
+        $view_attachment = false;
+        $file_ext = strtolower(pathinfo($attachment->file_name, PATHINFO_EXTENSION));
+
+        // Some file type should be viewed in the browser instead of downloading.
+        if (in_array($file_ext, config('app.viewable_attachments'))) {
+            $view_attachment = true;
+        }
+        // If HTML file is renamed into .txt for example it will be shown by the browser as HTML.
+        if ($view_attachment && $attachment->mime_type) {
+            $allowed_mime_type = false;
+
+            foreach (config('app.viewable_mime_types') as $mime_type) {
+                if (preg_match('#'.$mime_type.'#', $attachment->mime_type)) {
+                    $allowed_mime_type = true;
+                    break;
+                }
+            }
+            if (!$allowed_mime_type) {
+                $view_attachment = false;
+            }
+        }
+
+        if (config('app.download_attachments_via') == 'apache') {
+            // Send using Apache mod_xsendfile.
+            $response = response(null)
+               ->header('Content-Type' , $attachment->mime_type)
+               ->header('X-Sendfile', $attachment->getLocalFilePath());
+
+            if (!$view_attachment) {
+                $response->header('Content-Disposition', 'attachment; filename="'.$attachment->file_name.'"');
+            }
+        } elseif (config('app.download_attachments_via') == 'nginx') {
+            // Send using Nginx.
+            $response = response(null)
+               ->header('Content-Type' , $attachment->mime_type)
+               ->header('X-Accel-Redirect', $attachment->getLocalFilePath(false));
+               
+            if (!$view_attachment) {
+                $response->header('Content-Disposition', 'attachment; filename="'.$attachment->file_name.'"');
+            }
+        } else {
+            $response = $attachment->download($view_attachment);
+        }
+
+        return $response;
+    }
+
+    /**
+     * Needed for the mobile app.
+     */
+    // public function mobilePing()
+    // {
+    //     echo file_get_contents(public_path('installer/css/fontawesome.css'));
+    // }
+}

app/Http/Controllers/PublicController.php

@@ -1,109 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Option;
-use App\User;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Validator;
-
-class PublicController extends Controller
-{
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        
-    }
-
-    /**
-     * Setup user from invitation.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function userSetup($hash)
-    {
-        if (auth()->user()) {
-            return redirect()->route('dashboard');
-        }
-        $user = User::where('invite_hash', $hash)->first();
-
-        return view('public/user_setup', ['user' => $user]);
-    }
-
-    /**
-     * Save user from invitation.
-     *
-     */
-    public function userSetupSave($hash, Request $request)
-    {
-        if (auth()->user()) {
-            return redirect()->route('dashboard');
-        }
-        $user = User::where('invite_hash', $hash)->first();
-
-        if (!$user) {
-            abort(404);
-        }
-
-        $validator = Validator::make($request->all(), [
-            'email'       => 'required|string|email|max:100|unique:users,email,'.$user->id,
-            'password'    => 'required|string|min:8|confirmed',
-            'job_title'   => 'max:100',
-            'phone'       => 'max:60',
-            'timezone'    => 'required|string|max:255',
-            'time_format' => 'required',
-            'photo_url'   => 'nullable|image|mimes:jpeg,png,jpg,gif',
-        ]);
-        $validator->setAttributeNames([
-            'photo_url'   => __('Photo'),
-        ]);
-
-        // Photo
-        $validator->after(function ($validator) use ($user, $request) {
-            if ($request->hasFile('photo_url')) {
-                $path_url = $user->savePhoto($request->file('photo_url'));
-
-                if ($path_url) {
-                    $user->photo_url = $path_url;
-                } else {
-                    $validator->errors()->add('photo_url', __('Error occured processing the image. Make sure that PHP GD extension is enabled.'));
-                }
-            }
-        });
-
-        if ($validator->fails()) {
-            return redirect()->route('user_setup', ['hash' => $hash])
-                        ->withErrors($validator)
-                        ->withInput();
-        }
-
-        $request_data = $request->all();
-        // Do not allow user to set his role
-        if (isset($request_data['role'])) {
-            unset($request_data['role']);
-        }
-        if (isset($request_data['photo_url'])) {
-            unset($request_data['photo_url']);
-        }
-        $user->fill($request_data);
-
-        $user->password = bcrypt($request->password);
-
-        $user->invite_state = User::INVITE_STATE_ACTIVATED;
-        $user->invite_hash = '';
-
-        $user->save();
-
-        // Login user
-        Auth::guard()->login($user);
-
-        \Session::flash('flash_success_floating', __('Welcome to :company_name!', ['company_name' => Option::getCompanyName()]));
-
-        return redirect()->route('dashboard');
-    }
-}

app/Http/Controllers/SecureController.php

@@ -3,11 +3,10 @@
 namespace App\Http\Controllers;
 
 use App\ActivityLog;
-use App\Option;
+use App\Misc\Helper;
 use App\SendLog;
 use App\Thread;
 use App\User;
-use Carbon\Carbon;
 use Illuminate\Http\Request;
 
 class SecureController extends Controller
@@ -29,7 +28,15 @@ class SecureController extends Controller
      */
     public function dashboard()
     {
-        $mailboxes = auth()->user()->mailboxesCanView();
+        $user = auth()->user();
+        if (!$user->isAdmin()) {
+            $mailboxes = $user->mailboxesCanView();
+        } else {
+            $mailboxes = $user->mailboxesCanViewWithSettings();
+        }
+
+        // Sort by name.
+        $mailboxes = \Eventy::filter('dashboard.mailboxes', $mailboxes->sortBy('name'));
 
         return view('secure/dashboard', ['mailboxes' => $mailboxes]);
     }
@@ -63,7 +70,7 @@ class SecureController extends Controller
             $activities = ActivityLog::inLog($request->name)->orderBy('created_at', 'desc')->paginate($page_size);
             $name = $request->name;
         } elseif (count($names)) {
-            $name =  ActivityLog::NAME_OUT_EMAILS;
+            $name = ActivityLog::NAME_OUT_EMAILS;
             // $activities = ActivityLog::inLog($names[0])->orderBy('created_at', 'desc')->paginate($page_size);
             // $name = $names[0];
         }
@@ -105,23 +112,32 @@ class SecureController extends Controller
                 'type',
                 'email',
                 'status',
-                'conversation',
+                'message',
                 'user',
                 'customer',
             ];
 
-            $activities = SendLog::orderBy('created_at', 'desc')->paginate($page_size);
+            $activities_query = SendLog::orderBy('created_at', 'desc');
+            if ($request->get('thread_id')) {
+                $activities_query->where('thread_id', $request->get('thread_id'));
+            }
+            $activities = $activities_query->paginate($page_size);
 
             foreach ($activities as $record) {
-
                 $conversation = '';
                 if ($record->thread_id) {
                     $conversation = Thread::find($record->thread_id);
                 }
-                
+
                 $status = $record->getStatusName();
                 if ($record->status_message) {
                     $status .= '. '.$record->status_message;
+                    if ($record->status == SendLog::STATUS_SEND_ERROR) {
+                        $status .= '. Message-ID: '.$record->message_id;
+                    }
+                }
+                if ($record->smtp_queue_id) {
+                    $status .= '. SMTP ID: '.$record->smtp_queue_id;
                 }
 
                 $logs[] = [
@@ -129,12 +145,11 @@ class SecureController extends Controller
                     'type'          => $record->getMailTypeName(),
                     'email'         => $record->email,
                     'status'        => $status,
-                    'conversation'  => $conversation,
+                    'message'       => $conversation,
                     'user'          => $record->user,
                     'customer'      => $record->customer,
                 ];
             }
-
         }
 
         array_unshift($names, ActivityLog::NAME_OUT_EMAILS);
@@ -145,16 +160,16 @@ class SecureController extends Controller
         }
 
         return view('secure/logs', [
-            'logs' => $logs, 
-            'names' => $names,
+            'logs'         => $logs,
+            'names'        => $names,
             'current_name' => $name,
-            'cols' => $cols,
-            'activities' => $activities
+            'cols'         => $cols,
+            'activities'   => $activities,
         ]);
     }
 
     /**
-     * Logs page submitted
+     * Logs page submitted.
      */
     public function logsSubmit(Request $request)
     {
@@ -162,10 +177,10 @@ class SecureController extends Controller
 
         $name = '';
         if (!empty($request->name)) {
-            $activities = ActivityLog::inLog($request->name)->orderBy('created_at', 'desc')->get();
+            //$activities = ActivityLog::inLog($request->name)->orderBy('created_at', 'desc')->get();
             $name = $request->name;
         } elseif (count($names = ActivityLog::select('log_name')->distinct()->get()->pluck('log_name'))) {
-            $name =  ActivityLog::NAME_OUT_EMAILS;
+            $name = ActivityLog::NAME_OUT_EMAILS;
             // $activities = ActivityLog::inLog($names[0])->orderBy('created_at', 'desc')->get();
             // $name = $names[0];
         }
@@ -181,4 +196,41 @@ class SecureController extends Controller
 
         return redirect()->route('logs', ['name' => $name]);
     }
+
+    /**
+     * Upload files and images.
+     */
+    public function upload(Request $request, $allowed_exts = [])
+    {
+        // 'jpg','gif','png'
+        $response = [
+            'status' => 'error',
+            'msg'    => '', // this is error message
+        ];
+
+        $user = auth()->user();
+
+        if (!$user) {
+            $response['msg'] = __('Please login to upload file');
+        }
+
+        if (!$request->hasFile('file') || !$request->file('file')->isValid() || !$request->file) {
+            $response['msg'] = __('Error occurred uploading file');
+        }
+
+        if (!$response['msg']) {
+
+            $upload = Helper::uploadFile($request->file, $allowed_exts);
+            $filename = basename($upload);
+
+            if ($upload) {
+                $response['status'] = 'success';
+                $response['url'] = Helper::uploadedFileUrl($filename);
+            } else {
+                $response['msg'] = __('Error occurred uploading file');
+            }
+        }
+
+        return \Response::json($response);
+    }
 }

app/Http/Controllers/SettingsController.php

@@ -2,10 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use App\Conversation;
 use App\Option;
+use App\Subscription;
 use App\User;
 use Illuminate\Http\Request;
-use Illuminate\Validation\Rule;
 use Validator;
 
 class SettingsController extends Controller
@@ -21,12 +22,12 @@ class SettingsController extends Controller
     }
 
     /**
-     * General settings
+     * General settings.
      *
      * @return \Illuminate\Http\Response
      */
     public function view($section = 'general')
-    {       
+    {
         $settings = $this->getSectionSettings($section);
 
         if (!$settings) {
@@ -36,10 +37,10 @@ class SettingsController extends Controller
         $sections = $this->getSections();
 
         $template_vars = [
-            'settings' => $settings,
-            'section' => $section,
-            'sections' => $this->getSections(),
-            'section_name' => $sections[$section]['title']
+            'settings'     => $settings,
+            'section'      => $section,
+            'sections'     => $this->getSections(),
+            'section_name' => $sections[$section]['title'],
         ];
         $template_vars = $this->getTemplateVars($section, $template_vars);
 
@@ -48,81 +49,203 @@ class SettingsController extends Controller
 
     public function getValidator($section)
     {
-        switch ($section) {
-            case 'emails':
-                $rules = [
-                    'settings.mail_from' => 'required|email',
-                ];
-                break;
-            // default:
-            //     $rules = \Event::fire('filter.settings_validate_rules');
-            //     break;
-        }
+        $rules = $this->getSectionParams($section, 'validator_rules');
 
         if (!empty($rules)) {
             return Validator::make(request()->all(), $rules);
         }
-        return null;
     }
 
     public function getTemplateVars($section, $template_vars)
     {
+        $section_vars = $this->getSectionParams($section, 'template_vars');
+
+        if ($section_vars && is_array($section_vars)) {
+            return array_merge($template_vars, $section_vars);
+        } else {
+            return $template_vars;
+        }
+    }
+
+    /**
+     * Parameters of the sections settings.
+     *
+     * If in settings parameter `env` is set, option will be saved into .env file
+     * instead of DB.
+     *
+     * @param [type] $section [description]
+     * @param string $param   [description]
+     *
+     * @return [type] [description]
+     */
+    public function getSectionParams($section, $param = '')
+    {
+        $params = [];
+
         switch ($section) {
             case 'emails':
-                $template_vars['sendmail_path'] = ini_get('sendmail_path');
-                $template_vars['mail_drivers'] = [
-                    'mail'     => __("PHP's mail() function"),
-                    'sendmail' => __("Sendmail"),
-                    'smtp'     => 'SMTP',
+                $params = [
+                    'template_vars' => [
+                        'sendmail_path' => ini_get('sendmail_path'),
+                        'mail_drivers'  => [
+                            'mail'     => __("PHP's mail() function"),
+                            'sendmail' => __('Sendmail'),
+                            'smtp'     => 'SMTP',
+                        ],
+                    ],
+                    'validator_rules' => [
+                        'settings.mail_from' => 'required|email',
+                    ],
+                    'settings' => [
+                        'fetch_schedule' => [
+                            'env' => 'APP_FETCH_SCHEDULE',
+                        ],
+                        'mail_password' => [
+                            'safe_password' => true,
+                            'encrypt' => true,
+                        ],
+                        // 'use_mail_date_on_fetching' => [
+                        //     'env' => 'APP_USE_MAIL_DATE_ON_FETCHING',
+                        // ],
+                    ],
                 ];
                 break;
-            
-            // default:
-            //     $template_vars = \Event::fire('filter.settings_template_vars', [$template_vars]);
-            //     break;
+            case 'general':
+                $params = [
+                    'settings' => [
+                        'custom_number' => [
+                            'env' => 'APP_CUSTOM_NUMBER',
+                        ],
+                        'max_message_size' => [
+                            'env' => 'APP_MAX_MESSAGE_SIZE',
+                        ],
+                        'email_conv_history' => [
+                            'env' => 'APP_EMAIL_CONV_HISTORY',
+                        ],
+                        'email_user_history' => [
+                            'env' => 'APP_EMAIL_USER_HISTORY',
+                        ],
+                        'locale' => [
+                            'env' => 'APP_LOCALE',
+                        ],
+                        'timezone' => [
+                            'env' => 'APP_TIMEZONE',
+                        ],
+                        'user_permissions' => [
+                            'env' => 'APP_USER_PERMISSIONS',
+                            'env_encode' => true,
+                        ],
+                    ],
+                ];
+                break;
+            case 'alerts':
+                $subscriptions_defaults = Subscription::getDefaultSubscriptions();
+                $subscriptions = array();
+                foreach ($subscriptions_defaults as $medium => $subscriptions_for_medium) {
+                    foreach ($subscriptions_defaults[$medium] as $subscription) {
+                        $subscriptions[] = (object) array("medium" => $medium, "event" => $subscription);
+                    }
+                }
+                $params = [
+                    'template_vars' => [
+                        'logs' => \App\ActivityLog::getAvailableLogs(),
+                        'person' => null,
+                        'subscriptions' => $subscriptions,
+                        'mobile_available' => \Eventy::filter('notifications.mobile_available', false),
+                    ],
+                    'settings' => [
+                        'alert_logs' => [
+                            'env' => 'APP_ALERT_LOGS',
+                        ],
+                        'alert_logs_period' => [
+                            'env' => 'APP_ALERT_LOGS_PERIOD',
+                        ],
+                    ],
+                ];
+
+                // todo: monitor App Logs
+                foreach ($params['template_vars']['logs'] as $i => $log) {
+                    if ($log == \App\ActivityLog::NAME_APP_LOGS || $log == \App\ActivityLog::NAME_OUT_EMAILS) {
+                        unset($params['template_vars']['logs'][$i]);
+                    }
+                }
+
+                break;
+            default:
+                $params = \Eventy::filter('settings.section_params', $params, $section);
+                break;
         }
 
-        return $template_vars;
+        $params = \Eventy::filter('settings.alter_section_params', $params, $section);
+
+        if ($param) {
+            if (isset($params[$param])) {
+                return $params[$param];
+            } else {
+                return;
+            }
+        } else {
+            return $params;
+        }
     }
 
     public function getSectionSettings($section)
     {
+        $settings = [];
+
         switch ($section) {
             case 'general':
                 $settings = [
                     'company_name'         => Option::get('company_name', \Config::get('app.name')),
-                    'next_ticket'          => Option::get('next_ticket'),
-                    'user_permissions'     => Option::get('user_permissions', []),
+                    'next_ticket'          => (Option::get('next_ticket') >= Conversation::max('number') + 1) ? Option::get('next_ticket') : Conversation::max('number') + 1,
+                    'custom_number'        => (int)config('app.custom_number'),
+                    'user_permissions'     => User::getGlobalUserPermissions(),
                     'email_branding'       => Option::get('email_branding'),
                     'open_tracking'        => Option::get('open_tracking'),
+                    'email_conv_history'   => config('app.email_conv_history'),
+                    'max_message_size'     => config('app.max_message_size'),
+                    'email_user_history'   => config('app.email_user_history'),
                     'enrich_customer_data' => Option::get('enrich_customer_data'),
                     'time_format'          => Option::get('time_format', User::TIME_FORMAT_24),
+                    'locale'               => \Helper::getRealAppLocale(),
+                    'timezone'             => config('app.timezone'),
                 ];
                 break;
             case 'emails':
                 $settings = [
-                    'mail_from' => \App\Misc\Mail::getSystemMailFrom(),
-                    'mail_driver' => Option::get('mail_driver', \Config::get('mail.driver')),
-                    'mail_host' => Option::get('mail_host', \Config::get('mail.host')),
-                    'mail_port' => Option::get('mail_port', \Config::get('mail.port')),
-                    'mail_username' => Option::get('mail_username', \Config::get('mail.username')),
-                    'mail_password' => Option::get('mail_password', \Config::get('mail.password')),
+                    'mail_from'       => \App\Misc\Mail::getSystemMailFrom(),
+                    'mail_driver'     => Option::get('mail_driver', \Config::get('mail.driver')),
+                    'mail_host'       => Option::get('mail_host', \Config::get('mail.host')),
+                    'mail_port'       => Option::get('mail_port', \Config::get('mail.port')),
+                    'mail_username'   => Option::get('mail_username', \Config::get('mail.username')),
+                    'mail_password'   => \Helper::decrypt(Option::get('mail_password', \Config::get('mail.password'))),
                     'mail_encryption' => Option::get('mail_encryption', \Config::get('mail.encryption')),
+                    'fetch_schedule'  => config('app.fetch_schedule'),
+                    //'use_mail_date_on_fetching'             => config('app.use_mail_date_on_fetching'),
                 ];
                 break;
             case 'alerts':
-                $settings = [
-                    'alert_recipients'   => Option::get('alert_recipients'),
-                    'alert_fetch'        => Option::get('alert_fetch'),
-                    'alert_fetch_period' => Option::get('alert_fetch_period'),
-                    'alert_send'         => Option::get('alert_send'),
-                ];
+                $settings = Option::getOptions([
+                    'alert_recipients',
+                    'alert_fetch',
+                    'alert_fetch_period',
+                    'alert_logs',
+                    'alert_logs_names',
+                    'alert_logs_period',
+                    'subscription_defaults',
+                ], [
+                    'alert_logs_names'  => [],
+                    'alert_logs'        => config('app.alert_logs'),
+                    'alert_logs_period' => config('app.alert_logs_period'),
+                ]);
                 break;
             default:
-                $settings = \Event::fire('filter.section_settings', [$section]);
+                $settings = \Eventy::filter('settings.section_settings', $settings, $section);
                 break;
         }
 
+        $settings = \Eventy::filter('settings.alter_section_settings', $settings, $section);
+
         return $settings;
     }
 
@@ -134,7 +257,8 @@ class SettingsController extends Controller
             'emails'  => ['title' => __('Mail Settings'), 'icon' => 'transfer', 'order' => 200],
             'alerts'  => ['title' => __('Alerts'), 'icon' => 'bell', 'order' => 300],
         ];
-        //return \Event::fire('filter.settings_sections', [$sections]);
+        $sections = \Eventy::filter('settings.sections', $sections);
+
         return $sections;
     }
 
@@ -167,25 +291,85 @@ class SettingsController extends Controller
 
         $request = request();
 
-        $request->settings = array_merge($request->settings, [
-            'email_branding'       => !empty($request->settings['email_branding'])       ? $request->settings['email_branding']       : 0,
-            'open_tracking'        => !empty($request->settings['open_tracking'])        ? $request->settings['open_tracking']        : 0,
-            'enrich_customer_data' => !empty($request->settings['enrich_customer_data']) ? $request->settings['enrich_customer_data'] : 0,
-        ]);
+        $request = \Eventy::filter('settings.before_save', $request, $section, $settings);
 
+        $cc_required = false;
+        $settings_params = $this->getSectionParams($section, 'settings');
         foreach ($settings as $i => $option_name) {
-            // By some reason isset() does not work for empty elements
-            if (array_key_exists($option_name, $request->settings)) {
+            // Do not save dummy passwords.
+            if (!empty($settings_params[$option_name])
+                && !empty($settings_params[$option_name]['safe_password'])
+                && $request->settings[$option_name]
+                && preg_match("/^\*+$/", $request->settings[$option_name])
+            ) {
+                continue;
+            }
+
+            // Option has to be saved to .env file.
+            if (!empty($settings_params[$option_name]) && !empty($settings_params[$option_name]['env'])) {
+                $env_value = $request->settings[$option_name] ?? '';
+
+                if (is_array($env_value)) {
+                    $env_value = json_encode($env_value);
+                }
+
+                if (!empty($settings_params[$option_name]['encrypt'])) {
+                    $env_value = encrypt($env_value);
+                }
+
+                if (!empty($settings_params[$option_name]['env_encode'])) {
+                    $env_value = base64_encode($env_value);
+                }
+
+                \Helper::setEnvFileVar($settings_params[$option_name]['env'], $env_value);
+
+                config($option_name, $env_value);
+                $cc_required = true;
+                continue;
+            }
+
+            // By some reason isset() does not work for empty elements.
+            if (isset($request->settings) && array_key_exists($option_name, $request->settings)) {
                 $option_value = $request->settings[$option_name];
+
+                if (!empty($settings_params[$option_name]['encrypt'])) {
+                    $option_value = encrypt($option_value);
+                }
+
                 Option::set($option_name, $option_value);
             } else {
-                Option::remove($option_name);
+                // If option does not exist, default will be used,
+                // so we can not just remove bool settings.
+                if (isset($settings_params[$option_name]['default'])) {
+                    $default = $settings_params[$option_name]['default'];
+                } else {
+                    $default = \Option::getDefault($option_name, null);
+                }
+                if ($default === true) {
+                    Option::set($option_name, false);
+                } elseif (is_array(\Option::getDefault($option_name, -1))) {
+                    Option::set($option_name, []);
+                } else {
+                    Option::remove($option_name);
+                }
             }
         }
 
-        \Session::flash('flash_success_floating', __('Settings updated'));
+        // Clear cache if some options have been saved to .env file.
+        // Clearing the cache also restarts queue:work as it also
+        // needs to get new .env parameters.
+        if ($cc_required) {
+            \Helper::clearCache(['--doNotGenerateVars' => true]);
+        }
 
-        return redirect()->route('settings', ['section' => $section]);
+        // \Helper::clearCache prevents \Session::flash() from displaying.
+        $request->session()->flash('flash_success_floating', __('Settings updated'));
+
+        $response = redirect()->route('settings', ['section' => $section]);
+
+        $response = \Eventy::filter('settings.after_save', $response, $request, $section, $settings);
+
+        return $response;
     }
 
     /**
@@ -210,17 +394,22 @@ class SettingsController extends Controller
                 }
 
                 if (!$response['msg']) {
-                    $test_result = false;
+                    $test_result = [
+                        'status' => 'error'
+                    ];
 
                     try {
                         $test_result = \MailHelper::sendTestMail($request->to);
                     } catch (\Exception $e) {
-                        $response['msg'] = $e->getMessage();
+                        $test_result['msg'] = $e->getMessage();
                     }
 
-                    if (!$test_result && !$response['msg']) {
-                        $response['msg'] = __('Error occurend sending email. Please check your mail server logs for more details.');
+                    if ($test_result['status'] == 'error') {
+                        $response['msg'] = $test_result['msg']
+                            ?: __('Error occurred sending email. Please check your mail server logs for more details.');
                     }
+
+                    $response['log'] = $test_result['log'] ?? '';
                 }
 
                 if (!$response['msg']) {
@@ -239,7 +428,7 @@ class SettingsController extends Controller
         }
 
         if ($response['status'] == 'error' && empty($response['msg'])) {
-            $response['msg'] = 'Unknown error occured';
+            $response['msg'] = 'Unknown error occurred';
         }
 
         return \Response::json($response);

app/Http/Controllers/SystemController.php

@@ -4,12 +4,15 @@ namespace App\Http\Controllers;
 
 use App\Option;
 use App\User;
+use App\FailedJob;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Symfony\Component\Console\Output\BufferedOutput;
 
 class SystemController extends Controller
 {
+    public static $latest_version_error = '';
+
     /**
      * Create a new controller instance.
      *
@@ -17,7 +20,9 @@ class SystemController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('auth');
+        $this->middleware('auth', ['except' => [
+            'cron'
+        ]]);
     }
 
     /**
@@ -25,29 +30,66 @@ class SystemController extends Controller
      */
     public function status(Request $request)
     {
-        // PHP extensions
-        $php_extensions = [];
-        foreach (\Config::get('app.required_extensions') as $extension_name) {
-            $alternatives = explode('/', $extension_name);
-            if ($alternatives) {
-                foreach ($alternatives as $alternative) {
-                    $php_extensions[$extension_name] = extension_loaded(trim($alternative));
-                    if ($php_extensions[$extension_name]) {
-                        break;
-                    }
-                }
-            } else {
-                $php_extensions[$extension_name] = extension_loaded($extension_name);
+        // PHP extensions.
+        $php_extensions = \Helper::checkRequiredExtensions();
+
+        // Functions.
+        $functions = \Helper::checkRequiredFunctions();
+
+        // Permissions.
+        $permissions = [];
+        foreach (config('installer.permissions') as $perm_path => $perm_value) {
+            $path = base_path($perm_path);
+            $value = '';
+            if (file_exists($path)) {
+                $value = substr(sprintf('%o', fileperms($path)), -4);
+            }
+            $permissions[$perm_path] = [
+                'status' => \Helper::isFolderWritable($path),
+                'value'  => $value,
+            ];
+        }
+
+        // Check if cache files are writable.
+        $non_writable_cache_file = '';
+        if (function_exists('shell_exec')) {
+            $non_writable_cache_file = \Helper::shellExec('find '.base_path('storage/framework/cache/data/').' -type f | xargs -I {} sh -c \'[ ! -w "{}" ] && echo {}\' 2>&1 | head -n 1');
+            $non_writable_cache_file = trim($non_writable_cache_file ?? '');
+            // Leave only one line (in case head -n 1 does not work)
+            $non_writable_cache_file = preg_replace("#[\r\n].+#m", '', $non_writable_cache_file);
+            if (!strstr($non_writable_cache_file, base_path('storage/framework/cache/data/'))) {
+                $non_writable_cache_file = '';
+            }
+        }
+        
+
+        // Check if public symlink exists, if not, try to create.
+        $public_symlink_exists = true;
+        $public_path = public_path('storage');
+        $public_test = $public_path.DIRECTORY_SEPARATOR.'.gitignore';
+
+        if (!file_exists($public_test) || !file_get_contents($public_test)) {
+            \File::delete($public_path);
+            \Artisan::call('storage:link');
+            if (!file_exists($public_test) || !file_get_contents($public_test)) {
+                $public_symlink_exists = false;
             }
         }
 
+        // Check if .env is writable.
+        $env_is_writable = is_writable(base_path('.env'));
+
         // Jobs
-        $queued_jobs = \App\Job::orderBy('created_at', 'desc')->get();
-        $failed_jobs = \App\FailedJob::orderBy('failed_at', 'desc')->get();
+        $queued_jobs = \App\Job::orderBy('created_at', 'desc')->limit(100)->get();
+        $failed_jobs = \App\FailedJob::orderBy('failed_at', 'desc')->limit(100)->get();
+        $failed_queues = $failed_jobs->pluck('queue')->unique();
 
         // Commands
-        $commands_list = ['freescout:fetch-emails', 'queue:work'];
-        foreach ($commands_list as $command_name) {
+        $commands_list = [
+            'freescout:fetch-emails' => 'freescout:fetch-emails',
+            \Helper::getWorkerIdentifier() => 'queue:work'
+        ];
+        foreach ($commands_list as $command_identifier => $command_name) {
             $status_texts = [];
 
             // Check if command is running now
@@ -55,10 +97,16 @@ class SystemController extends Controller
                 $running_commands = 0;
 
                 try {
-                    $processes = preg_split("/[\r\n]/", shell_exec("ps aux | grep '{$command_name}'"));
+                    $processes = preg_split("/[\r\n]/", \Helper::shellExec("ps auxww | grep '{$command_identifier}'"));
                     $pids = [];
                     foreach ($processes as $process) {
+                        $process = trim($process);
                         preg_match("/^[\S]+\s+([\d]+)\s+/", $process, $m);
+                        if (empty($m)) {
+                            // Another format (used in Docker image).
+                            // 1713 nginx     0:00 /usr/bin/php82...
+                            preg_match("/^([\d]+)\s+[\S]+\s+/", $process, $m);
+                        }
                         if (!preg_match("/(sh \-c|grep )/", $process) && !empty($m[1])) {
                             $running_commands++;
                             $pids[] = $m[1];
@@ -77,7 +125,7 @@ class SystemController extends Controller
                 } elseif ($running_commands > 1) {
                     // queue:work command is stopped by settings a cache key
                     if ($command_name == 'queue:work') {
-                        \Cache::forever('illuminate:queue:restart', Carbon::now()->getTimestamp());
+                        \Helper::queueWorkerRestart();
                         $commands[] = [
                             'name'        => $command_name,
                             'status'      => 'error',
@@ -120,9 +168,10 @@ class SystemController extends Controller
             }
 
             // If queue:work is not running, clear cache to let it start if something is wrong with the mutex
-            if ($command_name == 'queue:work' && !$last_successful_run && function_exists('shell_exec')) {
-                $status_texts[] = __('Cleared cache to force command to start.');
-                \Artisan::call('cache:clear');
+            if ($command_name == 'queue:work' && !$last_successful_run) {
+                $status_texts[] = __('Try to :%a_start%clear cache:%a_end% to force command to start.', ['%a_start%' => '<a href="'.route('system.tools').'" target="_blank">', '%a_end%' => '</a>']);
+                // This sometimes makes Status page open as non logged in user.
+                //\Artisan::call('freescout:clear-cache', ['--doNotGenerateVars' => true]);
             }
 
             $commands[] = [
@@ -132,24 +181,80 @@ class SystemController extends Controller
             ];
         }
 
-        // Check new version
+        // Check new version if enabled
         $new_version_available = false;
-        $latest_version = \Cache::remember('latest_version', 15, function() {
-            return \Updater::getVersionAvailable();
-        });
-        if ($latest_version && $latest_version != \Config::get('app.version')) {
-            $new_version_available = true;
+        if (!\Config::get('app.disable_updating')) {
+            $latest_version = \Cache::remember('latest_version', 15, function () {
+                try {
+                    return \Updater::getVersionAvailable();
+                } catch (\Exception $e) {
+                    SystemController::$latest_version_error = $e->getMessage();
+                    return '';
+                }
+            });
+
+            if ($latest_version && version_compare($latest_version, \Config::get('app.version'), '>')) {
+                $new_version_available = true;
+            }
+        } else {
+            $latest_version = \Config::get('app.version');
         }
 
+        // Detect missing migrations.
+        $migrations_output = \Helper::runCommand('migrate:status');
+        preg_match_all("#\| N    \| ([^\|]+)\|#", $migrations_output, $migrations_m);
+        $missing_migrations = $migrations_m[1] ?? [];
+
         return view('system/status', [
-            'commands'       => $commands,
-            'queued_jobs'    => $queued_jobs,
-            'failed_jobs'    => $failed_jobs,
-            'php_extensions' => $php_extensions,
+            'commands'              => $commands,
+            'queued_jobs'           => $queued_jobs,
+            'failed_jobs'           => $failed_jobs,
+            'failed_queues'         => $failed_queues,
+            'php_extensions'        => $php_extensions,
+            'functions'             => $functions,
+            'permissions'           => $permissions,
             'new_version_available' => $new_version_available,
+            'latest_version'        => $latest_version,
+            'latest_version_error'  => SystemController::$latest_version_error,
+            'public_symlink_exists' => $public_symlink_exists,
+            'env_is_writable'       => $env_is_writable,
+            'non_writable_cache_file' => $non_writable_cache_file,
+            'missing_migrations'    => $missing_migrations,
+            'invalid_symlinks'      => \App\Module::checkSymlinks(),
         ]);
     }
 
+    public function action(Request $request)
+    {
+        switch ($request->action) {
+            case 'cancel_job':
+                \App\Job::where('id', $request->job_id)->delete();
+                \Session::flash('flash_success_floating', __('Done'));
+                break;
+
+            case 'retry_job':
+                \App\Job::where('id', $request->job_id)->update(['available_at' => time()]);
+                sleep(1);
+                \Session::flash('flash_success_floating', __('Done'));
+                break;
+
+            case 'delete_failed_jobs':
+                \App\FailedJob::where('queue', $request->failed_queue)->delete();
+                \Session::flash('flash_success_floating', __('Failed jobs deleted'));
+                break;
+
+            case 'retry_failed_jobs':
+                $jobs = \App\FailedJob::where('queue', $request->failed_queue)->get();
+                foreach ($jobs as $job) {
+                    \Artisan::call('queue:retry', ['id' => $job->id]);
+                }
+                \Session::flash('flash_success_floating', __('Failed jobs restarted'));
+                break;
+        }
+
+        return redirect()->route('system');
+    }
+
     /**
      * System tools.
      */
@@ -161,18 +266,20 @@ class SystemController extends Controller
         }
 
         return view('system/tools', [
-            'output' => $output
+            'output' => $output,
         ]);
     }
 
     /**
      * Execute tools action.
-     * @param  Request $request [description]
-     * @return [type]           [description]
+     *
+     * @param Request $request [description]
+     *
+     * @return [type] [description]
      */
     public function toolsExecute(Request $request)
     {
-        $outputLog = new BufferedOutput;
+        $outputLog = new BufferedOutput();
 
         switch ($request->action) {
             case 'clear_cache':
@@ -180,7 +287,19 @@ class SystemController extends Controller
                 break;
 
             case 'fetch_emails':
-                \Artisan::call('freescout:fetch-emails', [], $outputLog);
+                $params = [];
+                $params['--days'] = (int)$request->days;
+                $params['--unseen'] = (int)$request->unseen;
+                $params['--debug'] = (int)$request->debug;
+                \Artisan::call('freescout:fetch-emails', $params, $outputLog);
+                break;
+
+            case 'migrate_db':
+                \Artisan::call('migrate', ['--force' => true], $outputLog);
+                break;
+
+            case 'logout_users':
+                \Artisan::call('freescout:logout-users', [], $outputLog);
                 break;
         }
 
@@ -192,7 +311,7 @@ class SystemController extends Controller
             \Cache::forever('tools_execute_output', $output);
         }
 
-        return redirect()->route('system.tools');
+        return redirect()->route('system.tools')->withInput($request->input());
     }
 
     /**
@@ -210,26 +329,34 @@ class SystemController extends Controller
             case 'update':
                 try {
                     $status = \Updater::update();
+
                     // Artisan::output()
                 } catch (\Exception $e) {
-                    $response['msg'] = __('Error occured').': '.$e->getMessage();
+                    $response['msg'] = __('Error occurred. Please try again or try another :%a_start%update method:%a_end%', ['%a_start%' => '<a href="'.config('app.freescout_url').'/docs/update/" target="_blank">', '%a_end%' => '</a>']);
+                    $response['msg'] .= '<br/><br/>'.$e->getMessage();
+
+                    \Helper::logException($e);
                 }
                 if (!$response['msg'] && $status) {
-                    // Adding session flash is useless as cache is cleated
+                    // Adding session flash is useless as cache is cleared
                     $response['msg_success'] = __('Application successfully updated');
                     $response['status'] = 'success';
                 }
                 break;
 
             case 'check_updates':
-                try {
-                    $response['new_version_available'] = \Updater::isNewVersionAvailable(config('app.version'));
-                    $response['status'] = 'success';
-                } catch (\Exception $e) {
-                    $response['msg'] = __('Error occured').': '.$e->getMessage();
-                }
-                if (!$response['msg'] && !$response['new_version_available']) {
-                    // Adding session flash is useless as cache is cleated
+                if (!\Config::get('app.disable_updating')) {
+                    try {
+                        $response['new_version_available'] = \Updater::isNewVersionAvailable(config('app.version'));
+                        $response['status'] = 'success';
+                    } catch (\Exception $e) {
+                        $response['msg'] = __('Error occurred').': '.$e->getMessage();
+                    }
+                    if (!$response['msg'] && !$response['new_version_available']) {
+                        // Adding session flash is useless as cache is cleated
+                        $response['msg_success'] = __('You have the latest version installed');
+                    }
+                } else {
                     $response['msg_success'] = __('You have the latest version installed');
                 }
                 break;
@@ -240,9 +367,51 @@ class SystemController extends Controller
         }
 
         if ($response['status'] == 'error' && empty($response['msg'])) {
-            $response['msg'] = 'Unknown error occured';
+            $response['msg'] = 'Unknown error occurred';
         }
 
         return \Response::json($response);
     }
+
+    /**
+     * Web Cron.
+     */
+    public function cron(Request $request)
+    {
+        if (empty($request->hash) || $request->hash != \Helper::getWebCronHash()) {
+            abort(404);
+        }
+        $outputLog = new BufferedOutput();
+        \Artisan::call('schedule:run', [], $outputLog);
+        $output = $outputLog->fetch();
+
+        return response($output, 200)->header('Content-Type', 'text/plain');
+    }
+
+    /**
+     * Ajax HTML.
+     */
+    public function ajaxHtml(Request $request)
+    {
+        switch ($request->action) {
+            case 'job_details':
+                $job = \App\FailedJob::find($request->param);
+                if (!$job) {
+                    abort(404);
+                }
+
+                $html = '';
+                $payload = json_decode($job->payload, true);
+
+                if (!empty($payload['data']['command'])) {
+                    $html .= '<pre>'.print_r(unserialize($payload['data']['command']), 1).'</pre>';
+                }
+                
+                $html .= '<pre>'.$job->exception.'</pre>';
+
+                return response($html);
+        }
+
+        abort(404);
+    }
 }

app/Http/Controllers/TranslateController.php

@@ -2,24 +2,44 @@
 
 namespace App\Http\Controllers;
 
+use \Barryvdh\TranslationManager\Models\Translation;
 use Barryvdh\TranslationManager\Controller as BaseController;
 
 class TranslateController extends BaseController
 {
+    /**
+     * Send translations to FreeScout team.
+     *
+     * @return [type] [description]
+     */
     public function postSend()
     {
         $result = false;
 
+        // Count changed translations.
+        $changed_data = Translation::select(['locale', 'group', \DB::raw('count(*) as changed')])
+            ->where('status', Translation::STATUS_CHANGED)
+            ->groupBy(['locale', 'group'])
+            ->get()
+            ->toArray();
+
         $this->manager->exportTranslations('*', false);
 
         // Archive langs folder
-        $archive_path = \Helper::createZipArchive(base_path().DIRECTORY_SEPARATOR.'resources/lang', 'lang.zip', 'lang');
+        try {
+            $archive_path = \Helper::createZipArchive(base_path().DIRECTORY_SEPARATOR.'resources/lang', 'lang.zip', 'lang');
+        } catch (\Exception $e) {
+            return [
+                'status'  => 'error',
+                'error_msg' => $e->getMessage(),
+            ];
+        }
 
         if ($archive_path) {
             $attachments[] = $archive_path;
 
             // Send archive to developers
-            $result = \MailHelper::sendEmailToDevs('Translations', '', $attachments, auth()->user());
+            $result = \MailHelper::sendEmailToDevs('Translations', json_encode($changed_data), $attachments, auth()->user());
         }
 
         if ($result) {
@@ -28,4 +48,47 @@ class TranslateController extends BaseController
             abort(500);
         }
     }
+
+    /**
+     * Remove all translations which has not been published yet.
+     *
+     * @return [type] [description]
+     */
+    public function postRemoveUnpublished()
+    {
+        \Barryvdh\TranslationManager\Models\Translation::truncate();
+
+        return ['status' => 'ok'];
+    }
+
+    /**
+     * Download as ZIP.
+     *
+     * @return [type] [description]
+     */
+    public function postDownload()
+    {
+        $this->manager->exportTranslations('*', false);
+        $file_name = 'lang.zip';
+        // Archive langs folder
+        $archive_path = \Helper::createZipArchive(base_path().DIRECTORY_SEPARATOR.'resources/lang', $file_name, 'lang');
+        $public_path = storage_path('app/public/'.$file_name);
+
+        \File::copy($archive_path, $public_path);
+
+        $headers = [
+            'Content-Type: application/zip',
+        ];
+
+        return \Response::download($public_path, $file_name, $headers);
+    }
+
+    /**
+     * List of strings to translate.
+     */
+    public function stringsToTranslate()
+    {
+        __(':field is required');
+        __('The following modules have to be installed and activated: :modules');
+    }
 }

app/Http/Controllers/UsersController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\Events\UserDeleted;
 use App\Folder;
 use App\Mailbox;
 use App\Subscription;
+use App\Thread;
 use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
@@ -32,7 +32,8 @@ class UsersController extends Controller
     {
         $this->authorize('create', 'App\User');
 
-        $users = User::all();
+        $users = User::nonDeleted()->get();
+        $users = User::sortUsers($users);
 
         return view('users/users', ['users' => $users]);
     }
@@ -55,21 +56,30 @@ class UsersController extends Controller
      */
     public function createSave(Request $request)
     {
+        $invalid = false;
         $this->authorize('create', 'App\User');
+        $auth_user = auth()->user();
 
         $rules = [
-            'role'       => 'integer',
             'first_name' => 'required|string|max:20',
             'last_name'  => 'required|string|max:30',
             'email'      => 'required|string|email|max:100|unique:users',
-            'role'       => ['required', Rule::in(array_keys(User::$roles))],
+            //'role'       => ['required', Rule::in(array_keys(User::$roles))],
         ];
+        if ($auth_user->isAdmin()) {
+            $rules['role'] = ['required', Rule::in(array_keys(User::$roles))];
+        }
         if (empty($request->send_invite)) {
             $rules['password'] = 'required|string|max:255';
         }
         $validator = Validator::make($request->all(), $rules);
 
-        if ($validator->fails()) {
+        if (User::mailboxEmailExists($request->email)) {
+            $invalid = true;
+            $validator->errors()->add('email', __('There is a mailbox with such email. Users and mailboxes can not have the same email addresses.'));
+        }
+
+        if ($invalid || $validator->fails()) {
             return redirect()->route('users.create')
                         ->withErrors($validator)
                         ->withInput();
@@ -77,6 +87,9 @@ class UsersController extends Controller
 
         $user = new User();
         $user->fill($request->all());
+        if (!$auth_user->can('changeRole', $user)) {
+            $user->role = User::ROLE_USER;
+        }
         if (empty($request->send_invite)) {
             // Set password from request
             $user->password = Hash::make($request->password);
@@ -84,9 +97,12 @@ class UsersController extends Controller
             // Set some random password before sending invite
             $user->password = Hash::make($user->generateRandomPassword());
         }
+        // Set system timezone.
+        $user->timezone = config('app.timezone') ?: User::DEFAULT_TIMEZONE;
+        $user = \Eventy::filter('user.create_save', $user, $request);
         $user->save();
 
-        $user->mailboxes()->sync($request->mailboxes);
+        $user->mailboxes()->sync($request->mailboxes ?: []);
         $user->syncPersonalFolders($request->mailboxes);
 
         // Send invite
@@ -95,7 +111,7 @@ class UsersController extends Controller
                 $user->sendInvite(true);
             } catch (\Exception $e) {
                 // Admin is allowed to see exceptions
-                \Session::flash('flash_error_floating', $e->getMessage());
+                \Session::flash('flash_error_floating', $e->getMessage().' — '.__('Check mail settings in "Manage » Settings » Mail Settings"'));
             }
         }
 
@@ -110,6 +126,9 @@ class UsersController extends Controller
     public function profile($id)
     {
         $user = User::findOrFail($id);
+        if ($user->isDeleted()) {
+            abort(404);
+        }
 
         $this->authorize('update', $user);
 
@@ -121,7 +140,7 @@ class UsersController extends Controller
     public function getUsersForSidebar($except_id)
     {
         if (auth()->user()->isAdmin()) {
-            return User::all()->except($except_id);
+            return User::sortUsers(User::nonDeleted()->get());/*->except($except_id)*/;
         } else {
             return [];
         }
@@ -136,6 +155,8 @@ class UsersController extends Controller
      */
     public function profileSave($id, Request $request)
     {
+        $invalid = false;
+
         $user = User::findOrFail($id);
         $this->authorize('update', $user);
 
@@ -144,7 +165,7 @@ class UsersController extends Controller
             'first_name'  => 'required|string|max:20',
             'last_name'   => 'required|string|max:30',
             'email'       => 'required|string|email|max:100|unique:users,email,'.$id,
-            'emails'      => 'max:100',
+            //'emails'      => 'max:100',
             'job_title'   => 'max:100',
             'phone'       => 'max:60',
             'timezone'    => 'required|string|max:255',
@@ -164,7 +185,8 @@ class UsersController extends Controller
                 if ($path_url) {
                     $user->photo_url = $path_url;
                 } else {
-                    $validator->errors()->add('photo_url', __('Error occured processing the image. Make sure that PHP GD extension is enabled.'));
+                    $invalid = true;
+                    $validator->errors()->add('photo_url', __('Error occurred processing the image. Make sure that PHP GD extension is enabled.'));
                 }
             }
 
@@ -172,17 +194,28 @@ class UsersController extends Controller
             if ($user->isAdmin() && isset($request->role) && $request->role != User::ROLE_ADMIN) {
                 $admins_count = User::where('role', User::ROLE_ADMIN)->count();
                 if ($admins_count < 2) {
+                    $invalid = true;
                     $validator->errors()->add('role', __('Role of the only one administrator can not be changed.'));
                 }
             }
         });
 
-        if ($validator->fails()) {
+        if (User::mailboxEmailExists($request->email)) {
+            $invalid = true;
+            $validator->errors()->add('email', __('There is a mailbox with such email. Users and mailboxes can not have the same email addresses.'));
+        }
+
+        if ($invalid || $validator->fails()) {
             return redirect()->route('users.profile', ['id' => $id])
                         ->withErrors($validator)
                         ->withInput();
         }
 
+        // Save language into session.
+        if (auth()->user()->id == $id && $request->locale) {
+            session()->put('user_locale', $request->locale);
+        }
+
         $request_data = $request->all();
 
         if (isset($request_data['photo_url'])) {
@@ -191,12 +224,21 @@ class UsersController extends Controller
         if (!auth()->user()->can('changeRole', $user)) {
             unset($request_data['role']);
         }
-        $user->fill($request_data);
+        if ($user->status != User::STATUS_DELETED) {
+            if (!empty($request_data['disabled'])) {
+                $request_data['status'] = User::STATUS_DISABLED;
+            } else {
+                $request_data['status'] = User::STATUS_ACTIVE;
+            }
+        }
+        $user->setData($request_data);
 
         if (empty($request->input('enable_kb_shortcuts'))) {
             $user->enable_kb_shortcuts = false;
         }
 
+        $user = \Eventy::filter('user.save_profile', $user, $request);
+
         $user->save();
 
         \Session::flash('flash_success_floating', __('Profile saved successfully'));
@@ -216,13 +258,17 @@ class UsersController extends Controller
 
         $user = User::findOrFail($id);
 
+        if ($user->isDeleted()) {
+            abort(404);
+        }
+
         $mailboxes = Mailbox::all();
 
         $users = $this->getUsersForSidebar($id);
 
         return view('users/permissions', [
-            'user'           => $user, 
-            'mailboxes'      => $mailboxes, 
+            'user'           => $user,
+            'mailboxes'      => $mailboxes,
             'user_mailboxes' => $user->mailboxes,
             'users'          => $users,
         ]);
@@ -240,12 +286,27 @@ class UsersController extends Controller
         if (!$user->isAdmin()) {
             abort(403);
         }
-        
+
         $user = User::findOrFail($id);
 
-        $user->mailboxes()->sync($request->mailboxes);
+        $user->mailboxes()->sync($request->mailboxes ?: []);
         $user->syncPersonalFolders($request->mailboxes);
 
+        // Save permissions.
+        $user_permissions = $request->user_permissions ?? [];
+        $permissions = [];
+
+        foreach (User::getUserPermissionsList() as $permission_id) {
+            $new_has_permission = in_array($permission_id, $user_permissions);
+
+            if ($user->hasPermission($permission_id, false) != $new_has_permission) {
+                $permissions[$permission_id] = (int)(bool)$new_has_permission;
+                $save_user = true;
+            }
+        }
+        $user->permissions = $permissions;
+        $user->save();
+
         \Session::flash('flash_success_floating', __('Permissions saved successfully'));
 
         return redirect()->route('users.permissions', ['id' => $id]);
@@ -259,6 +320,10 @@ class UsersController extends Controller
         $user = User::findOrFail($id);
         $this->authorize('update', $user);
 
+        if ($user->isDeleted()) {
+            abort(404);
+        }
+        
         $subscriptions = $user->subscriptions()->select('medium', 'event')->get();
 
         $person = '';
@@ -273,6 +338,7 @@ class UsersController extends Controller
             'subscriptions' => $subscriptions,
             'person'        => $person,
             'users'         => $users,
+            'mobile_available' => \Eventy::filter('notifications.mobile_available', false),
         ]);
     }
 
@@ -311,10 +377,10 @@ class UsersController extends Controller
             // Both send and resend
             case 'send_invite':
                 if (!$auth_user->isAdmin()) {
-                     $response['msg'] = __('Not enough permissions');
+                    $response['msg'] = __('Not enough permissions');
                 }
                 if (empty($request->user_id)) {
-                     $response['msg'] = __('Incorrect user');
+                    $response['msg'] = __('Incorrect user');
                 }
                 if (!$response['msg']) {
                     $user = User::find($request->user_id);
@@ -331,8 +397,8 @@ class UsersController extends Controller
 
                         $response['status'] = 'success';
                     } catch (\Exception $e) {
-                        // Admin is allowed to see exceptions
-                        $response['msg'] = $e->getMessage();
+                        // Admin is allowed to see exceptions.
+                        $response['msg'] = $e->getMessage().' — '.__('Check mail settings in "Manage » Settings » Mail Settings"');
                     }
                 }
                 break;
@@ -340,10 +406,10 @@ class UsersController extends Controller
             // Reset password
             case 'reset_password':
                 if (!auth()->user()->isAdmin()) {
-                     $response['msg'] = __('Not enough permissions');
+                    $response['msg'] = __('Not enough permissions');
                 }
                 if (empty($request->user_id)) {
-                     $response['msg'] = __('Incorrect user');
+                    $response['msg'] = __('Incorrect user');
                 }
                 if (!$response['msg']) {
                     $user = User::find($request->user_id);
@@ -368,7 +434,7 @@ class UsersController extends Controller
             // Load website notifications
             case 'web_notifications':
                 if (!$auth_user) {
-                     $response['msg'] = __('You are not logged in');
+                    $response['msg'] = __('You are not logged in');
                 }
                 if (!$response['msg']) {
                     $web_notifications_info = $auth_user->getWebsiteNotificationsInfo(false);
@@ -376,8 +442,8 @@ class UsersController extends Controller
                         'web_notifications_info_data' => $web_notifications_info['data'],
                     ])->render();
 
-                    $response['has_more_pages'] = (int)$web_notifications_info['notifications']->hasMorePages();
-                    
+                    $response['has_more_pages'] = (int) $web_notifications_info['notifications']->hasMorePages();
+
                     $response['status'] = 'success';
                 }
                 break;
@@ -385,7 +451,7 @@ class UsersController extends Controller
             // Mark all user website notifications as read
             case 'mark_notifications_as_read':
                 if (!$auth_user) {
-                     $response['msg'] = __('You are not logged in');
+                    $response['msg'] = __('You are not logged in');
                 }
                 if (!$response['msg']) {
                     $auth_user->unreadNotifications()->update(['read_at' => now()]);
@@ -431,53 +497,10 @@ class UsersController extends Controller
                 }
 
                 if (!$response['msg']) {
-                    
-                    event(new UserDeleted($user, $auth_user));
 
-                    // We have to process conversations one by one to set move them to Unassigned folder,
-                    // as conversations may be in different mailboxes
-                    // $user->conversations()->update(['user_id' => null, 'folder_id' => ]);
-                    $mailbox_unassigned_folders = [];
-                    $user->conversations->each(function ($conversation) {
-                        // We don't fire ConversationUserChanged event to avoid sending notifications to users
-                        $conversation->user_id = null;
+                    $user->deleteUser($auth_user, $request->assign_user);
 
-                        $folder_id = null;
-                        if (!empty($mailbox_unassigned_folders[$conversation->mailbox_id])) {
-                            $folder_id = $mailbox_unassigned_folders[$conversation->mailbox_id];
-                        } else {
-                            $folder = $conversation->mailbox->folders()
-                                ->where('type', Folder::TYPE_UNASSIGNED)
-                                ->first();
-
-                            if ($folder) {
-                                $folder_id = $folder->id;
-                                $mailbox_unassigned_folders[$conversation->mailbox_id] = $folder_id;
-                            }
-                        }
-                        if ($folder_id) {
-                            $conversation->folder_id = $folder_id;
-                        }
-                        $conversation->save();
-                    });
-
-                    // Recalculate counters for folders
-                    if ($user->isAdmin()) {
-                        // Admin has access to all mailboxes
-                        Mailbox::all()->each(function ($mailbox) {
-                            $mailbox->updateFoldersCounters();
-                        });
-                    } else {
-                        $user->mailboxes->each(function ($mailbox) {
-                            $mailbox->updateFoldersCounters();
-                        });
-                    }
-
-                    $user->mailboxes()->sync([]);
-                    $user->folders()->delete();
-                    $user->delete();
-
-                    \Session::flash('flash_success_floating', __('User deleted'));
+                    \Session::flash('flash_success_floating', __('User deleted').': '.$user->getFullName());
 
                     $response['status'] = 'success';
                 }
@@ -489,7 +512,7 @@ class UsersController extends Controller
         }
 
         if ($response['status'] == 'error' && empty($response['msg'])) {
-            $response['msg'] = 'Unknown error occured';
+            $response['msg'] = 'Unknown error occurred';
         }
 
         return \Response::json($response);
@@ -533,7 +556,7 @@ class UsersController extends Controller
             // Check current password
             if (!Hash::check($request->password_current, $user->password)) {
                 $validator->errors()->add('password_current', __('This password is incorrect.'));
-            } else if (Hash::check($request->password, $user->password)) {
+            } elseif (Hash::check($request->password, $user->password)) {
                 // Check new password
                 $validator->errors()->add('password', __('The new password is the same as the old password.'));
             }

app/Http/Kernel.php

@@ -33,17 +33,22 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
+            \App\Http\Middleware\TokenAuth::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\HttpsRedirect::class,
+            \App\Http\Middleware\Localize::class,
+            \App\Http\Middleware\LogoutIfDeleted::class,
+            \App\Http\Middleware\FrameGuard::class,
+            \App\Http\Middleware\CustomHandle::class,
         ],
 
-        'api' => [
-            'throttle:60,1',
-            'bindings',
-        ],
+        // 'api' => [
+        //     'throttle:60,1',
+        //     'bindings',
+        // ],
     ];
 
     /**

app/Http/Middleware/CustomHandle.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class CustomHandle
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // Enable/disable chat mode
+        if ($request->exists('chat_mode')) {
+            \Helper::setChatMode((int)$request->chat_mode);
+        }
+
+        // Hook.
+        \Eventy::action('middleware.web.custom_handle', $request);
+
+        return \Eventy::filter('middleware.web.custom_handle.response', $next($request), $request, $next);
+    }
+}

app/Http/Middleware/EncryptCookies.php

@@ -12,6 +12,6 @@ class EncryptCookies extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        'in_app'
     ];
 }

app/Http/Middleware/FrameGuard.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class FrameGuard
+{
+    /**
+     * Handle the given request and get the response.
+     */
+    public function handle($request, Closure $next)
+    {
+        $response = $next($request);
+
+        $x_frame_options = config('app.x_frame_options');
+
+        if (false !== $x_frame_options 
+            && $x_frame_options !== 'false'
+            && $x_frame_options !== '0'
+        ) {
+            $value = 'SAMEORIGIN';
+
+            if (is_string($x_frame_options) && preg_match("#(DENY|SAMEORIGIN|ALLOW-FROM)#i", $x_frame_options)) {
+                $value = $x_frame_options;
+            }
+            $response->headers->set('X-Frame-Options', $value, false);
+        }
+
+        return $response;
+    }
+}

app/Http/Middleware/HttpsRedirect.php

@@ -9,17 +9,40 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\App;
+use Illuminate\Http\Request;
 
 class HttpsRedirect {
 
+    /**
+     * The current proxy header mappings.
+     *
+     * @var array
+     */
+    // protected $headers = [
+    //     Request::HEADER_FORWARDED         => 'FORWARDED',
+    //     Request::HEADER_X_FORWARDED_FOR   => 'X_FORWARDED_FOR',
+    //     Request::HEADER_X_FORWARDED_HOST  => 'X_FORWARDED_HOST',
+    //     Request::HEADER_X_FORWARDED_PORT  => 'X_FORWARDED_PORT',
+    //     Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
+    // ];
+
     public function handle($request, Closure $next)
     {
-        if (\Config::get('app.force_https') == 'true') {
-            $request->setTrustedProxies( [ $request->getClientIp() ] ); 
-            if (!$request->secure() /*&& App::environment() === 'production'*/) {
+        if (\Helper::isHttps()) {
+            //$request->setTrustedProxies( [ $request->getClientIp() ], array_keys($this->headers)); 
+            //!$request->secure()
+            if (!\Helper::isCurrentUrlHttps()) {
                 return redirect()->secure($request->getRequestUri());
             }
         }
+
+        // Correct protocol in $_SERVER
+        if (\Helper::isHttps() 
+            //&& !$request->secure() 
+            && strtolower($_SERVER['HTTPS'] ?? '') != 'on'
+        ) {
+            $_SERVER['HTTPS'] = 'on';
+        }
         return $next($request);
     }
 }

app/Http/Middleware/Localize.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class Localize
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // Interface language is set automatically, as locale is stored in .env file.
+
+        // Set user language if user logged in.
+        $user_locale = \Eventy::filter('locale', session('user_locale'));
+        if ($user_locale) {
+            \Helper::setLocale($user_locale);
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/LogoutIfDeleted.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Redirect;
+
+class LogoutIfDeleted
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     * @param string|null              $guard
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        $user = Auth::user();
+        if ($user && ($user->isDeleted() || $user->isDisabled())) {
+            Auth::logout();
+            return Redirect::route('login');
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/ResponseHeaders.php

@@ -12,9 +12,9 @@ class ResponseHeaders
 
         // Disable caching
         if (method_exists($response, 'header')) {
-	        $response->header('Pragma', 'no-cache');
-	        $response->header('Cache-Control', 'no-cache, max-age=0, must-revalidate, no-store');
-	    }
+            $response->header('Pragma', 'no-cache');
+            $response->header('Cache-Control', 'no-cache, max-age=0, must-revalidate, no-store');
+        }
 
         return $response;
     }

app/Http/Middleware/TerminateHandler.php

@@ -14,7 +14,7 @@ class TerminateHandler
 
     public function terminate($request, $response)
     {
-        // Process events which occured
+        // Process events which occurred
         Subscription::processEvents();
     }
 }

app/Http/Middleware/TokenAuth.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\User;
+use Closure;
+
+class TokenAuth
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // This is needed to restore authentication when app session expires.
+        if (!$request->user() && !empty($request->auth_token) && $request->cookie('in_app')) {
+            try {
+                $user = User::where(\DB::raw('md5(CONCAT(id, created_at, "'.config('app.key').'"))'), $request->auth_token)
+                    ->first();
+            } catch (\Exception $e) {
+                \Helper::logException($e, '[TokenAuth]');
+            }
+            if (!empty($user)) {
+                \Auth::login($user);
+            }
+        }
+        return $next($request);
+    }
+}

app/Job.php

@@ -2,12 +2,57 @@
 
 namespace App;
 
+use App\Thread;
 use Illuminate\Database\Eloquent\Model;
 
 class Job extends Model
 {
+	const UPDATED_AT = null;
+
+	public $payload_decoded = null;
+
     /**
      * Automatically converted into Carbon dates.
      */
     protected $dates = ['created_at', 'available_at', 'reserved_at'];
+
+    public function getPayloadDecoded()
+    {
+    	if ($this->payload_decoded !== null) {
+    		return $this->payload_decoded;
+    	}
+
+    	$this->payload_decoded = json_decode($this->payload, true);
+
+    	return $this->payload_decoded;
+    }
+
+    public function getCommand()
+    {
+    	return self::getPayloadCommand($this->getPayloadDecoded());
+    }
+
+    public function getCommandLastThread()
+    {
+	    $command = $this->getCommand();
+        if ($command && !empty($command->threads)) {
+            return Thread::getLastThread($command->threads);
+        }
+
+        return null;
+    }
+
+    public static function getPayloadCommand($payload)
+    {
+    	if (empty($payload['data']) || empty($payload['data']['command'])) {
+    		return null;
+    	}
+        try {
+            // If some record has been deleted from DB, there will be an error:
+            // No query results for model [App\Conversation].
+            return unserialize($payload['data']['command']);
+        } catch (\Exception $e) {
+            return null;
+        }
+    }
 }

app/Jobs/RestartQueueWorker.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Used to stop current queue:work in order to start a new one.
+ * https://github.com/freescout-helpdesk/freescout/issues/2507#issuecomment-1376006247
+ */
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class RestartQueueWorker implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $this->delete();
+        // register_shutdown_function() is called on exit(),
+        // so commands mutexes are removed.
+        exit();
+    }
+}

app/Jobs/SendAlert.php

@@ -2,11 +2,12 @@
 /**
  * Send alert to super admin.
  */
+
 namespace App\Jobs;
 
+use App\Mail\Alert;
 use App\SendLog;
 use App\User;
-use App\Mail\Alert;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -19,8 +20,17 @@ class SendAlert implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $text;
+
     public $title;
 
+    /**
+     * The number of seconds the job can run before timing out.
+     * fwrite() function in /vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+     * in some cases may stuck and continue infinitely. This blocks queue:work and no other jobs are processed.
+     * So we need to set the timeout. On timeout the whole queue:work process is being killed by Laravel.
+     */
+    public $timeout = 120;
+
     /**
      * Create a new job instance.
      *
@@ -41,19 +51,18 @@ class SendAlert implements ShouldQueue
     {
         // Configure mail driver according to Mailbox settings
         \MailHelper::setSystemMailDriver();
-        
-        $recipients = [];
 
-        $super_admin = User::getSuperAdmin();
-        if ($super_admin) {
-            $recipients[] = $super_admin->email;
-        }
+        $recipients = User::nonDeleted()
+            ->where('role', User::ROLE_ADMIN)
+            ->where('invite_state', User::INVITE_STATE_ACTIVATED)
+            ->pluck('email')
+            ->toArray();
 
         $extra = \MailHelper::sanitizeEmails(\Option::get('alert_recipients'));
         if ($extra) {
             $recipients = array_unique(array_merge($recipients, $extra));
         }
-
+      
         foreach ($recipients as $recipient) {
             $exception = null;
 

app/Jobs/SendAutoReply.php

@@ -23,6 +23,14 @@ class SendAutoReply implements ShouldQueue
 
     public $customer;
 
+    /**
+     * The number of seconds the job can run before timing out.
+     * fwrite() function in /vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+     * in some cases may stuck and continue infinitely. This blocks queue:work and no other jobs are processed.
+     * So we need to set the timeout. On timeout the whole queue:work process is being killed by Laravel.
+     */
+    public $timeout = 120;
+
     /**
      * Create a new job instance.
      *
@@ -43,22 +51,32 @@ class SendAutoReply implements ShouldQueue
      */
     public function handle()
     {
+        // Auto reply disabled.
+        if (!empty($this->conversation->meta['ar_off'])) {
+            return;
+        }
+
         // Configure mail driver according to Mailbox settings
-        \App\Misc\Mail::setMailDriver($this->mailbox);
+        \App\Misc\Mail::setMailDriver($this->mailbox, null, $this->conversation);
 
         // Auto reply appears as reply in customer's mailbox
         $headers['In-Reply-To'] = '<'.$this->thread->message_id.'>';
         $headers['References'] = '<'.$this->thread->message_id.'>';
 
         // Create Message-ID for the auto reply
-        $message_id = \App\Misc\Mail::MESSAGE_ID_PREFIX_AUTO_REPLY.'-'.$this->thread->id.'-'.md5($this->thread->id).'@'.$this->mailbox->getEmailDomain();
+        $message_id = \App\Misc\Mail::MESSAGE_ID_PREFIX_AUTO_REPLY.'-'.$this->thread->id.'-'.\MailHelper::getMessageIdHash($this->thread->id).'@'.$this->mailbox->getEmailDomain();
         $headers['Message-ID'] = $message_id;
 
         $customer_email = $this->conversation->customer_email;
+
+        if (!$customer_email) {
+            // When message is received via Chat, customer has no email adddress.
+            return;
+        }
         $recipients = [$customer_email];
-        $failures   = [];
-        $exception  = null;
-        
+        $failures = [];
+        $exception = null;
+
         try {
             Mail::to([['name' => $this->customer->getFullName(), 'email' => $customer_email]])
                 ->send(new AutoReply($this->conversation, $this->mailbox, $this->customer, $headers));

app/Jobs/SendEmailReplyError.php

@@ -7,7 +7,6 @@ namespace App\Jobs;
 
 use App\Mail\UserEmailReplyError;
 use App\SendLog;
-use App\Thread;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -25,6 +24,14 @@ class SendEmailReplyError implements ShouldQueue
 
     public $mailbox;
 
+    /**
+     * The number of seconds the job can run before timing out.
+     * fwrite() function in /vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+     * in some cases may stuck and continue infinitely. This blocks queue:work and no other jobs are processed.
+     * So we need to set the timeout. On timeout the whole queue:work process is being killed by Laravel.
+     */
+    public $timeout = 120;
+
     /**
      * Create a new job instance.
      *
@@ -48,6 +55,7 @@ class SendEmailReplyError implements ShouldQueue
         \App\Misc\Mail::setMailDriver($this->mailbox);
 
         $exception = null;
+
         try {
             Mail::to([['name' => '', 'email' => $this->from]])
                 ->send(new UserEmailReplyError());

app/Jobs/SendNotificationToUsers.php

@@ -22,6 +22,17 @@ class SendNotificationToUsers implements ShouldQueue
 
     public $threads;
 
+    // Max retries + 1
+    public $tries = 168; // One per hour
+
+    /**
+     * The number of seconds the job can run before timing out.
+     * fwrite() function in /vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+     * in some cases may stuck and continue infinitely. This blocks queue:work and no other jobs are processed.
+     * So we need to set the timeout. On timeout the whole queue:work process is being killed by Laravel.
+     */
+    public $timeout = 120;
+
     /**
      * Create a new job instance.
      *
@@ -44,46 +55,92 @@ class SendNotificationToUsers implements ShouldQueue
         $mailbox = $this->conversation->mailbox;
 
         // Configure mail driver according to Mailbox settings
-        \App\Misc\Mail::setMailDriver($mailbox);
+        \App\Misc\Mail::setMailDriver($mailbox, null, $this->conversation);
 
         // Threads has to be sorted here, if sorted before, they come here in wrong order
-        $this->threads = $this->threads->sortByDesc(function ($item, $key) {
-            return $item->created_at;
-        });
+        $this->threads = Thread::sortThreads($this->threads);
 
         $headers = [];
         $last_thread = $this->threads->first();
 
+        if (!$last_thread) {
+            return;
+        }
+
         // If thread is draft, it means it has been undone
         if ($last_thread->isDraft()) {
             return;
         }
 
+        // Limit conversation history
+        if (config('app.email_user_history') == 'last') {
+            $this->threads = $this->threads->slice(0, 2);
+        }
+
+        if (config('app.email_user_history') == 'none') {
+            $this->threads = $this->threads->slice(0, 1);
+        }
+
         // All notification for the same conversation has same dummy Message-ID
         $prev_message_id = \App\Misc\Mail::MESSAGE_ID_PREFIX_NOTIFICATION_IN_REPLY.'-'.$this->conversation->id.'-'.md5($this->conversation->id).'@'.$mailbox->getEmailDomain();
         $headers['In-Reply-To'] = '<'.$prev_message_id.'>';
         $headers['References'] = '<'.$prev_message_id.'>';
+        // https://github.com/freescout-helpdesk/freescout/issues/2488
+        $headers['X-Auto-Response-Suppress'] = 'All';
 
         // We throw an exception if any of the send attempts throws an exception (connection error, etc)
         $global_exception = null;
 
         foreach ($this->users as $user) {
+
+            // User can ne deleted from DB.
+            if (!isset($user->id)) {
+                continue;
+            }
+
+            if ($user->isDeleted()) {
+                continue;
+            }
+
+            // If for one user sending fails the job is marked as failed and retried after some time.
+            // So we have to check if notification email has already been successfully sent to this user.
+            if ($this->attempts() > 1) {
+                // Maybe add indexes to the table.
+                $already_sent = SendLog::where('thread_id', $last_thread->id)
+                    ->where('mail_type', SendLog::MAIL_TYPE_USER_NOTIFICATION)
+                    ->where('user_id', $user->id)
+                    ->whereIn('status', SendLog::$sent_success)
+                    ->exists();
+                if ($already_sent) {
+                    continue;
+                }
+            }
+
             $message_id = \App\Misc\Mail::MESSAGE_ID_PREFIX_NOTIFICATION.'-'.$last_thread->id.'-'.$user->id.'-'.time().'@'.$mailbox->getEmailDomain();
             $headers['Message-ID'] = $message_id;
 
-            // If this is notification on message from customer set customer as sender name
+            // If this is notification on message from customer, set customer as sender name
             $from_name = '';
             if ($last_thread->type == Thread::TYPE_CUSTOMER) {
-                $from_name = $last_thread->customer->getFullName();
+                $from_name = '';
+                if ($last_thread->customer) {
+                    $from_name = $last_thread->customer->getFullName(true, true);
+                }
                 if ($from_name) {
-                    $from_name = $from_name.' '.__('via').' '.\Config::get('app.name');
+                    $from_name = $from_name.' '.__('via').' '.$mailbox->name;
                 }
             }
             if (!$from_name) {
-                $from_name = \Config::get('app.name');
+                $from_name = $mailbox->name;
             }
             $from = ['address' => $mailbox->email, 'name' => $from_name];
 
+            // Set user language
+            app()->setLocale($user->getLocale());
+
+            $headers['X-FreeScout-Mail-Type'] = 'user.notification';
+            $headers = \Eventy::filter('jobs.send_reply_to_customer.headers', $headers, $user, $mailbox, $this->conversation, $this->threads, $from);
+
             $exception = null;
 
             try {
@@ -122,7 +179,24 @@ class SendNotificationToUsers implements ShouldQueue
         }
 
         if ($global_exception) {
-            throw $global_exception;
+            // Retry job with delay.
+            // https://stackoverflow.com/questions/35258175/how-can-i-create-delays-between-failed-queued-job-attempts-in-laravel
+            // We do not try to resend Bounce messages: https://github.com/freescout-helpdesk/freescout/issues/3156
+            if ($this->attempts() < $this->tries && !$last_thread->isBounce()) {
+                if ($this->attempts() == 1) {
+                    // Second attempt after 5 min.
+                    $this->release(300);
+                } else {
+                    // Others - after 1 hour.
+                    $this->release(3600);
+                }
+
+                throw $global_exception;
+            } else {
+                $this->fail($global_exception);
+
+                return;
+            }
         }
     }
 

app/Jobs/SendReplyToCustomer.php

@@ -3,14 +3,17 @@
 namespace App\Jobs;
 
 use App\Mail\ReplyToCustomer;
+use App\Customer;
 use App\SendLog;
 use App\Thread;
+use App\Misc\SwiftGetSmtpQueueId;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Mail;
+//use Webklex\IMAP\Client;
 
 class SendReplyToCustomer implements ShouldQueue
 {
@@ -28,6 +31,17 @@ class SendReplyToCustomer implements ShouldQueue
     private $message_id = '';
     private $customer_email = '';
 
+    // Number of retries + 1
+    public $tries = 168; // one per hour
+    
+    /**
+     * The number of seconds the job can run before timing out.
+     * fwrite() function in /vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+     * in some cases may stuck and continue infinitely. This blocks queue:work and no other jobs are processed.
+     * So we need to set the timeout. On timeout the whole queue:work process is being killed by Laravel.
+     */
+    public $timeout = 120;
+    
     /**
      * Create a new job instance.
      *
@@ -47,47 +61,183 @@ class SendReplyToCustomer implements ShouldQueue
      */
     public function handle()
     {
+        $send_previous_messages = false;
+        $is_forward = false;
+
+        // When forwarding conversation is undone, new conversation is deleted.
+        if (!$this->conversation) {
+            return;
+        }
+
         $mailbox = $this->conversation->mailbox;
 
+        // Mailbox may be deleted.
+        if (!$mailbox) {
+            return;
+        }
+
+        // Add forwarded conversation replies.
+        if ($this->conversation->threads_count == 1 && count($this->threads) == 1) {
+            $forward_child_thread = $this->threads[0];
+            if ($forward_child_thread->isForwarded() && $forward_child_thread->getForwardParentConversation()) {
+
+                // Add replies from original conversation.
+                $forwarded_replies = $forward_child_thread->getForwardParentConversation()->getReplies();
+                $forwarded_replies = Thread::sortThreads($forwarded_replies);
+                $forward_parent_thread = Thread::find($forward_child_thread->getMetaFw(Thread::META_FORWARD_PARENT_THREAD_ID));
+
+                if ($forward_parent_thread) {
+                    // Remove threads created after forwarding.
+                    foreach ($forwarded_replies as $i => $thread) {
+                        if ($thread->created_at > $forward_parent_thread->created_at) {
+                            $forwarded_replies->forget($i);
+                        }
+                    }
+                    $this->threads = $this->threads->merge($forwarded_replies);
+                    $is_forward = true;
+                }
+            }
+        }
+
         // Threads has to be sorted here, if sorted before, they come here in wrong order
-        $this->threads = $this->threads->sortByDesc(function ($item, $key) {
-            return $item->created_at;
-        });
+        $this->threads = Thread::sortThreads($this->threads);
 
         $new = false;
         $headers = [];
+
         $this->last_thread = $this->threads->first();
-        $prev_thread = null;
+
+        if ($this->last_thread === null) {
+            return;
+        }
+        $last_customer_thread = null;
 
         // If thread is draft, it means it has been undone
         if ($this->last_thread->isDraft()) {
             return;
         }
 
-        // Configure mail driver according to Mailbox settings
-        \App\Misc\Mail::setMailDriver($mailbox, $this->last_thread->created_by_user);
+        // After sending an email we are saving it into "IMAP Folder To Save Outgoing Replies".
+        // This process may stuck or make SendReplyToCustomer job die with
+        // "Allowed memory size of NNN bytes exhausted" error.
+        // https://github.com/freescout-helpdesk/freescout/issues/3632
+        if ($this->attempts() >= 1 && 
+            ($this->last_thread->send_status == SendLog::STATUS_ACCEPTED
+                || $this->last_thread->isSendStatusSuccess())
+        ) {
+            return;
+        }
 
         if (count($this->threads) == 1) {
             $new = true;
         }
-        $i = 0;
-        foreach ($this->threads as $thread) {
-            if ($i == 1) {
-                $prev_thread = $thread;
-                break;
+        if (!$new) {
+            $i = 0;
+            foreach ($this->threads as $thread) {
+                if ($i > 0 && $thread->type == Thread::TYPE_CUSTOMER) {
+                    $last_customer_thread = $thread;
+                    break;
+                }
+                $i++;
             }
-            $i++;
         }
 
-        // Get penultimate email Message-Id if reply
-        if (!$new && !empty($prev_thread) && $prev_thread->message_id) {
-            $headers['In-Reply-To'] = '<'.$prev_thread->message_id.'>';
-            $headers['References'] = '<'.$prev_thread->message_id.'>';
+        // In-Reply-To and References headers.
+        $references = '';
+        if (!$new && !empty($last_customer_thread) && $last_customer_thread->message_id) {
+
+            $headers['In-Reply-To'] = '<'.$last_customer_thread->message_id.'>';
+            //$headers['References'] = '<'.$last_customer_thread->message_id.'>';
+            // https://github.com/freescout-helpdesk/freescout/issues/3175
+            $i = 0;
+            $references_array = [];
+            foreach ($this->threads as $thread) {
+                if ($i > 0) {
+                    $reference = $thread->getMessageId();
+                    if ($reference) {
+                        $references_array[] = $reference;
+                    }
+                }
+                $i++;
+            }
+            if ($references_array) {
+                $references = '<'.implode('> <', array_reverse($references_array)).'>';
+            }
+            if ($references) {
+                $headers['References'] = $references;
+            }
         }
-        $this->message_id = \App\Misc\Mail::MESSAGE_ID_PREFIX_REPLY_TO_CUSTOMER.'-'.$this->last_thread->id.'-'.md5($this->last_thread->id).'@'.$mailbox->getEmailDomain();
+
+        // Conversation history.
+        $email_conv_history = config('app.email_conv_history');
+
+        $threads_count = count($this->threads);
+
+        $meta_conv_history = $this->last_thread->getMeta(Thread::META_CONVERSATION_HISTORY);
+        if (!empty($meta_conv_history)) {
+            $email_conv_history = $meta_conv_history;
+        }
+
+        if ($is_forward && $email_conv_history == 'global') {
+            $email_conv_history = 'full';
+        }
+
+        if ($is_forward && $email_conv_history == 'none') {
+            $email_conv_history = 'full';
+        }
+
+        if ($email_conv_history == 'full') {
+            $send_previous_messages = true;
+        }
+
+        if ($email_conv_history == 'last') {
+            $send_previous_messages = true;
+            $this->threads = $this->threads->slice(0, 2);
+        }
+
+        if ($email_conv_history == 'none') {
+            $send_previous_messages = false;
+        }
+
+        if (!$is_forward) {
+            $send_previous_messages = \Eventy::filter('jobs.send_reply_to_customer.send_previous_messages', $send_previous_messages, $this->last_thread, $this->threads, $this->conversation, $this->customer);
+        }
+
+        // Remove previous messages.
+        if (!$send_previous_messages) {
+            $this->threads = $this->threads->slice(0, 1);
+        }
+
+        // Configure mail driver according to Mailbox settings
+        \MailHelper::setMailDriver($mailbox, $this->last_thread->created_by_user, $this->conversation);
+
+        // https://github.com/freescout-helpdesk/freescout/issues/3330
+        if (!\MailHelper::$smtp_queue_id_plugin_registered) {
+            \Mail::getSwiftMailer()->registerPlugin(new SwiftGetSmtpQueueId());
+            \MailHelper::$smtp_queue_id_plugin_registered = true;
+        }
+
+        $this->message_id = $this->last_thread->getMessageId($mailbox);
         $headers['Message-ID'] = $this->message_id;
 
         $this->customer_email = $this->conversation->customer_email;
+
+        // For phone conversations we may need to get customer email.
+        // https://github.com/freescout-helpdesk/freescout/issues/3270
+        if (!$this->customer_email && $this->conversation->isPhone()) {            
+            $this->customer_email = $this->conversation->customer->getMainEmail();
+            if (!$this->customer_email) {
+                return;
+            }
+        }
+
+        // Try to get customer by email
+        if (!$this->customer) {
+            $this->customer = Customer::getByEmail($this->customer_email);
+            return;
+        }
+
+        $to_array = $mailbox->removeMailboxEmailsFromList($this->last_thread->getToArray());
         $cc_array = $mailbox->removeMailboxEmailsFromList($this->last_thread->getCcArray());
         $bcc_array = $mailbox->removeMailboxEmailsFromList($this->last_thread->getBccArray());
 
@@ -95,35 +245,257 @@ class SendReplyToCustomer implements ShouldQueue
         $cc_array = \App\Misc\Mail::removeEmailFromArray($cc_array, $this->customer_email);
         $bcc_array = \App\Misc\Mail::removeEmailFromArray($bcc_array, $this->customer_email);
 
+        // Auto Bcc.
+        if ($mailbox->auto_bcc) {
+            $auto_bcc = \MailHelper::sanitizeEmails($mailbox->auto_bcc);
+            if ($auto_bcc) {
+                $bcc_array = array_merge($bcc_array, $auto_bcc);
+            }
+        }
+
         // Remove from BCC emails which are present in CC
         foreach ($cc_array as $cc_email) {
             $bcc_array = \App\Misc\Mail::removeEmailFromArray($bcc_array, $cc_email);
         }
 
-        $this->recipients = array_merge([$this->customer_email], $cc_array, $bcc_array);
+        $this->recipients = array_merge($to_array, $cc_array, $bcc_array);
 
+        $to = [];
+        if (count($to_array) > 1) {
+            $to = $to_array;
+        } else {
+            $to = [['name' => $this->customer->getFullName(), 'email' => $this->customer_email]];
+        }
+
+        // If sending fails, all recipiens fail.
+        // if ($this->attempts() > 1) {
+        //     $cc_array = [];
+        //     $bcc_array = [];
+        // }
+
+        $subject = $this->conversation->subject;
+        if (!$new && !$is_forward) {
+            $subject = 'Re: '.$subject;
+        }
+        $subject = \Eventy::filter('email.reply_to_customer.subject', $subject, $this->conversation, $this->last_thread);
+        $this->threads = \Eventy::filter('email.reply_to_customer.threads', $this->threads, $this->conversation, $mailbox);
+
+        $headers['X-FreeScout-Mail-Type'] = 'customer.message';
+
+        $reply_mail = new ReplyToCustomer($this->conversation, $this->threads, $headers, $mailbox, $subject, $threads_count);
+
+        $smtp_queue_id = null;
+        
         try {
-            Mail::to([['name' => $this->customer->getFullName(), 'email' => $this->customer_email]])
+            Mail::to($to)
                 ->cc($cc_array)
                 ->bcc($bcc_array)
-                ->send(new ReplyToCustomer($this->conversation, $this->threads, $headers, $mailbox));
+                ->send($reply_mail);
+
+            $this->last_thread->send_status = SendLog::STATUS_ACCEPTED;
+            $this->last_thread->save();
+
+            $smtp_queue_id = SwiftGetSmtpQueueId::$last_smtp_queue_id;
         } catch (\Exception $e) {
             // We come here in case SMTP server unavailable for example
-            activity()
-                ->causedBy($this->customer)
-                ->withProperties([
-                    'error'    => $e->getMessage().'; File: '.$e->getFile().' ('.$e->getLine().')',
-                 ])
-                ->useLog(\App\ActivityLog::NAME_EMAILS_SENDING)
-                ->log(\App\ActivityLog::DESCRIPTION_EMAILS_SENDING_ERROR_TO_CUSTOMER);
+            if ($this->attempts() == 1) {
+                activity()
+                    ->causedBy($this->customer)
+                    ->withProperties([
+                        'error'    => $e->getMessage().'; File: '.$e->getFile().' ('.$e->getLine().')',
+                     ])
+                    ->useLog(\App\ActivityLog::NAME_EMAILS_SENDING)
+                    ->log(\App\ActivityLog::DESCRIPTION_EMAILS_SENDING_ERROR_TO_CUSTOMER);
+            }
 
             // Failures will be saved to send log when retry attempts will finish
+            // Mail::failures() is empty in case of connection error.
             $this->failures = $this->recipients;
 
-            // Save to send log
-            $this->saveToSendLog($e->getMessage());
+            // Save to send log (only first attempt).
+            if ($this->attempts() == 1) {
+                $this->saveToSendLog($e->getMessage());
+            }
 
-            throw $e;
+            $error_message = $e->getMessage();
+
+            // Remove stack trace from error message.
+            $error_message = preg_replace('#[\r\n]*" in /.*#s', '"', $error_message);
+
+            // SMTP response code is stored in the exception message:
+            // Expected response code 235 but got code "535", with message...
+            preg_match('#but got code "(\d+)",#', $error_message, $response_m);
+            $response_code = (int)($response_m[1] ?? 0);
+
+            // Retry job with delay.
+            // https://stackoverflow.com/questions/35258175/how-can-i-create-delays-between-failed-queued-job-attempts-in-laravel
+            if ($this->attempts() < $this->tries && !preg_match("/".config("app.no_retry_mail_errors")."/i", $error_message)) {
+                if ($this->attempts() == 1) {
+                    // Second attempt after 5 min.
+                    $this->release(300);
+                } else {
+                    // Others - after 1 hour.
+                    $this->release(3600);
+                }
+
+                // If an email has not been sent after 1 hour - show an error message to support agent.
+                if ($this->attempts() >= 3 || $response_code >= 500) {
+                    $this->last_thread->send_status = SendLog::STATUS_SEND_INTERMEDIATE_ERROR;
+                    $this->last_thread->updateSendStatusData(['msg' => $error_message]);
+                    $this->last_thread->save();
+                }
+
+                throw $e;
+            } else {
+                $this->last_thread->send_status = SendLog::STATUS_SEND_ERROR;
+                $this->last_thread->updateSendStatusData(['msg' => $error_message]);
+                $this->last_thread->save();
+
+                // This executes $this->failed().
+                $this->fail($e);
+
+                return;
+            }
+        }
+
+        SwiftGetSmtpQueueId::$last_smtp_queue_id = null;
+
+        // Clean error message if email finally has been sent.
+        if ($this->last_thread->send_status == SendLog::STATUS_SEND_ERROR) {
+            $this->last_thread->send_status = null;
+            $this->last_thread->updateSendStatusData(['msg' => '']);
+            $this->last_thread->save();
+        }
+
+        $imap_sent_folder = $mailbox->imap_sent_folder;
+        if ($imap_sent_folder) {
+            try {
+                $client = \MailHelper::getMailboxClient($mailbox);
+                
+                $client->connect();
+
+                $mail_from = $mailbox->getMailFrom($this->last_thread->created_by_user ?? null, $this->conversation);
+
+                if (!empty($mail_from['name'])) {
+                    $envelope['from'] = '"'.$mail_from['name'].'" <'.$mail_from['address'].'>';
+                } else {
+                    $envelope['from'] = $mail_from['address'];
+                }
+                if (is_array($to) && !empty($to[0]) && !empty($to[0]['name']) && !empty($to[0]['email'])) {
+                    $envelope['to'] = '"'.$to[0]['name'].'" <'.$to[0]['email'].'>';
+                } else {
+                    $envelope['to'] = $this->customer_email;
+                }
+                $envelope['subject'] = $subject;
+                $envelope['date'] = now()->toRfc2822String();
+                $envelope['message_id'] = $this->message_id;
+
+                // CC.
+                if (count($cc_array)) {
+                    $envelope['cc'] = implode(',', $cc_array);
+                }
+
+                // Get penultimate email Message-Id if reply
+                if (!$new && !empty($last_customer_thread) && $last_customer_thread->message_id) {
+                    $envelope['custom_headers'] = [
+                        'In-Reply-To: <'.$last_customer_thread->message_id.'>',
+                        'References: '.$references,
+                    ];
+                }
+                // Remove new lines to avoid "imap_mail_compose(): header injection attempt in subject".
+                foreach ($envelope as $i => $envelope_value) {
+                    $envelope[$i] = preg_replace("/[\r\n]/", '', $envelope_value);
+                }
+
+                $parts = [];
+
+                // Multipart flag.
+                if ($this->last_thread->has_attachments) {
+                    $multipart = [];
+                    $multipart["type"] = TYPEMULTIPART;
+                    $multipart["subtype"] = "mixed";
+                    // https://github.com/freescout-helpdesk/freescout/issues/3934
+                    //$multipart["subtype"] = "alternative";
+                    $parts[] = $multipart;
+                }
+
+                // Body.
+                $part_body['type'] = TYPETEXT;
+                $part_body['subtype'] = 'html';
+                $part_body['contents.data'] = $reply_mail->render();
+                $part_body['charset'] = 'utf-8';
+
+                $parts[] = $part_body;
+
+                // Add attachments.
+                if ($this->last_thread->has_attachments) {
+
+                    foreach ($this->last_thread->attachments as $attachment) {
+
+                        if ($attachment->embedded) {
+                            continue;
+                        }
+
+                        if ($attachment->fileExists()) {
+                            $part = [];
+                            $part["type"] = 'APPLICATION';
+                            $part["encoding"] = ENCBASE64;
+                            $part["subtype"] = "octet-stream";
+                            $part["description"] = $attachment->file_name;
+                            $part['disposition.type'] = 'attachment';
+                            $part['disposition'] = array('filename' => $attachment->file_name);
+                            $part['type.parameters'] = array('name' => $attachment->file_name);
+                            $part["description"] = '';
+                            $part["contents.data"] = base64_encode($attachment->getFileContents());
+                            
+                            $parts[] = $part;
+                        } else {
+                            \Log::error('[IMAP Folder To Save Outgoing Replies] Thread: '.$this->last_thread->id.'. Attachment file not find on disk: '.$attachment->getLocalFilePath());
+                        }
+                    }
+                }
+
+                try {
+                    // https://github.com/freescout-helpdesk/freescout/issues/3502
+                    $imap_sent_folder = mb_convert_encoding($imap_sent_folder, "UTF7-IMAP","UTF-8");
+
+                    // https://github.com/Webklex/php-imap/issues/380
+                    if (method_exists($client, 'getFolderByPath')) {
+                        $folder = $client->getFolderByPath($imap_sent_folder);
+                    } else {
+                        $folder = $client->getFolder($imap_sent_folder);
+                    }
+                    // Get folder method does not work if sent folder has spaces.
+                    if ($folder) {
+                        try {
+                            $save_result = $this->saveEmailToFolder($client, $folder, $envelope, $parts, $bcc_array);
+
+                            // Sometimes emails with attachments by some reason are not saved.
+                            // https://github.com/freescout-helpdesk/freescout/issues/2749
+                            if (!$save_result) {
+                                // Save without attachments.
+                                $save_result = $this->saveEmailToFolder($client, $folder, $envelope, [$part_body], $bcc_array);
+                                if (!$save_result) {
+                                    \Log::error($this->getImapSaveErrorPrefix($mailbox).'Could not save outgoing reply to the IMAP folder (check folder name and make sure IMAP folder does not have spaces - folders with spaces do not work): '.$imap_sent_folder);
+                                }
+                            }
+                        } catch (\Exception $e) {
+                            // Just log error and continue.
+                            \Helper::logException($e, $this->getImapSaveErrorPrefix($mailbox).'Could not save outgoing reply to the IMAP folder: ');
+                        }
+                    } else {
+                        \Log::error($this->getImapSaveErrorPrefix($mailbox).'Could not save outgoing reply to the IMAP folder (check folder name and make sure IMAP folder does not have spaces - folders with spaces do not work): '.$imap_sent_folder);
+                    }
+                } catch (\Exception $e) {
+                    // Just log error and continue.
+                    \Helper::logException($e, $this->getImapSaveErrorPrefix($mailbox).'Could not save outgoing reply to the IMAP folder, IMAP folder not found: '.$imap_sent_folder.' - ');
+                    //$this->saveToSendLog('['.date('Y-m-d H:i:s').'] Could not save outgoing reply to the IMAP folder: '.$imap_sent_folder);
+                }
+            } catch (\Exception $e) {
+                // Just log error and continue.
+                //$this->saveToSendLog('['.date('Y-m-d H:i:s').'] Could not get mailbox IMAP folder: '.$imap_sent_folder);
+                \Helper::logException($e, $this->getImapSaveErrorPrefix($mailbox).'Could not save outgoing reply to the IMAP folder: '.$imap_sent_folder.' - ');
+            }
         }
 
         // In message_id we are storing Message-ID of the incoming email which created the thread
@@ -135,7 +507,35 @@ class SendReplyToCustomer implements ShouldQueue
         $this->failures = Mail::failures();
 
         // Save to send log
-        $this->saveToSendLog();
+        $this->saveToSendLog('', $smtp_queue_id);
+    }
+
+    public function getImapSaveErrorPrefix($mailbox)
+    {
+        return '['.$mailbox->name.' » Connection Settings » Fetching Emails » IMAP Folder To Save Outgoing Replies] ';
+    }
+
+    // Save an email to IMAP folder.
+    public function saveEmailToFolder($client, $folder, $envelope, $parts, $bcc = [])
+    {
+        $envelope_str = imap_mail_compose($envelope, $parts);
+
+        // Add BCC.
+        // https://stackoverflow.com/questions/47353938/php-imap-append-with-bcc
+        if (!empty($bcc)) {
+            // There will be a "To:" parameter for sure.
+            $to_pos = strpos($envelope_str , "To:");
+            if ($to_pos !== false) {
+                $bcc_str = "Bcc: " . implode(',', $bcc) . "\r\n";
+                $envelope_str = substr_replace($envelope_str , $bcc_str, $to_pos, 0);
+            }
+        }
+
+        if (get_class($client) == 'Webklex\PHPIMAP\Client') {
+            return $folder->appendMessage($envelope_str, ['\Seen'], now()->format('d-M-Y H:i:s O'));
+        } else {
+            return $folder->appendMessage($envelope_str, '\Seen', now()->format('d-M-Y H:i:s O'));
+        }
     }
 
     /**
@@ -164,7 +564,7 @@ class SendReplyToCustomer implements ShouldQueue
     /**
      * Save emails to send log.
      */
-    public function saveToSendLog($error_message = '')
+    public function saveToSendLog($error_message = '', $smtp_queue_id = '')
     {
         foreach ($this->recipients as $recipient) {
             if (in_array($recipient, $this->failures)) {
@@ -179,7 +579,7 @@ class SendReplyToCustomer implements ShouldQueue
             } else {
                 $customer_id = null;
             }
-            SendLog::log($this->last_thread->id, $this->message_id, $recipient, SendLog::MAIL_TYPE_EMAIL_TO_CUSTOMER, $status, $customer_id, null, $status_message);
+            SendLog::log($this->last_thread->id, $this->message_id, $recipient, SendLog::MAIL_TYPE_EMAIL_TO_CUSTOMER, $status, $customer_id, null, $status_message, $smtp_queue_id);
         }
     }
 }

app/Jobs/TriggerAction.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Used to tirgger Eventy actions with delay.
+ */
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class TriggerAction implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $action;
+    public $params;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($action, $params)
+    {
+        $this->action = $action;
+        $this->params = $params;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $args = $this->params;
+        array_unshift($args, $this->action);
+
+        call_user_func_array("\Eventy::action", $args);
+    }
+}

app/Jobs/UpdateFolderCounters.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Folder;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+
+class UpdateFolderCounters implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    private $folder;
+
+    // Cache lock key
+    private $lockKey;
+
+    public function __construct(Folder $folder)
+    {
+        $this->folder = $folder;
+        $this->lockKey = "folder_update_lock_{$folder->id}";
+    }
+
+    public function handle()
+    {
+        // Check if another job is processing this folder
+        if (Cache::has($this->lockKey)) {
+            return; // Exit if already processing
+        }
+
+        // Set lock with a timeout of 5 minutes (adjust as needed)
+        Cache::put($this->lockKey, true, now()->addMinutes(5));
+
+        try {
+            // Perform the folder update logic
+            $this->folder->updateCountersNow();
+        } finally {
+            // Release the lock after processing
+            Cache::forget($this->lockKey);
+        }
+    }
+}

app/Listeners/LogLockout.php

@@ -26,8 +26,8 @@ class LogLockout
     public function handle(Lockout $event)
     {
         activity()
-           ->causedBy($event->user)
-           ->withProperties(['ip' => app('request')->ip()])
+           //->causedBy($event->user)
+           ->withProperties(['ip' => app('request')->ip(), 'email' => $event->request->email])
            ->useLog(\App\ActivityLog::NAME_USER)
            ->log(\App\ActivityLog::DESCRIPTION_USER_LOCKED);
     }

app/Listeners/LogUserDeletion.php

@@ -26,7 +26,7 @@ class LogUserDeletion
     public function handle(UserDeleted $event)
     {
         activity()
-           ->causedBy($event->user)
+           ->causedBy($event->by_user)
            ->withProperties(['deleted_user' => $event->deleted_user->getFullName().' ['.$event->deleted_user->id.']'])
            ->useLog(\App\ActivityLog::NAME_USER)
            ->log(\App\ActivityLog::DESCRIPTION_USER_DELETED);

app/Listeners/ProcessSwiftMessage.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Listeners;
+
+class ProcessSwiftMessage
+{
+
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     */
+    public function handle($event)
+    {
+        return \Eventy::filter('mail.process_swift_message', true, $event->message);
+    }
+}

app/Listeners/RefreshConversations.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Conversation;
+
+class RefreshConversations
+{
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  $event
+     *
+     * @return void
+     */
+    public function handle($event)
+    {
+        Conversation::refreshConversations($event->conversation, $event->thread ?? $event->last_thread);
+    }
+}

app/Listeners/RememberUserLocale.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Auth\Events\Login;
+
+class RememberUserLocale
+{
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param Login $event
+     *
+     * @return void
+     */
+    public function handle(Login $event)
+    {
+        // Save user locale to session to show user app in his chosen language.
+        session()->put('user_locale', $event->user->getLocale());
+    }
+}

app/Listeners/RestartSwiftMailer.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Listeners;
+
+class RestartSwiftMailer
+{
+
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     */
+    public function handle($event)
+    {
+        // Destroy Swift mailer to make it clean temp files.
+        // https://github.com/freescout-helpdesk/freescout/issues/2949
+        // https://github.com/swiftmailer/swiftmailer/issues/1287#issuecomment-833505298        
+        \App::forgetInstance('mailer');
+        \App::forgetInstance('swift.mailer');
+        \App::forgetInstance('swift.transport');
+    }
+}

app/Listeners/SendAutoReply.php

@@ -2,10 +2,14 @@
 
 namespace App\Listeners;
 
+use App\Conversation;
+use App\Mailbox;
 use App\SendLog;
 
 class SendAutoReply
 {
+    const CHECK_PERIOD = 180; // min
+
     /**
      * Create the event listener.
      *
@@ -23,7 +27,67 @@ class SendAutoReply
     {
         $conversation = $event->conversation;
 
-        if (/*!$conversation->imported &&*/ $conversation->mailbox->auto_reply_enabled) {
+        // no_autoreply meta value is checked in the SendAutoReply job.
+
+        if (!$conversation->imported 
+            && $conversation->mailbox->auto_reply_enabled
+        ) {
+            $thread = $conversation->threads()->first();
+
+            // Do not send auto reply to auto responders.
+            if ($thread->isAutoResponder()) {
+                return;
+            }
+            // Do not send auto replies to bounces.
+            if ($thread->isBounce()) {
+                return;
+            }
+
+            // Do not send auto replies to spam messages.
+            if ($conversation->status == Conversation::STATUS_SPAM) {
+                return;
+            }
+
+            if (!\Eventy::filter('autoreply.should_send', true, $conversation)) {
+                return;
+            }
+
+            // We can not send auto reply to incoming bounce messages, as it will lead to the infinite loop:
+            // application will be sending auto replies and mail server will be sending bounce messages to auto replies.
+            // Bounce detection can not be 100% reliable.
+            // So to prevent infinite loop, we are checking number of auto replies sent to the customer recently.
+            $created_at = \Illuminate\Support\Carbon::now()->subMinutes(self::CHECK_PERIOD);
+
+            $auto_replies_sent = SendLog::where('customer_id', $conversation->customer_id)
+                ->where('mail_type', SendLog::MAIL_TYPE_AUTO_REPLY)
+                ->where('created_at', '>', $created_at)
+                ->count();
+
+            if ($auto_replies_sent >= 10) {
+                return;
+            }
+
+            if ($auto_replies_sent >= 2) {
+                // Find conversations from this customer 
+                $prev_conversations = Conversation::select('subject', 'id')
+                    ->where('customer_id', $conversation->customer_id)
+                    ->where('created_at', '>', $created_at)
+                    ->get();
+
+                foreach ($prev_conversations as $prev_conv) {
+                    if ($prev_conv->subject == $conversation->subject && $prev_conv->id != $conversation->id) {
+                        return;
+                    }
+                }
+            }
+
+            // Do not send autoreplies to own mailboxes.
+            if ($conversation->customer_email) {
+                $is_internal_email = Mailbox::where('email', $conversation->customer_email)->exists();
+                if ($is_internal_email) {
+                    return;
+                }
+            }
 
             // 24h limit has been disabled: https://github.com/freescout-helpdesk/freescout/pull/95
             // Send auto reply once in 24h
@@ -37,7 +101,7 @@ class SendAutoReply
                 return;
             }*/
 
-            \App\Jobs\SendAutoReply::dispatch($conversation, $conversation->threads()->first(), $conversation->mailbox, $conversation->customer)
+            \App\Jobs\SendAutoReply::dispatch($conversation, $thread, $conversation->mailbox, $conversation->customer)
             ->onQueue('emails');
         }
     }

app/Listeners/SendNotificationToUsers.php

@@ -1,7 +1,10 @@
 <?php
-
+/**
+ * Send notifications to users by email and in browser.
+ */
 namespace App\Listeners;
 
+use App\Conversation;
 use App\Subscription;
 
 class SendNotificationToUsers
@@ -32,14 +35,21 @@ class SendNotificationToUsers
                 break;
             case 'App\Events\UserAddedNote':
                 $caused_by_user_id = $event->thread->created_by_user_id;
-                $event_type = Subscription::EVENT_TYPE_USER_ADDED_NOTE;
+                // When conversation is forwarded only notification
+                // about child forward conversation is sent.
+                if (!$event->thread->isForward()) {
+                    $event_type = Subscription::EVENT_TYPE_USER_ADDED_NOTE;
+                }
                 break;
             case 'App\Events\UserCreatedConversation':
                 $caused_by_user_id = $event->conversation->created_by_user_id;
                 $event_type = Subscription::EVENT_TYPE_NEW;
                 break;
             case 'App\Events\CustomerCreatedConversation':
-                $event_type = Subscription::EVENT_TYPE_NEW;
+                // Do not send notification if conversation is spam.
+                if ($event->conversation->status != Conversation::STATUS_SPAM) {
+                    $event_type = Subscription::EVENT_TYPE_NEW;
+                }
                 break;
             case 'App\Events\ConversationUserChanged':
                 $caused_by_user_id = $event->user->id;
@@ -52,12 +62,13 @@ class SendNotificationToUsers
         if (empty($event->conversation) || !$event_type) {
             return;
         }
+
+        // Ignore imported threads.
+        if (!empty($event->thread) && $event->thread->imported) {
+            return;
+        }
         $conversation = $event->conversation;
 
-        // We can not check imported here, as after conversation has been imported via API
-        // notifications has to be sent.
-        //if (!$conversation->imported) {
-        
         // Using the last argument you can make event to be processed immediately
         Subscription::registerEvent($event_type, $conversation, $caused_by_user_id/*, true*/);
     }

app/Listeners/SendReplyToCustomer.php

@@ -23,11 +23,45 @@ class SendReplyToCustomer
     {
         $conversation = $event->conversation;
 
+        // Do not send email if this is a Phone conversation and customer has no email.
+        if ($conversation->isPhone()) {
+            if (!$conversation->customer->getMainEmail()) {
+                return;
+            }
+        }
+
+        $replies = $conversation->getReplies();
+
+        // Ignore imported messages.
+        if ($replies && $replies->first() && $replies->first()->imported) {
+            return;
+        }
+
+        // Remove threads added after this event had fired.
+        $thread = $event->last_thread ?? $event->thread ?? null;
+        if ($thread) {
+            foreach ($replies as $i => $reply) {
+                if ($reply->id == $thread->id) {
+                    break;
+                } else {
+                    $replies->forget($i);
+                }
+            }
+        }
+
+        // Chat conversation.
+        if ($conversation->isChat()) {
+            \Helper::backgroundAction('chat_conversation.send_reply', [$conversation, $replies, $conversation->customer], now()->addSeconds(Conversation::UNDO_TIMOUT));
+            return;
+        }
+
         // We can not check imported here, as after conversation has been imported via API
         // notifications has to be sent.
         //if (!$conversation->imported) {
-        \App\Jobs\SendReplyToCustomer::dispatch($conversation, $conversation->getReplies(), $conversation->customer)
-            ->delay(now()->addSeconds(Conversation::UNDO_TIMOUT))
+        $delay = \Eventy::filter('conversation.send_reply_to_customer_delay', now()->addSeconds(Conversation::UNDO_TIMOUT), $conversation, $replies);
+
+        \App\Jobs\SendReplyToCustomer::dispatch($conversation, $replies, $conversation->customer)
+            ->delay($delay)
             ->onQueue('emails');
     }
 }

app/Mail/Alert.php

@@ -2,8 +2,6 @@
 
 namespace App\Mail;
 
-use Illuminate\Container\Container;
-use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Mail\Mailable;
 
 class Alert extends Mailable
@@ -20,7 +18,6 @@ class Alert extends Mailable
 
     /**
      * Create a new message instance.
-     *
      */
     public function __construct($text, $title = '')
     {
@@ -35,6 +32,8 @@ class Alert extends Mailable
      */
     public function build()
     {
+        \MailHelper::prepareMailable($this);
+        
         $subject = '['.\Config::get('app.name').'] ';
         if (!empty($this->title)) {
             $subject .= $this->title;

app/Mail/AutoReply.php

@@ -2,41 +2,32 @@
 
 namespace App\Mail;
 
-use Illuminate\Bus\Queueable;
-use Illuminate\Container\Container;
-use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
 
 class AutoReply extends Mailable
 {
     /**
      * Conversation created by customer.
-     *
      */
     public $conversation;
 
     /**
      * Mailbox.
-     *
      */
     public $mailbox;
 
     /**
      * Customer.
-     *
      */
     public $customer;
 
     /**
      * Custom headers.
-     *
      */
     public $headers = [];
 
     /**
      * Create a new message instance.
-     *
      */
     public function __construct($conversation, $mailbox, $customer, $headers)
     {
@@ -53,6 +44,8 @@ class AutoReply extends Mailable
      */
     public function build()
     {
+        \MailHelper::prepareMailable($this);
+        
         $view_params = [];
 
         // Set headers
@@ -65,8 +58,10 @@ class AutoReply extends Mailable
         ];
 
         // Set variables
-        $subject = \App\Misc\Mail::replaceMailVars($this->mailbox->auto_reply_subject, $data);
-        $view_params['auto_reply_message'] = \App\Misc\Mail::replaceMailVars($this->mailbox->auto_reply_message, $data);
+        $subject = \MailHelper::replaceMailVars($this->mailbox->auto_reply_subject, $data);
+        $view_params['auto_reply_message'] = \MailHelper::replaceMailVars($this->mailbox->auto_reply_message, $data);
+
+        $subject = \Eventy::filter('email.auto_reply.subject', $subject, $this->conversation);
 
         $message = $this->subject($subject)
                     ->view('emails/customer/auto_reply', $view_params)

app/Mail/PasswordChanged.php

@@ -2,12 +2,7 @@
 
 namespace App\Mail;
 
-use App\Option;
-use Illuminate\Bus\Queueable;
-use Illuminate\Container\Container;
-use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
 
 class PasswordChanged extends Mailable
 {
@@ -18,7 +13,6 @@ class PasswordChanged extends Mailable
 
     /**
      * Create a new message instance.
-     *
      */
     public function __construct($user)
     {
@@ -32,6 +26,8 @@ class PasswordChanged extends Mailable
      */
     public function build()
     {
+        \MailHelper::prepareMailable($this);
+        
         $message = $this->subject(__('Password Changed'))
                     ->view('emails/user/password_changed')
                     ->text('emails/user/password_changed_text');

app/Mail/ReplyToCustomer.php

@@ -2,11 +2,9 @@
 
 namespace App\Mail;
 
-use Illuminate\Bus\Queueable;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
 
 // https://medium.com/@guysmilez/queuing-mailables-with-custom-headers-in-laravel-5-4-ab615f022f17
 //abstract class AbstractMessage extends Mailable
@@ -40,17 +38,29 @@ class ReplyToCustomer extends Mailable
      */
     public $mailbox;
 
+    /**
+     * Subject.
+     */
+    public $subject;
+
+    /**
+     * Number of threads.
+     */
+    public $threads_count;
+
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct($conversation, $threads, $headers, $mailbox)
+    public function __construct($conversation, $threads, $headers, $mailbox, $subject, $threads_count = 1)
     {
         $this->conversation = $conversation;
         $this->threads = $threads;
         $this->headers = $headers;
         $this->mailbox = $mailbox;
+        $this->subject = $subject;
+        $this->threads_count = $threads_count;
     }
 
     /**
@@ -60,18 +70,58 @@ class ReplyToCustomer extends Mailable
      */
     public function build()
     {
+        \MailHelper::prepareMailable($this);
+
+        $thread = $this->threads->first();
+        $from_alias = trim($thread->from ?? '');
+
         // Set Message-ID
         // Settings via $this->addCustomHeaders does not work
         $new_headers = $this->headers;
-        if (!empty($new_headers)) {
-            $this->withSwiftMessage(function ($swiftmessage) use ($new_headers) {
-                if (!empty($new_headers['Message-ID'])) {
-                    $swiftmessage->setId($new_headers['Message-ID']);
+        if (!empty($new_headers) || $from_alias) {
+            $mailbox = $this->mailbox;
+            $this->withSwiftMessage(function ($swiftmessage) use ($new_headers, $from_alias, $mailbox, $thread) {
+                if (!empty($new_headers)) {
+                    if (!empty($new_headers['Message-ID'])) {
+                        $swiftmessage->setId($new_headers['Message-ID']);
+                    }
+                    $headers = $swiftmessage->getHeaders();
+                    foreach ($new_headers as $header => $value) {
+                        if ($header != 'Message-ID') {
+                            $headers->addTextHeader($header, $value);
+                        }
+                    }
                 }
-                $headers = $swiftmessage->getHeaders();
-                foreach ($new_headers as $header => $value) {
-                    if ($header != 'Message-ID') {
-                        $headers->addTextHeader($header, $value);
+                if (!empty($from_alias)) {
+                    $aliases = $mailbox->getAliases();
+
+                    // Make sure that the From contains a mailbox alias,
+                    // as user thread may have From specified when a user
+                    // replies to an email notification.
+                    if (array_key_exists($from_alias, $aliases)) {
+
+                        $from_alias_name = $aliases[$from_alias] ?? '';
+
+                        // Take into account mailbox From Name setting.
+                        $mailbox_mail_from = $mailbox->getMailFrom($thread->created_by_user, $thread->conversation);
+                        if ($mailbox_mail_from['name'] == $mailbox->name && $from_alias_name) {
+                            // Use name from alias.
+                        } else {
+                            // User name or custom.
+                            $from_alias_name = $mailbox_mail_from['name'];
+                        }
+
+                        $swift_from = $headers->get('From');
+
+                        if ($from_alias_name) {
+                            $swift_from->setNameAddresses([
+                                $from_alias => $from_alias_name
+                            ]);
+                        } else {
+                            $swift_from->setAddresses([
+                                $from_alias
+                            ]);
+                        }
                     }
                 }
 
@@ -79,20 +129,19 @@ class ReplyToCustomer extends Mailable
             });
         }
 
-        $subject = $this->conversation->subject;
-        if (count($this->threads) > 1) {
-            $subject = 'Re: '.$subject;
-        }
-
         // from($this->from) Sets only email, name stays empty.
         // So we set from in Mail::setMailDriver
-        $message = $this->subject($subject)
+        $message = $this->subject($this->subject)
                     ->view('emails/customer/reply_fancy')
                     ->text('emails/customer/reply_fancy_text');
 
-        if ($this->threads->first()->has_attachments) {
-            foreach ($this->threads->first()->attachments as $attachment) {
-                $message->attach($attachment->getLocalFilePath());  
+        if ($thread->has_attachments) {
+            foreach ($thread->attachments as $attachment) {
+                if ($attachment->fileExists()) {
+                    $message->attach($attachment->getLocalFilePath());
+                } else {
+                    \Log::error('[ReplyToCustomer] Thread: '.$thread->id.'. Attachment file not find on disk: '.$attachment->getLocalFilePath());
+                }
             }
         }
 

app/Mail/Test.php

@@ -2,8 +2,6 @@
 
 namespace App\Mail;
 
-use Illuminate\Container\Container;
-use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Mail\Mailable;
 
 class Test extends Mailable
@@ -12,7 +10,6 @@ class Test extends Mailable
 
     /**
      * Create a new message instance.
-     *
      */
     public function __construct($mailbox = null)
     {
@@ -26,6 +23,15 @@ class Test extends Mailable
      */
     public function build()
     {
+        \MailHelper::prepareMailable($this);
+        
+        $this->withSwiftMessage(function ($swiftmessage) {
+            $headers = $swiftmessage->getHeaders();
+            $headers->addTextHeader('X-FreeScout-Mail-Type', 'test.mailbox');
+
+            return $swiftmessage;
+        });
+
         $message = $this->subject(__(':app_name Test Email', ['app_name' => \Config::get('app.name')]));
         if ($this->mailbox) {
             $message->view('emails/user/test', ['mailbox' => $this->mailbox]);