@@ -34,7 +34,7 @@ |
||
| 34 | 34 | * |
| 35 | 35 | * @var array |
| 36 | 36 | */ |
| 37 | - protected $fillable = ['title', 'description', 'meeting_start', 'meeting_end', 'repeat']; |
|
| 37 | + protected $fillable = [ 'title', 'description', 'meeting_start', 'meeting_end', 'repeat' ]; |
|
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | 40 | * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany |
@@ -2,11 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace plunner\Http\Controllers\Employees; |
| 4 | 4 | |
| 5 | -use Illuminate\Http\Request; |
|
| 6 | - |
|
| 7 | -use plunner\Group; |
|
| 8 | 5 | use plunner\Employee; |
| 9 | -use plunner\Http\Requests; |
|
| 6 | +use plunner\Group; |
|
| 10 | 7 | use plunner\Http\Controllers\Controller; |
| 11 | 8 | |
| 12 | 9 | class GroupsController extends Controller |
@@ -21,8 +21,8 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | public function __construct() |
| 23 | 23 | { |
| 24 | - config(['auth.model' => \plunner\Employee::class]); |
|
| 25 | - config(['jwt.user' => \plunner\Employee::class]); |
|
| 24 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
| 25 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
| 26 | 26 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | 6 | |
| 7 | -use plunner\Http\Requests; |
|
| 8 | 7 | use plunner\Http\Controllers\Controller; |
| 9 | 8 | |
| 10 | 9 | class GroupsController extends Controller |
@@ -18,8 +18,8 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | public function __construct() |
| 20 | 20 | { |
| 21 | - config(['auth.model' => Planner::class]); |
|
| 22 | - config(['jwt.user' => Planner::class]); |
|
| 21 | + config([ 'auth.model' => Planner::class ]); |
|
| 22 | + config([ 'jwt.user' => Planner::class ]); |
|
| 23 | 23 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -18,36 +18,36 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Companies |
| 20 | 20 | */ |
| 21 | -Route::group(['namespace' => 'Companies', 'prefix' => 'companies'], function() { |
|
| 21 | +Route::group([ 'namespace' => 'Companies', 'prefix' => 'companies' ], function() { |
|
| 22 | 22 | |
| 23 | 23 | //\Auth |
| 24 | 24 | |
| 25 | - Route::group(['namespace' => 'Auth'], function() { |
|
| 26 | - Route::group(['prefix' => 'auth'], function () { |
|
| 25 | + Route::group([ 'namespace' => 'Auth' ], function() { |
|
| 26 | + Route::group([ 'prefix' => 'auth' ], function() { |
|
| 27 | 27 | // Authentication routes... |
| 28 | - Route::post('login', ['as' => 'companies.auth.login','uses'=>'AuthController@postLogin']); |
|
| 28 | + Route::post('login', [ 'as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin' ]); |
|
| 29 | 29 | |
| 30 | 30 | // Registration routes... |
| 31 | - Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); |
|
| 31 | + Route::post('register', [ 'as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister' ]); |
|
| 32 | 32 | |
| 33 | 33 | }); |
| 34 | 34 | |
| 35 | - Route::group(['prefix' => 'password'], function () { |
|
| 35 | + Route::group([ 'prefix' => 'password' ], function() { |
|
| 36 | 36 | // Password reset link request routes... |
| 37 | - Route::post('email', ['as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail']); |
|
| 37 | + Route::post('email', [ 'as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail' ]); |
|
| 38 | 38 | |
| 39 | 39 | // Password reset routes... |
| 40 | - Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']); |
|
| 40 | + Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset' ]); |
|
| 41 | 41 | }); |
| 42 | 42 | }); |
| 43 | 43 | |
| 44 | - Route::group(['namespace' => 'Employees'], function() { |
|
| 45 | - Route::resource('employees', 'EmployeesController', ['except' => ['create', 'edit']]); |
|
| 44 | + Route::group([ 'namespace' => 'Employees' ], function() { |
|
| 45 | + Route::resource('employees', 'EmployeesController', [ 'except' => [ 'create', 'edit' ] ]); |
|
| 46 | 46 | }); |
| 47 | 47 | |
| 48 | - Route::group(['namespace' => 'Groups'], function() { |
|
| 49 | - Route::resource('groups', 'GroupsController', ['except' => ['create', 'edit']]); |
|
| 50 | - Route::resource('groups.employees', 'EmployeesController', ['only' => ['store', 'index', 'destroy']]); |
|
| 48 | + Route::group([ 'namespace' => 'Groups' ], function() { |
|
| 49 | + Route::resource('groups', 'GroupsController', [ 'except' => [ 'create', 'edit' ] ]); |
|
| 50 | + Route::resource('groups.employees', 'EmployeesController', [ 'only' => [ 'store', 'index', 'destroy' ] ]); |
|
| 51 | 51 | }); |
| 52 | 52 | }); |
| 53 | 53 | |
@@ -55,34 +55,34 @@ discard block |
||
| 55 | 55 | /** |
| 56 | 56 | * Employees |
| 57 | 57 | */ |
| 58 | -Route::group(['namespace' => 'Employees', 'prefix' => 'employees'], function() { |
|
| 58 | +Route::group([ 'namespace' => 'Employees', 'prefix' => 'employees' ], function() { |
|
| 59 | 59 | |
| 60 | 60 | //\Auth |
| 61 | - Route::group(['namespace' => 'Auth'], function() { |
|
| 62 | - Route::group(['prefix' => 'auth'], function () { |
|
| 61 | + Route::group([ 'namespace' => 'Auth' ], function() { |
|
| 62 | + Route::group([ 'prefix' => 'auth' ], function() { |
|
| 63 | 63 | // Authentication routes... |
| 64 | - Route::post('login', ['as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin']); |
|
| 64 | + Route::post('login', [ 'as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin' ]); |
|
| 65 | 65 | |
| 66 | 66 | // Registration routes... |
| 67 | 67 | //Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); //the registration is managed by the company |
| 68 | 68 | |
| 69 | 69 | }); |
| 70 | 70 | |
| 71 | - Route::group(['prefix' => 'password'], function () { |
|
| 71 | + Route::group([ 'prefix' => 'password' ], function() { |
|
| 72 | 72 | // Password reset link request routes... |
| 73 | - Route::post('email', ['as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail']); |
|
| 73 | + Route::post('email', [ 'as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail' ]); |
|
| 74 | 74 | |
| 75 | 75 | // Password reset routes... |
| 76 | - Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']); |
|
| 76 | + Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset' ]); |
|
| 77 | 77 | }); |
| 78 | 78 | }); |
| 79 | 79 | |
| 80 | 80 | |
| 81 | - Route::group(['namespace' => 'Planners', 'prefix' => 'planners'], function() { |
|
| 82 | - Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]); |
|
| 81 | + Route::group([ 'namespace' => 'Planners', 'prefix' => 'planners' ], function() { |
|
| 82 | + Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]); |
|
| 83 | 83 | }); |
| 84 | 84 | |
| 85 | - Route::group(['namespace' => 'Groups'], function() { |
|
| 86 | - Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]); |
|
| 85 | + Route::group([ 'namespace' => 'Groups' ], function() { |
|
| 86 | + Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]); |
|
| 87 | 87 | }); |
| 88 | 88 | }); |
| 89 | 89 | \ No newline at end of file |
@@ -57,14 +57,14 @@ discard block |
||
| 57 | 57 | * |
| 58 | 58 | * @var array |
| 59 | 59 | */ |
| 60 | - protected $fillable = ['name', 'email', 'password']; |
|
| 60 | + protected $fillable = [ 'name', 'email', 'password' ]; |
|
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | 63 | * The attributes excluded from the model's JSON form. |
| 64 | 64 | * |
| 65 | 65 | * @var array |
| 66 | 66 | */ |
| 67 | - protected $hidden = ['password', 'remember_token', 'pivot']; |
|
| 67 | + protected $hidden = [ 'password', 'remember_token', 'pivot' ]; |
|
| 68 | 68 | |
| 69 | 69 | /** |
| 70 | 70 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
@@ -109,16 +109,16 @@ discard block |
||
| 109 | 109 | public function getEmailForPasswordReset() |
| 110 | 110 | { |
| 111 | 111 | list(, $caller) = debug_backtrace(false); |
| 112 | - if(isset($caller['class'])) |
|
| 113 | - $caller = explode('\\', $caller['class']); |
|
| 112 | + if (isset($caller[ 'class' ])) |
|
| 113 | + $caller = explode('\\', $caller[ 'class' ]); |
|
| 114 | 114 | else |
| 115 | 115 | $caller = ''; |
| 116 | 116 | |
| 117 | 117 | //check if this function is called by email sender |
| 118 | - if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) |
|
| 118 | + if ((count($caller) && $caller[ count($caller) - 1 ] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) |
|
| 119 | 119 | return $this->email; |
| 120 | 120 | //return unique identify for token repository |
| 121 | - return $this->email . $this->company->id; |
|
| 121 | + return $this->email.$this->company->id; |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | /** |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | public function belongsToGroup(Group $group) |
| 129 | 129 | { |
| 130 | 130 | $group = $this->groups()->where('id', $group->id)->first(); |
| 131 | - if(is_object($group) && $group->exists) |
|
| 131 | + if (is_object($group) && $group->exists) |
|
| 132 | 132 | return true; |
| 133 | 133 | return false; |
| 134 | 134 | } |