aimeos / ai-admin-jqadm

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

Braces +5 added lines, -2 removed lines

@@ -133,8 +133,11 @@
 										</option>
 									<?php endforeach; ?>
 								</select>
-							<?php else : ?>
-								<?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); ?>
+							<?php else {
+	: ?>
+								<?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' );
+}
+?>
 								<input class="item-languageid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>" value="<?= $enc->attr( $language ); ?>" />
 							<?php endif; ?>
 						</div>

Spacing +183 added lines, -183 removed lines

@@ -5,38 +5,38 @@ 
  * @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-customer form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr( $this->url( $target, $cntl, $action, $params, [], $config ) ); ?>">
-	<input id="item-id" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.id' ) ) ); ?>" value="<?= $enc->attr( $this->get( 'itemData/customer.id' ) ); ?>" />
-	<input id="item-next" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'next' ) ) ); ?>" value="get" />
+<form class="item item-customer form-horizontal" method="POST" enctype="multipart/form-data" action="<?= $enc->attr($this->url($target, $cntl, $action, $params, [], $config)); ?>">
+	<input id="item-id" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'customer.id'))); ?>" value="<?= $enc->attr($this->get('itemData/customer.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', 'Customer' ) ); ?>:
-			<?= $enc->html( $this->get( 'itemData/customer.id' ) ); ?> -
-			<?= $enc->html( $this->get( 'itemData/customer.label', $this->translate( 'admin', 'New' ) ) ); ?>
-			<span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/customer.siteid' ) ) ); ?>)</span>
+			<?= $enc->html($this->translate('admin', 'Customer')); ?>:
+			<?= $enc->html($this->get('itemData/customer.id')); ?> -
+			<?= $enc->html($this->get('itemData/customer.label', $this->translate('admin', 'New'))); ?>
+			<span class="navbar-secondary">(<?= $enc->html($this->site()->match($this->get('itemData/customer.siteid'))); ?>)</span>
 		</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>
 
@@ -47,14 +47,14 @@ 
 
 				<li class="nav-item basic">
 					<a class="nav-link active" href="#basic" data-toggle="tab" role="tab" aria-expanded="true" aria-controls="basic">
-						<?= $enc->html( $this->translate( 'admin', 'Basic' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Basic')); ?>
 					</a>
 				</li>
 
-				<?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?>
-					<li class="nav-item <?= $enc->attr( $subpart ); ?>">
-						<a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>">
-							<?= $enc->html( $this->translate( 'admin', $subpart ) ); ?>
+				<?php foreach (array_values($this->get('itemSubparts', [])) as $idx => $subpart) : ?>
+					<li class="nav-item <?= $enc->attr($subpart); ?>">
+						<a class="nav-link" href="#<?= $enc->attr($subpart); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>">
+							<?= $enc->html($this->translate('admin', $subpart)); ?>
 						</a>
 					</li>
 				<?php endforeach; ?>
@@ -63,89 +63,89 @@ 
 
 			<div class="item-meta text-muted">
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Modified' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.mtime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Modified')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.mtime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Created' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.ctime' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Created')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.ctime')); ?></span>
 				</small>
 				<small>
-					<?= $enc->html( $this->translate( 'admin', 'Editor' ) ); ?>:
-					<span class="meta-value"><?= $enc->html( $this->get( 'itemData/customer.editor' ) ); ?></span>
+					<?= $enc->html($this->translate('admin', 'Editor')); ?>:
+					<span class="meta-value"><?= $enc->html($this->get('itemData/customer.editor')); ?></span>
 				</small>
 			</div>
 		</div>
 
 		<div class="col-md-9 item-content tab-content">
-			<?php $readonly = ( $this->access( 'admin' ) === false ? $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ) : '' ); ?>
+			<?php $readonly = ($this->access('admin') === false ? $this->site()->readonly($this->get('itemData/customer.siteid')) : ''); ?>
 
 			<div id="basic" class="row item-basic tab-pane fade show active" role="tabpanel" aria-labelledby="basic">
 
 				<div class="col-xl-6 content-block <?= $readonly ?>">
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label"><?= $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', 'customer.status' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> >
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.status'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> >
 								<option value="">
-									<?= $enc->attr( $this->translate( 'admin', 'Please select' ) ); ?>
+									<?= $enc->attr($this->translate('admin', 'Please select')); ?>
 								</option>
-								<option value="1" <?= $selected( $this->get( 'itemData/customer.status', 1 ), 1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+								<option value="1" <?= $selected($this->get('itemData/customer.status', 1), 1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
-								<option value="0" <?= $selected( $this->get( 'itemData/customer.status', 1 ), 0 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+								<option value="0" <?= $selected($this->get('itemData/customer.status', 1), 0); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
-								<option value="-1" <?= $selected( $this->get( 'itemData/customer.status', 1 ), -1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+								<option value="-1" <?= $selected($this->get('itemData/customer.status', 1), -1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
-								<option value="-2" <?= $selected( $this->get( 'itemData/customer.status', 1 ), -2 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+								<option value="-2" <?= $selected($this->get('itemData/customer.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', '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" required="required" tabindex="1" autocomplete="off"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.email' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'E-Mail address (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.email' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.email'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'E-Mail address (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.email')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Unique customer e-mail address' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Unique customer e-mail address')); ?>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Password' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Password')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-password" type="password" required="required" tabindex="1" autocomplete="off"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.password' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Password (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.password' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.password'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Password (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.password')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Customer password' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Customer password')); ?>
 						</div>
 					</div>
 				</div><!--
 
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
 					<div class="form-group row optional">
-						<label class="col-sm-4 form-control-label"><?= $enc->html( $this->translate( 'admin', 'User groups' ) ); ?></label>
+						<label class="col-sm-4 form-control-label"><?= $enc->html($this->translate('admin', 'User groups')); ?></label>
 						<div class="col-sm-8">
 							<select class="form-control item-groups" tabindex="1" size="7" multiple
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.groups', '' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> >
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.groups', ''))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> >
 
-								<?php foreach( $this->get( 'itemGroups', [] ) as $groupId => $groupItem ) : ?>
-									<option value="<?= $enc->attr( $groupId ); ?>" <?= $selected( in_array( $groupId, $this->get( 'itemData/customer.groups', [] ) ), true ); ?> >
-										<?= $enc->html( $groupItem->getLabel() ); ?>
+								<?php foreach ($this->get('itemGroups', []) as $groupId => $groupItem) : ?>
+									<option value="<?= $enc->attr($groupId); ?>" <?= $selected(in_array($groupId, $this->get('itemData/customer.groups', [])), true); ?> >
+										<?= $enc->html($groupItem->getLabel()); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
@@ -154,284 +154,284 @@ 
 				</div><!--
 
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Personal data' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Personal data')); ?></h2>
 					<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">
 
-							<?php $languages = $this->get( 'pageLangItems', [] ); ?>
-							<?php if( count( $languages ) > 1 ) : ?>
+							<?php $languages = $this->get('pageLangItems', []); ?>
+							<?php if (count($languages) > 1) : ?>
 								<select class="form-control custom-select item-languageid" required="required" tabindex="1"
-									name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>"
-									<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> >
+									name="<?= $enc->attr($this->formparam(array('item', 'customer.languageid'))); ?>"
+									<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> >
 									<option value="">
-										<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+										<?= $enc->html($this->translate('admin', 'Please select')); ?>
 									</option>
 
-									<?php foreach( $languages as $langId => $langItem ) : ?>
-										<option value="<?= $enc->attr( $langId ); ?>" <?= $selected( $this->get( 'itemData/customer.languageid', '' ), $langId ); ?> >
-											<?= $enc->html( $this->translate( 'language', $langId ) ); ?>
+									<?php foreach ($languages as $langId => $langItem) : ?>
+										<option value="<?= $enc->attr($langId); ?>" <?= $selected($this->get('itemData/customer.languageid', ''), $langId); ?> >
+											<?= $enc->html($this->translate('language', $langId)); ?>
 										</option>
 									<?php endforeach; ?>
 								</select>
 							<?php else : ?>
-								<?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); ?>
-								<input class="item-languageid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>" value="<?= $enc->attr( $language ); ?>" />
+								<?php $language = (($item = reset($languages)) !== false ? $item->getId() : ''); ?>
+								<input class="item-languageid" type="hidden" name="<?= $enc->attr($this->formparam(array('item', 'customer.languageid'))); ?>" value="<?= $enc->attr($language); ?>" />
 							<?php endif; ?>
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.salutation' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> >
-								<option value="" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), '' ); ?> >
-									<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.salutation'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> >
+								<option value="" <?= $selected($this->get('itemData/customer.salutation', ''), ''); ?> >
+									<?= $enc->html($this->translate('admin', 'Please select')); ?>
 								</option>
-								<option value="company" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), 'company' ); ?> >
-									<?= $enc->html( $this->translate( 'client/code', 'company' ) ); ?>
+								<option value="company" <?= $selected($this->get('itemData/customer.salutation', ''), 'company'); ?> >
+									<?= $enc->html($this->translate('client/code', 'company')); ?>
 								</option>
-								<option value="mr" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), 'mr' ); ?> >
-									<?= $enc->html( $this->translate( 'client/code', 'mr' ) ); ?>
+								<option value="mr" <?= $selected($this->get('itemData/customer.salutation', ''), 'mr'); ?> >
+									<?= $enc->html($this->translate('client/code', 'mr')); ?>
 								</option>
-								<option value="mrs" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), 'mrs' ); ?> >
-									<?= $enc->html( $this->translate( 'client/code', 'mrs' ) ); ?>
+								<option value="mrs" <?= $selected($this->get('itemData/customer.salutation', ''), 'mrs'); ?> >
+									<?= $enc->html($this->translate('client/code', 'mrs')); ?>
 								</option>
-								<option value="miss" <?= $selected( $this->get( 'itemData/customer.salutation', '' ), 'miss' ); ?> >
-									<?= $enc->html( $this->translate( 'client/code', 'miss' ) ); ?>
+								<option value="miss" <?= $selected($this->get('itemData/customer.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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.title' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Honorary title (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.title' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.title'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Honorary title (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.title')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.lastname' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Last name (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.lastname' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.lastname'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Last name (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.lastname')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.firstname' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'First name (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.firstname' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.firstname'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'First name (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.firstname')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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', 'Birthday' ) ); ?></label>
+						<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Birthday')); ?></label>
 						<div class="col-sm-8">
 							<input class="form-control item-birthday" type="date" tabindex="1"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.birthday' ) ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.birthday' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.birthday'))); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.birthday')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</div>
 						<div class="col-sm-12 form-text text-muted help-text">
-							<?= $enc->html( $this->translate( 'admin', 'Birthday of the customer' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'Birthday of the customer')); ?>
 						</div>
 					</div>
 				</div><!--
 
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Billing address' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Billing address')); ?></h2>
 					<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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.address1' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Street name (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.address1' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.address1'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Street name (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.address1')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.address2' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'House number (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.address2' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.address2'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'House number (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.address2')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.address3' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Floor and/or apartment (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.address3' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.address3'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Floor and/or apartment (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.address3')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.postal' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Zip code (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.postal' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.postal'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Zip code (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.postal')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.city' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'City or town name (required)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.city' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.city'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'City or town name (required)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.city')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<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">
 							<select class="combobox item-countryid" required="required" tabindex="1" maxlength="2" pattern="^[a-zA-Z]{2}$"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.countryid' ) ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
-								<option value="<?= $enc->attr( $this->get( 'itemData/customer.countryid' ) ); ?>" >
-									<?= $enc->html( $this->get( 'itemData/customer.countryid' ) ); ?>
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.countryid'))); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
+								<option value="<?= $enc->attr($this->get('itemData/customer.countryid')); ?>" >
+									<?= $enc->html($this->get('itemData/customer.countryid')); ?>
 								</option>
 							</select>
 						</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', '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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.state' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Country state code (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.state' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.state'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Country state code (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.state')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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><!--
 
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Communication' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Communication')); ?></h2>
 					<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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.telephone' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Telephone number (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.telephone' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.telephone'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Telephone number (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.telephone')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.telefax' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Facsimile number (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.telefax' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.telefax'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Facsimile number (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.telefax')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.website' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Web site URL (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.website' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.website'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Web site URL (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.website')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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><!--
 
 				--><div class="col-xl-6 content-block <?= $readonly ?>">
-					<h2 class="col-sm-12 item-header"><?= $enc->html( $this->translate( 'admin', 'Company details' ) ); ?></h2>
+					<h2 class="col-sm-12 item-header"><?= $enc->html($this->translate('admin', 'Company details')); ?></h2>
 					<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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.company' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Company name (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.company' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.company'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Company name (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.company')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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"
-								name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.vatid' ) ) ); ?>"
-								placeholder="<?= $enc->attr( $this->translate( 'admin', 'Value added tax identifier (optional)' ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'itemData/customer.vatid' ) ); ?>"
-								<?= $this->site()->readonly( $this->get( 'itemData/customer.siteid' ) ); ?> />
+								name="<?= $enc->attr($this->formparam(array('item', 'customer.vatid'))); ?>"
+								placeholder="<?= $enc->attr($this->translate('admin', 'Value added tax identifier (optional)')); ?>"
+								value="<?= $enc->attr($this->get('itemData/customer.vatid')); ?>"
+								<?= $this->site()->readonly($this->get('itemData/customer.siteid')); ?> />
 						</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>
 
 			</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>
@@ -439,4 +439,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/customer/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/customer/product/fields
@@ -44,21 +44,21 @@ 
  * @category Developer
  */
 $default = ['customer.lists.position', 'customer.lists.status', 'customer.lists.type', 'customer.lists.config', 'customer.lists.refid'];
-$default = $this->config( 'admin/jqadm/customer/product/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/customerproduct/fields', $default );
+$default = $this->config('admin/jqadm/customer/product/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/customerproduct/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' => 'up', 'action' => 'get', 'fragment' => 'product',
-			'page' => $this->session( 'aimeos/admin/jqadm/customerproduct/page', [] )]
+			'page' => $this->session('aimeos/admin/jqadm/customerproduct/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' => 'up', 'action' => 'get', 'fragment' => 'product',
-						'sort' => $this->session( 'aimeos/admin/jqadm/customerproduct/sort' ),
+						'sort' => $this->session('aimeos/admin/jqadm/customerproduct/sort'),
 						'data' => [
-							'customer.lists.position' => $this->translate( 'admin', 'Position' ),
-							'customer.lists.status' => $this->translate( 'admin', 'Status' ),
-							'customer.lists.type' => $this->translate( 'admin', 'Type' ),
-							'customer.lists.config' => $this->translate( 'admin', 'Config' ),
-							'customer.lists.datestart' => $this->translate( 'admin', 'Start date' ),
-							'customer.lists.dateend' => $this->translate( 'admin', 'End date' ),
-							'customer.lists.refid' => $this->translate( 'admin', 'Product ID' ),
+							'customer.lists.position' => $this->translate('admin', 'Position'),
+							'customer.lists.status' => $this->translate('admin', 'Status'),
+							'customer.lists.type' => $this->translate('admin', 'Type'),
+							'customer.lists.config' => $this->translate('admin', 'Config'),
+							'customer.lists.datestart' => $this->translate('admin', 'Start date'),
+							'customer.lists.dateend' => $this->translate('admin', 'End date'),
+							'customer.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' => 'up', 'tabindex' => $this->get( 'tabindex' ),
+						$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'), [
+							'fields' => $fields, 'group' => 'up', 'tabindex' => $this->get('tabindex'),
 							'data' => [
-								'customer.lists.position' => $this->translate( 'admin', 'Position' ),
-								'customer.lists.status' => $this->translate( 'admin', 'Status' ),
-								'customer.lists.type' => $this->translate( 'admin', 'Type' ),
-								'customer.lists.config' => $this->translate( 'admin', 'Config' ),
-								'customer.lists.datestart' => $this->translate( 'admin', 'Start date' ),
-								'customer.lists.dateend' => $this->translate( 'admin', 'End date' ),
-								'customer.lists.refid' => $this->translate( 'admin', 'Product' ),
+								'customer.lists.position' => $this->translate('admin', 'Position'),
+								'customer.lists.status' => $this->translate('admin', 'Status'),
+								'customer.lists.type' => $this->translate('admin', 'Type'),
+								'customer.lists.config' => $this->translate('admin', 'Config'),
+								'customer.lists.datestart' => $this->translate('admin', 'Start date'),
+								'customer.lists.dateend' => $this->translate('admin', 'End date'),
+								'customer.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/customerproduct/filter', [] ),
-					'fields' => $fields, 'group' => 'up', 'tabindex' => $this->get( 'tabindex' ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'filter' => $this->session('aimeos/admin/jqadm/customerproduct/filter', []),
+					'fields' => $fields, 'group' => 'up', 'tabindex' => $this->get('tabindex'),
 					'data' => [
 						'customer.lists.position' => ['op' => '>=', 'type' => 'number'],
 						'customer.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'),
 						]],
-						'customer.lists.type' => ['op' => '==', 'type' => 'select', 'val' => array_keys( $this->get( 'productListTypes', [] ) )],
+						'customer.lists.type' => ['op' => '==', 'type' => 'select', 'val' => array_keys($this->get('productListTypes', []))],
 						'customer.lists.config' => ['op' => '~='],
 						'customer.lists.datestart' => ['op' => '>=', 'type' => 'datetime-local'],
 						'customer.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', 'customer.lists.id', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('product', 'customer.lists.id', ''))); ?>" />
 									<input class="item-config" type="hidden" disabled="disabled"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'customer.lists.config', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('product', 'customer.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', 'customer.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', 'customer.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', 'customer.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', 'customer.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', 'customer.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', 'customer.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 $type => $item ) : ?>
-											<option value="<?= $enc->attr( $type ); ?>"><?= $enc->html( $type ); ?></option>
+										<?php foreach ($this->get('productListTypes', []) as $type => $item) : ?>
+											<option value="<?= $enc->attr($type); ?>"><?= $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', 'customer.lists.datestart', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control item-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('product', 'customer.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', 'customer.lists.dateend', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control item-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('product', 'customer.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', 'customer.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', 'customer.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/customer.lists.id', [] ) as $idx => $listId ) : ?>
-				<?php $siteId = $this->get( 'productData/customer.lists.siteid/' . $idx ); ?>
-				<?php $refId = $this->get( 'productData/customer.lists.refid/' . $idx ); ?>
+			<?php foreach ($this->get('productData/customer.lists.id', []) as $idx => $listId) : ?>
+				<?php $siteId = $this->get('productData/customer.lists.siteid/' . $idx); ?>
+				<?php $refId = $this->get('productData/customer.lists.refid/' . $idx); ?>
 
-				<tr class="list-item <?= $this->site()->readonly( $siteId ); ?>">
-					<?php if( in_array( 'customer.lists.position', $fields ) ) : ?>
+				<tr class="list-item <?= $this->site()->readonly($siteId); ?>">
+					<?php if (in_array('customer.lists.position', $fields)) : ?>
 						<td class="customer-lists-position">
-							<input class="form-control item-position" type="number" step="1" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'customer.lists.position', '' ) ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'productData/customer.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', 'customer.lists.position', ''))); ?>"
+								value="<?= $enc->attr($this->get('productData/customer.lists.position/' . $idx)); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'customer.lists.status', $fields ) ) : ?>
+					<?php if (in_array('customer.lists.status', $fields)) : ?>
 						<td class="customer-lists-status">
-							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'customer.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', 'customer.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/customer.lists.status/' . $idx, 1 ), 1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+								<option value="1" <?= $selected($this->get('productData/customer.lists.status/' . $idx, 1), 1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
-								<option value="0" <?= $selected( $this->get( 'productData/customer.lists.status/' . $idx, 1 ), 0 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+								<option value="0" <?= $selected($this->get('productData/customer.lists.status/' . $idx, 1), 0); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
-								<option value="-1" <?= $selected( $this->get( 'productData/customer.lists.status/' . $idx, 1 ), -1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+								<option value="-1" <?= $selected($this->get('productData/customer.lists.status/' . $idx, 1), -1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
-								<option value="-2" <?= $selected( $this->get( 'productData/customer.lists.status/' . $idx, 1 ), -2 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+								<option value="-2" <?= $selected($this->get('productData/customer.lists.status/' . $idx, 1), -2); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'customer.lists.type', $fields ) ) : ?>
+					<?php if (in_array('customer.lists.type', $fields)) : ?>
 						<td class="customer-lists-type">
-							<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'customer.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', 'customer.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 $type => $item ) : ?>
-									<option value="<?= $enc->attr( $type ); ?>" <?= $selected( $this->get( 'productData/customer.lists.type/' . $idx ), $type ); ?> >
-										<?= $enc->html( $type ); ?>
+								<?php foreach ($this->get('productListTypes', []) as $type => $item) : ?>
+									<option value="<?= $enc->attr($type); ?>" <?= $selected($this->get('productData/customer.lists.type/' . $idx), $type); ?> >
+										<?= $enc->html($type); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'customer.lists.config', $fields ) ) : ?>
+					<?php if (in_array('customer.lists.config', $fields)) : ?>
 						<td class="customer-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', 'customer.lists.config', '' ) ) ); ?>"
-									value="<?= $enc->attr( json_encode( $this->get( 'productData/customer.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', 'customer.lists.config', ''))); ?>"
+									value="<?= $enc->attr(json_encode($this->get('productData/customer.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( 'customer.lists.datestart', $fields ) ) : ?>
+					<?php if (in_array('customer.lists.datestart', $fields)) : ?>
 						<td class="customer-lists-datestart">
-							<input class="form-control item-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'customer.lists.datestart', '' ) ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'productData/customer.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', 'customer.lists.datestart', ''))); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('productData/customer.lists.datestart/' . $idx))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'customer.lists.dateend', $fields ) ) : ?>
+					<?php if (in_array('customer.lists.dateend', $fields)) : ?>
 						<td class="customer-lists-dateend">
-							<input class="form-control item-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'customer.lists.dateend', '' ) ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'productData/customer.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', 'customer.lists.dateend', ''))); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('productData/customer.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( 'customer.lists.refid', $fields ) ) : ?>
+					<?php if (in_array('customer.lists.refid', $fields)) : ?>
 						<td class="customer-lists-refid">
 							<input class="form-control item-refid" type="hidden"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'customer.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', 'customer.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', 'customer.lists.id', '' ) ) ); ?>" />
+						<input type="hidden" value="<?= $enc->attr($listId); ?>" disabled="disabled"
+							name="<?= $enc->attr($this->formparam(array('product', 'customer.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' => 'customer/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' => 'customer/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' => 'up', 'action' => 'get', 'fragment' => 'product',
-			'page' =>$this->session( 'aimeos/admin/jqadm/customerproduct/page', [] )]
+			'page' =>$this->session('aimeos/admin/jqadm/customerproduct/page', [])]
 		);
 	?>
 
 </div>
-<?= $this->get( 'productBody' ); ?>
+<?= $this->get('productBody'); ?>

admin/jqadm/templates/catalog/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 +172 added lines, -172 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', []);
 
-$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', []);
 
-$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', []);
 
-$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/catalog/product/fields
@@ -44,21 +44,21 @@ 
  * @category Developer
  */
 $default = ['catalog.lists.status', 'catalog.lists.type', 'catalog.lists.position', 'catalog.lists.refid'];
-$default = $this->config( 'admin/jqadm/catalog/product/fields', $default );
-$fields = $this->session( 'aimeos/admin/jqadm/catalogproduct/fields', $default );
+$default = $this->config('admin/jqadm/catalog/product/fields', $default);
+$fields = $this->session('aimeos/admin/jqadm/catalogproduct/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' ),
-			'group' => 'cp', 'action' => ( $this->param( 'id') ? 'get' : 'search' ), 'fragment' => 'product',
-			'page' => $this->session( 'aimeos/admin/jqadm/catalogproduct/page', [] )]
+			$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+			['pageParams' => $params, 'pos' => 'top', 'total' => $this->get('productTotal'),
+			'group' => 'cp', 'action' => ($this->param('id') ? 'get' : 'search'), 'fragment' => 'product',
+			'page' => $this->session('aimeos/admin/jqadm/catalogproduct/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' ),
-						'group' => 'cp', 'action' => ( $this->param( 'id') ? 'get' : 'search' ), 'fragment' => 'product',
-						'sort' => $this->session( 'aimeos/admin/jqadm/catalogproduct/sort' ),
+					$this->config('admin/jqadm/partial/listhead', 'common/partials/listhead-standard'), [
+						'fields' => $fields, 'params' => $params, 'tabindex' => $this->get('tabindex'),
+						'group' => 'cp', 'action' => ($this->param('id') ? 'get' : 'search'), 'fragment' => 'product',
+						'sort' => $this->session('aimeos/admin/jqadm/catalogproduct/sort'),
 						'data' => [
-							'catalog.lists.position' => $this->translate( 'admin', 'Position' ),
-							'catalog.lists.status' => $this->translate( 'admin', 'Status' ),
-							'catalog.lists.type' => $this->translate( 'admin', 'Type' ),
-							'catalog.lists.config' => $this->translate( 'admin', 'Config' ),
-							'catalog.lists.datestart' => $this->translate( 'admin', 'Start date' ),
-							'catalog.lists.dateend' => $this->translate( 'admin', 'End date' ),
-							'catalog.lists.refid' => $this->translate( 'admin', 'Product ID' ),
+							'catalog.lists.position' => $this->translate('admin', 'Position'),
+							'catalog.lists.status' => $this->translate('admin', 'Status'),
+							'catalog.lists.type' => $this->translate('admin', 'Type'),
+							'catalog.lists.config' => $this->translate('admin', 'Config'),
+							'catalog.lists.datestart' => $this->translate('admin', 'Start date'),
+							'catalog.lists.dateend' => $this->translate('admin', 'End date'),
+							'catalog.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' => 'cp', 'tabindex' => $this->get( 'tabindex' ),
+						$this->config('admin/jqadm/partial/columns', 'common/partials/columns-standard'), [
+							'fields' => $fields, 'group' => 'cp', 'tabindex' => $this->get('tabindex'),
 							'data' => [
-								'catalog.lists.position' => $this->translate( 'admin', 'Position' ),
-								'catalog.lists.status' => $this->translate( 'admin', 'Status' ),
-								'catalog.lists.type' => $this->translate( 'admin', 'Type' ),
-								'catalog.lists.config' => $this->translate( 'admin', 'Config' ),
-								'catalog.lists.datestart' => $this->translate( 'admin', 'Start date' ),
-								'catalog.lists.dateend' => $this->translate( 'admin', 'End date' ),
-								'catalog.lists.refid' => $this->translate( 'admin', 'Product' ),
+								'catalog.lists.position' => $this->translate('admin', 'Position'),
+								'catalog.lists.status' => $this->translate('admin', 'Status'),
+								'catalog.lists.type' => $this->translate('admin', 'Type'),
+								'catalog.lists.config' => $this->translate('admin', 'Config'),
+								'catalog.lists.datestart' => $this->translate('admin', 'Start date'),
+								'catalog.lists.dateend' => $this->translate('admin', 'End date'),
+								'catalog.lists.refid' => $this->translate('admin', 'Product'),
 							]
 						] );
 					?>
@@ -107,18 +107,18 @@ 
 		</thead>
 		<tbody>
 			<?= $this->partial(
-				$this->config( 'admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard' ), [
-					'fields' => $fields, 'group' => 'cp', 'tabindex' => $this->get( 'tabindex' ),
-					'filter' => $this->session( 'aimeos/admin/jqadm/catalogproduct/filter', [] ),
+				$this->config('admin/jqadm/partial/listsearch', 'common/partials/listsearch-standard'), [
+					'fields' => $fields, 'group' => 'cp', 'tabindex' => $this->get('tabindex'),
+					'filter' => $this->session('aimeos/admin/jqadm/catalogproduct/filter', []),
 					'data' => [
 						'catalog.lists.position' => ['op' => '>=', 'type' => 'number'],
 						'catalog.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'),
 						]],
-						'catalog.lists.type' => ['op' => '==', 'type' => 'select', 'val' => array_keys( $this->get( 'productListTypes', [] ) )],
+						'catalog.lists.type' => ['op' => '==', 'type' => 'select', 'val' => array_keys($this->get('productListTypes', []))],
 						'catalog.lists.config' => ['op' => '~='],
 						'catalog.lists.datestart' => ['op' => '>=', 'type' => 'datetime-local'],
 						'catalog.lists.dateend' => ['op' => '>=', 'type' => 'datetime-local'],
@@ -128,78 +128,78 @@ 
 			?>
 
 			<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', 'catalog.lists.id', '' ) ) ); ?>" />
+										name="<?= $enc->attr($this->formparam(array('product', 'catalog.lists.id', ''))); ?>" />
 									<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', 'catalog.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', 'catalog.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', 'catalog.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', 'catalog.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', 'catalog.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', 'catalog.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 $type => $item ) : ?>
-											<option value="<?= $enc->attr( $type ); ?>"><?= $enc->html( $type ); ?></option>
+										<?php foreach ($this->get('productListTypes', []) as $type => $item) : ?>
+											<option value="<?= $enc->attr($type); ?>"><?= $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 catalog-lists-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'catalog.lists.datestart', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control catalog-lists-datestart" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('product', 'catalog.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 catalog-lists-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'catalog.lists.dateend', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control catalog-lists-dateend" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('product', 'catalog.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 catalog-lists-position" type="number" step="1" tabindex="<?= $this->get( 'tabindex' ); ?>"
-										name="<?= $enc->attr( $this->formparam( array( 'product', 'catalog.lists.position', '' ) ) ); ?>" disabled="disabled" />
+									<input class="form-control catalog-lists-position" type="number" step="1" tabindex="<?= $this->get('tabindex'); ?>"
+										name="<?= $enc->attr($this->formparam(array('product', 'catalog.lists.position', ''))); ?>" disabled="disabled" />
 								</div>
 							</div>
 						</div>
@@ -208,17 +208,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="1"
-												title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>">
+												title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>">
 											</div>
 										</th>
 									</tr>
@@ -226,16 +226,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>
@@ -245,79 +245,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/catalog.lists.id', [] ) as $idx => $listId ) : ?>
-				<?php $siteId = $this->get( 'productData/catalog.lists.siteid/' . $idx ); ?>
-				<?php $refId = $this->get( 'productData/catalog.lists.refid/' . $idx ); ?>
+			<?php foreach ($this->get('productData/catalog.lists.id', []) as $idx => $listId) : ?>
+				<?php $siteId = $this->get('productData/catalog.lists.siteid/' . $idx); ?>
+				<?php $refId = $this->get('productData/catalog.lists.refid/' . $idx); ?>
 
-				<tr class="list-item <?= $this->site()->readonly( $siteId ); ?>">
-					<?php if( in_array( 'catalog.lists.position', $fields ) ) : ?>
+				<tr class="list-item <?= $this->site()->readonly($siteId); ?>">
+					<?php if (in_array('catalog.lists.position', $fields)) : ?>
 						<td class="catalog-lists-position">
-							<input class="form-control item-position" type="number" step="1" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'catalog.lists.position', '' ) ) ); ?>"
-								value="<?= $enc->attr( $this->get( 'productData/catalog.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', 'catalog.lists.position', ''))); ?>"
+								value="<?= $enc->attr($this->get('productData/catalog.lists.position/' . $idx)); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.status', $fields ) ) : ?>
+					<?php if (in_array('catalog.lists.status', $fields)) : ?>
 						<td class="catalog-lists-status">
-							<select class="form-control custom-select item-status" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'catalog.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', 'catalog.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/catalog.lists.status/' . $idx, 1 ), 1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:1' ) ); ?>
+								<option value="1" <?= $selected($this->get('productData/catalog.lists.status/' . $idx, 1), 1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:1')); ?>
 								</option>
-								<option value="0" <?= $selected( $this->get( 'productData/catalog.lists.status/' . $idx, 1 ), 0 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:0' ) ); ?>
+								<option value="0" <?= $selected($this->get('productData/catalog.lists.status/' . $idx, 1), 0); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:0')); ?>
 								</option>
-								<option value="-1" <?= $selected( $this->get( 'productData/catalog.lists.status/' . $idx, 1 ), -1 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-1' ) ); ?>
+								<option value="-1" <?= $selected($this->get('productData/catalog.lists.status/' . $idx, 1), -1); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-1')); ?>
 								</option>
-								<option value="-2" <?= $selected( $this->get( 'productData/catalog.lists.status/' . $idx, 1 ), -2 ); ?> >
-									<?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?>
+								<option value="-2" <?= $selected($this->get('productData/catalog.lists.status/' . $idx, 1), -2); ?> >
+									<?= $enc->html($this->translate('mshop/code', 'status:-2')); ?>
 								</option>
 							</select>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.type', $fields ) ) : ?>
+					<?php if (in_array('catalog.lists.type', $fields)) : ?>
 						<td class="catalog-lists-type">
-							<select class="form-control custom-select item-type" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'catalog.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', 'catalog.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 $type => $item ) : ?>
-									<option value="<?= $enc->attr( $type ); ?>" <?= $selected( $this->get( 'productData/catalog.lists.type/' . $idx ), $type ); ?> >
-										<?= $enc->html( $type ); ?>
+								<?php foreach ($this->get('productListTypes', []) as $type => $item) : ?>
+									<option value="<?= $enc->attr($type); ?>" <?= $selected($this->get('productData/catalog.lists.type/' . $idx), $type); ?> >
+										<?= $enc->html($type); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.config', $fields ) ) : ?>
+					<?php if (in_array('catalog.lists.config', $fields)) : ?>
 						<td class="catalog-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', 'catalog.lists.config', '' ) ) ); ?>"
-									value="<?= $enc->attr( json_encode( $this->get( 'productData/catalog.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', 'catalog.lists.config', ''))); ?>"
+									value="<?= $enc->attr(json_encode($this->get('productData/catalog.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">
@@ -330,12 +330,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>
@@ -343,55 +343,55 @@ 
 							</div>
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.datestart', $fields ) ) : ?>
+					<?php if (in_array('catalog.lists.datestart', $fields)) : ?>
 						<td class="catalog-lists-datestart">
-							<input class="form-control item-datestart" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'catalog.lists.datestart', '' ) ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'productData/catalog.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', 'catalog.lists.datestart', ''))); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('productData/catalog.lists.datestart/' . $idx))); ?>"
+								<?= $this->site()->readonly($siteId); ?> disabled="disabled" />
 						</td>
 					<?php endif; ?>
-					<?php if( in_array( 'catalog.lists.dateend', $fields ) ) : ?>
+					<?php if (in_array('catalog.lists.dateend', $fields)) : ?>
 						<td class="catalog-lists-dateend">
-							<input class="form-control item-dateend" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'catalog.lists.dateend', '' ) ) ); ?>"
-								value="<?= $enc->attr( str_replace( ' ', 'T', $this->get( 'productData/catalog.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', 'catalog.lists.dateend', ''))); ?>"
+								value="<?= $enc->attr(str_replace(' ', 'T', $this->get('productData/catalog.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( 'catalog.lists.refid', $fields ) ) : ?>
+					<?php if (in_array('catalog.lists.refid', $fields)) : ?>
 						<td class="catalog-lists-refid">
 							<input class="form-control item-refid" type="hidden"
-								name="<?= $enc->attr( $this->formparam( array( 'product', 'catalog.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', 'catalog.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', 'catalog.lists.id', '' ) ) ); ?>" />
+						<input type="hidden" value="<?= $enc->attr($listId); ?>" disabled="disabled"
+							name="<?= $enc->attr($this->formparam(array('product', 'catalog.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' => 'catalog/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' => 'catalog/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>
@@ -400,17 +400,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' ),
-			'group' => 'cp', 'action' => ( $this->param( 'id') ? 'get' : 'search' ), 'fragment' => 'product',
-			'page' => $this->session( 'aimeos/admin/jqadm/catalogproduct/page', [] )]
+			$this->config('admin/jqadm/partial/pagination', 'common/partials/pagination-standard'),
+			['pageParams' => $params, 'pos' => 'bottom', 'total' => $this->get('productTotal'),
+			'group' => 'cp', 'action' => ($this->param('id') ? 'get' : 'search'), 'fragment' => 'product',
+			'page' => $this->session('aimeos/admin/jqadm/catalogproduct/page', [])]
 		);
 	?>
 
 </div>
-<?= $this->get( 'productBody' ); ?>
+<?= $this->get('productBody'); ?>

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

Spacing +6 added lines, -6 removed lines

@@ -6,16 +6,16 @@
  */
 
 $enc = $this->encoder();
-$list = $this->get( 'info', [] );
+$list = $this->get('info', []);
 
 ?>
-<?php if( !empty( $list ) ) : ?>
+<?php if (!empty($list)) : ?>
 	<ul class="info-list alert alert-info" role="alert">
-		<?php	foreach( $list as $key => $entry ) : ?>
-			<li class="info-item" data-key="<?= $enc->attr( $key ); ?>">
+		<?php	foreach ($list as $key => $entry) : ?>
+			<li class="info-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', 'Info' ) ); ?></span>
-				<?= $enc->html( $entry ); ?>
+				<span class="sr-only"><?= $enc->html($this->translate('admin', 'Info')); ?></span>
+				<?= $enc->html($entry); ?>
 			</li>
 		<?php	endforeach; ?>
 	</ul>

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

Spacing +15 added lines, -15 removed lines

@@ -12,36 +12,36 @@
  * - params: Associative list of current parameters
  */
 
-$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', []);
 
-$params = $this->get( 'params', [] );
-unset( $params['id'] );
+$params = $this->get('params', []);
+unset($params['id']);
 
 $enc = $this->encoder();
 
 
 ?>
 <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, $params, [], $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, $params, [], $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="copy"><?= $enc->html( $this->translate( 'admin', 'Save & Copy' ) ); ?></a></li>
-		<li class="dropdown-item"><a class="next-action" href="#" data-next="create"><?= $enc->html( $this->translate( 'admin', 'Save & New' ) ); ?></a></li>
+		<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="copy"><?= $enc->html($this->translate('admin', 'Save & Copy')); ?></a></li>
+		<li class="dropdown-item"><a class="next-action" href="#" data-next="create"><?= $enc->html($this->translate('admin', 'Save & New')); ?></a></li>
 	</ul>
 </div>

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

Spacing +14 added lines, -14 removed lines

@@ -16,31 +16,31 @@
  */
 
 
-$checked = function( array $list, $code ) {
-	return ( in_array( $code, $list ) ? 'checked="checked"' : '' );
+$checked = function(array $list, $code) {
+	return (in_array($code, $list) ? 'checked="checked"' : '');
 };
 
 
 $enc = $this->encoder();
-$fields = $this->get( 'fields', [] );
-$names = array_merge( (array) $this->get( 'group', [] ), ['fields', ''] );
+$fields = $this->get('fields', []);
+$names = array_merge((array) $this->get('group', []), ['fields', '']);
 
 
 ?>
 <div class="dropdown filter-columns">
-	<button class="btn act-columns fa" type="button" id="dropdownMenuButton-<?= $this->get( 'group' ) ?>"
-		data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" tabindex="<?= $this->get( 'tabindex', 1 ); ?>"
-		aria-label="<?= $enc->attr( $this->translate( 'admin', 'Columns' ) ); ?>"
-		title="<?= $enc->attr( $this->translate( 'admin', 'Columns') ); ?>">
+	<button class="btn act-columns fa" type="button" id="dropdownMenuButton-<?= $this->get('group') ?>"
+		data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" tabindex="<?= $this->get('tabindex', 1); ?>"
+		aria-label="<?= $enc->attr($this->translate('admin', 'Columns')); ?>"
+		title="<?= $enc->attr($this->translate('admin', 'Columns')); ?>">
 	</button>
-	<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<?= $this->get( 'group' ) ?>">
-		<?php foreach( $this->get( 'data', [] ) as $key => $name ) : ?>
+	<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<?= $this->get('group') ?>">
+		<?php foreach ($this->get('data', []) as $key => $name) : ?>
 			<li class="dropdown-item">
 				<a href="#"><label>
-					<input type="checkbox" tabindex="<?= $this->get( 'tabindex', 1 ); ?>"
-						name="<?= $enc->attr( $this->formparam( $names ) ); ?>"
-						value="<?= $enc->attr( $key ); ?>" <?= $checked( $fields, $key ); ?> />
-					<?= $enc->html( $name ); ?>
+					<input type="checkbox" tabindex="<?= $this->get('tabindex', 1); ?>"
+						name="<?= $enc->attr($this->formparam($names)); ?>"
+						value="<?= $enc->attr($key); ?>" <?= $checked($fields, $key); ?> />
+					<?= $enc->html($name); ?>
 				</label></a>
 			</li>
 		<?php endforeach; ?>

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>