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

… dist

app/Console/Kernel.php

@@ -70,7 +70,7 @@ protected function schedule(Schedule $schedule)
             ->monthly();
 
         $schedule->command('freescout:clean-tmp')
-            ->weekly();
+            ->daily();
 
         // Logs monitoring.
         $alert_logs_period = config('app.alert_logs_period');

app/Conversation.php

@@ -522,6 +522,11 @@ public function isPublished()
         return $this->state == self::STATE_PUBLISHED;
     }
 
+    public function isDraft()
+    {
+        return $this->state == self::STATE_DRAFT;
+    }
+
     /**
      * Get status name.
      *

app/Http/Controllers/ConversationsController.php

@@ -298,7 +298,10 @@ public function view(Request $request, $id)
         if (count($from_aliases) == 1) {
             $from_aliases = [];
         }
-        if (count($from_aliases)) {
+        if ($conversation->isDraft() && !empty($threads[0])) {
+            $from_alias = $threads[0]->from ?? '';
+        }
+        if (count($from_aliases) && !$from_alias) {
             // Preset the last alias used.
             $check_initial_thread = true;
             foreach ($threads as $thread) {
@@ -412,6 +415,7 @@ public function create(Request $request, $mailbox_id)
             'folders'      => $mailbox->getAssesibleFolders(),
             'after_send'   => $after_send,
             'to'           => $to,
+            'from_aliases' => $mailbox->getAliases(),
         ]);
     }
 
@@ -1450,6 +1454,7 @@ public function ajax(Request $request)
                     } else {
                         $thread->type = Thread::TYPE_MESSAGE;
                     }
+                    $thread->from = $request->from_alias ?? null;
                     $thread->body = $request->body;
                     $thread->setTo($to);
                     // We save CC and BCC as is and filter emails when sending replies
@@ -1582,6 +1587,7 @@ public function ajax(Request $request)
 
                     $response['data'] = [
                         'thread_id'   => $thread->id,
+                        'from_alias'  => $thread->from,
                         'to'          => $thread->getToFirst(),
                         'cc'          => $thread->getCcArray(),
                         'bcc'         => $thread->getBccArray(),

app/Jobs/SendNotificationToUsers.php

@@ -59,7 +59,9 @@ public function handle()
 
         // 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->id;
+            // Threads has to be sorted by created_at and not by id.
+            // https://github.com/freescout-helpdesk/freescout/issues/2938
+            return $item->created_at->getTimestamp();
         });
 
         $headers = [];

app/Jobs/SendReplyToCustomer.php

@@ -101,7 +101,9 @@ public function handle()
 
         // 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->id;
+            // Threads has to be sorted by created_at and not by id.
+            // https://github.com/freescout-helpdesk/freescout/issues/2938
+            return $item->created_at->getTimestamp();
         });
 
         $new = false;

app/Misc/Helper.php

@@ -1791,7 +1791,9 @@ public static function phoneToNumeric($phone)
     public static function checkRequiredExtensions()
     {
         $php_extensions = [];
-        foreach (\Config::get('installer.requirements.php') as $extension_name) {
+        $required_extensions = \Config::get('installer.requirements.php');
+
+        foreach ($required_extensions as $extension_name) {
             $alternatives = explode('/', $extension_name);
             if ($alternatives) {
                 foreach ($alternatives as $alternative) {
@@ -1847,4 +1849,11 @@ public static function maybeShowSendingProblemsAlert()
 
         return $flashes;
     }
+
+    public static function mbUcfirst($string, $encoding = 'UTF-8')
+    {
+        $first_char = mb_substr($string, 0, 1, $encoding);
+        $then = mb_substr($string, 1, null, $encoding);
+        return mb_strtoupper($first_char, $encoding) . $then;
+    }
 }

app/User.php

@@ -505,7 +505,38 @@ public static function dateFormat($date, $format = 'M j, Y H:i', $user = null, $
                 $date->setTimezone($user->timezone);
             }
         }
-        return $date->format($format);
+
+        if (class_exists('IntlDateFormatter')) {
+
+            // Convert `strftime` format to `IntlDateFormatter` pattern.
+            // https://unicode-org.github.io/icu/userguide/format_parse/datetime/
+            $format = strtr($format, [
+                'M' => 'MMM',
+                'm' => 'MM',
+                'j' => 'd',
+                'd' => 'dd',
+                'H' => 'HH',
+                'h' => 'hh',
+                'i' => 'mm',
+                'l' => 'cccc',
+                'O' => 'xx',
+            ]);
+
+            // Remove dot from month name.
+            $formatted = $date->formatLocalized($format);
+            if (!strstr($format, '.')) {
+                $formatted = str_replace('.', '', $formatted);
+            }
+
+            // AM/PM to am/pm
+            $formatted = preg_replace_callback('#\d(AM|PM)$#', function ($m) {
+                return strtolower($m[1] ?? '');
+            }, $formatted);
+
+            return \Helper::mbUcfirst($formatted);
+        } else {
+            return $date->format($format);
+        }
     }
 
     /**

config/app.php

@@ -18,7 +18,7 @@
     | or any other location as required by the application or its packages.
     */
 
-    'version' => '1.8.73',
+    'version' => '1.8.74',
 
     /*
     |--------------------------------------------------------------------------

config/installer.php

@@ -39,6 +39,7 @@
             'ZIP',
             'iconv',
             'cURL',
+            //'intl',
         ],
         // 'apache' => [
         //     'mod_rewrite',

overrides/nesbot/carbon/src/Carbon/Carbon.php

@@ -1844,7 +1844,17 @@ public function formatLocalized($format)
             $format = preg_replace('#(?<!%)((?:%%)*)%e#', '\1%#d', $format); // @codeCoverageIgnore
         }
 
-        $formatted = strftime($format, strtotime($this->toDateTimeString()));
+        // https://php.watch/versions/8.1/strftime-gmstrftime-deprecated
+        //$formatted = strftime($format, strtotime($this->toDateTimeString()));
+        $formatter = new \IntlDateFormatter(
+            config('app.locale'), 
+            \IntlDateFormatter::LONG,
+            \IntlDateFormatter::NONE,
+            config('app.timezone'),
+            \IntlDateFormatter::GREGORIAN,
+            $format
+        );
+        $formatted = datefmt_format($formatter, strtotime($this->toDateTimeString()));
 
         return static::$utf8 ? utf8_encode($formatted) : $formatted;
     }

resources/views/conversations/create.blade.php

@@ -133,6 +133,20 @@
                                 </div>
                             </div>
 
+                            @if (count($from_aliases))
+                                <div class="form-group email-conv-fields">
+                                    <label class="col-sm-2 control-label">{{ __('From') }}</label>
+
+                                    <div class="col-sm-9">
+                                        <select name="from_alias" class="form-control">
+                                            @foreach ($from_aliases as $from_alias_email => $from_alias_name)
+                                                <option value="@if ($from_alias_email != $mailbox->email){{ $from_alias_email }}@endif" @if (!empty($from_alias) && $from_alias == $from_alias_email)selected="selected"@endif>@if ($from_alias_name){{ $from_alias_email }} ({{ $from_alias_name }})@else{{ $from_alias_email }}@endif</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                            @endif
+
                             <div class="form-group{{ $errors->has('to') ? ' has-error' : '' }}" id="field-to">
                                 <label for="to" class="col-sm-2 control-label">{{ __('To') }}</label>
 

resources/views/system/status.blade.php

@@ -84,7 +84,7 @@
         <tbody>
             @foreach ($php_extensions as $extension_name => $extension_status)
                 <tr>
-                    <th>{{ $extension_name }}</th>
+                    <th>{{ $extension_name }}@if ($extension_name == 'intl' && !$extension_status) {{ __('(optional)') }}@endif</th>
                     <td class="table-main-col">
                         @if ($extension_status)
                             <strong class="text-success">OK</strong>