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

… dist
freescout-help-desk · Feb 28, 2025 · 31c72b8 · 31c72b8
2 parents b8f82a1 + 5e56a47
commit 31c72b8
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 19 deletions.
diff --git a/app/Console/Commands/FetchEmails.php b/app/Console/Commands/FetchEmails.php
@@ -1383,7 +1383,7 @@ public function separateReply($body, $is_html, $is_reply, $user_reply_to_notific
                 libxml_use_internal_errors(true);
                 //$dom->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
                 //$dom->loadHTML(\Helper::mbConvertEncodingHtmlEntities($html));
-                $dom->loadHTML(\Symfony\Polyfill\Mbstring\Mbstring::mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
+                $dom->loadHTML(\Symfony\Polyfill\Mbstring\Mbstring::mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8') ?: $html);
                 libxml_use_internal_errors(false);
                 $bodies = $dom->getElementsByTagName('body');
                 if ($bodies->length == 1) {

diff --git a/app/Http/Controllers/ModulesController.php b/app/Http/Controllers/ModulesController.php
@@ -166,10 +166,16 @@ public function modules(Request $request)
 
                 if (empty($latest_version)) {
                     continue;
-                } else {
-                    // Get the current version of the module
-                    $current_version = $module['version'];
                 }
+
+                // If it is the module.json file - try to parse the body.
+                preg_match('#"version":[^"]*"([\d\.]+)"#', $latest_version, $m);
+                if (!empty($m[1])) {
+                    $latest_version = $m[1];
+                }
+
+                // 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;

diff --git a/app/Module.php b/app/Module.php
@@ -495,10 +495,12 @@ private static function updateFromUrl($module, $url, $result)
         } else {
             // Extract.
             try {
+                $module_path = $module->getPath();
+
                 // Sometimes by some reason Public folder becomes a symlink leading to itself.
                 // It causes an error during updating process.
                 // https://github.com/freescout-helpdesk/freescout/issues/2709
-                $public_folder = $module->getPath() . DIRECTORY_SEPARATOR . 'Public';
+                $public_folder = $module_path.DIRECTORY_SEPARATOR.'Public';
                 try {
                     if (is_link($public_folder)) {
                         unlink($public_folder);
@@ -508,6 +510,15 @@ private static function updateFromUrl($module, $url, $result)
                 }
 
                 \Helper::unzip($module_archive, \Module::getPath());
+
+                // Rename the folder if the archive has been downloaded from GitHub:
+                // SomeModule-master >> SomeModule.
+                // https://github.com/freescout-help-desk/freescout/issues/4611
+                $basename = basename($url, '.zip');
+
+                if (file_exists($module_path.'-'.$basename)) {
+                    \File::moveDirectory($module_path.'-'.$basename, $module_path, true);
+                }
             } catch (\Exception $e) {
                 $result['msg'] = $e->getMessage();
             }

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.172',
+    'version' => '1.8.173',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/public/js/summernote/summernote.js b/public/js/summernote/summernote.js
diff --git a/resources/views/customers/profile_snippet.blade.php b/resources/views/customers/profile_snippet.blade.php
@@ -48,12 +48,12 @@
 			@php
 				$location = array_filter([$customer->city, $customer->state, $customer->getCountryName()]);
 			@endphp
-			@if ($customer->company || $customer->job_title || $location || $customer->address)
+			@if ($customer->company || $customer->job_title || $location || $customer->address || $customer->zip)
 				<div class="customer-section">
 					@if ($customer->company)<div>{{ $customer->company }}</div>@endif
 					@if ($customer->job_title)<div>{{ $customer->job_title }}</div>@endif
 					@if ($location)<div>{{ implode(', ', $location) }}</div>@endif
-					@if ($customer->address)<div>{{ $customer->address }}</div>@endif
+					@if ($customer->address || $customer->zip)<div>{{ $customer->address }}@if ($customer->address && $customer->zip), @endif{{ $customer->zip }}</div>@endif
 				</div>
 			@endif
 			@if ($customer->notes)