Completed
Push — master ( 0e4dfd...689d98 )
by Aimeos
02:11
created
src/default.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -10,16 +10,16 @@  discard block
 block discarded – undo
10 10
 	'uploaddir' => '/',
11 11
 
12 12
 	'page' => array(
13
-		'account-index' => array( 'account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session' ),
14
-		'basket-index' => array( 'basket/standard','basket/related' ),
15
-		'catalog-count' => array( 'catalog/count' ),
16
-		'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ),
17
-		'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ),
18
-		'catalog-stock' => array( 'catalog/stock' ),
19
-		'catalog-suggest' => array( 'catalog/suggest' ),
20
-		'checkout-confirm' => array( 'checkout/confirm' ),
21
-		'checkout-index' => array( 'checkout/standard' ),
22
-		'checkout-update' => array( 'checkout/update'),
13
+		'account-index' => array('account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'),
14
+		'basket-index' => array('basket/standard', 'basket/related'),
15
+		'catalog-count' => array('catalog/count'),
16
+		'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'),
17
+		'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'),
18
+		'catalog-stock' => array('catalog/stock'),
19
+		'catalog-suggest' => array('catalog/suggest'),
20
+		'checkout-confirm' => array('checkout/confirm'),
21
+		'checkout-index' => array('checkout/standard'),
22
+		'checkout-update' => array('checkout/update'),
23 23
 	),
24 24
 
25 25
 	'resource' => array(
@@ -37,22 +37,22 @@  discard block
 block discarded – undo
37 37
 		'fs' => array(
38 38
 			'adapter' => 'Standard',
39 39
 			'basedir' => public_path(),
40
-			'tempdir' => storage_path( 'tmp' ),
40
+			'tempdir' => storage_path('tmp'),
41 41
 		),
42 42
 		'fs-admin' => array(
43 43
 			'adapter' => 'Standard',
44
-			'basedir' => storage_path( 'admin' ),
45
-			'tempdir' => storage_path( 'tmp' ),
44
+			'basedir' => storage_path('admin'),
45
+			'tempdir' => storage_path('tmp'),
46 46
 		),
47 47
 		'fs-import' => array(
48 48
 			'adapter' => 'Standard',
49
-			'basedir' => storage_path( 'import' ),
50
-			'tempdir' => storage_path( 'tmp' ),
49
+			'basedir' => storage_path('import'),
50
+			'tempdir' => storage_path('tmp'),
51 51
 		),
52 52
 		'fs-secure' => array(
53 53
 			'adapter' => 'Standard',
54
-			'basedir' => storage_path( 'secure' ),
55
-			'tempdir' => storage_path( 'tmp' ),
54
+			'basedir' => storage_path('secure'),
55
+			'tempdir' => storage_path('tmp'),
56 56
 		),
57 57
 		'mq' => array(
58 58
 			'adapter' => 'Standard',
@@ -169,10 +169,10 @@  discard block
 block discarded – undo
169 169
 			),
170 170
 			'common' => array(
171 171
 				'content' => array(
172
-					'baseurl' => config( 'app.url' ) . '/',
172
+					'baseurl' => config('app.url').'/',
173 173
 				),
174 174
 				'template' => array(
175
-					'baseurl' => public_path( 'packages/aimeos/shop/themes/elegance' ),
175
+					'baseurl' => public_path('packages/aimeos/shop/themes/elegance'),
176 176
 				),
177 177
 			),
178 178
 			'basket' => array(
@@ -219,8 +219,8 @@  discard block
 block discarded – undo
219 219
 				),
220 220
 			),
221 221
 			'email' => [
222
-				'from-email' => config( 'mail.from.address' ),
223
-				'from-name' => config( 'mail.from.name' ),
222
+				'from-email' => config('mail.from.address'),
223
+				'from-name' => config('mail.from.name'),
224 224
 			],
225 225
 			'locale' => array(
226 226
 				'select' => array(
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 						# in the "maxwidth" parameter
298 298
 						# 'maxheight' => 280,
299 299
 					),
300
-					'tempdir' => storage_path( 'aimeos' ),
300
+					'tempdir' => storage_path('aimeos'),
301 301
 				),
302 302
 			),
303 303
 		),
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -36,26 +36,26 @@
 block discarded – undo
36 36
 	 * @param \Illuminate\Http\Request $request Laravel request object
37 37
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
38 38
 	 */
39
-	public function indexAction( Request $request )
39
+	public function indexAction(Request $request)
40 40
 	{
41
-		if( Auth::check() === false
42
-			|| $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) === false
41
+		if (Auth::check() === false
42
+			|| $request->user()->can('admin', [AdminController::class, ['admin', 'editor']]) === false
43 43
 		) {
44
-			return redirect()->guest( 'login' );
44
+			return redirect()->guest('login');
45 45
 		}
46 46
 
47 47
 		$siteId = $request->user()->siteid;
48
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
49
-		$siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
50
-		$siteCode = ( $siteId ? $siteManager->getItem( $siteId )->getCode() : 'default' );
51
-		$locale = $request->user()->langid ?: config( 'app.locale', 'en' );
48
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
49
+		$siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
50
+		$siteCode = ($siteId ? $siteManager->getItem($siteId)->getCode() : 'default');
51
+		$locale = $request->user()->langid ?: config('app.locale', 'en');
52 52
 
53 53
 		$param = array(
54 54
 			'resource' => 'dashboard',
55
-			'site' => Route::input( 'site', Input::get( 'site', $siteCode ) ),
56
-			'lang' => Route::input( 'lang', Input::get( 'lang', $locale ) )
55
+			'site' => Route::input('site', Input::get('site', $siteCode)),
56
+			'lang' => Route::input('lang', Input::get('lang', $locale))
57 57
 		);
58 58
 
59
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
59
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
60 60
 	}
61 61
 }
Please login to merge, or discard this patch.