Completed
Push — master ( 4f506c...6daf04 )
by Aimeos
02:12
created
src/Aimeos/Shop/Controller/JqadmController.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -34,38 +34,38 @@  discard block
 block discarded – undo
34 34
 	 */
35 35
 	public function fileAction()
36 36
 	{
37
-		if( config( 'shop.authorize', true ) ) {
38
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
37
+		if (config('shop.authorize', true)) {
38
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
39 39
 		}
40 40
 
41 41
 		$contents = '';
42 42
 		$files = array();
43
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
44
-		$type = Route::input( 'type', Input::get( 'type', 'js' ) );
43
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
44
+		$type = Route::input('type', Input::get('type', 'js'));
45 45
 
46
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
46
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
47 47
 		{
48
-			foreach( $paths as $path )
48
+			foreach ($paths as $path)
49 49
 			{
50
-				$jsbAbsPath = $base . '/' . $path;
51
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
52
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
50
+				$jsbAbsPath = $base.'/'.$path;
51
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
52
+				$files = array_merge($files, $jsb2->getFiles($type));
53 53
 			}
54 54
 		}
55 55
 
56
-		foreach( $files as $file )
56
+		foreach ($files as $file)
57 57
 		{
58
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
58
+			if (($content = file_get_contents($file)) !== false) {
59 59
 				$contents .= $content;
60 60
 			}
61 61
 		}
62 62
 
63
-		$response = response( $contents );
63
+		$response = response($contents);
64 64
 
65
-		if( $type === 'js' ) {
66
-			$response->header( 'Content-Type', 'application/javascript' );
67
-		} elseif( $type === 'css' ) {
68
-			$response->header( 'Content-Type', 'text/css' );
65
+		if ($type === 'js') {
66
+			$response->header('Content-Type', 'application/javascript');
67
+		} elseif ($type === 'css') {
68
+			$response->header('Content-Type', 'text/css');
69 69
 		}
70 70
 
71 71
 		return $response;
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function copyAction()
81 81
 	{
82
-		if( config( 'shop.authorize', true ) ) {
83
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
82
+		if (config('shop.authorize', true)) {
83
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
84 84
 		}
85 85
 
86 86
 		$cntl = $this->createClient();
87
-		return $this->getHtml( $cntl->copy() );
87
+		return $this->getHtml($cntl->copy());
88 88
 	}
89 89
 
90 90
 
@@ -95,12 +95,12 @@  discard block
 block discarded – undo
95 95
 	 */
96 96
 	public function createAction()
97 97
 	{
98
-		if( config( 'shop.authorize', true ) ) {
99
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
98
+		if (config('shop.authorize', true)) {
99
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
100 100
 		}
101 101
 
102 102
 		$cntl = $this->createClient();
103
-		return $this->getHtml( $cntl->create() );
103
+		return $this->getHtml($cntl->create());
104 104
 	}
105 105
 
106 106
 
@@ -111,12 +111,12 @@  discard block
 block discarded – undo
111 111
 	 */
112 112
 	public function deleteAction()
113 113
 	{
114
-		if( config( 'shop.authorize', true ) ) {
115
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
114
+		if (config('shop.authorize', true)) {
115
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
116 116
 		}
117 117
 
118 118
 		$cntl = $this->createClient();
119
-		return $this->getHtml( $cntl->delete() . $cntl->search() );
119
+		return $this->getHtml($cntl->delete().$cntl->search());
120 120
 	}
121 121
 
122 122
 
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function getAction()
129 129
 	{
130
-		if( config( 'shop.authorize', true ) ) {
131
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
130
+		if (config('shop.authorize', true)) {
131
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
132 132
 		}
133 133
 
134 134
 		$cntl = $this->createClient();
135
-		return $this->getHtml( $cntl->get() );
135
+		return $this->getHtml($cntl->get());
136 136
 	}
137 137
 
138 138
 
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
 	 */
144 144
 	public function saveAction()
145 145
 	{
146
-		if( config( 'shop.authorize', true ) ) {
147
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
146
+		if (config('shop.authorize', true)) {
147
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
148 148
 		}
149 149
 
150 150
 		$cntl = $this->createClient();
151
-		return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );
151
+		return $this->getHtml(($cntl->save() ?: $cntl->search()));
152 152
 	}
153 153
 
154 154
 
@@ -159,12 +159,12 @@  discard block
 block discarded – undo
159 159
 	 */
160 160
 	public function searchAction()
161 161
 	{
162
-		if( config( 'shop.authorize', true ) ) {
163
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
162
+		if (config('shop.authorize', true)) {
163
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
164 164
 		}
165 165
 
166 166
 		$cntl = $this->createClient();
167
-		return $this->getHtml( $cntl->search() );
167
+		return $this->getHtml($cntl->search());
168 168
 	}
169 169
 
170 170
 
@@ -175,19 +175,19 @@  discard block
 block discarded – undo
175 175
 	 */
176 176
 	protected function createClient()
177 177
 	{
178
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
179
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
180
-		$resource = Route::input( 'resource' );
178
+		$site = Route::input('site', Input::get('site', 'default'));
179
+		$lang = Input::get('lang', config('app.locale', 'en'));
180
+		$resource = Route::input('resource');
181 181
 
182
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
183
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
182
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
183
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
184 184
 
185
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
186
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
187
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
188
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
185
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
186
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
187
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
188
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
189 189
 
190
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
190
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
191 191
 	}
192 192
 
193 193
 
@@ -197,12 +197,12 @@  discard block
 block discarded – undo
197 197
 	 * @param string $content Content from admin client
198 198
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
199 199
 	 */
200
-	protected function getHtml( $content )
200
+	protected function getHtml($content)
201 201
 	{
202
-		$version = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion();
203
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
204
-		$content = str_replace( ['{type}', '{version}'], ['Laravel', $version], $content );
202
+		$version = app('\Aimeos\Shop\Base\Aimeos')->getVersion();
203
+		$site = Route::input('site', Input::get('site', 'default'));
204
+		$content = str_replace(['{type}', '{version}'], ['Laravel', $version], $content);
205 205
 
206
-		return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) );
206
+		return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site));
207 207
 	}
208 208
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/ExtadmController.php 1 patch
Spacing   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -34,65 +34,65 @@  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', [ExtadmController::class, ['admin']] );
39
+		if (config('shop.authorize', true)) {
40
+			$this->authorize('admin', [ExtadmController::class, ['admin']]);
41 41
 		}
42 42
 
43
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
44
-		$lang = Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) );
45
-		$tab = Route::input( 'tab', Input::get( 'tab', 0 ) );
43
+		$site = Route::input('site', Input::get('site', 'default'));
44
+		$lang = Route::input('lang', Input::get('lang', config('app.locale', 'en')));
45
+		$tab = Route::input('tab', Input::get('tab', 0));
46 46
 
47
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
47
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos');
48 48
 
49 49
 		$bootstrap = $aimeos->get();
50
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
50
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
51 51
 
52
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
53
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
52
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
53
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
54 54
 
55
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
55
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
56 56
 		$cssFiles = array();
57 57
 
58
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
58
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
59 59
 		{
60
-			foreach( $paths as $path )
60
+			foreach ($paths as $path)
61 61
 			{
62
-				$jsbAbsPath = $base . '/' . $path;
62
+				$jsbAbsPath = $base.'/'.$path;
63 63
 
64
-				if( !is_file( $jsbAbsPath ) ) {
65
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
64
+				if (!is_file($jsbAbsPath)) {
65
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
66 66
 				}
67 67
 
68
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
69
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
68
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
69
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
70 70
 			}
71 71
 		}
72 72
 
73
-		$jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
74
-		$jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );
75
-		$adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
73
+		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
74
+		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token()));
75
+		$adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
76 76
 
77 77
 		$vars = array(
78 78
 			'site' => $site,
79 79
 			'lang' => $lang,
80 80
 			'cssFiles' => $cssFiles,
81
-			'languages' => $this->getJsonLanguages( $context),
82
-			'config' => $this->getJsonClientConfig( $context ),
83
-			'siteitem' => $this->getJsonSiteItem( $context, $site ),
84
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
81
+			'languages' => $this->getJsonLanguages($context),
82
+			'config' => $this->getJsonClientConfig($context),
83
+			'siteitem' => $this->getJsonSiteItem($context, $site),
84
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
85 85
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
86 86
 			'itemSchemas' => $controller->getJsonItemSchemas(),
87
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
88
-			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
89
-			'uploaddir' => config( 'shop::uploaddir' ),
87
+			'smd' => $controller->getJsonSmd($jsonUrl),
88
+			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
89
+			'uploaddir' => config('shop::uploaddir'),
90 90
 			'version' => $aimeos->getVersion(),
91 91
 			'jqadmurl' => $jqadmUrl,
92 92
 			'activeTab' => $tab,
93 93
 		);
94 94
 
95
-		return View::make( 'shop::extadm.index', $vars );
95
+		return View::make('shop::extadm.index', $vars);
96 96
 	}
97 97
 
98 98
 
@@ -102,25 +102,25 @@  discard block
 block discarded – undo
102 102
 	 * @param \Illuminate\Http\Request $request Laravel request object
103 103
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
104 104
 	 */
105
-	public function doAction( Request $request )
105
+	public function doAction(Request $request)
106 106
 	{
107
-		if( config( 'shop.authorize', true ) ) {
108
-			$this->authorize( 'admin', [ExtadmController::class, ['admin']] );
107
+		if (config('shop.authorize', true)) {
108
+			$this->authorize('admin', [ExtadmController::class, ['admin']]);
109 109
 		}
110 110
 
111
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
111
+		$site = Route::input('site', Input::get('site', 'default'));
112 112
 
113
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
114
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
113
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
114
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
115 115
 
116
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
117
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, array() ) );
118
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
116
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
117
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, array()));
118
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
119 119
 
120
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
120
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
121 121
 
122
-		$response = $controller->process( Input::instance()->request->all(), $request->getContent() );
123
-		return View::make( 'shop::extadm.do', array( 'output' => $response ) );
122
+		$response = $controller->process(Input::instance()->request->all(), $request->getContent());
123
+		return View::make('shop::extadm.do', array('output' => $response));
124 124
 	}
125 125
 
126 126
 
@@ -131,32 +131,32 @@  discard block
 block discarded – undo
131 131
 	 */
132 132
 	public function fileAction()
133 133
 	{
134
-		if( config( 'shop.authorize', true ) ) {
135
-			$this->authorize( 'admin', [ExtadmController::class, ['admin']] );
134
+		if (config('shop.authorize', true)) {
135
+			$this->authorize('admin', [ExtadmController::class, ['admin']]);
136 136
 		}
137 137
 
138 138
 		$contents = '';
139 139
 		$jsFiles = array();
140
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
140
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
141 141
 
142
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
142
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
143 143
 		{
144
-			foreach( $paths as $path )
144
+			foreach ($paths as $path)
145 145
 			{
146
-				$jsbAbsPath = $base . '/' . $path;
147
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
148
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
146
+				$jsbAbsPath = $base.'/'.$path;
147
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
148
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
149 149
 			}
150 150
 		}
151 151
 
152
-		foreach( $jsFiles as $file )
152
+		foreach ($jsFiles as $file)
153 153
 		{
154
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
154
+			if (($content = file_get_contents($file)) !== false) {
155 155
 				$contents .= $content;
156 156
 			}
157 157
 		}
158 158
 
159
-		return response( $contents )->header( 'Content-Type', 'application/javascript' );
159
+		return response($contents)->header('Content-Type', 'application/javascript');
160 160
 	}
161 161
 
162 162
 
@@ -166,15 +166,15 @@  discard block
 block discarded – undo
166 166
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
167 167
 	 * @return array List of language IDs with labels
168 168
 	 */
169
-	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
169
+	protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
170 170
 	{
171 171
 		$result = array();
172 172
 
173
-		foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
174
-			$result[] = array( 'id' => $id, 'label' => $id );
173
+		foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) {
174
+			$result[] = array('id' => $id, 'label' => $id);
175 175
 		}
176 176
 
177
-		return json_encode( $result );
177
+		return json_encode($result);
178 178
 	}
179 179
 
180 180
 
@@ -184,10 +184,10 @@  discard block
 block discarded – undo
184 184
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
185 185
 	 * @return string JSON encoded configuration object
186 186
 	 */
187
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
187
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
188 188
 	{
189
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
190
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
189
+		$config = $context->getConfig()->get('admin/extjs', array());
190
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
191 191
 	}
192 192
 
193 193
 
@@ -198,16 +198,16 @@  discard block
 block discarded – undo
198 198
 	 * @param string $lang ISO language code like "en" or "en_GB"
199 199
 	 * @return string JSON encoded translation object
200 200
 	 */
201
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
201
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
202 202
 	{
203
-		$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang );
203
+		$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
204 204
 
205 205
 		$content = array(
206
-			'admin' => $i18n->getAll( 'admin' ),
207
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
206
+			'admin' => $i18n->getAll('admin'),
207
+			'admin/ext' => $i18n->getAll('admin/ext'),
208 208
 		);
209 209
 
210
-		return json_encode( $content, JSON_FORCE_OBJECT );
210
+		return json_encode($content, JSON_FORCE_OBJECT);
211 211
 	}
212 212
 
213 213
 
@@ -219,18 +219,18 @@  discard block
 block discarded – undo
219 219
 	 * @return string JSON encoded site item object
220 220
 	 * @throws Exception If no site item was found for the code
221 221
 	 */
222
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
222
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
223 223
 	{
224
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
224
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
225 225
 
226 226
 		$criteria = $manager->createSearch();
227
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
228
-		$items = $manager->searchItems( $criteria );
227
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
228
+		$items = $manager->searchItems($criteria);
229 229
 
230
-		if( ( $item = reset( $items ) ) === false ) {
231
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
230
+		if (($item = reset($items)) === false) {
231
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
232 232
 		}
233 233
 
234
-		return json_encode( $item->toArray() );
234
+		return json_encode($item->toArray());
235 235
 	}
236 236
 }
237 237
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -36,20 +36,20 @@
 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() === false
42
-			|| $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) ) === false
41
+		if (config('shop.authorize', true) && (Auth::check() === false
42
+			|| $request->user()->can('admin', [AdminController::class, ['admin', 'editor']])) === false
43 43
 		) {
44
-			return View::make( 'shop::admin.index' );
44
+			return View::make('shop::admin.index');
45 45
 		}
46 46
 
47 47
 		$param = array(
48 48
 			'resource' => 'dashboard',
49
-			'site' => Route::input( 'site', Input::get( 'site', 'default' ) ),
50
-			'lang' => Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) )
49
+			'site' => Route::input('site', Input::get('site', 'default')),
50
+			'lang' => Route::input('lang', Input::get('lang', config('app.locale', 'en')))
51 51
 		);
52 52
 
53
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
53
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
54 54
 	}
55 55
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/JsonadmController.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -36,13 +36,13 @@  discard block
 block discarded – undo
36 36
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
37 37
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
38 38
 	 */
39
-	public function deleteAction( ServerRequestInterface $request )
39
+	public function deleteAction(ServerRequestInterface $request)
40 40
 	{
41
-		if( config( 'shop.authorize', true ) ) {
42
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
41
+		if (config('shop.authorize', true)) {
42
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
43 43
 		}
44 44
 
45
-		return $this->createClient()->delete( $request, new Response() );
45
+		return $this->createClient()->delete($request, new Response());
46 46
 	}
47 47
 
48 48
 
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
53 53
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
54 54
 	 */
55
-	public function getAction( ServerRequestInterface $request )
55
+	public function getAction(ServerRequestInterface $request)
56 56
 	{
57
-		if( config( 'shop.authorize', true ) ) {
58
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
57
+		if (config('shop.authorize', true)) {
58
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
59 59
 		}
60 60
 
61
-		return $this->createClient()->get( $request, new Response() );
61
+		return $this->createClient()->get($request, new Response());
62 62
 	}
63 63
 
64 64
 
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
68 68
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
69 69
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
70 70
 	 */
71
-	public function patchAction( ServerRequestInterface $request )
71
+	public function patchAction(ServerRequestInterface $request)
72 72
 	{
73
-		if( config( 'shop.authorize', true ) ) {
74
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
73
+		if (config('shop.authorize', true)) {
74
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
75 75
 		}
76 76
 
77
-		return $this->createClient()->patch( $request, new Response() );
77
+		return $this->createClient()->patch($request, new Response());
78 78
 	}
79 79
 
80 80
 
@@ -84,13 +84,13 @@  discard block
 block discarded – undo
84 84
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
85 85
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
86 86
 	 */
87
-	public function postAction( ServerRequestInterface $request )
87
+	public function postAction(ServerRequestInterface $request)
88 88
 	{
89
-		if( config( 'shop.authorize', true ) ) {
90
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
89
+		if (config('shop.authorize', true)) {
90
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
91 91
 		}
92 92
 
93
-		return $this->createClient()->post( $request, new Response() );
93
+		return $this->createClient()->post($request, new Response());
94 94
 	}
95 95
 
96 96
 
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
101 101
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
102 102
 	 */
103
-	public function putAction( ServerRequestInterface $request )
103
+	public function putAction(ServerRequestInterface $request)
104 104
 	{
105
-		if( config( 'shop.authorize', true ) ) {
106
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
105
+		if (config('shop.authorize', true)) {
106
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
107 107
 		}
108 108
 
109
-		return $this->createClient()->put( $request, new Response() );
109
+		return $this->createClient()->put($request, new Response());
110 110
 	}
111 111
 
112 112
 
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
117 117
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
118 118
 	 */
119
-	public function optionsAction( ServerRequestInterface $request )
119
+	public function optionsAction(ServerRequestInterface $request)
120 120
 	{
121
-		if( config( 'shop.authorize', true ) ) {
122
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
121
+		if (config('shop.authorize', true)) {
122
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
123 123
 		}
124 124
 
125
-		return $this->createClient()->options( $request, new Response() );
125
+		return $this->createClient()->options($request, new Response());
126 126
 	}
127 127
 
128 128
 
@@ -133,18 +133,18 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	protected function createClient()
135 135
 	{
136
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
137
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
138
-		$resource = Route::input( 'resource' );
136
+		$site = Route::input('site', Input::get('site', 'default'));
137
+		$lang = Input::get('lang', config('app.locale', 'en'));
138
+		$resource = Route::input('resource');
139 139
 
140
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
141
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
140
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
141
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
142 142
 
143
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
144
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
145
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
146
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
143
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
144
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
145
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
146
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
147 147
 
148
-		return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource );
148
+		return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource);
149 149
 	}
150 150
 }
Please login to merge, or discard this patch.