From 555b8817534526116ddb51ceb76ee8c4322edc51 Mon Sep 17 00:00:00 2001
From: RafficMohammed <mohammed.raffic@ladybirdweb.com>
Date: Tue, 28 Feb 2023 18:06:18 +0530
Subject: [PATCH] issues

---
 app/Http/Controllers/Common/PhpMailController.php        | 2 +-
 app/Http/Controllers/Update/SyncFaveoToLatestVersion.php | 1 +
 app/User.php                                             | 4 ++--
 routes/web.php                                           | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php
index eb0ced449..c2cfa6f57 100644
--- a/app/Http/Controllers/Common/PhpMailController.php
+++ b/app/Http/Controllers/Common/PhpMailController.php
@@ -186,7 +186,7 @@ class PhpMailController extends Controller
                     'port'        => $mail->sending_port,
                     'security'    => $mail->sending_encryption,
                     'username'    => $mail->email_address,
-                    'password'    => $mail->password,
+                    'password'    => $mail->getRawOriginal()['password'],
                 ];
                 if (!$this->commonMailer->setSmtpDriver($config)) {
                     \Log::info('Invaid configuration :- '.$config);
diff --git a/app/Http/Controllers/Update/SyncFaveoToLatestVersion.php b/app/Http/Controllers/Update/SyncFaveoToLatestVersion.php
index 0efff341f..d0561289f 100644
--- a/app/Http/Controllers/Update/SyncFaveoToLatestVersion.php
+++ b/app/Http/Controllers/Update/SyncFaveoToLatestVersion.php
@@ -25,6 +25,7 @@ class SyncFaveoToLatestVersion extends Controller
         if (version_compare($latestVersion, $olderVersion) == 1) {
             $this->updateToLatestVersion($olderVersion);
         }
+        Artisan::call('storage:link');
         System::first()->update(['version' => Config::get('app.version')]);
     }
 
diff --git a/app/User.php b/app/User.php
index 43d3981e2..49dfbf9d1 100644
--- a/app/User.php
+++ b/app/User.php
@@ -47,8 +47,8 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         }
         if (!$pic && $value) {
             $pic = '';
-            $file = asset('uploads/profilepic/'.$value);
-            if ($file) {
+            $file = public_path('uploads/profilepic/'.$value);
+            if ($file && file_exists($file)) {
                 $type = pathinfo($file, PATHINFO_EXTENSION);
                 $data = file_get_contents($file);
                 $pic = 'data:image/'.$type.';base64,'.base64_encode($data);
diff --git a/routes/web.php b/routes/web.php
index 57c57763c..665725e1b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -543,7 +543,7 @@ Route::middleware('web')->group(function () {
         Route::post('/ticket/close/{id}', [Agent\helpdesk\TicketController::class, 'close'])->name('ticket.close'); /*  Get Ticket Close */
         Route::post('/ticket/resolve/{id}', [Agent\helpdesk\TicketController::class, 'resolve'])->name('ticket.resolve'); /*  Get ticket Resolve */
         Route::post('/ticket/open/{id}', [Agent\helpdesk\TicketController::class, 'open'])->name('ticket.open'); /*  Get Ticket Open */
-        Route::get('image/{id}', [Agent\helpdesk\MailController::class, 'get_data'])->name('image'); /* get image */
+        Route::get('image/{id?}', [Agent\helpdesk\MailController::class, 'get_data'])->name('image'); /* get image */
         Route::post('rating/{id}', [Agent\helpdesk\TicketController::class, 'rating'])->name('ticket.rating'); /* Get overall Ratings */
         Route::post('rating2/{id}', [Agent\helpdesk\TicketController::class, 'ratingReply'])->name('ticket.rating2'); /* Get reply Ratings */
     });