@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * Store a newly created employee in storage. |
| 48 | 48 | * |
| 49 | 49 | * @param Request $request |
| 50 | - * @return mixed |
|
| 50 | + * @return \Illuminate\Http\RedirectResponse |
|
| 51 | 51 | */ |
| 52 | 52 | public function store(Request $request) |
| 53 | 53 | { |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | * |
| 79 | 79 | * @param Int, $id |
| 80 | 80 | * @param Request $request |
| 81 | - * @return mixed |
|
| 81 | + * @return \Illuminate\Http\RedirectResponse |
|
| 82 | 82 | */ |
| 83 | 83 | public function updateUser($id, Request $request) |
| 84 | 84 | { |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | * Remove the user role. |
| 151 | 151 | * |
| 152 | 152 | * @param int, $id |
| 153 | - * @return redirect |
|
| 153 | + * @return \Illuminate\Http\RedirectResponse |
|
| 154 | 154 | */ |
| 155 | 155 | public function destroyRole($id) |
| 156 | 156 | { |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | * Save the new permission. |
| 184 | 184 | * |
| 185 | 185 | * @param Request $request |
| 186 | - * @return redirect |
|
| 186 | + * @return \Illuminate\Http\RedirectResponse |
|
| 187 | 187 | */ |
| 188 | 188 | public function save_permission(Request $request) |
| 189 | 189 | { |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | * Update the specified resource in storage. |
| 250 | 250 | * |
| 251 | 251 | * @param \Illuminate\Http\Request $request |
| 252 | - * @return \Illuminate\Http\Response |
|
| 252 | + * @return \Illuminate\Http\RedirectResponse |
|
| 253 | 253 | */ |
| 254 | 254 | public function update(Request $request) |
| 255 | 255 | { |
@@ -261,10 +261,10 @@ |
||
| 261 | 261 | public function update(Request $request) |
| 262 | 262 | { |
| 263 | 263 | /** TODO: Add validation - Tjoosten |
| 264 | - * <<<<<<< Updated upstream |
|
| 265 | - * ======= |
|
| 266 | - * >>>>>>> Stashed changes |
|
| 267 | - */ |
|
| 264 | + * <<<<<<< Updated upstream |
|
| 265 | + * ======= |
|
| 266 | + * >>>>>>> Stashed changes |
|
| 267 | + */ |
|
| 268 | 268 | $user = User::findOrFail(auth()->user()->id); |
| 269 | 269 | $user->fname = $request->get('email'); |
| 270 | 270 | $user->name = $request->get('name'); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | $injectionData = ['user' => $user, 'password' => $mail_password]; |
| 72 | 72 | |
| 73 | - Mail::send('emails.new_user', $injectionData, function ($m) use ($user, $mailbox) { |
|
| 73 | + Mail::send('emails.new_user', $injectionData, function($m) use ($user, $mailbox) { |
|
| 74 | 74 | $m->from($mailbox); |
| 75 | 75 | $m->to($user->email)->subject('Your user credentials!'); |
| 76 | 76 | }); |
@@ -274,8 +274,8 @@ discard block |
||
| 274 | 274 | |
| 275 | 275 | if (Input::file()) { |
| 276 | 276 | $image = Input::file('avatar'); |
| 277 | - $filename = time() . '.' . $image->getClientOriginalExtension(); |
|
| 278 | - $path = public_path('profilepics/' . $filename); |
|
| 277 | + $filename = time().'.'.$image->getClientOriginalExtension(); |
|
| 278 | + $path = public_path('profilepics/'.$filename); |
|
| 279 | 279 | |
| 280 | 280 | Image::make($image->getRealPath())->resize(200, 200)->save($path); |
| 281 | 281 | $user->image = $filename; |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | */ |
| 295 | 295 | public function destroy($id) |
| 296 | 296 | { |
| 297 | - if (! Auth::user()->is('Administrator')) { |
|
| 297 | + if (!Auth::user()->is('Administrator')) { |
|
| 298 | 298 | return Redirect::back(); |
| 299 | 299 | } |
| 300 | 300 | |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | * Store a newly created resource in storage. |
| 36 | 36 | * |
| 37 | 37 | * @param \Illuminate\Http\Request $request |
| 38 | - * @return \Illuminate\Http\Response |
|
| 38 | + * @return \Illuminate\Http\RedirectResponse |
|
| 39 | 39 | */ |
| 40 | 40 | public function store(Request $request) |
| 41 | 41 | { |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * Remove the specified resource from storage. |
| 86 | 86 | * |
| 87 | 87 | * @param int $id |
| 88 | - * @return \Illuminate\Http\Response |
|
| 88 | + * @return \Illuminate\Http\RedirectResponse |
|
| 89 | 89 | */ |
| 90 | 90 | public function destroy($id) |
| 91 | 91 | { |
@@ -3,8 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | - |
|
| 7 | -use App\Http\Requests; |
|
| 8 | 6 | use App\Http\Controllers\Controller; |
| 9 | 7 | |
| 10 | 8 | class SettingsController extends Controller |