@@ -32,16 +32,16 @@ |
||
| 32 | 32 | protected function execute(InputInterface $input, OutputInterface $output) |
| 33 | 33 | { |
| 34 | 34 | $output->writeln('Information about FFCMS package and environment:'); |
| 35 | - $output->writeln("\t PHP version: " . phpversion()); |
|
| 36 | - $output->writeln("\t Dist path: " . root); |
|
| 37 | - $output->writeln("\t Used version: " . Version::VERSION . ' [build: ' . Version::DATE . ']'); |
|
| 35 | + $output->writeln("\t PHP version: ".phpversion()); |
|
| 36 | + $output->writeln("\t Dist path: ".root); |
|
| 37 | + $output->writeln("\t Used version: ".Version::VERSION.' [build: '.Version::DATE.']'); |
|
| 38 | 38 | $output->writeln('Information about FFCMS cmf packages:'); |
| 39 | 39 | |
| 40 | 40 | $composerInfo = File::read('/composer.lock'); |
| 41 | 41 | if (false !== $composerInfo) { |
| 42 | 42 | $jsonInfo = json_decode($composerInfo); |
| 43 | 43 | foreach ($jsonInfo->packages as $item) { |
| 44 | - $output->writeln("\t Package: " . $item->name . ' => ' . $item->version); |
|
| 44 | + $output->writeln("\t Package: ".$item->name.' => '.$item->version); |
|
| 45 | 45 | } |
| 46 | 46 | } else { |
| 47 | 47 | $output->writeln("\t Composer is never be used - no information available."); |
@@ -124,9 +124,9 @@ discard block |
||
| 124 | 124 | $allCfg['adminEmail'] = $email; |
| 125 | 125 | $allCfg['baseDomain'] = $domain; |
| 126 | 126 | $output->writeln('Generate password salt for BLOWFISH crypt'); |
| 127 | - $allCfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$'; |
|
| 127 | + $allCfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$'; |
|
| 128 | 128 | $output->writeln('Generate security cookies for debug panel'); |
| 129 | - $allCfg['debug']['cookie']['key'] = 'fdebug_' . Str::randomLatinNumeric(mt_rand(8, 32)); |
|
| 129 | + $allCfg['debug']['cookie']['key'] = 'fdebug_'.Str::randomLatinNumeric(mt_rand(8, 32)); |
|
| 130 | 130 | $allCfg['debug']['cookie']['value'] = Str::randomLatinNumeric(mt_rand(32, 128)); |
| 131 | 131 | // write config data |
| 132 | 132 | $writeCfg = Console::$Properties->writeConfig('default', $allCfg); |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | return; |
| 136 | 136 | } |
| 137 | 137 | File::write('/Private/Install/install.lock', 'Install is locked'); |
| 138 | - $output->writeln('Congratulations! FFCMS are successful installed. Used version: ' . Version::VERSION . ' since ' . Version::DATE); |
|
| 138 | + $output->writeln('Congratulations! FFCMS are successful installed. Used version: '.Version::VERSION.' since '.Version::DATE); |
|
| 139 | 139 | $output->writeln(''); |
| 140 | 140 | $output->writeln('> Please, use "php console.php main:adduser" to add admin account(set role=4) or you are unavailable to manage cms.'); |
| 141 | 141 | } |
@@ -38,8 +38,8 @@ discard block |
||
| 38 | 38 | 'roots' => [ |
| 39 | 39 | [ |
| 40 | 40 | 'driver' => 'LocalFileSystem', |
| 41 | - 'path' => root . '/upload/', |
|
| 42 | - 'URL' => App::$Alias->scriptUrl . '/upload/' |
|
| 41 | + 'path' => root.'/upload/', |
|
| 42 | + 'URL' => App::$Alias->scriptUrl.'/upload/' |
|
| 43 | 43 | ] |
| 44 | 44 | ] |
| 45 | 45 | ])); |
@@ -104,9 +104,9 @@ discard block |
||
| 104 | 104 | { |
| 105 | 105 | $this->setJsonHeader(); |
| 106 | 106 | // get ffcms news if cache is not available |
| 107 | - $cache = App::$Cache->getItem('download.ffcms.api.news.' . $this->lang); |
|
| 107 | + $cache = App::$Cache->getItem('download.ffcms.api.news.'.$this->lang); |
|
| 108 | 108 | if ($cache->isHit()) { |
| 109 | - $cache->set(File::getFromUrl('https://ffcms.org/api/api/news?lang=' . $this->lang)) |
|
| 109 | + $cache->set(File::getFromUrl('https://ffcms.org/api/api/news?lang='.$this->lang)) |
|
| 110 | 110 | ->expiresAfter(1440); |
| 111 | 111 | } |
| 112 | 112 | $news = $cache->get(); |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | use Ffcms\Core\Exception\ForbiddenException; |
| 11 | 11 | use Ffcms\Core\Helper\FileSystem\File; |
| 12 | 12 | use Ffcms\Core\Helper\Type\Str; |
| 13 | -use Ffcms\Core\Helper\Url; |
|
| 14 | 13 | |
| 15 | 14 | /** |
| 16 | 15 | * Class Main. Basic api features for ffcms |
@@ -28,14 +28,14 @@ |
||
| 28 | 28 | public function actionIndex() |
| 29 | 29 | { |
| 30 | 30 | // get search query value from GET headers |
| 31 | - $query = (string)$this->request->query->get('query', null); |
|
| 31 | + $query = (string) $this->request->query->get('query', null); |
|
| 32 | 32 | // strip html tags |
| 33 | 33 | $query = App::$Security->strip_tags(trim($query)); |
| 34 | 34 | // get configs |
| 35 | 35 | $configs = $this->getConfigs(); |
| 36 | 36 | |
| 37 | 37 | // check search query length |
| 38 | - if (Str::likeEmpty($query) || Str::length($query) < (int)$configs['minLength']) { |
|
| 38 | + if (Str::likeEmpty($query) || Str::length($query) < (int) $configs['minLength']) { |
|
| 39 | 39 | throw new NotFoundException(__('Search query is too short!')); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $query = ProfileRecords::with(['user']); |
| 39 | 39 | |
| 40 | 40 | // set current page and offset |
| 41 | - $page = (int)$this->request->query->get('page'); |
|
| 41 | + $page = (int) $this->request->query->get('page'); |
|
| 42 | 42 | $offset = $page * self::ITEM_PER_PAGE; |
| 43 | 43 | |
| 44 | 44 | // build pagination |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function actionDelete($id) |
| 70 | 70 | { |
| 71 | - $this->response->redirect('user/delete/' . $id); |
|
| 71 | + $this->response->redirect('user/delete/'.$id); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $search = \Apps\ActiveRecord\App::getItem('app', $controller); |
| 88 | 88 | |
| 89 | 89 | // check what we got |
| 90 | - if ($search === null || (int)$search->id < 1) { |
|
| 90 | + if ($search === null || (int) $search->id < 1) { |
|
| 91 | 91 | throw new NotFoundException('App is not founded'); |
| 92 | 92 | } |
| 93 | 93 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | $search = \Apps\ActiveRecord\App::where('sys_name', '=', $controllerName)->where('type', '=', 'app')->first(); |
| 121 | 121 | |
| 122 | - if ($search === null || (int)$search->id < 1) { |
|
| 122 | + if ($search === null || (int) $search->id < 1) { |
|
| 123 | 123 | throw new ForbiddenException('App is not founded'); |
| 124 | 124 | } |
| 125 | 125 | |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | |
| 36 | 36 | // render view output |
| 37 | 37 | return $this->view->render('index', [ |
| 38 | - 'model' => $model |
|
| 38 | + 'model' => $model |
|
| 39 | 39 | ]); |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -55,6 +55,6 @@ |
||
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | // if widget is disabled - lets return nothing |
| 58 | - return !(bool)$wData->disabled; |
|
| 58 | + return !(bool) $wData->disabled; |
|
| 59 | 59 | } |
| 60 | 60 | } |
@@ -1,42 +1,42 @@ |
||
| 1 | 1 | <?php return [ |
| 2 | - 'baseProto' => 'http', |
|
| 3 | - 'baseDomain' => 'ffcms.app', |
|
| 4 | - 'basePath' => '/', |
|
| 5 | - 'passwordSalt' => '$2a$07$2NJgci5A7NI9m2J9Ii92a1I3DiH6$', |
|
| 6 | - 'timezone' => 'Europe/Moscow', |
|
| 7 | - 'adminEmail' => '[email protected]', |
|
| 8 | - 'debug' => [ |
|
| 9 | - 'all' => false, |
|
| 10 | - 'cookie' => [ |
|
| 11 | - 'key' => 'fdebug_jepP2', |
|
| 12 | - 'value' => 'pOH1Kj18fHN7mk9a81F32eJbl9d3AeDjLC1g7poPGE22Ii6pI68P5B6O5hKMofnLPB0lFdpo2a2o78NhedjGA' |
|
| 13 | - ] |
|
| 14 | - ], |
|
| 15 | - 'userCron' => false, |
|
| 16 | - 'theme' => [ |
|
| 17 | - 'Front' => 'default', |
|
| 18 | - 'Admin' => 'default' |
|
| 19 | - ], |
|
| 20 | - 'database' => [ |
|
| 21 | - 'driver' => 'mysql', |
|
| 22 | - 'host' => '127.0.0.1', |
|
| 23 | - 'username' => 'mysql', |
|
| 24 | - 'password' => 'mysql', |
|
| 25 | - 'database' => 'ffcms', |
|
| 26 | - 'prefix' => 'ffcms_', |
|
| 27 | - 'charset' => 'utf8', |
|
| 28 | - 'collation' => 'utf8_unicode_ci' |
|
| 29 | - ], |
|
| 2 | + 'baseProto' => 'http', |
|
| 3 | + 'baseDomain' => 'ffcms.app', |
|
| 4 | + 'basePath' => '/', |
|
| 5 | + 'passwordSalt' => '$2a$07$2NJgci5A7NI9m2J9Ii92a1I3DiH6$', |
|
| 6 | + 'timezone' => 'Europe/Moscow', |
|
| 7 | + 'adminEmail' => '[email protected]', |
|
| 8 | + 'debug' => [ |
|
| 9 | + 'all' => false, |
|
| 10 | + 'cookie' => [ |
|
| 11 | + 'key' => 'fdebug_jepP2', |
|
| 12 | + 'value' => 'pOH1Kj18fHN7mk9a81F32eJbl9d3AeDjLC1g7poPGE22Ii6pI68P5B6O5hKMofnLPB0lFdpo2a2o78NhedjGA' |
|
| 13 | + ] |
|
| 14 | + ], |
|
| 15 | + 'userCron' => false, |
|
| 16 | + 'theme' => [ |
|
| 17 | + 'Front' => 'default', |
|
| 18 | + 'Admin' => 'default' |
|
| 19 | + ], |
|
| 20 | + 'database' => [ |
|
| 21 | + 'driver' => 'mysql', |
|
| 22 | + 'host' => '127.0.0.1', |
|
| 23 | + 'username' => 'mysql', |
|
| 24 | + 'password' => 'mysql', |
|
| 25 | + 'database' => 'ffcms', |
|
| 26 | + 'prefix' => 'ffcms_', |
|
| 27 | + 'charset' => 'utf8', |
|
| 28 | + 'collation' => 'utf8_unicode_ci' |
|
| 29 | + ], |
|
| 30 | 30 | 'testSuite' => false, |
| 31 | - 'baseLanguage' => 'en', |
|
| 32 | - 'multiLanguage' => true, |
|
| 33 | - 'singleLanguage' => 'en', |
|
| 34 | - 'languages' => [ |
|
| 35 | - 'en', |
|
| 36 | - 'ru' |
|
| 37 | - ], |
|
| 38 | - 'languageDomainAlias' => false, |
|
| 39 | - 'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com', |
|
| 40 | - 'gaTrackId' => false, |
|
| 41 | - 'trustedProxy' => false |
|
| 31 | + 'baseLanguage' => 'en', |
|
| 32 | + 'multiLanguage' => true, |
|
| 33 | + 'singleLanguage' => 'en', |
|
| 34 | + 'languages' => [ |
|
| 35 | + 'en', |
|
| 36 | + 'ru' |
|
| 37 | + ], |
|
| 38 | + 'languageDomainAlias' => false, |
|
| 39 | + 'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com', |
|
| 40 | + 'gaTrackId' => false, |
|
| 41 | + 'trustedProxy' => false |
|
| 42 | 42 | ]; |
| 43 | 43 | \ No newline at end of file |