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

… dist
freescout-helpdesk · Apr 9, 2024 · ad76e2d · ad76e2d
2 parents c15278d + aec78d1
commit ad76e2d
Show file tree

Hide file tree

Showing 8 changed files with 109 additions and 89 deletions.
diff --git a/app/Customer.php b/app/Customer.php
@@ -1537,5 +1537,17 @@ public static function findCustomersBySocialProfile($type, $value, $exclude_chan
             return $customers;
         }
     }
+
+    /**
+     * Get dummy customer.
+     */
+    public static function getDummyCustomer()
+    {
+        $customer = new self();
+        $customer->first_name = __('Customer');
+        $customer->last_name = '';
+
+        return $customer;
+    }
 }
 
diff --git a/app/Http/Controllers/MailboxesController.php b/app/Http/Controllers/MailboxesController.php
@@ -715,6 +715,7 @@ public function ajax(Request $request)
 
                         if (count($imap_folders)) {
                             $response = $this->interateFolders($response, $imap_folders);
+                            $response['folders'] = array_unique($response['folders']);
                         }
 
                         if (count($response['folders'])) {
@@ -837,9 +838,8 @@ public function interateFolders($response, $imap_folders, $subfolder = false) {
             // Old library.
             if (!empty($imap_folder->fullName)) {
                 $response['folders'][] = $imap_folder->fullName;
-            }
-            // New library.
-            if (!empty($imap_folder->full_name)) {
+            } elseif (!empty($imap_folder->full_name)) {
+                // New library.
                 $response['folders'][] = $imap_folder->full_name;
             }
         }

diff --git a/app/Thread.php b/app/Thread.php
@@ -572,7 +572,12 @@ public function getCreatedBy()
                 return \App\User::getDeletedUser();
             }
         } else {
-            return $this->created_by_customer;
+            // In some cases the created_by_customer can be empty.
+            if ($this->created_by_customer) {
+                return $this->created_by_customer;
+            } else {
+                return \App\Customer::getDummyCustomer();
+            }
         }
     }
 

diff --git a/config/app.php b/config/app.php
@@ -18,7 +18,7 @@
     | or any other location as required by the application or its packages.
     */
 
-    'version' => '1.8.131',
+    'version' => '1.8.132',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/overrides/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php b/overrides/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
@@ -274,8 +274,11 @@ protected static function removeIEConditional($string)
     {
         // https://github.com/freescout-helpdesk/freescout/issues/3894
         return preg_replace(
-            '#<!--\[if [^>]+\]>(.*?)<!\[endif\]-->#si', // probably should generalize for all strings
-            '$1',
+            // This change caused: https://github.com/freescout-helpdesk/freescout/issues/3907#issuecomment-2043126228
+            // '#<!--\[if [^>]+\]>(.*?)<!\[endif\]-->#si', // probably should generalize for all strings
+            // '$1',
+            '#<!--\[if [^>]+\]>.*?<!\[endif\]-->#si', // probably should generalize for all strings
+            '',
             $string
         );
     }

diff --git a/overrides/symfony/http-foundation/Request.php b/overrides/symfony/http-foundation/Request.php
@@ -1891,11 +1891,11 @@ protected function prepareBaseUrl()
     {
         $filename = basename($this->server->get('SCRIPT_FILENAME'));
 
-        if (basename($this->server->get('SCRIPT_NAME')) === $filename) {
+        if (basename((string)$this->server->get('SCRIPT_NAME')) === $filename) {
             $baseUrl = $this->server->get('SCRIPT_NAME');
-        } elseif (basename($this->server->get('PHP_SELF')) === $filename) {
+        } elseif (basename((string)$this->server->get('PHP_SELF')) === $filename) {
             $baseUrl = $this->server->get('PHP_SELF');
-        } elseif (basename($this->server->get('ORIG_SCRIPT_NAME')) === $filename) {
+        } elseif (basename((string)$this->server->get('ORIG_SCRIPT_NAME')) === $filename) {
             $baseUrl = $this->server->get('ORIG_SCRIPT_NAME'); // 1and1 shared hosting compatibility
         } else {
             // Backtrack up the script_filename to find the portion matching

diff --git a/resources/lang/ru.json b/resources/lang/ru.json
diff --git a/resources/views/emails/user/notification.blade.php b/resources/views/emails/user/notification.blade.php
@@ -97,7 +97,7 @@
 							                    <td height="10" bgcolor="{{ $conversation->getStatusColor() }}" style="color:#ffffff; font-family:Arial, 'Helvetica Neue', Helvetica, Tahoma, sans-serif; line-height:12px; font-size:12px; margin-top: 3px;border-radius: 2px; {{--@if ($conversation->status == App\Conversation::STATUS_PENDING)border: 1px solid #ccc; color: #727d87;@endif--}}">{{ strtoupper($conversation->getStatusName()) }}</td>
 							                </tr>
 							            </table>
-							            @if ($conversation->user_id)
+							            @if ($conversation->user_id && $conversation->user)
 								            <table border="0" cellspacing="0" cellpadding="0">
 								                <tr>
 								                    <td style="font-family:Arial, 'Helvetica Neue', Helvetica, Tahoma, sans-serif; color:#B5B9BD; line-height:16px; font-size:12px; padding-top: 8px;text-align:right;">