@@ -34,65 +34,65 @@ 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', [['admin']] ); |
|
39 | + if (config('shop.authorize', true)) { |
|
40 | + $this->authorize('admin', [['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 ); |
|
53 | - $context = $this->setLocale( $context, $site ); |
|
52 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
53 | + $context = $this->setLocale($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,23 +102,23 @@ discard block |
||
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', [['admin']] ); |
|
107 | + if (config('shop.authorize', true)) { |
|
108 | + $this->authorize('admin', [['admin']]); |
|
109 | 109 | } |
110 | 110 | |
111 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
112 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' ); |
|
111 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
112 | + $cntlPaths = $aimeos->getCustomPaths('controller/extjs'); |
|
113 | 113 | |
114 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
115 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), array() ) ); |
|
116 | - $context = $this->setLocale( $context ); |
|
114 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
115 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context->getConfig(), array())); |
|
116 | + $context = $this->setLocale($context); |
|
117 | 117 | |
118 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
118 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
119 | 119 | |
120 | - $response = $controller->process( Input::instance()->request->all(), $request->getContent() ); |
|
121 | - return View::make( 'shop::extadm.do', array( 'output' => $response ) ); |
|
120 | + $response = $controller->process(Input::instance()->request->all(), $request->getContent()); |
|
121 | + return View::make('shop::extadm.do', array('output' => $response)); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | |
@@ -129,32 +129,32 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public function fileAction() |
131 | 131 | { |
132 | - if( config( 'shop.authorize', true ) ) { |
|
133 | - $this->authorize( 'admin', [['admin']] ); |
|
132 | + if (config('shop.authorize', true)) { |
|
133 | + $this->authorize('admin', [['admin']]); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | $contents = ''; |
137 | 137 | $jsFiles = array(); |
138 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
138 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
139 | 139 | |
140 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
140 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
141 | 141 | { |
142 | - foreach( $paths as $path ) |
|
142 | + foreach ($paths as $path) |
|
143 | 143 | { |
144 | - $jsbAbsPath = $base . '/' . $path; |
|
145 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
146 | - $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) ); |
|
144 | + $jsbAbsPath = $base.'/'.$path; |
|
145 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
146 | + $jsFiles = array_merge($jsFiles, $jsb2->getFiles('js')); |
|
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
150 | - foreach( $jsFiles as $file ) |
|
150 | + foreach ($jsFiles as $file) |
|
151 | 151 | { |
152 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
152 | + if (($content = file_get_contents($file)) !== false) { |
|
153 | 153 | $contents .= $content; |
154 | 154 | } |
155 | 155 | } |
156 | 156 | |
157 | - return response( $contents )->header( 'Content-Type', 'application/javascript' ); |
|
157 | + return response($contents)->header('Content-Type', 'application/javascript'); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | |
@@ -164,15 +164,15 @@ discard block |
||
164 | 164 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
165 | 165 | * @return array List of language IDs with labels |
166 | 166 | */ |
167 | - protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) |
|
167 | + protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context) |
|
168 | 168 | { |
169 | 169 | $result = array(); |
170 | 170 | |
171 | - foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) { |
|
172 | - $result[] = array( 'id' => $id, 'label' => $id ); |
|
171 | + foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) { |
|
172 | + $result[] = array('id' => $id, 'label' => $id); |
|
173 | 173 | } |
174 | 174 | |
175 | - return json_encode( $result ); |
|
175 | + return json_encode($result); |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | |
@@ -182,10 +182,10 @@ discard block |
||
182 | 182 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object |
183 | 183 | * @return string JSON encoded configuration object |
184 | 184 | */ |
185 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) |
|
185 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) |
|
186 | 186 | { |
187 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); |
|
188 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); |
|
187 | + $config = $context->getConfig()->get('admin/extjs', array()); |
|
188 | + return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | |
@@ -196,16 +196,16 @@ discard block |
||
196 | 196 | * @param string $lang ISO language code like "en" or "en_GB" |
197 | 197 | * @return string JSON encoded translation object |
198 | 198 | */ |
199 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) |
|
199 | + protected function getJsonClientI18n(array $i18nPaths, $lang) |
|
200 | 200 | { |
201 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang ); |
|
201 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang); |
|
202 | 202 | |
203 | 203 | $content = array( |
204 | - 'admin' => $i18n->getAll( 'admin' ), |
|
205 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), |
|
204 | + 'admin' => $i18n->getAll('admin'), |
|
205 | + 'admin/ext' => $i18n->getAll('admin/ext'), |
|
206 | 206 | ); |
207 | 207 | |
208 | - return json_encode( $content, JSON_FORCE_OBJECT ); |
|
208 | + return json_encode($content, JSON_FORCE_OBJECT); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | |
@@ -217,19 +217,19 @@ discard block |
||
217 | 217 | * @return string JSON encoded site item object |
218 | 218 | * @throws Exception If no site item was found for the code |
219 | 219 | */ |
220 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
220 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
221 | 221 | { |
222 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
222 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
223 | 223 | |
224 | 224 | $criteria = $manager->createSearch(); |
225 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); |
|
226 | - $items = $manager->searchItems( $criteria ); |
|
225 | + $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); |
|
226 | + $items = $manager->searchItems($criteria); |
|
227 | 227 | |
228 | - if( ( $item = reset( $items ) ) === false ) { |
|
229 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); |
|
228 | + if (($item = reset($items)) === false) { |
|
229 | + throw new \Exception(sprintf('No site found for code "%1$s"', $site)); |
|
230 | 230 | } |
231 | 231 | |
232 | - return json_encode( $item->toArray() ); |
|
232 | + return json_encode($item->toArray()); |
|
233 | 233 | } |
234 | 234 | |
235 | 235 | |
@@ -240,22 +240,22 @@ discard block |
||
240 | 240 | * @param string $sitecode Unique site code |
241 | 241 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
242 | 242 | */ |
243 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default' ) |
|
243 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default') |
|
244 | 244 | { |
245 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
245 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
246 | 246 | |
247 | 247 | try |
248 | 248 | { |
249 | - $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
|
250 | - $localeItem->setLanguageId( null ); |
|
251 | - $localeItem->setCurrencyId( null ); |
|
249 | + $localeItem = $localeManager->bootstrap($sitecode, '', '', false); |
|
250 | + $localeItem->setLanguageId(null); |
|
251 | + $localeItem->setCurrencyId(null); |
|
252 | 252 | } |
253 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
253 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
254 | 254 | { |
255 | 255 | $localeItem = $localeManager->createItem(); |
256 | 256 | } |
257 | 257 | |
258 | - $context->setLocale( $localeItem ); |
|
258 | + $context->setLocale($localeItem); |
|
259 | 259 | |
260 | 260 | return $context; |
261 | 261 | } |