@@ -5,7 +5,6 @@ |
||
5 | 5 | use Ffcms\Core\App as MainApp; |
6 | 6 | use Ffcms\Core\Arch\ActiveModel; |
7 | 7 | use Ffcms\Core\Helper\Type\Arr; |
8 | -use Ffcms\Core\Helper\Type\Str; |
|
9 | 8 | |
10 | 9 | class Role extends ActiveModel |
11 | 10 | { |
@@ -26,12 +26,12 @@ |
||
26 | 26 | */ |
27 | 27 | public static function get($role_id) |
28 | 28 | { |
29 | - $role = MainApp::$Memory->get('user.role.cache.' . $role_id); |
|
29 | + $role = MainApp::$Memory->get('user.role.cache.'.$role_id); |
|
30 | 30 | |
31 | 31 | // not founded in cache |
32 | 32 | if ($role === null) { |
33 | 33 | $role = self::find($role_id); |
34 | - MainApp::$Memory->set('user.role.cache.' . $role_id, $role); |
|
34 | + MainApp::$Memory->set('user.role.cache.'.$role_id, $role); |
|
35 | 35 | } |
36 | 36 | return $role; |
37 | 37 | } |
@@ -9,7 +9,6 @@ |
||
9 | 9 | use Ffcms\Core\Helper\Date; |
10 | 10 | use Ffcms\Core\Helper\FileSystem\Directory; |
11 | 11 | use Ffcms\Core\Helper\FileSystem\File; |
12 | -use Ffcms\Core\Helper\Type\Integer; |
|
13 | 12 | use Ffcms\Core\Helper\Type\Obj; |
14 | 13 | use Ffcms\Core\Helper\Serialize; |
15 | 14 | use Ffcms\Core\Helper\Type\Str; |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
46 | - * Set model properties from active record data |
|
47 | - */ |
|
46 | + * Set model properties from active record data |
|
47 | + */ |
|
48 | 48 | public function before() |
49 | 49 | { |
50 | 50 | // is new item? |
@@ -105,8 +105,8 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
108 | - * Labels |
|
109 | - */ |
|
108 | + * Labels |
|
109 | + */ |
|
110 | 110 | public function labels() |
111 | 111 | { |
112 | 112 | return [ |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | if ($this->_content->id === null) { |
52 | 52 | $this->_new = true; |
53 | 53 | if (null === $this->galleryFreeId) { |
54 | - $this->galleryFreeId = '_tmp_' . Str::randomLatin(mt_rand(16, 32)); |
|
54 | + $this->galleryFreeId = '_tmp_'.Str::randomLatin(mt_rand(16, 32)); |
|
55 | 55 | } |
56 | 56 | if (null === $this->authorId) { |
57 | 57 | $this->authorId = App::$User->identity()->getId(); |
@@ -81,9 +81,9 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function rules() |
83 | 83 | { |
84 | - $res = [ |
|
85 | - ['title.' . App::$Request->getLanguage(), 'required'], |
|
86 | - ['text.' . App::$Request->getLanguage(), 'required', null, true, true], |
|
84 | + $res = [ |
|
85 | + ['title.'.App::$Request->getLanguage(), 'required'], |
|
86 | + ['text.'.App::$Request->getLanguage(), 'required', null, true, true], |
|
87 | 87 | ['text', 'used', null, true, true], |
88 | 88 | ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'], |
89 | 89 | [['path', 'categoryId', 'authorId', 'display', 'galleryFreeId', 'title'], 'required'], |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | ]; |
97 | 97 | |
98 | 98 | foreach (App::$Properties->get('languages') as $lang) { |
99 | - $res[] = ['title.' . $lang, 'length_max', 120, null, true, true]; |
|
100 | - $res[] = ['keywords.' . $lang, 'length_max', 150]; |
|
101 | - $res[] = ['description.' . $lang, 'length_max', 250]; |
|
99 | + $res[] = ['title.'.$lang, 'length_max', 120, null, true, true]; |
|
100 | + $res[] = ['keywords.'.$lang, 'length_max', 150]; |
|
101 | + $res[] = ['description.'.$lang, 'length_max', 250]; |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | return $res; |
@@ -142,8 +142,8 @@ discard block |
||
142 | 142 | $this->_content->meta_description = Serialize::encode(App::$Security->strip_tags($this->metaDescription)); |
143 | 143 | $this->_content->source = App::$Security->strip_tags($this->source); |
144 | 144 | // check if rating is changed |
145 | - if ((int)$this->addRating !== 0) { |
|
146 | - $this->_content->rating += (int)$this->addRating; |
|
145 | + if ((int) $this->addRating !== 0) { |
|
146 | + $this->_content->rating += (int) $this->addRating; |
|
147 | 147 | } |
148 | 148 | // check if special comment hash is exist |
149 | 149 | if ($this->_new || Str::length($this->_content->comment_hash) < 32) { |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | // save poster data |
158 | - $posterPath = '/upload/gallery/' . $this->galleryFreeId . '/orig/' . $this->poster; |
|
158 | + $posterPath = '/upload/gallery/'.$this->galleryFreeId.'/orig/'.$this->poster; |
|
159 | 159 | if (File::exist($posterPath)) { |
160 | 160 | $this->_content->poster = $this->poster; |
161 | 161 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | |
169 | 169 | // move files |
170 | 170 | if ($tmpGalleryId !== $this->_content->id) { |
171 | - Directory::rename('/upload/gallery/' . $tmpGalleryId, $this->_content->id); |
|
171 | + Directory::rename('/upload/gallery/'.$tmpGalleryId, $this->_content->id); |
|
172 | 172 | } |
173 | 173 | } |
174 | 174 | |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | $data = ContentCategory::getSortedCategories(); |
182 | 182 | $response = []; |
183 | 183 | foreach ($data as $key=>$val) { |
184 | - $response[] = (string)$key; |
|
184 | + $response[] = (string) $key; |
|
185 | 185 | } |
186 | 186 | return $response; |
187 | 187 | } |
@@ -202,7 +202,7 @@ |
||
202 | 202 | $findAnswer->delete(); |
203 | 203 | |
204 | 204 | $this->response = json_encode([ |
205 | - 'status' => 1, |
|
205 | + 'status' => 1, |
|
206 | 206 | 'message' => 'ok' |
207 | 207 | ]); |
208 | 208 | } |
@@ -15,7 +15,6 @@ |
||
15 | 15 | use Ffcms\Core\Helper\Date; |
16 | 16 | use Ffcms\Core\Helper\Type\Obj; |
17 | 17 | use Ffcms\Core\Helper\Type\Str; |
18 | -use Ffcms\Core\Interfaces\iUser; |
|
19 | 18 | use Illuminate\Database\Capsule\Manager as Capsule; |
20 | 19 | use Ffcms\Core\Exception\NativeException; |
21 | 20 | use Ffcms\Core\Exception\ForbiddenException; |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $answerTime = Date::convertToTimestamp($lastAnswer->created_at); |
161 | 161 | $cfgs = \Apps\ActiveRecord\App::getConfigs('app', 'Profile'); |
162 | 162 | // hmm, maybe past less then delay required? |
163 | - if ($now - (int)$cfgs['delayBetweenPost'] < $answerTime) { |
|
163 | + if ($now - (int) $cfgs['delayBetweenPost'] < $answerTime) { |
|
164 | 164 | throw new ForbiddenException('Delay between answers not pass'); |
165 | 165 | } |
166 | 166 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | // add notification for target user |
176 | 176 | if ($viewer->id !== $target_id) { |
177 | 177 | $notify = new EntityAddNotification($target_id); |
178 | - $notify->add('/profile/show/' . $target_id . '#wall-post-' . $wallRow->id, EntityAddNotification::MSG_ADD_WALLANSWER, [ |
|
178 | + $notify->add('/profile/show/'.$target_id.'#wall-post-'.$wallRow->id, EntityAddNotification::MSG_ADD_WALLANSWER, [ |
|
179 | 179 | 'snippet' => Text::snippet($message, 50), |
180 | 180 | 'post' => $wallRow->message |
181 | 181 | ]); |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | $postInfo = $findAnswer->getWallPost(); |
220 | 220 | |
221 | 221 | // if not a target user of answer and not answer owner - lets throw exception |
222 | - if($postInfo->target_id !== $viewer->id && $findAnswer->user_id !== $viewer->id) { |
|
222 | + if ($postInfo->target_id !== $viewer->id && $findAnswer->user_id !== $viewer->id) { |
|
223 | 223 | throw new ForbiddenException('Access declined!'); |
224 | 224 | } |
225 | 225 | |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | // sender is not myself? then i'm - target (remote user is sender user->to_me) |
281 | 281 | if ($row->sender_id !== $user->id) { |
282 | 282 | $userList[] = $row->sender_id; |
283 | - if ((int)$row->tread === 0) { |
|
283 | + if ((int) $row->tread === 0) { |
|
284 | 284 | $unreadList[] = $row->sender_id; |
285 | 285 | } |
286 | 286 | } |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | |
361 | 361 | // get special types for this action |
362 | 362 | $queryType = $this->request->get('type'); |
363 | - $queryId = (int)$this->request->get('id'); |
|
363 | + $queryId = (int) $this->request->get('id'); |
|
364 | 364 | // get current user object |
365 | 365 | $user = App::$User->identity(); |
366 | 366 | |
@@ -376,11 +376,11 @@ discard block |
||
376 | 376 | switch ($queryType) { |
377 | 377 | case 'after': |
378 | 378 | $messages = Message::where('id', '>', $queryId) |
379 | - ->where(function ($query) use ($cor_id, $user) { |
|
380 | - $query->where(function ($q) use ($cor_id, $user){ |
|
379 | + ->where(function($query) use ($cor_id, $user) { |
|
380 | + $query->where(function($q) use ($cor_id, $user){ |
|
381 | 381 | $q->where('target_id', '=', $user->getId()) |
382 | 382 | ->where('sender_id', '=', $cor_id); |
383 | - })->orWhere(function ($q) use ($cor_id, $user){ |
|
383 | + })->orWhere(function($q) use ($cor_id, $user){ |
|
384 | 384 | $q->where('target_id', '=', $cor_id) |
385 | 385 | ->where('sender_id', '=', $user->getId()); |
386 | 386 | }); |
@@ -388,11 +388,11 @@ discard block |
||
388 | 388 | break; |
389 | 389 | case 'before': |
390 | 390 | $messages = Message::where('id', '<', $queryId) |
391 | - ->where(function ($query) use ($cor_id, $user) { |
|
392 | - $query->where(function ($q) use ($cor_id, $user){ |
|
391 | + ->where(function($query) use ($cor_id, $user) { |
|
392 | + $query->where(function($q) use ($cor_id, $user){ |
|
393 | 393 | $q->where('target_id', '=', $user->getId()) |
394 | 394 | ->where('sender_id', '=', $cor_id); |
395 | - })->orWhere(function ($q) use ($cor_id, $user){ |
|
395 | + })->orWhere(function($q) use ($cor_id, $user){ |
|
396 | 396 | $q->where('target_id', '=', $cor_id) |
397 | 397 | ->where('sender_id', '=', $user->getId()); |
398 | 398 | }); |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | $this->setJsonHeader(); |
501 | 501 | |
502 | 502 | // get operation type and target user id |
503 | - $target_id = (int)$this->request->get('target'); |
|
503 | + $target_id = (int) $this->request->get('target'); |
|
504 | 504 | $type = $this->request->get('type'); |
505 | 505 | |
506 | 506 | // check type of query |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | |
516 | 516 | $cfg = \Apps\ActiveRecord\App::getConfigs('app', 'Profile'); |
517 | 517 | // check if rating is enabled for website |
518 | - if ((int)$cfg['rating'] !== 1) { |
|
518 | + if ((int) $cfg['rating'] !== 1) { |
|
519 | 519 | throw new NativeException('Rating is disabled'); |
520 | 520 | } |
521 | 521 |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
32 | - * Pass properties from record construction |
|
33 | - */ |
|
32 | + * Pass properties from record construction |
|
33 | + */ |
|
34 | 34 | public function before() |
35 | 35 | { |
36 | 36 | $this->title = Serialize::getDecodeLocale($this->_record->title); |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
41 | - * Form labels |
|
42 | - */ |
|
41 | + * Form labels |
|
42 | + */ |
|
43 | 43 | public function labels() |
44 | 44 | { |
45 | 45 | return [ |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
53 | - * Validation rules |
|
54 | - */ |
|
53 | + * Validation rules |
|
54 | + */ |
|
55 | 55 | public function rules() |
56 | 56 | { |
57 | 57 | return [ |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | // get all depended category ids |
78 | - $cats = ContentCategory::where('path', 'like', $this->_record->path . '%')->get(['id'])->toArray(); |
|
78 | + $cats = ContentCategory::where('path', 'like', $this->_record->path.'%')->get(['id'])->toArray(); |
|
79 | 79 | $allCategoryIds = Arr::ploke('id', $cats); |
80 | 80 | |
81 | 81 | // update category_id in content |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $response = []; |
111 | 111 | foreach ($data as $key=>$val) { |
112 | 112 | if ($this->_record->id !== $key) { |
113 | - $response[] = (string)$key; |
|
113 | + $response[] = (string) $key; |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | return $response; |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
41 | - * Pass properties from default record values |
|
42 | - */ |
|
41 | + * Pass properties from default record values |
|
42 | + */ |
|
43 | 43 | public function before() |
44 | 44 | { |
45 | 45 | if ($this->_record->id === null) { |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
77 | - * Form labels |
|
78 | - */ |
|
77 | + * Form labels |
|
78 | + */ |
|
79 | 79 | public function labels() |
80 | 80 | { |
81 | 81 | return [ |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
96 | - * Validation rules |
|
97 | - */ |
|
96 | + * Validation rules |
|
97 | + */ |
|
98 | 98 | public function rules() |
99 | 99 | { |
100 | 100 | $rules = [ |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Ffcms\Core\App; |
6 | 6 | use Ffcms\Core\Arch\Model; |
7 | -use Ffcms\Core\Helper\Type\Obj; |
|
8 | 7 | use Ffcms\Core\Helper\Type\Str; |
9 | 8 | use Ffcms\Core\Interfaces\iUser; |
10 | 9 |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | ]; |
108 | 108 | |
109 | 109 | // general category |
110 | - if ($this->_new === false && (int)$this->_record->id === 1) { |
|
110 | + if ($this->_new === false && (int) $this->_record->id === 1) { |
|
111 | 111 | $rules[] = ['path', 'used']; |
112 | 112 | } else { |
113 | 113 | $rules[] = ['path', 'required']; |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | $rules[] = ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/']; |
117 | 117 | } |
118 | 118 | |
119 | - $rules[] = ['title.' . App::$Request->getLanguage(), 'required']; |
|
119 | + $rules[] = ['title.'.App::$Request->getLanguage(), 'required']; |
|
120 | 120 | |
121 | 121 | |
122 | 122 | return $rules; |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | { |
130 | 130 | $this->_record->title = Serialize::encode(App::$Security->strip_tags($this->title)); |
131 | 131 | $this->_record->description = Serialize::encode(App::$Security->strip_tags($this->description)); |
132 | - $savePath = trim($this->_pathNested . '/' . $this->path, '/'); |
|
132 | + $savePath = trim($this->_pathNested.'/'.$this->path, '/'); |
|
133 | 133 | $this->_record->path = $savePath; |
134 | 134 | $this->_record->configs = Serialize::encode($this->configs); |
135 | 135 | $this->_record->save(); |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | // build path with owner category |
165 | 165 | $this->_pathNested = $owner->path; |
166 | 166 | if (Str::length($this->_pathNested) > 0) { |
167 | - $path = $this->_pathNested . '/' . $path; |
|
167 | + $path = $this->_pathNested.'/'.$path; |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | // make select for check |
@@ -15,8 +15,8 @@ discard block |
||
15 | 15 | } |
16 | 16 | |
17 | 17 | /** |
18 | - * Example of usage magic labels for future form helper usage |
|
19 | - */ |
|
18 | + * Example of usage magic labels for future form helper usage |
|
19 | + */ |
|
20 | 20 | public function labels() |
21 | 21 | { |
22 | 22 | return [ |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
28 | - * Typo rules |
|
29 | - */ |
|
28 | + * Typo rules |
|
29 | + */ |
|
30 | 30 | public function rules() |
31 | 31 | { |
32 | 32 | return []; |
@@ -24,8 +24,8 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
27 | - * Set readable title of content to property |
|
28 | - */ |
|
27 | + * Set readable title of content to property |
|
28 | + */ |
|
29 | 29 | public function before() |
30 | 30 | { |
31 | 31 | $this->id = $this->_record->id; |
@@ -33,8 +33,8 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | /** |
36 | - * Form labels |
|
37 | - */ |
|
36 | + * Form labels |
|
37 | + */ |
|
38 | 38 | public function labels() |
39 | 39 | { |
40 | 40 | return [ |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
46 | - * Validation does not matter |
|
47 | - */ |
|
46 | + * Validation does not matter |
|
47 | + */ |
|
48 | 48 | public function rules() |
49 | 49 | { |
50 | 50 | return [ |
@@ -20,8 +20,8 @@ discard block |
||
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
23 | - * Pass properties |
|
24 | - */ |
|
23 | + * Pass properties |
|
24 | + */ |
|
25 | 25 | public function before() |
26 | 26 | { |
27 | 27 | $this->id = $this->_record->id; |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
32 | - * Form label |
|
33 | - */ |
|
32 | + * Form label |
|
33 | + */ |
|
34 | 34 | public function labels() |
35 | 35 | { |
36 | 36 | return [ |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
42 | - * Typical rules |
|
43 | - */ |
|
42 | + * Typical rules |
|
43 | + */ |
|
44 | 44 | public function rules() |
45 | 45 | { |
46 | 46 | return []; |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
31 | - * Set model properties based on defaults config values |
|
32 | - */ |
|
31 | + * Set model properties based on defaults config values |
|
32 | + */ |
|
33 | 33 | public function before() |
34 | 34 | { |
35 | 35 | foreach ($this->_configs as $property => $value) { |
@@ -40,8 +40,8 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
43 | - * Form labels |
|
44 | - */ |
|
43 | + * Form labels |
|
44 | + */ |
|
45 | 45 | public function labels() |
46 | 46 | { |
47 | 47 | return [ |
@@ -57,8 +57,8 @@ discard block |
||
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
60 | - * Validation rules |
|
61 | - */ |
|
60 | + * Validation rules |
|
61 | + */ |
|
62 | 62 | public function rules() |
63 | 63 | { |
64 | 64 | return [ |