| @@ -34,38 +34,38 @@ discard block | ||
| 34 | 34 | */ | 
| 35 | 35 | public function fileAction() | 
| 36 | 36 |  	{ | 
| 37 | -		if( config( 'shop.authorize', true ) ) { | |
| 38 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); | |
| 37 | +		if (config('shop.authorize', true)) { | |
| 38 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); | |
| 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,17 +79,17 @@ discard block | ||
| 79 | 79 | */ | 
| 80 | 80 | public function copyAction() | 
| 81 | 81 |  	{ | 
| 82 | -		if( config( 'shop.authorize', true ) ) { | |
| 83 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); | |
| 82 | +		if (config('shop.authorize', true)) { | |
| 83 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); | |
| 84 | 84 | } | 
| 85 | 85 | |
| 86 | 86 | $cntl = $this->createClient(); | 
| 87 | 87 | |
| 88 | -		if( ( $html = $cntl->copy() ) == '' ) { | |
| 88 | +		if (($html = $cntl->copy()) == '') { | |
| 89 | 89 | return $cntl->getView()->response(); | 
| 90 | 90 | } | 
| 91 | 91 | |
| 92 | - return $this->getHtml( $html ); | |
| 92 | + return $this->getHtml($html); | |
| 93 | 93 | } | 
| 94 | 94 | |
| 95 | 95 | |
| @@ -100,17 +100,17 @@ discard block | ||
| 100 | 100 | */ | 
| 101 | 101 | public function createAction() | 
| 102 | 102 |  	{ | 
| 103 | -		if( config( 'shop.authorize', true ) ) { | |
| 104 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); | |
| 103 | +		if (config('shop.authorize', true)) { | |
| 104 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); | |
| 105 | 105 | } | 
| 106 | 106 | |
| 107 | 107 | $cntl = $this->createClient(); | 
| 108 | 108 | |
| 109 | -		if( ( $html = $cntl->create() ) == '' ) { | |
| 109 | +		if (($html = $cntl->create()) == '') { | |
| 110 | 110 | return $cntl->getView()->response(); | 
| 111 | 111 | } | 
| 112 | 112 | |
| 113 | - return $this->getHtml( $html ); | |
| 113 | + return $this->getHtml($html); | |
| 114 | 114 | } | 
| 115 | 115 | |
| 116 | 116 | |
| @@ -121,17 +121,17 @@ discard block | ||
| 121 | 121 | */ | 
| 122 | 122 | public function deleteAction() | 
| 123 | 123 |  	{ | 
| 124 | -		if( config( 'shop.authorize', true ) ) { | |
| 125 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); | |
| 124 | +		if (config('shop.authorize', true)) { | |
| 125 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); | |
| 126 | 126 | } | 
| 127 | 127 | |
| 128 | 128 | $cntl = $this->createClient(); | 
| 129 | 129 | |
| 130 | -		if( ( $html = $cntl->delete() ) == '' ) { | |
| 130 | +		if (($html = $cntl->delete()) == '') { | |
| 131 | 131 | return $cntl->getView()->response(); | 
| 132 | 132 | } | 
| 133 | 133 | |
| 134 | - return $this->getHtml( $html ); | |
| 134 | + return $this->getHtml($html); | |
| 135 | 135 | } | 
| 136 | 136 | |
| 137 | 137 | |
| @@ -142,17 +142,17 @@ discard block | ||
| 142 | 142 | */ | 
| 143 | 143 | public function exportAction() | 
| 144 | 144 |  	{ | 
| 145 | -		if( config( 'shop.authorize', true ) ) { | |
| 146 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); | |
| 145 | +		if (config('shop.authorize', true)) { | |
| 146 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); | |
| 147 | 147 | } | 
| 148 | 148 | |
| 149 | 149 | $cntl = $this->createClient(); | 
| 150 | 150 | |
| 151 | -		if( ( $html = $cntl->export() ) == '' ) { | |
| 151 | +		if (($html = $cntl->export()) == '') { | |
| 152 | 152 | return $cntl->getView()->response(); | 
| 153 | 153 | } | 
| 154 | 154 | |
| 155 | - return $this->getHtml( $html ); | |
| 155 | + return $this->getHtml($html); | |
| 156 | 156 | } | 
| 157 | 157 | |
| 158 | 158 | |
| @@ -163,17 +163,17 @@ discard block | ||
| 163 | 163 | */ | 
| 164 | 164 | public function getAction() | 
| 165 | 165 |  	{ | 
| 166 | -		if( config( 'shop.authorize', true ) ) { | |
| 167 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); | |
| 166 | +		if (config('shop.authorize', true)) { | |
| 167 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); | |
| 168 | 168 | } | 
| 169 | 169 | |
| 170 | 170 | $cntl = $this->createClient(); | 
| 171 | 171 | |
| 172 | -		if( ( $html = $cntl->get() ) == '' ) { | |
| 172 | +		if (($html = $cntl->get()) == '') { | |
| 173 | 173 | return $cntl->getView()->response(); | 
| 174 | 174 | } | 
| 175 | 175 | |
| 176 | - return $this->getHtml( $html ); | |
| 176 | + return $this->getHtml($html); | |
| 177 | 177 | } | 
| 178 | 178 | |
| 179 | 179 | |
| @@ -184,17 +184,17 @@ discard block | ||
| 184 | 184 | */ | 
| 185 | 185 | public function importAction() | 
| 186 | 186 |  	{ | 
| 187 | -		if( config( 'shop.authorize', true ) ) { | |
| 188 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'super']] ); | |
| 187 | +		if (config('shop.authorize', true)) { | |
| 188 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'super']]); | |
| 189 | 189 | } | 
| 190 | 190 | |
| 191 | 191 | $cntl = $this->createClient(); | 
| 192 | 192 | |
| 193 | -		if( ( $html = $cntl->import() ) == '' ) { | |
| 193 | +		if (($html = $cntl->import()) == '') { | |
| 194 | 194 | return $cntl->getView()->response(); | 
| 195 | 195 | } | 
| 196 | 196 | |
| 197 | - return $this->getHtml( $html ); | |
| 197 | + return $this->getHtml($html); | |
| 198 | 198 | } | 
| 199 | 199 | |
| 200 | 200 | |
| @@ -205,17 +205,17 @@ discard block | ||
| 205 | 205 | */ | 
| 206 | 206 | public function saveAction() | 
| 207 | 207 |  	{ | 
| 208 | -		if( config( 'shop.authorize', true ) ) { | |
| 209 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); | |
| 208 | +		if (config('shop.authorize', true)) { | |
| 209 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); | |
| 210 | 210 | } | 
| 211 | 211 | |
| 212 | 212 | $cntl = $this->createClient(); | 
| 213 | 213 | |
| 214 | -		if( ( $html = $cntl->save() ) == '' ) { | |
| 214 | +		if (($html = $cntl->save()) == '') { | |
| 215 | 215 | return $cntl->getView()->response(); | 
| 216 | 216 | } | 
| 217 | 217 | |
| 218 | - return $this->getHtml( $html ); | |
| 218 | + return $this->getHtml($html); | |
| 219 | 219 | } | 
| 220 | 220 | |
| 221 | 221 | |
| @@ -226,17 +226,17 @@ discard block | ||
| 226 | 226 | */ | 
| 227 | 227 | public function searchAction() | 
| 228 | 228 |  	{ | 
| 229 | -		if( config( 'shop.authorize', true ) ) { | |
| 230 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); | |
| 229 | +		if (config('shop.authorize', true)) { | |
| 230 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); | |
| 231 | 231 | } | 
| 232 | 232 | |
| 233 | 233 | $cntl = $this->createClient(); | 
| 234 | 234 | |
| 235 | -		if( ( $html = $cntl->search() ) == '' ) { | |
| 235 | +		if (($html = $cntl->search()) == '') { | |
| 236 | 236 | return $cntl->getView()->response(); | 
| 237 | 237 | } | 
| 238 | 238 | |
| 239 | - return $this->getHtml( $html ); | |
| 239 | + return $this->getHtml($html); | |
| 240 | 240 | } | 
| 241 | 241 | |
| 242 | 242 | |
| @@ -247,19 +247,19 @@ discard block | ||
| 247 | 247 | */ | 
| 248 | 248 | protected function createClient() | 
| 249 | 249 |  	{ | 
| 250 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); | |
| 251 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); | |
| 252 | - $resource = Route::input( 'resource' ); | |
| 250 | +		$site = Route::input('site', Input::get('site', 'default')); | |
| 251 | +		$lang = Input::get('lang', config('app.locale', 'en')); | |
| 252 | +		$resource = Route::input('resource'); | |
| 253 | 253 | |
| 254 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); | |
| 255 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); | |
| 254 | +		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); | |
| 255 | +		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); | |
| 256 | 256 | |
| 257 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); | |
| 258 | -		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); | |
| 259 | -		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); | |
| 260 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) ); | |
| 257 | +		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); | |
| 258 | +		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); | |
| 259 | +		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); | |
| 260 | +		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); | |
| 261 | 261 | |
| 262 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $aimeos, $resource ); | |
| 262 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $aimeos, $resource); | |
| 263 | 263 | } | 
| 264 | 264 | |
| 265 | 265 | |
| @@ -269,15 +269,15 @@ discard block | ||
| 269 | 269 | * @param string $content Content from admin client | 
| 270 | 270 | * @return \Illuminate\Contracts\View\View View for rendering the output | 
| 271 | 271 | */ | 
| 272 | - protected function getHtml( $content ) | |
| 272 | + protected function getHtml($content) | |
| 273 | 273 |  	{ | 
| 274 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' ); | |
| 275 | - $extnames = implode( ',', $aimeos->get()->getExtensions() ); | |
| 274 | +		$aimeos = app('\Aimeos\Shop\Base\Aimeos'); | |
| 275 | +		$extnames = implode(',', $aimeos->get()->getExtensions()); | |
| 276 | 276 | $version = $aimeos->getVersion(); | 
| 277 | 277 | |
| 278 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); | |
| 279 | -		$content = str_replace( ['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content ); | |
| 278 | +		$site = Route::input('site', Input::get('site', 'default')); | |
| 279 | +		$content = str_replace(['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content); | |
| 280 | 280 | |
| 281 | - return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) ); | |
| 281 | +		return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site)); | |
| 282 | 282 | } | 
| 283 | 283 | } | 
| @@ -36,13 +36,13 @@ discard block | ||
| 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', 'super']] ); | |
| 41 | +		if (config('shop.authorize', true)) { | |
| 42 | +			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]); | |
| 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 | ||
| 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', 'super']] ); | |
| 57 | +		if (config('shop.authorize', true)) { | |
| 58 | +			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']]); | |
| 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 | ||
| 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', 'super']] ); | |
| 73 | +		if (config('shop.authorize', true)) { | |
| 74 | +			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]); | |
| 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 | ||
| 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', 'super']] ); | |
| 89 | +		if (config('shop.authorize', true)) { | |
| 90 | +			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]); | |
| 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 | ||
| 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', 'super']] ); | |
| 105 | +		if (config('shop.authorize', true)) { | |
| 106 | +			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]); | |
| 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 | ||
| 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', 'super']] ); | |
| 121 | +		if (config('shop.authorize', true)) { | |
| 122 | +			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']]); | |
| 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 | ||
| 133 | 133 | */ | 
| 134 | 134 | protected function createClient() | 
| 135 | 135 |  	{ | 
| 136 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); | |
| 137 | - $lang = Input::get( 'locale', config( 'app.locale', 'en' ) ); | |
| 138 | - $resource = Route::input( 'resource' ); | |
| 136 | +		$site = Route::input('site', Input::get('site', 'default')); | |
| 137 | +		$lang = Input::get('locale', 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 | } | 
| @@ -34,66 +34,66 @@ discard block | ||
| 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', 'super']] ); | |
| 39 | +		if (config('shop.authorize', true)) { | |
| 40 | +			$this->authorize('admin', [ExtadmController::class, ['admin', 'super']]); | |
| 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 | - $jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) ); | |
| 74 | - $jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'lang' => $lang, 'resource' => 'dashboard' ) ); | |
| 75 | - $adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) ); | |
| 73 | +		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token())); | |
| 74 | +		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'lang' => $lang, 'resource' => 'dashboard')); | |
| 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 | - 'uploaddir' => config( 'shop::uploaddir' ), | |
| 89 | -			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ), | |
| 90 | - 'extensions' => implode( ',', $bootstrap->getExtensions() ), | |
| 87 | + 'smd' => $controller->getJsonSmd($jsonUrl), | |
| 88 | +			'uploaddir' => config('shop::uploaddir'), | |
| 89 | +			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)), | |
| 90 | +			'extensions' => implode(',', $bootstrap->getExtensions()), | |
| 91 | 91 | 'version' => $aimeos->getVersion(), | 
| 92 | 92 | 'jqadmurl' => $jqadmUrl, | 
| 93 | 93 | 'activeTab' => $tab, | 
| 94 | 94 | ); | 
| 95 | 95 | |
| 96 | - return View::make( 'shop::extadm.index', $vars ); | |
| 96 | +		return View::make('shop::extadm.index', $vars); | |
| 97 | 97 | } | 
| 98 | 98 | |
| 99 | 99 | |
| @@ -103,25 +103,25 @@ discard block | ||
| 103 | 103 | * @param \Illuminate\Http\Request $request Laravel request object | 
| 104 | 104 | * @return \Illuminate\Contracts\View\View View for rendering the output | 
| 105 | 105 | */ | 
| 106 | - public function doAction( Request $request ) | |
| 106 | + public function doAction(Request $request) | |
| 107 | 107 |  	{ | 
| 108 | -		if( config( 'shop.authorize', true ) ) { | |
| 109 | - $this->authorize( 'admin', [ExtadmController::class, ['admin', 'super']] ); | |
| 108 | +		if (config('shop.authorize', true)) { | |
| 109 | +			$this->authorize('admin', [ExtadmController::class, ['admin', 'super']]); | |
| 110 | 110 | } | 
| 111 | 111 | |
| 112 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); | |
| 112 | +		$site = Route::input('site', Input::get('site', 'default')); | |
| 113 | 113 | |
| 114 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); | |
| 115 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' ); | |
| 114 | +		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); | |
| 115 | +		$cntlPaths = $aimeos->getCustomPaths('controller/extjs'); | |
| 116 | 116 | |
| 117 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); | |
| 118 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, array() ) ); | |
| 119 | -		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); | |
| 117 | +		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); | |
| 118 | +		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, array())); | |
| 119 | +		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); | |
| 120 | 120 | |
| 121 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); | |
| 121 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); | |
| 122 | 122 | |
| 123 | - $response = $controller->process( Input::instance()->request->all(), $request->getContent() ); | |
| 124 | - return View::make( 'shop::extadm.do', array( 'output' => $response ) ); | |
| 123 | + $response = $controller->process(Input::instance()->request->all(), $request->getContent()); | |
| 124 | +		return View::make('shop::extadm.do', array('output' => $response)); | |
| 125 | 125 | } | 
| 126 | 126 | |
| 127 | 127 | |
| @@ -132,32 +132,32 @@ discard block | ||
| 132 | 132 | */ | 
| 133 | 133 | public function fileAction() | 
| 134 | 134 |  	{ | 
| 135 | -		if( config( 'shop.authorize', true ) ) { | |
| 136 | - $this->authorize( 'admin', [ExtadmController::class, ['admin', 'super']] ); | |
| 135 | +		if (config('shop.authorize', true)) { | |
| 136 | +			$this->authorize('admin', [ExtadmController::class, ['admin', 'super']]); | |
| 137 | 137 | } | 
| 138 | 138 | |
| 139 | 139 | $contents = ''; | 
| 140 | 140 | $jsFiles = array(); | 
| 141 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); | |
| 141 | +		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); | |
| 142 | 142 | |
| 143 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) | |
| 143 | +		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) | |
| 144 | 144 |  		{ | 
| 145 | - foreach( $paths as $path ) | |
| 145 | + foreach ($paths as $path) | |
| 146 | 146 |  			{ | 
| 147 | - $jsbAbsPath = $base . '/' . $path; | |
| 148 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); | |
| 149 | - $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) ); | |
| 147 | + $jsbAbsPath = $base.'/'.$path; | |
| 148 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); | |
| 149 | +				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js')); | |
| 150 | 150 | } | 
| 151 | 151 | } | 
| 152 | 152 | |
| 153 | - foreach( $jsFiles as $file ) | |
| 153 | + foreach ($jsFiles as $file) | |
| 154 | 154 |  		{ | 
| 155 | -			if( ( $content = file_get_contents( $file ) ) !== false ) { | |
| 155 | +			if (($content = file_get_contents($file)) !== false) { | |
| 156 | 156 | $contents .= $content; | 
| 157 | 157 | } | 
| 158 | 158 | } | 
| 159 | 159 | |
| 160 | - return response( $contents )->header( 'Content-Type', 'application/javascript' ); | |
| 160 | +		return response($contents)->header('Content-Type', 'application/javascript'); | |
| 161 | 161 | } | 
| 162 | 162 | |
| 163 | 163 | |
| @@ -167,15 +167,15 @@ discard block | ||
| 167 | 167 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object | 
| 168 | 168 | * @return array List of language IDs with labels | 
| 169 | 169 | */ | 
| 170 | - protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) | |
| 170 | + protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context) | |
| 171 | 171 |  	{ | 
| 172 | 172 | $result = array(); | 
| 173 | 173 | |
| 174 | -		foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) { | |
| 175 | - $result[] = array( 'id' => $id, 'label' => $id ); | |
| 174 | +		foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) { | |
| 175 | +			$result[] = array('id' => $id, 'label' => $id); | |
| 176 | 176 | } | 
| 177 | 177 | |
| 178 | - return json_encode( $result ); | |
| 178 | + return json_encode($result); | |
| 179 | 179 | } | 
| 180 | 180 | |
| 181 | 181 | |
| @@ -185,10 +185,10 @@ discard block | ||
| 185 | 185 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object | 
| 186 | 186 | * @return string JSON encoded configuration object | 
| 187 | 187 | */ | 
| 188 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) | |
| 188 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) | |
| 189 | 189 |  	{ | 
| 190 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); | |
| 191 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); | |
| 190 | +		$config = $context->getConfig()->get('admin/extjs', array()); | |
| 191 | +		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); | |
| 192 | 192 | } | 
| 193 | 193 | |
| 194 | 194 | |
| @@ -199,16 +199,16 @@ discard block | ||
| 199 | 199 | * @param string $lang ISO language code like "en" or "en_GB" | 
| 200 | 200 | * @return string JSON encoded translation object | 
| 201 | 201 | */ | 
| 202 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) | |
| 202 | + protected function getJsonClientI18n(array $i18nPaths, $lang) | |
| 203 | 203 |  	{ | 
| 204 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang ); | |
| 204 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang); | |
| 205 | 205 | |
| 206 | 206 | $content = array( | 
| 207 | - 'admin' => $i18n->getAll( 'admin' ), | |
| 208 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), | |
| 207 | +			'admin' => $i18n->getAll('admin'), | |
| 208 | +			'admin/ext' => $i18n->getAll('admin/ext'), | |
| 209 | 209 | ); | 
| 210 | 210 | |
| 211 | - return json_encode( $content, JSON_FORCE_OBJECT ); | |
| 211 | + return json_encode($content, JSON_FORCE_OBJECT); | |
| 212 | 212 | } | 
| 213 | 213 | |
| 214 | 214 | |
| @@ -220,18 +220,18 @@ discard block | ||
| 220 | 220 | * @return string JSON encoded site item object | 
| 221 | 221 | * @throws Exception If no site item was found for the code | 
| 222 | 222 | */ | 
| 223 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) | |
| 223 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) | |
| 224 | 224 |  	{ | 
| 225 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); | |
| 225 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); | |
| 226 | 226 | |
| 227 | 227 | $criteria = $manager->createSearch(); | 
| 228 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); | |
| 229 | - $items = $manager->searchItems( $criteria ); | |
| 228 | +		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); | |
| 229 | + $items = $manager->searchItems($criteria); | |
| 230 | 230 | |
| 231 | -		if( ( $item = reset( $items ) ) === false ) { | |
| 232 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); | |
| 231 | +		if (($item = reset($items)) === false) { | |
| 232 | +			throw new \Exception(sprintf('No site found for code "%1$s"', $site)); | |
| 233 | 233 | } | 
| 234 | 234 | |
| 235 | - return json_encode( $item->toArray() ); | |
| 235 | + return json_encode($item->toArray()); | |
| 236 | 236 | } | 
| 237 | 237 | } | 
| 238 | 238 | \ No newline at end of file |