@@ -31,15 +31,15 @@ discard block |
||
| 31 | 31 | * @param string $site Unique site code |
| 32 | 32 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 33 | 33 | */ |
| 34 | - public function deleteAction( Request $request, $resource, $site = 'default' ) |
|
| 34 | + public function deleteAction(Request $request, $resource, $site = 'default') |
|
| 35 | 35 | { |
| 36 | 36 | $status = 500; |
| 37 | 37 | $header = $request->headers->all(); |
| 38 | 38 | |
| 39 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 40 | - $result = $client->delete( $request->getContent(), $header, $status ); |
|
| 39 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 40 | + $result = $client->delete($request->getContent(), $header, $status); |
|
| 41 | 41 | |
| 42 | - return $this->createResponse( $result, $status, $header ); |
|
| 42 | + return $this->createResponse($result, $status, $header); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -51,15 +51,15 @@ discard block |
||
| 51 | 51 | * @param string $site Unique site code |
| 52 | 52 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 53 | 53 | */ |
| 54 | - public function getAction( Request $request, $resource, $site = 'default' ) |
|
| 54 | + public function getAction(Request $request, $resource, $site = 'default') |
|
| 55 | 55 | { |
| 56 | 56 | $status = 500; |
| 57 | 57 | $header = $request->headers->all(); |
| 58 | 58 | |
| 59 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 60 | - $result = $client->get( $request->getContent(), $header, $status ); |
|
| 59 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 60 | + $result = $client->get($request->getContent(), $header, $status); |
|
| 61 | 61 | |
| 62 | - return $this->createResponse( $result, $status, $header ); |
|
| 62 | + return $this->createResponse($result, $status, $header); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | * @param string $site Unique site code |
| 72 | 72 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 73 | 73 | */ |
| 74 | - public function patchAction( Request $request, $resource, $site = 'default' ) |
|
| 74 | + public function patchAction(Request $request, $resource, $site = 'default') |
|
| 75 | 75 | { |
| 76 | 76 | $status = 500; |
| 77 | 77 | $header = $request->headers->all(); |
| 78 | 78 | |
| 79 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 80 | - $result = $client->patch( $request->getContent(), $header, $status ); |
|
| 79 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 80 | + $result = $client->patch($request->getContent(), $header, $status); |
|
| 81 | 81 | |
| 82 | - return $this->createResponse( $result, $status, $header ); |
|
| 82 | + return $this->createResponse($result, $status, $header); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | |
@@ -91,15 +91,15 @@ discard block |
||
| 91 | 91 | * @param string $site Unique site code |
| 92 | 92 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 93 | 93 | */ |
| 94 | - public function postAction( Request $request, $resource, $site = 'default' ) |
|
| 94 | + public function postAction(Request $request, $resource, $site = 'default') |
|
| 95 | 95 | { |
| 96 | 96 | $status = 500; |
| 97 | 97 | $header = $request->headers->all(); |
| 98 | 98 | |
| 99 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 100 | - $result = $client->post( $request->getContent(), $header, $status ); |
|
| 99 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 100 | + $result = $client->post($request->getContent(), $header, $status); |
|
| 101 | 101 | |
| 102 | - return $this->createResponse( $result, $status, $header ); |
|
| 102 | + return $this->createResponse($result, $status, $header); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | |
@@ -111,15 +111,15 @@ discard block |
||
| 111 | 111 | * @param string $site Unique site code |
| 112 | 112 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 113 | 113 | */ |
| 114 | - public function putAction( Request $request, $resource, $site = 'default' ) |
|
| 114 | + public function putAction(Request $request, $resource, $site = 'default') |
|
| 115 | 115 | { |
| 116 | 116 | $status = 500; |
| 117 | 117 | $header = $request->headers->all(); |
| 118 | 118 | |
| 119 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 120 | - $result = $client->put( $request->getContent(), $header, $status ); |
|
| 119 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 120 | + $result = $client->put($request->getContent(), $header, $status); |
|
| 121 | 121 | |
| 122 | - return $this->createResponse( $result, $status, $header ); |
|
| 122 | + return $this->createResponse($result, $status, $header); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | |
@@ -131,15 +131,15 @@ discard block |
||
| 131 | 131 | * @param string $site Unique site code |
| 132 | 132 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 133 | 133 | */ |
| 134 | - public function optionsAction( Request $request, $resource = '', $site = 'default' ) |
|
| 134 | + public function optionsAction(Request $request, $resource = '', $site = 'default') |
|
| 135 | 135 | { |
| 136 | 136 | $status = 500; |
| 137 | 137 | $header = $request->headers->all(); |
| 138 | 138 | |
| 139 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 140 | - $result = $client->options( $request->getContent(), $header, $status ); |
|
| 139 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 140 | + $result = $client->options($request->getContent(), $header, $status); |
|
| 141 | 141 | |
| 142 | - return $this->createResponse( $result, $status, $header ); |
|
| 142 | + return $this->createResponse($result, $status, $header); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | |
@@ -151,19 +151,19 @@ discard block |
||
| 151 | 151 | * @param string $lang Language code |
| 152 | 152 | * @return \Aimeos\MShop\Context\Item\Iface Context item |
| 153 | 153 | */ |
| 154 | - protected function createClient( $site, $resource, $lang ) |
|
| 154 | + protected function createClient($site, $resource, $lang) |
|
| 155 | 155 | { |
| 156 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
| 157 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
|
| 156 | + $aimeos = $this->get('aimeos')->get(); |
|
| 157 | + $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates'); |
|
| 158 | 158 | |
| 159 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
| 160 | - $context->setI18n( $this->get('aimeos_i18n')->get( array( $lang, 'en' ) ) ); |
|
| 161 | - $context->setLocale( $this->get('aimeos_locale')->getBackend( $context, $site ) ); |
|
| 159 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
| 160 | + $context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en'))); |
|
| 161 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, $site)); |
|
| 162 | 162 | |
| 163 | - $view = $this->get('aimeos_view')->create( $context, $templatePaths, $lang ); |
|
| 164 | - $context->setView( $view ); |
|
| 163 | + $view = $this->get('aimeos_view')->create($context, $templatePaths, $lang); |
|
| 164 | + $context->setView($view); |
|
| 165 | 165 | |
| 166 | - return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 166 | + return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | |
@@ -175,14 +175,14 @@ discard block |
||
| 175 | 175 | * @param array $header List of HTTP headers |
| 176 | 176 | * @return Response HTTP response object |
| 177 | 177 | */ |
| 178 | - protected function createResponse( $content, $status, array $header ) |
|
| 178 | + protected function createResponse($content, $status, array $header) |
|
| 179 | 179 | { |
| 180 | 180 | $response = new Response(); |
| 181 | - $response->setContent( $content ); |
|
| 182 | - $response->setStatusCode( $status ); |
|
| 181 | + $response->setContent($content); |
|
| 182 | + $response->setStatusCode($status); |
|
| 183 | 183 | |
| 184 | - foreach( $header as $key => $value ) { |
|
| 185 | - $response->headers->set( $key, $value ); |
|
| 184 | + foreach ($header as $key => $value) { |
|
| 185 | + $response->headers->set($key, $value); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | return $response; |
@@ -30,63 +30,63 @@ discard block |
||
| 30 | 30 | * @param Request $request Symfony request object |
| 31 | 31 | * @return Response Generated output for the admin interface |
| 32 | 32 | */ |
| 33 | - public function indexAction( Request $request ) |
|
| 33 | + public function indexAction(Request $request) |
|
| 34 | 34 | { |
| 35 | - $site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) ); |
|
| 36 | - $lang = $request->attributes->get( 'lang', $request->query->get( 'lang', 'en' ) ); |
|
| 37 | - $tab = $request->attributes->get( 'tab', $request->query->get( 'tab', 0 ) ); |
|
| 35 | + $site = $request->attributes->get('site', $request->query->get('site', 'default')); |
|
| 36 | + $lang = $request->attributes->get('lang', $request->query->get('lang', 'en')); |
|
| 37 | + $tab = $request->attributes->get('tab', $request->query->get('tab', 0)); |
|
| 38 | 38 | |
| 39 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
| 40 | - $context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) ); |
|
| 39 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
| 40 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, $site)); |
|
| 41 | 41 | |
| 42 | - $aimeos = $this->get( 'aimeos' ); |
|
| 42 | + $aimeos = $this->get('aimeos'); |
|
| 43 | 43 | $bootstrap = $aimeos->get(); |
| 44 | 44 | |
| 45 | - $cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' ); |
|
| 46 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
| 45 | + $cntlPaths = $bootstrap->getCustomPaths('controller/extjs'); |
|
| 46 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
| 47 | 47 | $cssFiles = array(); |
| 48 | 48 | |
| 49 | - foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
| 49 | + foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths) |
|
| 50 | 50 | { |
| 51 | - foreach( $paths as $path ) |
|
| 51 | + foreach ($paths as $path) |
|
| 52 | 52 | { |
| 53 | - $jsbAbsPath = $base . '/' . $path; |
|
| 53 | + $jsbAbsPath = $base.'/'.$path; |
|
| 54 | 54 | |
| 55 | - if( !is_file( $jsbAbsPath ) ) { |
|
| 56 | - throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) ); |
|
| 55 | + if (!is_file($jsbAbsPath)) { |
|
| 56 | + throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath)); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) ); |
|
| 60 | - $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) ); |
|
| 59 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path)); |
|
| 60 | + $cssFiles = array_merge($cssFiles, $jsb2->getUrls('css')); |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - $params = array( 'site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}' ); |
|
| 65 | - $adminUrl = $this->generateUrl( 'aimeos_shop_extadm', $params ); |
|
| 64 | + $params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}'); |
|
| 65 | + $adminUrl = $this->generateUrl('aimeos_shop_extadm', $params); |
|
| 66 | 66 | |
| 67 | - $token = $this->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' )->getValue(); |
|
| 68 | - $jsonUrl = $this->generateUrl( 'aimeos_shop_extadm_json', array( '_token' => $token, 'site' => $site ) ); |
|
| 67 | + $token = $this->get('security.csrf.token_manager')->getToken('aimeos_admin_token')->getValue(); |
|
| 68 | + $jsonUrl = $this->generateUrl('aimeos_shop_extadm_json', array('_token' => $token, 'site' => $site)); |
|
| 69 | 69 | |
| 70 | - $jqadmUrl = $this->generateUrl( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) ); |
|
| 70 | + $jqadmUrl = $this->generateUrl('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product')); |
|
| 71 | 71 | |
| 72 | 72 | $vars = array( |
| 73 | 73 | 'lang' => $lang, |
| 74 | 74 | 'cssFiles' => $cssFiles, |
| 75 | 75 | 'languages' => $this->getJsonLanguages(), |
| 76 | - 'config' => $this->getJsonClientConfig( $context ), |
|
| 77 | - 'site' => $this->getJsonSiteItem( $context, $site ), |
|
| 78 | - 'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ), |
|
| 76 | + 'config' => $this->getJsonClientConfig($context), |
|
| 77 | + 'site' => $this->getJsonSiteItem($context, $site), |
|
| 78 | + 'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang), |
|
| 79 | 79 | 'searchSchemas' => $controller->getJsonSearchSchemas(), |
| 80 | 80 | 'itemSchemas' => $controller->getJsonItemSchemas(), |
| 81 | - 'smd' => $controller->getJsonSmd( $jsonUrl ), |
|
| 82 | - 'urlTemplate' => urldecode( $adminUrl ), |
|
| 83 | - 'uploaddir' => $this->container->getParameter( 'aimeos_shop.uploaddir' ), |
|
| 81 | + 'smd' => $controller->getJsonSmd($jsonUrl), |
|
| 82 | + 'urlTemplate' => urldecode($adminUrl), |
|
| 83 | + 'uploaddir' => $this->container->getParameter('aimeos_shop.uploaddir'), |
|
| 84 | 84 | 'version' => $aimeos->getVersion(), |
| 85 | 85 | 'jqadmurl' => $jqadmUrl, |
| 86 | 86 | 'activeTab' => $tab, |
| 87 | 87 | ); |
| 88 | 88 | |
| 89 | - return $this->render( 'AimeosShopBundle:Extadm:index.html.twig', $vars ); |
|
| 89 | + return $this->render('AimeosShopBundle:Extadm:index.html.twig', $vars); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | |
@@ -96,23 +96,23 @@ discard block |
||
| 96 | 96 | * @param Request $request Symfony request object |
| 97 | 97 | * @return Response JSON RPC message response |
| 98 | 98 | */ |
| 99 | - public function doAction( Request $request ) |
|
| 99 | + public function doAction(Request $request) |
|
| 100 | 100 | { |
| 101 | 101 | $csrfProvider = $this->get('security.csrf.token_manager'); |
| 102 | 102 | |
| 103 | - if( $csrfProvider->isTokenValid( new CsrfToken( 'aimeos_admin_token', $request->query->get( '_token' ) ) ) !== true ) { |
|
| 104 | - throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException( 'CSRF token is invalid' ); |
|
| 103 | + if ($csrfProvider->isTokenValid(new CsrfToken('aimeos_admin_token', $request->query->get('_token'))) !== true) { |
|
| 104 | + throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException('CSRF token is invalid'); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - $cntlPaths = $this->get( 'aimeos' )->get()->getCustomPaths( 'controller/extjs' ); |
|
| 108 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
| 109 | - $context->setView( $this->get( 'aimeos_view' )->create( $context, array() ) ); |
|
| 110 | - $context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, 'default' ) ); |
|
| 107 | + $cntlPaths = $this->get('aimeos')->get()->getCustomPaths('controller/extjs'); |
|
| 108 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
| 109 | + $context->setView($this->get('aimeos_view')->create($context, array())); |
|
| 110 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, 'default')); |
|
| 111 | 111 | |
| 112 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
| 112 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
| 113 | 113 | |
| 114 | - $response = $controller->process( $request->request->all(), $request->getContent() ); |
|
| 115 | - return $this->render( 'AimeosShopBundle:Extadm:do.html.twig', array( 'output' => $response ) ); |
|
| 114 | + $response = $controller->process($request->request->all(), $request->getContent()); |
|
| 115 | + return $this->render('AimeosShopBundle:Extadm:do.html.twig', array('output' => $response)); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | |
@@ -125,27 +125,27 @@ discard block |
||
| 125 | 125 | { |
| 126 | 126 | $contents = ''; |
| 127 | 127 | $jsFiles = array(); |
| 128 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
| 128 | + $aimeos = $this->get('aimeos')->get(); |
|
| 129 | 129 | |
| 130 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
| 130 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
| 131 | 131 | { |
| 132 | - foreach( $paths as $path ) |
|
| 132 | + foreach ($paths as $path) |
|
| 133 | 133 | { |
| 134 | - $jsbAbsPath = $base . '/' . $path; |
|
| 135 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
| 136 | - $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) ); |
|
| 134 | + $jsbAbsPath = $base.'/'.$path; |
|
| 135 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
| 136 | + $jsFiles = array_merge($jsFiles, $jsb2->getFiles('js')); |
|
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - foreach( $jsFiles as $file ) |
|
| 140 | + foreach ($jsFiles as $file) |
|
| 141 | 141 | { |
| 142 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
| 142 | + if (($content = file_get_contents($file)) !== false) { |
|
| 143 | 143 | $contents .= $content; |
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - $response = new Response( $contents ); |
|
| 148 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
| 147 | + $response = new Response($contents); |
|
| 148 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
| 149 | 149 | |
| 150 | 150 | return $response; |
| 151 | 151 | } |
@@ -160,11 +160,11 @@ discard block |
||
| 160 | 160 | { |
| 161 | 161 | $result = array(); |
| 162 | 162 | |
| 163 | - foreach( $this->get( 'aimeos' )->get()->getI18nList( 'admin' ) as $id ) { |
|
| 164 | - $result[] = array( 'id' => $id, 'label' => $id ); |
|
| 163 | + foreach ($this->get('aimeos')->get()->getI18nList('admin') as $id) { |
|
| 164 | + $result[] = array('id' => $id, 'label' => $id); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - return json_encode( $result ); |
|
| 167 | + return json_encode($result); |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | |
@@ -174,10 +174,10 @@ discard block |
||
| 174 | 174 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object |
| 175 | 175 | * @return string JSON encoded configuration object |
| 176 | 176 | */ |
| 177 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 177 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 178 | 178 | { |
| 179 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); |
|
| 180 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); |
|
| 179 | + $config = $context->getConfig()->get('admin/extjs', array()); |
|
| 180 | + return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | |
@@ -188,16 +188,16 @@ discard block |
||
| 188 | 188 | * @param string $lang ISO language code like "en" or "en_GB" |
| 189 | 189 | * @return string JSON encoded translation object |
| 190 | 190 | */ |
| 191 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) |
|
| 191 | + protected function getJsonClientI18n(array $i18nPaths, $lang) |
|
| 192 | 192 | { |
| 193 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang ); |
|
| 193 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang); |
|
| 194 | 194 | |
| 195 | 195 | $content = array( |
| 196 | - 'admin' => $i18n->getAll( 'admin' ), |
|
| 197 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), |
|
| 196 | + 'admin' => $i18n->getAll('admin'), |
|
| 197 | + 'admin/ext' => $i18n->getAll('admin/ext'), |
|
| 198 | 198 | ); |
| 199 | 199 | |
| 200 | - return json_encode( $content, JSON_FORCE_OBJECT ); |
|
| 200 | + return json_encode($content, JSON_FORCE_OBJECT); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | |
@@ -209,18 +209,18 @@ discard block |
||
| 209 | 209 | * @return string JSON encoded site item object |
| 210 | 210 | * @throws Exception If no site item was found for the code |
| 211 | 211 | */ |
| 212 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 212 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 213 | 213 | { |
| 214 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
| 214 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
| 215 | 215 | |
| 216 | 216 | $criteria = $manager->createSearch(); |
| 217 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); |
|
| 218 | - $items = $manager->searchItems( $criteria ); |
|
| 217 | + $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); |
|
| 218 | + $items = $manager->searchItems($criteria); |
|
| 219 | 219 | |
| 220 | - if( ( $item = reset( $items ) ) === false ) { |
|
| 221 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); |
|
| 220 | + if (($item = reset($items)) === false) { |
|
| 221 | + throw new \Exception(sprintf('No site found for code "%1$s"', $site)); |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | - return json_encode( $item->toArray() ); |
|
| 224 | + return json_encode($item->toArray()); |
|
| 225 | 225 | } |
| 226 | 226 | } |
@@ -29,35 +29,35 @@ discard block |
||
| 29 | 29 | * @param $type File type, i.e. "css" or "js" |
| 30 | 30 | * @return Response Response object |
| 31 | 31 | */ |
| 32 | - public function fileAction( $type ) |
|
| 32 | + public function fileAction($type) |
|
| 33 | 33 | { |
| 34 | 34 | $contents = ''; |
| 35 | 35 | $files = array(); |
| 36 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
| 36 | + $aimeos = $this->get('aimeos')->get(); |
|
| 37 | 37 | |
| 38 | - foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths ) |
|
| 38 | + foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths) |
|
| 39 | 39 | { |
| 40 | - foreach( $paths as $path ) |
|
| 40 | + foreach ($paths as $path) |
|
| 41 | 41 | { |
| 42 | - $jsbAbsPath = $base . '/' . $path; |
|
| 43 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
| 44 | - $files = array_merge( $files, $jsb2->getFiles( $type ) ); |
|
| 42 | + $jsbAbsPath = $base.'/'.$path; |
|
| 43 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
| 44 | + $files = array_merge($files, $jsb2->getFiles($type)); |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - foreach( $files as $file ) |
|
| 48 | + foreach ($files as $file) |
|
| 49 | 49 | { |
| 50 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
| 50 | + if (($content = file_get_contents($file)) !== false) { |
|
| 51 | 51 | $contents .= $content; |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - $response = new Response( $contents ); |
|
| 55 | + $response = new Response($contents); |
|
| 56 | 56 | |
| 57 | - if( $type === 'js' ) { |
|
| 58 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
| 59 | - } elseif( $type === 'css' ) { |
|
| 60 | - $response->headers->set( 'Content-Type', 'text/css' ); |
|
| 57 | + if ($type === 'js') { |
|
| 58 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
| 59 | + } elseif ($type === 'css') { |
|
| 60 | + $response->headers->set('Content-Type', 'text/css'); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | return $response; |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | * @param string $site Unique site code |
| 73 | 73 | * @return Response Generated output |
| 74 | 74 | */ |
| 75 | - public function copyAction( Request $request, $resource, $site = 'default' ) |
|
| 75 | + public function copyAction(Request $request, $resource, $site = 'default') |
|
| 76 | 76 | { |
| 77 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 78 | - return $this->getHtml( $cntl->copy() ); |
|
| 77 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 78 | + return $this->getHtml($cntl->copy()); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | |
@@ -87,10 +87,10 @@ discard block |
||
| 87 | 87 | * @param string $site Unique site code |
| 88 | 88 | * @return Response Generated output |
| 89 | 89 | */ |
| 90 | - public function createAction( Request $request, $resource, $site = 'default' ) |
|
| 90 | + public function createAction(Request $request, $resource, $site = 'default') |
|
| 91 | 91 | { |
| 92 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 93 | - return $this->getHtml( $cntl->create() ); |
|
| 92 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 93 | + return $this->getHtml($cntl->create()); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | |
@@ -102,10 +102,10 @@ discard block |
||
| 102 | 102 | * @param string $site Unique site code |
| 103 | 103 | * @return Response Generated output |
| 104 | 104 | */ |
| 105 | - public function deleteAction( Request $request, $resource, $site = 'default' ) |
|
| 105 | + public function deleteAction(Request $request, $resource, $site = 'default') |
|
| 106 | 106 | { |
| 107 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 108 | - return $this->getHtml( $cntl->delete() . $cntl->search() ); |
|
| 107 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 108 | + return $this->getHtml($cntl->delete().$cntl->search()); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | |
@@ -117,10 +117,10 @@ discard block |
||
| 117 | 117 | * @param string $site Unique site code |
| 118 | 118 | * @return Response Generated output |
| 119 | 119 | */ |
| 120 | - public function getAction( Request $request, $resource, $site = 'default' ) |
|
| 120 | + public function getAction(Request $request, $resource, $site = 'default') |
|
| 121 | 121 | { |
| 122 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 123 | - return $this->getHtml( $cntl->get() ); |
|
| 122 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 123 | + return $this->getHtml($cntl->get()); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | |
@@ -132,10 +132,10 @@ discard block |
||
| 132 | 132 | * @param string $site Unique site code |
| 133 | 133 | * @return Response Generated output |
| 134 | 134 | */ |
| 135 | - public function saveAction( Request $request, $resource, $site = 'default' ) |
|
| 135 | + public function saveAction(Request $request, $resource, $site = 'default') |
|
| 136 | 136 | { |
| 137 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 138 | - return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) ); |
|
| 137 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 138 | + return $this->getHtml(($cntl->save() ?: $cntl->search())); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
@@ -147,10 +147,10 @@ discard block |
||
| 147 | 147 | * @param string $site Unique site code |
| 148 | 148 | * @return Response Generated output |
| 149 | 149 | */ |
| 150 | - public function searchAction( Request $request, $resource, $site = 'default' ) |
|
| 150 | + public function searchAction(Request $request, $resource, $site = 'default') |
|
| 151 | 151 | { |
| 152 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 153 | - return $this->getHtml( $cntl->search() ); |
|
| 152 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 153 | + return $this->getHtml($cntl->search()); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | |
@@ -162,21 +162,21 @@ discard block |
||
| 162 | 162 | * @param string $resource Resource location, e.g. "product" |
| 163 | 163 | * @return \Aimeos\Admin\JQAdm\Iface Context item |
| 164 | 164 | */ |
| 165 | - protected function createClient( Request $request, $site, $resource ) |
|
| 165 | + protected function createClient(Request $request, $site, $resource) |
|
| 166 | 166 | { |
| 167 | - $lang = $request->get( 'lang', 'en' ); |
|
| 167 | + $lang = $request->get('lang', 'en'); |
|
| 168 | 168 | |
| 169 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
| 170 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
| 169 | + $aimeos = $this->get('aimeos')->get(); |
|
| 170 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
| 171 | 171 | |
| 172 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
| 173 | - $context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) ); |
|
| 174 | - $context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) ); |
|
| 172 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
| 173 | + $context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en'))); |
|
| 174 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, $site)); |
|
| 175 | 175 | |
| 176 | - $view = $this->get( 'aimeos_view' )->create( $context, $templatePaths, $lang ); |
|
| 177 | - $context->setView( $view ); |
|
| 176 | + $view = $this->get('aimeos_view')->create($context, $templatePaths, $lang); |
|
| 177 | + $context->setView($view); |
|
| 178 | 178 | |
| 179 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 179 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | |
@@ -186,11 +186,11 @@ discard block |
||
| 186 | 186 | * @param string $content Content from admin client |
| 187 | 187 | * @return Response View for rendering the output |
| 188 | 188 | */ |
| 189 | - protected function getHtml( $content ) |
|
| 189 | + protected function getHtml($content) |
|
| 190 | 190 | { |
| 191 | - $version = $this->get( 'aimeos' )->getVersion(); |
|
| 192 | - $content = str_replace( array( '{type}', '{version}' ), array( 'Symfony', $version ), $content ); |
|
| 191 | + $version = $this->get('aimeos')->getVersion(); |
|
| 192 | + $content = str_replace(array('{type}', '{version}'), array('Symfony', $version), $content); |
|
| 193 | 193 | |
| 194 | - return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) ); |
|
| 194 | + return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content)); |
|
| 195 | 195 | } |
| 196 | 196 | } |