@@ -4,8 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Log extends Model |
|
8 | -{ |
|
7 | +class Log extends Model { |
|
9 | 8 | /** |
10 | 9 | * @var string |
11 | 10 | */ |
@@ -32,35 +31,40 @@ discard block |
||
32 | 31 | /** |
33 | 32 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
34 | 33 | */ |
35 | - public function thread() { |
|
34 | + public function thread() |
|
35 | + { |
|
36 | 36 | return $this->belongsTo('App\Thread', 'thread_id'); |
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
40 | 40 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
41 | 41 | */ |
42 | - public function article() { |
|
42 | + public function article() |
|
43 | + { |
|
43 | 44 | return $this->belongsTo('App\Articles', 'article_id'); |
44 | 45 | } |
45 | 46 | |
46 | 47 | /** |
47 | 48 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
48 | 49 | */ |
49 | - public function admin() { |
|
50 | + public function admin() |
|
51 | + { |
|
50 | 52 | return $this->belongsTo('App\Admin', 'admin_id'); |
51 | 53 | } |
52 | 54 | |
53 | 55 | /** |
54 | 56 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
55 | 57 | */ |
56 | - public function doctor() { |
|
58 | + public function doctor() |
|
59 | + { |
|
57 | 60 | return $this->belongsTo('App\Doctor', 'doctor_id'); |
58 | 61 | } |
59 | 62 | |
60 | 63 | /** |
61 | 64 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
62 | 65 | */ |
63 | - public function member() { |
|
66 | + public function member() |
|
67 | + { |
|
64 | 68 | return $this->belongsTo('App\User', 'user_id'); |
65 | 69 | } |
66 | 70 | } |
@@ -8,8 +8,7 @@ discard block |
||
8 | 8 | use Illuminate\Support\Facades\Auth; |
9 | 9 | use App\Articles; |
10 | 10 | |
11 | -class ArticleController extends Controller |
|
12 | -{ |
|
11 | +class ArticleController extends Controller { |
|
13 | 12 | /** |
14 | 13 | * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View |
15 | 14 | */ |
@@ -45,13 +44,13 @@ discard block |
||
45 | 44 | 'cover_image' => 'image|nullable|max:3999' |
46 | 45 | ]); |
47 | 46 | |
48 | - if($request->hasFile('cover_image')){ |
|
47 | + if($request->hasFile('cover_image')) { |
|
49 | 48 | $filenameWithExt = $request->file('cover_image')->getClientOriginalName(); |
50 | 49 | $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME); |
51 | 50 | $extension = $request->file('cover_image')->getClientOriginalExtension(); |
52 | 51 | $fileNameToStore = $filename.'_'.time().'.'.$extension; |
53 | 52 | $path = $request->file('cover_image')->storeAs('public/cover_images', $fileNameToStore); |
54 | - }else { |
|
53 | + } else { |
|
55 | 54 | $fileNameToStore = 'noimage.jpg'; |
56 | 55 | } |
57 | 56 | |
@@ -237,7 +236,7 @@ discard block |
||
237 | 236 | |
238 | 237 | ]); |
239 | 238 | |
240 | - if($request->hasFile('cover_image')){ |
|
239 | + if($request->hasFile('cover_image')) { |
|
241 | 240 | $filenameWithExt = $request->file('cover_image')->getClientOriginalName(); |
242 | 241 | $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME); |
243 | 242 | $extension = $request->file('cover_image')->getClientOriginalExtension(); |
@@ -249,7 +248,7 @@ discard block |
||
249 | 248 | $article->category = $request->input('category'); |
250 | 249 | $article->title = $request->input('title'); |
251 | 250 | $article->content = $request->input('content'); |
252 | - if($request->hasFile('cover_image')){ |
|
251 | + if($request->hasFile('cover_image')) { |
|
253 | 252 | $article->cover_image = $fileNameToStore; |
254 | 253 | } |
255 | 254 | |
@@ -268,7 +267,7 @@ discard block |
||
268 | 267 | { |
269 | 268 | $article = Articles::find($id); |
270 | 269 | |
271 | - if($article->cover_image != 'noimage.jpg'){ |
|
270 | + if($article->cover_image != 'noimage.jpg') { |
|
272 | 271 | Storage::delete('public/cover_images/'.$article->cover_image); |
273 | 272 | } |
274 | 273 | |
@@ -284,7 +283,8 @@ discard block |
||
284 | 283 | * |
285 | 284 | * @return mixed |
286 | 285 | */ |
287 | - private function currentUser() { |
|
286 | + private function currentUser() |
|
287 | + { |
|
288 | 288 | return Auth::guard(session('guard'))->user(); |
289 | 289 | } |
290 | 290 | } |
@@ -4,8 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Support\Facades\Auth; |
6 | 6 | |
7 | -class Common |
|
8 | -{ |
|
7 | +class Common { |
|
9 | 8 | |
10 | 9 | /** |
11 | 10 | * Register new activity log |
@@ -13,7 +12,8 @@ discard block |
||
13 | 12 | * @param $data |
14 | 13 | * @return bool |
15 | 14 | */ |
16 | - public static function registerLog($data) { |
|
15 | + public static function registerLog($data) |
|
16 | + { |
|
17 | 17 | $log = new Log; |
18 | 18 | |
19 | 19 | $log->action = $data['action']; |