aimeos / ai-admin-jqadm

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

Spacing +32 added lines, -32 removed lines

@@ -21,16 +21,16 @@ 
 		$this->view = \TestHelperJqadm::getView();
 		$this->context = \TestHelperJqadm::getContext();
 
-		$this->object = new \Aimeos\Admin\JQAdm\Log\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\Log\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);
 	}
 
 
@@ -38,23 +38,23 @@ 
 	{
 		$param = array(
 			'site' => 'unittest', 'lang' => 'de',
-			'sort' => array( '-log.timestamp' ),
+			'sort' => array('-log.timestamp'),
 		);
-		$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( '>unittest facility<', $result );
+		$this->assertContains('>unittest facility<', $result);
 	}
 
 
 	public function testSearchException()
 	{
-		$object = $this->getClientMock( 'initCriteria' );
+		$object = $this->getClientMock('initCriteria');
 
-		$object->expects( $this->once() )->method( 'initCriteria' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$object->expects($this->once())->method('initCriteria')
+			->will($this->throwException(new \RuntimeException()));
 
 		$object->search();
 	}
@@ -62,10 +62,10 @@ 
 
 	public function testSearchMShopException()
 	{
-		$object = $this->getClientMock( 'initCriteria' );
+		$object = $this->getClientMock('initCriteria');
 
-		$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->search();
 	}
@@ -73,27 +73,27 @@ 
 
 	public function testGetSubClientInvalid()
 	{
-		$this->setExpectedException( \Aimeos\Admin\JQAdm\Exception::class );
-		$this->object->getSubClient( '$unknown$' );
+		$this->setExpectedException(\Aimeos\Admin\JQAdm\Exception::class);
+		$this->object->getSubClient('$unknown$');
 	}
 
 
 	public function testGetSubClientUnknown()
 	{
-		$this->setExpectedException( \Aimeos\Admin\JQAdm\Exception::class );
-		$this->object->getSubClient( 'unknown' );
+		$this->setExpectedException(\Aimeos\Admin\JQAdm\Exception::class);
+		$this->object->getSubClient('unknown');
 	}
 
 
-	public function getClientMock( $method )
+	public function getClientMock($method)
 	{
-		$object = $this->getMockBuilder( \Aimeos\Admin\JQAdm\Log\Standard::class )
-			->setConstructorArgs( array( $this->context, \TestHelperJqadm::getTemplatePaths() ) )
-			->setMethods( [$method] )
+		$object = $this->getMockBuilder(\Aimeos\Admin\JQAdm\Log\Standard::class)
+			->setConstructorArgs(array($this->context, \TestHelperJqadm::getTemplatePaths()))
+			->setMethods([$method])
 			->getMock();
 
-		$object->setAimeos( \TestHelperJqadm::getAimeos() );
-		$object->setView( $this->getViewNoRender() );
+		$object->setAimeos(\TestHelperJqadm::getAimeos());
+		$object->setView($this->getViewNoRender());
 
 		return $object;
 	}
@@ -101,17 +101,17 @@ 
 
 	protected function getViewNoRender()
 	{
-		$view = $this->getMockBuilder( \Aimeos\MW\View\Standard::class )
-			->setConstructorArgs( array( [] ) )
-			->setMethods( array( 'render', 'config' ) )
+		$view = $this->getMockBuilder(\Aimeos\MW\View\Standard::class)
+			->setConstructorArgs(array([]))
+			->setMethods(array('render', 'config'))
 			->getMock();
 
 		$param = ['site' => 'unittest'];
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $param );
-		$view->addHelper( 'param', $helper );
+		$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/Common/Decorator/PageTest.php

Spacing +12 added lines, -12 removed lines

@@ -19,16 +19,16 @@ 
 	{
 		$this->context = \TestHelperJqadm::getContext();
 
-		$client = new \Aimeos\Admin\JQAdm\Product\Standard( $this->context );
-		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page( $client, $this->context );
-		$this->object->setAimeos( \TestHelperJqadm::getAimeos() );
-		$this->object->setView( \TestHelperJqadm::getView() );
+		$client = new \Aimeos\Admin\JQAdm\Product\Standard($this->context);
+		$this->object = new \Aimeos\Admin\JQAdm\Common\Decorator\Page($client, $this->context);
+		$this->object->setAimeos(\TestHelperJqadm::getAimeos());
+		$this->object->setView(\TestHelperJqadm::getView());
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
@@ -36,13 +36,13 @@ 
 	{
 		$view = \TestHelperJqadm::getView();
 
-		$this->object->setView( $view );
+		$this->object->setView($view);
 
-		$this->assertNull( $view->get( 'pageUser' ) );
-		$this->assertInternalType( 'array', $view->pageParams );
-		$this->assertInternalType( 'array', $view->pageI18nList );
-		$this->assertInternalType( 'array', $view->pageLangItems );
-		$this->assertInstanceOf( \Aimeos\MShop\Locale\Item\Site\Iface::class, $view->pageSiteTree );
-		$this->assertInstanceOf( \Aimeos\MShop\Locale\Item\Site\Iface::class, $view->pageSiteItem );
+		$this->assertNull($view->get('pageUser'));
+		$this->assertInternalType('array', $view->pageParams);
+		$this->assertInternalType('array', $view->pageI18nList);
+		$this->assertInternalType('array', $view->pageLangItems);
+		$this->assertInstanceOf(\Aimeos\MShop\Locale\Item\Site\Iface::class, $view->pageSiteTree);
+		$this->assertInstanceOf(\Aimeos\MShop\Locale\Item\Site\Iface::class, $view->pageSiteItem);
 	}
 }

admin/jqadm/templates/locale/currency/list-standard.php

Spacing +80 added lines, -80 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/locale/currency/fields
@@ -49,37 +49,37 @@ 
  * @category Developer
  */
 $default = ['locale.currency.status', 'locale.currency.code', 'locale.currency.label'];
-$default = $this->config( 'admin/jqadm/locale/currency/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/locale/currency/fields', $default );
+$default = $this->config('admin/jqadm/locale/currency/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/locale/currency/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
 $columnList = [
-	'locale.currency.id' => $this->translate( 'admin', 'ID' ),
-	'locale.currency.status' => $this->translate( 'admin', 'Status' ),
-	'locale.currency.code' => $this->translate( 'admin', 'Code' ),
-	'locale.currency.label' => $this->translate( 'admin', 'Label' ),
-	'locale.currency.ctime' => $this->translate( 'admin', 'Created' ),
-	'locale.currency.mtime' => $this->translate( 'admin', 'Modified' ),
-	'locale.currency.editor' => $this->translate( 'admin', 'Editor' ),
+	'locale.currency.id' => $this->translate('admin', 'ID'),
+	'locale.currency.status' => $this->translate('admin', 'Status'),
+	'locale.currency.code' => $this->translate('admin', 'Code'),
+	'locale.currency.label' => $this->translate('admin', 'Label'),
+	'locale.currency.ctime' => $this->translate('admin', 'Created'),
+	'locale.currency.mtime' => $this->translate('admin', 'Modified'),
+	'locale.currency.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', 'Currencies' ) ); ?>
+		<?= $enc->html($this->translate('admin', 'Currencies')); ?>
 	</span>
 
 	<?= $this->partial(
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
-			'filter' => $this->session( 'aimeos/admin/jqadm/locale/currency/filter', [] ),
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
-			'filterOperators' => $this->get( 'filterOperators', [] ),
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
+			'filter' => $this->session('aimeos/admin/jqadm/locale/currency/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' ),
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/locale/currency/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/locale/currency/page', [])]
 	);
 ?>
 
-<form class="list list-locale-currency" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
+<form class="list list-locale-currency" 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' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/locale/currency/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/locale/currency/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' ),
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
 							['fields' => $fields, 'data' => $columnList]
 						);
 					?>
@@ -124,15 +124,15 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/locale/currency/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/locale/currency/filter', []),
 					'data' => [
 						'locale.currency.id' => ['op' => '=='],
 						'locale.currency.status' => ['op' => '==', 'type' => 'select', 'val' => [
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
+							'1' => $this->translate('mshop/code', 'status:1'),
+							'0' => $this->translate('mshop/code', 'status:0'),
+							'-1' => $this->translate('mshop/code', 'status:-1'),
+							'-2' => $this->translate('mshop/code', 'status:-2'),
 						]],
 						'locale.currency.code' => ['op' => '=='],
 						'locale.currency.label' => [],
@@ -143,58 +143,58 @@ 
 				] );
 			?>
 
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig)); ?>
 				<tr>
-					<?php if( in_array( 'locale.currency.id', $fields ) ) : ?>
-						<td class="locale-currency-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a></td>
+					<?php if (in_array('locale.currency.id', $fields)) : ?>
+						<td class="locale-currency-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.currency.status', $fields ) ) : ?>
-						<td class="locale-currency-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
+					<?php if (in_array('locale.currency.status', $fields)) : ?>
+						<td class="locale-currency-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.currency.code', $fields ) ) : ?>
-						<td class="locale-currency-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getCode() ); ?></a></td>
+					<?php if (in_array('locale.currency.code', $fields)) : ?>
+						<td class="locale-currency-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getCode()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.currency.label', $fields ) ) : ?>
-						<td class="locale-currency-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('locale.currency.label', $fields)) : ?>
+						<td class="locale-currency-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.currency.ctime', $fields ) ) : ?>
-						<td class="locale-currency-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('locale.currency.ctime', $fields)) : ?>
+						<td class="locale-currency-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.currency.mtime', $fields ) ) : ?>
-						<td class="locale-currency-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('locale.currency.mtime', $fields)) : ?>
+						<td class="locale-currency-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.currency.editor', $fields ) ) : ?>
-						<td class="locale-currency-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('locale.currency.editor', $fields)) : ?>
+						<td class="locale-currency-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>
+							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>
 						<a class="btn act-delete fa" tabindex="1"
-							href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['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, ['id' => $id] + $params, [], $delConfig)); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
+							aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
 					</td>
 				</tr>
 			<?php endforeach; ?>
 		</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' ),
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/locale/currency/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/locale/currency/page', [])]
 	);
 ?>
 
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/locale/language/list-standard.php

Spacing +80 added lines, -80 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/locale/language/fields
@@ -49,37 +49,37 @@ 
  * @category Developer
  */
 $default = ['locale.language.status', 'locale.language.code', 'locale.language.label'];
-$default = $this->config( 'admin/jqadm/locale/language/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/locale/language/fields', $default );
+$default = $this->config('admin/jqadm/locale/language/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/locale/language/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
 $columnList = [
-	'locale.language.id' => $this->translate( 'admin', 'ID' ),
-	'locale.language.status' => $this->translate( 'admin', 'Status' ),
-	'locale.language.code' => $this->translate( 'admin', 'Code' ),
-	'locale.language.label' => $this->translate( 'admin', 'Label' ),
-	'locale.language.ctime' => $this->translate( 'admin', 'Created' ),
-	'locale.language.mtime' => $this->translate( 'admin', 'Modified' ),
-	'locale.language.editor' => $this->translate( 'admin', 'Editor' ),
+	'locale.language.id' => $this->translate('admin', 'ID'),
+	'locale.language.status' => $this->translate('admin', 'Status'),
+	'locale.language.code' => $this->translate('admin', 'Code'),
+	'locale.language.label' => $this->translate('admin', 'Label'),
+	'locale.language.ctime' => $this->translate('admin', 'Created'),
+	'locale.language.mtime' => $this->translate('admin', 'Modified'),
+	'locale.language.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', 'Languages' ) ); ?>
+		<?= $enc->html($this->translate('admin', 'Languages')); ?>
 	</span>
 
 	<?= $this->partial(
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
-			'filter' => $this->session( 'aimeos/admin/jqadm/locale/language/filter', [] ),
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
-			'filterOperators' => $this->get( 'filterOperators', [] ),
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
+			'filter' => $this->session('aimeos/admin/jqadm/locale/language/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' ),
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/locale/language/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/locale/language/page', [])]
 	);
 ?>
 
-<form class="list list-locale-language" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
+<form class="list list-locale-language" 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' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/locale/language/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/locale/language/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' ),
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
 							['fields' => $fields, 'data' => $columnList]
 						);
 					?>
@@ -124,15 +124,15 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/locale/language/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/locale/language/filter', []),
 					'data' => [
 						'locale.language.id' => ['op' => '=='],
 						'locale.language.status' => ['op' => '==', 'type' => 'select', 'val' => [
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
+							'1' => $this->translate('mshop/code', 'status:1'),
+							'0' => $this->translate('mshop/code', 'status:0'),
+							'-1' => $this->translate('mshop/code', 'status:-1'),
+							'-2' => $this->translate('mshop/code', 'status:-2'),
 						]],
 						'locale.language.code' => ['op' => '=='],
 						'locale.language.label' => [],
@@ -143,58 +143,58 @@ 
 				] );
 			?>
 
-			<?php foreach( $this->get( 'items', [] ) as $id => $item ) : ?>
-				<?php $url = $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig ) ); ?>
+			<?php foreach ($this->get('items', []) as $id => $item) : ?>
+				<?php $url = $enc->attr($this->url($getTarget, $getCntl, $getAction, ['id' => $id] + $params, [], $getConfig)); ?>
 				<tr>
-					<?php if( in_array( 'locale.language.id', $fields ) ) : ?>
-						<td class="locale-language-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getId() ); ?></a></td>
+					<?php if (in_array('locale.language.id', $fields)) : ?>
+						<td class="locale-language-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.language.status', $fields ) ) : ?>
-						<td class="locale-language-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
+					<?php if (in_array('locale.language.status', $fields)) : ?>
+						<td class="locale-language-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.language.code', $fields ) ) : ?>
-						<td class="locale-language-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getCode() ); ?></a></td>
+					<?php if (in_array('locale.language.code', $fields)) : ?>
+						<td class="locale-language-code"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getCode()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.language.label', $fields ) ) : ?>
-						<td class="locale-language-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('locale.language.label', $fields)) : ?>
+						<td class="locale-language-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.language.ctime', $fields ) ) : ?>
-						<td class="locale-language-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('locale.language.ctime', $fields)) : ?>
+						<td class="locale-language-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.language.mtime', $fields ) ) : ?>
-						<td class="locale-language-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('locale.language.mtime', $fields)) : ?>
+						<td class="locale-language-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'locale.language.editor', $fields ) ) : ?>
-						<td class="locale-language-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('locale.language.editor', $fields)) : ?>
+						<td class="locale-language-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>
+							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>
 						<a class="btn act-delete fa" tabindex="1"
-							href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['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, ['id' => $id] + $params, [], $delConfig)); ?>"
+							title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
+							aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
 					</td>
 				</tr>
 			<?php endforeach; ?>
 		</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' ),
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/locale/language/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/locale/language/page', [])]
 	);
 ?>
 
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/locale/language/item-standard.php

Spacing +50 added lines, -50 removed lines

@@ -5,37 +5,37 @@ 
  * @copyright Aimeos (aimeos.org), 2017-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-locale 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', 'locale.language.id' ) ) ); ?>" value="<?= $enc->attr( $this->get( 'itemData/locale.language.id' ) ); ?>" />
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
+<form class="item item-locale 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', 'locale.language.id'))); ?>" value="<?= $enc->attr($this->get('itemData/locale.language.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', 'Language' ) ); ?>:
-			<?= $enc->html( $this->get( 'itemData/locale.language.id' ) ); ?> -
-			<?= $enc->html( $this->get( 'itemData/locale.language.label', $this->translate( 'admin', 'New' ) ) ); ?>
+			<?= $enc->html($this->translate('admin', 'Language')); ?>:
+			<?= $enc->html($this->get('itemData/locale.language.id')); ?> -
+			<?= $enc->html($this->get('itemData/locale.language.label', $this->translate('admin', 'New'))); ?>
 		</span>
 		<div class="item-actions">
-			<?= $this->partial( $this->config( 'admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 		</div>
 	</nav>
 
@@ -46,14 +46,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; ?>
@@ -62,16 +62,16 @@ 
 
 			<div class="item-meta text-muted">
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.language.mtime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/locale.language.mtime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.language.ctime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Created')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/locale.language.ctime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/locale.language.editor' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/locale.language.editor')); ?></span>
 				</small>
 			</div>
 		</div>
@@ -81,62 +81,62 @@ 
 
 				<div class="col-xl-6 content-block">
 					<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="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.language.status' ) ) ); ?>" >
+								name="<?= $enc->attr($this->formparam(array('item', 'locale.language.status'))); ?>" >
 								<option value="">
-									<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 								</option>
-								<option value="1" <?= $selected( $this->get( 'itemData/locale.language.status', 1 ), 1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+								<option value="1" <?= $selected($this->get('itemData/locale.language.status', 1), 1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
-								<option value="0" <?= $selected( $this->get( 'itemData/locale.language.status', 1 ), 0 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+								<option value="0" <?= $selected($this->get('itemData/locale.language.status', 1), 0); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
-								<option value="-1" <?= $selected( $this->get( 'itemData/locale.language.status', 1 ), -1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+								<option value="-1" <?= $selected($this->get('itemData/locale.language.status', 1), -1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
-								<option value="-2" <?= $selected( $this->get( 'itemData/locale.language.status', 1 ), -2 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+								<option value="-2" <?= $selected($this->get('itemData/locale.language.status', 1), -2); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</div>
 					</div>
 					<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" required="required" tabindex="1" autocomplete="off"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.language.code' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'ISO language code (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/locale.language.code' ) ); ?>" />
+								name="<?= $enc->attr($this->formparam(array('item', 'locale.language.code'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'ISO language code (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/locale.language.code')); ?>" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Two letter ISO language code' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Two letter ISO language code')); ?>
 						</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" required="required" tabindex="1" autocomplete="off"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'locale.language.label' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Label (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/locale.language.label' ) ); ?>" />
+								name="<?= $enc->attr($this->formparam(array('item', 'locale.language.label'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Label (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/locale.language.label')); ?>" />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Descritive name of the language' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Descritive name of the language')); ?>
 						</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' ), ['params' => $params] ); ?>
+			<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 		</div>
 	</div>
 </form>
@@ -144,4 +144,4 @@ 
 <?php $this->block()->stop(); ?>
 
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

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

Spacing +306 added lines, -306 removed lines

@@ -5,20 +5,20 @@ 
  * @copyright Aimeos (aimeos.org), 2017-2018
  */
 
-$selected = function( $key, $code ) {
-	return ( $key == $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ($key == $code ? 'selected="selected"' : '');
 };
 
-$sortItems = function( array $items )
+$sortItems = function(array $items)
 {
 	$result = [];
 
-	if( isset( $items['payment'] ) ) {
-		$result['payment'] = $items['payment']; unset( $items['payment'] );
+	if (isset($items['payment'])) {
+		$result['payment'] = $items['payment']; unset($items['payment']);
 	}
 
-	if( isset( $items['delivery'] ) ) {
-		$result['delivery'] = $items['delivery']; unset( $items['delivery'] );
+	if (isset($items['delivery'])) {
+		$result['delivery'] = $items['delivery']; unset($items['delivery']);
 	}
 
 	return $result + $items;
@@ -28,32 +28,32 @@ 
 $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', []);
 
-$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', []);
 
-$listTarget = $this->config( 'admin/jqadm/url/search/target' );
-$listCntl = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
-$listAction = $this->config( 'admin/jqadm/url/search/action', 'search' );
-$listConfig = $this->config( 'admin/jqadm/url/search/config', [] );
+$listTarget = $this->config('admin/jqadm/url/search/target');
+$listCntl = $this->config('admin/jqadm/url/search/controller', 'Jqadm');
+$listAction = $this->config('admin/jqadm/url/search/action', 'search');
+$listConfig = $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', []);
 
 
-$searchParams = $params = $this->get( 'pageParams', [] );
-unset( $searchParams['id'] );
+$searchParams = $params = $this->get('pageParams', []);
+unset($searchParams['id']);
 
 /// Price format with price value (%1$s) and currency (%2$s)
-$priceFormat = $this->translate( 'client/code', '%1$s %2$s' );
+$priceFormat = $this->translate('client/code', '%1$s %2$s');
 
 $serviceAttrCodes = [
 	/** admin/jqadm/order/service/delivery/attribute/suggest
@@ -68,7 +68,7 @@ 
 	 * @category Developer
 	 * @see admin/jqadm/order/service/payment/attribute/suggest
 	 */
-	'delivery' => $this->config( 'admin/jqadm/order/service/delivery/attribute/suggest', ['trackingid'] ),
+	'delivery' => $this->config('admin/jqadm/order/service/delivery/attribute/suggest', ['trackingid']),
 
 	/** admin/jqadm/order/service/payment/attribute/suggest
 	 * List of suggested configuration keys for payment service attributes in orders
@@ -82,59 +82,59 @@ 
 	 * @category Developer
 	 * @see admin/jqadm/order/service/delivery/attribute/suggest
 	 */
-	'payment' => $this->config( 'admin/jqadm/order/service/payment/attribute/suggest', [] ),
+	'payment' => $this->config('admin/jqadm/order/service/payment/attribute/suggest', []),
 ];
 
 $statusList = [
-	'-1' => $this->translate( 'mshop/code', 'stat:-1' ),
-	'0' => $this->translate( 'mshop/code', 'stat:0' ),
-	'1' => $this->translate( 'mshop/code', 'stat:1' ),
-	'2' => $this->translate( 'mshop/code', 'stat:2' ),
-	'3' => $this->translate( 'mshop/code', 'stat:3' ),
-	'4' => $this->translate( 'mshop/code', 'stat:4' ),
-	'5' => $this->translate( 'mshop/code', 'stat:5' ),
-	'6' => $this->translate( 'mshop/code', 'stat:6' ),
-	'7' => $this->translate( 'mshop/code', 'stat:7' ),
+	'-1' => $this->translate('mshop/code', 'stat:-1'),
+	'0' => $this->translate('mshop/code', 'stat:0'),
+	'1' => $this->translate('mshop/code', 'stat:1'),
+	'2' => $this->translate('mshop/code', 'stat:2'),
+	'3' => $this->translate('mshop/code', 'stat:3'),
+	'4' => $this->translate('mshop/code', 'stat:4'),
+	'5' => $this->translate('mshop/code', 'stat:5'),
+	'6' => $this->translate('mshop/code', 'stat:6'),
+	'7' => $this->translate('mshop/code', 'stat:7'),
 ];
 
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
-<?php if( isset( $this->item ) ) : ?>
-	<?php $basket = $this->item; $currency = $this->translate( 'currency', $basket->getPrice()->getCurrencyId() ); ?>
+<?php if (isset($this->item)) : ?>
+	<?php $basket = $this->item; $currency = $this->translate('currency', $basket->getPrice()->getCurrencyId()); ?>
 
-	<form class="item item-order form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>">
-		<input id="item-baseid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'order.base.id' ) ) ); ?>" value="<?= $enc->attr( $basket->getId() ); ?>" />
-		<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
+	<form class="item item-order form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>">
+		<input id="item-baseid" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'order.base.id'))); ?>" value="<?= $enc->attr($basket->getId()); ?>" />
+		<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', 'Order' ) ); ?>:
-				<?= $enc->html( $basket->getId() ); ?> -
-				<?= $enc->html( $this->number( $basket->getPrice()->getValue() ) ); ?>
-				<?= $enc->html( $basket->getPrice()->getCurrencyId() ); ?>
-				<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $basket->getLocale()->getSiteId() ) ); ?>)</span>
+				<?= $enc->html($this->translate('admin', 'Order')); ?>:
+				<?= $enc->html($basket->getId()); ?> -
+				<?= $enc->html($this->number($basket->getPrice()->getValue())); ?>
+				<?= $enc->html($basket->getPrice()->getCurrencyId()); ?>
+				<span class="navbar-secondary">(<?= $enc->html($this->site()->match($basket->getLocale()->getSiteId())); ?>)</span>
 			</span>
 			<div class="item-actions">
 				<a class="btn btn-secondary act-cancel"
-					title="<?= $enc->attr( $this->translate( 'admin', 'Cancel and return to list') ); ?>"
-					href="<?= $enc->attr( $this->url( $listTarget, $listCntl, $listAction, $searchParams, [], $listConfig ) ); ?>">
-					<?= $enc->html( $this->translate( 'admin', 'Cancel' ) ); ?>
+					title="<?= $enc->attr($this->translate('admin', 'Cancel and return to list')); ?>"
+					href="<?= $enc->attr($this->url($listTarget, $listCntl, $listAction, $searchParams, [], $listConfig)); ?>">
+					<?= $enc->html($this->translate('admin', 'Cancel')); ?>
 				</a>
 
 				<div class="btn-group">
 					<button type="submit" class="btn btn-primary act-save"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Save entry (Ctrl+S)') ); ?>">
-						<?= $enc->html( $this->translate( 'admin', 'Save' ) ); ?>
+						title="<?= $enc->attr($this->translate('admin', 'Save entry (Ctrl+S)')); ?>">
+						<?= $enc->html($this->translate('admin', 'Save')); ?>
 					</button>
 					<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"
 						aria-haspopup="true" aria-expanded="false">
-						<span class="sr-only"><?= $enc->html( $this->translate( 'admin', 'Toggle dropdown' ) ); ?></span>
+						<span class="sr-only"><?= $enc->html($this->translate('admin', 'Toggle dropdown')); ?></span>
 					</button>
 					<ul class="dropdown-menu dropdown-menu-right">
-						<li class="dropdown-item"><a class="next-action" href="#" data-next="search"><?= $enc->html( $this->translate( 'admin', 'Save & Close' ) ); ?></a></li>
+						<li class="dropdown-item"><a class="next-action" href="#" data-next="search"><?= $enc->html($this->translate('admin', 'Save & Close')); ?></a></li>
 					</ul>
 				</div>
 			</div>
@@ -147,14 +147,14 @@ 
 
 					<li class="nav-item order">
 						<a class="nav-link active" href="#order" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="order">
-							<?= $enc->html( $this->translate( 'admin', 'Order' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Order')); ?>
 						</a>
 					</li>
 
-					<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $type => $subpart ) : ?>
-						<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-							<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$type+1; ?>">
-								<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
+					<?php foreach (array_values($this->get('itemSubparts', [])) as $type => $subpart) : ?>
+						<li class="nav-item <?= $enc->attr($subpart); ?>">
+							<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$type + 1; ?>">
+								<?= $enc->html($this->translate('admin', $subpart)); ?>
 							</a>
 						</li>
 					<?php endforeach; ?>
@@ -163,16 +163,16 @@ 
 
 				<div class="item-meta text-muted">
 					<small>
-						<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-						<span class="meta-value"><?= $enc->html( $basket->getTimeModified() ); ?></span>
+						<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+						<span class="meta-value"><?= $enc->html($basket->getTimeModified()); ?></span>
 					</small>
 					<small>
-						<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-						<span class="meta-value"><?= $enc->html( $basket->getTimeCreated() ); ?></span>
+						<?= $enc->html($this->translate('admin', 'Created')); ?>:
+						<span class="meta-value"><?= $enc->html($basket->getTimeCreated()); ?></span>
 					</small>
 					<small>
-						<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-						<span class="meta-value"><?= $enc->html( $basket->getEditor() ); ?></span>
+						<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+						<span class="meta-value"><?= $enc->html($basket->getEditor()); ?></span>
 					</small>
 				</div>
 			</div>
@@ -182,57 +182,57 @@ 
 				<div id="order" class="item-order tab-pane fade show active" role="tabpanel" aria-labelledby="order">
 
 					<div class="row item-base">
-						<div class="col-xl-6 content-block <?= $this->site()->readonly( $basket->getSiteId() ); ?>">
+						<div class="col-xl-6 content-block <?= $this->site()->readonly($basket->getSiteId()); ?>">
 							<div class="form-group row mandatory">
-								<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label>
+								<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Language')); ?></label>
 								<div class="col-sm-8">
 									<select class="form-control custom-select item-languageid" required="required" tabindex="1"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'order.base.languageid' ) ) ); ?>"
-										<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> >
+										name="<?= $enc->attr($this->formparam(array('item', 'order.base.languageid'))); ?>"
+										<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> >
 										<option value="">
-											<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Please select')); ?>
 										</option>
 
-										<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-											<option value="<?= $enc->attr( $langId ); ?>" <?= $selected( $basket->getLocale()->getLanguageId(), $langId ); ?> >
-												<?= $enc->html( $this->translate( 'language', $langId ) ); ?>
+										<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+											<option value="<?= $enc->attr($langId); ?>" <?= $selected($basket->getLocale()->getLanguageId(), $langId); ?> >
+												<?= $enc->html($this->translate('language', $langId)); ?>
 											</option>
 										<?php endforeach; ?>
 									</select>
 								</div>
 							</div>
 							<div class="form-group row">
-								<label class="col-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Site' ) ); ?></label>
+								<label class="col-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Site')); ?></label>
 								<div class="col-8">
-									<span class="form-control item-sitecode"><?= $enc->html( $basket->getSiteCode() ); ?></span>
+									<span class="form-control item-sitecode"><?= $enc->html($basket->getSiteCode()); ?></span>
 								</div>
 								<div class="col-12 form-text text-muted help-text">
-									<?= $enc->html( $this->translate( 'admin', 'Site the order was placed at' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Site the order was placed at')); ?>
 								</div>
 							</div>
 						</div>
 
-						<div class="col-xl-6 content-block <?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?>">
+						<div class="col-xl-6 content-block <?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?>">
 							<div class="form-group row">
-								<label class="col-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Customer' ) ); ?></label>
+								<label class="col-4 form-control-label"><?= $enc->html($this->translate('admin', 'Customer')); ?></label>
 								<div class="col-8">
 									<select class="combobox item-customer" tabindex="1"
-										name="<?= $enc->attr( $this->formparam( array( 'item', 'order.base.customerid' ) ) ); ?>"
-										<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
-										<option value="<?= $enc->attr( $this->get( 'itemData/order.base.customerid' ) ); ?>" >
-											<?= $enc->html( $this->get( 'itemData/customer.code' ) ); ?>
+										name="<?= $enc->attr($this->formparam(array('item', 'order.base.customerid'))); ?>"
+										<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
+										<option value="<?= $enc->attr($this->get('itemData/order.base.customerid')); ?>" >
+											<?= $enc->html($this->get('itemData/customer.code')); ?>
 										</option>
 									</select>
 								</div>
 							</div>
 							<div class="form-group row">
-								<label class="col-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Customer ID' ) ); ?></label>
+								<label class="col-4 form-control-label"><?= $enc->html($this->translate('admin', 'Customer ID')); ?></label>
 								<div class="col-8">
 									<span class="form-control item-customerid">
-										<?php if( $basket->getCustomerId() ) : ?>
+										<?php if ($basket->getCustomerId()) : ?>
 											<a class="act-view" target="_blank"
-												href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'customer', 'id' => $basket->getCustomerId()], [], $getConfig ) ); ?>">
-												<?= $enc->attr( $basket->getCustomerId() ); ?>
+												href="<?= $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'customer', 'id' => $basket->getCustomerId()], [], $getConfig)); ?>">
+												<?= $enc->attr($basket->getCustomerId()); ?>
 											</a>
 										<?php endif; ?>
 									</span>
@@ -245,73 +245,73 @@ 
 					<div class="row item-product">
 
 						<div class="col-sm-12 content-block">
-							<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Products' ) ); ?></h2>
+							<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Products')); ?></h2>
 							<table class="item-product-list table table-striped">
 								<thead>
 									<tr>
-										<th class="item-column column-subscription"><?= $enc->html( $this->translate( 'admin', 'Renew' ) ); ?></th>
-										<th class="item-column column-status"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></th>
-										<th class="item-column column-desc"><?= $enc->html( $this->translate( 'admin', 'Name' ) ); ?></th>
-										<th class="item-column column-quantity"><?= $enc->html( $this->translate( 'admin', 'Quantity' ) ); ?></th>
-										<th class="item-column column-price"><?= $enc->html( $this->translate( 'admin', 'Price' ) ); ?></th>
-										<th class="item-column column-sum"><?= $enc->html( $this->translate( 'admin', 'Sum' ) ); ?></th>
+										<th class="item-column column-subscription"><?= $enc->html($this->translate('admin', 'Renew')); ?></th>
+										<th class="item-column column-status"><?= $enc->html($this->translate('admin', 'Status')); ?></th>
+										<th class="item-column column-desc"><?= $enc->html($this->translate('admin', 'Name')); ?></th>
+										<th class="item-column column-quantity"><?= $enc->html($this->translate('admin', 'Quantity')); ?></th>
+										<th class="item-column column-price"><?= $enc->html($this->translate('admin', 'Price')); ?></th>
+										<th class="item-column column-sum"><?= $enc->html($this->translate('admin', 'Sum')); ?></th>
 									</tr>
 								</thead>
 								<tbody>
 
-									<?php foreach( (array) $basket->getProducts() as $pos => $orderProduct ) : ?>
+									<?php foreach ((array) $basket->getProducts() as $pos => $orderProduct) : ?>
 										<tr class="list-item">
 											<td class="item-column column-subscription">
 												<?php $newParams = [
 														'item' => ['subscription.ordbaseid' => $basket->getId(), 'subscription.ordprodid' => $orderProduct->getId()],
-														'site' => $this->param( 'site' ),
-														'lang' => $this->param( 'lang' ),
+														'site' => $this->param('site'),
+														'lang' => $this->param('lang'),
 														'resource' => 'subscription'
 													];
 												?>
-												<a class="btn btn-subscription fa" href="<?= $this->url( $newTarget, $newCntl, $newAction, $newParams, [], $newConfig ) ?>"></a>
+												<a class="btn btn-subscription fa" href="<?= $this->url($newTarget, $newCntl, $newAction, $newParams, [], $newConfig) ?>"></a>
 											</td>
 											<td class="item-column column-status">
 												<select class="form-control custom-select product-status" required="required" tabindex="1"
-													name="<?= $enc->attr( $this->formparam( array( 'item', 'product', $pos, 'order.base.product.status' ) ) ); ?>"
-													<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> >
+													name="<?= $enc->attr($this->formparam(array('item', 'product', $pos, 'order.base.product.status'))); ?>"
+													<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> >
 													<option value="">
-														<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+														<?= $enc->html($this->translate('admin', 'Please select')); ?>
 													</option>
-													<?php foreach( $statusList as $code => $label ) : ?>
-														<option value="<?= $code ?>" <?= $selected( $this->get( 'itemData/product/' . $pos . '/order.base.product.status' ), $code ); ?> >
-															<?= $enc->html( $label ); ?>
+													<?php foreach ($statusList as $code => $label) : ?>
+														<option value="<?= $code ?>" <?= $selected($this->get('itemData/product/' . $pos . '/order.base.product.status'), $code); ?> >
+															<?= $enc->html($label); ?>
 														</option>
 													<?php endforeach; ?>
 												</select>
 											</td>
 											<td class="item-column column-desc">
-												<span class="product-name"><?= $enc->html( $orderProduct->getName() ); ?></span>
+												<span class="product-name"><?= $enc->html($orderProduct->getName()); ?></span>
 												<span class="product-attr">
-													<?php foreach( $orderProduct->getAttributeItems() as $attrItem ) : ?>
-														<span class="attr-code"><?= $enc->html( $attrItem->getCode() ); ?></span>
+													<?php foreach ($orderProduct->getAttributeItems() as $attrItem) : ?>
+														<span class="attr-code"><?= $enc->html($attrItem->getCode()); ?></span>
 														<span class="attr-value">
-															<?php if( $attrItem->getQuantity() > 1 ) : ?>
-																<?= $enc->html( $attrItem->getQuantity() ); ?>×
+															<?php if ($attrItem->getQuantity() > 1) : ?>
+																<?= $enc->html($attrItem->getQuantity()); ?>×
 															<?php endif; ?>
-															<?= $enc->html( $attrItem->getValue() ); ?>
+															<?= $enc->html($attrItem->getValue()); ?>
 														</span>
 													<?php endforeach; ?>
 												</span>
-												<span class="product-sku"><?= $enc->html( $orderProduct->getProductCode() ); ?></span>
+												<span class="product-sku"><?= $enc->html($orderProduct->getProductCode()); ?></span>
 											</td>
 											<td class="item-column column-quantity">
-												<span class="product-quantity"><?= $enc->html( $orderProduct->getQuantity() ); ?></span>
+												<span class="product-quantity"><?= $enc->html($orderProduct->getQuantity()); ?></span>
 											</td>
 											<td class="item-column column-price">
-												<span class="product-price"><?= $enc->html( sprintf( $priceFormat, $orderProduct->getPrice()->getValue(), $currency ) ); ?></span>
-												<span class="product-costs"><?= $enc->html( sprintf( $priceFormat, $orderProduct->getPrice()->getCosts(), $currency ) ); ?></span>
-												<span class="product-rebate"><?= $enc->html( sprintf( $priceFormat, $orderProduct->getPrice()->getRebate(), $currency ) ); ?></span>
+												<span class="product-price"><?= $enc->html(sprintf($priceFormat, $orderProduct->getPrice()->getValue(), $currency)); ?></span>
+												<span class="product-costs"><?= $enc->html(sprintf($priceFormat, $orderProduct->getPrice()->getCosts(), $currency)); ?></span>
+												<span class="product-rebate"><?= $enc->html(sprintf($priceFormat, $orderProduct->getPrice()->getRebate(), $currency)); ?></span>
 											</td>
 											<td class="item-column column-sum">
-												<span class="product-price"><?= $enc->html( sprintf( $priceFormat, $this->number( $orderProduct->getPrice()->getValue() * $orderProduct->getQuantity() ), $currency ) ); ?></span>
-												<span class="product-costs"><?= $enc->html( sprintf( $priceFormat, $this->number( $orderProduct->getPrice()->getCosts() * $orderProduct->getQuantity() ), $currency ) ); ?></span>
-												<span class="product-rebate"><?= $enc->html( sprintf( $priceFormat, $this->number( $orderProduct->getPrice()->getRebate() * $orderProduct->getQuantity() ), $currency ) ); ?></span>
+												<span class="product-price"><?= $enc->html(sprintf($priceFormat, $this->number($orderProduct->getPrice()->getValue() * $orderProduct->getQuantity()), $currency)); ?></span>
+												<span class="product-costs"><?= $enc->html(sprintf($priceFormat, $this->number($orderProduct->getPrice()->getCosts() * $orderProduct->getQuantity()), $currency)); ?></span>
+												<span class="product-rebate"><?= $enc->html(sprintf($priceFormat, $this->number($orderProduct->getPrice()->getRebate() * $orderProduct->getQuantity()), $currency)); ?></span>
 											</td>
 										</tr>
 									<?php endforeach; ?>
@@ -326,27 +326,27 @@ 
 					<div class="row item-misc">
 
 						<div class="col-xl-6 content-block">
-							<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Coupon' ) ); ?></h2>
-							<?php if( $basket->getCoupons() !== [] ) : ?>
-								<?php foreach( $basket->getCoupons() as $code => $product ) : ?>
+							<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Coupon')); ?></h2>
+							<?php if ($basket->getCoupons() !== []) : ?>
+								<?php foreach ($basket->getCoupons() as $code => $product) : ?>
 									<div class="form-group row">
-										<label class="col-sm-4"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label>
-										<div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ); ?></span></div>
+										<label class="col-sm-4"><?= $enc->html($this->translate('admin', 'Code')); ?></label>
+										<div class="col-sm-8"><span class="item-coupon"><?= $enc->attr($code); ?></span></div>
 									</div>
 								<?php endforeach; ?>
 							<?php else : ?>
-								<?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); ?>
+								<?= $enc->html($this->translate('admin', 'No voucher')); ?>
 							<?php endif; ?>
 						</div>
 
 						<div class="col-xl-6 content-block">
-							<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Comment' ) ); ?></h2>
+							<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Comment')); ?></h2>
 							<div class="form-group optional">
 								<textarea class="form-control item-title" type="text" tabindex="1" rows="3"
-									name="<?= $enc->attr( $this->formparam( array( 'item', 'order.base.comment' ) ) ); ?>"
-									placeholder="<?= $enc->attr( $this->translate( 'admin', 'Customer comment (optional)' ) ); ?>"
-									<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?>
-								><?= $enc->html( $basket->getComment() ); ?></textarea>
+									name="<?= $enc->attr($this->formparam(array('item', 'order.base.comment'))); ?>"
+									placeholder="<?= $enc->attr($this->translate('admin', 'Customer comment (optional)')); ?>"
+									<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?>
+								><?= $enc->html($basket->getComment()); ?></textarea>
 							</div>
 						</div>
 
@@ -354,265 +354,265 @@ 
 
 
 					<div class="row">
-						<?php foreach( $sortItems( $basket->getAddresses() ) as $type => $addressItem ) : $code = 'address:' . $type; ?>
+						<?php foreach ($sortItems($basket->getAddresses()) as $type => $addressItem) : $code = 'address:' . $type; ?>
 
 							<div class="col-xl-6 content-block item-address">
-								<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin/ext', $code ) ); ?></h2>
+								<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin/ext', $code)); ?></h2>
 
 								<div class="address-short">
 									<?php
 										/// short order address with company (%1$s), first name (%2$s), last name (%3$s), street (%4$s), house number (%5$s),
 										/// zip code (%6$s), city (%7$s),state (%8$s), countryid (%9$s), e-mail (%10$s), telephone (%11$s), VAT ID  (%12$s)
-										$addrFormat = $this->translate( 'admin', "%1\$s\n%2\$s %3\$s\n%5\$s %4\$s\n%7\$s, %6\$s\n%8\$s, %9\$s\n%10\$s\n%11\$s\n%12\$s" );
+										$addrFormat = $this->translate('admin', "%1\$s\n%2\$s %3\$s\n%5\$s %4\$s\n%7\$s, %6\$s\n%8\$s, %9\$s\n%10\$s\n%11\$s\n%12\$s");
 									?>
-									<span class="address-text" data-format="<?= $enc->attr( $addrFormat ); ?>"><!-- inserted by order.js --></span>
+									<span class="address-text" data-format="<?= $enc->attr($addrFormat); ?>"><!-- inserted by order.js --></span>
 									<span class="address-edit"></span>
 								</div>
 
 								<fieldset class="address-form">
 									<div class="form-group row mandatory">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'E-Mail' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'E-Mail')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-email" type="email" tabindex="1" data-field="email"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.email' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'E-Mail address (required)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.email' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.email'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'E-Mail address (required)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.email')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Customer e-mail address' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Customer e-mail address')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></label>
+										<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Language')); ?></label>
 										<div class="col-sm-8">
 											<select class="form-control custom-select item-languageid" tabindex="1" data-field="languageid"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.languageid' ) ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> >
-												<option value=""><?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?></option>
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.languageid'))); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> >
+												<option value=""><?= $enc->html($this->translate('admin', 'Please select')); ?></option>
 
-												<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-													<option value="<?= $enc->attr( $langId ); ?>" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.languageid' ), $langId ); ?> >
-														<?= $enc->html( $this->translate( 'language', $langId ) ); ?>
+												<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+													<option value="<?= $enc->attr($langId); ?>" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.languageid'), $langId); ?> >
+														<?= $enc->html($this->translate('language', $langId)); ?>
 													</option>
 												<?php endforeach; ?>
 											</select>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Salutation' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Salutation')); ?></label>
 										<div class="col-sm-8">
 											<select class="form-control custom-select item-salutation" tabindex="1" data-field="salutation"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.salutation' ) ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> >
-												<option value="" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), '' ); ?> >
-													<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.salutation'))); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> >
+												<option value="" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), ''); ?> >
+													<?= $enc->html($this->translate('admin', 'Please select')); ?>
 												</option>
-												<option value="company" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), 'company' ); ?> >
-													<?= $enc->html( $this->translate( 'client/code', 'company' ) ); ?>
+												<option value="company" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), 'company'); ?> >
+													<?= $enc->html($this->translate('client/code', 'company')); ?>
 												</option>
-												<option value="mr" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), 'mr' ); ?> >
-													<?= $enc->html( $this->translate( 'client/code', 'mr' ) ); ?>
+												<option value="mr" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), 'mr'); ?> >
+													<?= $enc->html($this->translate('client/code', 'mr')); ?>
 												</option>
-												<option value="mrs" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), 'mrs' ); ?> >
-													<?= $enc->html( $this->translate( 'client/code', 'mrs' ) ); ?>
+												<option value="mrs" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), 'mrs'); ?> >
+													<?= $enc->html($this->translate('client/code', 'mrs')); ?>
 												</option>
-												<option value="miss" <?= $selected( $this->get( 'itemData/address/' . $type . '/order.base.address.salutation' ), 'miss' ); ?> >
-													<?= $enc->html( $this->translate( 'client/code', 'miss' ) ); ?>
+												<option value="miss" <?= $selected($this->get('itemData/address/' . $type . '/order.base.address.salutation'), 'miss'); ?> >
+													<?= $enc->html($this->translate('client/code', 'miss')); ?>
 												</option>
 											</select>
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'How the customer is addressed in e-mails' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'How the customer is addressed in e-mails')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Title' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Title')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-title" type="text" tabindex="1" data-field="title"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.title' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Honorary title (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.title' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.title'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Honorary title (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.title')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Honorary titles like Dr., Ph.D, etc.' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Honorary titles like Dr., Ph.D, etc.')); ?>
 										</div>
 									</div>
 									<div class="form-group row mandatory">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Last name' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Last name')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-lastname" type="text" required="required" tabindex="1" data-field="lastname"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.lastname' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Last name (required)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.lastname' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.lastname'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Last name (required)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.lastname')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Last name of the person or full name in cultures where no first names are used' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Last name of the person or full name in cultures where no first names are used')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'First name' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'First name')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-firstname" type="text" tabindex="1" data-field="firstname"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.firstname' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'First name (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.firstname' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.firstname'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'First name (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.firstname')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'First name of the person if used in cultures where they are used' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'First name of the person if used in cultures where they are used')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Street' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Street')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-address1" type="text" tabindex="1" data-field="address1"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.address1' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Street name (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.address1' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.address1'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Street name (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.address1')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'First name of the person if used in cultures where they are used' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'First name of the person if used in cultures where they are used')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'House number' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'House number')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-address2" type="text" tabindex="1" data-field="address2"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.address2' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'House number (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.address2' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.address2'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'House number (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.address2')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Address identifier of the customer\'s house for delivery' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Address identifier of the customer\'s house for delivery')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Floor / Appartment' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Floor / Appartment')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-address3" type="text" tabindex="1" data-field="address3"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.address3' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Floor and/or apartment (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.address3' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.address3'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Floor and/or apartment (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.address3')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Additional information where the customer\'s apartment can be found' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Additional information where the customer\'s apartment can be found')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Zip code' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Zip code')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-postal" type="text" tabindex="1" data-field="postal"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.postal' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Zip code (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.postal' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.postal'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Zip code (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.postal')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Postal code for delivery if used in the area the customer is living' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Postal code for delivery if used in the area the customer is living')); ?>
 										</div>
 									</div>
 									<div class="form-group row mandatory">
-										<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'City' ) ); ?></label>
+										<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'City')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-city" type="text" required="required" tabindex="1" data-field="city"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.city' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'City or town name (required)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.city' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.city'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'City or town name (required)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.city')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'State' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'State')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-state" type="text" tabindex="1" data-field="state"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.state' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Country state code (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.state' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.state'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Country state code (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.state')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Short state code (e.g. NY) if used in the country the customer is living' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Short state code (e.g. NY) if used in the country the customer is living')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Country' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Country')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-countryid" type="text" tabindex="1" maxlength="2" pattern="^[a-zA-Z]{2}$" data-field="countryid"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.countryid' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Country code (required)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.countryid' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.countryid'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Country code (required)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.countryid')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Two letter ISO country code' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Two letter ISO country code')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Telephone' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Telephone')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-telephone" type="tel" tabindex="1" data-field="telephone"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.telephone' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Telephone number (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.telephone' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.telephone'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Telephone number (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.telephone')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', '(International) telephone number without separation characters, can start with a "+"' ) ); ?>
+											<?= $enc->html($this->translate('admin', '(International) telephone number without separation characters, can start with a "+"')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Facsimile' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Facsimile')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-telefax" type="text" tabindex="1" data-field="telefax"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.telefax' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Facsimile number (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.telefax' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.telefax'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Facsimile number (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.telefax')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', '(International) facsimilie number without separation characters, can start with a "+"' ) ); ?>
+											<?= $enc->html($this->translate('admin', '(International) facsimilie number without separation characters, can start with a "+"')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Web site' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Web site')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-website" type="url" tabindex="1" data-field="website"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.website' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Web site URL (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.website') ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.website'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Web site URL (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.website')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'URL of the customer web site' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'URL of the customer web site')); ?>
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Company' ) ); ?></label>
+										<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Company')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-company" type="text" tabindex="1" data-field="company"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.company' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Company name (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.company' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.company'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Company name (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.company')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 									</div>
 									<div class="form-group row optional">
-										<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'VAT ID' ) ); ?></label>
+										<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'VAT ID')); ?></label>
 										<div class="col-sm-8">
 											<input class="form-control item-vatid" type="text" tabindex="1" data-field="vatid"
-												name="<?= $enc->attr( $this->formparam( array( 'item', 'address', $type, 'order.base.address.vatid' ) ) ); ?>"
-												placeholder="<?= $enc->attr( $this->translate( 'admin', 'Value added tax identifier (optional)' ) ); ?>"
-												value="<?= $enc->attr( $this->get( 'itemData/address/' . $type . '/order.base.address.vatid' ) ); ?>"
-												<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+												name="<?= $enc->attr($this->formparam(array('item', 'address', $type, 'order.base.address.vatid'))); ?>"
+												placeholder="<?= $enc->attr($this->translate('admin', 'Value added tax identifier (optional)')); ?>"
+												value="<?= $enc->attr($this->get('itemData/address/' . $type . '/order.base.address.vatid')); ?>"
+												<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 										</div>
 										<div class="col-sm-12 form-text text-muted help-text">
-											<?= $enc->html( $this->translate( 'admin', 'Official VAT ID to determine if the tax needs to be billed in invoices' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Official VAT ID to determine if the tax needs to be billed in invoices')); ?>
 										</div>
 									</div>
 								</div>
@@ -622,41 +622,41 @@ 
 					</div>
 
 					<div class="row">
-						<?php foreach( $sortItems( $basket->getServices() ) as $type => $services ) : $code = 'service:' . $type; ?>
-							<?php foreach( $services as $serviceItem ) : $serviceId = $serviceItem->getServiceId(); ?>
+						<?php foreach ($sortItems($basket->getServices()) as $type => $services) : $code = 'service:' . $type; ?>
+							<?php foreach ($services as $serviceItem) : $serviceId = $serviceItem->getServiceId(); ?>
 
 								<div class="col-xl-6 content-block item-service">
-									<h2 class="col-12 item-header"><?= $enc->html( $this->translate( 'admin/ext', $code ) ); ?></h2>
+									<h2 class="col-12 item-header"><?= $enc->html($this->translate('admin/ext', $code)); ?></h2>
 									<div class="row">
 										<div class="col-6 content-block">
-											<span class="service-name"><?= $enc->html( $serviceItem->getName() ); ?></span>
-											<span class="service-code"><?= $enc->html( $serviceItem->getCode() ); ?></span>
+											<span class="service-name"><?= $enc->html($serviceItem->getName()); ?></span>
+											<span class="service-code"><?= $enc->html($serviceItem->getCode()); ?></span>
 										</div>
 										<div class="col-6 content-block">
-											<span class="service-price"><?= $enc->html( sprintf( $priceFormat, $this->number( $serviceItem->getPrice()->getValue() + $serviceItem->getPrice()->getCosts() ), $currency ) ); ?></span>
-											<?php if( $serviceItem->getPrice()->getRebate() > 0 ) : ?>
-												<span class="service-rebate"><?= $enc->html( sprintf( $priceFormat, $this->number( $serviceItem->getPrice()->getRebate() ), $currency ) ); ?></span>
+											<span class="service-price"><?= $enc->html(sprintf($priceFormat, $this->number($serviceItem->getPrice()->getValue() + $serviceItem->getPrice()->getCosts()), $currency)); ?></span>
+											<?php if ($serviceItem->getPrice()->getRebate() > 0) : ?>
+												<span class="service-rebate"><?= $enc->html(sprintf($priceFormat, $this->number($serviceItem->getPrice()->getRebate()), $currency)); ?></span>
 											<?php endif; ?>
 										</div>
 									</div>
 
-									<table class="service-attr table table-striped" data-id="<?= $enc->attr($serviceId ) ?>"
-										data-codes="<?= $enc->attr( isset( $serviceAttrCodes[$type] ) ? implode( ',', $serviceAttrCodes[$type] ) : '' ); ?>">
+									<table class="service-attr table table-striped" data-id="<?= $enc->attr($serviceId) ?>"
+										data-codes="<?= $enc->attr(isset($serviceAttrCodes[$type]) ? implode(',', $serviceAttrCodes[$type]) : ''); ?>">
 										<thead>
 											<tr>
 												<th>
-													<span class="help"><?= $enc->html( $this->translate( 'admin', 'Code' ) ); ?></span>
+													<span class="help"><?= $enc->html($this->translate('admin', 'Code')); ?></span>
 													<div class="form-text text-muted help-text">
-														<?= $enc->html( $this->translate( 'admin', 'Service attribute code' ) ); ?>
+														<?= $enc->html($this->translate('admin', 'Service attribute code')); ?>
 													</div>
 												</th>
 												<th>
-													<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+													<?= $enc->html($this->translate('admin', 'Value')); ?>
 												</th>
 												<th class="actions">
-													<?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?>
+													<?php if (!$this->site()->readonly($basket->getLocale()->getSiteId())) : ?>
 														<div class="btn act-add fa" tabindex="1"
-															title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+															title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>">
 														</div>
 													<?php endif; ?>
 												</th>
@@ -664,38 +664,38 @@ 
 										</thead>
 										<tbody>
 
-											<?php foreach( (array) $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.id', [] ) as $idx => $attrId ) : ?>
+											<?php foreach ((array) $this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.id', []) as $idx => $attrId) : ?>
 												<tr class="service-attr-item">
 													<td>
-														<input type="hidden" class="service-attr-id" value="<?= $enc->attr( $attrId ); ?>"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.id', '' ) ) ); ?>" />
+														<input type="hidden" class="service-attr-id" value="<?= $enc->attr($attrId); ?>"
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.id', ''))); ?>" />
 														<input type="hidden" class="service-attr-attributeid"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.attrid', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.attrid/' . $idx ) ); ?>" />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.attrid', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.attrid/' . $idx)); ?>" />
 														<input type="hidden" class="service-attr-type"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.type', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.type/' . $idx ) ); ?>" />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.type', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.type/' . $idx)); ?>" />
 														<input type="hidden" class="service-attr-name"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.name', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.name/' . $idx ) ); ?>" />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.name', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.name/' . $idx)); ?>" />
 														<input type="hidden" class="service-attr-quantity"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.quantity', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.quantity/' . $idx ) ); ?>" />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.quantity', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.quantity/' . $idx)); ?>" />
 														<input type="text" class="service-attr-code form-control" tabindex="1"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.code', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.code/' . $idx ) ); ?>"
-															<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.code', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.code/' . $idx)); ?>"
+															<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 													</td>
 													<td>
 														<input type="text" class="service-attr-value form-control" tabindex="1"
-															name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, $serviceId, 'order.base.service.attribute.value', '' ) ) ); ?>"
-															value="<?= $enc->attr( $this->get( 'itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.value/' . $idx ) ); ?>"
-															<?= $this->site()->readonly( $basket->getLocale()->getSiteId() ); ?> />
+															name="<?= $enc->attr($this->formparam(array('item', 'service', $type, $serviceId, 'order.base.service.attribute.value', ''))); ?>"
+															value="<?= $enc->attr($this->get('itemData/service/' . $type . '/' . $serviceId . '/order.base.service.attribute.value/' . $idx)); ?>"
+															<?= $this->site()->readonly($basket->getLocale()->getSiteId()); ?> />
 													</td>
 													<td class="actions">
-														<?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?>
+														<?php if (!$this->site()->readonly($basket->getLocale()->getSiteId())) : ?>
 															<div class="btn act-delete fa" tabindex="1"
-																title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+																title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 															</div>
 														<?php endif; ?>
 													</td>
@@ -705,26 +705,26 @@ 
 											<tr class="prototype">
 												<td>
 													<input type="hidden" class="service-attr-id" value="" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.id', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.id', ''))); ?>" />
 													<input type="hidden" class="service-attr-attributeid" value="" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.attrid', '' ) ) ); ?>" />
-													<input type="hidden" class="service-attr-type" value="<?= $enc->attr( $type ); ?>" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.type', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.attrid', ''))); ?>" />
+													<input type="hidden" class="service-attr-type" value="<?= $enc->attr($type); ?>" disabled="disabled"
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.type', ''))); ?>" />
 													<input type="hidden" class="service-attr-name" value="" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.name', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.name', ''))); ?>" />
 													<input type="hidden" class="service-attr-quantity" value="1" disabled="disabled"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.quantity', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.quantity', ''))); ?>" />
 													<input type="text" class="service-attr-code form-control" value="" disabled="disabled" tabindex="1"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.code', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.code', ''))); ?>" />
 												</td>
 												<td>
 													<input type="text" class="service-attr-value form-control" value="" disabled="disabled" tabindex="1"
-														name="<?= $enc->attr( $this->formparam( array( 'item', 'service', $type, '_id_', 'order.base.service.attribute.value', '' ) ) ); ?>" />
+														name="<?= $enc->attr($this->formparam(array('item', 'service', $type, '_id_', 'order.base.service.attribute.value', ''))); ?>" />
 												</td>
 												<td class="actions">
-													<?php if( !$this->site()->readonly( $basket->getLocale()->getSiteId() ) ) : ?>
+													<?php if (!$this->site()->readonly($basket->getLocale()->getSiteId())) : ?>
 														<div class="btn act-delete fa" tabindex="1"
-															title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+															title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 														</div>
 													<?php endif; ?>
 												</td>
@@ -741,40 +741,40 @@ 
 						<div class="col-xl-6 content-block"></div>
 
 						<div class="col-xl-6 content-block item-total">
-							<h2 class="item-header"><?= $enc->html( $this->translate( 'admin', 'Order totals' ) ); ?></h2>
+							<h2 class="item-header"><?= $enc->html($this->translate('admin', 'Order totals')); ?></h2>
 							<div class="form-group row total-subtotal">
-								<div class="col-6 name"><?= $enc->html( $this->translate( 'admin', 'Sub-total' ) ); ?></div>
-								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getValue() ), $currency ) ); ?></div>
+								<div class="col-6 name"><?= $enc->html($this->translate('admin', 'Sub-total')); ?></div>
+								<div class="col-6 value"><?= $enc->html(sprintf($priceFormat, $this->number($basket->getPrice()->getValue()), $currency)); ?></div>
 							</div>
 							<div class="form-group row total-shipping">
-								<div class="col-6 name"><?= $enc->html( $this->translate( 'admin', 'Shipping' ) ); ?></div>
-								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getCosts() ), $currency ) ); ?></div>
+								<div class="col-6 name"><?= $enc->html($this->translate('admin', 'Shipping')); ?></div>
+								<div class="col-6 value"><?= $enc->html(sprintf($priceFormat, $this->number($basket->getPrice()->getCosts()), $currency)); ?></div>
 							</div>
 							<div class="form-group row total-value">
-								<div class="col-6 name"><?= $enc->html( $this->translate( 'admin', 'Total' ) ); ?></div>
-								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getValue() + $basket->getPrice()->getCosts() ), $currency ) ); ?></div>
+								<div class="col-6 name"><?= $enc->html($this->translate('admin', 'Total')); ?></div>
+								<div class="col-6 value"><?= $enc->html(sprintf($priceFormat, $this->number($basket->getPrice()->getValue() + $basket->getPrice()->getCosts()), $currency)); ?></div>
 							</div>
 							<div class="form-group row total-tax">
 								<div class="col-6 name">
-									<?php if( $basket->getPrice()->getTaxFlag() ) : ?>
-										<?= $enc->html( $this->translate( 'admin', 'Incl. tax' ) ); ?>
+									<?php if ($basket->getPrice()->getTaxFlag()) : ?>
+										<?= $enc->html($this->translate('admin', 'Incl. tax')); ?>
 									<?php else : ?>
-										<?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Excl. tax')); ?>
 									<?php endif; ?>
 								</div>
-								<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getTaxValue() ), $currency ) ); ?></div>
+								<div class="col-6 value"><?= $enc->html(sprintf($priceFormat, $this->number($basket->getPrice()->getTaxValue()), $currency)); ?></div>
 							</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' ), ['params' => $params] ); ?>
+				<?= $this->partial($this->config('admin/jqadm/partial/itemactions', 'common/partials/itemactions-standard'), ['params' => $params]); ?>
 			</div>
 		</div>
 	</form>
@@ -784,4 +784,4 @@ 
 <?php $this->block()->stop(); ?>
 
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/type/text/list-standard.php

Spacing +99 added lines, -99 removed lines

@@ -8,34 +8,34 @@ 
 $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/type/text/fields
@@ -53,44 +53,44 @@ 
  * @category Developer
  */
 $default = ['text.type.domain', 'text.type.status', 'text.type.code', 'text.type.label'];
-$default = $this->config( 'admin/jqadm/type/text/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/type/text/fields', $default );
+$default = $this->config('admin/jqadm/type/text/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/type/text/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
 $typeList = [];
-foreach( $this->get( 'itemTypes', [] ) as $typeItem ) {
+foreach ($this->get('itemTypes', []) as $typeItem) {
 	$typeList[$typeItem->getCode()] = $typeItem->getCode();
 }
 
 $columnList = [
-	'text.type.id' => $this->translate( 'admin', 'ID' ),
-	'text.type.domain' => $this->translate( 'admin', 'Domain' ),
-	'text.type.status' => $this->translate( 'admin', 'Status' ),
-	'text.type.code' => $this->translate( 'admin', 'Code' ),
-	'text.type.label' => $this->translate( 'admin', 'Label' ),
-	'text.type.position' => $this->translate( 'admin', 'Position' ),
-	'text.type.ctime' => $this->translate( 'admin', 'Created' ),
-	'text.type.mtime' => $this->translate( 'admin', 'Modified' ),
-	'text.type.editor' => $this->translate( 'admin', 'Editor' ),
+	'text.type.id' => $this->translate('admin', 'ID'),
+	'text.type.domain' => $this->translate('admin', 'Domain'),
+	'text.type.status' => $this->translate('admin', 'Status'),
+	'text.type.code' => $this->translate('admin', 'Code'),
+	'text.type.label' => $this->translate('admin', 'Label'),
+	'text.type.position' => $this->translate('admin', 'Position'),
+	'text.type.ctime' => $this->translate('admin', 'Created'),
+	'text.type.mtime' => $this->translate('admin', 'Modified'),
+	'text.type.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', 'Text Types' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'Text Types')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 
 	<?= $this->partial(
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
-			'filter' => $this->session( 'aimeos/admin/jqadm/type/text/filter', [] ),
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
-			'filterOperators' => $this->get( 'filterOperators', [] ),
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
+			'filter' => $this->session('aimeos/admin/jqadm/type/text/filter', []),
+			'filterAttributes' => $this->get('filterAttributes', []),
+			'filterOperators' => $this->get('filterOperators', []),
 			'params' => $params,
 		]
 	); ?>
@@ -98,33 +98,33 @@ 
 
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/type/text/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/type/text/page', [])]
 	);
 ?>
 
-<form class="list list-text-type" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
+<form class="list list-text-type" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
 	<?= $this->csrf()->formfield(); ?>
 
 	<table class="list-items table table-hover table-striped">
 		<thead class="list-header">
 			<tr>
 				<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/type/text/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/type/text/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' ),
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
 							['fields' => $fields, 'data' => $columnList]
 						);
 					?>
@@ -134,26 +134,26 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/type/text/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/type/text/filter', []),
 					'data' => [
 						'text.type.id' => ['op' => '=='],
 						'text.type.domain' => ['op' => '==', 'type' => 'select', 'val' => [
-							'text' => $this->translate( 'admin', 'text' ),
-							'catalog' => $this->translate( 'admin', 'catalog' ),
-							'customer' => $this->translate( 'admin', 'customer' ),
-							'media' => $this->translate( 'admin', 'media' ),
-							'price' => $this->translate( 'admin', 'price' ),
-							'product' => $this->translate( 'admin', 'product' ),
-							'service' => $this->translate( 'admin', 'service' ),
-							'supplier' => $this->translate( 'admin', 'supplier' ),
-							'text' => $this->translate( 'admin', 'text' ),
+							'text' => $this->translate('admin', 'text'),
+							'catalog' => $this->translate('admin', 'catalog'),
+							'customer' => $this->translate('admin', 'customer'),
+							'media' => $this->translate('admin', 'media'),
+							'price' => $this->translate('admin', 'price'),
+							'product' => $this->translate('admin', 'product'),
+							'service' => $this->translate('admin', 'service'),
+							'supplier' => $this->translate('admin', 'supplier'),
+							'text' => $this->translate('admin', 'text'),
 						]],
 						'text.type.status' => ['op' => '==', 'type' => 'select', 'val' => [
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
+							'1' => $this->translate('mshop/code', 'status:1'),
+							'0' => $this->translate('mshop/code', 'status:0'),
+							'-1' => $this->translate('mshop/code', 'status:-1'),
+							'-2' => $this->translate('mshop/code', 'status:-2'),
 						]],
 						'text.type.code' => [],
 						'text.type.label' => [],
@@ -165,47 +165,47 @@ 
 				] );
 			?>
 
-			<?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( 'text.type.id', $fields ) ) : ?>
-						<td class="text-type-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('text.type.id', $fields)) : ?>
+						<td class="text-type-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.type.domain', $fields ) ) : ?>
-						<td class="text-type-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDomain() ); ?></a></td>
+					<?php if (in_array('text.type.domain', $fields)) : ?>
+						<td class="text-type-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDomain()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.type.status', $fields ) ) : ?>
-						<td class="text-type-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
+					<?php if (in_array('text.type.status', $fields)) : ?>
+						<td class="text-type-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.type.code', $fields ) ) : ?>
-						<td class="text-type-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getCode() ); ?></a></td>
+					<?php if (in_array('text.type.code', $fields)) : ?>
+						<td class="text-type-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getCode()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.type.label', $fields ) ) : ?>
-						<td class="text-type-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('text.type.label', $fields)) : ?>
+						<td class="text-type-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.type.position', $fields ) ) : ?>
-						<td class="text-type-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getPosition() ); ?></a></td>
+					<?php if (in_array('text.type.position', $fields)) : ?>
+						<td class="text-type-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getPosition()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.type.ctime', $fields ) ) : ?>
-						<td class="text-type-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('text.type.ctime', $fields)) : ?>
+						<td class="text-type-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.type.mtime', $fields ) ) : ?>
-						<td class="text-type-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('text.type.mtime', $fields)) : ?>
+						<td class="text-type-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.type.editor', $fields ) ) : ?>
-						<td class="text-type-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('text.type.editor', $fields)) : ?>
+						<td class="text-type-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, ['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, ['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>
@@ -213,18 +213,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' ),
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/type/text/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/type/text/page', [])]
 	);
 ?>
 
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/type/text/lists/list-standard.php

Spacing +99 added lines, -99 removed lines

@@ -8,34 +8,34 @@ 
 $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/type/text/lists/fields
@@ -53,44 +53,44 @@ 
  * @category Developer
  */
 $default = ['text.lists.type.domain', 'text.lists.type.status', 'text.lists.type.code', 'text.lists.type.label'];
-$default = $this->config( 'admin/jqadm/type/text/lists/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/type/text/lists/fields', $default );
+$default = $this->config('admin/jqadm/type/text/lists/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/type/text/lists/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
 $typeList = [];
-foreach( $this->get( 'itemTypes', [] ) as $typeItem ) {
+foreach ($this->get('itemTypes', []) as $typeItem) {
 	$typeList[$typeItem->getCode()] = $typeItem->getCode();
 }
 
 $columnList = [
-	'text.lists.type.id' => $this->translate( 'admin', 'ID' ),
-	'text.lists.type.domain' => $this->translate( 'admin', 'Domain' ),
-	'text.lists.type.status' => $this->translate( 'admin', 'Status' ),
-	'text.lists.type.code' => $this->translate( 'admin', 'Code' ),
-	'text.lists.type.label' => $this->translate( 'admin', 'Label' ),
-	'text.lists.type.position' => $this->translate( 'admin', 'Position' ),
-	'text.lists.type.ctime' => $this->translate( 'admin', 'Created' ),
-	'text.lists.type.mtime' => $this->translate( 'admin', 'Modified' ),
-	'text.lists.type.editor' => $this->translate( 'admin', 'Editor' ),
+	'text.lists.type.id' => $this->translate('admin', 'ID'),
+	'text.lists.type.domain' => $this->translate('admin', 'Domain'),
+	'text.lists.type.status' => $this->translate('admin', 'Status'),
+	'text.lists.type.code' => $this->translate('admin', 'Code'),
+	'text.lists.type.label' => $this->translate('admin', 'Label'),
+	'text.lists.type.position' => $this->translate('admin', 'Position'),
+	'text.lists.type.ctime' => $this->translate('admin', 'Created'),
+	'text.lists.type.mtime' => $this->translate('admin', 'Modified'),
+	'text.lists.type.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', 'Text Lists Types' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'Text Lists Types')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 
 	<?= $this->partial(
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
-			'filter' => $this->session( 'aimeos/admin/jqadm/type/text/lists/filter', [] ),
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
-			'filterOperators' => $this->get( 'filterOperators', [] ),
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
+			'filter' => $this->session('aimeos/admin/jqadm/type/text/lists/filter', []),
+			'filterAttributes' => $this->get('filterAttributes', []),
+			'filterOperators' => $this->get('filterOperators', []),
 			'params' => $params,
 		]
 	); ?>
@@ -98,33 +98,33 @@ 
 
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/type/text/lists/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/type/text/lists/page', [])]
 	);
 ?>
 
-<form class="list list-text-lists-type" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
+<form class="list list-text-lists-type" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
 	<?= $this->csrf()->formfield(); ?>
 
 	<table class="list-items table table-hover table-striped">
 		<thead class="list-header">
 			<tr>
 				<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/type/text/lists/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/type/text/lists/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' ),
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
 							['fields' => $fields, 'data' => $columnList]
 						);
 					?>
@@ -134,26 +134,26 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/type/text/lists/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/type/text/lists/filter', []),
 					'data' => [
 						'text.lists.type.id' => ['op' => '=='],
 						'text.lists.type.domain' => ['op' => '==', 'type' => 'select', 'val' => [
-							'attribute' => $this->translate( 'admin', 'attribute' ),
-							'catalog' => $this->translate( 'admin', 'catalog' ),
-							'customer' => $this->translate( 'admin', 'customer' ),
-							'media' => $this->translate( 'admin', 'media' ),
-							'price' => $this->translate( 'admin', 'price' ),
-							'product' => $this->translate( 'admin', 'product' ),
-							'service' => $this->translate( 'admin', 'service' ),
-							'supplier' => $this->translate( 'admin', 'supplier' ),
-							'text' => $this->translate( 'admin', 'text' ),
+							'attribute' => $this->translate('admin', 'attribute'),
+							'catalog' => $this->translate('admin', 'catalog'),
+							'customer' => $this->translate('admin', 'customer'),
+							'media' => $this->translate('admin', 'media'),
+							'price' => $this->translate('admin', 'price'),
+							'product' => $this->translate('admin', 'product'),
+							'service' => $this->translate('admin', 'service'),
+							'supplier' => $this->translate('admin', 'supplier'),
+							'text' => $this->translate('admin', 'text'),
 						]],
 						'text.lists.type.status' => ['op' => '==', 'type' => 'select', 'val' => [
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
+							'1' => $this->translate('mshop/code', 'status:1'),
+							'0' => $this->translate('mshop/code', 'status:0'),
+							'-1' => $this->translate('mshop/code', 'status:-1'),
+							'-2' => $this->translate('mshop/code', 'status:-2'),
 						]],
 						'text.lists.type.code' => [],
 						'text.lists.type.label' => [],
@@ -165,47 +165,47 @@ 
 				] );
 			?>
 
-			<?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( 'text.lists.type.id', $fields ) ) : ?>
-						<td class="text-type-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('text.lists.type.id', $fields)) : ?>
+						<td class="text-type-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.lists.type.domain', $fields ) ) : ?>
-						<td class="text-type-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDomain() ); ?></a></td>
+					<?php if (in_array('text.lists.type.domain', $fields)) : ?>
+						<td class="text-type-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDomain()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.lists.type.status', $fields ) ) : ?>
-						<td class="text-type-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
+					<?php if (in_array('text.lists.type.status', $fields)) : ?>
+						<td class="text-type-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.lists.type.code', $fields ) ) : ?>
-						<td class="text-type-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getCode() ); ?></a></td>
+					<?php if (in_array('text.lists.type.code', $fields)) : ?>
+						<td class="text-type-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getCode()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.lists.type.label', $fields ) ) : ?>
-						<td class="text-type-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('text.lists.type.label', $fields)) : ?>
+						<td class="text-type-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.lists.type.position', $fields ) ) : ?>
-						<td class="text-type-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getPosition() ); ?></a></td>
+					<?php if (in_array('text.lists.type.position', $fields)) : ?>
+						<td class="text-type-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getPosition()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.lists.type.ctime', $fields ) ) : ?>
-						<td class="text-type-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('text.lists.type.ctime', $fields)) : ?>
+						<td class="text-type-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.lists.type.mtime', $fields ) ) : ?>
-						<td class="text-type-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('text.lists.type.mtime', $fields)) : ?>
+						<td class="text-type-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'text.lists.type.editor', $fields ) ) : ?>
-						<td class="text-type-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('text.lists.type.editor', $fields)) : ?>
+						<td class="text-type-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, ['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, ['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>
@@ -213,18 +213,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' ),
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/type/text/lists/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/type/text/lists/page', [])]
 	);
 ?>
 
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>

admin/jqadm/templates/type/catalog/lists/list-standard.php

Spacing +99 added lines, -99 removed lines

@@ -8,34 +8,34 @@ 
 $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/type/catalog/lists/fields
@@ -53,44 +53,44 @@ 
  * @category Developer
  */
 $default = ['catalog.lists.type.domain', 'catalog.lists.type.status', 'catalog.lists.type.code', 'catalog.lists.type.label'];
-$default = $this->config( 'admin/jqadm/type/catalog/lists/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/type/catalog/lists/fields', $default );
+$default = $this->config('admin/jqadm/type/catalog/lists/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/type/catalog/lists/fields', $default);
 
-$searchParams = $params = $this->get( 'pageParams', [] );
+$searchParams = $params = $this->get('pageParams', []);
 $searchParams['page']['start'] = 0;
 
 $typeList = [];
-foreach( $this->get( 'itemTypes', [] ) as $typeItem ) {
+foreach ($this->get('itemTypes', []) as $typeItem) {
 	$typeList[$typeItem->getCode()] = $typeItem->getCode();
 }
 
 $columnList = [
-	'catalog.lists.type.id' => $this->translate( 'admin', 'ID' ),
-	'catalog.lists.type.domain' => $this->translate( 'admin', 'Domain' ),
-	'catalog.lists.type.status' => $this->translate( 'admin', 'Status' ),
-	'catalog.lists.type.code' => $this->translate( 'admin', 'Code' ),
-	'catalog.lists.type.label' => $this->translate( 'admin', 'Label' ),
-	'catalog.lists.type.position' => $this->translate( 'admin', 'Position' ),
-	'catalog.lists.type.ctime' => $this->translate( 'admin', 'Created' ),
-	'catalog.lists.type.mtime' => $this->translate( 'admin', 'Modified' ),
-	'catalog.lists.type.editor' => $this->translate( 'admin', 'Editor' ),
+	'catalog.lists.type.id' => $this->translate('admin', 'ID'),
+	'catalog.lists.type.domain' => $this->translate('admin', 'Domain'),
+	'catalog.lists.type.status' => $this->translate('admin', 'Status'),
+	'catalog.lists.type.code' => $this->translate('admin', 'Code'),
+	'catalog.lists.type.label' => $this->translate('admin', 'Label'),
+	'catalog.lists.type.position' => $this->translate('admin', 'Position'),
+	'catalog.lists.type.ctime' => $this->translate('admin', 'Created'),
+	'catalog.lists.type.mtime' => $this->translate('admin', 'Modified'),
+	'catalog.lists.type.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', 'Catalog Lists Types' ) ); ?>
-		<span class="navbar-secondary">(<?= $enc->html( $this->site()->label() ); ?>)</span>
+		<?= $enc->html($this->translate('admin', 'Catalog Lists Types')); ?>
+		<span class="navbar-secondary">(<?= $enc->html($this->site()->label()); ?>)</span>
 	</span>
 
 	<?= $this->partial(
-		$this->config( 'admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard' ), [
-			'filter' => $this->session( 'aimeos/admin/jqadm/type/catalog/lists/filter', [] ),
-			'filterAttributes' => $this->get( 'filterAttributes', [] ),
-			'filterOperators' => $this->get( 'filterOperators', [] ),
+		$this->config('admin/jqadm/partial/navsearch', 'common/partials/navsearch-standard'), [
+			'filter' => $this->session('aimeos/admin/jqadm/type/catalog/lists/filter', []),
+			'filterAttributes' => $this->get('filterAttributes', []),
+			'filterOperators' => $this->get('filterOperators', []),
 			'params' => $params,
 		]
 	); ?>
@@ -98,33 +98,33 @@ 
 
 
 <?= $this->partial(
-		$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/type/catalog/lists/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/type/catalog/lists/page', [])]
 	);
 ?>
 
-<form class="list list-catalog-lists-type" method="POST" action="<?= $enc->attr( $this->url( $target, $controller, $action, $searchParams, [], $config ) ); ?>">
+<form class="list list-catalog-lists-type" method="POST" action="<?= $enc->attr($this->url($target, $controller, $action, $searchParams, [], $config)); ?>">
 	<?= $this->csrf()->formfield(); ?>
 
 	<table class="list-items table table-hover table-striped">
 		<thead class="list-header">
 			<tr>
 				<?= $this->partial(
-						$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ),
-						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session( 'aimeos/admin/jqadm/type/catalog/lists/sort' )]
+						$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'),
+						['fields' => $fields, 'params' => $params, 'data' => $columnList, 'sort' => $this->session('aimeos/admin/jqadm/type/catalog/lists/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' ),
+							$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'),
 							['fields' => $fields, 'data' => $columnList]
 						);
 					?>
@@ -134,26 +134,26 @@ 
 		<tbody>
 
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => $fields, 'filter' => $this->session( 'aimeos/admin/jqadm/type/catalog/lists/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => $fields, 'filter' => $this->session('aimeos/admin/jqadm/type/catalog/lists/filter', []),
 					'data' => [
 						'catalog.lists.type.id' => ['op' => '=='],
 						'catalog.lists.type.domain' => ['op' => '==', 'type' => 'select', 'val' => [
-							'attribute' => $this->translate( 'admin', 'attribute' ),
-							'catalog' => $this->translate( 'admin', 'catalog' ),
-							'customer' => $this->translate( 'admin', 'customer' ),
-							'media' => $this->translate( 'admin', 'media' ),
-							'price' => $this->translate( 'admin', 'price' ),
-							'product' => $this->translate( 'admin', 'product' ),
-							'service' => $this->translate( 'admin', 'service' ),
-							'supplier' => $this->translate( 'admin', 'supplier' ),
-							'text' => $this->translate( 'admin', 'text' ),
+							'attribute' => $this->translate('admin', 'attribute'),
+							'catalog' => $this->translate('admin', 'catalog'),
+							'customer' => $this->translate('admin', 'customer'),
+							'media' => $this->translate('admin', 'media'),
+							'price' => $this->translate('admin', 'price'),
+							'product' => $this->translate('admin', 'product'),
+							'service' => $this->translate('admin', 'service'),
+							'supplier' => $this->translate('admin', 'supplier'),
+							'text' => $this->translate('admin', 'text'),
 						]],
 						'catalog.lists.type.status' => ['op' => '==', 'type' => 'select', 'val' => [
-							'1' => $this->translate( 'mshop/code', 'status:1' ),
-							'0' => $this->translate( 'mshop/code', 'status:0' ),
-							'-1' => $this->translate( 'mshop/code', 'status:-1' ),
-							'-2' => $this->translate( 'mshop/code', 'status:-2' ),
+							'1' => $this->translate('mshop/code', 'status:1'),
+							'0' => $this->translate('mshop/code', 'status:0'),
+							'-1' => $this->translate('mshop/code', 'status:-1'),
+							'-2' => $this->translate('mshop/code', 'status:-2'),
 						]],
 						'catalog.lists.type.code' => [],
 						'catalog.lists.type.label' => [],
@@ -165,47 +165,47 @@ 
 				] );
 			?>
 
-			<?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( 'catalog.lists.type.id', $fields ) ) : ?>
-						<td class="catalog-type-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('catalog.lists.type.id', $fields)) : ?>
+						<td class="catalog-type-id"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getId()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.type.domain', $fields ) ) : ?>
-						<td class="catalog-type-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getDomain() ); ?></a></td>
+					<?php if (in_array('catalog.lists.type.domain', $fields)) : ?>
+						<td class="catalog-type-domain"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getDomain()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.type.status', $fields ) ) : ?>
-						<td class="catalog-type-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr( $item->getStatus() ); ?>"></div></a></td>
+					<?php if (in_array('catalog.lists.type.status', $fields)) : ?>
+						<td class="catalog-type-status"><a class="items-field" href="<?= $url; ?>"><div class="fa status-<?= $enc->attr($item->getStatus()); ?>"></div></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.type.code', $fields ) ) : ?>
-						<td class="catalog-type-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html( $item->getCode() ); ?></a></td>
+					<?php if (in_array('catalog.lists.type.code', $fields)) : ?>
+						<td class="catalog-type-code"><a class="items-field" href="<?= $url; ?>" tabindex="1"><?= $enc->html($item->getCode()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.type.label', $fields ) ) : ?>
-						<td class="catalog-type-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getLabel() ); ?></a></td>
+					<?php if (in_array('catalog.lists.type.label', $fields)) : ?>
+						<td class="catalog-type-label"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getLabel()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.type.position', $fields ) ) : ?>
-						<td class="catalog-type-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getPosition() ); ?></a></td>
+					<?php if (in_array('catalog.lists.type.position', $fields)) : ?>
+						<td class="catalog-type-position"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getPosition()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.type.ctime', $fields ) ) : ?>
-						<td class="catalog-type-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeCreated() ); ?></a></td>
+					<?php if (in_array('catalog.lists.type.ctime', $fields)) : ?>
+						<td class="catalog-type-ctime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeCreated()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.type.mtime', $fields ) ) : ?>
-						<td class="catalog-type-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getTimeModified() ); ?></a></td>
+					<?php if (in_array('catalog.lists.type.mtime', $fields)) : ?>
+						<td class="catalog-type-mtime"><a class="items-field" href="<?= $url; ?>"><?= $enc->html($item->getTimeModified()); ?></a></td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.type.editor', $fields ) ) : ?>
-						<td class="catalog-type-editor"><a class="items-field" href="<?= $url; ?>"><?= $enc->html( $item->getEditor() ); ?></a></td>
+					<?php if (in_array('catalog.lists.type.editor', $fields)) : ?>
+						<td class="catalog-type-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, ['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, ['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>
@@ -213,18 +213,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' ),
-		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'total' ),
-		'page' => $this->session( 'aimeos/admin/jqadm/type/catalog/lists/page', [] )]
+		$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+		['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('total'),
+		'page' => $this->session('aimeos/admin/jqadm/type/catalog/lists/page', [])]
 	);
 ?>
 
 <?php $this->block()->stop(); ?>
 
-<?= $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-standard' ) ); ?>
+<?= $this->render($this->config('admin/jqadm/template/page', 'common/page-standard')); ?>