@@ -22,19 +22,19 @@ |
||
| 22 | 22 | * @param string|array $sites Unique site codes |
| 23 | 23 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items |
| 24 | 24 | */ |
| 25 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) |
|
| 25 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites) |
|
| 26 | 26 | { |
| 27 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
| 27 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
| 28 | 28 | $search = $manager->createSearch(); |
| 29 | 29 | |
| 30 | - if( is_scalar( $sites ) && $sites != '' ) { |
|
| 31 | - $sites = explode( ' ', $sites ); |
|
| 30 | + if (is_scalar($sites) && $sites != '') { |
|
| 31 | + $sites = explode(' ', $sites); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - if( !empty( $sites ) ) { |
|
| 35 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); |
|
| 34 | + if (!empty($sites)) { |
|
| 35 | + $search->setConditions($search->compare('==', 'locale.site.code', $sites)); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - return $manager->searchItems( $search ); |
|
| 38 | + return $manager->searchItems($search); |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | \ No newline at end of file |
@@ -135,7 +135,7 @@ |
||
| 135 | 135 | * Creates a list of all available translations. |
| 136 | 136 | * |
| 137 | 137 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 138 | - * @return array List of language IDs with labels |
|
| 138 | + * @return string List of language IDs with labels |
|
| 139 | 139 | */ |
| 140 | 140 | protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) |
| 141 | 141 | { |
@@ -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']] ); |
|
| 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 | - $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']] ); |
|
| 108 | + if (config('shop.authorize', true)) { |
|
| 109 | + $this->authorize('admin', [ExtadmController::class, ['admin']]); |
|
| 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']] ); |
|
| 135 | + if (config('shop.authorize', true)) { |
|
| 136 | + $this->authorize('admin', [ExtadmController::class, ['admin']]); |
|
| 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 |
@@ -43,39 +43,39 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function fire() |
| 45 | 45 | { |
| 46 | - $ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
| 47 | - $ctx->setEditor( 'aimeos:setup' ); |
|
| 46 | + $ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
| 47 | + $ctx->setEditor('aimeos:setup'); |
|
| 48 | 48 | |
| 49 | 49 | $config = $ctx->getConfig(); |
| 50 | - $site = $this->argument( 'site' ); |
|
| 51 | - $template = $this->argument( 'tplsite' ); |
|
| 50 | + $site = $this->argument('site'); |
|
| 51 | + $template = $this->argument('tplsite'); |
|
| 52 | 52 | |
| 53 | - $config->set( 'setup/site', $site ); |
|
| 54 | - $dbconfig = $this->getDbConfig( $config ); |
|
| 55 | - $this->setOptions( $config ); |
|
| 53 | + $config->set('setup/site', $site); |
|
| 54 | + $dbconfig = $this->getDbConfig($config); |
|
| 55 | + $this->setOptions($config); |
|
| 56 | 56 | |
| 57 | - $taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template ); |
|
| 58 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx ); |
|
| 57 | + $taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template); |
|
| 58 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx); |
|
| 59 | 59 | |
| 60 | - $this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) ); |
|
| 60 | + $this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site)); |
|
| 61 | 61 | |
| 62 | - if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) { |
|
| 63 | - $task = reset( $task ); |
|
| 62 | + if (($task = $this->option('task')) && is_array($task)) { |
|
| 63 | + $task = reset($task); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - switch( $this->option( 'action' ) ) |
|
| 66 | + switch ($this->option('action')) |
|
| 67 | 67 | { |
| 68 | 68 | case 'migrate': |
| 69 | - $manager->migrate( $task ); |
|
| 69 | + $manager->migrate($task); |
|
| 70 | 70 | break; |
| 71 | 71 | case 'rollback': |
| 72 | - $manager->rollback( $task ); |
|
| 72 | + $manager->rollback($task); |
|
| 73 | 73 | break; |
| 74 | 74 | case 'clean': |
| 75 | - $manager->clean( $task ); |
|
| 75 | + $manager->clean($task); |
|
| 76 | 76 | break; |
| 77 | 77 | default: |
| 78 | - throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) ); |
|
| 78 | + throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action'))); |
|
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | 81 | |
@@ -88,8 +88,8 @@ discard block |
||
| 88 | 88 | protected function getArguments() |
| 89 | 89 | { |
| 90 | 90 | return array( |
| 91 | - array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ), |
|
| 92 | - array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ), |
|
| 91 | + array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'), |
|
| 92 | + array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'), |
|
| 93 | 93 | ); |
| 94 | 94 | } |
| 95 | 95 | |
@@ -102,9 +102,9 @@ discard block |
||
| 102 | 102 | protected function getOptions() |
| 103 | 103 | { |
| 104 | 104 | return array( |
| 105 | - array( 'option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ), |
|
| 106 | - array( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ), |
|
| 107 | - array( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ), |
|
| 105 | + array('option', null, InputOption::VALUE_REQUIRED, 'Setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()), |
|
| 106 | + array('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'), |
|
| 107 | + array('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null), |
|
| 108 | 108 | ); |
| 109 | 109 | } |
| 110 | 110 | |
@@ -115,14 +115,14 @@ discard block |
||
| 115 | 115 | * @param \Aimeos\MW\Config\Iface $conf Config object |
| 116 | 116 | * @return array Multi-dimensional associative list of database configuration parameters |
| 117 | 117 | */ |
| 118 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf ) |
|
| 118 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf) |
|
| 119 | 119 | { |
| 120 | - $dbconfig = $conf->get( 'resource', array() ); |
|
| 120 | + $dbconfig = $conf->get('resource', array()); |
|
| 121 | 121 | |
| 122 | - foreach( $dbconfig as $rname => $dbconf ) |
|
| 122 | + foreach ($dbconfig as $rname => $dbconf) |
|
| 123 | 123 | { |
| 124 | - if( strncmp( $rname, 'db', 2 ) !== 0 ) { |
|
| 125 | - unset( $dbconfig[$rname] ); |
|
| 124 | + if (strncmp($rname, 'db', 2) !== 0) { |
|
| 125 | + unset($dbconfig[$rname]); |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
@@ -137,12 +137,12 @@ discard block |
||
| 137 | 137 | * @param array Associative list of database configurations |
| 138 | 138 | * @throws \RuntimeException If the format of the options is invalid |
| 139 | 139 | */ |
| 140 | - protected function setOptions( \Aimeos\MW\Config\Iface $conf ) |
|
| 140 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf) |
|
| 141 | 141 | { |
| 142 | - foreach( (array) $this->option( 'option' ) as $option ) |
|
| 142 | + foreach ((array) $this->option('option') as $option) |
|
| 143 | 143 | { |
| 144 | - list( $name, $value ) = explode( ':', $option ); |
|
| 145 | - $conf->set( str_replace( '\\', '/', $name ), $value ); |
|
| 144 | + list($name, $value) = explode(':', $option); |
|
| 145 | + $conf->set(str_replace('\\', '/', $name), $value); |
|
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | } |
@@ -42,24 +42,24 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function fire() |
| 44 | 44 | { |
| 45 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
| 46 | - $context->setEditor( 'aimeos:cache' ); |
|
| 45 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
| 46 | + $context->setEditor('aimeos:cache'); |
|
| 47 | 47 | |
| 48 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 48 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 49 | 49 | |
| 50 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
| 50 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
| 51 | 51 | { |
| 52 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 52 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 53 | 53 | |
| 54 | 54 | $lcontext = clone $context; |
| 55 | - $lcontext->setLocale( $localeItem ); |
|
| 55 | + $lcontext->setLocale($localeItem); |
|
| 56 | 56 | |
| 57 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
| 58 | - $lcontext->setCache( $cache ); |
|
| 57 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
| 58 | + $lcontext->setCache($cache); |
|
| 59 | 59 | |
| 60 | - $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) ); |
|
| 60 | + $this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode())); |
|
| 61 | 61 | |
| 62 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear(); |
|
| 62 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear(); |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | protected function getArguments() |
| 73 | 73 | { |
| 74 | 74 | return array( |
| 75 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ), |
|
| 75 | + array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'), |
|
| 76 | 76 | ); |
| 77 | 77 | } |
| 78 | 78 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 40 | 40 | */ |
| 41 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
| 41 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
| 42 | 42 | { |
| 43 | 43 | $this->config = $config; |
| 44 | 44 | } |
@@ -50,25 +50,25 @@ discard block |
||
| 50 | 50 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 51 | 51 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 52 | 52 | */ |
| 53 | - public function get( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 53 | + public function get(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 54 | 54 | { |
| 55 | - if( $this->locale === null ) |
|
| 55 | + if ($this->locale === null) |
|
| 56 | 56 | { |
| 57 | - $site = Input::get( 'site', 'default' ); |
|
| 58 | - $currency = Input::get( 'currency', '' ); |
|
| 59 | - $lang = Input::get( 'locale', '' ); |
|
| 57 | + $site = Input::get('site', 'default'); |
|
| 58 | + $currency = Input::get('currency', ''); |
|
| 59 | + $lang = Input::get('locale', ''); |
|
| 60 | 60 | |
| 61 | - if( Route::current() ) |
|
| 61 | + if (Route::current()) |
|
| 62 | 62 | { |
| 63 | - $site = Route::input( 'site', $site ); |
|
| 64 | - $currency = Route::input( 'currency', $currency ); |
|
| 65 | - $lang = Route::input( 'locale', $lang ); |
|
| 63 | + $site = Route::input('site', $site); |
|
| 64 | + $currency = Route::input('currency', $currency); |
|
| 65 | + $lang = Route::input('locale', $lang); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - $disableSites = $this->config->get( 'shop.disableSites', true ); |
|
| 68 | + $disableSites = $this->config->get('shop.disableSites', true); |
|
| 69 | 69 | |
| 70 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 71 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); |
|
| 70 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 71 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | return $this->locale; |
@@ -82,17 +82,17 @@ discard block |
||
| 82 | 82 | * @param string $site Unique site code |
| 83 | 83 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 84 | 84 | */ |
| 85 | - public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 85 | + public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 86 | 86 | { |
| 87 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 87 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 88 | 88 | |
| 89 | 89 | try |
| 90 | 90 | { |
| 91 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
| 92 | - $localeItem->setLanguageId( null ); |
|
| 93 | - $localeItem->setCurrencyId( null ); |
|
| 91 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
| 92 | + $localeItem->setLanguageId(null); |
|
| 93 | + $localeItem->setCurrencyId(null); |
|
| 94 | 94 | } |
| 95 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 95 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
| 96 | 96 | { |
| 97 | 97 | $localeItem = $localeManager->createItem(); |
| 98 | 98 | } |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | |
| 10 | -if( !function_exists( 'aiconfig' ) ) |
|
| 10 | +if (!function_exists('aiconfig')) |
|
| 11 | 11 | { |
| 12 | 12 | /** |
| 13 | 13 | * Returns the configuration setting for the given key |
@@ -16,14 +16,14 @@ discard block |
||
| 16 | 16 | * @param mixed $default Default value if the configuration key isn't found |
| 17 | 17 | * @return mixed Configuration value |
| 18 | 18 | */ |
| 19 | - function aiconfig( $key, $default = null ) |
|
| 19 | + function aiconfig($key, $default = null) |
|
| 20 | 20 | { |
| 21 | - return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
| 21 | + return app('\Aimeos\Shop\Base\Config')->get()->get($key, $default); |
|
| 22 | 22 | } |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | -if( !function_exists( 'aitrans' ) ) |
|
| 26 | +if (!function_exists('aitrans')) |
|
| 27 | 27 | { |
| 28 | 28 | /** |
| 29 | 29 | * Translates the given message |
@@ -34,16 +34,16 @@ discard block |
||
| 34 | 34 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
| 35 | 35 | * @return string Translated string |
| 36 | 36 | */ |
| 37 | - function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
| 37 | + function aitrans($singular, array $params = array(), $domain = 'client', $locale = null) |
|
| 38 | 38 | { |
| 39 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 39 | + $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); |
|
| 40 | 40 | |
| 41 | - return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
| 41 | + return vsprintf($i18n->dt($domain, $singular), $params); |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
| 46 | -if( !function_exists( 'aitransplural' ) ) |
|
| 46 | +if (!function_exists('aitransplural')) |
|
| 47 | 47 | { |
| 48 | 48 | /** |
| 49 | 49 | * Translates the given messages based on the number |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
| 57 | 57 | * @return string Translated string |
| 58 | 58 | */ |
| 59 | - function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
| 59 | + function aitransplural($singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null) |
|
| 60 | 60 | { |
| 61 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
| 61 | + $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); |
|
| 62 | 62 | |
| 63 | - return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
| 63 | + return vsprintf($i18n->dn($domain, $singular, $plural, $number), $params); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -106,12 +106,12 @@ |
||
| 106 | 106 | }); |
| 107 | 107 | |
| 108 | 108 | |
| 109 | - $this->commands( array( |
|
| 109 | + $this->commands(array( |
|
| 110 | 110 | 'Aimeos\Shop\Command\AccountCommand', |
| 111 | 111 | 'Aimeos\Shop\Command\CacheCommand', |
| 112 | 112 | 'Aimeos\Shop\Command\SetupCommand', |
| 113 | 113 | 'Aimeos\Shop\Command\JobsCommand', |
| 114 | - ) ); |
|
| 114 | + )); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" /> |
| 10 | 10 | <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" /> |
| 11 | 11 | @foreach ($cssFiles as $cssFile) |
| 12 | - <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" /> |
|
| 12 | + <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" /> |
|
| 13 | 13 | @endforeach |
| 14 | 14 | |
| 15 | 15 | <script type="text/javascript"> |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script> |
| 47 | 47 | <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script> |
| 48 | - <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script> |
|
| 48 | + <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script> |
|
| 49 | 49 | |
| 50 | 50 | </head> |
| 51 | 51 | <body> |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | * @param \Aimeos\Shop\Base\Locale $locale Locale object |
| 54 | 54 | * @param \Aimeos\Shop\Base\View $view View object |
| 55 | 55 | */ |
| 56 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
| 56 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
| 57 | 57 | \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, |
| 58 | - \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view ) |
|
| 58 | + \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view) |
|
| 59 | 59 | { |
| 60 | 60 | $this->config = $config; |
| 61 | 61 | $this->aimeos = $aimeos; |
@@ -71,21 +71,21 @@ discard block |
||
| 71 | 71 | * @param string $pageName Name of the configured page |
| 72 | 72 | * @return array Associative list with body and header output separated by client name |
| 73 | 73 | */ |
| 74 | - public function getSections( $pageName ) |
|
| 74 | + public function getSections($pageName) |
|
| 75 | 75 | { |
| 76 | 76 | $context = $this->context->get(); |
| 77 | 77 | $langid = $context->getLocale()->getLanguageId(); |
| 78 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); |
|
| 79 | - $view = $this->view->create( $context, $tmplPaths, $langid ); |
|
| 80 | - $context->setView( $view ); |
|
| 78 | + $tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); |
|
| 79 | + $view = $this->view->create($context, $tmplPaths, $langid); |
|
| 80 | + $context->setView($view); |
|
| 81 | 81 | |
| 82 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); |
|
| 83 | - $page = $context->getConfig()->get( 'page/' . $pageName, array() ); |
|
| 82 | + $result = array('aibody' => array(), 'aiheader' => array()); |
|
| 83 | + $page = $context->getConfig()->get('page/'.$pageName, array()); |
|
| 84 | 84 | |
| 85 | - foreach( (array) $page as $clientName ) |
|
| 85 | + foreach ((array) $page as $clientName) |
|
| 86 | 86 | { |
| 87 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); |
|
| 88 | - $client->setView( clone $view ); |
|
| 87 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); |
|
| 88 | + $client->setView(clone $view); |
|
| 89 | 89 | $client->process(); |
| 90 | 90 | |
| 91 | 91 | $result['aibody'][$clientName] = $client->getBody(); |