| @@ -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', 'viewer']] ); | |
| 37 | +		if (config('shop.authorize', true)) { | |
| 38 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); | |
| 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']] ); | |
| 82 | +		if (config('shop.authorize', true)) { | |
| 83 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | |
| 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']] ); | |
| 103 | +		if (config('shop.authorize', true)) { | |
| 104 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | |
| 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']] ); | |
| 124 | +		if (config('shop.authorize', true)) { | |
| 125 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | |
| 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', 'viewer']] ); | |
| 145 | +		if (config('shop.authorize', true)) { | |
| 146 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); | |
| 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', 'viewer']] ); | |
| 166 | +		if (config('shop.authorize', true)) { | |
| 167 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); | |
| 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', 'editor']] ); | |
| 187 | +		if (config('shop.authorize', true)) { | |
| 188 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | |
| 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']] ); | |
| 208 | +		if (config('shop.authorize', true)) { | |
| 209 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); | |
| 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', 'viewer']] ); | |
| 229 | +		if (config('shop.authorize', true)) { | |
| 230 | +			$this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); | |
| 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, $templatePaths, $resource )->setAimeos( $aimeos ); | |
| 262 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource)->setAimeos($aimeos); | |
| 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 | } |