aimeos / ai-admin-jqadm

admin/jqadm/templates/common/partials/navsearch-standard.php

Spacing +21 added lines, -21 removed lines

@@ -17,49 +17,49 @@
  */
 
 
-$selected = function( array $filter, $key, $code ) {
-	return ( isset( $filter[$key][0] ) && $filter[$key][0] == $code ? 'selected="selected"' : '' );
+$selected = function(array $filter, $key, $code) {
+	return (isset($filter[$key][0]) && $filter[$key][0] == $code ? 'selected="selected"' : '');
 };
 
 
-$target = $this->config( 'admin/jqadm/url/search/target' );
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
+$target = $this->config('admin/jqadm/url/search/target');
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/search/action', 'search');
+$config = $this->config('admin/jqadm/url/search/config', []);
 
-$filter = $this->get( 'filter', [] );
-$params = $this->get( 'params', [] );
+$filter = $this->get('filter', []);
+$params = $this->get('params', []);
 $params['page']['start'] = 0;
-unset( $params['filter'] );
+unset($params['filter']);
 
 $enc = $this->encoder();
 
 
 ?>
-<form class="form-inline" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $params, [], $config ) ); ?>">
+<form class="form-inline" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $params, [], $config)); ?>">
 	<?= $this->csrf()->formfield(); ?>
 
 	<i class="fa more"></i>
 
 	<div class="input-group">
-		<select class="custom-select filter-key" name="<?= $this->formparam( ['filter', 'key', '0'] ); ?>">
-			<?php foreach( $this->get( 'filterAttributes', [] ) as $code => $attrItem ) : ?>
-				<?php if( $attrItem->isPublic() ) : ?>
-					<option value="<?= $enc->attr( $code ); ?>" data-type="<?= $enc->attr( $attrItem->getType() ); ?>" <?= $selected( $filter, 'key', $code ); ?> >
-						<?= $enc->html( $this->translate( 'admin/ext', $attrItem->getLabel() ) ); ?>
+		<select class="custom-select filter-key" name="<?= $this->formparam(['filter', 'key', '0']); ?>">
+			<?php foreach ($this->get('filterAttributes', []) as $code => $attrItem) : ?>
+				<?php if ($attrItem->isPublic()) : ?>
+					<option value="<?= $enc->attr($code); ?>" data-type="<?= $enc->attr($attrItem->getType()); ?>" <?= $selected($filter, 'key', $code); ?> >
+						<?= $enc->html($this->translate('admin/ext', $attrItem->getLabel())); ?>
 					</option>
 				<?php endif; ?>
 			<?php endforeach; ?>
 		</select>
-		<select class="custom-select filter-operator" name="<?= $this->formparam( ['filter', 'op', '0'] ); ?>">
-			<?php foreach( $this->get( 'filterOperators/compare', [] ) as $code ) : ?>
-				<option value="<?= $enc->attr( $code ); ?>" <?= $selected( $filter, 'op', $code ); ?> >
-					<?= $enc->html( $code ) . ( strlen( $code ) === 1 ? '&nbsp;' : '' ); ?>&nbsp;&nbsp;<?= $enc->html( $this->translate( 'admin/ext', $code ) ); ?>
+		<select class="custom-select filter-operator" name="<?= $this->formparam(['filter', 'op', '0']); ?>">
+			<?php foreach ($this->get('filterOperators/compare', []) as $code) : ?>
+				<option value="<?= $enc->attr($code); ?>" <?= $selected($filter, 'op', $code); ?> >
+					<?= $enc->html($code) . (strlen($code) === 1 ? '&nbsp;' : ''); ?>&nbsp;&nbsp;<?= $enc->html($this->translate('admin/ext', $code)); ?>
 				</option>
 			<?php endforeach; ?>
 		</select>
-		<input type="text" class="form-control filter-value" name="<?= $this->formparam( ['filter', 'val', '0'] ); ?>"
-			 value="<?= $enc->attr( ( isset( $filter['val'][0] ) ? $filter['val'][0] : '' ) ); ?>" >
+		<input type="text" class="form-control filter-value" name="<?= $this->formparam(['filter', 'val', '0']); ?>"
+			 value="<?= $enc->attr((isset($filter['val'][0]) ? $filter['val'][0] : '')); ?>" >
 		<div class="input-group-append">
 			<button class="btn btn-primary fa fa-search"></button>
 		</div>

admin/jqadm/src/Admin/JQAdm/Group/Standard.php

Braces +13 added lines, -26 removed lines

@@ -88,14 +88,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@ 
 
 			$this->nextAction( $view, 'search', 'group', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@ 
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@ 
 
 			$this->nextAction( $view, $view->param( 'next' ), 'group', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,14 +316,12 @@ 
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Doc Comments +1 added lines, -1 removed lines

@@ -464,7 +464,7 @@
 	 * Creates new and updates existing items using the data array
 	 *
 	 * @param string[] Data array
-	 * @return \Aimeos\MShop\Group\Item\Iface New group item object
+	 * @return \Aimeos\MShop\Common\Item\Iface New group item object
 	 */
 	protected function fromArray( array $data )
 	{

Spacing +102 added lines, -102 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Group;
 
-sprintf( 'group' ); // for translation
+sprintf('group'); // for translation
 
 
 /**
@@ -35,37 +35,37 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
-			$view->item = $manager->getItem( $id );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
+			$view->item = $manager->getItem($id);
 
-			$view->itemData = $this->toArray( $view->item, true );
+			$view->itemData = $this->toArray($view->item, true);
 			$view->itemSubparts = $this->getSubClientNames();
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -81,10 +81,10 @@ 
 
 		try
 		{
-			$data = $view->param( 'item', [] );
+			$data = $view->param('item', []);
 
-			if( !isset( $view->item ) ) {
-				$view->item = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' )->createItem();
+			if (!isset($view->item)) {
+				$view->item = \Aimeos\MShop\Factory::createManager($context, 'customer/group')->createItem();
 			}
 
 			$data['customer.group.siteid'] = $view->item->getSiteId();
@@ -93,26 +93,26 @@ 
 			$view->itemData = $data;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -126,38 +126,38 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 		$manager->begin();
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$view->item = $manager->getItem( $id );
+			$view->item = $manager->getItem($id);
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$client->delete();
 			}
 
-			$manager->deleteItem( $id );
+			$manager->deleteItem($id);
 			$manager->commit();
 
-			$this->nextAction( $view, 'search', 'group', null, 'delete' );
+			$this->nextAction($view, 'search', 'group', null, 'delete');
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -178,37 +178,37 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'id' ) ) === null ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Required parameter "%1$s" is missing', 'id' ) );
+			if (($id = $view->param('id')) === null) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Required parameter "%1$s" is missing', 'id'));
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 
-			$view->item = $manager->getItem( $id );
+			$view->item = $manager->getItem($id);
 			$view->itemSubparts = $this->getSubClientNames();
-			$view->itemData = $this->toArray( $view->item );
+			$view->itemData = $this->toArray($view->item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $idx => $client )
+			foreach ($this->getSubClients() as $idx => $client)
 			{
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -222,40 +222,40 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
 		$manager->begin();
 
 		try
 		{
-			$item = $this->fromArray( $view->param( 'item', [] ) );
-			$view->item = $item->getId() ? $item : $manager->saveItem( $item );
+			$item = $this->fromArray($view->param('item', []));
+			$view->item = $item->getId() ? $item : $manager->saveItem($item);
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->save();
 			}
 
-			$manager->saveItem( clone $view->item );
+			$manager->saveItem(clone $view->item);
 			$manager->commit();
 
-			$this->nextAction( $view, $view->param( 'next' ), 'group', $view->item->getId(), 'save' );
+			$this->nextAction($view, $view->param('next'), 'group', $view->item->getId(), 'save');
 			return;
 		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		catch (\Aimeos\Admin\JQAdm\Exception $e)
 		{
 			// fall through to create
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		$manager->rollback();
@@ -277,31 +277,31 @@ 
 		try
 		{
 			$total = 0;
-			$params = $this->storeSearchParams( $view->param(), 'group' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
-			$search = $this->initCriteria( $manager->createSearch(), $params );
+			$params = $this->storeSearchParams($view->param(), 'group');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
+			$search = $this->initCriteria($manager->createSearch(), $params);
 
-			$view->items = $manager->searchItems( $search, [], $total );
-			$view->filterAttributes = $manager->getSearchAttributes( true );
+			$view->items = $manager->searchItems($search, [], $total);
+			$view->filterAttributes = $manager->getSearchAttributes(true);
 			$view->filterOperators = $search->getOperators();
 			$view->total = $total;
 			$view->itemBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->itemBody .= $client->search();
 			}
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'group-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('group-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		/** admin/jqadm/group/template-list
@@ -326,7 +326,7 @@ 
 		$tplconf = 'admin/jqadm/group/template-list';
 		$default = 'group/list-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -337,7 +337,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/group/decorators/excludes
 		 * Excludes decorators added by the "common" option from the group JQAdm client
@@ -412,7 +412,7 @@ 
 		 * @see admin/jqadm/group/decorators/excludes
 		 * @see admin/jqadm/group/decorators/global
 		 */
-		return $this->createSubClient( 'group/' . $type, $name );
+		return $this->createSubClient('group/' . $type, $name);
 	}
 
 
@@ -456,7 +456,7 @@ 
 		 * @since 2018.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/group/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/group/standard/subparts', []);
 	}
 
 
@@ -467,17 +467,17 @@ 
 	 * @param string[] Data array
 	 * @return \Aimeos\MShop\Group\Item\Iface New group item object
 	 */
-	protected function fromArray( array $data )
+	protected function fromArray(array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/group');
 
-		if( isset( $data['customer.group.id'] ) && $data['customer.group.id'] != '' ) {
-			$item = $manager->getItem( $data['customer.group.id'] );
+		if (isset($data['customer.group.id']) && $data['customer.group.id'] != '') {
+			$item = $manager->getItem($data['customer.group.id']);
 		} else {
 			$item = $manager->createItem();
 		}
 
-		$item->fromArray( $data );
+		$item->fromArray($data);
 
 		return $item;
 	}
@@ -489,11 +489,11 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Group\Iface $item Group item object
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Customer\Item\Group\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Customer\Item\Group\Iface $item, $copy = false)
 	{
-		$data = $item->toArray( true );
+		$data = $item->toArray(true);
 
-		if( $copy === true )
+		if ($copy === true)
 		{
 			$data['customer.group.siteid'] = $this->getContext()->getLocale()->getSiteId();
 			$data['customer.group.id'] = '';
@@ -509,7 +509,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/group/template-item
 		 * Relative path to the HTML body template for the group item.
@@ -533,6 +533,6 @@ 
 		$tplconf = 'admin/jqadm/group/template-item';
 		$default = 'group/item-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }

admin/jqadm/src/Admin/JQAdm/Group/Factory.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return \Aimeos\Admin\JQAdm\Iface Filter part implementing \Aimeos\Admin\JQAdm\Iface
 	 * @throws \Aimeos\Admin\JQAdm\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** admin/jqadm/group/name
 		 * Class name of the used account favorite client implementation
@@ -64,22 +64,22 @@ 
 		 * @since 2018.07
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jqadm/group/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jqadm/group/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JQAdm\\Group\\' . $name : '<not a string>';
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JQAdm\\Group\\' . $name : '<not a string>';
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Admin\\JQAdm\\Iface';
 		$classname = '\\Aimeos\\Admin\\JQAdm\\Group\\' . $name;
 
-		$client = self::createClientBase( $context, $classname, $iface );
+		$client = self::createClientBase($context, $classname, $iface);
 
-		return self::addClientDecorators( $context, $client, 'group' );
+		return self::addClientDecorators($context, $client, 'group');
 	}
 
 }
\ No newline at end of file

admin/jqadm/tests/Admin/JQAdm/Group/StandardTest.php

Spacing +120 added lines, -120 removed lines

@@ -21,16 +21,16 @@ 
 		$this->view = \TestHelperJqadm::getView();
 		$this->context = \TestHelperJqadm::getContext();
 
-		$this->object = new \Aimeos\Admin\JQAdm\Group\Standard( $this->context );
-		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page( $this->object, $this->context );
-		$this->object->setAimeos( \TestHelperJqadm::getAimeos() );
-		$this->object->setView( $this->view );
+		$this->object = new \Aimeos\Admin\JQAdm\Group\Standard($this->context);
+		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page($this->object, $this->context);
+		$this->object->setAimeos(\TestHelperJqadm::getAimeos());
+		$this->object->setView($this->view);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->view, $this->context );
+		unset($this->object, $this->view, $this->context);
 	}
 
 
@@ -42,15 +42,15 @@ 
 
 	public function testCreateException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->create();
 	}
@@ -58,15 +58,15 @@ 
 
 	public function testCreateMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->create();
 	}
@@ -74,29 +74,29 @@ 
 
 	public function testCopy()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/group');
 
-		$param = ['type' => 'unittest', 'id' => $manager->findItem( 'unitgroup' )->getId()];
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$param = ['type' => 'unittest', 'id' => $manager->findItem('unitgroup')->getId()];
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->copy();
 
-		$this->assertContains( 'unitgroup', $result );
+		$this->assertContains('unitgroup', $result);
 	}
 
 
 	public function testCopyException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->copy();
 	}
@@ -104,15 +104,15 @@ 
 
 	public function testCopyMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->copy();
 	}
@@ -120,21 +120,21 @@ 
 
 	public function testDelete()
 	{
-		$this->assertNotNull( $this->object->delete() );
+		$this->assertNotNull($this->object->delete());
 	}
 
 
 	public function testDeleteException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients', 'search' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients', 'search'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->delete();
 	}
@@ -142,15 +142,15 @@ 
 
 	public function testDeleteMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients', 'search' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients', 'search'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->delete();
 	}
@@ -158,29 +158,29 @@ 
 
 	public function testGet()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/group');
 
-		$param = ['type' => 'unittest', 'id' => $manager->findItem( 'unitgroup' )->getId()];
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$param = ['type' => 'unittest', 'id' => $manager->findItem('unitgroup')->getId()];
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->get();
 
-		$this->assertContains( 'unitgroup', $result );
+		$this->assertContains('unitgroup', $result);
 	}
 
 
 	public function testGetException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->get();
 	}
@@ -188,15 +188,15 @@ 
 
 	public function testGetMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'getSubClients' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('getSubClients'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'getSubClients' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('getSubClients')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->get();
 	}
@@ -204,16 +204,16 @@ 
 
 	public function testGetViewException()
 	{
-		$object = new \Aimeos\Admin\JQAdm\Group\Standard( $this->context, [] );
+		$object = new \Aimeos\Admin\JQAdm\Group\Standard($this->context, []);
 
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
 		$object->getView();
 	}
 
 
 	public function testSave()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/group');
 
 		$param = array(
 			'type' => 'unittest',
@@ -224,26 +224,26 @@ 
 			),
 		);
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$this->object->save();
 
-		$manager->deleteItem( $manager->findItem( 'jqadm@test' )->getId() );
+		$manager->deleteItem($manager->findItem('jqadm@test')->getId());
 	}
 
 
 	public function testSaveException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'fromArray' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('fromArray'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'fromArray' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('fromArray')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->save();
 	}
@@ -251,15 +251,15 @@ 
 
 	public function testSaveMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'fromArray' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('fromArray'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'fromArray' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('fromArray')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->save();
 	}
@@ -267,15 +267,15 @@ 
 
 	public function testSaveJQAdmException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'fromArray' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('fromArray'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'fromArray' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('fromArray')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->save();
 	}
@@ -286,32 +286,32 @@ 
 		$param = array(
 			'type' => 'unittest', 'lang' => 'de',
 			'filter' => array(
-				'key' => array( 0 => 'customer.group.code' ),
-				'op' => array( 0 => '==' ),
-				'val' => array( 0 => 'unitgroup' ),
+				'key' => array(0 => 'customer.group.code'),
+				'op' => array(0 => '=='),
+				'val' => array(0 => 'unitgroup'),
 			),
-			'sort' => array( '-customer.group.id' ),
+			'sort' => array('-customer.group.id'),
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $param );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $param);
+		$this->view->addHelper('param', $helper);
 
 		$result = $this->object->search();
 
-		$this->assertContains( '>unitgroup<', $result );
+		$this->assertContains('>unitgroup<', $result);
 	}
 
 
 	public function testSearchException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'initCriteria' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('initCriteria'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'initCriteria' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('initCriteria')
+			->will($this->throwException(new \RuntimeException()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->search();
 	}
@@ -319,15 +319,15 @@ 
 
 	public function testSearchMShopException()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Admin\JQAdm\Group\Standard' )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( array( 'initCriteria' ) )
+		$object = $this->getMockBuilder('\Aimeos\Admin\JQAdm\Group\Standard')
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods(array('initCriteria'))
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'initCriteria' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$object->expects($this->once())->method('initCriteria')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$object->setView( $this->getViewNoRender() );
+		$object->setView($this->getViewNoRender());
 
 		$object->search();
 	}
@@ -335,33 +335,33 @@ 
 
 	public function testGetSubClientInvalid()
 	{
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
-		$this->object->getSubClient( '$unknown$' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
+		$this->object->getSubClient('$unknown$');
 	}
 
 
 	public function testGetSubClientUnknown()
 	{
-		$this->setExpectedException( '\Aimeos\Admin\JQAdm\Exception' );
-		$this->object->getSubClient( 'unknown' );
+		$this->setExpectedException('\Aimeos\Admin\JQAdm\Exception');
+		$this->object->getSubClient('unknown');
 	}
 
 
 	protected function getViewNoRender()
 	{
-		$view = $this->getMockBuilder( '\Aimeos\MW\View\Standard' )
-			->setConstructorArgs( array( [] ) )
-			->setMethods( array( 'render', 'config' ) )
+		$view = $this->getMockBuilder('\Aimeos\MW\View\Standard')
+			->setConstructorArgs(array([]))
+			->setMethods(array('render', 'config'))
 			->getMock();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/group' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/group');
 
-		$param = ['type' => 'unittest', 'id' => $manager->findItem( 'unitgroup' )->getId()];
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $param );
-		$view->addHelper( 'param', $helper );
+		$param = ['type' => 'unittest', 'id' => $manager->findItem('unitgroup')->getId()];
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $param);
+		$view->addHelper('param', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, [] );
-		$view->addHelper( 'access', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, []);
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}

admin/jqadm/tests/Admin/JQAdm/Group/FactoryTest.php

Spacing +11 added lines, -11 removed lines

@@ -17,42 +17,42 @@
 	protected function setUp()
 	{
 		$this->context = \TestHelperJqadm::getContext();
-		$this->context->setView( \TestHelperJqadm::getView() );
+		$this->context->setView(\TestHelperJqadm::getView());
 	}
 
 
 	public function testCreateClient()
 	{
-		$client = \Aimeos\Admin\JQAdm\Group\Factory::createClient( $this->context );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Group\Factory::createClient($this->context);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientName()
 	{
-		$client = \Aimeos\Admin\JQAdm\Group\Factory::createClient( $this->context, 'Standard' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JQAdm\\Iface', $client );
+		$client = \Aimeos\Admin\JQAdm\Group\Factory::createClient($this->context, 'Standard');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JQAdm\\Iface', $client);
 	}
 
 
 	public function testCreateClientNameEmpty()
 	{
-		$this->setExpectedException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Group\Factory::createClient( $this->context, '' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Group\Factory::createClient($this->context, '');
 	}
 
 
 	public function testCreateClientNameInvalid()
 	{
-		$this->setExpectedException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Group\Factory::createClient( $this->context, '%group' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Group\Factory::createClient($this->context, '%group');
 	}
 
 
 	public function testCreateClientNameNotFound()
 	{
-		$this->setExpectedException( '\\Aimeos\\Admin\\JQAdm\\Exception' );
-		\Aimeos\Admin\JQAdm\Group\Factory::createClient( $this->context, 'test' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JQAdm\\Exception');
+		\Aimeos\Admin\JQAdm\Group\Factory::createClient($this->context, 'test');
 	}
 
 }

admin/jqadm/templates/group/item-standard.php

Spacing +43 added lines, -43 removed lines

@@ -5,38 +5,38 @@ 
  * @copyright Aimeos (aimeos.org), 2018
  */
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
 $enc = $this->encoder();
 
 
-$target = $this->config( 'admin/jqadm/url/save/target' );
-$cntl = $this->config( 'admin/jqadm/url/save/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/save/action', 'save' );
-$config = $this->config( 'admin/jqadm/url/save/config', [] );
+$target = $this->config('admin/jqadm/url/save/target');
+$cntl = $this->config('admin/jqadm/url/save/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/save/action', 'save');
+$config = $this->config('admin/jqadm/url/save/config', []);
 
-$params = $this->get( 'pageParams', [] );
+$params = $this->get('pageParams', []);
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
-<form class="item item-group form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>">
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.group.id' ) ) ); ?>" value="<?= $enc->attr( $this->get( 'itemData/customer.group.id' ) ); ?>" />
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
+<form class="item item-group form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>">
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'customer.group.id'))); ?>" value="<?= $enc->attr($this->get('itemData/customer.group.id')); ?>" />
+	<input id="item-next" type="hidden" name="<?= $enc->attr($this->formparam(array('next'))); ?>" value="get" />
 	<?= $this->csrf()->formfield(); ?>
 
 	<nav class="main-navbar">
 		<span class="navbar-brand">
-			<?= $enc->html( $this->translate( 'admin', 'Group' ) ); ?>:
-			<?= $enc->html( $this->get( 'itemData/customer.group.id' ) ); ?> -
-			<?= $enc->html( $this->get( 'itemData/customer.group.label', $this->translate( 'admin', 'New' ) ) ) ?>
-			<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/customer.group.siteid' ) ) ); ?>)</span>
+			<?= $enc->html($this->translate('admin', 'Group')); ?>:
+			<?= $enc->html($this->get('itemData/customer.group.id')); ?> -
+			<?= $enc->html($this->get('itemData/customer.group.label', $this->translate('admin', 'New'))) ?>
+			<span class="navbar-secondary">(<?= $enc->html($this->site()->match($this->get('itemData/customer.group.siteid'))); ?>)</span>
 		</span>
 		<div class="item-actions">
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard.php' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard.php'), ['params' => $params]); ?>
 		</div>
 	</nav>
 
@@ -47,14 +47,14 @@ 
 
 				<li class="nav-item basic">
 					<a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic">
-						<?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Basic')); ?>
 					</a>
 				</li>
 
-				<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
-					<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
-							<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
+				<?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?>
+					<li class="nav-item <?= $enc->attr($subpart); ?>">
+						<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
+							<?= $enc->html($this->translate('admin', $subpart)); ?>
 						</a>
 					</li>
 				<?php endforeach; ?>
@@ -63,61 +63,61 @@ 
 
 			<div class="item-meta text-muted">
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.group.mtime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.group.mtime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.group.ctime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Created')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.group.ctime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.group.editor' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.group.editor')); ?></span>
 				</small>
 			</div>
 		</div>
 
 		<div class="col-md-9 item-content tab-content">
-			<?php $readonly = ( $this->access( ['admin', 'super'] ) === false ? $this->site()->readonly( $this->get( 'itemData/customer.group.siteid' ) ) : '' ); ?>
+			<?php $readonly = ($this->access(['admin', 'super']) === false ? $this->site()->readonly($this->get('itemData/customer.group.siteid')) : ''); ?>
 
 			<div id="basic" class="row item-basic tab-pane fade show active" role="tabpanel" aria-labelledby="basic">
 
 				<div class="col-xl-6 content-block <?= $readonly ?>">
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Code')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-code" type="text" required="required" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.group.code' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Unique group code (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.group.code' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.group.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.group.code'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Unique group code (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.group.code')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.group.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Alphanumeric string that can identify the group uniquely' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Alphanumeric string that can identify the group uniquely')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-label" type="text" required="required" tabindex="1"
-								name="<?= $this->formparam( array( 'item', 'customer.group.label' ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Internal name (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.group.label' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.group.siteid' ) ); ?> />
+								name="<?= $this->formparam(array('item', 'customer.group.label')); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Internal name (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.group.label')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.group.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Group name describing for which members the group is for' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Group name describing for which members the group is for')); ?>
 						</div>
 					</div>
 				</div>
 			</div>
 
-			<?= $this->get( 'itemBody' ); ?>
+			<?= $this->get('itemBody'); ?>
 
 		</div>
 
 		<div class="item-actions">
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard.php' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard.php'), ['params' => $params]); ?>
 		</div>
 	</div>
 </form>
@@ -125,4 +125,4 @@ 
 <?php $this->block()->stop(); ?>
 
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard.php' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard.php')); ?>

admin/jqadm/templates/group/list-standard.php

Spacing +76 added lines, -76 removed lines

@@ -8,30 +8,30 @@ 
 $enc = $this->encoder();
 
 
-$target = $this->config( 'admin/jqadm/url/search/target' );
-$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$action = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$config = $this->config( 'admin/jqadm/url/search/config', [] );
+$target = $this->config('admin/jqadm/url/search/target');
+$controller = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$action = $this->config('admin/jqadm/url/search/action', 'search');
+$config = $this->config('admin/jqadm/url/search/config', []);
 
-$newTarget = $this->config( 'admin/jqadm/url/create/target' );
-$newCntl = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
-$newAction = $this->config( 'admin/jqadm/url/create/action', 'create' );
-$newConfig = $this->config( 'admin/jqadm/url/create/config', [] );
+$newTarget = $this->config('admin/jqadm/url/create/target');
+$newCntl = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
+$newAction = $this->config('admin/jqadm/url/create/action', 'create');
+$newConfig = $this->config('admin/jqadm/url/create/config', []);
 
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
+$getTarget = $this->config('admin/jqadm/url/get/target');
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
 
-$copyTarget = $this->config( 'admin/jqadm/url/copy/target' );
-$copyCntl = $this->config( 'admin/jqadm/url/copy/controller', 'Jqadm' );
-$copyAction = $this->config( 'admin/jqadm/url/copy/action', 'copy' );
-$copyConfig = $this->config( 'admin/jqadm/url/copy/config', [] );
+$copyTarget = $this->config('admin/jqadm/url/copy/target');
+$copyCntl = $this->config('admin/jqadm/url/copy/controller', 'Jqadm');
+$copyAction = $this->config('admin/jqadm/url/copy/action', 'copy');
+$copyConfig = $this->config('admin/jqadm/url/copy/config', []);
 
-$delTarget = $this->config( 'admin/jqadm/url/delete/target' );
-$delCntl = $this->config( 'admin/jqadm/url/delete/controller', 'Jqadm' );
-$delAction = $this->config( 'admin/jqadm/url/delete/action', 'delete' );
-$delConfig = $this->config( 'admin/jqadm/url/delete/config', [] );
+$delTarget = $this->config('admin/jqadm/url/delete/target');
+$delCntl = $this->config('admin/jqadm/url/delete/controller', 'Jqadm');
+$delAction = $this->config('admin/jqadm/url/delete/action', 'delete');
+$delConfig = $this->config('admin/jqadm/url/delete/config', []);
 
 
 /** admin/jqadm/group/fields
@@ -49,37 +49,37 @@ 
  * @category Developer
  */
 $default = ['customer.group.status', 'customer.group.label', 'customer.group.code'];
-$default = $this->config( 'admin/jqadm/group/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/group/fields', $default );
+$default = $this->config('admin/jqadm/group/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/group/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
 $columnList = [
-	'customer.group.id' => $this->translate( 'admin', 'ID' ),
-	'customer.group.code' => $this->translate( 'admin', 'Code' ),
-	'customer.group.label' => $this->translate( 'admin', 'Label' ),
-	'customer.group.ctime' => $this->translate( 'admin', 'Created' ),
-	'customer.group.mtime' => $this->translate( 'admin', 'Modified' ),
-	'customer.group.editor' => $this->translate( 'admin', 'Editor' ),
+	'customer.group.id' => $this->translate('admin', 'ID'),
+	'customer.group.code' => $this->translate('admin', 'Code'),
+	'customer.group.label' => $this->translate('admin', 'Label'),
+	'customer.group.ctime' => $this->translate('admin', 'Created'),
+	'customer.group.mtime' => $this->translate('admin', 'Modified'),
+	'customer.group.editor' => $this->translate('admin', 'Editor'),
 ];
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
 <nav class="main-navbar">
 
 	<span class="navbar-brand">
-		<?= $enc->html( $this->translate( 'admin', 'Group' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'Group')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 
 	<?= $this->partial(
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard.php' ), [
-			'filter' => $this->session( 'aimeos/admin/jqadm/group/filter', [] ),
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
-			'filterOperators' => $this->get( 'filterOperators', [] ),
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard.php'), [
+			'filter' => $this->session('aimeos/admin/jqadm/group/filter', []),
+			'filterAttributes' => $this->get('filterAttributes', []),
+			'filterOperators' => $this->get('filterOperators', []),
 			'params' => $params,
 		]
 	); ?>
@@ -87,13 +87,13 @@ 
 
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard.php' ),
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/group/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard.php'),
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/group/page', [])]
 	);
 ?>
 
-<form class="list list-group" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
+<form class="list list-group" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
 	<?= $this->csrf()->formfield(); ?>
 
 	<table class="list-items table table-hover table-striped">
@@ -101,20 +101,20 @@ 
 			<tr>
 
 				<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard.php' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/group/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard.php'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/group/sort')]
 					);
 				?>
 
 				<th class="actions">
 					<a class="btn fa act-add" tabindex="1"
-						href="<?= $enc->attr( $this->url( $newTarget, $newCntl, $newAction, $params, [], $newConfig ) ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
+						href="<?= $enc->attr($this->url($newTarget, $newCntl, $newAction, $params, [], $newConfig)); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
+						aria-label="<?= $enc->attr($this->translate('admin', 'Add')); ?>">
 					</a>
 
 					<?= $this->partial(
-							$this->config( 'admin/jqadm/partial/columns', 'common/partials/columns-standard.php' ),
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard.php'),
 							['fields' => $fields, 'data' => $columnList]
 						);
 					?>
@@ -124,8 +124,8 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard.php' ), [
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/group/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard.php'), [
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/group/filter', []),
 					'data' => [
 						'customer.group.id' => ['op' => '=='],
 						'customer.group.code' => [],
@@ -137,38 +137,38 @@ 
 				] );
 			?>
 
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
-				<tr class="<?= $this->site()->readonly( $item->getSiteId() ); ?>">
-					<?php if( in_array( 'customer.group.id', $fields ) ) : ?>
-						<td class="group-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a></td>
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig)); ?>
+				<tr class="<?= $this->site()->readonly($item->getSiteId()); ?>">
+					<?php if (in_array('customer.group.id', $fields)) : ?>
+						<td class="group-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'customer.group.code', $fields ) ) : ?>
-						<td class="group-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getCode() ); ?></a></td>
+					<?php if (in_array('customer.group.code', $fields)) : ?>
+						<td class="group-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getCode()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'customer.group.label', $fields ) ) : ?>
-						<td class="group-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('customer.group.label', $fields)) : ?>
+						<td class="group-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'customer.group.ctime', $fields ) ) : ?>
-						<td class="group-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('customer.group.ctime', $fields)) : ?>
+						<td class="group-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'customer.group.mtime', $fields ) ) : ?>
-						<td class="group-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('customer.group.mtime', $fields)) : ?>
+						<td class="group-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'customer.group.editor', $fields ) ) : ?>
-						<td class="group-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('customer.group.editor', $fields)) : ?>
+						<td class="group-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getEditor()); ?></a></td>
 					<?php endif; ?>
 
 					<td class="actions">
 						<a class="btn act-copy fa" tabindex="1"
-							href="<?= $enc->attr( $this->url( $copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig ) ); ?>"
-							title="<?= $enc->attr( $this->translate( 'admin', 'Copy this entry') ); ?>"
-							aria-label="<?= $enc->attr( $this->translate( 'admin', 'Copy' ) ); ?>"></a>
-						<?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?>
+							href="<?= $enc->attr($this->url($copyTarget, $copyCntl, $copyAction, ['id' => $id] + $params, [], $copyConfig)); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Copy this entry')); ?>"
+							aria-label="<?= $enc->attr($this->translate('admin', 'Copy')); ?>"></a>
+						<?php if (!$this->site()->readonly($item->getSiteId())) : ?>
 							<a class="btn act-delete fa" tabindex="1"
-								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'group', 'id' => $id] + $params, [], $delConfig ) ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
+								href="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, ['resource' => 'group', 'id' => $id] + $params, [], $delConfig)); ?>"
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
 						<?php endif; ?>
 					</td>
 				</tr>
@@ -176,18 +176,18 @@ 
 		</tbody>
 	</table>
 
-	<?php if( $this->get( 'items', [] ) === [] ) : ?>
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
+	<?php if ($this->get('items', []) === []) : ?>
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
 	<?php endif; ?>
 </form>
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard.php' ),
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/group/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard.php'),
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/group/page', [])]
 	);
 ?>
 
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard.php' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard.php')); ?>

admin/jqadm/templates/catalog/item-text-standard.php

Braces +15 added lines, -6 removed lines

@@ -112,9 +112,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="text-langid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
 					<?php endif; ?>
 
@@ -143,9 +146,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="item-typeid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.typeid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.typeid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
 					<?php endif; ?>
 
@@ -198,9 +204,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="listitem-typeid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'catalog.lists.typeid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'catalog.lists.typeid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $listTypes ) ); ?>"
 							v-model="items[idx]['catalog.lists.typeid']" />
 					<?php endif; ?>

Spacing +85 added lines, -85 removed lines

@@ -17,9 +17,9 @@ 
 ?>
 <div id="text" class="item-text content-block tab-pane fade" role="tablist" aria-labelledby="text">
 	<div id="item-text-group" role="tablist" aria-multiselectable="true"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'textData', [] ) ) ); ?>"
-		data-listtypeid="<?= key( $this->get( 'textListTypes', [] ) ) ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('textData', []))); ?>"
+		data-listtypeid="<?= key($this->get('textListTypes', [])) ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<div v-for="(entry, idx) in items" class="group-item card">
@@ -28,16 +28,16 @@ 
 				v-bind:data-target="'#item-text-group-data-' + idx" data-toggle="collapse" role="tab" class="card-header header"
 				v-bind:aria-controls="'item-text-group-data-' + idx" aria-expanded="false">
 				<div class="card-tools-left">
-					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide this entry') ); ?>">
+					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Show/hide this entry')); ?>">
 					</div>
 				</div>
 				<span class="item-label header-label" v-html="getLabel(idx)"></span>
 				&nbsp;
 				<div class="card-tools-right">
 					<div v-if="!checkSite('catalog.lists.siteid', idx)"
-						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removeItem(idx)">
 					</div>
 				</div>
@@ -47,7 +47,7 @@ 
 				v-bind:aria-labelledby="'item-text-group-item-' + idx" role="tabpanel" class="card-block collapse row">
 
 				<input type="hidden" v-model="items[idx]['text.id']"
-					v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.id' ) ) ); ?>'.replace('idx', idx)" />
+					v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.id'))); ?>'.replace('idx', idx)" />
 
 				<div class="col-xl-6">
 
@@ -56,9 +56,9 @@ 
 							<textarea is="html-editor" class="form-control item-content" required="required" v-once
 								v-model="items[idx]['text.content']"
 								v-bind:value="items[idx]['text.content']"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.content' ) ) ); ?>'.replace('idx', idx)"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.content'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('text.siteid', idx)"
-								v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+								v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 							></textarea>
 						</div>
 					</div>
@@ -68,101 +68,101 @@ 
 				<div class="col-xl-6">
 
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 						<div class="col-sm-8">
-							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.status' ) ) ); ?>'.replace('idx', idx)"
+							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.status'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('text.siteid', idx)"
 								v-model="items[idx]['text.status']" >
 								<option value="1" v-bind:selected="entry['text.status'] == 1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
 								<option value="0" v-bind:selected="entry['text.status'] == 0" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
 								<option value="-1" v-bind:selected="entry['text.status'] == -1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
 								<option value="-2" v-bind:selected="entry['text.status'] == -2" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</div>
 					</div>
 
-					<?php $languages = $this->get( 'pageLangItems', [] ); ?>
-					<?php if( count( $languages ) > 1 ) : ?>
+					<?php $languages = $this->get('pageLangItems', []); ?>
+					<?php if (count($languages) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Language')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-languageid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-languageid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.languageid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('text.siteid', idx)"
 									v-model="items[idx]['text.languageid']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( $languages as $langId => $langItem ) : ?>
-										<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="entry['text.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-											<?= $enc->html( $langItem->getLabel() ); ?>
+									<?php foreach ($languages as $langId => $langItem) : ?>
+										<option value="<?= $enc->attr($langId); ?>" v-bind:selected="entry['text.languageid'] == '<?= $enc->attr($langId) ?>'" >
+											<?= $enc->html($langItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Language of the entered text')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="text-langid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $languages ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.languageid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($languages)); ?>" />
 					<?php endif; ?>
 
-					<?php $textTypes = $this->get( 'textTypes', [] ); ?>
-					<?php if( count( $textTypes ) > 1 ) : ?>
+					<?php $textTypes = $this->get('textTypes', []); ?>
+					<?php if (count($textTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.typeid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.typeid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('text.siteid', idx)"
 									v-model="items[idx]['text.typeid']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( (array) $textTypes as $typeId => $typeItem ) : ?>
-										<option value="<?= $enc->attr( $typeId ); ?>" v-bind:selected="entry['text.typeid'] == '<?= $enc->attr( $typeId ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ((array) $textTypes as $typeId => $typeItem) : ?>
+										<option value="<?= $enc->attr($typeId); ?>" v-bind:selected="entry['text.typeid'] == '<?= $enc->attr($typeId) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Types for additional texts like per one lb/kg or per month')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="item-typeid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.typeid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.typeid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($textTypes)); ?>" />
 					<?php endif; ?>
 
 					<div class="form-group row optional">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-label" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.label' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Label' ) ); ?>"
+							<input class="form-control item-label" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.label'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Label')); ?>"
 								v-bind:readonly="checkSite('text.siteid', idx)"
 								v-model="items[idx]['text.label']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Description of the text content if it\'s in a foreign language' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Description of the text content if it\'s in a foreign language')); ?>
 						</div>
 					</div>
 
@@ -171,70 +171,70 @@ 
 
 				<div v-on:click="toggle(idx)" class="col-xl-12 advanced" v-bind:class="{ 'collapsed': !advanced[idx] }">
 					<div class="card-tools-left">
-						<div class="btn act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-							title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide advanced data') ); ?>">
+						<div class="btn act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Show/hide advanced data')); ?>">
 						</div>
 					</div>
-					<span class="header-label"><?= $enc->html( $this->translate( 'admin', 'Advanced' ) ); ?></span>
+					<span class="header-label"><?= $enc->html($this->translate('admin', 'Advanced')); ?></span>
 				</div>
 
 				<div v-show="advanced[idx]" class="col-xl-6 content-block secondary">
 
 					<input type="hidden" v-model="items[idx]['catalog.lists.type']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'catalog.lists.type' ) ) ); ?>'.replace( 'idx', idx )" />
+						v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'catalog.lists.type'))); ?>'.replace( 'idx', idx )" />
 
-					<?php $listTypes = $this->get( 'textListTypes', [] ); ?>
-					<?php if( count( $listTypes ) > 1 ) : ?>
+					<?php $listTypes = $this->get('textListTypes', []); ?>
+					<?php if (count($listTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'List type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'List type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select listitem-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'catalog.lists.typeid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select listitem-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'catalog.lists.typeid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('catalog.lists.siteid', idx)"
 									v-model="items[idx]['catalog.lists.typeid']" >
 
-									<?php foreach( $this->get( 'textListTypes', [] ) as $id => $typeItem ) : ?>
-										<option value="<?= $enc->attr( $id ); ?>" v-bind:selected="entry['catalog.lists.typeid'] == '<?= $enc->attr( $id ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ($this->get('textListTypes', []) as $id => $typeItem) : ?>
+										<option value="<?= $enc->attr($id); ?>" v-bind:selected="entry['catalog.lists.typeid'] == '<?= $enc->attr($id) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Second level type for grouping items')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="listitem-typeid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'catalog.lists.typeid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $listTypes ) ); ?>"
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'catalog.lists.typeid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($listTypes)); ?>"
 							v-model="items[idx]['catalog.lists.typeid']" />
 					<?php endif; ?>
 
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Start date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Start date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'catalog.lists.datestart' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'catalog.lists.datestart'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('catalog.lists.siteid', idx)"
 								v-model="items[idx]['catalog.lists.datestart']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site after that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site after that date and time')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'End date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'End date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'catalog.lists.dateend' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'catalog.lists.dateend'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('catalog.lists.siteid', idx)"
 								v-model="items[idx]['catalog.lists.dateend']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site until that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site until that date and time')); ?>
 						</div>
 					</div>
 				</div>
@@ -244,17 +244,17 @@ 
 						<thead>
 							<tr>
 								<th>
-									<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
+									<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
 									<div class="form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Configuration options, will be available as key/value pairs in the list item' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Configuration options, will be available as key/value pairs in the list item')); ?>
 									</div>
 								</th>
 								<th>
-									<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Value')); ?>
 								</th>
 								<th class="actions">
-									<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+									<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 										v-bind:readonly="checkSite('catalog.lists.siteid', idx)"
 										v-on:click="addConfig(idx)" >
 									</div>
@@ -267,21 +267,21 @@ 
 								<td>
 									<input is="auto-complete"
 										v-model="items[idx]['config']['key'][pos]"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'config', 'key', '' ) ) ); ?>'.replace('idx', idx)"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'config', 'key', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('catalog.lists.siteid', idx)"
-										v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+										v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 										v-bind:keys="[]" />
 								</td>
 								<td>
-									<input type="text" class="form-control" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'config', 'val', '' ) ) ); ?>'.replace('idx', idx)"
+									<input type="text" class="form-control" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'config', 'val', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('catalog.lists.siteid', idx)"
 										v-model="items[idx]['config']['val'][pos]" />
 								</td>
 								<td class="actions">
 									<div v-if="!checkSite('catalog.lists.siteid', idx)" v-on:click="removeConfig(idx, pos)"
-										class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+										class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 									</div>
 								</td>
 							</tr>
@@ -290,14 +290,14 @@ 
 					</table>
 				</div>
 
-				<?= $this->get( 'textBody' ); ?>
+				<?= $this->get('textBody'); ?>
 
 			</div>
 		</div>
 
 		<div class="card-tools-more">
-			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-				title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+				title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 				v-on:click="addItem('catalog.lists.')" >
 			</div>
 		</div>

admin/jqadm/templates/supplier/item-text-standard.php

Braces +15 added lines, -6 removed lines

@@ -112,9 +112,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="text-langid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $languages ) ); ?>" />
 					<?php endif; ?>
 
@@ -143,9 +146,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="item-typeid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.typeid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.typeid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
 					<?php endif; ?>
 
@@ -198,9 +204,12 @@ 
 								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
 							</div>
 						</div>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input class="listitem-typeid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'supplier.lists.typeid' ) ) ); ?>'.replace('idx', idx)"
+							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'supplier.lists.typeid' ) ) );
+}
+?>'.replace('idx', idx)"
 							value="<?= $enc->attr( key( $listTypes ) ); ?>"
 							v-model="items[idx]['supplier.lists.typeid']" />
 					<?php endif; ?>

Spacing +85 added lines, -85 removed lines

@@ -17,9 +17,9 @@ 
 ?>
 <div id="text" class="item-text content-block tab-pane fade" role="tablist" aria-labelledby="text">
 	<div id="item-text-group" role="tablist" aria-multiselectable="true"
-		data-items="<?= $enc->attr( json_encode( $this->get( 'textData', [] ) ) ); ?>"
-		data-listtypeid="<?= key( $this->get( 'textListTypes', [] ) ) ?>"
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
+		data-items="<?= $enc->attr(json_encode($this->get('textData', []))); ?>"
+		data-listtypeid="<?= key($this->get('textListTypes', [])) ?>"
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
 		data-siteid="<?= $this->site()->siteid() ?>" >
 
 		<div v-for="(entry, idx) in items" class="group-item card">
@@ -28,16 +28,16 @@ 
 				v-bind:data-target="'#item-text-group-data-' + idx" data-toggle="collapse" role="tab" class="card-header header"
 				v-bind:aria-controls="'item-text-group-data-' + idx" aria-expanded="false">
 				<div class="card-tools-left">
-					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide this entry') ); ?>">
+					<div class="btn btn-card-header act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Show/hide this entry')); ?>">
 					</div>
 				</div>
 				<span class="item-label header-label" v-html="getLabel(idx)"></span>
 				&nbsp;
 				<div class="card-tools-right">
 					<div v-if="!checkSite('supplier.lists.siteid', idx)"
-						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+						class="btn btn-card-header act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removeItem(idx)">
 					</div>
 				</div>
@@ -47,7 +47,7 @@ 
 				v-bind:aria-labelledby="'item-text-group-item-' + idx" role="tabpanel" class="card-block collapse row">
 
 				<input type="hidden" v-model="items[idx]['text.id']"
-					v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.id' ) ) ); ?>'.replace('idx', idx)" />
+					v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.id'))); ?>'.replace('idx', idx)" />
 
 				<div class="col-xl-6">
 
@@ -56,9 +56,9 @@ 
 							<textarea is="html-editor" class="form-control item-content" required="required" v-once
 								v-model="items[idx]['text.content']"
 								v-bind:value="items[idx]['text.content']"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.content' ) ) ); ?>'.replace('idx', idx)"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.content'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('text.siteid', idx)"
-								v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+								v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 							></textarea>
 						</div>
 					</div>
@@ -68,101 +68,101 @@ 
 				<div class="col-xl-6">
 
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 						<div class="col-sm-8">
-							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.status' ) ) ); ?>'.replace('idx', idx)"
+							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.status'))); ?>'.replace('idx', idx)"
 								v-bind:readonly="checkSite('text.siteid', idx)"
 								v-model="items[idx]['text.status']" >
 								<option value="1" v-bind:selected="entry['text.status'] == 1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
 								<option value="0" v-bind:selected="entry['text.status'] == 0" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
 								<option value="-1" v-bind:selected="entry['text.status'] == -1" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
 								<option value="-2" v-bind:selected="entry['text.status'] == -2" >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</div>
 					</div>
 
-					<?php $languages = $this->get( 'pageLangItems', [] ); ?>
-					<?php if( count( $languages ) > 1 ) : ?>
+					<?php $languages = $this->get('pageLangItems', []); ?>
+					<?php if (count($languages) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Language')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-languageid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-languageid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.languageid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('text.siteid', idx)"
 									v-model="items[idx]['text.languageid']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( $languages as $langId => $langItem ) : ?>
-										<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="entry['text.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-											<?= $enc->html( $langItem->getLabel() ); ?>
+									<?php foreach ($languages as $langId => $langItem) : ?>
+										<option value="<?= $enc->attr($langId); ?>" v-bind:selected="entry['text.languageid'] == '<?= $enc->attr($langId) ?>'" >
+											<?= $enc->html($langItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Language of the entered text')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="text-langid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $languages ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.languageid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($languages)); ?>" />
 					<?php endif; ?>
 
-					<?php $textTypes = $this->get( 'textTypes', [] ); ?>
-					<?php if( count( $textTypes ) > 1 ) : ?>
+					<?php $textTypes = $this->get('textTypes', []); ?>
+					<?php if (count($textTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.typeid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.typeid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('text.siteid', idx)"
 									v-model="items[idx]['text.typeid']" >
 
 									<option value="" disable >
-										<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( (array) $textTypes as $typeId => $typeItem ) : ?>
-										<option value="<?= $enc->attr( $typeId ); ?>" v-bind:selected="entry['text.typeid'] == '<?= $enc->attr( $typeId ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ((array) $textTypes as $typeId => $typeItem) : ?>
+										<option value="<?= $enc->attr($typeId); ?>" v-bind:selected="entry['text.typeid'] == '<?= $enc->attr($typeId) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Types for additional texts like per one lb/kg or per month')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="item-typeid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.typeid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $textTypes ) ); ?>" />
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.typeid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($textTypes)); ?>" />
 					<?php endif; ?>
 
 					<div class="form-group row optional">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Label')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control item-label" type="text" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.label' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Label' ) ); ?>"
+							<input class="form-control item-label" type="text" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'text.label'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Label')); ?>"
 								v-bind:readonly="checkSite('text.siteid', idx)"
 								v-model="items[idx]['text.label']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Description of the text content if it\'s in a foreign language' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Description of the text content if it\'s in a foreign language')); ?>
 						</div>
 					</div>
 
@@ -171,70 +171,70 @@ 
 
 				<div v-on:click="toggle(idx)" class="col-xl-12 advanced" v-bind:class="{ 'collapsed': !advanced[idx] }">
 					<div class="card-tools-left">
-						<div class="btn act-show fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-							title="<?= $enc->attr( $this->translate( 'admin', 'Show/hide advanced data') ); ?>">
+						<div class="btn act-show fa" tabindex="<?= $this->get('tabindex'); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Show/hide advanced data')); ?>">
 						</div>
 					</div>
-					<span class="header-label"><?= $enc->html( $this->translate( 'admin', 'Advanced' ) ); ?></span>
+					<span class="header-label"><?= $enc->html($this->translate('admin', 'Advanced')); ?></span>
 				</div>
 
 				<div v-show="advanced[idx]" class="col-xl-6 content-block secondary">
 
 					<input type="hidden" v-model="items[idx]['supplier.lists.type']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'supplier.lists.type' ) ) ); ?>'.replace( 'idx', idx )" />
+						v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'supplier.lists.type'))); ?>'.replace( 'idx', idx )" />
 
-					<?php $listTypes = $this->get( 'textListTypes', [] ); ?>
-					<?php if( count( $listTypes ) > 1 ) : ?>
+					<?php $listTypes = $this->get('textListTypes', []); ?>
+					<?php if (count($listTypes) > 1) : ?>
 						<div class="form-group row mandatory">
-							<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'List type' ) ); ?></label>
+							<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'List type')); ?></label>
 							<div class="col-sm-8">
-								<select class="form-control custom-select listitem-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'supplier.lists.typeid' ) ) ); ?>'.replace('idx', idx)"
+								<select class="form-control custom-select listitem-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+									v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'supplier.lists.typeid'))); ?>'.replace('idx', idx)"
 									v-bind:readonly="checkSite('supplier.lists.siteid', idx)"
 									v-model="items[idx]['supplier.lists.typeid']" >
 
-									<?php foreach( $this->get( 'textListTypes', [] ) as $id => $typeItem ) : ?>
-										<option value="<?= $enc->attr( $id ); ?>" v-bind:selected="entry['supplier.lists.typeid'] == '<?= $enc->attr( $id ) ?>'" >
-											<?= $enc->html( $typeItem->getLabel() ); ?>
+									<?php foreach ($this->get('textListTypes', []) as $id => $typeItem) : ?>
+										<option value="<?= $enc->attr($id); ?>" v-bind:selected="entry['supplier.lists.typeid'] == '<?= $enc->attr($id) ?>'" >
+											<?= $enc->html($typeItem->getLabel()); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							</div>
 							<div class="col-sm-12 form-text text-muted help-text">
-								<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'Second level type for grouping items')); ?>
 							</div>
 						</div>
 					<?php else : ?>
 						<input class="listitem-typeid" type="hidden"
-							v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'supplier.lists.typeid' ) ) ); ?>'.replace('idx', idx)"
-							value="<?= $enc->attr( key( $listTypes ) ); ?>"
+							v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'supplier.lists.typeid'))); ?>'.replace('idx', idx)"
+							value="<?= $enc->attr(key($listTypes)); ?>"
 							v-model="items[idx]['supplier.lists.typeid']" />
 					<?php endif; ?>
 
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Start date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Start date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'supplier.lists.datestart' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'supplier.lists.datestart'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.lists.siteid', idx)"
 								v-model="items[idx]['supplier.lists.datestart']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site after that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site after that date and time')); ?>
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'End date' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'End date')); ?></label>
 						<div class="col-sm-8">
-							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'supplier.lists.dateend' ) ) ); ?>'.replace('idx', idx)"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
+							<input class="form-control listitem-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'supplier.lists.dateend'))); ?>'.replace('idx', idx)"
+								placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
 								v-bind:readonly="checkSite('supplier.lists.siteid', idx)"
 								v-model="items[idx]['supplier.lists.dateend']" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'The item is only shown on the web site until that date and time' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'The item is only shown on the web site until that date and time')); ?>
 						</div>
 					</div>
 				</div>
@@ -244,17 +244,17 @@ 
 						<thead>
 							<tr>
 								<th>
-									<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
+									<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
 									<div class="form-text text-muted help-text">
-										<?= $enc->html( $this->translate( 'admin', 'Configuration options, will be available as key/value pairs in the list item' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Configuration options, will be available as key/value pairs in the list item')); ?>
 									</div>
 								</th>
 								<th>
-									<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Value')); ?>
 								</th>
 								<th class="actions">
-									<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+									<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 										v-bind:readonly="checkSite('supplier.lists.siteid', idx)"
 										v-on:click="addConfig(idx)" >
 									</div>
@@ -267,21 +267,21 @@ 
 								<td>
 									<input is="auto-complete"
 										v-model="items[idx]['config']['key'][pos]"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'config', 'key', '' ) ) ); ?>'.replace('idx', idx)"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'config', 'key', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('supplier.lists.siteid', idx)"
-										v-bind:tabindex="<?= $this->get( 'tabindex' ); ?>"
+										v-bind:tabindex="<?= $this->get('tabindex'); ?>"
 										v-bind:keys="[]" />
 								</td>
 								<td>
-									<input type="text" class="form-control" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'config', 'val', '' ) ) ); ?>'.replace('idx', idx)"
+									<input type="text" class="form-control" tabindex="<?= $this->get('tabindex'); ?>"
+										v-bind:name="'<?= $enc->attr($this->formparam(array('text', 'idx', 'config', 'val', ''))); ?>'.replace('idx', idx)"
 										v-bind:readonly="checkSite('supplier.lists.siteid', idx)"
 										v-model="items[idx]['config']['val'][pos]" />
 								</td>
 								<td class="actions">
 									<div v-if="!checkSite('supplier.lists.siteid', idx)" v-on:click="removeConfig(idx, pos)"
-										class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+										class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+										title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 									</div>
 								</td>
 							</tr>
@@ -290,14 +290,14 @@ 
 					</table>
 				</div>
 
-				<?= $this->get( 'textBody' ); ?>
+				<?= $this->get('textBody'); ?>
 
 			</div>
 		</div>
 
 		<div class="card-tools-more">
-			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-				title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+			<div class="btn btn-primary btn-card-more act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+				title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 				v-on:click="addItem('supplier.lists.')" >
 			</div>
 		</div>