Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 12:44:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2021-10-20 07:58:20 +11:00
commit 2b5c58f607
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/BaseController.php
View File

@ -738,6 +738,10 @@ class BaseController extends Controller
return redirect()->secure(request()->getRequestUri()); return redirect()->secure(request()->getRequestUri());
} }
/* Clean up URLs and remove query parameters from the URL*/
if(request()->has('login') && request()->input('login') == 'true')
return redirect('/')->with(['login' => "true"]);
$data = []; $data = [];
//pass report errors bool to front end //pass report errors bool to front end
@ -748,6 +752,9 @@ class BaseController extends Controller
$data['build'] = request()->has('build') ? request()->input('build') : ''; $data['build'] = request()->has('build') ? request()->input('build') : '';
$data['login'] = request()->has('login') ? request()->input('login') : "false"; $data['login'] = request()->has('login') ? request()->input('login') : "false";
if(request()->session()->has('login'))
$data['login'] = "true";
$data['user_agent'] = request()->server('HTTP_USER_AGENT'); $data['user_agent'] = request()->server('HTTP_USER_AGENT');
$data['path'] = $this->setBuild(); $data['path'] = $this->setBuild();

10
app/Utils/SystemHealth.php
View File

@ -84,9 +84,19 @@ class SystemHealth
'jobs_pending' => (int) Queue::size(), 'jobs_pending' => (int) Queue::size(),
'pdf_engine' => (string) self::getPdfEngine(), 'pdf_engine' => (string) self::getPdfEngine(),
'queue' => (string) config('queue.default'), 'queue' => (string) config('queue.default'),
'trailing_slash' => (bool) self::checkUrlState(),
]; ];
} }
public static function checkUrlState()
{
if (env('APP_URL') && substr(env('APP_URL'), -1) == '/')
return true;
return false;
}
public static function getPdfEngine() public static function getPdfEngine()
{ {
if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja')