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

Applied fixes from StyleCI

Browse Source
This commit is contained in:
Sujit Prasad
2016-06-21 10:14:51 -04:00
committed by StyleCI Bot
parent f000615e68
commit 268b7b13f6
5 changed files with 128 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/Http/Controllers/Auth/AuthController.php
View File

@@ -29,8 +29,8 @@ use Mail;
* *
* @author Ladybird <info@ladybirdweb.com> * @author Ladybird <info@ladybirdweb.com>
*/ */
class AuthController extends Controller { class AuthController extends Controller
{
use AuthenticatesAndRegistersUsers; use AuthenticatesAndRegistersUsers;
/* to redirect after login */ /* to redirect after login */
@@ -50,7 +50,8 @@ class AuthController extends Controller {
* *
* @return void * @return void
*/ */
public function __construct(PhpMailController $PhpMailController) { public function __construct(PhpMailController $PhpMailController)
{
$this->PhpMailController = $PhpMailController; $this->PhpMailController = $PhpMailController;
SettingsController::smtp(); SettingsController::smtp();
$this->middleware('guest', ['except' => 'getLogout']); $this->middleware('guest', ['except' => 'getLogout']);
@@ -61,7 +62,8 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function getRegister() { public function getRegister()
{
// Event for login // Event for login
\Event::fire(new \App\Events\FormRegisterEvent()); \Event::fire(new \App\Events\FormRegisterEvent());
if (Auth::user()) { if (Auth::user()) {
@@ -83,7 +85,8 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function postRegister(User $user, RegisterRequest $request) { public function postRegister(User $user, RegisterRequest $request)
{
// Event for login // Event for login
\Event::fire(new \App\Events\LoginEvent($request)); \Event::fire(new \App\Events\LoginEvent($request));
$password = Hash::make($request->input('password')); $password = Hash::make($request->input('password'));
@@ -116,7 +119,8 @@ class AuthController extends Controller {
* *
* @return type redirect * @return type redirect
*/ */
public function accountActivate($token) { public function accountActivate($token)
{
$user = User::where('remember_token', '=', $token)->first(); $user = User::where('remember_token', '=', $token)->first();
if ($user) { if ($user) {
$user->active = 1; $user->active = 1;
@@ -137,7 +141,8 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function getMail($token, User $user) { public function getMail($token, User $user)
{
$user = $user->where('remember_token', $token)->where('active', 0)->first(); $user = $user->where('remember_token', $token)->where('active', 0)->first();
if ($user) { if ($user) {
$user->active = 1; $user->active = 1;
@@ -154,9 +159,10 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function getLogin() { public function getLogin()
{
$directory = base_path(); $directory = base_path();
if (file_exists($directory . DIRECTORY_SEPARATOR . ".env")) { if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) {
if (Auth::user()) { if (Auth::user()) {
if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') { if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') {
return \Redirect::route('dashboard'); return \Redirect::route('dashboard');
@@ -178,7 +184,8 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function postLogin(LoginRequest $request) { public function postLogin(LoginRequest $request)
{
// Set login attempts and login time // Set login attempts and login time
$value = $_SERVER['REMOTE_ADDR']; $value = $_SERVER['REMOTE_ADDR'];
$usernameinput = $request->input('email'); $usernameinput = $request->input('email');
@@ -261,7 +268,8 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function addLoginAttempt($value, $field) { public function addLoginAttempt($value, $field)
{
$result = DB::table('login_attempts')->where('IP', '=', $value)->first(); $result = DB::table('login_attempts')->where('IP', '=', $value)->first();
$data = $result; $data = $result;
$security = Security::whereId('1')->first(); $security = Security::whereId('1')->first();
@@ -286,7 +294,8 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function clearLoginAttempts($value, $field) { public function clearLoginAttempts($value, $field)
{
$data = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['attempts' => '0']); $data = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['attempts' => '0']);
return $data; return $data;
@@ -299,7 +308,8 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function confirmIPAddress($value, $field) { public function confirmIPAddress($value, $field)
{
$security = Security::whereId('1')->first(); $security = Security::whereId('1')->first();
$time = $security->lockout_period; $time = $security->lockout_period;
$max_attempts = $security->backlist_threshold; $max_attempts = $security->backlist_threshold;
@@ -329,8 +339,8 @@ class AuthController extends Controller {
* *
* @return type string * @return type string
*/ */
protected function getFailedLoginMessage() { protected function getFailedLoginMessage()
{
return Lang::get('lang.this_field_do_not_match_our_records'); return Lang::get('lang.this_field_do_not_match_our_records');
} }
} }

16
app/Http/Controllers/Client/helpdesk/WelcomepageController.php
View File

@@ -15,9 +15,10 @@ use Redirect;
* *
* @author Ladybird <info@ladybirdweb.com> * @author Ladybird <info@ladybirdweb.com>
*/ */
class WelcomepageController extends Controller { class WelcomepageController extends Controller
{
public function __construct() { public function __construct()
{
// $this->middleware('board'); // $this->middleware('board');
} }
@@ -26,7 +27,8 @@ class WelcomepageController extends Controller {
* *
* @return Response * @return Response
*/ */
public function get(System $note) { public function get(System $note)
{
if (Config::get('database.install') == '%0%') { if (Config::get('database.install') == '%0%') {
return Redirect::route('licence'); return Redirect::route('licence');
} }
@@ -38,13 +40,13 @@ class WelcomepageController extends Controller {
return view('themes.default1.client.guest-user.guest', compact('heading', 'content')); return view('themes.default1.client.guest-user.guest', compact('heading', 'content'));
} }
public function index() { public function index()
{
$directory = base_path(); $directory = base_path();
if (file_exists($directory .DIRECTORY_SEPARATOR. ".env")) { if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) {
return view('themes.default1.client.helpdesk.guest-user.index'); return view('themes.default1.client.helpdesk.guest-user.index');
} else { } else {
return Redirect::route('licence'); return Redirect::route('licence');
} }
} }
} }

76
app/Http/Controllers/Installer/helpdesk/InstallController.php
View File

@@ -7,24 +7,24 @@ use App\Http\Controllers\Controller;
// requests // requests
use App\Http\Requests\helpdesk\DatabaseRequest; use App\Http\Requests\helpdesk\DatabaseRequest;
use App\Http\Requests\helpdesk\InstallerRequest; use App\Http\Requests\helpdesk\InstallerRequest;
use Illuminate\Http\Request;
// models
use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Settings\System;
// models
use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Date_time_format;
use App\Model\helpdesk\Utility\Timezones; use App\Model\helpdesk\Utility\Timezones;
use App\User; use App\User;
// classes
use Artisan; use Artisan;
// classes
use Cache;
use Config; use Config;
use DB; use DB;
use Exception; use Exception;
use File; use File;
use Hash; use Hash;
use Illuminate\Http\Request;
use Input; use Input;
use Redirect; use Redirect;
use Session; use Session;
use View; use View;
use Cache;
/** /**
* |======================================================================= * |=======================================================================
@@ -36,21 +36,23 @@ use Cache;
* *
* @author Ladybird <info@ladybirdweb.com> * @author Ladybird <info@ladybirdweb.com>
*/ */
class InstallController extends Controller { class InstallController extends Controller
{
/** /**
* Get Licence (step 1). * Get Licence (step 1).
* *
* @return type view * @return type view
*/ */
public function licence() { public function licence()
{
// checking if the installation is running for the first time or not // checking if the installation is running for the first time or not
$directory = base_path(); $directory = base_path();
if (file_exists($directory . DIRECTORY_SEPARATOR . ".env")) { if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) {
return redirect('/auth/login'); return redirect('/auth/login');
} else { } else {
Cache::flush(); Cache::flush();
Artisan::call('config:clear'); Artisan::call('config:clear');
return view('themes/default1/installer/helpdesk/view1'); return view('themes/default1/installer/helpdesk/view1');
} }
} }
@@ -60,11 +62,13 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function licencecheck(Request $request) { public function licencecheck(Request $request)
{
// checking if the user have accepted the licence agreement // checking if the user have accepted the licence agreement
$accept = (Input::has('accept1')) ? true : false; $accept = (Input::has('accept1')) ? true : false;
if ($accept == 'accept') { if ($accept == 'accept') {
Cache::forever('step1', 'step1'); Cache::forever('step1', 'step1');
return Redirect::route('prerequisites'); return Redirect::route('prerequisites');
} else { } else {
return Redirect::route('licence')->with('fails', 'Failed! first accept the licence agreeement'); return Redirect::route('licence')->with('fails', 'Failed! first accept the licence agreeement');
@@ -79,7 +83,8 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function prerequisites(Request $request) { public function prerequisites(Request $request)
{
// checking if the installation is running for the first time or not // checking if the installation is running for the first time or not
if (Cache::get('step1') == 'step1') { if (Cache::get('step1') == 'step1') {
return View::make('themes/default1/installer/helpdesk/view2'); return View::make('themes/default1/installer/helpdesk/view2');
@@ -94,8 +99,10 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function prerequisitescheck(Request $request) { public function prerequisitescheck(Request $request)
{
Cache::forever('step2', 'step2'); Cache::forever('step2', 'step2');
return Redirect::route('configuration'); return Redirect::route('configuration');
} }
@@ -105,7 +112,8 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function localization(Request $request) { public function localization(Request $request)
{
// checking if the installation is running for the first time or not // checking if the installation is running for the first time or not
if (Cache::get('step2') == 'step2') { if (Cache::get('step2') == 'step2') {
return View::make('themes/default1/installer/helpdesk/view3'); return View::make('themes/default1/installer/helpdesk/view3');
@@ -120,7 +128,8 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function localizationcheck(Request $request) { public function localizationcheck(Request $request)
{
Cache::forever('step3', 'step3'); Cache::forever('step3', 'step3');
$request->session()->put('step3', 'step3'); $request->session()->put('step3', 'step3');
@@ -138,7 +147,8 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function configuration(Request $request) { public function configuration(Request $request)
{
// checking if the installation is running for the first time or not // checking if the installation is running for the first time or not
if (Cache::get('step2') == 'step2') { if (Cache::get('step2') == 'step2') {
return View::make('themes/default1/installer/helpdesk/view3'); return View::make('themes/default1/installer/helpdesk/view3');
@@ -153,7 +163,8 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function configurationcheck(DatabaseRequest $request) { public function configurationcheck(DatabaseRequest $request)
{
Cache::forever('step4', 'step4'); Cache::forever('step4', 'step4');
Session::set('default', $request->input('default')); Session::set('default', $request->input('default'));
@@ -171,8 +182,8 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function postconnection(Request $request) { public function postconnection(Request $request)
{
error_reporting(E_ALL & ~E_NOTICE); error_reporting(E_ALL & ~E_NOTICE);
$default = Input::get('default'); $default = Input::get('default');
$host = Input::get('host'); $host = Input::get('host');
@@ -220,7 +231,8 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function database(Request $request) { public function database(Request $request)
{
// checking if the installation is running for the first time or not // checking if the installation is running for the first time or not
if (Cache::get('step4') == 'step4') { if (Cache::get('step4') == 'step4') {
return View::make('themes/default1/installer/helpdesk/view4'); return View::make('themes/default1/installer/helpdesk/view4');
@@ -235,10 +247,12 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function account(Request $request) { public function account(Request $request)
{
// checking if the installation is running for the first time or not // checking if the installation is running for the first time or not
if (Cache::get('step4') == 'step4') { if (Cache::get('step4') == 'step4') {
$request->session()->put('step5', $request->input('step5')); $request->session()->put('step5', $request->input('step5'));
return View::make('themes/default1/installer/helpdesk/view5'); return View::make('themes/default1/installer/helpdesk/view5');
} else { } else {
return Redirect::route('configuration'); return Redirect::route('configuration');
@@ -253,7 +267,8 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function accountcheck(InstallerRequest $request) { public function accountcheck(InstallerRequest $request)
{
// checking is the installation was done previously // checking is the installation was done previously
try { try {
$check_for_pre_installation = System::all(); $check_for_pre_installation = System::all();
@@ -261,7 +276,6 @@ class InstallController extends Controller {
return redirect()->back()->with('fails', 'The data in database already exist. Please provide fresh database'); return redirect()->back()->with('fails', 'The data in database already exist. Please provide fresh database');
} }
} catch (Exception $e) { } catch (Exception $e) {
} }
if ($request->input('dummy-data') == 'on') { if ($request->input('dummy-data') == 'on') {
$path = base_path().'/DB/dummy-data.sql'; $path = base_path().'/DB/dummy-data.sql';
@@ -302,7 +316,7 @@ class InstallController extends Controller {
$system->date_time_format = $date_time_format->id; $system->date_time_format = $date_time_format->id;
$system->time_zone = $timezones->id; $system->time_zone = $timezones->id;
$version = \Config::get('app.version'); $version = \Config::get('app.version');
$version = explode(" ", $version); $version = explode(' ', $version);
$version = $version[1]; $version = $version[1];
$system->version = $version; $system->version = $version;
$system->save(); $system->save();
@@ -322,6 +336,7 @@ class InstallController extends Controller {
// checking if the user have been created // checking if the user have been created
if ($user) { if ($user) {
Cache::forever('step6', 'step6'); Cache::forever('step6', 'step6');
return Redirect::route('final'); return Redirect::route('final');
} }
} }
@@ -332,9 +347,10 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function finalize() { public function finalize()
{
// checking if the installation have been completed or not // checking if the installation have been completed or not
if (Cache::get('step6') == "step6") { if (Cache::get('step6') == 'step6') {
$value = '1'; $value = '1';
$install = base_path().DIRECTORY_SEPARATOR.'.env'; $install = base_path().DIRECTORY_SEPARATOR.'.env';
$datacontent = File::get($install); $datacontent = File::get($install);
@@ -359,10 +375,10 @@ class InstallController extends Controller {
File::put($path22, $content23); File::put($path22, $content23);
File::put($path23, $content24); File::put($path23, $content24);
try { try {
Cache::flush(); Cache::flush();
Artisan::call('key:generate'); Artisan::call('key:generate');
return View::make('themes/default1/installer/helpdesk/view6'); return View::make('themes/default1/installer/helpdesk/view6');
} catch (Exception $e) { } catch (Exception $e) {
return Redirect::route('account')->with('fails', $e->getMessage()); return Redirect::route('account')->with('fails', $e->getMessage());
@@ -378,7 +394,8 @@ class InstallController extends Controller {
* *
* @return type view * @return type view
*/ */
public function finalcheck() { public function finalcheck()
{
try { try {
return redirect('/auth/login'); return redirect('/auth/login');
} catch (Exception $e) { } catch (Exception $e) {
@@ -386,7 +403,8 @@ class InstallController extends Controller {
} }
} }
public function changeFilePermission() { public function changeFilePermission()
{
$path1 = base_path().DIRECTORY_SEPARATOR.'.env'; $path1 = base_path().DIRECTORY_SEPARATOR.'.env';
if (chmod($path1, 0644)) { if (chmod($path1, 0644)) {
$f1 = substr(sprintf('%o', fileperms($path1)), -3); $f1 = substr(sprintf('%o', fileperms($path1)), -3);
@@ -400,8 +418,8 @@ class InstallController extends Controller {
} }
} }
public function jsDisabled() { public function jsDisabled()
{
return view('themes/default1/installer/helpdesk/check-js')->with('url', 'step1'); return view('themes/default1/installer/helpdesk/check-js')->with('url', 'step1');
} }
} }

5
app/Http/Kernel.php
View File

@@ -7,8 +7,8 @@ use Illuminate\Foundation\Http\Kernel as HttpKernel;
/** /**
* Kernel. * Kernel.
*/ */
class Kernel extends HttpKernel { class Kernel extends HttpKernel
{
/** /**
* The application's global HTTP middleware stack. * The application's global HTTP middleware stack.
* *
@@ -60,5 +60,4 @@ class Kernel extends HttpKernel {
'update' => \App\Http\Middleware\CheckUpdate::class, 'update' => \App\Http\Middleware\CheckUpdate::class,
'board' => \App\Http\Middleware\CheckBoard::class, 'board' => \App\Http\Middleware\CheckBoard::class,
]; ];
} }