@@ -5,6 +5,9 @@ |
||
| 5 | 5 | |
| 6 | 6 | trait FileUploadTrait |
| 7 | 7 | { |
| 8 | + /** |
|
| 9 | + * @param string $attribute |
|
| 10 | + */ |
|
| 8 | 11 | public function uploadFile($attribute, $file) |
| 9 | 12 | { |
| 10 | 13 | $existingFile = $this->getAttribute($attribute); |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | use WITR\Http\Controllers\Controller; |
| 5 | 5 | use WITR\AlbumReview; |
| 6 | 6 | use File; |
| 7 | -use Carbon\Carbon; |
|
| 8 | 7 | |
| 9 | 8 | class AlbumReviewController extends Controller { |
| 10 | 9 | |
@@ -36,10 +36,10 @@ |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | - * Save the new Album Review. |
|
| 40 | - * |
|
| 41 | - *@return Response |
|
| 42 | - */ |
|
| 39 | + * Save the new Album Review. |
|
| 40 | + * |
|
| 41 | + *@return Response |
|
| 42 | + */ |
|
| 43 | 43 | public function create(Requests\CreateRequest $request) |
| 44 | 44 | { |
| 45 | 45 | $review = new AlbumReview($request->except('img_name')); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * Display a listing of the Shows. |
| 22 | 22 | * |
| 23 | - * @return Response |
|
| 23 | + * @return \Illuminate\View\View |
|
| 24 | 24 | */ |
| 25 | 25 | public function index() |
| 26 | 26 | { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Display a listing of the resource. |
| 33 | 33 | * |
| 34 | - * @return Response |
|
| 34 | + * @return \Illuminate\View\View |
|
| 35 | 35 | */ |
| 36 | 36 | public function new_show() |
| 37 | 37 | { |
@@ -6,12 +6,7 @@ |
||
| 6 | 6 | use WITR\Http\Controllers\Controller; |
| 7 | 7 | use WITR\DJ; |
| 8 | 8 | use WITR\TimeSlot; |
| 9 | -use Input; |
|
| 10 | 9 | use File; |
| 11 | -use Hash; |
|
| 12 | - |
|
| 13 | -use Illuminate\Http\Request; |
|
| 14 | -use Illuminate\Contracts\Auth\PasswordBroker; |
|
| 15 | 10 | |
| 16 | 11 | class DJController extends Controller { |
| 17 | 12 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | { |
| 47 | 47 | $dj = new DJ($request->all()); |
| 48 | 48 | |
| 49 | - if($request->hasFile('picture')) |
|
| 49 | + if ($request->hasFile('picture')) |
|
| 50 | 50 | { |
| 51 | 51 | $file = $request->file('picture'); |
| 52 | 52 | $dj->uploadFile('picture', $file); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $dj = DJ::findOrFail($id); |
| 87 | 87 | $dj->fill($request->except(['picture'])); |
| 88 | 88 | |
| 89 | - if($request->hasFile('picture')) |
|
| 89 | + if ($request->hasFile('picture')) |
|
| 90 | 90 | { |
| 91 | 91 | $file = $request->file('picture'); |
| 92 | 92 | $dj->uploadFile('picture', $file); |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | $dj = DJ::findOrFail($id); |
| 114 | - File::delete(public_path().'/img/djs/'.$dj->picture); |
|
| 114 | + File::delete(public_path() . '/img/djs/' . $dj->picture); |
|
| 115 | 115 | DJ::destroy($id); |
| 116 | 116 | return redirect()->route('admin.djs.index') |
| 117 | 117 | ->with('success', 'DJ Deleted!'); |
@@ -50,8 +50,7 @@ |
||
| 50 | 50 | { |
| 51 | 51 | $file = $request->file('picture'); |
| 52 | 52 | $dj->uploadFile('picture', $file); |
| 53 | - } |
|
| 54 | - else |
|
| 53 | + } else |
|
| 55 | 54 | { |
| 56 | 55 | $dj->picture = 'default.jpg'; |
| 57 | 56 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * Display a listing of the Shows. |
| 22 | 22 | * |
| 23 | - * @return Response |
|
| 23 | + * @return \Illuminate\View\View |
|
| 24 | 24 | */ |
| 25 | 25 | public function index() |
| 26 | 26 | { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Display a listing of the resource. |
| 33 | 33 | * |
| 34 | - * @return Response |
|
| 34 | + * @return \Illuminate\View\View |
|
| 35 | 35 | */ |
| 36 | 36 | public function new_show() |
| 37 | 37 | { |
@@ -4,11 +4,8 @@ |
||
| 4 | 4 | use WITR\Http\Controllers\Controller; |
| 5 | 5 | use WITR\Event; |
| 6 | 6 | use Carbon\Carbon; |
| 7 | -use Input; |
|
| 8 | 7 | use File; |
| 9 | 8 | |
| 10 | -use Illuminate\Http\Request; |
|
| 11 | - |
|
| 12 | 9 | class EventController extends Controller { |
| 13 | 10 | |
| 14 | 11 | public function __construct() |
@@ -39,10 +39,10 @@ |
||
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | - * Save the new Event |
|
| 43 | - * |
|
| 44 | - * @return Response |
|
| 45 | - */ |
|
| 42 | + * Save the new Event |
|
| 43 | + * |
|
| 44 | + * @return Response |
|
| 45 | + */ |
|
| 46 | 46 | public function create(Requests\CreateRequest $request) |
| 47 | 47 | { |
| 48 | 48 | $input = $request->all(); |
@@ -85,7 +85,7 @@ |
||
| 85 | 85 | public function delete($id) |
| 86 | 86 | { |
| 87 | 87 | $event = Event::findOrFail($id); |
| 88 | - File::delete(public_path().'/img/events/'.$event->picture); |
|
| 88 | + File::delete(public_path() . '/img/events/' . $event->picture); |
|
| 89 | 89 | Event::destroy($id); |
| 90 | 90 | return redirect()->route('admin.events.index') |
| 91 | 91 | ->with('success', 'Event Deleted!'); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * Display a listing of the Shows. |
| 22 | 22 | * |
| 23 | - * @return Response |
|
| 23 | + * @return \Illuminate\View\View |
|
| 24 | 24 | */ |
| 25 | 25 | public function index() |
| 26 | 26 | { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Display a listing of the resource. |
| 33 | 33 | * |
| 34 | - * @return Response |
|
| 34 | + * @return \Illuminate\View\View |
|
| 35 | 35 | */ |
| 36 | 36 | public function new_show() |
| 37 | 37 | { |
@@ -29,7 +29,6 @@ |
||
| 29 | 29 | /** |
| 30 | 30 | * Update the specified resource in storage. |
| 31 | 31 | * |
| 32 | - * @param int $id |
|
| 33 | 32 | * @return Response |
| 34 | 33 | */ |
| 35 | 34 | public function update(Request $request) |
@@ -1,9 +1,7 @@ |
||
| 1 | 1 | <?php namespace WITR\Http\Controllers\Admin; |
| 2 | 2 | |
| 3 | -use WITR\Http\Requests; |
|
| 4 | 3 | use WITR\Http\Controllers\Controller; |
| 5 | 4 | use WITR\SystemSetting; |
| 6 | - |
|
| 7 | 5 | use Illuminate\Http\Request; |
| 8 | 6 | |
| 9 | 7 | class SystemSettingController extends Controller { |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * Display a listing of the Shows. |
| 22 | 22 | * |
| 23 | - * @return Response |
|
| 23 | + * @return \Illuminate\View\View |
|
| 24 | 24 | */ |
| 25 | 25 | public function index() |
| 26 | 26 | { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Display a listing of the resource. |
| 33 | 33 | * |
| 34 | - * @return Response |
|
| 34 | + * @return \Illuminate\View\View |
|
| 35 | 35 | */ |
| 36 | 36 | public function new_show() |
| 37 | 37 | { |
@@ -3,11 +3,7 @@ |
||
| 3 | 3 | use WITR\Http\Requests\Admin\Show as Requests; |
| 4 | 4 | use WITR\Http\Controllers\Controller; |
| 5 | 5 | use WITR\Show; |
| 6 | -use Input; |
|
| 7 | 6 | use File; |
| 8 | -use Carbon\Carbon; |
|
| 9 | - |
|
| 10 | -use Illuminate\Http\Request; |
|
| 11 | 7 | |
| 12 | 8 | class ShowController extends Controller { |
| 13 | 9 | |
@@ -39,10 +39,10 @@ |
||
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | - * Save the new Show. |
|
| 43 | - * |
|
| 44 | - *@return Response |
|
| 45 | - */ |
|
| 42 | + * Save the new Show. |
|
| 43 | + * |
|
| 44 | + *@return Response |
|
| 45 | + */ |
|
| 46 | 46 | public function create(Requests\CreateRequest $request) |
| 47 | 47 | { |
| 48 | 48 | $show = new Show($request->except(['show_picture', 'slider_picture'])); |
@@ -29,8 +29,7 @@ |
||
| 29 | 29 | /** |
| 30 | 30 | * Update the specified resource in storage. |
| 31 | 31 | * |
| 32 | - * @param int $id |
|
| 33 | - * @return Response |
|
| 32 | + * @return \Illuminate\Http\RedirectResponse |
|
| 34 | 33 | */ |
| 35 | 34 | public function update(Request $request) |
| 36 | 35 | { |
@@ -1,9 +1,7 @@ |
||
| 1 | 1 | <?php namespace WITR\Http\Controllers\Admin; |
| 2 | 2 | |
| 3 | -use WITR\Http\Requests; |
|
| 4 | 3 | use WITR\Http\Controllers\Controller; |
| 5 | 4 | use WITR\SystemSetting; |
| 6 | - |
|
| 7 | 5 | use Illuminate\Http\Request; |
| 8 | 6 | |
| 9 | 7 | class SystemSettingController extends Controller { |
@@ -41,12 +41,12 @@ |
||
| 41 | 41 | $value = $input['value_' . $setting->id]; |
| 42 | 42 | $setting->value = $value; |
| 43 | 43 | |
| 44 | - $enabled_id = 'enabled_' . $setting->id; |
|
| 45 | - if (array_key_exists($enabled_id, $input)) { |
|
| 46 | - $setting->enabled = $input[$enabled_id]; |
|
| 47 | - } else { |
|
| 48 | - $setting->enabled = 1; |
|
| 49 | - } |
|
| 44 | + $enabled_id = 'enabled_' . $setting->id; |
|
| 45 | + if (array_key_exists($enabled_id, $input)) { |
|
| 46 | + $setting->enabled = $input[$enabled_id]; |
|
| 47 | + } else { |
|
| 48 | + $setting->enabled = 1; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | 51 | $setting->save(); |
| 52 | 52 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | /** |
| 27 | 27 | * Display a listing of the Users. |
| 28 | 28 | * |
| 29 | - * @return Response |
|
| 29 | + * @return \Illuminate\View\View |
|
| 30 | 30 | */ |
| 31 | 31 | public function index() |
| 32 | 32 | { |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | /** |
| 44 | 44 | * Show the form for creating a new resource. |
| 45 | 45 | * |
| 46 | - * @return Response |
|
| 46 | + * @return \Illuminate\Http\RedirectResponse|null |
|
| 47 | 47 | */ |
| 48 | 48 | public function create(Requests\CreateRequest $request) |
| 49 | 49 | { |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * Show the form for editing the specified resource. |
| 72 | 72 | * |
| 73 | 73 | * @param int $id |
| 74 | - * @return Response |
|
| 74 | + * @return \Illuminate\View\View |
|
| 75 | 75 | */ |
| 76 | 76 | public function edit($id) |
| 77 | 77 | { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * Remove the specified resource from storage. |
| 97 | 97 | * |
| 98 | 98 | * @param int $id |
| 99 | - * @return Response |
|
| 99 | + * @return \Illuminate\Http\RedirectResponse |
|
| 100 | 100 | */ |
| 101 | 101 | public function delete($id) |
| 102 | 102 | { |
@@ -6,11 +6,7 @@ |
||
| 6 | 6 | use WITR\Http\Controllers\Controller; |
| 7 | 7 | use WITR\User; |
| 8 | 8 | use WITR\Role; |
| 9 | -use Input; |
|
| 10 | 9 | use File; |
| 11 | -use Hash; |
|
| 12 | - |
|
| 13 | -use Illuminate\Http\Request; |
|
| 14 | 10 | use Illuminate\Contracts\Auth\PasswordBroker; |
| 15 | 11 | |
| 16 | 12 | class UserController extends Controller { |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | $user->password = ''; |
| 53 | 53 | $user->save(); |
| 54 | 54 | |
| 55 | - $response = $this->passwords->sendResetLink($request->only('email'), function($m) |
|
| 55 | + $response = $this->passwords->sendResetLink($request->only('email'), function($m) |
|
| 56 | 56 | { |
| 57 | 57 | $m->subject('Welcome to WITR!'); |
| 58 | 58 | }); |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | public function delete($id) |
| 102 | 102 | { |
| 103 | 103 | $user = User::findOrFail($id); |
| 104 | - File::delete(public_path().'/img/djs/'.$user->picture); |
|
| 104 | + File::delete(public_path() . '/img/djs/' . $user->picture); |
|
| 105 | 105 | User::destroy($id); |
| 106 | 106 | return redirect()->route('admin.users.index') |
| 107 | 107 | ->with('success', 'User Deleted!'); |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Display a listing of the Videos. |
| 20 | 20 | * |
| 21 | - * @return Response |
|
| 21 | + * @return \Illuminate\View\View |
|
| 22 | 22 | */ |
| 23 | 23 | public function index() |
| 24 | 24 | { |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | /** |
| 30 | 30 | * Display a listing of the resource. |
| 31 | 31 | * |
| 32 | - * @return Response |
|
| 32 | + * @return \Illuminate\View\View |
|
| 33 | 33 | */ |
| 34 | 34 | public function new_review() |
| 35 | 35 | { |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | /** |
| 40 | 40 | * Save the new eboard position. |
| 41 | 41 | * |
| 42 | - *@return Response |
|
| 42 | + *@return \Illuminate\Http\RedirectResponse |
|
| 43 | 43 | */ |
| 44 | 44 | public function create(Requests\CreateRequest $request) |
| 45 | 45 | { |
@@ -3,9 +3,6 @@ |
||
| 3 | 3 | use WITR\Http\Requests\Admin\Video as Requests; |
| 4 | 4 | use WITR\Http\Controllers\Controller; |
| 5 | 5 | use WITR\Video; |
| 6 | -use Input; |
|
| 7 | - |
|
| 8 | -use Illuminate\Http\Request; |
|
| 9 | 6 | |
| 10 | 7 | class VideoController extends Controller { |
| 11 | 8 | |
@@ -37,10 +37,10 @@ |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | - * Save the new eboard position. |
|
| 41 | - * |
|
| 42 | - *@return Response |
|
| 43 | - */ |
|
| 40 | + * Save the new eboard position. |
|
| 41 | + * |
|
| 42 | + *@return Response |
|
| 43 | + */ |
|
| 44 | 44 | public function create(Requests\CreateRequest $request) |
| 45 | 45 | { |
| 46 | 46 | $input = $request->all(); |