aimeos / ai-admin-jqadm

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

Spacing +24 added lines, -24 removed lines

@@ -19,50 +19,50 @@
  */
 
 
-$sort = function( $sortcode, $code ) {
-	return ( $sortcode === $code ? '-' . $code : $code );
+$sort = function($sortcode, $code) {
+	return ($sortcode === $code ? '-' . $code : $code);
 };
 
-$sortclass = function( $sortcode, $code ) {
-	if( $sortcode === $code ) {
+$sortclass = function($sortcode, $code) {
+	if ($sortcode === $code) {
 		return 'sort-desc';
 	}
-	if( $sortcode === '-' . $code ) {
+	if ($sortcode === '-' . $code) {
 		return 'sort-asc';
 	}
 };
 
 
-if( $this->get( 'action' ) === 'get' )
+if ($this->get('action') === 'get')
 {
-	$target = $this->config( 'admin/jqadm/url/get/target' );
-	$controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
-	$action = $this->config( 'admin/jqadm/url/get/action', 'get' );
-	$config = $this->config( 'admin/jqadm/url/get/config', [] );
+	$target = $this->config('admin/jqadm/url/get/target');
+	$controller = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
+	$action = $this->config('admin/jqadm/url/get/action', 'get');
+	$config = $this->config('admin/jqadm/url/get/config', []);
 }
 else
 {
-	$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', []);
 }
 
-$fields = $this->get( 'fields', [] );
-$params = $this->get( 'params', [] );
-$fragment = (array) $this->get( 'fragment', [] );
-$sortcode = $this->get( 'sort' );
+$fields = $this->get('fields', []);
+$params = $this->get('params', []);
+$fragment = (array) $this->get('fragment', []);
+$sortcode = $this->get('sort');
 
 $enc = $this->encoder();
 
 
 ?>
-<?php foreach( $this->get( 'data', [] ) as $key => $name ) : ?>
-	<?php if( in_array( $key, $fields ) ) : ?>
-		<th class="<?= $enc->attr( str_replace( '.', '-', $key ) ); ?>">
-			<a class="<?= $sortclass( $sortcode, $key ); ?>" tabindex="<?= $this->get( 'tabindex', 1 ); ?>"
-				href="<?= $enc->attr( $this->url( $target, $controller, $action, ['sort' => $sort( $sortcode, $key )] + $params, $fragment, $config ) ); ?>">
-				<?= $enc->html( $name ); ?>
+<?php foreach ($this->get('data', []) as $key => $name) : ?>
+	<?php if (in_array($key, $fields)) : ?>
+		<th class="<?= $enc->attr(str_replace('.', '-', $key)); ?>">
+			<a class="<?= $sortclass($sortcode, $key); ?>" tabindex="<?= $this->get('tabindex', 1); ?>"
+				href="<?= $enc->attr($this->url($target, $controller, $action, ['sort' => $sort($sortcode, $key)] + $params, $fragment, $config)); ?>">
+				<?= $enc->html($name); ?>
 			</a>
 		</th>
 	<?php endif; ?>

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 	$controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
 	$action = $this->config( 'admin/jqadm/url/get/action', 'get' );
 	$config = $this->config( 'admin/jqadm/url/get/config', [] );
-}
-else
+} else
 {
 	$target = $this->config( 'admin/jqadm/url/search/target' );
 	$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );

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

Spacing +6 added lines, -6 removed lines

@@ -6,16 +6,16 @@
  */
 
 $enc = $this->encoder();
-$errors = $this->get( 'errors', [] );
+$errors = $this->get('errors', []);
 
 ?>
-<?php if( !empty( $errors ) ) : ?>
+<?php if (!empty($errors)) : ?>
 	<ul class="error-list alert alert-danger" role="alert">
-		<?php	foreach( $errors as $key => $error ) : ?>
-			<li class="error-item" data-key="<?= $enc->attr( $key ); ?>">
+		<?php	foreach ($errors as $key => $error) : ?>
+			<li class="error-item" data-key="<?= $enc->attr($key); ?>">
 				<span class="fa fa-exclamation-circle" aria-hidden="true"></span>
-				<span class="sr-only"><?= $enc->html( $this->translate( 'admin', 'Error' ) ); ?></span>
-				<?= $enc->html( $error ); ?>
+				<span class="sr-only"><?= $enc->html($this->translate('admin', 'Error')); ?></span>
+				<?= $enc->html($error); ?>
 			</li>
 		<?php	endforeach; ?>
 	</ul>

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

Braces +2 added lines, -4 removed lines

@@ -56,16 +56,14 @@
 		$controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
 		$action = $this->config( 'admin/jqadm/url/get/action', 'get' );
 		$config = $this->config( 'admin/jqadm/url/get/config', [] );
-	}
-	else
+	} else
 	{
 		$target = $this->config( 'admin/jqadm/url/create/target' );
 		$controller = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
 		$action = $this->config( 'admin/jqadm/url/create/action', 'create' );
 		$config = $this->config( 'admin/jqadm/url/create/config', [] );
 	}
-}
-else
+} else
 {
 	$target = $this->config( 'admin/jqadm/url/search/target' );
 	$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );

Spacing +60 added lines, -60 removed lines

@@ -21,56 +21,56 @@ 
  */
 
 
-$pgroup = function( array $params, $group )
+$pgroup = function(array $params, $group)
 {
-	if( $group != null ) {
+	if ($group != null) {
 		return [$group => ['page' => $params]];
 	}
 
 	return ['page' => $params];
 };
 
-$fragment = (array) $this->get( 'fragment', [] );
-$total = min( $this->get( 'total', 0 ), 10000 );
-$pOffset = $pLimit = $this->get( 'page', [] );
-$params = $this->get( 'pageParams', [] );
-$group = $this->get( 'group' );
+$fragment = (array) $this->get('fragment', []);
+$total = min($this->get('total', 0), 10000);
+$pOffset = $pLimit = $this->get('page', []);
+$params = $this->get('pageParams', []);
+$group = $this->get('group');
 
-$offset = max( $this->get( 'page/offset', 0 ), 0 );
-$limit = max( $this->get( 'page/limit', 25 ), 1 );
+$offset = max($this->get('page/offset', 0), 0);
+$limit = max($this->get('page/limit', 25), 1);
 
-$first = ( $offset > 0 ? 0 : null );
-$prev = ( $offset - $limit >= 0 ? $offset - $limit : null );
-$next = ( $offset + $limit < $total ? $offset + $limit : null );
-$last = ( floor(($total - 1) / $limit) * $limit > $offset ? floor(($total - 1) / $limit) * $limit : null );
+$first = ($offset > 0 ? 0 : null);
+$prev = ($offset - $limit >= 0 ? $offset - $limit : null);
+$next = ($offset + $limit < $total ? $offset + $limit : null);
+$last = (floor(($total - 1) / $limit) * $limit > $offset ? floor(($total - 1) / $limit) * $limit : null);
 
-$pageCurrent = floor( $offset / $limit ) + 1;
-$pageTotal = ( $total != 0 ? ceil( $total / $limit ) : 1 );
+$pageCurrent = floor($offset / $limit) + 1;
+$pageTotal = ($total != 0 ? ceil($total / $limit) : 1);
 
 
-if( $this->get( 'action' ) === 'get' )
+if ($this->get('action') === 'get')
 {
-	if( isset( $params['id'] ) )
+	if (isset($params['id']))
 	{
-		$target = $this->config( 'admin/jqadm/url/get/target' );
-		$controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
-		$action = $this->config( 'admin/jqadm/url/get/action', 'get' );
-		$config = $this->config( 'admin/jqadm/url/get/config', [] );
+		$target = $this->config('admin/jqadm/url/get/target');
+		$controller = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
+		$action = $this->config('admin/jqadm/url/get/action', 'get');
+		$config = $this->config('admin/jqadm/url/get/config', []);
 	}
 	else
 	{
-		$target = $this->config( 'admin/jqadm/url/create/target' );
-		$controller = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
-		$action = $this->config( 'admin/jqadm/url/create/action', 'create' );
-		$config = $this->config( 'admin/jqadm/url/create/config', [] );
+		$target = $this->config('admin/jqadm/url/create/target');
+		$controller = $this->config('admin/jqadm/url/create/controller', 'Jqadm');
+		$action = $this->config('admin/jqadm/url/create/action', 'create');
+		$config = $this->config('admin/jqadm/url/create/config', []);
 	}
 }
 else
 {
-	$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', []);
 }
 
 
@@ -78,68 +78,68 @@ 
 
 
 ?>
-<?php if( $total > $limit || $offset > 0 || $this->get( 'pos', 'top' ) === 'bottom' ) : ?>
+<?php if ($total > $limit || $offset > 0 || $this->get('pos', 'top') === 'bottom') : ?>
 	<nav class="list-page">
 		<ul class="page-offset pagination">
-			<li class="page-item <?= ( $first === null ? 'disabled' : '' ) ?>">
-				<a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>"
-					href="<?php $pOffset['offset'] = $first; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pOffset, $group ) + $params, $fragment, $config ) ); ?>"
-					aria-label="<?= $enc->attr( $this->translate( 'admin', 'First' ) ); ?>">
+			<li class="page-item <?= ($first === null ? 'disabled' : '') ?>">
+				<a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>"
+					href="<?php $pOffset['offset'] = $first; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pOffset, $group) + $params, $fragment, $config)); ?>"
+					aria-label="<?= $enc->attr($this->translate('admin', 'First')); ?>">
 					<span class="fa fa-fast-backward" aria-hidden="true"></span>
 				</a>
 			</li><!--
-			--><li class="page-item <?= ( $prev === null ? 'disabled' : '' ) ?>">
-				<a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>"
-					href="<?php $pOffset['offset'] = $prev; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pOffset, $group ) + $params, $fragment, $config ) ); ?>"
-					aria-label="<?= $enc->attr( $this->translate( 'admin', 'Previous' ) ); ?>">
+			--><li class="page-item <?= ($prev === null ? 'disabled' : '') ?>">
+				<a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>"
+					href="<?php $pOffset['offset'] = $prev; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pOffset, $group) + $params, $fragment, $config)); ?>"
+					aria-label="<?= $enc->attr($this->translate('admin', 'Previous')); ?>">
 					<span class="fa fa-step-backward" aria-hidden="true"></span>
 				</a>
 			</li><!--
 			--><li class="page-item disabled">
-				<a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" href="#">
-					<?= $enc->html( sprintf( $this->translate( 'admin', 'Page %1$d of %2$d' ), $pageCurrent, $pageTotal ) ); ?>
+				<a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>" href="#">
+					<?= $enc->html(sprintf($this->translate('admin', 'Page %1$d of %2$d'), $pageCurrent, $pageTotal)); ?>
 				</a>
 			</li><!--
-			--><li class="page-item <?= ( $next === null ? 'disabled' : '' ) ?>">
-				<a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>"
-					href="<?php $pOffset['offset'] = $next; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pOffset, $group ) + $params, $fragment, $config ) ); ?>"
-					aria-label="<?= $enc->attr( $this->translate( 'admin', 'Next' ) ); ?>">
+			--><li class="page-item <?= ($next === null ? 'disabled' : '') ?>">
+				<a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>"
+					href="<?php $pOffset['offset'] = $next; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pOffset, $group) + $params, $fragment, $config)); ?>"
+					aria-label="<?= $enc->attr($this->translate('admin', 'Next')); ?>">
 					<span class="fa fa-step-forward" aria-hidden="true"></span>
 				</a>
 			</li><!--
-			--><li class="page-item <?= ( $last === null ? 'disabled' : '' ) ?>">
-				<a class="page-link" tabindex="<?= $this->get( 'tabindex', 1 ); ?>"
-					href="<?php $pOffset['offset'] = $last; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pOffset, $group ) + $params, $fragment, $config ) ); ?>"
-					aria-label="<?= $enc->attr( $this->translate( 'admin', 'Last' ) ); ?>">
+			--><li class="page-item <?= ($last === null ? 'disabled' : '') ?>">
+				<a class="page-link" tabindex="<?= $this->get('tabindex', 1); ?>"
+					href="<?php $pOffset['offset'] = $last; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pOffset, $group) + $params, $fragment, $config)); ?>"
+					aria-label="<?= $enc->attr($this->translate('admin', 'Last')); ?>">
 					<span class="fa fa-fast-forward" aria-hidden="true"></span>
 				</a>
 			</li>
 		</ul>
-		<div class="page-limit btn-group <?= ( $this->get( 'pos', 'top' ) === 'bottom' ? 'dropup' : '' ); ?>" role="group">
+		<div class="page-limit btn-group <?= ($this->get('pos', 'top') === 'bottom' ? 'dropup' : ''); ?>" role="group">
 			<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"
-				 tabindex="<?= $this->get( 'tabindex', 1 ); ?>" aria-haspopup="true" aria-expanded="false">
+				 tabindex="<?= $this->get('tabindex', 1); ?>" aria-haspopup="true" aria-expanded="false">
 				<?= $limit; ?> <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu">
 				<li class="dropdown-item">
-					<a href="<?php $pLimit['limit'] = 25; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>"
-						tabindex="<?= $this->get( 'tabindex', 1 ); ?>">25</a>
+					<a href="<?php $pLimit['limit'] = 25; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>"
+						tabindex="<?= $this->get('tabindex', 1); ?>">25</a>
 				</li>
 				<li class="dropdown-item">
-					<a href="<?php $pLimit['limit'] = 50; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>"
-						tabindex="<?= $this->get( 'tabindex', 1 ); ?>">50</a>
+					<a href="<?php $pLimit['limit'] = 50; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>"
+						tabindex="<?= $this->get('tabindex', 1); ?>">50</a>
 				</li>
 				<li class="dropdown-item">
-					<a href="<?php $pLimit['limit'] = 100; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>"
-						tabindex="<?= $this->get( 'tabindex', 1 ); ?>">100</a>
+					<a href="<?php $pLimit['limit'] = 100; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>"
+						tabindex="<?= $this->get('tabindex', 1); ?>">100</a>
 				</li>
 				<li class="dropdown-item">
-					<a href="<?php $pLimit['limit'] = 200; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>"
-						tabindex="<?= $this->get( 'tabindex', 1 ); ?>">200</a>
+					<a href="<?php $pLimit['limit'] = 200; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>"
+						tabindex="<?= $this->get('tabindex', 1); ?>">200</a>
 				</li>
 				<li class="dropdown-item">
-					<a href="<?php $pLimit['limit'] = 500; echo $enc->attr( $this->url( $target, $controller, $action, $pgroup( $pLimit, $group ) + $params, $fragment, $config ) ); ?>"
-						tabindex="<?= $this->get( 'tabindex', 1 ); ?>">500</a>
+					<a href="<?php $pLimit['limit'] = 500; echo $enc->attr($this->url($target, $controller, $action, $pgroup($pLimit, $group) + $params, $fragment, $config)); ?>"
+						tabindex="<?= $this->get('tabindex', 1); ?>">500</a>
 				</li>
 			</ul>
 		</div>

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

Spacing +28 added lines, -28 removed lines

@@ -17,14 +17,14 @@ 
  */
 
 
-$selected = function( $key, $code ) {
-	return ( (string) $key === (string) $code ? 'selected="selected"' : '' );
+$selected = function($key, $code) {
+	return ((string) $key === (string) $code ? 'selected="selected"' : '');
 };
 
 
-$group = (array) $this->get( 'group', [] );
-$filter = $this->get( 'filter', [] );
-$fields = $this->get( 'fields', [] );
+$group = (array) $this->get('group', []);
+$filter = $this->get('filter', []);
+$fields = $this->get('fields', []);
 $idx = 0;
 
 $enc = $this->encoder();
@@ -32,41 +32,41 @@ 
 
 ?>
 <tr class="list-search">
-	<?php foreach( $this->get( 'data', [] ) as $key => $list ) : $idx++ ?>
-		<?php if( in_array( $key, $fields ) ) : ?>
-			<td class="<?= str_replace( '.', '-', $key ); ?>">
-				<input type="hidden" value="<?= $enc->attr( $key ); ?>"
-					name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'key', $idx] ) ) ); ?>" />
-				<input type="hidden" value="<?= $enc->attr( $this->value( $list, 'op', '=~' ) ); ?>"
-					name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'op', $idx] ) ) ); ?>" />
+	<?php foreach ($this->get('data', []) as $key => $list) : $idx++ ?>
+		<?php if (in_array($key, $fields)) : ?>
+			<td class="<?= str_replace('.', '-', $key); ?>">
+				<input type="hidden" value="<?= $enc->attr($key); ?>"
+					name="<?= $enc->attr($this->formparam(array_merge($group, ['filter', 'key', $idx]))); ?>" />
+				<input type="hidden" value="<?= $enc->attr($this->value($list, 'op', '=~')); ?>"
+					name="<?= $enc->attr($this->formparam(array_merge($group, ['filter', 'op', $idx]))); ?>" />
 
-				<?php if( ( $type = $this->value( $list, 'type', 'text' ) ) === 'select' ) : ?>
-					<select class="form-control custom-select" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'val', $idx] ) ) ); ?>">
-						<option value=""><?= $enc->attr( $this->translate( 'admin', 'All' ) ); ?></option>
+				<?php if (($type = $this->value($list, 'type', 'text')) === 'select') : ?>
+					<select class="form-control custom-select" tabindex="<?= $this->get('tabindex'); ?>"
+						name="<?= $enc->attr($this->formparam(array_merge($group, ['filter', 'val', $idx]))); ?>">
+						<option value=""><?= $enc->attr($this->translate('admin', 'All')); ?></option>
 
-						<?php foreach( (array) $this->value( $list, 'val', [] ) as $val => $name ) : ?>
-							<option value="<?= $enc->attr( $val ); ?>" <?= $selected( $this->value( $filter, 'val/' . $idx ), $val ); ?> >
-								<?= $enc->html( $name ); ?>
+						<?php foreach ((array) $this->value($list, 'val', []) as $val => $name) : ?>
+							<option value="<?= $enc->attr($val); ?>" <?= $selected($this->value($filter, 'val/' . $idx), $val); ?> >
+								<?= $enc->html($name); ?>
 							</option>
 						<?php endforeach; ?>
 					</select>
 				<?php else : ?>
-					<input class="form-control" type="<?= $enc->attr( $type ); ?>" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'val', $idx] ) ) ); ?>"
-						value="<?= $enc->attr( $this->value( $filter, 'val/' . $idx ) ); ?>" />
+					<input class="form-control" type="<?= $enc->attr($type); ?>" tabindex="<?= $this->get('tabindex'); ?>"
+						name="<?= $enc->attr($this->formparam(array_merge($group, ['filter', 'val', $idx]))); ?>"
+						value="<?= $enc->attr($this->value($filter, 'val/' . $idx)); ?>" />
 				<?php endif; ?>
 			</td>
 		<?php endif; ?>
 	<?php endforeach; ?>
 
 	<td class="actions">
-		<button type="submit" class="btn act-search fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-			title="<?= $enc->attr( $this->translate( 'admin', 'Search') ); ?>"
-			aria-label="<?= $enc->attr( $this->translate( 'admin', 'Search' ) ); ?>">
+		<button type="submit" class="btn act-search fa" tabindex="<?= $this->get('tabindex'); ?>"
+			title="<?= $enc->attr($this->translate('admin', 'Search')); ?>"
+			aria-label="<?= $enc->attr($this->translate('admin', 'Search')); ?>">
 		</button>
-		<a class="btn act-reset fa" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-			title="<?= $enc->attr( $this->translate( 'admin', 'Reset') ); ?>"
-			aria-label="<?= $enc->attr( $this->translate( 'admin', 'Reset' ) ); ?>"></a>
+		<a class="btn act-reset fa" href="#" tabindex="<?= $this->get('tabindex'); ?>"
+			title="<?= $enc->attr($this->translate('admin', 'Reset')); ?>"
+			aria-label="<?= $enc->attr($this->translate('admin', 'Reset')); ?>"></a>
 	</td>
 </tr>

Braces +5 added lines, -2 removed lines

@@ -51,8 +51,11 @@
 							</option>
 						<?php endforeach; ?>
 					</select>
-				<?php else : ?>
-					<input class="form-control" type="<?= $enc->attr( $type ); ?>" tabindex="<?= $this->get( 'tabindex' ); ?>"
+				<?php else {
+	: ?>
+					<input class="form-control" type="<?= $enc->attr( $type );
+}
+?>" tabindex="<?= $this->get( 'tabindex' ); ?>"
 						name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'val', $idx] ) ) ); ?>"
 						value="<?= $enc->attr( $this->value( $filter, 'val/' . $idx ) ); ?>" />
 				<?php endif; ?>

admin/jqadm/templates/common/page-standard.php

Indentation -1 removed lines

@@ -161,7 +161,6 @@
  *
  * You can add, remove or reorder the links in the navigation bar by
  * setting a new list of client resource names.
-
  * In the configuration files of extensions, you should only add entries using
  * one of these lines:
  *

Braces +15 added lines, -6 removed lines

@@ -262,8 +262,11 @@ 
 							<?php foreach( $this->pageSiteList as $siteItem ) : ?>
 								<?php if( $siteItem->getId() === $this->pageSiteTree->getId() ) : ?>
 									<?php $siteFcn( $this->pageSiteTree ); ?>
-								<?php else : ?>
-									<?php $siteFcn( $siteItem ); ?>
+								<?php else {
+	: ?>
+									<?php $siteFcn( $siteItem );
+}
+?>
 								<?php endif; ?>
 							<?php endforeach; ?>
 						</ul>
@@ -295,9 +298,12 @@ 
 							</li>
 
 						<?php endif; ?>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?>
-							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?>
+							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' );
+}
+?>
 
 							<li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>">
 								<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>"
@@ -344,10 +350,13 @@ 
 							</li>
 
 						<?php endif; ?>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?>
 
-							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?>
+							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' );
+}
+?>
 							<li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>">
 								<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>"
 									title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>"

Spacing +87 added lines, -87 removed lines

@@ -8,10 +8,10 @@ 
 $enc = $this->encoder();
 
 $target = $this->request()->getTarget();
-$searchTarget = $this->config( 'admin/jqadm/url/search/target' );
-$cntl = $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', [] );
+$searchTarget = $this->config('admin/jqadm/url/search/target');
+$cntl = $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', []);
 
 
 /** admin/jsonadm/url/options/target
@@ -28,7 +28,7 @@ 
  * @see admin/jsonadm/url/options/action
  * @see admin/jsonadm/url/options/config
  */
-$jsonTarget = $this->config( 'admin/jsonadm/url/options/target' );
+$jsonTarget = $this->config('admin/jsonadm/url/options/target');
 
 /** admin/jsonadm/url/options/controller
  * Name of the controller whose action should be called
@@ -44,7 +44,7 @@ 
  * @see admin/jsonadm/url/options/action
  * @see admin/jsonadm/url/options/config
  */
-$jsonCntl = $this->config( 'admin/jsonadm/url/options/controller', 'Jsonadm' );
+$jsonCntl = $this->config('admin/jsonadm/url/options/controller', 'Jsonadm');
 
 /** admin/jsonadm/url/options/action
  * Name of the action that should create the output
@@ -60,7 +60,7 @@ 
  * @see admin/jsonadm/url/options/controller
  * @see admin/jsonadm/url/options/config
  */
-$jsonAction = $this->config( 'admin/jsonadm/url/options/action', 'options' );
+$jsonAction = $this->config('admin/jsonadm/url/options/action', 'options');
 
 /** admin/jsonadm/url/options/config
  * Associative list of configuration options used for generating the URL
@@ -82,7 +82,7 @@ 
  * @see admin/jsonadm/url/options/controller
  * @see admin/jsonadm/url/options/action
  */
-$jsonConfig = $this->config( 'admin/jsonadm/url/options/config', [] );
+$jsonConfig = $this->config('admin/jsonadm/url/options/config', []);
 
 
 /** admin/jqadm/navbar
@@ -106,7 +106,7 @@ 
  * @category Developer
  * @see admin/jqadm/navbar-limit
  */
-$navlist = $this->config( 'admin/jqadm/navbar', [] );
+$navlist = $this->config('admin/jqadm/navbar', []);
 
 /** admin/jqadm/navbar-limit
  * Number of JQAdm client links in the navigation bar shown by default
@@ -122,26 +122,26 @@ 
  * @category Developer
  * @see admin/jqadm/navbar
  */
-$navlimit = $this->config( 'admin/jqadm/navbar-limit', 7 );
+$navlimit = $this->config('admin/jqadm/navbar-limit', 7);
 
 
-$navfirst = reset( $navlist );
-if( is_array( $navfirst ) ) {
-	$navfirst = key( $navlist );
+$navfirst = reset($navlist);
+if (is_array($navfirst)) {
+	$navfirst = key($navlist);
 }
 
-$resource = $this->param( 'resource', 'dashboard' );
-$site = $this->param( 'site', 'default' );
-$lang = $this->param( 'lang' );
+$resource = $this->param('resource', 'dashboard');
+$site = $this->param('site', 'default');
+$lang = $this->param('lang');
 
 $params = ['resource' => $resource, 'site' => $site];
 $extParams = ['site' => $site];
 
-if( $lang ) {
+if ($lang) {
 	$params['lang'] = $extParams['lang'] = $lang;
 }
 
-$title = $this->translate( 'admin', '%1$s (Ctrl+Alt+%2$s)' );
+$title = $this->translate('admin', '%1$s (Ctrl+Alt+%2$s)');
 
 
 /** admin/jqadm/partial/confirm
@@ -211,82 +211,82 @@ 
  */
 
 
-$infoMsgs = $this->get( 'info', [] );
+$infoMsgs = $this->get('info', []);
 
-switch( $this->param( 'act' ) )
+switch ($this->param('act'))
 {
 	case 'save':
-		$infoMsgs[] = $this->translate( 'admin', 'Item saved successfully' ); break;
+		$infoMsgs[] = $this->translate('admin', 'Item saved successfully'); break;
 	case 'delete':
-		$infoMsgs[] = $this->translate( 'admin', 'Item deleted successfully' ); break;
+		$infoMsgs[] = $this->translate('admin', 'Item deleted successfully'); break;
 }
 
 
 ?>
-<div class="aimeos" lang="<?= $this->param( 'lang' ); ?>" data-url="<?= $enc->attr( $this->url( $jsonTarget, $jsonCntl, $jsonAction, array( 'site' => $site ), [], $jsonConfig ) ); ?>">
+<div class="aimeos" lang="<?= $this->param('lang'); ?>" data-url="<?= $enc->attr($this->url($jsonTarget, $jsonCntl, $jsonAction, array('site' => $site), [], $jsonConfig)); ?>">
 
 	<nav class="main-sidebar">
 		<div class="sidebar-wrapper">
 
-			<a class="logo" target="_blank" href="https://aimeos.org/update/?type=<?= $this->get( 'aimeosType' ) ?>&version=<?= $this->get( 'aimeosVersion' ) ?>">
-				<img src="https://aimeos.org/check/?type=<?= $this->get( 'aimeosType' ) ?>&version=<?= $this->get( 'aimeosVersion' ) ?>&extensions=<?= $this->get( 'aimeosExtensions' ) ?>" alt="Aimeos update" title="Aimeos update">
+			<a class="logo" target="_blank" href="https://aimeos.org/update/?type=<?= $this->get('aimeosType') ?>&version=<?= $this->get('aimeosVersion') ?>">
+				<img src="https://aimeos.org/check/?type=<?= $this->get('aimeosType') ?>&version=<?= $this->get('aimeosVersion') ?>&extensions=<?= $this->get('aimeosExtensions') ?>" alt="Aimeos update" title="Aimeos update">
 			</a>
 
 			<ul class="sidebar-menu basic">
 
-				<?php if( ( count( $this->get( 'pageSiteList', [] ) ) > 1 || $this->pageSiteTree->getChildren() !== [] || count( $this->get( 'pageSitePath', [] ) ) > 1 ) && $this->access( $this->config( 'admin/jqadm/resource/site/groups', [] ) ) ) : ?>
+				<?php if ((count($this->get('pageSiteList', [])) > 1 || $this->pageSiteTree->getChildren() !== [] || count($this->get('pageSitePath', [])) > 1) && $this->access($this->config('admin/jqadm/resource/site/groups', []))) : ?>
 					<li class="site treeview">
 						<a href="#">
 							<i class="icon"></i>
-							<span class="title"><?= $enc->html( $this->site()->label() ); ?></span>
+							<span class="title"><?= $enc->html($this->site()->label()); ?></span>
 						</a>
 						<ul class="tree-menu">
-							<li class="menu-header"><strong><?= $enc->html( $this->translate( 'admin', 'Site' ) ); ?></strong></li>
+							<li class="menu-header"><strong><?= $enc->html($this->translate('admin', 'Site')); ?></strong></li>
 
-							<?php $siteFcn = function( \Aimeos\MShop\Locale\Item\Site\Iface $site ) use ( &$siteFcn, $enc, $searchTarget, $cntl, $action, $params, $config ) { ?>
+							<?php $siteFcn = function(\Aimeos\MShop\Locale\Item\Site\Iface $site) use (&$siteFcn, $enc, $searchTarget, $cntl, $action, $params, $config) { ?>
 
-								<li class="site-<?= $enc->attr( $site->getCode() ) ?>">
-									<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'site' => $site->getCode() ) + $params, [], $config ) ); ?>">
-										<span class="name"><?= $enc->html( $site->getLabel() ); ?></span>
+								<li class="site-<?= $enc->attr($site->getCode()) ?>">
+									<a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, array('site' => $site->getCode()) + $params, [], $config)); ?>">
+										<span class="name"><?= $enc->html($site->getLabel()); ?></span>
 									</a>
 
-									<?php if( $site->getChildren() !== [] ) : ?>
+									<?php if ($site->getChildren() !== []) : ?>
 										<ul class="menu-sub">
-											<?php foreach( $site->getChildren() as $site ) { $siteFcn( $site ); } ?>
+											<?php foreach ($site->getChildren() as $site) { $siteFcn($site); } ?>
 										</ul>
 									<?php endif; ?>
 								</li>
 
 							<?php }; ?>
 
-							<?php foreach( $this->pageSiteList as $siteItem ) : ?>
-								<?php if( $siteItem->getId() === $this->pageSiteTree->getId() ) : ?>
-									<?php $siteFcn( $this->pageSiteTree ); ?>
+							<?php foreach ($this->pageSiteList as $siteItem) : ?>
+								<?php if ($siteItem->getId() === $this->pageSiteTree->getId()) : ?>
+									<?php $siteFcn($this->pageSiteTree); ?>
 								<?php else : ?>
-									<?php $siteFcn( $siteItem ); ?>
+									<?php $siteFcn($siteItem); ?>
 								<?php endif; ?>
 							<?php endforeach; ?>
 						</ul>
 					</li>
 				<?php endif; ?>
 
-				<?php foreach( array_splice( $navlist, 0, $navlimit ) as $nav => $navitem ) : ?>
-					<?php if( is_array( $navitem ) ) : ?>
-						<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $nav . '/groups', [] ) ) ) : ?>
+				<?php foreach (array_splice($navlist, 0, $navlimit) as $nav => $navitem) : ?>
+					<?php if (is_array($navitem)) : ?>
+						<?php if ($this->access($this->config('admin/jqadm/resource/' . $nav . '/groups', []))) : ?>
 
-							<li class="treeview <?= $enc->attr( $nav ) ?> <?= strncmp( $this->param( 'resource' ), $nav, strlen( $nav ) ) ? '' : 'active' ?>">
+							<li class="treeview <?= $enc->attr($nav) ?> <?= strncmp($this->param('resource'), $nav, strlen($nav)) ? '' : 'active' ?>">
 								<span>
 									<i class="icon"></i>
-									<span class="title"><?= $enc->attr( $this->translate( 'admin', $nav ) ); ?></span>
+									<span class="title"><?= $enc->attr($this->translate('admin', $nav)); ?></span>
 								</span>
 								<ul class="tree-menu">
-									<li class="menu-header"><strong><?= $enc->html( $this->translate( 'admin', $nav ) ); ?></strong></li>
+									<li class="menu-header"><strong><?= $enc->html($this->translate('admin', $nav)); ?></strong></li>
 
-									<?php foreach( $navitem as $subresource ) : ?>
-										<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $subresource . '/groups', [] ) ) ) : ?>
-											<li class="<?= str_replace( '/', '-', $subresource); ?>">
-												<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config ) ); ?>">
-													<span class="name"><?= $enc->html( $this->translate( 'admin', $subresource ) ); ?></span>
+									<?php foreach ($navitem as $subresource) : ?>
+										<?php if ($this->access($this->config('admin/jqadm/resource/' . $subresource . '/groups', []))) : ?>
+											<li class="<?= str_replace('/', '-', $subresource); ?>">
+												<a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config)); ?>">
+													<span class="name"><?= $enc->html($this->translate('admin', $subresource)); ?></span>
 												</a>
 											</li>
 										<?php endif; ?>
@@ -296,15 +296,15 @@ 
 
 						<?php endif; ?>
 					<?php else : ?>
-						<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?>
-							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?>
+						<?php if ($this->access($this->config('admin/jqadm/resource/' . $navitem . '/groups', []))) : ?>
+							<?php $key = $this->config('admin/jqadm/resource/' . $navitem . '/key'); ?>
 
-							<li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>">
-								<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>"
-									title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>"
-									data-ctrlkey="<?= $enc->attr( strtolower( $key ) ); ?>">
+							<li class="<?= $enc->attr($navitem); ?> <?= $this->param('resource', $navfirst) === $navitem ? 'active' : '' ?>">
+								<a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, array('resource' => $navitem) + $params, [], $config)); ?>"
+									title="<?= $enc->attr(sprintf($title, $this->translate('admin', $navitem), $key)); ?>"
+									data-ctrlkey="<?= $enc->attr(strtolower($key)); ?>">
 									<i class="icon"></i>
-									<span class="title"><?= $enc->html( $this->translate( 'admin', $navitem ) ); ?></span>
+									<span class="title"><?= $enc->html($this->translate('admin', $navitem)); ?></span>
 								</a>
 							</li>
 
@@ -318,23 +318,23 @@ 
 
 			<ul class="sidebar-menu advanced">
 
-				<?php foreach( $navlist as $nav => $navitem ) : ?>
-					<?php if( is_array( $navitem ) ) : ?>
-						<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $nav . '/groups', [] ) ) ) : ?>
+				<?php foreach ($navlist as $nav => $navitem) : ?>
+					<?php if (is_array($navitem)) : ?>
+						<?php if ($this->access($this->config('admin/jqadm/resource/' . $nav . '/groups', []))) : ?>
 
-							<li class="treeview <?= $enc->attr( $nav ) ?> <?= strncmp( $this->param( 'resource' ), $nav, strlen( $nav ) ) ? '' : 'active' ?>">
+							<li class="treeview <?= $enc->attr($nav) ?> <?= strncmp($this->param('resource'), $nav, strlen($nav)) ? '' : 'active' ?>">
 								<span>
 									<i class="icon"></i>
-									<span class="title"><?= $enc->attr( $this->translate( 'admin', $nav ) ); ?></span>
+									<span class="title"><?= $enc->attr($this->translate('admin', $nav)); ?></span>
 								</span>
 								<ul class="tree-menu">
-									<li class="menu-header"><strong><?= $enc->html( $this->translate( 'admin', $nav ) ); ?></strong></li>
+									<li class="menu-header"><strong><?= $enc->html($this->translate('admin', $nav)); ?></strong></li>
 
-									<?php foreach( $navitem as $subresource ) : ?>
-										<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $subresource . '/groups', [] ) ) ) : ?>
-											<li class="<?= str_replace( '/', '-', $subresource); ?>">
-												<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config ) ); ?>">
-													<span class="name"><?= $enc->html( $this->translate( 'admin', $subresource ) ); ?></span>
+									<?php foreach ($navitem as $subresource) : ?>
+										<?php if ($this->access($this->config('admin/jqadm/resource/' . $subresource . '/groups', []))) : ?>
+											<li class="<?= str_replace('/', '-', $subresource); ?>">
+												<a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, ['resource' => $subresource] + $params, [], $config)); ?>">
+													<span class="name"><?= $enc->html($this->translate('admin', $subresource)); ?></span>
 												</a>
 											</li>
 										<?php endif; ?>
@@ -345,15 +345,15 @@ 
 
 						<?php endif; ?>
 					<?php else : ?>
-						<?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?>
+						<?php if ($this->access($this->config('admin/jqadm/resource/' . $navitem . '/groups', []))) : ?>
 
-							<?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?>
-							<li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>">
-								<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>"
-									title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>"
-									data-ctrlkey="<?= $enc->attr( strtolower( $key ) ); ?>">
+							<?php $key = $this->config('admin/jqadm/resource/' . $navitem . '/key'); ?>
+							<li class="<?= $enc->attr($navitem); ?> <?= $this->param('resource', $navfirst) === $navitem ? 'active' : '' ?>">
+								<a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, array('resource' => $navitem) + $params, [], $config)); ?>"
+									title="<?= $enc->attr(sprintf($title, $this->translate('admin', $navitem), $key)); ?>"
+									data-ctrlkey="<?= $enc->attr(strtolower($key)); ?>">
 									<i class="icon"></i>
-									<span class="title"><?= $enc->html( $this->translate( 'admin', $navitem ) ); ?></span>
+									<span class="title"><?= $enc->html($this->translate('admin', $navitem)); ?></span>
 								</a>
 							</li>
 
@@ -361,18 +361,18 @@ 
 					<?php endif; ?>
 				<?php endforeach; ?>
 
-				<?php if( $this->access( $this->config( 'admin/jqadm/resource/language/groups', [] ) ) ) : ?>
+				<?php if ($this->access($this->config('admin/jqadm/resource/language/groups', []))) : ?>
 					<li class="language treeview">
 						<span>
 							<i class="icon"></i>
-							<span class="title"><?= $enc->attr( $this->translate( 'language', $this->param( 'lang', $this->translate( 'admin', 'Language' ) ) ) ); ?></span>
+							<span class="title"><?= $enc->attr($this->translate('language', $this->param('lang', $this->translate('admin', 'Language')))); ?></span>
 						</span>
 						<ul class="tree-menu">
-							<li class="menu-header"><strong><?= $enc->html( $this->translate( 'admin', 'Language' ) ); ?></strong></li>
-							<?php foreach( $this->get( 'pageI18nList', [] ) as $langid ) : ?>
-								<li class="lang-<?= $enc->attr( $langid ) ?>">
-									<a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'lang' => $langid ) + $params, [], $config ) ); ?>">
-										<span class="name"><?= $enc->html( $this->translate( 'language', $langid ) ); ?> (<?= $langid ?>)</span>
+							<li class="menu-header"><strong><?= $enc->html($this->translate('admin', 'Language')); ?></strong></li>
+							<?php foreach ($this->get('pageI18nList', []) as $langid) : ?>
+								<li class="lang-<?= $enc->attr($langid) ?>">
+									<a href="<?= $enc->attr($this->url($searchTarget, $cntl, $action, array('lang' => $langid) + $params, [], $config)); ?>">
+										<span class="name"><?= $enc->html($this->translate('language', $langid)); ?> (<?= $langid ?>)</span>
 									</a>
 								</li>
 							<?php endforeach; ?>
@@ -386,20 +386,20 @@ 
 
 	<main class="main-content">
 
-		<?= $this->partial( $this->config( 'admin/jqadm/partial/error', 'common/partials/error-standard' ), array( 'errors' => $this->get( 'errors', [] ) ) ); ?>
-		<?= $this->partial( $this->config( 'admin/jqadm/partial/info', 'common/partials/info-standard' ), array( 'info' => $infoMsgs ) ); ?>
+		<?= $this->partial($this->config('admin/jqadm/partial/error', 'common/partials/error-standard'), array('errors' => $this->get('errors', []))); ?>
+		<?= $this->partial($this->config('admin/jqadm/partial/info', 'common/partials/info-standard'), array('info' => $infoMsgs)); ?>
 
-		<?= $this->block()->get( 'jqadm_content' ); ?>
+		<?= $this->block()->get('jqadm_content'); ?>
 
 	</main>
 
 	<footer class="main-footer">
 		<a href="https://github.com/aimeos/ai-admin-jqadm/issues" target="_blank">
-			<?= $enc->html( $this->translate( 'admin', 'Bug or suggestion?' ) ); ?>
+			<?= $enc->html($this->translate('admin', 'Bug or suggestion?')); ?>
 		</a>
 	</footer>
 
-	<?= $this->partial( $this->config( 'admin/jqadm/partial/confirm', 'common/partials/confirm-standard' ) ); ?>
-	<?= $this->partial( $this->config( 'admin/jqadm/partial/problem', 'common/partials/problem-standard' ) ); ?>
+	<?= $this->partial($this->config('admin/jqadm/partial/confirm', 'common/partials/confirm-standard')); ?>
+	<?= $this->partial($this->config('admin/jqadm/partial/problem', 'common/partials/problem-standard')); ?>
 
 </div>

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

Braces +5 added lines, -2 removed lines

@@ -374,8 +374,11 @@
 									aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>">
 									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?>
 								</a>
-							<?php else : ?>
-								<?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>)
+							<?php else {
+	: ?>
+								<?= $enc->html( $refId );
+}
+?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>)
 							<?php endif; ?>
 						</td>
 					<?php endif; ?>

Spacing +171 added lines, -171 removed lines

@@ -5,28 +5,28 @@ 
  * @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();
-$params = $this->get( 'pageParams', [] );
+$params = $this->get('pageParams', []);
 
-$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', []);
 
-$delTarget = $this->config( 'admin/jsonadm/url/target' );
-$delCntl = $this->config( 'admin/jsonadm/url/controller', 'Jsonadm' );
-$delAction = $this->config( 'admin/jsonadm/url/action', 'delete' );
-$delConfig = $this->config( 'admin/jsonadm/url/config', [] );
+$delTarget = $this->config('admin/jsonadm/url/target');
+$delCntl = $this->config('admin/jsonadm/url/controller', 'Jsonadm');
+$delAction = $this->config('admin/jsonadm/url/action', 'delete');
+$delConfig = $this->config('admin/jsonadm/url/config', []);
 
 
 /** admin/jqadm/supplier/product/fields
@@ -44,21 +44,21 @@ 
  * @category Developer
  */
 $default = ['supplier.lists.position', 'supplier.lists.status', 'supplier.lists.type', 'supplier.lists.config', 'supplier.lists.refid'];
-$default = $this->config( 'admin/jqadm/supplier/product/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/supplierproduct/fields', $default );
+$default = $this->config('admin/jqadm/supplier/product/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/supplierproduct/fields', $default);
 
-$listItems = $this->get( 'productListItems', [] );
-$refItems = $this->get( 'productItems', [] );
+$listItems = $this->get('productListItems', []);
+$refItems = $this->get('productItems', []);
 
 
 ?>
 <div id="product" class="item-product content-block tab-pane fade" role="tabpanel" aria-labelledby="product">
 
 	<?= $this->partial(
-			$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-			['pageParams' => $params, 'pos' => 'top', 'total' => $this->get( 'productTotal' ),
+			$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+			['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('productTotal'),
 			'group' => 'sp', 'action' => 'get', 'fragment' => 'product',
-			'page' => $this->session( 'aimeos/admin/jqadm/supplierproduct/page', [] )]
+			'page' => $this->session('aimeos/admin/jqadm/supplierproduct/page', [])]
 		);
 	?>
 
@@ -66,39 +66,39 @@ 
 		<thead class="list-header">
 			<tr>
 				<?= $this->partial(
-					$this->config( 'admin/jqadm/partial/listhead', 'common/partials/listhead-standard' ), [
-						'fields' => $fields, 'params' => $params, 'tabindex' => $this->get( 'tabindex' ),
+					$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'), [
+						'fields' => $fields, 'params' => $params, 'tabindex' => $this->get('tabindex'),
 						'group' => 'sp', 'action' => 'get', 'fragment' => 'product',
-						'sort' => $this->session( 'aimeos/admin/jqadm/supplierproduct/sort' ),
+						'sort' => $this->session('aimeos/admin/jqadm/supplierproduct/sort'),
 						'data' => [
-							'supplier.lists.position' => $this->translate( 'admin', 'Position' ),
-							'supplier.lists.status' => $this->translate( 'admin', 'Status' ),
-							'supplier.lists.type' => $this->translate( 'admin', 'Type' ),
-							'supplier.lists.config' => $this->translate( 'admin', 'Config' ),
-							'supplier.lists.datestart' => $this->translate( 'admin', 'Start date' ),
-							'supplier.lists.dateend' => $this->translate( 'admin', 'End date' ),
-							'supplier.lists.refid' => $this->translate( 'admin', 'Product ID' ),
+							'supplier.lists.position' => $this->translate('admin', 'Position'),
+							'supplier.lists.status' => $this->translate('admin', 'Status'),
+							'supplier.lists.type' => $this->translate('admin', 'Type'),
+							'supplier.lists.config' => $this->translate('admin', 'Config'),
+							'supplier.lists.datestart' => $this->translate('admin', 'Start date'),
+							'supplier.lists.dateend' => $this->translate('admin', 'End date'),
+							'supplier.lists.refid' => $this->translate('admin', 'Product ID'),
 						]
 					] );
 				?>
 
 				<th class="actions">
-					<a class="btn fa act-add" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Add' ) ); ?>">
+					<a class="btn fa act-add" href="#" tabindex="<?= $this->get('tabindex'); ?>"
+						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' ), [
-							'fields' => $fields, 'group' => 'sp', 'tabindex' => $this->get( 'tabindex' ),
+						$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'), [
+							'fields' => $fields, 'group' => 'sp', 'tabindex' => $this->get('tabindex'),
 							'data' => [
-								'supplier.lists.position' => $this->translate( 'admin', 'Position' ),
-								'supplier.lists.status' => $this->translate( 'admin', 'Status' ),
-								'supplier.lists.type' => $this->translate( 'admin', 'Type' ),
-								'supplier.lists.config' => $this->translate( 'admin', 'Config' ),
-								'supplier.lists.datestart' => $this->translate( 'admin', 'Start date' ),
-								'supplier.lists.dateend' => $this->translate( 'admin', 'End date' ),
-								'supplier.lists.refid' => $this->translate( 'admin', 'Product' ),
+								'supplier.lists.position' => $this->translate('admin', 'Position'),
+								'supplier.lists.status' => $this->translate('admin', 'Status'),
+								'supplier.lists.type' => $this->translate('admin', 'Type'),
+								'supplier.lists.config' => $this->translate('admin', 'Config'),
+								'supplier.lists.datestart' => $this->translate('admin', 'Start date'),
+								'supplier.lists.dateend' => $this->translate('admin', 'End date'),
+								'supplier.lists.refid' => $this->translate('admin', 'Product'),
 							]
 						] );
 					?>
@@ -107,18 +107,18 @@ 
 		</thead>
 		<tbody>
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'filter' => $this->session( 'aimeos/admin/jqadm/supplierproduct/filter', [] ),
-					'fields' => $fields, 'group' => 'sp', 'tabindex' => $this->get( 'tabindex' ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'filter' => $this->session('aimeos/admin/jqadm/supplierproduct/filter', []),
+					'fields' => $fields, 'group' => 'sp', 'tabindex' => $this->get('tabindex'),
 					'data' => [
 						'supplier.lists.position' => ['op' => '>=', 'type' => 'number'],
 						'supplier.lists.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'),
 						]],
-						'supplier.lists.type' => ['op' => '==', 'type' => 'select', 'val' => $this->get( 'productListTypes', [])],
+						'supplier.lists.type' => ['op' => '==', 'type' => 'select', 'val' => $this->get('productListTypes', [])],
 						'supplier.lists.config' => ['op' => '~='],
 						'supplier.lists.datestart' => ['op' => '>=', 'type' => 'datetime-local'],
 						'supplier.lists.dateend' => ['op' => '>=', 'type' => 'datetime-local'],
@@ -128,80 +128,80 @@ 
 			?>
 
 			<tr class="list-item-new prototype">
-				<td colspan="<?= count( $fields ); ?>">
+				<td colspan="<?= count($fields); ?>">
 					<div class="content-block row">
 						<div class="col-xl-6">
 							<div class="form-group row mandatory">
-								<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Product' ) ); ?></label>
+								<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Product')); ?></label>
 								<div class="col-sm-8">
 									<input class="item-listid" type="hidden" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.id', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.id', ''))); ?>" />
 									<input class="item-config" type="hidden" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.config', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.config', ''))); ?>" />
 									<input class="item-label" type="hidden" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'product.label', '' ) ) ); ?>" />
-									<select class="combobox-prototype item-refid" tabindex="<?= $this->get( 'tabindex' ); ?>" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.refid', '' ) ) ); ?>">
+										name="<?= $enc->attr($this->formparam(array('product', 'product.label', ''))); ?>" />
+									<select class="combobox-prototype item-refid" tabindex="<?= $this->get('tabindex'); ?>" disabled="disabled"
+										name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.refid', ''))); ?>">
 									</select>
 								</div>
 							</div>
 							<div class="form-group row mandatory">
-								<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+								<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Status')); ?></label>
 								<div class="col-sm-8">
-									<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.status', '' ) ) ); ?>">
+									<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get('tabindex'); ?>" disabled="disabled"
+										name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.status', ''))); ?>">
 										<option value="">
-											<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Please select')); ?>
 										</option>
 										<option value="1">
-											<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+											<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 										</option>
 										<option value="0">
-											<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+											<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 										</option>
 										<option value="-1">
-											<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+											<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 										</option>
 										<option value="-2">
-											<?= $enc->html( $this->translate( 'mshop/code', 'status:-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"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+								<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Type')); ?></label>
 								<div class="col-sm-8">
-									<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.type', '' ) ) ); ?>" >
+									<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get('tabindex'); ?>" disabled="disabled"
+										name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.type', ''))); ?>" >
 										<option value="">
-											<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Please select')); ?>
 										</option>
 
-										<?php foreach( $this->get( 'productListTypes', [] ) as $id => $type ) : ?>
-											<option value="<?= $enc->attr( $id ); ?>"><?= $enc->html( $type ); ?></option>
+										<?php foreach ($this->get('productListTypes', []) as $id => $type) : ?>
+											<option value="<?= $enc->attr($id); ?>"><?= $enc->html($type); ?></option>
 										<?php endforeach; ?>
 									</select>
 								</div>
 							</div>
 							<div class="form-group row optional">
-								<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Start date' ) ); ?></label>
+								<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Start date')); ?></label>
 								<div class="col-sm-8">
-									<input class="form-control item-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.datestart', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control item-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.datestart', ''))); ?>" disabled="disabled" />
 								</div>
 							</div>
 							<div class="form-group row optional">
-								<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'End date' ) ); ?></label>
+								<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'End date')); ?></label>
 								<div class="col-sm-8">
-									<input class="form-control item-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.dateend', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control item-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.dateend', ''))); ?>" disabled="disabled" />
 								</div>
 							</div>
 							<div class="form-group row optional">
-								<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'Position' ) ); ?></label>
+								<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'Position')); ?></label>
 								<div class="col-sm-8">
-									<input class="form-control item-position" type="number" step="1" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.position', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control item-position" type="number" step="1" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.position', ''))); ?>" disabled="disabled" />
 								</div>
 							</div>
 						</div>
@@ -210,17 +210,17 @@ 
 								<thead>
 									<tr>
 										<th>
-											<span class="help"><?= $enc->html( $this->translate( 'admin', 'Option' ) ); ?></span>
+											<span class="help"><?= $enc->html($this->translate('admin', 'Option')); ?></span>
 											<div class="form-text text-muted help-text">
-												<?= $enc->html( $this->translate( 'admin', 'Article specific configuration options, will be available as key/value pairs in the templates' ) ); ?>
+												<?= $enc->html($this->translate('admin', 'Article specific configuration options, will be available as key/value pairs in the templates')); ?>
 											</div>
 										</th>
 										<th>
-											<?= $enc->html( $this->translate( 'admin', 'Value' ) ); ?>
+											<?= $enc->html($this->translate('admin', 'Value')); ?>
 										</th>
 										<th class="actions">
-											<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+											<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+												title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>">
 											</div>
 										</th>
 									</tr>
@@ -228,16 +228,16 @@ 
 								<tbody>
 									<tr class="prototype">
 										<td>
-											<input type="text" class="config-key form-control" tabindex="<?= $this->get( 'tabindex' ); ?>" disabled="disabled"
-												name="<?= $enc->attr( $this->formparam( array( 'product', 'config', 'idx', 'key', '' ) ) ); ?>" />
+											<input type="text" class="config-key form-control" tabindex="<?= $this->get('tabindex'); ?>" disabled="disabled"
+												name="<?= $enc->attr($this->formparam(array('product', 'config', 'idx', 'key', ''))); ?>" />
 										</td>
 										<td>
-											<input type="text" class="config-value form-control" tabindex="<?= $this->get( 'tabindex' ); ?>" disabled="disabled"
-												name="<?= $enc->attr( $this->formparam( array( 'product', 'config', 'idx', 'val', '' ) ) ); ?>" />
+											<input type="text" class="config-value form-control" tabindex="<?= $this->get('tabindex'); ?>" disabled="disabled"
+												name="<?= $enc->attr($this->formparam(array('product', 'config', 'idx', 'val', ''))); ?>" />
 										</td>
 										<td class="actions">
-											<div class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>">
+											<div class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+												title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>">
 											</div>
 										</td>
 									</tr>
@@ -247,79 +247,79 @@ 
 					</div>
 				</td>
 				<td class="actions">
-					<a class="btn fa act-close" href="#" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Close') ); ?>"
-						aria-label="<?= $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>">
+					<a class="btn fa act-close" href="#" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Close')); ?>"
+						aria-label="<?= $enc->attr($this->translate('admin', 'Close')); ?>">
 					</a>
 				</td>
 			</tr>
 
-			<?php foreach( $this->get( 'productData/supplier.lists.id', [] ) as $idx => $listId ) : ?>
-				<?php $siteId = $this->get( 'productData/supplier.lists.siteid/' . $idx ); ?>
-				<?php $refId = $this->get( 'productData/supplier.lists.refid/' . $idx ); ?>
+			<?php foreach ($this->get('productData/supplier.lists.id', []) as $idx => $listId) : ?>
+				<?php $siteId = $this->get('productData/supplier.lists.siteid/' . $idx); ?>
+				<?php $refId = $this->get('productData/supplier.lists.refid/' . $idx); ?>
 
-				<tr class="list-item <?= $this->site()->readonly( $siteId ); ?>">
-					<?php if( in_array( 'supplier.lists.position', $fields ) ) : ?>
+				<tr class="list-item <?= $this->site()->readonly($siteId); ?>">
+					<?php if (in_array('supplier.lists.position', $fields)) : ?>
 						<td class="supplier-lists-position">
-							<input class="form-control item-position" type="number" step="1" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.position', '' ) ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'productData/supplier.lists.position/' . $idx ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" />
+							<input class="form-control item-position" type="number" step="1" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.position', ''))); ?>"
+								value="<?= $enc->attr($this->get('productData/supplier.lists.position/' . $idx)); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'supplier.lists.status', $fields ) ) : ?>
+					<?php if (in_array('supplier.lists.status', $fields)) : ?>
 						<td class="supplier-lists-status">
-							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.status', '' ) ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" >
+							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.status', ''))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" >
 								<option value="">
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
 								</option>
-								<option value="1" <?= $selected( $this->get( 'productData/supplier.lists.status/' . $idx, 1 ), 1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+								<option value="1" <?= $selected($this->get('productData/supplier.lists.status/' . $idx, 1), 1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
-								<option value="0" <?= $selected( $this->get( 'productData/supplier.lists.status/' . $idx, 1 ), 0 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+								<option value="0" <?= $selected($this->get('productData/supplier.lists.status/' . $idx, 1), 0); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
-								<option value="-1" <?= $selected( $this->get( 'productData/supplier.lists.status/' . $idx, 1 ), -1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+								<option value="-1" <?= $selected($this->get('productData/supplier.lists.status/' . $idx, 1), -1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
-								<option value="-2" <?= $selected( $this->get( 'productData/supplier.lists.status/' . $idx, 1 ), -2 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+								<option value="-2" <?= $selected($this->get('productData/supplier.lists.status/' . $idx, 1), -2); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'supplier.lists.type', $fields ) ) : ?>
+					<?php if (in_array('supplier.lists.type', $fields)) : ?>
 						<td class="supplier-lists-type">
-							<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.type', '' ) ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" >
+							<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.type', ''))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" >
 								<option value="">
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
 								</option>
 
-								<?php foreach( $this->get( 'productListTypes', [] ) as $id => $type ) : ?>
-									<option value="<?= $enc->attr( $id ); ?>" <?= $selected( $this->get( 'productData/supplier.lists.type/' . $idx ), $id ); ?> >
-										<?= $enc->html( $type ); ?>
+								<?php foreach ($this->get('productListTypes', []) as $id => $type) : ?>
+									<option value="<?= $enc->attr($id); ?>" <?= $selected($this->get('productData/supplier.lists.type/' . $idx), $id); ?> >
+										<?= $enc->html($type); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'supplier.lists.config', $fields ) ) : ?>
+					<?php if (in_array('supplier.lists.config', $fields)) : ?>
 						<td class="supplier-lists-config item-config">
 							<div class="config-type config-type-map">
-								<input type="text" class="config-value form-control" tabindex="<?= $this->get( 'tabindex' ); ?>"
-									name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.config', '' ) ) ); ?>"
-									value="<?= $enc->attr( json_encode( $this->get( 'productData/supplier.lists.config/' . $idx ) ) ); ?>"
-									<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" />
+								<input type="text" class="config-value form-control" tabindex="<?= $this->get('tabindex'); ?>"
+									name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.config', ''))); ?>"
+									value="<?= $enc->attr(json_encode($this->get('productData/supplier.lists.config/' . $idx))); ?>"
+									<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 
 								<table class="table table-striped config-map-table">
 									<tr class="config-map-row prototype-map">
 										<td class="config-map-actions">
 											<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>
 										</td>
 										<td class="config-map-row-key">
@@ -332,12 +332,12 @@ 
 									<tr class="config-map-actions">
 										<td class="config-map-action-add">
 											<div class="btn act-add fa" tabindex="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry') ); ?>">
+												title="<?= $enc->attr($this->translate('admin', 'Insert new entry')); ?>">
 											</div>
 										</td>
 										<td class="config-map-action-update" colspan="2">
 											<div class="btn btn-primary act-update" tabindex="1">
-												<?= $enc->attr( $this->translate( 'admin', 'OK') ); ?>
+												<?= $enc->attr($this->translate('admin', 'OK')); ?>
 											</div>
 										</td>
 									</tr>
@@ -345,55 +345,55 @@ 
 							</div>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'supplier.lists.datestart', $fields ) ) : ?>
+					<?php if (in_array('supplier.lists.datestart', $fields)) : ?>
 						<td class="supplier-lists-datestart">
-							<input class="form-control item-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.datestart', '' ) ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'productData/supplier.lists.datestart/' . $idx ) ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" />
+							<input class="form-control item-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.datestart', ''))); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('productData/supplier.lists.datestart/' . $idx))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'supplier.lists.dateend', $fields ) ) : ?>
+					<?php if (in_array('supplier.lists.dateend', $fields)) : ?>
 						<td class="supplier-lists-dateend">
-							<input class="form-control item-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.dateend', '' ) ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'productData/supplier.lists.dateend/' . $idx ) ) ); ?>"
-								<?= $this->site()->readonly( $siteId ); ?> disabled="disabled" />
+							<input class="form-control item-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+								name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.dateend', ''))); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('productData/supplier.lists.dateend/' . $idx))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
 
-					<?php $refItem = ( isset( $refItems[$refId] ) ? $refItems[$refId] : null ); ?>
+					<?php $refItem = (isset($refItems[$refId]) ? $refItems[$refId] : null); ?>
 
-					<?php if( in_array( 'supplier.lists.refid', $fields ) ) : ?>
+					<?php if (in_array('supplier.lists.refid', $fields)) : ?>
 						<td class="supplier-lists-refid">
 							<input class="form-control item-refid" type="hidden"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.refid', '' ) ) ); ?>"
-								value="<?= $enc->attr( $refId ); ?>" disabled="disabled" />
-							<?php if( $refItem ) : ?>
-								<a class="btn act-view fa item-refid" tabindex="<?= $this->get( 'tabindex' ); ?>" target="_blank"
-									href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'product', 'id' => $refId] + $params, [], $getConfig ) ); ?>"
-									title="<?= $enc->attr( $this->translate( 'admin', 'Show entry') ); ?>"
-									aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>">
-									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?>
+								name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.refid', ''))); ?>"
+								value="<?= $enc->attr($refId); ?>" disabled="disabled" />
+							<?php if ($refItem) : ?>
+								<a class="btn act-view fa item-refid" tabindex="<?= $this->get('tabindex'); ?>" target="_blank"
+									href="<?= $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'product', 'id' => $refId] + $params, [], $getConfig)); ?>"
+									title="<?= $enc->attr($this->translate('admin', 'Show entry')); ?>"
+									aria-label="<?= $enc->attr($this->translate('admin', 'Show')); ?>">
+									<?= $enc->html($refId); ?> - <?= $enc->html($refItem->getLabel() . ' (' . $refItem->getCode() . ')'); ?>
 								</a>
 							<?php else : ?>
-								<?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>)
+								<?= $enc->html($refId); ?> (<?= $enc->html($this->translate('admin', 'not available any more')); ?>)
 							<?php endif; ?>
 						</td>
 					<?php endif; ?>
 
 					<td class="actions">
-						<input type="hidden" value="<?= $enc->attr( $listId ); ?>" disabled="disabled"
-							name="<?= $enc->attr( $this->formparam( array( 'product', 'supplier.lists.id', '' ) ) ); ?>" />
+						<input type="hidden" value="<?= $enc->attr($listId); ?>" disabled="disabled"
+							name="<?= $enc->attr($this->formparam(array('product', 'supplier.lists.id', ''))); ?>" />
 
-						<?php if( !$this->site()->readonly( $siteId ) ) : ?>
-							<a class="btn act-edit fa" tabindex="<?= $this->get( 'tabindex' ); ?>" href="#"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Edit this entry') ); ?>"
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Edit' ) ); ?>"></a>
-							<a class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'supplier/lists', 'id' => $listId] + $params, [], $delConfig ) ); ?>"
-								title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
-								aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
+						<?php if (!$this->site()->readonly($siteId)) : ?>
+							<a class="btn act-edit fa" tabindex="<?= $this->get('tabindex'); ?>" href="#"
+								title="<?= $enc->attr($this->translate('admin', 'Edit this entry')); ?>"
+								aria-label="<?= $enc->attr($this->translate('admin', 'Edit')); ?>"></a>
+							<a class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+								href="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, ['resource' => 'supplier/lists', 'id' => $listId] + $params, [], $delConfig)); ?>"
+								title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
+								aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
 						<?php endif; ?>
 					</td>
 				</tr>
@@ -402,17 +402,17 @@ 
 		</tbody>
 	</table>
 
-	<?php if( $this->get( 'productData', [] ) === [] ) : ?>
-		<div class="noitems"><?= $enc->html( sprintf( $this->translate( 'admin', 'No items found' ) ) ); ?></div>
+	<?php if ($this->get('productData', []) === []) : ?>
+		<div class="noitems"><?= $enc->html(sprintf($this->translate('admin', 'No items found'))); ?></div>
 	<?php endif; ?>
 
 	<?= $this->partial(
-			$this->config( 'admin/jqadm/partial/pagination', 'common/partials/pagination-standard' ),
-			['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get( 'productTotal' ),
+			$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+			['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('productTotal'),
 			'group' => 'sp', 'action' => 'get', 'fragment' => 'product',
-			'page' =>$this->session( 'aimeos/admin/jqadm/supplierproduct/page', [] )]
+			'page' =>$this->session('aimeos/admin/jqadm/supplierproduct/page', [])]
 		);
 	?>
 
 </div>
-<?= $this->get( 'productBody' ); ?>
+<?= $this->get('productBody'); ?>

admin/jqadm/tests/Admin/JQAdm/Type/Media/Property/FactoryTest.php

Spacing +11 added lines, -11 removed lines

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

admin/jqadm/src/Admin/JQAdm/Type/Media/Property/Factory.php

Spacing +8 added lines, -8 removed lines

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

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

Spacing +8 added lines, -8 removed lines

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