@@ -70,7 +70,7 @@ |
||
70 | 70 | { |
71 | 71 | $password = App::$Security->password_hash($this->password); |
72 | 72 | |
73 | - $search = App::$User->where('password', '=', $password)->where(function ($query) { |
|
73 | + $search = App::$User->where('password', '=', $password)->where(function($query) { |
|
74 | 74 | $query->where('login', '=', $this->login) |
75 | 75 | ->orWhere('email', '=', $this->login); |
76 | 76 | }); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | // labels for custom fields |
73 | 73 | foreach (ProfileField::all() as $custom) { |
74 | - $labels['custom_data.' . $custom->id] = $custom->getLocaled('name'); |
|
74 | + $labels['custom_data.'.$custom->id] = $custom->getLocaled('name'); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | return $labels; |
@@ -97,12 +97,12 @@ discard block |
||
97 | 97 | // custom profile fields |
98 | 98 | foreach (ProfileField::all() as $custom) { |
99 | 99 | $rules[] = [ |
100 | - 'custom_data.' . $custom->id, |
|
100 | + 'custom_data.'.$custom->id, |
|
101 | 101 | 'used' |
102 | 102 | ]; |
103 | 103 | $rules[] = [ |
104 | - 'custom_data.' . $custom->id, |
|
105 | - (int)$custom->reg_cond === 1 ? 'direct_match' : 'reverse_match', |
|
104 | + 'custom_data.'.$custom->id, |
|
105 | + (int) $custom->reg_cond === 1 ? 'direct_match' : 'reverse_match', |
|
106 | 106 | $custom->reg_exp |
107 | 107 | ]; |
108 | 108 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public static function all($columns = ['*']) |
36 | 36 | { |
37 | - $cacheName = 'activerecord.contentcategory.all.' . implode('.', $columns); |
|
37 | + $cacheName = 'activerecord.contentcategory.all.'.implode('.', $columns); |
|
38 | 38 | $records = MemoryObject::instance()->get($cacheName); |
39 | 39 | if ($records === null) { |
40 | 40 | $records = parent::all($columns); |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public static function getByPath($path = '') |
52 | 52 | { |
53 | - if (MainApp::$Memory->get('cache.content.category.path.' . $path) !== null) { |
|
54 | - return MainApp::$Memory->get('cache.content.category.path.' . $path); |
|
53 | + if (MainApp::$Memory->get('cache.content.category.path.'.$path) !== null) { |
|
54 | + return MainApp::$Memory->get('cache.content.category.path.'.$path); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | $record = self::where('path', '=', $path)->first(); |
58 | - MainApp::$Memory->set('cache.content.category.path.' . $path, $record); |
|
58 | + MainApp::$Memory->set('cache.content.category.path.'.$path, $record); |
|
59 | 59 | return $record; |
60 | 60 | } |
61 | 61 | |
@@ -66,12 +66,12 @@ discard block |
||
66 | 66 | */ |
67 | 67 | public static function getById($id) |
68 | 68 | { |
69 | - if (MainApp::$Memory->get('cache.content.category.id.' . $id) !== null) { |
|
70 | - return MainApp::$Memory->get('cache.content.category.id.' . $id); |
|
69 | + if (MainApp::$Memory->get('cache.content.category.id.'.$id) !== null) { |
|
70 | + return MainApp::$Memory->get('cache.content.category.id.'.$id); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | $record = self::find($id); |
74 | - MainApp::$Memory->set('cache.content.category.id.' . $id, $record); |
|
74 | + MainApp::$Memory->set('cache.content.category.id.'.$id, $record); |
|
75 | 75 | return $record; |
76 | 76 | } |
77 | 77 | |
@@ -99,12 +99,12 @@ discard block |
||
99 | 99 | } else { |
100 | 100 | // set level marker based on slashes count in pathway |
101 | 101 | $slashCount = Str::entryCount($path, '/'); |
102 | - for ($i=-1; $i <= $slashCount; $i++) { |
|
102 | + for ($i = -1; $i <= $slashCount; $i++) { |
|
103 | 103 | $title .= '--'; |
104 | 104 | } |
105 | 105 | } |
106 | 106 | // add canonical title from db |
107 | - $title .= ' ' . $data->getLocaled('title'); |
|
107 | + $title .= ' '.$data->getLocaled('title'); |
|
108 | 108 | // set response as array [id => title, ... ] |
109 | 109 | $response[$data->id] = $title; |
110 | 110 | } |
@@ -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 |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | // check if SAPI client == cli (php built-in dev server) |
15 | 15 | if (php_sapi_name() === 'cli-server') { |
16 | - $path = root . DIRECTORY_SEPARATOR . ltrim($uriRequest, '/'); |
|
16 | + $path = root.DIRECTORY_SEPARATOR.ltrim($uriRequest, '/'); |
|
17 | 17 | // if static file exist |
18 | 18 | if (is_file($path)) { |
19 | 19 | // check if it looks like standalone php script |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | |
29 | 29 | // get configs to prepare posible route to switch environment |
30 | -$configs = require(root . '/Private/Config/Default.php'); |
|
30 | +$configs = require(root.'/Private/Config/Default.php'); |
|
31 | 31 | // remove base path |
32 | 32 | $uriRequest = substr($uriRequest, strlen($configs['basePath'])); |
33 | 33 | $uriArray = explode('/', $uriRequest); |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | $uriLoader = ucfirst(strtolower(str_replace('.', '', $uriLoader))); |
39 | 39 | |
40 | 40 | // if loader of interface is available - require it |
41 | -if (in_array($uriLoader, $loaderList, true) && file_exists(root . '/Loader/' . $uriLoader . '/index.php')) { |
|
42 | - require_once (root . '/Loader/' . $uriLoader . '/index.php'); |
|
41 | +if (in_array($uriLoader, $loaderList, true) && file_exists(root.'/Loader/'.$uriLoader.'/index.php')) { |
|
42 | + require_once (root.'/Loader/'.$uriLoader.'/index.php'); |
|
43 | 43 | } else { // else - try to load default interface |
44 | - require_once (root . '/Loader/Front/index.php'); |
|
44 | + require_once (root.'/Loader/Front/index.php'); |
|
45 | 45 | } |
46 | 46 | \ No newline at end of file |
@@ -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; |