@@ -39,21 +39,21 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function fire() |
41 | 41 | { |
42 | - $code = $this->argument( 'email' ); |
|
43 | - if( ( $password = $this->option( 'password' ) ) === null ) { |
|
44 | - $password = $this->secret( 'Password' ); |
|
42 | + $code = $this->argument('email'); |
|
43 | + if (($password = $this->option('password')) === null) { |
|
44 | + $password = $this->secret('Password'); |
|
45 | 45 | } |
46 | 46 | |
47 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false ); |
|
48 | - $context->setEditor( 'aimeos:account' ); |
|
47 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false); |
|
48 | + $context->setEditor('aimeos:account'); |
|
49 | 49 | |
50 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
51 | - $context->setLocale( $localeManager->createItem() ); |
|
50 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
51 | + $context->setLocale($localeManager->createItem()); |
|
52 | 52 | |
53 | - $user = $this->createCustomerItem( $context, $code, $password ); |
|
53 | + $user = $this->createCustomerItem($context, $code, $password); |
|
54 | 54 | |
55 | - if( $this->option( 'admin' ) ) { |
|
56 | - $this->addPrivilege( $context, $user, 'admin' ); |
|
55 | + if ($this->option('admin')) { |
|
56 | + $this->addPrivilege($context, $user, 'admin'); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | |
@@ -65,31 +65,31 @@ discard block |
||
65 | 65 | * @param string $userid Unique user ID |
66 | 66 | * @param string $groupid Unique group ID |
67 | 67 | */ |
68 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid ) |
|
68 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid) |
|
69 | 69 | { |
70 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' ); |
|
71 | - $typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId(); |
|
70 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists'); |
|
71 | + $typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId(); |
|
72 | 72 | |
73 | 73 | $search = $manager->createSearch(); |
74 | 74 | $expr = array( |
75 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
76 | - $search->compare( '==', 'customer.lists.refid', $groupid ), |
|
77 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
78 | - $search->compare( '==', 'customer.lists.typeid', $typeid ), |
|
75 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
76 | + $search->compare('==', 'customer.lists.refid', $groupid), |
|
77 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
78 | + $search->compare('==', 'customer.lists.typeid', $typeid), |
|
79 | 79 | ); |
80 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
81 | - $search->setSlice( 0, 1 ); |
|
80 | + $search->setConditions($search->combine('&&', $expr)); |
|
81 | + $search->setSlice(0, 1); |
|
82 | 82 | |
83 | - if( count( $manager->searchItems( $search ) ) === 0 ) |
|
83 | + if (count($manager->searchItems($search)) === 0) |
|
84 | 84 | { |
85 | 85 | $item = $manager->createItem(); |
86 | - $item->setDomain( 'customer/group' ); |
|
87 | - $item->setParentId( $userid ); |
|
88 | - $item->setTypeId( $typeid ); |
|
89 | - $item->setRefId( $groupid ); |
|
90 | - $item->setStatus( 1 ); |
|
86 | + $item->setDomain('customer/group'); |
|
87 | + $item->setParentId($userid); |
|
88 | + $item->setTypeId($typeid); |
|
89 | + $item->setRefId($groupid); |
|
90 | + $item->setStatus(1); |
|
91 | 91 | |
92 | - $manager->saveItem( $item, false ); |
|
92 | + $manager->saveItem($item, false); |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | |
@@ -101,23 +101,23 @@ discard block |
||
101 | 101 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object |
102 | 102 | * @param string $privilege Unique customer group code |
103 | 103 | */ |
104 | - protected function addPrivilege( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege ) |
|
104 | + protected function addPrivilege(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege) |
|
105 | 105 | { |
106 | - $this->info( sprintf( 'Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode() ) ); |
|
106 | + $this->info(sprintf('Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode())); |
|
107 | 107 | |
108 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
108 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
109 | 109 | |
110 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
110 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
111 | 111 | { |
112 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
112 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
113 | 113 | |
114 | 114 | $lcontext = clone $context; |
115 | - $lcontext->setLocale( $localeItem ); |
|
115 | + $lcontext->setLocale($localeItem); |
|
116 | 116 | |
117 | - $this->info( '- ' . $siteItem->getCode() ); |
|
117 | + $this->info('- ' . $siteItem->getCode()); |
|
118 | 118 | |
119 | - $groupItem = $this->getGroupItem( $lcontext, $privilege ); |
|
120 | - $this->addListItem( $lcontext, $user->getId(), $groupItem->getId() ); |
|
119 | + $groupItem = $this->getGroupItem($lcontext, $privilege); |
|
120 | + $this->addListItem($lcontext, $user->getId(), $groupItem->getId()); |
|
121 | 121 | } |
122 | 122 | } |
123 | 123 | |
@@ -132,21 +132,21 @@ discard block |
||
132 | 132 | * @param string $password New user password |
133 | 133 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object |
134 | 134 | */ |
135 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) |
|
135 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) |
|
136 | 136 | { |
137 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
137 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
138 | 138 | |
139 | 139 | try { |
140 | - $item = $manager->findItem( $email ); |
|
141 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
140 | + $item = $manager->findItem($email); |
|
141 | + } catch (\Aimeos\MShop\Exception $e) { |
|
142 | 142 | $item = $manager->createItem(); |
143 | 143 | } |
144 | 144 | |
145 | - $item->setCode( $email ); |
|
146 | - $item->getPaymentAddress()->setEmail( $email ); |
|
147 | - $item->setPassword( $password ); |
|
145 | + $item->setCode($email); |
|
146 | + $item->getPaymentAddress()->setEmail($email); |
|
147 | + $item->setPassword($password); |
|
148 | 148 | |
149 | - $manager->saveItem( $item ); |
|
149 | + $manager->saveItem($item); |
|
150 | 150 | |
151 | 151 | return $item; |
152 | 152 | } |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | protected function getArguments() |
161 | 161 | { |
162 | 162 | return array( |
163 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ), |
|
164 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' ), |
|
163 | + array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), |
|
164 | + array('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)'), |
|
165 | 165 | ); |
166 | 166 | } |
167 | 167 | |
@@ -173,21 +173,21 @@ discard block |
||
173 | 173 | * @param string $code Unique customer group code |
174 | 174 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object |
175 | 175 | */ |
176 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) |
|
176 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) |
|
177 | 177 | { |
178 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); |
|
178 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); |
|
179 | 179 | |
180 | 180 | try |
181 | 181 | { |
182 | - $item = $manager->findItem( $code ); |
|
182 | + $item = $manager->findItem($code); |
|
183 | 183 | } |
184 | - catch( \Aimeos\MShop\Exception $e ) |
|
184 | + catch (\Aimeos\MShop\Exception $e) |
|
185 | 185 | { |
186 | 186 | $item = $manager->createItem(); |
187 | - $item->setLabel( $code ); |
|
188 | - $item->setCode( $code ); |
|
187 | + $item->setLabel($code); |
|
188 | + $item->setCode($code); |
|
189 | 189 | |
190 | - $manager->saveItem( $item ); |
|
190 | + $manager->saveItem($item); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | return $item; |
@@ -202,8 +202,8 @@ discard block |
||
202 | 202 | protected function getOptions() |
203 | 203 | { |
204 | 204 | return array( |
205 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ), |
|
206 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ), |
|
205 | + array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), |
|
206 | + array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), |
|
207 | 207 | ); |
208 | 208 | } |
209 | 209 | } |
@@ -35,17 +35,17 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function indexAction() |
37 | 37 | { |
38 | - if( config( 'shop.authorize', true ) ) { |
|
39 | - $this->authorize( 'admin' ); |
|
38 | + if (config('shop.authorize', true)) { |
|
39 | + $this->authorize('admin'); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $param = array( |
43 | 43 | 'resource' => 'product', |
44 | - 'site' => Route::input( 'site', 'default' ), |
|
45 | - 'lang' => Input::get( 'lang', config( 'app.locale', 'en' ) ), |
|
44 | + 'site' => Route::input('site', 'default'), |
|
45 | + 'lang' => Input::get('lang', config('app.locale', 'en')), |
|
46 | 46 | ); |
47 | 47 | |
48 | - return redirect()->route( 'aimeos_shop_jqadm_search', $param ); |
|
48 | + return redirect()->route('aimeos_shop_jqadm_search', $param); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -56,12 +56,12 @@ discard block |
||
56 | 56 | */ |
57 | 57 | protected function getVersion() |
58 | 58 | { |
59 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false |
|
60 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
59 | + if (($content = @file_get_contents(base_path('composer.lock'))) !== false |
|
60 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
61 | 61 | ) { |
62 | - foreach( (array) $content['packages'] as $item ) |
|
62 | + foreach ((array) $content['packages'] as $item) |
|
63 | 63 | { |
64 | - if( $item['name'] === 'aimeos/aimeos-laravel' ) { |
|
64 | + if ($item['name'] === 'aimeos/aimeos-laravel') { |
|
65 | 65 | return $item['version']; |
66 | 66 | } |
67 | 67 | } |
@@ -79,23 +79,23 @@ discard block |
||
79 | 79 | * @param string $lang ISO language code, e.g. "en" or "en_GB" |
80 | 80 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
81 | 81 | */ |
82 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $lang = null ) |
|
82 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $lang = null) |
|
83 | 83 | { |
84 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
84 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
85 | 85 | |
86 | 86 | try |
87 | 87 | { |
88 | - $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
|
89 | - $localeItem->setLanguageId( null ); |
|
90 | - $localeItem->setCurrencyId( null ); |
|
88 | + $localeItem = $localeManager->bootstrap($sitecode, '', '', false); |
|
89 | + $localeItem->setLanguageId(null); |
|
90 | + $localeItem->setCurrencyId(null); |
|
91 | 91 | } |
92 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
92 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
93 | 93 | { |
94 | 94 | $localeItem = $localeManager->createItem(); |
95 | 95 | } |
96 | 96 | |
97 | - $context->setLocale( $localeItem ); |
|
98 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang ) ) ); |
|
97 | + $context->setLocale($localeItem); |
|
98 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang))); |
|
99 | 99 | |
100 | 100 | return $context; |
101 | 101 | } |
@@ -34,54 +34,54 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function indexAction() |
36 | 36 | { |
37 | - if( config( 'shop.authorize', true ) ) { |
|
38 | - $this->authorize( 'admin' ); |
|
37 | + if (config('shop.authorize', true)) { |
|
38 | + $this->authorize('admin'); |
|
39 | 39 | } |
40 | 40 | |
41 | - $site = Route::input( 'site', 'default' ); |
|
42 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
41 | + $site = Route::input('site', 'default'); |
|
42 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
43 | 43 | |
44 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
45 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' ); |
|
44 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
45 | + $cntlPaths = $aimeos->getCustomPaths('controller/extjs'); |
|
46 | 46 | |
47 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
48 | - $context = $this->setLocale( $context, $site, $lang ); |
|
47 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
48 | + $context = $this->setLocale($context, $site, $lang); |
|
49 | 49 | |
50 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
50 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
51 | 51 | $cssFiles = array(); |
52 | 52 | |
53 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
53 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
54 | 54 | { |
55 | - foreach( $paths as $path ) |
|
55 | + foreach ($paths as $path) |
|
56 | 56 | { |
57 | 57 | $jsbAbsPath = $base . '/' . $path; |
58 | 58 | |
59 | - if( !is_file( $jsbAbsPath ) ) { |
|
60 | - throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) ); |
|
59 | + if (!is_file($jsbAbsPath)) { |
|
60 | + throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath)); |
|
61 | 61 | } |
62 | 62 | |
63 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) ); |
|
64 | - $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) ); |
|
63 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path)); |
|
64 | + $cssFiles = array_merge($cssFiles, $jsb2->getUrls('css')); |
|
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
68 | - $jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) ); |
|
69 | - $jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) ); |
|
70 | - $adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) ); |
|
68 | + $jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product')); |
|
69 | + $jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token())); |
|
70 | + $adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>')); |
|
71 | 71 | |
72 | 72 | $vars = array( |
73 | 73 | 'lang' => $lang, |
74 | 74 | 'cssFiles' => $cssFiles, |
75 | - 'languages' => $this->getJsonLanguages( $context), |
|
76 | - 'config' => $this->getJsonClientConfig( $context ), |
|
77 | - 'site' => $this->getJsonSiteItem( $context, $site ), |
|
78 | - 'i18nContent' => $this->getJsonClientI18n( $aimeos->getI18nPaths(), $lang ), |
|
75 | + 'languages' => $this->getJsonLanguages($context), |
|
76 | + 'config' => $this->getJsonClientConfig($context), |
|
77 | + 'site' => $this->getJsonSiteItem($context, $site), |
|
78 | + 'i18nContent' => $this->getJsonClientI18n($aimeos->getI18nPaths(), $lang), |
|
79 | 79 | 'searchSchemas' => $controller->getJsonSearchSchemas(), |
80 | 80 | 'itemSchemas' => $controller->getJsonItemSchemas(), |
81 | - 'smd' => $controller->getJsonSmd( $jsonUrl ), |
|
82 | - 'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ), |
|
83 | - 'uploaddir' => config( 'shop::uploaddir' ), |
|
84 | - 'activeTab' => Input::get( 'tab', 0 ), |
|
81 | + 'smd' => $controller->getJsonSmd($jsonUrl), |
|
82 | + 'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)), |
|
83 | + 'uploaddir' => config('shop::uploaddir'), |
|
84 | + 'activeTab' => Input::get('tab', 0), |
|
85 | 85 | 'version' => $this->getVersion(), |
86 | 86 | 'jqadmurl' => $jqadmUrl, |
87 | 87 | ); |
@@ -97,20 +97,20 @@ discard block |
||
97 | 97 | */ |
98 | 98 | public function doAction() |
99 | 99 | { |
100 | - if( config( 'shop.authorize', true ) ) { |
|
101 | - $this->authorize( 'admin' ); |
|
100 | + if (config('shop.authorize', true)) { |
|
101 | + $this->authorize('admin'); |
|
102 | 102 | } |
103 | 103 | |
104 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
105 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' ); |
|
104 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
105 | + $cntlPaths = $aimeos->getCustomPaths('controller/extjs'); |
|
106 | 106 | |
107 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
108 | - $context = $this->setLocale( $context ); |
|
107 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
108 | + $context = $this->setLocale($context); |
|
109 | 109 | |
110 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
110 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
111 | 111 | |
112 | - $response = $controller->process( Input::instance()->request->all(), 'php://input' ); |
|
113 | - return View::make('shop::admin.extadm-do', array( 'output' => $response )); |
|
112 | + $response = $controller->process(Input::instance()->request->all(), 'php://input'); |
|
113 | + return View::make('shop::admin.extadm-do', array('output' => $response)); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | |
@@ -121,32 +121,32 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public function fileAction() |
123 | 123 | { |
124 | - if( config( 'shop.authorize', true ) ) { |
|
125 | - $this->authorize( 'admin' ); |
|
124 | + if (config('shop.authorize', true)) { |
|
125 | + $this->authorize('admin'); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | $contents = ''; |
129 | 129 | $jsFiles = array(); |
130 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
130 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
131 | 131 | |
132 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
132 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
133 | 133 | { |
134 | - foreach( $paths as $path ) |
|
134 | + foreach ($paths as $path) |
|
135 | 135 | { |
136 | 136 | $jsbAbsPath = $base . '/' . $path; |
137 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
138 | - $jsFiles = array_merge( $jsFiles, $jsb2->getUrls( 'js', '' ) ); |
|
137 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
138 | + $jsFiles = array_merge($jsFiles, $jsb2->getUrls('js', '')); |
|
139 | 139 | } |
140 | 140 | } |
141 | 141 | |
142 | - foreach( $jsFiles as $file ) |
|
142 | + foreach ($jsFiles as $file) |
|
143 | 143 | { |
144 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
144 | + if (($content = file_get_contents($file)) !== false) { |
|
145 | 145 | $contents .= $content; |
146 | 146 | } |
147 | 147 | } |
148 | 148 | |
149 | - return response( $contents )->header( 'Content-Type', 'application/javascript' ); |
|
149 | + return response($contents)->header('Content-Type', 'application/javascript'); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | |
@@ -156,30 +156,30 @@ discard block |
||
156 | 156 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
157 | 157 | * @return array List of language IDs with labels |
158 | 158 | */ |
159 | - protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) |
|
159 | + protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context) |
|
160 | 160 | { |
161 | - $paths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nPaths(); |
|
161 | + $paths = app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nPaths(); |
|
162 | 162 | $langs = array(); |
163 | 163 | |
164 | - if( !isset( $paths['admin'] ) ) { |
|
165 | - return json_encode( array() ); |
|
164 | + if (!isset($paths['admin'])) { |
|
165 | + return json_encode(array()); |
|
166 | 166 | } |
167 | 167 | |
168 | - foreach( $paths['admin'] as $path ) |
|
168 | + foreach ($paths['admin'] as $path) |
|
169 | 169 | { |
170 | - $iter = new \DirectoryIterator( $path ); |
|
170 | + $iter = new \DirectoryIterator($path); |
|
171 | 171 | |
172 | - foreach( $iter as $file ) |
|
172 | + foreach ($iter as $file) |
|
173 | 173 | { |
174 | 174 | $name = $file->getFilename(); |
175 | 175 | |
176 | - if( preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name ) ) { |
|
176 | + if (preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name)) { |
|
177 | 177 | $langs[$name] = null; |
178 | 178 | } |
179 | 179 | } |
180 | 180 | } |
181 | 181 | |
182 | - return json_encode( $this->getLanguages( $context, array_keys( $langs ) ) ); |
|
182 | + return json_encode($this->getLanguages($context, array_keys($langs))); |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | |
@@ -189,10 +189,10 @@ discard block |
||
189 | 189 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object |
190 | 190 | * @return string JSON encoded configuration object |
191 | 191 | */ |
192 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) |
|
192 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) |
|
193 | 193 | { |
194 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); |
|
195 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); |
|
194 | + $config = $context->getConfig()->get('admin/extjs', array()); |
|
195 | + return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | |
@@ -203,16 +203,16 @@ discard block |
||
203 | 203 | * @param string $lang ISO language code like "en" or "en_GB" |
204 | 204 | * @return string JSON encoded translation object |
205 | 205 | */ |
206 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) |
|
206 | + protected function getJsonClientI18n(array $i18nPaths, $lang) |
|
207 | 207 | { |
208 | - $i18n = new \Aimeos\MW\Translation\Zend2( $i18nPaths, 'gettext', $lang, array( 'disableNotices' => true ) ); |
|
208 | + $i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $lang, array('disableNotices' => true)); |
|
209 | 209 | |
210 | 210 | $content = array( |
211 | - 'admin' => $i18n->getAll( 'admin' ), |
|
212 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), |
|
211 | + 'admin' => $i18n->getAll('admin'), |
|
212 | + 'admin/ext' => $i18n->getAll('admin/ext'), |
|
213 | 213 | ); |
214 | 214 | |
215 | - return json_encode( $content, JSON_FORCE_OBJECT ); |
|
215 | + return json_encode($content, JSON_FORCE_OBJECT); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | |
@@ -224,19 +224,19 @@ discard block |
||
224 | 224 | * @return string JSON encoded site item object |
225 | 225 | * @throws Exception If no site item was found for the code |
226 | 226 | */ |
227 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
227 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
228 | 228 | { |
229 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
229 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
230 | 230 | |
231 | 231 | $criteria = $manager->createSearch(); |
232 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); |
|
233 | - $items = $manager->searchItems( $criteria ); |
|
232 | + $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); |
|
233 | + $items = $manager->searchItems($criteria); |
|
234 | 234 | |
235 | - if( ( $item = reset( $items ) ) === false ) { |
|
236 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); |
|
235 | + if (($item = reset($items)) === false) { |
|
236 | + throw new \Exception(sprintf('No site found for code "%1$s"', $site)); |
|
237 | 237 | } |
238 | 238 | |
239 | - return json_encode( $item->toArray() ); |
|
239 | + return json_encode($item->toArray()); |
|
240 | 240 | } |
241 | 241 | |
242 | 242 | |
@@ -247,18 +247,18 @@ discard block |
||
247 | 247 | * @param array $langIds List of language IDs |
248 | 248 | * @return array List of associative lists with "id" and "label" as keys |
249 | 249 | */ |
250 | - protected function getLanguages( \Aimeos\MShop\Context\Item\Iface $context, array $langIds ) |
|
250 | + protected function getLanguages(\Aimeos\MShop\Context\Item\Iface $context, array $langIds) |
|
251 | 251 | { |
252 | - $languageManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/language' ); |
|
252 | + $languageManager = \Aimeos\MShop\Factory::createManager($context, 'locale/language'); |
|
253 | 253 | $result = array(); |
254 | 254 | |
255 | 255 | $search = $languageManager->createSearch(); |
256 | - $search->setConditions( $search->compare('==', 'locale.language.id', $langIds ) ); |
|
257 | - $search->setSortations( array( $search->sort( '-', 'locale.language.status' ), $search->sort( '+', 'locale.language.label' ) ) ); |
|
258 | - $langItems = $languageManager->searchItems( $search ); |
|
256 | + $search->setConditions($search->compare('==', 'locale.language.id', $langIds)); |
|
257 | + $search->setSortations(array($search->sort('-', 'locale.language.status'), $search->sort('+', 'locale.language.label'))); |
|
258 | + $langItems = $languageManager->searchItems($search); |
|
259 | 259 | |
260 | - foreach( $langItems as $id => $item ) { |
|
261 | - $result[] = array( 'id' => $id, 'label' => $item->getLabel() ); |
|
260 | + foreach ($langItems as $id => $item) { |
|
261 | + $result[] = array('id' => $id, 'label' => $item->getLabel()); |
|
262 | 262 | } |
263 | 263 | |
264 | 264 | return $result; |
@@ -273,17 +273,17 @@ discard block |
||
273 | 273 | * @param string $locale ISO language code, e.g. "en" or "en_GB" |
274 | 274 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
275 | 275 | */ |
276 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null ) |
|
276 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null) |
|
277 | 277 | { |
278 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
278 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
279 | 279 | |
280 | 280 | try { |
281 | - $localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false ); |
|
282 | - } catch( \Aimeos\MShop\Locale\Exception $e ) { |
|
281 | + $localeItem = $localeManager->bootstrap($sitecode, $locale, '', false); |
|
282 | + } catch (\Aimeos\MShop\Locale\Exception $e) { |
|
283 | 283 | $localeItem = $localeManager->createItem(); |
284 | 284 | } |
285 | 285 | |
286 | - $context->setLocale( $localeItem ); |
|
286 | + $context->setLocale($localeItem); |
|
287 | 287 | |
288 | 288 | return $context; |
289 | 289 | } |