From 7ed92728a50a0da5c55d11c19d7aaf29375c7551 Mon Sep 17 00:00:00 2001
From: Sujit Prasad <sujit.prasad@ladybirdweb.com>
Date: Fri, 24 Jun 2016 20:02:20 +0530
Subject: [PATCH] Update v1.0.7.8

---
 app/Http/Controllers/Admin/helpdesk/TemplateController.php | 6 +++---
 app/Http/Controllers/Api/v1/InstallerApiController.php     | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php
index 6cb0f522e..4ae517277 100644
--- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php
+++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php
@@ -326,8 +326,8 @@ class TemplateController extends Controller
                 $mail->SetFrom($email_details->email_address, $email_details->email_name); // sender details
                 $address = $request->to; // receiver email
                 $mail->AddAddress($address);
-                $mail->Subject = $request->subject; // subject of the email
-                $body = $request->message; // body of the email
+                $mail->Subject = utf8_decode($request->subject); // subject of the email
+                $body = utf8_decode($request->message); // body of the email
                 $mail->MsgHTML($body);
                 if (!$mail->Send()) {
                     $return = Lang::get('lang.mailer_error').': '.$mail->ErrorInfo;
@@ -355,7 +355,7 @@ class TemplateController extends Controller
                 $mail->setFrom($email_details->email_address, $email_details->email_name);
                 $mail->addAddress($request->to, '');     // Add a recipient
                 $mail->isHTML(true);                                  // Set email format to HTML
-                $mail->Subject = $request->subject;
+                $mail->Subject = utf8_decode($request->subject);
                 $mail->Body = utf8_decode($request->message);
                 if (!$mail->send()) {
                     $return = Lang::get('lang.mailer_error').': '.$mail->ErrorInfo;
diff --git a/app/Http/Controllers/Api/v1/InstallerApiController.php b/app/Http/Controllers/Api/v1/InstallerApiController.php
index d6416fc2f..60855d60b 100644
--- a/app/Http/Controllers/Api/v1/InstallerApiController.php
+++ b/app/Http/Controllers/Api/v1/InstallerApiController.php
@@ -98,14 +98,14 @@ class InstallerApiController extends Controller
                 $ENV['QUEUE_DRIVER'] = 'sync';
 
                 $config = '';
+                
                 foreach ($ENV as $key => $val) {
                     $config .= "{$key}={$val}\n";
                 }
                 // Write environment file
-                $fp = fopen(base_path().DIRECTORY_SEPARATOR.'example.env', 'w');
+                $fp = fopen(base_path().DIRECTORY_SEPARATOR.'.env', 'w');
                 fwrite($fp, $config);
                 fclose($fp);
-                rename(base_path().DIRECTORY_SEPARATOR.'example.env', base_path().DIRECTORY_SEPARATOR.'.env');
 
                 return ['response' => 'success', 'status' => '1'];
             } else {
@@ -213,8 +213,6 @@ class InstallerApiController extends Controller
             File::put($install, $datacontent);
 
             // Applying email configuration on route
-            $smtpfilepath = "\App\Http\Controllers\Common\SettingsController::smtp()";
-            $lfmpath = "url('photos').'/'";
             $link = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
             $pos = strpos($link, 'final');
             $link = substr($link, 0, $pos);