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-02-19 02:20:12 -05:00
committed by StyleCI Bot
parent be5df5334f
commit d637c2b23f
439 changed files with 19063 additions and 19210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,21 +3,20 @@
namespace App\Http\Controllers\Auth;
// controllers
use App\Http\Controllers\Controller;
use App\Http\Controllers\Common\SettingsController;
use App\Http\Controllers\Common\PhpMailController;
use App\Http\Controllers\Common\SettingsController;
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests\helpdesk\LoginRequest;
use App\Http\Requests\helpdesk\RegisterRequest;
use App\User;
// classes
use Auth;
use Hash;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Contracts\Auth\Registrar;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
use Mail;
use Auth;
use Exception;
/**
* ---------------------------------------------------
@@ -27,12 +26,10 @@ use Exception;
* authentication of existing users. By default, this controller uses
* a simple trait to add these behaviors. Why don't you explore it?
*
* @package Controllers
* @subpackage Controller
* @author Ladybird <info@ladybirdweb.com>
*/
class AuthController extends Controller {
class AuthController extends Controller
{
use AuthenticatesAndRegistersUsers;
/* to redirect after login */
@@ -47,11 +44,13 @@ class AuthController extends Controller {
/**
* Create a new authentication controller instance.
*
* @param \Illuminate\Contracts\Auth\Guard $auth
* @param \Illuminate\Contracts\Auth\Registrar $registrar
* @param \Illuminate\Contracts\Auth\Guard $auth
* @param \Illuminate\Contracts\Auth\Registrar $registrar
*
* @return void
*/
public function __construct(Guard $auth, Registrar $registrar, PhpMailController $PhpMailController) {
public function __construct(Guard $auth, Registrar $registrar, PhpMailController $PhpMailController)
{
$this->PhpMailController = $PhpMailController;
SettingsController::smtp();
$this->auth = $auth;
@@ -60,17 +59,19 @@ class AuthController extends Controller {
}
/**
* Get the form for registration
* Get the form for registration.
*
* @return type Response
*/
public function getRegister() {
public function getRegister()
{
// Event for login
\Event::fire(new \App\Events\FormRegisterEvent());
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');
} elseif (Auth::user()->role == "user") {
// return view('auth.register');
} elseif (Auth::user()->role == 'user') {
// return view('auth.register');
}
} else {
return view('auth.register');
@@ -78,12 +79,15 @@ class AuthController extends Controller {
}
/**
* Post registration form
* @param type User $user
* Post registration form.
*
* @param type User $user
* @param type RegisterRequest $request
*
* @return type Response
*/
public function postRegister(User $user, RegisterRequest $request) {
public function postRegister(User $user, RegisterRequest $request)
{
// Event for login
\Event::fire(new \App\Events\LoginEvent($request));
@@ -105,24 +109,26 @@ class AuthController extends Controller {
// $message->to($user->email, $user->full_name)->subject('active your account');
// });
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('password/reset/' . $code)]);
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('password/reset/'.$code)]);
return redirect('home')->with('success', 'Activate Your Account ! Click on Link that send to your mail');
}
/**
* Get mail function
* @param type $token
* Get mail function.
*
* @param type $token
* @param type User $user
*
* @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();
if ($user) {
$user->active = 1;
$user->save();
return redirect('auth/login');
} else {
return redirect('auth/login');
@@ -130,14 +136,16 @@ class AuthController extends Controller {
}
/**
* Get login page
* Get login page.
*
* @return type Response
*/
public function getLogin() {
public function getLogin()
{
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');
} elseif (Auth::user()->role == "user") {
} elseif (Auth::user()->role == 'user') {
return \Redirect::route('home');
}
} else {
@@ -146,11 +154,14 @@ class AuthController extends Controller {
}
/**
* Post of login page
* Post of login page.
*
* @param type LoginRequest $request
*
* @return type Response
*/
public function postLogin(LoginRequest $request) {
public function postLogin(LoginRequest $request)
{
// Set login attempts and login time
$loginAttempts = 1;
$usernameinput = $request->input('email');
@@ -186,21 +197,23 @@ class AuthController extends Controller {
return redirect()->intended($this->redirectPath());
}
}
return redirect($this->loginPath())
->withInput($request->only('email', 'remember'))
->withErrors([
'email' => $this->getFailedLoginMessage(),
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
]);
// Increment login attempts
}
/**
* Get Failed login message
* Get Failed login message.
*
* @return type string
*/
protected function getFailedLoginMessage() {
protected function getFailedLoginMessage()
{
return 'This Field do not match our records.';
}
}

38
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -3,39 +3,37 @@
namespace App\Http\Controllers\Auth;
// controllers
use App\Http\Controllers\Controller;
use App\Http\Controllers\Common\SettingsController;
use App\Http\Controllers\Common\PhpMailController;
use App\Http\Controllers\Common\SettingsController;
use App\Http\Controllers\Controller;
// request
use Illuminate\Http\Request;
// model
use App\User;
// classes
// model
use Illuminate\Contracts\Auth\Guard;
// classes
use Illuminate\Contracts\Auth\PasswordBroker;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Exception;
use Illuminate\Http\Request;
/**
* PasswordController
* PasswordController.
*
* @package Controllers
* @subpackage Controller
* @author Ladybird <info@ladybirdweb.com>
*/
class PasswordController extends Controller {
class PasswordController extends Controller
{
use ResetsPasswords;
/**
* Create a new password controller instance.
*
* @param \Illuminate\Contracts\Auth\Guard $auth
* @param \Illuminate\Contracts\Auth\PasswordBroker $passwords
* @param \Illuminate\Contracts\Auth\Guard $auth
* @param \Illuminate\Contracts\Auth\PasswordBroker $passwords
*
* @return void
*/
public function __construct(Guard $auth, PasswordBroker $passwords, PhpMailController $PhpMailController) {
public function __construct(Guard $auth, PasswordBroker $passwords, PhpMailController $PhpMailController)
{
$this->PhpMailController = $PhpMailController;
$this->auth = $auth;
$this->passwords = $passwords;
@@ -48,7 +46,8 @@ class PasswordController extends Controller {
*
* @return Response
*/
public function getEmail() {
public function getEmail()
{
return view('auth.password');
}
@@ -57,7 +56,8 @@ class PasswordController extends Controller {
*
* @return Response
*/
public function postEmail(Request $request) {
public function postEmail(Request $request)
{
$date = date('Y-m-d H:i:s');
$this->validate($request, ['email' => 'required|email']);
$user = User::where('email', '=', $request->only('email'))->first();
@@ -67,7 +67,6 @@ class PasswordController extends Controller {
$code = str_random(60);
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]);
@@ -75,12 +74,11 @@ class PasswordController extends Controller {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
}
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->user_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/' . $code)]);
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->user_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)]);
return redirect()->back()->with('status', 'We have e-mailed your password reset link!');
} else {
return redirect()->back()->with('errors', "We can't find a user with that e-mail address.");
}
}
}

152
app/Http/Controllers/Auth/UserController.php
View File

@@ -32,24 +32,23 @@ use Input;
use Redirect;
/**
* UserController
* UserController.
*
* @package Controllers
* @subpackage Controller
* @author Ladybird <info@ladybirdweb.com>
*/
class UserController extends Controller {
class UserController extends Controller
{
/**
* Create a new controller instance.
* constructor to check
* 1. authentication
* 2. user roles
* 3. roles must be agent
* 3. roles must be agent.
*
* @return void
*/
public function __construct() {
public function __construct()
{
$this->middleware('auth');
$this->middleware('role.agent');
// $this->middleware('roles');
@@ -57,10 +56,13 @@ class UserController extends Controller {
/**
* Display a listing of the resource.
*
* @param type User $user
*
* @return type Response
*/
public function index() {
public function index()
{
try {
/* get all values in Sys_user */
return view('themes.default1.agent.helpdesk.user.index');
@@ -70,11 +72,12 @@ class UserController extends Controller {
}
/**
* This function is used to display the list of users
* This function is used to display the list of users.
*
* @return datatable
*/
public function user_list() {
public function user_list()
{
return \Datatable::collection(User::where('role', '!=', 'admin')->where('role', '!=', 'agent')->get())
->searchColumns('user_name')
->orderColumns('user_name', 'email')
@@ -83,18 +86,20 @@ class UserController extends Controller {
})
->addColumn('email', function ($model) {
$email = $model->email;
return $email;
})
->addColumn('phone', function ($model) {
$phone = "";
$phone = '';
if ($model->phone_number) {
$phone = $model->ext . ' ' . $model->phone_number;
$phone = $model->ext.' '.$model->phone_number;
}
$mobile = "";
$mobile = '';
if ($model->mobile) {
$mobile = $model->mobile;
}
$phone = $phone . "&nbsp;&nbsp;&nbsp;" . $mobile;
$phone = $phone.'&nbsp;&nbsp;&nbsp;'.$mobile;
return $phone;
})
->addColumn('status', function ($model) {
@@ -104,17 +109,19 @@ class UserController extends Controller {
} else {
$stat = '<button class="btn btn-danger btn-xs">Inactive</button>';
}
return $stat;
})
->addColumn('lastlogin', function ($model) {
$t = $model->updated_at;
return TicketController::usertimezone($t);
})
->addColumn('Actions', function ($model) {
//return '<a href=article/delete/ ' . $model->id . ' class="btn btn-danger btn-flat" onclick="myFunction()">Delete</a>&nbsp;<a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
//return '<form action="article/delete/ ' . $model->id . '" method="post" onclick="alert()"><button type="sumbit" value="Delete"></button></form><a href=article/' . $model->id . '/edit class="btn btn-warning btn-flat">Edit</a>&nbsp;<a href=show/' . $model->id . ' class="btn btn-warning btn-flat">View</a>';
return '<span data-toggle="modal" data-target="#deletearticle' . $model->id . '"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . ' </button></span>&nbsp;<a href="' . route('user.edit', $model->id) . '" class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href="' . route('user.show', $model->id) . '" class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
<div class="modal fade" id="deletearticle' . $model->id . '">
return '<span data-toggle="modal" data-target="#deletearticle'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').' </button></span>&nbsp;<a href="'.route('user.edit', $model->id).'" class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
<div class="modal fade" id="deletearticle'.$model->id.'">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -122,11 +129,11 @@ class UserController extends Controller {
<h4 class="modal-title">Are You Sure ?</h4>
</div>
<div class="modal-body">
' . $model->user_name . '
'.$model->user_name.'
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
<a href="' . route('user.delete', $model->id) . '"><button class="btn btn-danger">delete</button></a>
<a href="'.route('user.delete', $model->id).'"><button class="btn btn-danger">delete</button></a>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
@@ -137,9 +144,11 @@ class UserController extends Controller {
/**
* Show the form for creating a new resource.
*
* @return type Response
*/
public function create() {
public function create()
{
try {
return view('themes.default1.agent.helpdesk.user.create');
} catch (Exception $e) {
@@ -149,11 +158,14 @@ class UserController extends Controller {
/**
* Store a newly created resource in storage.
* @param type User $user
*
* @param type User $user
* @param type Sys_userRequest $request
*
* @return type Response
*/
public function store(User $user, Sys_userRequest $request) {
public function store(User $user, Sys_userRequest $request)
{
try {
/* insert the input request to sys_user table */
/* Check whether function success or not */
@@ -180,14 +192,18 @@ class UserController extends Controller {
/**
* Display the specified resource.
*
* @param type int $id
* @param type User $user
*
* @return type Response
*/
public function show($id, User $user) {
public function show($id, User $user)
{
try {
/* select the field where id = $id(request Id) */
$users = $user->whereId($id)->first();
return view('themes.default1.agent.helpdesk.user.show', compact('users'));
} catch (Exception $e) {
return view('404');
@@ -196,14 +212,18 @@ class UserController extends Controller {
/**
* Show the form for editing the specified resource.
* @param type int $id
*
* @param type int $id
* @param type User $user
*
* @return type Response
*/
public function edit($id, User $user) {
public function edit($id, User $user)
{
try {
/* select the field where id = $id(request Id) */
$users = $user->whereId($id)->first();
return view('themes.default1.agent.helpdesk.user.edit', compact('users'));
} catch (Exception $e) {
return view('404');
@@ -212,12 +232,15 @@ class UserController extends Controller {
/**
* Update the specified resource in storage.
* @param type int $id
* @param type User $user
*
* @param type int $id
* @param type User $user
* @param type Sys_userUpdate $request
*
* @return type Response
*/
public function update($id, User $user, Sys_userUpdate $request) {
public function update($id, User $user, Sys_userUpdate $request)
{
try {
/* select the field where id = $id(request Id) */
$users = $user->whereId($id)->first();
@@ -238,11 +261,14 @@ class UserController extends Controller {
/**
* Remove the specified resource from storage.
* @param type int $id
*
* @param type int $id
* @param type User $user
*
* @return type Response
*/
public function destroy($id, User $user) {
public function destroy($id, User $user)
{
try {
/* select the field where id = $id(request Id) */
$users = $user->whereId($id)->first();
@@ -262,30 +288,39 @@ class UserController extends Controller {
}
/**
* get profile page
* get profile page.
*
* @return type Response
*/
public function getProfile() {
public function getProfile()
{
$user = Auth::user();
return view('themes.default1.agent.helpdesk.user.profile', compact('user'));
}
/**
* get profile edit page
* get profile edit page.
*
* @return type Response
*/
public function getProfileedit() {
public function getProfileedit()
{
$user = Auth::user();
return view('themes.default1.agent.helpdesk.user.profile-edit', compact('user'));
}
/**
* post profile page
* @param type int $id
* post profile page.
*
* @param type int $id
* @param type ProfileRequest $request
*
* @return type Response
*/
public function postProfileedit(ProfileRequest $request) {
public function postProfileedit(ProfileRequest $request)
{
$user = Auth::user();
$user->gender = $request->input('gender');
$user->save();
@@ -304,12 +339,13 @@ class UserController extends Controller {
//$extension = Input::file('profile_pic')->getClientOriginalExtension();
$name = Input::file('profile_pic')->getClientOriginalName();
$destinationPath = 'lb-faveo/profilepic';
$fileName = rand(0000, 9999) . '.' . $name;
$fileName = rand(0000, 9999).'.'.$name;
//echo $fileName;
Input::file('profile_pic')->move($destinationPath, $fileName);
$user->profile_pic = $fileName;
} else {
$user->fill($request->except('profile_pic', 'gender'))->save();
return Redirect::route('profile')->with('success', 'Profile Updated sucessfully');
}
if ($user->fill($request->except('profile_pic'))->save()) {
@@ -318,17 +354,21 @@ class UserController extends Controller {
}
/**
* Post profile password
* @param type int $id
* Post profile password.
*
* @param type int $id
* @param type ProfilePassword $request
*
* @return type Response
*/
public function postProfilePassword($id, ProfilePassword $request) {
public function postProfilePassword($id, ProfilePassword $request)
{
$user = Auth::user();
//echo $user->password;
if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
$user->password = Hash::make($request->input('new_password'));
$user->save();
return redirect('profile-edit')->with('success1', 'Password Updated sucessfully');
} else {
return redirect('profile-edit')->with('fails1', 'Password was not Updated. Incorrect old password');
@@ -336,25 +376,30 @@ class UserController extends Controller {
}
/**
* User Assign Org
* @param type $id
* User Assign Org.
*
* @param type $id
*
* @return type boolean
*/
public function UserAssignOrg($id) {
public function UserAssignOrg($id)
{
$org = Input::get('org');
$user_org = new User_org;
$user_org = new User_org();
$user_org->org_id = $org;
$user_org->user_id = $id;
$user_org->save();
return 1;
}
/**
* user create organisation
* user create organisation.
*
* @return type value
*/
public function User_Create_Org($id) {
public function User_Create_Org($id)
{
if (Input::get('website') != null) {
// checking website
$check = Organization::where('website', '=', Input::get('website'))->first();
@@ -366,13 +411,13 @@ class UserController extends Controller {
$check2 = Organization::where('name', '=', Input::get('name'))->first();
if (\Input::get('name') == null) {
return "Name is required";
return 'Name is required';
} elseif ($check2 != null) {
return "Name should be Unique";
return 'Name should be Unique';
} elseif ($check != null) {
return "Website should be Unique";
return 'Website should be Unique';
} else {
$org = new Organization;
$org = new Organization();
$org->name = Input::get('name');
$org->phone = Input::get('phone');
$org->website = Input::get('website');
@@ -380,7 +425,7 @@ class UserController extends Controller {
$org->internal_notes = Input::get('internal');
$org->save();
$user_org = new User_org;
$user_org = new User_org();
$user_org->org_id = $org->id;
$user_org->user_id = $id;
$user_org->save();
@@ -388,5 +433,4 @@ class UserController extends Controller {
return 0;
}
}
}