@@ -4,12 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use App\Events\Obyx; |
6 | 6 | use App\Models\Logo; |
7 | -use App\Models\User; |
|
8 | 7 | use Illuminate\Http\Request; |
9 | -use Illuminate\Support\Facades\Input; |
|
10 | 8 | use Illuminate\Support\Facades\Storage; |
11 | -use Illuminate\Support\Facades\File; |
|
12 | -use Illuminate\Http\Response; |
|
13 | 9 | use Illuminate\Http\UploadedFile; |
14 | 10 | |
15 | 11 | class SubmitController extends Controller |
@@ -14,17 +14,17 @@ |
||
14 | 14 | |
15 | 15 | class SubmitController extends Controller |
16 | 16 | { |
17 | - public function index(){ |
|
17 | + public function index() { |
|
18 | 18 | //Zeige Submit View |
19 | 19 | return view('submit.index'); |
20 | 20 | } |
21 | 21 | |
22 | - public function logo_index(){ |
|
22 | + public function logo_index() { |
|
23 | 23 | //Zeige View zum Einsenden eines Logos |
24 | 24 | return view('submit.logo.index'); |
25 | 25 | } |
26 | 26 | |
27 | - public function logo_add(Request $request){ |
|
27 | + public function logo_add(Request $request) { |
|
28 | 28 | $this->validate($request, [ |
29 | 29 | 'file' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048', |
30 | 30 | 'logoname' => 'required', |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use App\Models\Tag; |
6 | 6 | use App\Models\TagRelation; |
7 | -use Carbon\Carbon; |
|
8 | 7 | use Illuminate\Http\Request; |
9 | 8 | |
10 | 9 | class TaggingController extends Controller |
@@ -9,12 +9,12 @@ discard block |
||
9 | 9 | |
10 | 10 | class TaggingController extends Controller |
11 | 11 | { |
12 | - public function showGames($tagid){ |
|
12 | + public function showGames($tagid) { |
|
13 | 13 | $games = \DB::table('games') |
14 | 14 | ->leftJoin('games_developer', 'games.id', '=', 'games_developer.game_id') |
15 | 15 | ->leftJoin('developer', 'games_developer.developer_id', '=', 'developer.id') |
16 | 16 | ->leftJoin('makers', 'makers.id', '=', 'games.maker_id') |
17 | - ->leftJoin('tag_relations', function($join){ |
|
17 | + ->leftJoin('tag_relations', function($join) { |
|
18 | 18 | $join->on('tag_relations.content_id', '=', 'games.id'); |
19 | 19 | $join->on('tag_relations.content_type', '=', \DB::raw("'game'")); |
20 | 20 | }) |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | ->select('id', 'title', 'short') |
53 | 53 | ->get(); |
54 | 54 | $gtypes = array(); |
55 | - foreach ($gametypes as $gt){ |
|
55 | + foreach ($gametypes as $gt) { |
|
56 | 56 | $t['title'] = $gt->title; |
57 | 57 | $t['short'] = $gt->short; |
58 | 58 | $gtypes[$gt->id] = $t; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | ]); |
65 | 65 | } |
66 | 66 | |
67 | - public function store(Request $request){ |
|
67 | + public function store(Request $request) { |
|
68 | 68 | $this->validate($request, [ |
69 | 69 | 'title' => 'required', |
70 | 70 | 'content_id' => 'required', |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | 'content_type' => $request->get('content_type'), |
82 | 82 | ]); |
83 | 83 | |
84 | - if($request->get('content_type') == 'news'){ |
|
84 | + if ($request->get('content_type') == 'news') { |
|
85 | 85 | return \Redirect::action('NewsController@show', $request->get('content_id')); |
86 | - }elseif($request->get('content_type') == 'game'){ |
|
86 | + }elseif ($request->get('content_type') == 'game') { |
|
87 | 87 | return \Redirect::action('GameController@show', $request->get('content_id')); |
88 | - }elseif($request->get('content_type') == 'resource'){ |
|
88 | + }elseif ($request->get('content_type') == 'resource') { |
|
89 | 89 | return \Redirect::action('ResourceController@show', $request->get('content_id')); |
90 | 90 | } |
91 | 91 |
@@ -83,9 +83,9 @@ |
||
83 | 83 | |
84 | 84 | if($request->get('content_type') == 'news'){ |
85 | 85 | return \Redirect::action('NewsController@show', $request->get('content_id')); |
86 | - }elseif($request->get('content_type') == 'game'){ |
|
86 | + } elseif($request->get('content_type') == 'game'){ |
|
87 | 87 | return \Redirect::action('GameController@show', $request->get('content_id')); |
88 | - }elseif($request->get('content_type') == 'resource'){ |
|
88 | + } elseif($request->get('content_type') == 'resource'){ |
|
89 | 89 | return \Redirect::action('ResourceController@show', $request->get('content_id')); |
90 | 90 | } |
91 | 91 |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use App\Models\User; |
6 | 6 | use App\Models\UserObyx; |
7 | -use App\Models\UserPermission; |
|
8 | 7 | use App\Models\UserRole; |
9 | 8 | use Illuminate\Http\Request; |
10 | 9 |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | |
11 | 11 | class UserController extends Controller |
12 | 12 | { |
13 | - public function index(){ |
|
13 | + public function index() { |
|
14 | 14 | $user = User::orderBy('name')->paginate(15); |
15 | 15 | |
16 | 16 | //name |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | ]); |
45 | 45 | } |
46 | 46 | |
47 | - public function show($userid){ |
|
47 | + public function show($userid) { |
|
48 | 48 | |
49 | 49 | $user = \DB::table('users as u') |
50 | 50 | ->leftJoin('user_role_user as uru', 'u.id', '=', 'uru.user_id') |
@@ -75,10 +75,10 @@ discard block |
||
75 | 75 | ]); |
76 | 76 | } |
77 | 77 | |
78 | - public function admin($userid){ |
|
78 | + public function admin($userid) { |
|
79 | 79 | |
80 | - if(\Auth::check()){ |
|
81 | - if(\Auth::user()->settings->is_admin == 1){ |
|
80 | + if (\Auth::check()) { |
|
81 | + if (\Auth::user()->settings->is_admin == 1) { |
|
82 | 82 | $user = User::whereId($userid)->first(); |
83 | 83 | |
84 | 84 | $perms = UserRole::all(); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | |
93 | 93 | } |
94 | 94 | |
95 | - public function admin_store(Request $request, $userid){ |
|
95 | + public function admin_store(Request $request, $userid) { |
|
96 | 96 | |
97 | 97 | $role = UserRole::all()->where('id', '=', $request->get('perm'))->first(); |
98 | 98 | $user = User::find($userid); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | return redirect()->action('UserController@admin', [$userid]); |
104 | 104 | } |
105 | 105 | |
106 | - public function activity_index(){ |
|
106 | + public function activity_index() { |
|
107 | 107 | $data = UserObyx::with('obyx', 'user')->orderBy('created_at', 'desc')->paginate(25); |
108 | 108 | |
109 | 109 | return view('users.activity.index', [ |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace App\Listeners; |
4 | 4 | |
5 | 5 | use App\Events\GameView; |
6 | -use Illuminate\Queue\InteractsWithQueue; |
|
7 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
8 | 6 | |
9 | 7 | class GameViewListener |
10 | 8 | { |
@@ -4,8 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use App\Events\Obyx; |
6 | 6 | use Carbon\Carbon; |
7 | -use Illuminate\Queue\InteractsWithQueue; |
|
8 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
9 | 7 | |
10 | 8 | class ObyxListener |
11 | 9 | { |
@@ -37,11 +37,11 @@ |
||
37 | 37 | |
38 | 38 | protected $guarded = []; |
39 | 39 | |
40 | - public function type(){ |
|
40 | + public function type() { |
|
41 | 41 | return $this->hasOne('App\Models\UserCreditType', 'id', 'credit_type_id'); |
42 | 42 | } |
43 | 43 | |
44 | - public function user(){ |
|
44 | + public function user() { |
|
45 | 45 | return $this->hasOne('App\Models\User', 'id', 'user_id'); |
46 | 46 | } |
47 | 47 | } |
48 | 48 | \ No newline at end of file |
@@ -58,15 +58,15 @@ |
||
58 | 58 | |
59 | 59 | protected $guarded = []; |
60 | 60 | |
61 | - public function content(){ |
|
61 | + public function content() { |
|
62 | 62 | return $this->morphTo(); |
63 | 63 | } |
64 | 64 | |
65 | - public function user(){ |
|
65 | + public function user() { |
|
66 | 66 | return $this->belongsTo('App\Models\User'); |
67 | 67 | } |
68 | 68 | |
69 | - public function game(){ |
|
69 | + public function game() { |
|
70 | 70 | return $this->hasOne('App\Models\Game', 'id', 'content_id')->with('user', 'maker', 'gamefiles', 'language'); |
71 | 71 | } |
72 | 72 |
@@ -38,7 +38,7 @@ |
||
38 | 38 | |
39 | 39 | protected $guarded = []; |
40 | 40 | |
41 | - public function user(){ |
|
41 | + public function user() { |
|
42 | 42 | return $this->hasOne('App\Models\User', 'id', 'user_id'); |
43 | 43 | } |
44 | 44 |
@@ -38,11 +38,11 @@ |
||
38 | 38 | |
39 | 39 | protected $guarded = []; |
40 | 40 | |
41 | - public function developer(){ |
|
41 | + public function developer() { |
|
42 | 42 | return $this->hasOne('App\Models\Developer', 'id', 'developer_id')->with('user'); |
43 | 43 | } |
44 | 44 | |
45 | - public function game(){ |
|
45 | + public function game() { |
|
46 | 46 | return $this->hasOne('App\Models\Game', 'id', 'game_id')->with('comments', 'maker', 'gamefiles', 'cdcs'); |
47 | 47 | } |
48 | 48 |