@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | public function before() |
44 | 44 | { |
45 | 45 | foreach ($this->_apps as $app) { |
46 | - $this->_definedControllers[] = (string)$app->sys_name; |
|
46 | + $this->_definedControllers[] = (string) $app->sys_name; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | parent::before(); |
@@ -79,14 +79,14 @@ discard block |
||
79 | 79 | public function make() |
80 | 80 | { |
81 | 81 | $cName = ucfirst(Str::lowerCase($this->sysname)); |
82 | - $cPath = 'Apps\Controller\Admin\\' . $cName; |
|
82 | + $cPath = 'Apps\Controller\Admin\\'.$cName; |
|
83 | 83 | // if object class is not loaded - prevent install |
84 | - if (!class_exists($cPath) || !defined($cPath . '::VERSION')) { |
|
84 | + if (!class_exists($cPath) || !defined($cPath.'::VERSION')) { |
|
85 | 85 | return false; |
86 | 86 | } |
87 | 87 | |
88 | 88 | // get ext version |
89 | - $cVersion = constant($cPath . '::VERSION'); |
|
89 | + $cVersion = constant($cPath.'::VERSION'); |
|
90 | 90 | if ($cVersion === null || Str::likeEmpty($cVersion)) { |
91 | 91 | $cVersion = '1.0.0'; |
92 | 92 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | |
103 | 103 | // callback to install method in extension |
104 | 104 | if (method_exists($cPath, 'install')) { |
105 | - call_user_func($cPath . '::install'); |
|
105 | + call_user_func($cPath.'::install'); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | return true; |
@@ -34,12 +34,12 @@ |
||
34 | 34 | */ |
35 | 35 | public function make() |
36 | 36 | { |
37 | - $archive = $this->name . '.zip'; |
|
37 | + $archive = $this->name.'.zip'; |
|
38 | 38 | // download archive |
39 | - File::saveFromUrl($this->url, '/' . $archive); |
|
39 | + File::saveFromUrl($this->url, '/'.$archive); |
|
40 | 40 | // extract archive |
41 | 41 | $zip = new \ZipArchive(); |
42 | - if ($zip->open(root . '/' . $archive) === true) { |
|
42 | + if ($zip->open(root.'/'.$archive) === true) { |
|
43 | 43 | $zip->extractTo(root); |
44 | 44 | $zip->close(); |
45 | 45 | // cleanup cache |
@@ -45,10 +45,10 @@ |
||
45 | 45 | */ |
46 | 46 | public static function check($user1, $user2) |
47 | 47 | { |
48 | - $query = self::where(function ($query) use ($user1, $user2) { |
|
48 | + $query = self::where(function($query) use ($user1, $user2) { |
|
49 | 49 | $query->where('user_id', '=', $user1) |
50 | 50 | ->where('target_id', '=', $user2); |
51 | - })->orWhere(function ($query) use ($user1, $user2) { |
|
51 | + })->orWhere(function($query) use ($user1, $user2) { |
|
52 | 52 | $query->where('user_id', '=', $user2) |
53 | 53 | ->where('target_id', '=', $user1); |
54 | 54 | }); |
@@ -86,15 +86,15 @@ |
||
86 | 86 | public function getAnswerCount() |
87 | 87 | { |
88 | 88 | // check if count is cached |
89 | - if (MainApp::$Memory->get('commentpost.answer.count.' . $this->id) !== null) { |
|
90 | - return MainApp::$Memory->get('commentpost.answer.count.' . $this->id); |
|
89 | + if (MainApp::$Memory->get('commentpost.answer.count.'.$this->id) !== null) { |
|
90 | + return MainApp::$Memory->get('commentpost.answer.count.'.$this->id); |
|
91 | 91 | } |
92 | 92 | // get count from db |
93 | 93 | $count = CommentAnswer::where('comment_id', '=', $this->id) |
94 | 94 | ->where('moderate', '=', 0) |
95 | 95 | ->count(); |
96 | 96 | // save in cache |
97 | - MainApp::$Memory->set('commentpost.answer.count.' . $this->id, $count); |
|
97 | + MainApp::$Memory->set('commentpost.answer.count.'.$this->id, $count); |
|
98 | 98 | return $count; |
99 | 99 | } |
100 | 100 | } |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | // check in cache |
64 | - if (MainApp::$Memory->get('profile.object.cache.' . $userId) !== null) { |
|
65 | - return MainApp::$Memory->get('profile.object.cache.' . $userId); |
|
64 | + if (MainApp::$Memory->get('profile.object.cache.'.$userId) !== null) { |
|
65 | + return MainApp::$Memory->get('profile.object.cache.'.$userId); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | // find row |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | |
76 | 76 | $object = $profile->first(); |
77 | 77 | |
78 | - MainApp::$Memory->set('profile.object.cache.' . $userId, $object); |
|
78 | + MainApp::$Memory->set('profile.object.cache.'.$userId, $object); |
|
79 | 79 | return $object; |
80 | 80 | } |
81 | 81 | |
@@ -86,17 +86,17 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function getAvatarUrl($type = 'small') |
88 | 88 | { |
89 | - $default = '/upload/user/avatar/' . $type . '/default.jpg'; |
|
89 | + $default = '/upload/user/avatar/'.$type.'/default.jpg'; |
|
90 | 90 | if (!Arr::in($type, ['small', 'big', 'medium'])) { |
91 | - return MainApp::$Alias->scriptUrl . $default; |
|
91 | + return MainApp::$Alias->scriptUrl.$default; |
|
92 | 92 | } |
93 | 93 | |
94 | - $route = '/upload/user/avatar/' . $type . '/' . $this->user_id . '.jpg'; |
|
94 | + $route = '/upload/user/avatar/'.$type.'/'.$this->user_id.'.jpg'; |
|
95 | 95 | if (File::exist($route)) { |
96 | - return MainApp::$Alias->scriptUrl . $route . '?mtime=' . File::mTime($route); |
|
96 | + return MainApp::$Alias->scriptUrl.$route.'?mtime='.File::mTime($route); |
|
97 | 97 | } |
98 | 98 | |
99 | - return MainApp::$Alias->scriptUrl . $default; |
|
99 | + return MainApp::$Alias->scriptUrl.$default; |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | { |
108 | 108 | $userNick = $this->nick; |
109 | 109 | if ($userNick === null || Str::likeEmpty($userNick)) { |
110 | - $userNick = 'id' . $this->id; |
|
110 | + $userNick = 'id'.$this->id; |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | return $userNick; |
@@ -50,13 +50,13 @@ discard block |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | // check if id is looks like integer |
53 | - if (!Any::isInt($id) || (int)$id < 1) { |
|
53 | + if (!Any::isInt($id) || (int) $id < 1) { |
|
54 | 54 | return null; |
55 | 55 | } |
56 | 56 | |
57 | 57 | // check in memory cache object |
58 | - if (MainApp::$Memory->get('user.object.cache.' . $id) !== null) { |
|
59 | - return MainApp::$Memory->get('user.object.cache.' . $id); |
|
58 | + if (MainApp::$Memory->get('user.object.cache.'.$id) !== null) { |
|
59 | + return MainApp::$Memory->get('user.object.cache.'.$id); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | // not founded in memory? lets make query |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | ->find($id); |
65 | 65 | |
66 | 66 | // store cache and return object |
67 | - MainApp::$Memory->set('user.object.cache.' . $user->id, $user); |
|
67 | + MainApp::$Memory->set('user.object.cache.'.$user->id, $user); |
|
68 | 68 | return $user; |
69 | 69 | } |
70 | 70 | |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function getId(): ?int |
76 | 76 | { |
77 | - return (int)$this->id; |
|
77 | + return (int) $this->id; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | public static function isAuth(): bool |
96 | 96 | { |
97 | 97 | // get data from session |
98 | - $sessionUserId = (int)MainApp::$Session->get('ff_user_id', 0); |
|
98 | + $sessionUserId = (int) MainApp::$Session->get('ff_user_id', 0); |
|
99 | 99 | |
100 | 100 | // check if session contains user id data |
101 | 101 | if ($sessionUserId < 1) { |
@@ -128,10 +128,10 @@ discard block |
||
128 | 128 | return false; |
129 | 129 | } |
130 | 130 | |
131 | - $find = MainApp::$Memory->get('user.counter.cache.' . $id); |
|
131 | + $find = MainApp::$Memory->get('user.counter.cache.'.$id); |
|
132 | 132 | if (!$find) { |
133 | 133 | $find = self::where('id', $id)->count(); |
134 | - MainApp::$Memory->set('user.counter.cache.' . $id, $find); |
|
134 | + MainApp::$Memory->set('user.counter.cache.'.$id, $find); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | return $find === 1; |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | */ |
232 | 232 | public function inBlacklist(?string $target = null): bool |
233 | 233 | { |
234 | - if ($target === null || (int)$target < 1) { |
|
234 | + if ($target === null || (int) $target < 1) { |
|
235 | 235 | return false; |
236 | 236 | } |
237 | 237 |
@@ -76,7 +76,7 @@ |
||
76 | 76 | $this->_content->save(); |
77 | 77 | |
78 | 78 | // update content author rating |
79 | - $authorId = (int)$this->_content->author_id; |
|
79 | + $authorId = (int) $this->_content->author_id; |
|
80 | 80 | if ($authorId > 0 && App::$User->isExist($authorId)) { |
81 | 81 | $authorObject = App::$User->identity($authorId); |
82 | 82 | if ($authorObject !== null) { |
@@ -48,12 +48,12 @@ discard block |
||
48 | 48 | public function check() |
49 | 49 | { |
50 | 50 | // check if user is auth'd or guest name is defined |
51 | - if (!App::$User->isAuth() && ((int)$this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) { |
|
51 | + if (!App::$User->isAuth() && ((int) $this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) { |
|
52 | 52 | throw new JsonException(__('Guest name is not defined')); |
53 | 53 | } |
54 | 54 | |
55 | 55 | // guest moderation |
56 | - if (!App::$User->isAuth() && (bool)$this->_configs['guestModerate']) { |
|
56 | + if (!App::$User->isAuth() && (bool) $this->_configs['guestModerate']) { |
|
57 | 57 | $captcha = App::$Request->request->get('captcha'); |
58 | 58 | if (!App::$Captcha->validate($captcha)) { |
59 | 59 | throw new JsonException(__('Captcha is incorrect! Click on image to refresh and try again')); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | // check if message length is correct |
69 | - if (Str::length($this->message) < (int)$this->_configs['minLength'] || Str::length($this->message) > (int)$this->_configs['maxLength']) { |
|
69 | + if (Str::length($this->message) < (int) $this->_configs['minLength'] || Str::length($this->message) > (int) $this->_configs['maxLength']) { |
|
70 | 70 | throw new JsonException(__('Message length is incorrect. Current: %cur%, min - %min%, max - %max%', [ |
71 | 71 | 'cur' => Str::length($this->message), |
72 | 72 | 'min' => $this->_configs['minLength'], |
@@ -111,15 +111,15 @@ discard block |
||
111 | 111 | $record->lang = App::$Request->getLanguage(); |
112 | 112 | $record->ip = $this->ip; |
113 | 113 | // check if premoderation is enabled and user is guest |
114 | - if ((bool)$this->_configs['guestModerate'] && $this->_userId < 1) { |
|
114 | + if ((bool) $this->_configs['guestModerate'] && $this->_userId < 1) { |
|
115 | 115 | $record->moderate = 1; |
116 | 116 | } |
117 | 117 | $record->save(); |
118 | 118 | |
119 | 119 | // add notification for comment post owner |
120 | 120 | $commentPost = $record->post; |
121 | - if ($commentPost !== null && (int)$commentPost->user_id !== 0 && (int)$commentPost->user_id !== $this->_userId) { |
|
122 | - $notify = new EntityAddNotification((int)$commentPost->user_id); |
|
121 | + if ($commentPost !== null && (int) $commentPost->user_id !== 0 && (int) $commentPost->user_id !== $this->_userId) { |
|
122 | + $notify = new EntityAddNotification((int) $commentPost->user_id); |
|
123 | 123 | $notify->add($commentPost->pathway, EntityAddNotification::MSG_ADD_COMMENTANSWER, [ |
124 | 124 | 'snippet' => Text::snippet($this->message, 50), |
125 | 125 | 'post' => Text::snippet($commentPost->message, 50) |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | public function __construct($record, $calcAnswers = true) |
30 | 30 | { |
31 | 31 | $this->_record = $record; |
32 | - $this->_calcAnswers = (bool)$calcAnswers; |
|
32 | + $this->_calcAnswers = (bool) $calcAnswers; |
|
33 | 33 | if ($this->_record instanceof CommentPost) { |
34 | 34 | $this->_type = 'post'; |
35 | 35 | } elseif ($this->_record instanceof CommentAnswer) { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | // build user data |
54 | 54 | $userName = __('Unknown'); |
55 | - $userAvatar = App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg'; |
|
55 | + $userAvatar = App::$Alias->scriptUrl.'/upload/user/avatar/small/default.jpg'; |
|
56 | 56 | $userColor = 0; |
57 | 57 | if ($this->_record->user !== null && $this->_record->user->id > 0) { |
58 | 58 | $userName = $this->_record->user->profile->getNickname(); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | 'text' => $this->_record->message, |
72 | 72 | 'date' => Date::convertToDatetime($this->_record->created_at, Date::FORMAT_TO_HOUR), |
73 | 73 | 'pathway' => $this->_record->pathway, |
74 | - 'moderate' => (int)$this->_record->moderate, |
|
74 | + 'moderate' => (int) $this->_record->moderate, |
|
75 | 75 | 'user' => [ |
76 | 76 | 'id' => $this->_record->user_id, |
77 | 77 | 'name' => $userName, |