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

Author: freescout-help-desk

app/Console/Commands/AfterAppUpdate.php

@@ -40,5 +40,7 @@ public function handle()
         $this->call('freescout:clear-cache');
         $this->call('migrate', ['--force' => true]);
         $this->call('queue:restart');
+
+        \Eventy::action('command.after_app_update');
     }
 }

app/Conversation.php

@@ -1911,6 +1911,8 @@ public static function deleteConversationsForever($conversation_ids)
     {
         \Eventy::action('conversations.before_delete_forever', $conversation_ids);
 
+        $folder_ids = [];
+
         //$conversation_ids = $conversations->pluck('id')->toArray();
         for ($i=0; $i < ceil(count($conversation_ids) / \Helper::IN_LIMIT); $i++) { 
 
@@ -1920,6 +1922,20 @@ public static function deleteConversationsForever($conversation_ids)
             $thread_ids = Thread::whereIn('conversation_id', $ids)->pluck('id')->toArray();
             Attachment::deleteByThreadIds($thread_ids);
 
+            // Collect folders IDs.
+            $folder_ids = array_merge($folder_ids, ConversationFolder::whereIn('conversation_id', $ids)
+                ->distinct()
+                ->pluck('id')
+                ->toArray()
+            );
+            $folder_ids = array_unique($folder_ids);
+            $folder_ids = array_merge($folder_ids, Conversation::whereIn('id', $ids)
+                ->distinct()
+                ->pluck('folder_id')
+                ->toArray()
+            );
+            $folder_ids = array_unique($folder_ids);
+
             // Observers do not react on this kind of deleting.
 
             // Delete threads.
@@ -1930,8 +1946,22 @@ public static function deleteConversationsForever($conversation_ids)
 
             // Delete conversations.
             Conversation::whereIn('id', $ids)->delete();
+
+            // Delete links to folders.
             ConversationFolder::whereIn('conversation_id', $ids)->delete();
         }
+
+        // Update folders counters.
+        for ($i=0; $i < ceil(count($folder_ids) / \Helper::IN_LIMIT); $i++) { 
+
+            $ids = array_slice($folder_ids, $i*\Helper::IN_LIMIT, \Helper::IN_LIMIT);
+
+            // Update counters.
+            $folders = Folder::whereIn('id', $ids)->get();
+            foreach ($folders as $folder) {
+                $folder->updateCounters();
+            }
+        }
     }
 
     /**

config/app.php

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

overrides/guzzlehttp/guzzle/src/Handler/StreamHandler.php

@@ -322,7 +322,13 @@ function () use ($context, $params) {
         return $this->createResource(
             function () use ($uri, &$http_response_header_local, $context, $options) {
                 $resource = fopen((string) $uri, 'r', null, $context);
-                $this->lastHeaders = $http_response_header_local;
+
+                // See https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_the_http_response_header_predefined_variable
+                if (function_exists('http_get_last_response_headers')) {
+                    $http_response_header = \http_get_last_response_headers();
+                }
+
+                $this->lastHeaders = $http_response_header ?? [];
 
                 if (isset($options['read_timeout'])) {
                     $readTimeout = $options['read_timeout'];

public/css/style.css

@@ -1233,6 +1233,9 @@ https://github.com/freescout-help-desk/freescout/issues/4354
     margin: 0 0 4px 0;
 }
 .customer-social-profiles {
+    white-space: nowrap;
+    max-width: 144px;
+    overflow-x: auto;
     position: absolute;
     top: 0;
     left: 92px;
@@ -1359,6 +1362,14 @@ https://github.com/freescout-help-desk/freescout/issues/4354
     text-align: center;
     vertical-align: middle;
 }
+.conv-email {
+    color: #93a1af;
+    font-weight: normal;
+    font-size: 13.4px;
+    display: block;
+    max-height: 36px;
+    overflow: hidden;
+}
 .conv-cb label {
     position: relative;
     top: -8px;
@@ -1762,6 +1773,9 @@ button.conv-checkbox-clear {
         right: 0;
         text-align: right;
     }
+    .conv-email {
+        display: none;
+    }
     .conv-thread-count {
         position: absolute;
         right: 0;
@@ -2904,6 +2918,10 @@ ul.sidebar-block-list {
         display: none!important;
         height: 0!important;
     }
+    .customer-social-profiles {
+        white-space: normal;
+        max-width: none;
+    }
 }
 @media (max-width:991px) {
     .conv-info .btn-group button.conv-info-val {

resources/lang/ar.json

@@ -268,7 +268,7 @@
     "Get license key": "الحصول على مفتاح الترخيص",
     "Go to": "اذهب إلى",
     "HTTPS protocol is required for the browser push notifications to work.": "بروتوكول HTTPS مطلوب حتى يعمل المتصفح دفع الإخطارات.",
-    "Headers": "الرؤوس",
+    "Email Headers": "الرؤوس",
     "Help": "مساعدة",
     "Hide": "اخفاء",
     "Hide from Assign list": "إخفاء من قائمة التخصيص",

resources/lang/cs.json

@@ -331,7 +331,7 @@
     "Get license key": "Získání licenčního klíče",
     "Go to": "Přejít na",
     "HTTPS protocol is required for the browser push notifications to work.": "Pro fungování oznámení push v prohlížeči je vyžadován protokol HTTPS.",
-    "Headers": "Záhlaví",
+    "Email Headers": "Záhlaví",
     "Hello :user_name": "Dobrý den :person_name",
     "Help": "Pomoc",
     "Hi :user, an account has been created for you at :app_url": "Dobrý den :user, byl pro vás vytvořen účet na adrese :app_url",

resources/lang/de.json

@@ -328,7 +328,7 @@
     "Get license key": "Lizenz erwerben",
     "Go to": "Gehe zu",
     "HTTPS protocol is required for the browser push notifications to work.": "Damit Push-Nachrichten funktionieren wird das \"HTTPS\"-Protokoll benötigt.",
-    "Headers": "Überschriften",
+    "Email Headers": "Überschriften",
     "Hello :user_name": "Hallo :user_name",
     "Help": "Hilfe",
     "Hi :user, an account has been created for you at :app_url": "Hallo :user, für Sie wurde ein Konto auf :app_url angelegt",

resources/lang/es.json

@@ -326,7 +326,7 @@
     "Get license key": "Obtener clave de licencia",
     "Go to": "Ir a",
     "HTTPS protocol is required for the browser push notifications to work.": "Se requiere protocolo HTTPS para que funcionen las notificaciones push del navegador.",
-    "Headers": "Cabeceras",
+    "Email Headers": "Cabeceras",
     "Hello :user_name": "Hola :user_name",
     "Help": "Ayuda",
     "Hi :user, an account has been created for you at :app_url": "Hola :user, se ha creado una cuenta para ti en :app_url",

resources/lang/fa.json

@@ -310,7 +310,7 @@
     "Get license key": "دریافت کلید مجوز",
     "Go to": "قابل اعتماد",
     "HTTPS protocol is required for the browser push notifications to work.": "برای اینکه اعلان های لحظه ای کار کنند، HTTPS لازم است.",
-    "Headers": "سرصفحه ها",
+    "Email Headers": "سرصفحه ها",
     "Hello :user_name": "سلام :user_name",
     "Hi :user, an account has been created for you at :app_url": "سلام :user، یک حساب کاربری برای شما در :app_url ایجاد شده است",
     "Hide": "پنهان شدن",