cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update v1.0.7.8

Browse Source
This commit is contained in:
Sujit Prasad
2016-06-24 20:02:20 +05:30
parent 909ebb1895
commit 7ed92728a5
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/helpdesk/TemplateController.php
View File

@@ -326,8 +326,8 @@ class TemplateController extends Controller
$mail->SetFrom($email_details->email_address, $email_details->email_name); // sender details $mail->SetFrom($email_details->email_address, $email_details->email_name); // sender details
$address = $request->to; // receiver email $address = $request->to; // receiver email
$mail->AddAddress($address); $mail->AddAddress($address);
$mail->Subject = $request->subject; // subject of the email $mail->Subject = utf8_decode($request->subject); // subject of the email
$body = $request->message; // body of the email $body = utf8_decode($request->message); // body of the email
$mail->MsgHTML($body); $mail->MsgHTML($body);
if (!$mail->Send()) { if (!$mail->Send()) {
$return = Lang::get('lang.mailer_error').': '.$mail->ErrorInfo; $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->setFrom($email_details->email_address, $email_details->email_name);
$mail->addAddress($request->to, ''); // Add a recipient $mail->addAddress($request->to, ''); // Add a recipient
$mail->isHTML(true); // Set email format to HTML $mail->isHTML(true); // Set email format to HTML
$mail->Subject = $request->subject; $mail->Subject = utf8_decode($request->subject);
$mail->Body = utf8_decode($request->message); $mail->Body = utf8_decode($request->message);
if (!$mail->send()) { if (!$mail->send()) {
$return = Lang::get('lang.mailer_error').': '.$mail->ErrorInfo; $return = Lang::get('lang.mailer_error').': '.$mail->ErrorInfo;

6
app/Http/Controllers/Api/v1/InstallerApiController.php
View File

@@ -98,14 +98,14 @@ class InstallerApiController extends Controller
$ENV['QUEUE_DRIVER'] = 'sync'; $ENV['QUEUE_DRIVER'] = 'sync';
$config = ''; $config = '';
foreach ($ENV as $key => $val) { foreach ($ENV as $key => $val) {
$config .= "{$key}={$val}\n"; $config .= "{$key}={$val}\n";
} }
// Write environment file // Write environment file
$fp = fopen(base_path().DIRECTORY_SEPARATOR.'example.env', 'w'); $fp = fopen(base_path().DIRECTORY_SEPARATOR.'.env', 'w');
fwrite($fp, $config); fwrite($fp, $config);
fclose($fp); fclose($fp);
rename(base_path().DIRECTORY_SEPARATOR.'example.env', base_path().DIRECTORY_SEPARATOR.'.env');
return ['response' => 'success', 'status' => '1']; return ['response' => 'success', 'status' => '1'];
} else { } else {
@@ -213,8 +213,6 @@ class InstallerApiController extends Controller
File::put($install, $datacontent); File::put($install, $datacontent);
// Applying email configuration on route // Applying email configuration on route
$smtpfilepath = "\App\Http\Controllers\Common\SettingsController::smtp()";
$lfmpath = "url('photos').'/'";
$link = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; $link = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
$pos = strpos($link, 'final'); $pos = strpos($link, 'final');
$link = substr($link, 0, $pos); $link = substr($link, 0, $pos);