Installer updates
Added probe.php Added new installer views and controllers Updated AuthController Updated Middlewares Updated Commands for installation process
This commit is contained in:
@@ -25,6 +25,6 @@ class CheckRoleAgent
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
return redirect('dashboard')->with('fails', 'You are not Authorised');
|
||||
return redirect('dashboard')->with('fails', 'You are not Autherised');
|
||||
}
|
||||
}
|
||||
|
32
app/Http/Middleware/IsInstalled.php
Normal file
32
app/Http/Middleware/IsInstalled.php
Normal file
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
|
||||
class IsInstalled
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if (!isInstall()) {
|
||||
return $next($request);
|
||||
} else {
|
||||
if ($request->isJson()) {
|
||||
$url = url('/');
|
||||
$result = ['fails' => 'already installed', 'api' => $url];
|
||||
|
||||
return response()->json(compact('result'));
|
||||
} else {
|
||||
return redirect('/');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@@ -4,20 +4,44 @@ namespace App\Http\Middleware;
|
||||
|
||||
use Cache;
|
||||
use Closure;
|
||||
// use Illuminate\Contracts\Routing\Middleware;
|
||||
use Illuminate\Support\Facades\App;
|
||||
// use Illuminate\Contracts\Routing\Middleware;
|
||||
use Illuminate\Support\Facades\Config;
|
||||
use Session;
|
||||
|
||||
class LanguageMiddleware
|
||||
{
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if (Cache::has('language') and array_key_exists(Cache::get('language'), Config::get('languages'))) {
|
||||
App::setLocale(Cache::get('language'));
|
||||
$lang = '';
|
||||
if (\Auth::check()) {
|
||||
if (\Auth::user()->user_language != null) {
|
||||
$lang = \Auth::user()->user_language;
|
||||
} else {
|
||||
$lang = $this->getLangFromSessionOrCache();
|
||||
}
|
||||
} else {
|
||||
$lang = $this->getLangFromSessionOrCache();
|
||||
}
|
||||
|
||||
if ($lang != '' and array_key_exists($lang, Config::get('languages'))) {
|
||||
App::setLocale($lang);
|
||||
} else { // This is optional as Laravel will automatically set the fallback language if there is none specified
|
||||
App::setLocale(Config::get('app.fallback_locale'));
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
public function getLangFromSessionOrCache()
|
||||
{
|
||||
$lang = '';
|
||||
if (Session::has('language')) {
|
||||
$lang = Session::get('language');
|
||||
} elseif (Cache::has('language')) {
|
||||
$lang = Cache::get('language');
|
||||
}
|
||||
|
||||
return $lang;
|
||||
}
|
||||
}
|
||||
|
49
app/Http/Middleware/Redirect.php
Normal file
49
app/Http/Middleware/Redirect.php
Normal file
@@ -0,0 +1,49 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
|
||||
class Redirect
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
$root = $request->root(); //http://localhost/faveo/Faveo-Helpdesk-Pro-fork/public
|
||||
$url = $this->setAppUrl($request);
|
||||
if ($url == $root) {
|
||||
return $next($request);
|
||||
}
|
||||
$seg = '';
|
||||
$segments = $request->segments();
|
||||
if (count($segments) > 0) {
|
||||
foreach ($segments as $segment) {
|
||||
$seg .= '/'.$segment;
|
||||
}
|
||||
}
|
||||
$url = $url.$seg;
|
||||
|
||||
return redirect($url);
|
||||
}
|
||||
|
||||
public function setAppUrl($request)
|
||||
{
|
||||
$url = $request->root();
|
||||
if (isInstall()) {
|
||||
$schema = new \App\Model\helpdesk\Settings\CommonSettings();
|
||||
$row = $schema->getOptionValue('url', 'app_url', true);
|
||||
if ($row) {
|
||||
$url = $row->option_value;
|
||||
}
|
||||
}
|
||||
|
||||
return $url;
|
||||
}
|
||||
}
|
47
app/Http/Middleware/TicketViewURL.php
Normal file
47
app/Http/Middleware/TicketViewURL.php
Normal file
@@ -0,0 +1,47 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
use Input;
|
||||
|
||||
//use Redirect;
|
||||
|
||||
class TicketViewURL
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
// dd(\Input::all(), $request->fullUrl());
|
||||
$request_str = $request->fullUrl();
|
||||
if (preg_match('([^D]=)', $request_str) == 1) {
|
||||
$request_str = str_replace('=', '%5B%5D=', $request_str);
|
||||
$request_str = str_replace('%5B%5D%5B%5D=', '%5B%5D=', $request_str);
|
||||
}
|
||||
if (count(Input::all()) == 0) {
|
||||
return \Redirect::to('tickets?show%5B%5D=inbox&departments%5B%5D=All');
|
||||
} else {
|
||||
if (!array_key_exists('show', Input::all()) && !array_key_exists('departments', Input::all())) {
|
||||
return \Redirect::to($request_str.'&show%5B%5D=inbox&departments%5B%5D=All');
|
||||
} elseif (!array_key_exists('show', Input::all()) && array_key_exists('departments', Input::all())) {
|
||||
return \Redirect::to($request_str.'&show%5B%5D=inbox');
|
||||
} elseif (array_key_exists('show', Input::all()) && !array_key_exists('departments', Input::all())) {
|
||||
return \Redirect::to($request_str.'&departments%5B%5D=All');
|
||||
} else {
|
||||
// do nothing
|
||||
}
|
||||
if (preg_match('([^D]=)', $request->fullUrl()) == 1) {
|
||||
return \Redirect::to($request_str);
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
}
|
@@ -13,8 +13,11 @@ class VerifyCsrfToken extends BaseVerifier
|
||||
* @var array
|
||||
*/
|
||||
protected $except = [
|
||||
'CheckSerial',
|
||||
'api/v1/*',
|
||||
'chunk/upload',
|
||||
'chunk/upload/public',
|
||||
'media/files/public',
|
||||
'media/files',
|
||||
];
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user