@@ -55,8 +55,8 @@ |
||
55 | 55 | $this->loadDefault(); |
56 | 56 | |
57 | 57 | app('xe.frontend')->js([ |
58 | - 'assets/vendor/swiper2/idangerous.swiper.js', |
|
59 | - 'assets/core/plugin/js/plugin.js' |
|
58 | + 'assets/vendor/swiper2/idangerous.swiper.js', |
|
59 | + 'assets/core/plugin/js/plugin.js' |
|
60 | 60 | ])->appendTo('head')->load(); |
61 | 61 | app('xe.frontend')->css('assets/vendor/swiper2/idangerous.swiper.css') |
62 | 62 | ->before('assets/core/settings/css/admin.css')->load(); |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | 'storage' => array( |
30 | 30 | 'enabled' => true, |
31 | 31 | 'driver' => 'file', // redis, file, pdo |
32 | - 'path' => storage_path() . '/debugbar', // For file driver |
|
33 | - 'connection' => null, // Leave null for default connection (Redis/PDO) |
|
32 | + 'path' => storage_path().'/debugbar', // For file driver |
|
33 | + 'connection' => null, // Leave null for default connection (Redis/PDO) |
|
34 | 34 | ), |
35 | 35 | |
36 | 36 | /* |
@@ -71,20 +71,20 @@ discard block |
||
71 | 71 | */ |
72 | 72 | |
73 | 73 | 'collectors' => array( |
74 | - 'phpinfo' => true, // Php version |
|
75 | - 'messages' => true, // Messages |
|
76 | - 'time' => true, // Time Datalogger |
|
77 | - 'memory' => true, // Memory usage |
|
78 | - 'exceptions' => true, // Exception displayer |
|
79 | - 'log' => true, // Logs from Monolog (merged in messages if enabled) |
|
80 | - 'db' => true, // Show database (PDO) queries and bindings |
|
81 | - 'views' => true, // Views with their data |
|
82 | - 'route' => true, // Current route information |
|
74 | + 'phpinfo' => true, // Php version |
|
75 | + 'messages' => true, // Messages |
|
76 | + 'time' => true, // Time Datalogger |
|
77 | + 'memory' => true, // Memory usage |
|
78 | + 'exceptions' => true, // Exception displayer |
|
79 | + 'log' => true, // Logs from Monolog (merged in messages if enabled) |
|
80 | + 'db' => true, // Show database (PDO) queries and bindings |
|
81 | + 'views' => true, // Views with their data |
|
82 | + 'route' => true, // Current route information |
|
83 | 83 | 'laravel' => false, // Laravel version and environment |
84 | 84 | 'events' => false, // All events fired |
85 | 85 | 'default_request' => false, // Regular or special Symfony request logger |
86 | - 'symfony_request' => true, // Only one can be enabled.. |
|
87 | - 'mail' => true, // Catch mail messages |
|
86 | + 'symfony_request' => true, // Only one can be enabled.. |
|
87 | + 'mail' => true, // Catch mail messages |
|
88 | 88 | 'logs' => false, // Add the latest log messages |
89 | 89 | 'files' => false, // Show the included files |
90 | 90 | 'config' => false, // Display config settings |
@@ -103,23 +103,23 @@ discard block |
||
103 | 103 | |
104 | 104 | 'options' => array( |
105 | 105 | 'auth' => array( |
106 | - 'show_name' => false, // Also show the users name/email in the debugbar |
|
106 | + 'show_name' => false, // Also show the users name/email in the debugbar |
|
107 | 107 | ), |
108 | 108 | 'db' => array( |
109 | - 'with_params' => true, // Render SQL with the parameters substituted |
|
110 | - 'timeline' => false, // Add the queries to the timeline |
|
111 | - 'backtrace' => false, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. |
|
109 | + 'with_params' => true, // Render SQL with the parameters substituted |
|
110 | + 'timeline' => false, // Add the queries to the timeline |
|
111 | + 'backtrace' => false, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. |
|
112 | 112 | 'explain' => array( // EXPERIMENTAL: Show EXPLAIN output on queries |
113 | 113 | 'enabled' => false, |
114 | 114 | 'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ |
115 | 115 | ), |
116 | - 'hints' => true, // Show hints for common mistakes |
|
116 | + 'hints' => true, // Show hints for common mistakes |
|
117 | 117 | ), |
118 | 118 | 'mail' => array( |
119 | 119 | 'full_log' => false |
120 | 120 | ), |
121 | 121 | 'views' => array( |
122 | - 'data' => false, //Note: Can slow down the application, because the data can be quite large.. |
|
122 | + 'data' => false, //Note: Can slow down the application, because the data can be quite large.. |
|
123 | 123 | ), |
124 | 124 | 'route' => array( |
125 | 125 | 'label' => true // show complete route on bar |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | |
75 | 75 | protected function isInstalled() |
76 | 76 | { |
77 | - return file_exists($this->app->storagePath() . '/app/installed'); |
|
77 | + return file_exists($this->app->storagePath().'/app/installed'); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -95,11 +95,11 @@ discard block |
||
95 | 95 | */ |
96 | 96 | protected function resetProviders() |
97 | 97 | { |
98 | - $this->app['events']->listen('bootstrapped: App\Bootstrappers\LoadConfiguration', function ($app) { |
|
98 | + $this->app['events']->listen('bootstrapped: App\Bootstrappers\LoadConfiguration', function($app) { |
|
99 | 99 | $config = $app['config']; |
100 | 100 | |
101 | 101 | $providers = $config['app.providers']; |
102 | - $providers = array_filter($providers, function ($p) { |
|
102 | + $providers = array_filter($providers, function($p) { |
|
103 | 103 | return substr($p, 0, strlen('Illuminate')) == 'Illuminate'; |
104 | 104 | }); |
105 | 105 |
@@ -8,51 +8,51 @@ discard block |
||
8 | 8 | class Kernel extends ConsoleKernel |
9 | 9 | { |
10 | 10 | |
11 | - /** |
|
12 | - * The bootstrap classes for the application. |
|
13 | - * |
|
14 | - * @var array |
|
15 | - */ |
|
16 | - protected $bootstrappers = [ |
|
17 | - 'Illuminate\Foundation\Bootstrap\DetectEnvironment', |
|
18 | - 'App\Bootstrappers\LoadConfiguration', |
|
19 | - 'Illuminate\Foundation\Bootstrap\ConfigureLogging', |
|
20 | - 'Illuminate\Foundation\Bootstrap\HandleExceptions', |
|
21 | - 'Illuminate\Foundation\Bootstrap\RegisterFacades', |
|
22 | - 'Illuminate\Foundation\Bootstrap\SetRequestForConsole', |
|
23 | - 'Illuminate\Foundation\Bootstrap\RegisterProviders', |
|
24 | - 'Illuminate\Foundation\Bootstrap\BootProviders', |
|
25 | - ]; |
|
26 | - |
|
27 | - /** |
|
28 | - * The Artisan commands provided by your application. |
|
29 | - * |
|
30 | - * @var array |
|
31 | - */ |
|
32 | - protected $commands = [ |
|
33 | - \App\Console\Commands\Inspire::class, |
|
11 | + /** |
|
12 | + * The bootstrap classes for the application. |
|
13 | + * |
|
14 | + * @var array |
|
15 | + */ |
|
16 | + protected $bootstrappers = [ |
|
17 | + 'Illuminate\Foundation\Bootstrap\DetectEnvironment', |
|
18 | + 'App\Bootstrappers\LoadConfiguration', |
|
19 | + 'Illuminate\Foundation\Bootstrap\ConfigureLogging', |
|
20 | + 'Illuminate\Foundation\Bootstrap\HandleExceptions', |
|
21 | + 'Illuminate\Foundation\Bootstrap\RegisterFacades', |
|
22 | + 'Illuminate\Foundation\Bootstrap\SetRequestForConsole', |
|
23 | + 'Illuminate\Foundation\Bootstrap\RegisterProviders', |
|
24 | + 'Illuminate\Foundation\Bootstrap\BootProviders', |
|
25 | + ]; |
|
26 | + |
|
27 | + /** |
|
28 | + * The Artisan commands provided by your application. |
|
29 | + * |
|
30 | + * @var array |
|
31 | + */ |
|
32 | + protected $commands = [ |
|
33 | + \App\Console\Commands\Inspire::class, |
|
34 | 34 | \App\Console\Commands\XeInstall::class, |
35 | - \App\Console\Commands\Trash::class, |
|
36 | - \App\Console\Commands\Schema::class, |
|
37 | - \App\Console\Commands\PutTranslation::class, |
|
38 | - \App\Console\Commands\XeCacheClear::class, |
|
39 | - \App\Console\Commands\StorageOptimize::class, |
|
40 | - \App\Console\Commands\Site::class, |
|
41 | - \App\Console\Commands\PluginMakeCommand::class, |
|
42 | - \App\Console\Commands\PluginInstallCommand::class, |
|
43 | - \App\Console\Commands\ThemeMakeCommand::class, |
|
44 | - ]; |
|
45 | - |
|
46 | - /** |
|
47 | - * Define the application's command schedule. |
|
48 | - * |
|
49 | - * @param \Illuminate\Console\Scheduling\Schedule $schedule |
|
50 | - * @return void |
|
51 | - */ |
|
52 | - protected function schedule(Schedule $schedule) |
|
53 | - { |
|
54 | - $schedule->command('inspire')->hourly(); |
|
55 | - } |
|
35 | + \App\Console\Commands\Trash::class, |
|
36 | + \App\Console\Commands\Schema::class, |
|
37 | + \App\Console\Commands\PutTranslation::class, |
|
38 | + \App\Console\Commands\XeCacheClear::class, |
|
39 | + \App\Console\Commands\StorageOptimize::class, |
|
40 | + \App\Console\Commands\Site::class, |
|
41 | + \App\Console\Commands\PluginMakeCommand::class, |
|
42 | + \App\Console\Commands\PluginInstallCommand::class, |
|
43 | + \App\Console\Commands\ThemeMakeCommand::class, |
|
44 | + ]; |
|
45 | + |
|
46 | + /** |
|
47 | + * Define the application's command schedule. |
|
48 | + * |
|
49 | + * @param \Illuminate\Console\Scheduling\Schedule $schedule |
|
50 | + * @return void |
|
51 | + */ |
|
52 | + protected function schedule(Schedule $schedule) |
|
53 | + { |
|
54 | + $schedule->command('inspire')->hourly(); |
|
55 | + } |
|
56 | 56 | |
57 | 57 | /** |
58 | 58 | * Bootstrap the application for artisan commands. |
@@ -84,18 +84,18 @@ discard block |
||
84 | 84 | * @return void |
85 | 85 | */ |
86 | 86 | protected function resetForFramework() |
87 | - { |
|
88 | - $this->resetProviders(); |
|
89 | - $this->setCommandBeforeInstall(); |
|
90 | - } |
|
87 | + { |
|
88 | + $this->resetProviders(); |
|
89 | + $this->setCommandBeforeInstall(); |
|
90 | + } |
|
91 | 91 | |
92 | 92 | /** |
93 | 93 | * Define for providers of framework. |
94 | 94 | * |
95 | 95 | * @return void |
96 | 96 | */ |
97 | - protected function resetProviders() |
|
98 | - { |
|
97 | + protected function resetProviders() |
|
98 | + { |
|
99 | 99 | $this->app['events']->listen('bootstrapped: App\Bootstrappers\LoadConfiguration', function ($app) { |
100 | 100 | $config = $app['config']; |
101 | 101 | |
@@ -106,20 +106,20 @@ discard block |
||
106 | 106 | |
107 | 107 | $config->set('app.providers', $providers); |
108 | 108 | }); |
109 | - } |
|
109 | + } |
|
110 | 110 | |
111 | 111 | /** |
112 | 112 | * Define commands for previously installation |
113 | 113 | * |
114 | 114 | * @return void |
115 | 115 | */ |
116 | - protected function setCommandBeforeInstall() |
|
117 | - { |
|
118 | - $this->commands = array_intersect($this->commands, [ |
|
116 | + protected function setCommandBeforeInstall() |
|
117 | + { |
|
118 | + $this->commands = array_intersect($this->commands, [ |
|
119 | 119 | \App\Console\Commands\Inspire::class, |
120 | 120 | \App\Console\Commands\XeInstall::class |
121 | 121 | ]); |
122 | - } |
|
122 | + } |
|
123 | 123 | |
124 | 124 | /** |
125 | 125 | * Define commands for after installation |
@@ -126,8 +126,8 @@ |
||
126 | 126 | private function summary($args) |
127 | 127 | { |
128 | 128 | foreach ($this->waste($args) as $basket) { |
129 | - $this->info(' name: ' . $basket::name()); |
|
130 | - $this->info(' summary: ' . $basket::summary()); |
|
129 | + $this->info(' name: '.$basket::name()); |
|
130 | + $this->info(' summary: '.$basket::summary()); |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 |
@@ -106,7 +106,7 @@ |
||
106 | 106 | if (count($cacheNames) === 0) { |
107 | 107 | $this->error('캐시된 테이블이 없습니다. 테이블 이름을 확인하세요.'); |
108 | 108 | } else { |
109 | - $this->info(implode(',', array_unique($cacheNames)) . ' 테이블을 캐시 했습니다.'); |
|
109 | + $this->info(implode(',', array_unique($cacheNames)).' 테이블을 캐시 했습니다.'); |
|
110 | 110 | } |
111 | 111 | } |
112 | 112 |
@@ -51,7 +51,7 @@ |
||
51 | 51 | foreach ($fields as $key => $value) { |
52 | 52 | if ($params = XeLang::parsePreprocessor($key)) { |
53 | 53 | list($kSeq, $seq, $command) = $params; |
54 | - switch ( $command ) { |
|
54 | + switch ($command) { |
|
55 | 55 | case 'name': |
56 | 56 | $this->mapSeqName[$seq] = $value; |
57 | 57 | break; |
@@ -9,7 +9,7 @@ |
||
9 | 9 | { |
10 | 10 | $file = File::find($id); |
11 | 11 | |
12 | - header('Content-type: ' . $file->mime); |
|
12 | + header('Content-type: '.$file->mime); |
|
13 | 13 | |
14 | 14 | echo $file->getContent(); |
15 | 15 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $settingsSection = [ |
96 | 96 | 'settings' => [ |
97 | 97 | 'title' => xe_trans('xe::defaultSettings'), |
98 | - 'content' => function ($user) { |
|
98 | + 'content' => function($user) { |
|
99 | 99 | return $this->userEditView($user); |
100 | 100 | } |
101 | 101 | ] |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | $menus = array_merge($settingsSection, $menus); |
109 | 109 | |
110 | 110 | // get Selected section |
111 | - if(isset($menus[$section]) === false) { |
|
111 | + if (isset($menus[$section]) === false) { |
|
112 | 112 | throw new NotFoundHttpException(); |
113 | 113 | } |
114 | 114 | $selectedSection = $menus[$section]; |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | $message = 'success'; |
207 | 207 | $target = null; |
208 | 208 | |
209 | - if($this->user->getAuthPassword() !== "") { |
|
209 | + if ($this->user->getAuthPassword() !== "") { |
|
210 | 210 | |
211 | 211 | $credentials = [ |
212 | 212 | 'id' => $this->user->getId(), |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | |
225 | 225 | try { |
226 | 226 | $this->handler->validatePassword($password); |
227 | - } catch(Exception $e) { |
|
227 | + } catch (Exception $e) { |
|
228 | 228 | $e = new HttpXpressengineException(); |
229 | 229 | $e->setMessage('비밀번호 보안수준을 만족하지 못했습니다.'); |
230 | 230 | throw $e; |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | } |
369 | 369 | |
370 | 370 | // 이미 존재하는 이메일이 있는지 확인한다. |
371 | - if($this->emails->findByAddress($input['address'])) { |
|
371 | + if ($this->emails->findByAddress($input['address'])) { |
|
372 | 372 | throw new MailAlreadyExistsException(); |
373 | 373 | } |
374 | 374 | |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | $selected = null; |
465 | 465 | |
466 | 466 | $pendingEmail = $this->user->getPendingEmail(); |
467 | - if($pendingEmail !== null && $pendingEmail->getAddress() === $address) { |
|
467 | + if ($pendingEmail !== null && $pendingEmail->getAddress() === $address) { |
|
468 | 468 | $selected = $pendingEmail; |
469 | 469 | } else { |
470 | 470 | foreach ($this->user->emails as $mail) { |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | { |
520 | 520 | $confirm = $request->get('confirm_leave'); |
521 | 521 | |
522 | - if($confirm !== 'Y') { |
|
522 | + if ($confirm !== 'Y') { |
|
523 | 523 | $e = new InvalidArgumentException(); |
524 | 524 | $e->setMessage('약관의 동의가 필요합니다.'); |
525 | 525 | throw $e; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | $type = $request->get('type', 'template'); |
17 | 17 | |
18 | 18 | // TODO: validate themeid, fileName |
19 | - if($themeId === null) { |
|
19 | + if ($themeId === null) { |
|
20 | 20 | $e = new InvalidArgumentHttpException(); |
21 | 21 | $e->setMessage('잘못된 요청입니다.'); |
22 | 22 | throw $e; |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | /** @var ThemeEntity $theme */ |
28 | 28 | $files = $theme->getEditFiles(); |
29 | 29 | |
30 | - if(empty($files)) { |
|
30 | + if (empty($files)) { |
|
31 | 31 | return \XePresenter::make( |
32 | 32 | 'theme.edit', |
33 | 33 | [ |