@@ -271,7 +271,7 @@ |
||
271 | 271 | |
272 | 272 | Route::group( $conf, function() { |
273 | 273 | |
274 | - Route::match(['GET', 'POST'], '{path?}', [ |
|
274 | + Route::match( ['GET', 'POST'], '{path?}', [ |
|
275 | 275 | 'as' => 'aimeos_page', |
276 | 276 | 'uses' => '\Aimeos\Shop\Controller\PageController@indexAction' |
277 | 277 | ] )->where( ['locale' => '[a-z]{2}(\_[A-Z]{2})?', 'site' => '[A-Za-z0-9\.\-]+'] ); |
@@ -257,7 +257,7 @@ |
||
257 | 257 | $context->setI18n( app( 'aimeos.i18n' )->get( array( $lang, 'en' ) ) ); |
258 | 258 | $context->setLocale( app( 'aimeos.locale' )->getBackend( $context, $site ) ); |
259 | 259 | |
260 | - $siteManager = \Aimeos\MShop::create( $context, 'locale/site'); |
|
260 | + $siteManager = \Aimeos\MShop::create( $context, 'locale/site' ); |
|
261 | 261 | $context->config()->apply( $siteManager->find( $site )->getConfig() ); |
262 | 262 | |
263 | 263 | $paths = $aimeos->getTemplatePaths( 'admin/jqadm/templates', $context->locale()->getSiteItem()->getTheme() ); |
@@ -62,25 +62,25 @@ |
||
62 | 62 | 'adapter' => 'Standard', |
63 | 63 | 'tempdir' => storage_path( 'tmp' ), |
64 | 64 | 'basedir' => public_path(), |
65 | - 'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/'), |
|
65 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ), |
|
66 | 66 | ], |
67 | 67 | 'fs-media' => [ |
68 | 68 | 'adapter' => 'Standard', |
69 | 69 | 'tempdir' => storage_path( 'tmp' ), |
70 | 70 | 'basedir' => public_path( 'aimeos' ), |
71 | - 'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/') . '/aimeos', |
|
71 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ) . '/aimeos', |
|
72 | 72 | ], |
73 | 73 | 'fs-mimeicon' => [ |
74 | 74 | 'adapter' => 'Standard', |
75 | 75 | 'tempdir' => storage_path( 'tmp' ), |
76 | 76 | 'basedir' => public_path( 'vendor/shop/mimeicons' ), |
77 | - 'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/') . '/vendor/shop/mimeicons', |
|
77 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ) . '/vendor/shop/mimeicons', |
|
78 | 78 | ], |
79 | 79 | 'fs-theme' => [ |
80 | 80 | 'adapter' => 'Standard', |
81 | 81 | 'tempdir' => storage_path( 'tmp' ), |
82 | 82 | 'basedir' => public_path( 'vendor/shop/themes' ), |
83 | - 'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/') . '/vendor/shop/themes', |
|
83 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ) . '/vendor/shop/themes', |
|
84 | 84 | ], |
85 | 85 | 'fs-admin' => [ |
86 | 86 | 'adapter' => 'Standard', |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | public function deleteAction( ServerRequestInterface $request ) |
34 | 34 | { |
35 | 35 | if( config( 'shop.authorize', true ) ) { |
36 | - $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'])] ); |
|
36 | + $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'] )] ); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | return $this->createAdmin()->delete( $request, ( new Psr17Factory )->createResponse() ); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | public function getAction( ServerRequestInterface $request ) |
50 | 50 | { |
51 | 51 | if( config( 'shop.authorize', true ) ) { |
52 | - $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'])] ); |
|
52 | + $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'] )] ); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | return $this->createAdmin()->get( $request, ( new Psr17Factory )->createResponse() ); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | public function patchAction( ServerRequestInterface $request ) |
66 | 66 | { |
67 | 67 | if( config( 'shop.authorize', true ) ) { |
68 | - $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'])] ); |
|
68 | + $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'] )] ); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | return $this->createAdmin()->patch( $request, ( new Psr17Factory )->createResponse() ); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | public function postAction( ServerRequestInterface $request ) |
82 | 82 | { |
83 | 83 | if( config( 'shop.authorize', true ) ) { |
84 | - $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'])] ); |
|
84 | + $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'] )] ); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | return $this->createAdmin()->post( $request, ( new Psr17Factory )->createResponse() ); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | public function putAction( ServerRequestInterface $request ) |
98 | 98 | { |
99 | 99 | if( config( 'shop.authorize', true ) ) { |
100 | - $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'])] ); |
|
100 | + $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'] )] ); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | return $this->createAdmin()->put( $request, ( new Psr17Factory )->createResponse() ); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | public function optionsAction( ServerRequestInterface $request ) |
114 | 114 | { |
115 | 115 | if( config( 'shop.authorize', true ) ) { |
116 | - $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'])] ); |
|
116 | + $this->authorize( 'admin', [JsonadmController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'] )] ); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | return $this->createAdmin()->options( $request, ( new Psr17Factory )->createResponse() ); |
@@ -32,7 +32,7 @@ |
||
32 | 32 | public function indexAction( ServerRequestInterface $request ) |
33 | 33 | { |
34 | 34 | if( config( 'shop.authorize', true ) ) { |
35 | - $this->authorize( 'admin', [GraphqlController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'])] ); |
|
35 | + $this->authorize( 'admin', [GraphqlController::class, array_merge( config( 'shop.roles', ['admin', 'editor'] ), ['api'] )] ); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | $site = Route::input( 'site', Request::get( 'site', config( 'shop.mshop.locale.site', 'default' ) ) ); |