@@ -40,14 +40,14 @@ |
||
| 40 | 40 | // for each item in path array calculate comments count |
| 41 | 41 | foreach ($ids as $id) { |
| 42 | 42 | $query = CommentPost::where('app_name', $appName) |
| 43 | - ->where('app_relation_id', (int)$id) |
|
| 43 | + ->where('app_relation_id', (int) $id) |
|
| 44 | 44 | ->where('moderate', '=', 0); |
| 45 | 45 | // check if comments is depend of language locale |
| 46 | - if ((bool)$configs['onlyLocale']) { |
|
| 46 | + if ((bool) $configs['onlyLocale']) { |
|
| 47 | 47 | $query = $query->where('lang', '=', $this->request->getLanguage()); |
| 48 | 48 | } |
| 49 | 49 | // set itemId => count |
| 50 | - $count[(int)$id] = $query->count(); |
|
| 50 | + $count[(int) $id] = $query->count(); |
|
| 51 | 51 | } |
| 52 | 52 | // render json response |
| 53 | 53 | return json_encode(['status' => 1, 'count' => $count]); |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | public function up() |
| 16 | 16 | { |
| 17 | 17 | // set nullable varchar type for token column |
| 18 | - $this->getSchema()->table('users', function($table){ |
|
| 18 | + $this->getSchema()->table('users', function($table) { |
|
| 19 | 19 | $table->string('approve_token', 128)->nullable()->default(null)->change(); |
| 20 | 20 | }); |
| 21 | 21 | // set approve_token = null where it like '0' str or '' |
@@ -29,13 +29,13 @@ discard block |
||
| 29 | 29 | }); |
| 30 | 30 | } |
| 31 | 31 | if (!$this->getSchema()->hasColumn('comment_answers', 'app_relation_id')) { |
| 32 | - $this->getSchema()->table('comment_answers', function ($table){ |
|
| 32 | + $this->getSchema()->table('comment_answers', function($table) { |
|
| 33 | 33 | $table->integer('app_relation_id')->unsigned()->default(0)->after('app_name'); |
| 34 | 34 | }); |
| 35 | 35 | } |
| 36 | 36 | // @todo: add algo to find app_name & app_id for oldest comments |
| 37 | 37 | if ($this->getSchema()->hasColumn('comment_posts', 'pathway')) { |
| 38 | - $this->getSchema()->table('comment_posts', function ($table){ |
|
| 38 | + $this->getSchema()->table('comment_posts', function($table) { |
|
| 39 | 39 | $table->dropColumn('pathway'); |
| 40 | 40 | }); |
| 41 | 41 | } |
@@ -1,49 +1,49 @@ |
||
| 1 | 1 | <?php return [ |
| 2 | - 'baseProto' => 'http', |
|
| 3 | - 'baseDomain' => 'ffcms3.test', |
|
| 4 | - 'basePath' => '/', |
|
| 5 | - 'passwordSalt' => '$2a$07$GEc5J9C48A0Aom5ph53Al13aa$', |
|
| 6 | - 'timezone' => 'Europe/Moscow', |
|
| 7 | - 'adminEmail' => false, |
|
| 8 | - 'debug' => [ |
|
| 9 | - 'all' => false, |
|
| 10 | - 'cookie' => [ |
|
| 11 | - 'key' => 'fdebug_ebcfb0', |
|
| 12 | - 'value' => 'e377c1648b7f1f6364c081bd339a93c101881f77da9b815a4ed605822ed33dee9debee99611afe0001be2c8e7e07705833901954543' |
|
| 13 | - ] |
|
| 14 | - ], |
|
| 15 | - 'userCron' => false, |
|
| 16 | - 'testSuite' => false, |
|
| 17 | - 'theme' => [ |
|
| 18 | - 'Front' => 'default', |
|
| 19 | - 'Admin' => 'default' |
|
| 20 | - ], |
|
| 21 | - 'database' => [ |
|
| 22 | - 'driver' => 'mysql', |
|
| 23 | - 'host' => '127.0.0.1', |
|
| 24 | - 'username' => 'mysql', |
|
| 25 | - 'password' => 'mysql', |
|
| 26 | - 'database' => 'ffcms', |
|
| 27 | - 'prefix' => 'ffcms_', |
|
| 28 | - 'charset' => 'utf8', |
|
| 29 | - 'collation' => 'utf8_unicode_ci' |
|
| 30 | - ], |
|
| 31 | - 'mail' => [ |
|
| 32 | - 'host' => 'localhost', |
|
| 33 | - 'port' => '23', |
|
| 34 | - 'user' => '[email protected]', |
|
| 35 | - 'encrypt' => 'tls', |
|
| 36 | - 'password' => '1234' |
|
| 37 | - ], |
|
| 38 | - 'baseLanguage' => 'en', |
|
| 39 | - 'multiLanguage' => true, |
|
| 40 | - 'singleLanguage' => 'en', |
|
| 41 | - 'languages' => [ |
|
| 42 | - 'en', |
|
| 43 | - 'ru' |
|
| 44 | - ], |
|
| 45 | - 'languageDomainAlias' => false, |
|
| 46 | - 'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com', |
|
| 47 | - 'gaTrackId' => false, |
|
| 48 | - 'trustedProxy' => false |
|
| 2 | + 'baseProto' => 'http', |
|
| 3 | + 'baseDomain' => 'ffcms3.test', |
|
| 4 | + 'basePath' => '/', |
|
| 5 | + 'passwordSalt' => '$2a$07$GEc5J9C48A0Aom5ph53Al13aa$', |
|
| 6 | + 'timezone' => 'Europe/Moscow', |
|
| 7 | + 'adminEmail' => false, |
|
| 8 | + 'debug' => [ |
|
| 9 | + 'all' => false, |
|
| 10 | + 'cookie' => [ |
|
| 11 | + 'key' => 'fdebug_ebcfb0', |
|
| 12 | + 'value' => 'e377c1648b7f1f6364c081bd339a93c101881f77da9b815a4ed605822ed33dee9debee99611afe0001be2c8e7e07705833901954543' |
|
| 13 | + ] |
|
| 14 | + ], |
|
| 15 | + 'userCron' => false, |
|
| 16 | + 'testSuite' => false, |
|
| 17 | + 'theme' => [ |
|
| 18 | + 'Front' => 'default', |
|
| 19 | + 'Admin' => 'default' |
|
| 20 | + ], |
|
| 21 | + 'database' => [ |
|
| 22 | + 'driver' => 'mysql', |
|
| 23 | + 'host' => '127.0.0.1', |
|
| 24 | + 'username' => 'mysql', |
|
| 25 | + 'password' => 'mysql', |
|
| 26 | + 'database' => 'ffcms', |
|
| 27 | + 'prefix' => 'ffcms_', |
|
| 28 | + 'charset' => 'utf8', |
|
| 29 | + 'collation' => 'utf8_unicode_ci' |
|
| 30 | + ], |
|
| 31 | + 'mail' => [ |
|
| 32 | + 'host' => 'localhost', |
|
| 33 | + 'port' => '23', |
|
| 34 | + 'user' => '[email protected]', |
|
| 35 | + 'encrypt' => 'tls', |
|
| 36 | + 'password' => '1234' |
|
| 37 | + ], |
|
| 38 | + 'baseLanguage' => 'en', |
|
| 39 | + 'multiLanguage' => true, |
|
| 40 | + 'singleLanguage' => 'en', |
|
| 41 | + 'languages' => [ |
|
| 42 | + 'en', |
|
| 43 | + 'ru' |
|
| 44 | + ], |
|
| 45 | + 'languageDomainAlias' => false, |
|
| 46 | + 'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com', |
|
| 47 | + 'gaTrackId' => false, |
|
| 48 | + 'trustedProxy' => false |
|
| 49 | 49 | ]; |
| 50 | 50 | \ No newline at end of file |
@@ -1,8 +1,8 @@ |
||
| 1 | 1 | <?php return [ |
| 2 | - 'Alias' => [ |
|
| 3 | - 'Front' => [ |
|
| 4 | - '/' => '/content/list/news', |
|
| 5 | - '/about' => '/content/read/page/about-page' |
|
| 6 | - ] |
|
| 7 | - ] |
|
| 2 | + 'Alias' => [ |
|
| 3 | + 'Front' => [ |
|
| 4 | + '/' => '/content/list/news', |
|
| 5 | + '/about' => '/content/read/page/about-page' |
|
| 6 | + ] |
|
| 7 | + ] |
|
| 8 | 8 | ]; |
| 9 | 9 | \ No newline at end of file |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | public function init(): void |
| 21 | 21 | { |
| 22 | 22 | if (App::$Request->getLanguage() !== 'en') { |
| 23 | - App::$Translate->append('/i18n/Front/' . App::$Request->getLanguage() . '/CommentWidget.php'); |
|
| 23 | + App::$Translate->append('/i18n/Front/'.App::$Request->getLanguage().'/CommentWidget.php'); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
@@ -30,14 +30,14 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function display(): ?string |
| 32 | 32 | { |
| 33 | - if (!$this->name || (int)$this->id < 1) { |
|
| 33 | + if (!$this->name || (int) $this->id < 1) { |
|
| 34 | 34 | return null; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | return App::$View->render('widgets/comments/show', [ |
| 38 | 38 | 'configs' => $this->getConfigs(), |
| 39 | - 'name' => (string)$this->name, |
|
| 40 | - 'id' => (int)$this->id, |
|
| 39 | + 'name' => (string) $this->name, |
|
| 40 | + 'id' => (int) $this->id, |
|
| 41 | 41 | ]); |
| 42 | 42 | } |
| 43 | 43 | } |
@@ -11,12 +11,12 @@ |
||
| 11 | 11 | mb_internal_encoding('UTF-8'); |
| 12 | 12 | |
| 13 | 13 | // load composer packages |
| 14 | -$loader = require root . '/vendor/autoload.php'; |
|
| 14 | +$loader = require root.'/vendor/autoload.php'; |
|
| 15 | 15 | // enable autoload for general namespaces user apps |
| 16 | 16 | $loader->add('Apps\\', root); |
| 17 | 17 | $loader->add('Extend\\', root); |
| 18 | 18 | $loader->add('Widgets\\', root); |
| 19 | 19 | |
| 20 | 20 | // tmp @todo |
| 21 | -$loader->add('Widgets\\', root . '/vendor/phpffcms/ffcms-tinymce/src'); |
|
| 22 | -$loader->add('Apps\\', root . '/vendor/phpffcms/ffcms-tinymce/src'); |
|
| 23 | 21 | \ No newline at end of file |
| 22 | +$loader->add('Widgets\\', root.'/vendor/phpffcms/ffcms-tinymce/src'); |
|
| 23 | +$loader->add('Apps\\', root.'/vendor/phpffcms/ffcms-tinymce/src'); |
|
| 24 | 24 | \ No newline at end of file |
@@ -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 |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $object = $profile->first(); |
| 77 | - MainApp::$Memory->set('profile.object.cache.' . $userId, $object); |
|
| 77 | + MainApp::$Memory->set('profile.object.cache.'.$userId, $object); |
|
| 78 | 78 | |
| 79 | 79 | return $object; |
| 80 | 80 | } |
@@ -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 || Str::likeEmpty($userNick)) { |
| 110 | - $userNick = 'id' . $this->id; |
|
| 110 | + $userNick = 'id'.$this->id; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | return $userNick; |
@@ -68,15 +68,15 @@ |
||
| 68 | 68 | public function getAnswerCount() |
| 69 | 69 | { |
| 70 | 70 | // check if count is cached |
| 71 | - if (MainApp::$Memory->get('commentpost.answer.count.' . $this->id) !== null) { |
|
| 72 | - return MainApp::$Memory->get('commentpost.answer.count.' . $this->id); |
|
| 71 | + if (MainApp::$Memory->get('commentpost.answer.count.'.$this->id) !== null) { |
|
| 72 | + return MainApp::$Memory->get('commentpost.answer.count.'.$this->id); |
|
| 73 | 73 | } |
| 74 | 74 | // get count from db |
| 75 | 75 | $count = CommentAnswer::where('comment_id', $this->id) |
| 76 | 76 | ->where('moderate', 0) |
| 77 | 77 | ->count(); |
| 78 | 78 | // save in cache |
| 79 | - MainApp::$Memory->set('commentpost.answer.count.' . $this->id, $count); |
|
| 79 | + MainApp::$Memory->set('commentpost.answer.count.'.$this->id, $count); |
|
| 80 | 80 | return $count; |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -46,10 +46,10 @@ |
||
| 46 | 46 | */ |
| 47 | 47 | public static function check($user1, $user2): bool |
| 48 | 48 | { |
| 49 | - $query = self::where(function ($query) use ($user1, $user2) { |
|
| 49 | + $query = self::where(function($query) use ($user1, $user2) { |
|
| 50 | 50 | $query->where('user_id', $user1) |
| 51 | 51 | ->where('target_id', $user2); |
| 52 | - })->orWhere(function ($query) use ($user1, $user2) { |
|
| 52 | + })->orWhere(function($query) use ($user1, $user2) { |
|
| 53 | 53 | $query->where('user_id', $user2) |
| 54 | 54 | ->where('target_id', $user1); |
| 55 | 55 | }); |