Completed
Push — master ( c04502...89c576 )
by Aimeos
17:16 queued 17:16
created
src/routes.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-Route::match( array( 'GET' ), 'admin', array(
3
+Route::match(array('GET'), 'admin', array(
4 4
 	'as' => 'aimeos_shop_admin',
5 5
 	'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
6 6
 ));
@@ -8,97 +8,97 @@  discard block
 block discarded – undo
8 8
 
9 9
 Route::group(config('shop.routes.admin', ['middleware' => 'auth', 'prefix' => '{site}']), function() {
10 10
 
11
-	Route::match( array( 'GET' ), 'extadm', array(
11
+	Route::match(array('GET'), 'extadm', array(
12 12
 		'as' => 'aimeos_shop_extadm',
13 13
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@indexAction'
14 14
 	));
15 15
 
16
-	Route::match( array( 'GET' ), 'extadm/file', array(
16
+	Route::match(array('GET'), 'extadm/file', array(
17 17
 		'as' => 'aimeos_shop_extadm_file',
18 18
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@fileAction'
19 19
 	));
20 20
 
21
-	Route::match( array( 'POST' ), 'extadm/do', array(
21
+	Route::match(array('POST'), 'extadm/do', array(
22 22
 		'as' => 'aimeos_shop_extadm_json',
23 23
 		'uses' => 'Aimeos\Shop\Controller\ExtadmController@doAction'
24 24
 	));
25 25
 
26 26
 
27
-	Route::match( array( 'GET', 'POST' ), 'jqadm/copy/{resource}/{id}', array(
27
+	Route::match(array('GET', 'POST'), 'jqadm/copy/{resource}/{id}', array(
28 28
 		'as' => 'aimeos_shop_jqadm_copy',
29 29
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction'
30
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
30
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
31 31
 
32
-	Route::match( array( 'GET', 'POST' ), 'jqadm/create/{resource}', array(
32
+	Route::match(array('GET', 'POST'), 'jqadm/create/{resource}', array(
33 33
 		'as' => 'aimeos_shop_jqadm_create',
34 34
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction'
35
-	))->where( array( 'resource' => '[^0-9]+' ) );
35
+	))->where(array('resource' => '[^0-9]+'));
36 36
 
37
-	Route::match( array( 'GET', 'POST' ), 'jqadm/delete/{resource}/{id}', array(
37
+	Route::match(array('GET', 'POST'), 'jqadm/delete/{resource}/{id}', array(
38 38
 		'as' => 'aimeos_shop_jqadm_delete',
39 39
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction'
40
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
40
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
41 41
 
42
-	Route::match( array( 'GET' ), 'jqadm/get/{resource}/{id}', array(
42
+	Route::match(array('GET'), 'jqadm/get/{resource}/{id}', array(
43 43
 		'as' => 'aimeos_shop_jqadm_get',
44 44
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction'
45
-	))->where( array( 'resource' => '[^0-9]*', 'id' => '[0-9]*' ) );
45
+	))->where(array('resource' => '[^0-9]*', 'id' => '[0-9]*'));
46 46
 
47
-	Route::match( array( 'POST' ), 'jqadm/save/{resource}/{id?}', array(
47
+	Route::match(array('POST'), 'jqadm/save/{resource}/{id?}', array(
48 48
 		'as' => 'aimeos_shop_jqadm_save',
49 49
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction'
50
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
50
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
51 51
 
52
-	Route::match( array( 'GET', 'POST' ), 'jqadm/search/{resource}', array(
52
+	Route::match(array('GET', 'POST'), 'jqadm/search/{resource}', array(
53 53
 		'as' => 'aimeos_shop_jqadm_search',
54 54
 		'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction'
55
-	))->where( array( 'resource' => '[^0-9]+' ) );
55
+	))->where(array('resource' => '[^0-9]+'));
56 56
 
57 57
 
58
-	Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array(
58
+	Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array(
59 59
 		'as' => 'aimeos_shop_jsonadm_delete',
60 60
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction'
61
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
61
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
62 62
 
63
-	Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array(
63
+	Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array(
64 64
 		'as' => 'aimeos_shop_jsonadm_get',
65 65
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction'
66
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
66
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
67 67
 
68
-	Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array(
68
+	Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array(
69 69
 		'as' => 'aimeos_shop_jsonadm_patch',
70 70
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction'
71
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
71
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
72 72
 
73
-	Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array(
73
+	Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array(
74 74
 		'as' => 'aimeos_shop_jsonadm_post',
75 75
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction'
76
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
76
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
77 77
 
78
-	Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array(
78
+	Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array(
79 79
 		'as' => 'aimeos_shop_jsonadm_put',
80 80
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction'
81
-	))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) );
81
+	))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'));
82 82
 
83
-	Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array(
83
+	Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array(
84 84
 		'as' => 'aimeos_shop_jsonadm_options',
85 85
 		'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction'
86
-	))->where( array( 'resource' => '[^0-9]*' ) );
86
+	))->where(array('resource' => '[^0-9]*'));
87 87
 
88 88
 });
89 89
 
90 90
 
91 91
 Route::group(config('shop.routes.account', ['middleware' => 'auth']), function() {
92 92
 
93
-	Route::match( array( 'GET', 'POST' ), 'myaccount', array(
93
+	Route::match(array('GET', 'POST'), 'myaccount', array(
94 94
 		'as' => 'aimeos_shop_account',
95 95
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
96 96
 	));
97
-	Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
97
+	Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
98 98
 		'as' => 'aimeos_shop_account_favorite',
99 99
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
100 100
 	));
101
-	Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
101
+	Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
102 102
 		'as' => 'aimeos_shop_account_watch',
103 103
 		'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction'
104 104
 	));
@@ -108,45 +108,45 @@  discard block
 block discarded – undo
108 108
 
109 109
 Route::group(config('shop.routes.default', []), function() {
110 110
 
111
-	Route::match( array( 'GET', 'POST' ), 'basket', array(
111
+	Route::match(array('GET', 'POST'), 'basket', array(
112 112
 		'as' => 'aimeos_shop_basket',
113 113
 		'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction'
114 114
 	));
115 115
 
116
-	Route::match( array( 'GET', 'POST' ), 'count', array(
116
+	Route::match(array('GET', 'POST'), 'count', array(
117 117
 		'as' => 'aimeos_shop_count',
118 118
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction'
119 119
 	));
120
-	Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
120
+	Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array(
121 121
 		'as' => 'aimeos_shop_detail',
122 122
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
123 123
 	));
124
-	Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
124
+	Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array(
125 125
 		'as' => 'aimeos_shop_session_pinned',
126 126
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction'
127 127
 	));
128
-	Route::match( array( 'GET', 'POST' ), 'list', array(
128
+	Route::match(array('GET', 'POST'), 'list', array(
129 129
 		'as' => 'aimeos_shop_list',
130 130
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction'
131 131
 	));
132
-	Route::match( array( 'GET', 'POST' ), 'suggest', array(
132
+	Route::match(array('GET', 'POST'), 'suggest', array(
133 133
 		'as' => 'aimeos_shop_suggest',
134 134
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction'
135 135
 	));
136
-	Route::match( array( 'GET', 'POST' ), 'stock', array(
136
+	Route::match(array('GET', 'POST'), 'stock', array(
137 137
 		'as' => 'aimeos_shop_stock',
138 138
 		'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction'
139 139
 	));
140 140
 
141
-	Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array(
141
+	Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array(
142 142
 		'as' => 'aimeos_shop_checkout',
143 143
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction'
144 144
 	));
145
-	Route::match( array( 'GET', 'POST' ), 'confirm', array(
145
+	Route::match(array('GET', 'POST'), 'confirm', array(
146 146
 		'as' => 'aimeos_shop_confirm',
147 147
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction'
148 148
 	));
149
-	Route::match( array( 'GET', 'POST' ), 'update', array(
149
+	Route::match(array('GET', 'POST'), 'update', array(
150 150
 		'as' => 'aimeos_shop_update',
151 151
 		'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction'
152 152
 	));
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -36,19 +36,19 @@  discard block
 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( config( 'shop.authorize', true ) && !( Auth::check() && $request->user()->can( 'admin' ) ) ) {
42
-			return View::make( 'shop::admin.index' );
41
+		if (config('shop.authorize', true) && !(Auth::check() && $request->user()->can('admin'))) {
42
+			return View::make('shop::admin.index');
43 43
 		}
44 44
 
45 45
 		$param = array(
46 46
 			'resource' => 'product',
47
-			'site' => Route::input( 'site', 'default' ),
48
-			'lang' => Input::get( 'lang', config( 'app.locale', 'en' ) ),
47
+			'site' => Route::input('site', 'default'),
48
+			'lang' => Input::get('lang', config('app.locale', 'en')),
49 49
 		);
50 50
 
51
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
51
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
52 52
 	}
53 53
 
54 54
 
@@ -59,12 +59,12 @@  discard block
 block discarded – undo
59 59
 	 */
60 60
 	protected function getVersion()
61 61
 	{
62
-		if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
63
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
62
+		if (($content = @file_get_contents(base_path('composer.lock'))) !== false
63
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
64 64
 		) {
65
-			foreach( (array) $content['packages'] as $item )
65
+			foreach ((array) $content['packages'] as $item)
66 66
 			{
67
-				if( $item['name'] === 'aimeos/aimeos-laravel' ) {
67
+				if ($item['name'] === 'aimeos/aimeos-laravel') {
68 68
 					return $item['version'];
69 69
 				}
70 70
 			}
@@ -82,23 +82,23 @@  discard block
 block discarded – undo
82 82
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
83 83
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
84 84
 	 */
85
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $lang = null )
85
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $lang = null)
86 86
 	{
87
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
87
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
88 88
 
89 89
 		try
90 90
 		{
91
-			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
92
-			$localeItem->setLanguageId( null );
93
-			$localeItem->setCurrencyId( null );
91
+			$localeItem = $localeManager->bootstrap($sitecode, '', '', false);
92
+			$localeItem->setLanguageId(null);
93
+			$localeItem->setCurrencyId(null);
94 94
 		}
95
-		catch( \Aimeos\MShop\Locale\Exception $e )
95
+		catch (\Aimeos\MShop\Locale\Exception $e)
96 96
 		{
97 97
 			$localeItem = $localeManager->createItem();
98 98
 		}
99 99
 
100
-		$context->setLocale( $localeItem );
101
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang ) ) );
100
+		$context->setLocale($localeItem);
101
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang)));
102 102
 
103 103
 		return $context;
104 104
 	}
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/ExtadmController.php 1 patch
Spacing   +82 added lines, -82 removed lines patch added patch discarded remove patch
@@ -34,56 +34,56 @@  discard block
 block discarded – undo
34 34
 	 * @param \Illuminate\Http\Request $request Laravel request object
35 35
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
36 36
 	 */
37
-	public function indexAction( Request $request )
37
+	public function indexAction(Request $request)
38 38
 	{
39
-		if( config( 'shop.authorize', true ) ) {
40
-			$this->authorize( 'admin' );
39
+		if (config('shop.authorize', true)) {
40
+			$this->authorize('admin');
41 41
 		}
42 42
 
43
-		$site = Route::input( 'site', 'default' );
44
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
43
+		$site = Route::input('site', 'default');
44
+		$lang = Input::get('lang', config('app.locale', 'en'));
45 45
 
46
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
47
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
46
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
47
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
48 48
 
49
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
50
-		$context = $this->setLocale( $context, $site, $lang );
49
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
50
+		$context = $this->setLocale($context, $site, $lang);
51 51
 
52
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
52
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
53 53
 		$cssFiles = array();
54 54
 
55
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
55
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
56 56
 		{
57
-			foreach( $paths as $path )
57
+			foreach ($paths as $path)
58 58
 			{
59 59
 				$jsbAbsPath = $base . '/' . $path;
60 60
 
61
-				if( !is_file( $jsbAbsPath ) ) {
62
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
61
+				if (!is_file($jsbAbsPath)) {
62
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
63 63
 				}
64 64
 
65
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
66
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
65
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
66
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
67 67
 			}
68 68
 		}
69 69
 
70
-		$jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
71
-		$jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );
72
-		$adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
70
+		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
71
+		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token()));
72
+		$adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
73 73
 
74 74
 		$vars = array(
75 75
 			'lang' => $lang,
76 76
 			'cssFiles' => $cssFiles,
77
-			'languages' => $this->getJsonLanguages( $context),
78
-			'config' => $this->getJsonClientConfig( $context ),
79
-			'site' => $this->getJsonSiteItem( $context, $site ),
80
-			'i18nContent' => $this->getJsonClientI18n( $aimeos->getI18nPaths(), $lang ),
77
+			'languages' => $this->getJsonLanguages($context),
78
+			'config' => $this->getJsonClientConfig($context),
79
+			'site' => $this->getJsonSiteItem($context, $site),
80
+			'i18nContent' => $this->getJsonClientI18n($aimeos->getI18nPaths(), $lang),
81 81
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
82 82
 			'itemSchemas' => $controller->getJsonItemSchemas(),
83
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
84
-			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
85
-			'uploaddir' => config( 'shop::uploaddir' ),
86
-			'activeTab' => Input::get( 'tab', 0 ),
83
+			'smd' => $controller->getJsonSmd($jsonUrl),
84
+			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
85
+			'uploaddir' => config('shop::uploaddir'),
86
+			'activeTab' => Input::get('tab', 0),
87 87
 			'version' => $this->getVersion(),
88 88
 			'jqadmurl' => $jqadmUrl,
89 89
 		);
@@ -99,20 +99,20 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	public function doAction()
101 101
 	{
102
-		if( config( 'shop.authorize', true ) ) {
103
-			$this->authorize( 'admin' );
102
+		if (config('shop.authorize', true)) {
103
+			$this->authorize('admin');
104 104
 		}
105 105
 
106
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
107
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
106
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
107
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
108 108
 
109
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
110
-		$context = $this->setLocale( $context );
109
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
110
+		$context = $this->setLocale($context);
111 111
 
112
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
112
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
113 113
 
114
-		$response = $controller->process( Input::instance()->request->all(), 'php://input' );
115
-		return View::make('shop::admin.extadm-do', array( 'output' => $response ));
114
+		$response = $controller->process(Input::instance()->request->all(), 'php://input');
115
+		return View::make('shop::admin.extadm-do', array('output' => $response));
116 116
 	}
117 117
 
118 118
 
@@ -123,32 +123,32 @@  discard block
 block discarded – undo
123 123
 	 */
124 124
 	public function fileAction()
125 125
 	{
126
-		if( config( 'shop.authorize', true ) ) {
127
-			$this->authorize( 'admin' );
126
+		if (config('shop.authorize', true)) {
127
+			$this->authorize('admin');
128 128
 		}
129 129
 
130 130
 		$contents = '';
131 131
 		$jsFiles = array();
132
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
132
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
133 133
 
134
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
134
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
135 135
 		{
136
-			foreach( $paths as $path )
136
+			foreach ($paths as $path)
137 137
 			{
138 138
 				$jsbAbsPath = $base . '/' . $path;
139
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
140
-				$jsFiles = array_merge( $jsFiles, $jsb2->getUrls( 'js', '' ) );
139
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
140
+				$jsFiles = array_merge($jsFiles, $jsb2->getUrls('js', ''));
141 141
 			}
142 142
 		}
143 143
 
144
-		foreach( $jsFiles as $file )
144
+		foreach ($jsFiles as $file)
145 145
 		{
146
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
146
+			if (($content = file_get_contents($file)) !== false) {
147 147
 				$contents .= $content;
148 148
 			}
149 149
 		}
150 150
 
151
-		return response( $contents )->header( 'Content-Type', 'application/javascript' );
151
+		return response($contents)->header('Content-Type', 'application/javascript');
152 152
 	}
153 153
 
154 154
 
@@ -158,30 +158,30 @@  discard block
 block discarded – undo
158 158
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
159 159
 	 * @return array List of language IDs with labels
160 160
 	 */
161
-	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
161
+	protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
162 162
 	{
163
-		$paths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nPaths();
163
+		$paths = app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nPaths();
164 164
 		$langs = array();
165 165
 
166
-		if( !isset( $paths['admin'] ) ) {
167
-			return json_encode( array() );
166
+		if (!isset($paths['admin'])) {
167
+			return json_encode(array());
168 168
 		}
169 169
 
170
-		foreach( $paths['admin'] as $path )
170
+		foreach ($paths['admin'] as $path)
171 171
 		{
172
-			$iter = new \DirectoryIterator( $path );
172
+			$iter = new \DirectoryIterator($path);
173 173
 
174
-			foreach( $iter as $file )
174
+			foreach ($iter as $file)
175 175
 			{
176 176
 				$name = $file->getFilename();
177 177
 
178
-				if( preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name ) ) {
178
+				if (preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name)) {
179 179
 					$langs[$name] = null;
180 180
 				}
181 181
 			}
182 182
 		}
183 183
 
184
-		return json_encode( $this->getLanguages( $context, array_keys( $langs ) ) );
184
+		return json_encode($this->getLanguages($context, array_keys($langs)));
185 185
 	}
186 186
 
187 187
 
@@ -191,10 +191,10 @@  discard block
 block discarded – undo
191 191
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
192 192
 	 * @return string JSON encoded configuration object
193 193
 	 */
194
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
194
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
195 195
 	{
196
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
197
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
196
+		$config = $context->getConfig()->get('admin/extjs', array());
197
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
198 198
 	}
199 199
 
200 200
 
@@ -205,16 +205,16 @@  discard block
 block discarded – undo
205 205
 	 * @param string $lang ISO language code like "en" or "en_GB"
206 206
 	 * @return string JSON encoded translation object
207 207
 	 */
208
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
208
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
209 209
 	{
210
-		$i18n = new \Aimeos\MW\Translation\Zend2( $i18nPaths, 'gettext', $lang, array( 'disableNotices' => true ) );
210
+		$i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $lang, array('disableNotices' => true));
211 211
 
212 212
 		$content = array(
213
-			'admin' => $i18n->getAll( 'admin' ),
214
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
213
+			'admin' => $i18n->getAll('admin'),
214
+			'admin/ext' => $i18n->getAll('admin/ext'),
215 215
 		);
216 216
 
217
-		return json_encode( $content, JSON_FORCE_OBJECT );
217
+		return json_encode($content, JSON_FORCE_OBJECT);
218 218
 	}
219 219
 
220 220
 
@@ -226,19 +226,19 @@  discard block
 block discarded – undo
226 226
 	 * @return string JSON encoded site item object
227 227
 	 * @throws Exception If no site item was found for the code
228 228
 	 */
229
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
229
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
230 230
 	{
231
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
231
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
232 232
 
233 233
 		$criteria = $manager->createSearch();
234
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
235
-		$items = $manager->searchItems( $criteria );
234
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
235
+		$items = $manager->searchItems($criteria);
236 236
 
237
-		if( ( $item = reset( $items ) ) === false ) {
238
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
237
+		if (($item = reset($items)) === false) {
238
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
239 239
 		}
240 240
 
241
-		return json_encode( $item->toArray() );
241
+		return json_encode($item->toArray());
242 242
 	}
243 243
 
244 244
 
@@ -249,18 +249,18 @@  discard block
 block discarded – undo
249 249
 	 * @param array $langIds List of language IDs
250 250
 	 * @return array List of associative lists with "id" and "label" as keys
251 251
 	 */
252
-	protected function getLanguages( \Aimeos\MShop\Context\Item\Iface $context, array $langIds )
252
+	protected function getLanguages(\Aimeos\MShop\Context\Item\Iface $context, array $langIds)
253 253
 	{
254
-		$languageManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/language' );
254
+		$languageManager = \Aimeos\MShop\Factory::createManager($context, 'locale/language');
255 255
 		$result = array();
256 256
 
257 257
 		$search = $languageManager->createSearch();
258
-		$search->setConditions( $search->compare('==', 'locale.language.id', $langIds ) );
259
-		$search->setSortations( array( $search->sort( '-', 'locale.language.status' ), $search->sort( '+', 'locale.language.label' ) ) );
260
-		$langItems = $languageManager->searchItems( $search );
258
+		$search->setConditions($search->compare('==', 'locale.language.id', $langIds));
259
+		$search->setSortations(array($search->sort('-', 'locale.language.status'), $search->sort('+', 'locale.language.label')));
260
+		$langItems = $languageManager->searchItems($search);
261 261
 
262
-		foreach( $langItems as $id => $item ) {
263
-			$result[] = array( 'id' => $id, 'label' => $item->getLabel() );
262
+		foreach ($langItems as $id => $item) {
263
+			$result[] = array('id' => $id, 'label' => $item->getLabel());
264 264
 		}
265 265
 
266 266
 		return $result;
@@ -275,17 +275,17 @@  discard block
 block discarded – undo
275 275
 	 * @param string $locale ISO language code, e.g. "en" or "en_GB"
276 276
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
277 277
 	 */
278
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null )
278
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
279 279
 	{
280
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
280
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
281 281
 
282 282
 		try {
283
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
284
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
283
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
284
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
285 285
 			$localeItem = $localeManager->createItem();
286 286
 		}
287 287
 
288
-		$context->setLocale( $localeItem );
288
+		$context->setLocale($localeItem);
289 289
 
290 290
 		return $context;
291 291
 	}
Please login to merge, or discard this patch.