aimeos / ai-admin-jqadm

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

Spacing +6 added lines, -6 removed lines

@@ -6,16 +6,16 @@
  */
 
 $enc = $this->encoder();
-$errors = $this->get( 'errors', array() );
+$errors = $this->get('errors', array());
 
 ?>
-<?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="<?php echo $enc->attr( $key ); ?>">
+<?php	foreach ($errors as $key => $error) : ?>
+	<li class="error-item" data-key="<?php echo $enc->attr($key); ?>">
 		<span class="fa fa-exclamation-circle" aria-hidden="true"></span>
-		<span class="sr-only"><?php echo $enc->html( $this->translate( 'admin', 'Error' ) ); ?></span>
-		<?php echo $enc->html( $error ); ?>
+		<span class="sr-only"><?php echo $enc->html($this->translate('admin', 'Error')); ?></span>
+		<?php echo $enc->html($error); ?>
 	</li>
 <?php	endforeach; ?>
 </ul>

admin/jqadm/templates/common/partials/confirm-default.php

Spacing +5 added lines, -5 removed lines

@@ -12,15 +12,15 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Close' ) ); ?>"><span aria-hidden="true">&times;</span></button>
-				<h4 class="modal-title"><?php echo $enc->html( $this->translate( 'admin', 'Delete items?' ) ); ?></h4>
+				<button type="button" class="close" data-dismiss="modal" aria-label="<?php echo $enc->attr($this->translate('admin', 'Close')); ?>"><span aria-hidden="true">&times;</span></button>
+				<h4 class="modal-title"><?php echo $enc->html($this->translate('admin', 'Delete items?')); ?></h4>
 			</div>
 			<div class="modal-body">
-				<p><?php echo $enc->html( $this->translate( 'admin', 'You are going to delete one or more items. Would you like to proceed?' ) ); ?></p>
+				<p><?php echo $enc->html($this->translate('admin', 'You are going to delete one or more items. Would you like to proceed?')); ?></p>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn btn-danger" data-dismiss="modal"><?php echo $enc->html( $this->translate( 'admin', 'Delete' ) ); ?></button>
-				<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo $enc->html( $this->translate( 'admin', 'Close' ) ); ?></button>
+				<button type="button" class="btn btn-danger" data-dismiss="modal"><?php echo $enc->html($this->translate('admin', 'Delete')); ?></button>
+				<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo $enc->html($this->translate('admin', 'Close')); ?></button>
 			</div>
 		</div>
 	</div>

admin/jqadm/templates/common/partials/filter-default.php

Spacing +34 added lines, -34 removed lines

@@ -7,72 +7,72 @@
 
 $enc = $this->encoder();
 
-$operators = $this->get( 'operators', array() );
-$operators = ( isset( $operators['compare'] ) ? $operators['compare'] : array() );
+$operators = $this->get('operators', array());
+$operators = (isset($operators['compare']) ? $operators['compare'] : array());
 
 $operatorMap = array(
-	'=~' => array( 'string' ),
-	'~=' => array( 'string' ),
-	'>' => array( 'date', 'datetime', 'integer', 'float' ),
-	'>=' => array( 'date', 'datetime', 'integer', 'float' ),
-	'<' => array( 'date', 'datetime', 'integer', 'float' ),
-	'<=' => array( 'date', 'datetime', 'integer', 'float' ),
-	'==' => array( 'boolean', 'date', 'datetime', 'integer', 'float', 'string' ),
-	'!=' => array( 'boolean', 'date', 'datetime', 'integer', 'float', 'string' ),
+	'=~' => array('string'),
+	'~=' => array('string'),
+	'>' => array('date', 'datetime', 'integer', 'float'),
+	'>=' => array('date', 'datetime', 'integer', 'float'),
+	'<' => array('date', 'datetime', 'integer', 'float'),
+	'<=' => array('date', 'datetime', 'integer', 'float'),
+	'==' => array('boolean', 'date', 'datetime', 'integer', 'float', 'string'),
+	'!=' => array('boolean', 'date', 'datetime', 'integer', 'float', 'string'),
 );
 
-$filter = $this->param( 'filter' );
+$filter = $this->param('filter');
 
-if( !isset( $filter['key'][0] ) ) {
-	$filter['key'][0] = $this->get( 'default', '' );
+if (!isset($filter['key'][0])) {
+	$filter['key'][0] = $this->get('default', '');
 }
 
-$cnt = count( (array) $filter['key'] );
+$cnt = count((array) $filter['key']);
 
 ?>
 <table class="filter-items search-item">
-<?php for( $pos = 0; $pos < $cnt; $pos++ ) : ?>
+<?php for ($pos = 0; $pos < $cnt; $pos++) : ?>
 	<tr class="input-group filter-item">
 		<td>
-<?php	if( $pos < $cnt - 1 ) : ?>
-			<div class="fa fa-minus" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Remove filter' ) ); ?>"></div>
+<?php	if ($pos < $cnt - 1) : ?>
+			<div class="fa fa-minus" aria-label="<?php echo $enc->attr($this->translate('admin', 'Remove filter')); ?>"></div>
 <?php	else : ?>
-			<div class="fa fa-plus" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Add filter' ) ); ?>"></div>
+			<div class="fa fa-plus" aria-label="<?php echo $enc->attr($this->translate('admin', 'Add filter')); ?>"></div>
 <?php	endif; ?>
 		</td>
 		<td>
 			<fieldset>
-				<select name="<?php echo $this->formparam( array( 'filter', 'key', '' ) ); ?>" class="filter-key form-control" data-selected="<?php echo $filter['key'][$pos]; ?>">
+				<select name="<?php echo $this->formparam(array('filter', 'key', '')); ?>" class="filter-key form-control" data-selected="<?php echo $filter['key'][$pos]; ?>">
 				</select><!--
-				--><select name="<?php echo $this->formparam( array( 'filter', 'op', '' ) ); ?>" class="filter-operator form-control c-select">
-<?php foreach( $operators as $code ) : ?>
-					<option value="<?php echo $enc->attr( $code ); ?>"
-						class="<?php echo ( isset( $operatorMap[$code] ) ? implode( ' ', $operatorMap[$code] ) : '' ); ?>"
-						<?php echo ( isset( $filter['op'][$pos] ) && $filter['op'][$pos] === $code ? 'selected' : '' ); ?>
-					><?php echo $enc->html( $this->translate( 'admin/ext', $code ) ); ?></option>
+				--><select name="<?php echo $this->formparam(array('filter', 'op', '')); ?>" class="filter-operator form-control c-select">
+<?php foreach ($operators as $code) : ?>
+					<option value="<?php echo $enc->attr($code); ?>"
+						class="<?php echo (isset($operatorMap[$code]) ? implode(' ', $operatorMap[$code]) : ''); ?>"
+						<?php echo (isset($filter['op'][$pos]) && $filter['op'][$pos] === $code ? 'selected' : ''); ?>
+					><?php echo $enc->html($this->translate('admin/ext', $code)); ?></option>
 <?php endforeach; ?>
 				</select><!--
-				--><input name="<?php echo $this->formparam( array( 'filter', 'val', '' ) ); ?>" class="filter-value form-control" type="text" value="<?php echo $enc->attr( ( isset( $filter['val'][$pos] ) ? $filter['val'][$pos] : '' ) ); ?>" />
+				--><input name="<?php echo $this->formparam(array('filter', 'val', '')); ?>" class="filter-value form-control" type="text" value="<?php echo $enc->attr((isset($filter['val'][$pos]) ? $filter['val'][$pos] : '')); ?>" />
 			</fieldset>
 		</td>
 	</tr>
 <?php endfor; ?>
 	<tr class="input-group prototype">
 		<td>
-			<div class="fa fa-plus" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Add filter' ) ); ?>"></div>
+			<div class="fa fa-plus" aria-label="<?php echo $enc->attr($this->translate('admin', 'Add filter')); ?>"></div>
 		</td>
 		<td>
 			<fieldset>
-				<select name="<?php echo $this->formparam( array( 'filter', 'key', '' ) ); ?>" class="filter-key form-control" data-selected="<?php echo $this->get( 'default' ); ?>" disabled="disabled">
+				<select name="<?php echo $this->formparam(array('filter', 'key', '')); ?>" class="filter-key form-control" data-selected="<?php echo $this->get('default'); ?>" disabled="disabled">
 				</select><!--
-				--><select name="<?php echo $this->formparam( array( 'filter', 'op', '' ) ); ?>" class="filter-operator form-control c-select" disabled="disabled">
-<?php foreach( $operators as $code ) : ?>
-					<option value="<?php echo $enc->attr( $code ); ?>"
-						class="<?php echo ( isset( $operatorMap[$code] ) ? implode( ' ', $operatorMap[$code] ) : '' ); ?>"
-					><?php echo $enc->html( $this->translate( 'admin/ext', $code ) ); ?></option>
+				--><select name="<?php echo $this->formparam(array('filter', 'op', '')); ?>" class="filter-operator form-control c-select" disabled="disabled">
+<?php foreach ($operators as $code) : ?>
+					<option value="<?php echo $enc->attr($code); ?>"
+						class="<?php echo (isset($operatorMap[$code]) ? implode(' ', $operatorMap[$code]) : ''); ?>"
+					><?php echo $enc->html($this->translate('admin/ext', $code)); ?></option>
 <?php endforeach; ?>
 				</select><!--
-				--><input name="<?php echo $this->formparam( array( 'filter', 'val', '' ) ); ?>" class="filter-value form-control" type="text" disabled="disabled" />
+				--><input name="<?php echo $this->formparam(array('filter', 'val', '')); ?>" class="filter-value form-control" type="text" disabled="disabled" />
 			</fieldset>
 		</td>
 	</tr>

Braces +5 added lines, -2 removed lines

@@ -36,8 +36,11 @@
 		<td>
 <?php	if( $pos < $cnt - 1 ) : ?>
 			<div class="fa fa-minus" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Remove filter' ) ); ?>"></div>
-<?php	else : ?>
-			<div class="fa fa-plus" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Add filter' ) ); ?>"></div>
+<?php	else {
+	: ?>
+			<div class="fa fa-plus" aria-label="<?php echo $enc->attr( $this->translate( 'admin', 'Add filter' ) );
+}
+?>"></div>
 <?php	endif; ?>
 		</td>
 		<td>

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

Spacing +25 added lines, -25 removed lines

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

admin/jqadm/templates/product/item-selection-default.php

Spacing +33 added lines, -33 removed lines

@@ -12,48 +12,48 @@ 
 	<div id="product-item-selection-head" class="header card-header collapsed" role="tab"
 		data-toggle="collapse" data-parent="#accordion" data-target="#product-item-selection-data"
 		aria-expanded="true" aria-controls="product-item-selection-data">
-		<?php echo $enc->html( $this->translate( 'admin', 'Variants' ) ); ?>
+		<?php echo $enc->html($this->translate('admin', 'Variants')); ?>
 	</div>
 	<div id="product-item-selection-data" class="item-selection card-block panel-collapse collapse"
 		role="tabpanel" aria-labelledby="product-item-selection-head">
 		<div id="product-item-selection-group" role="tablist" aria-multiselectable="true">
 
-<?php foreach( (array) $this->get( 'selectionData', array() ) as $code => $map ) : ?>
+<?php foreach ((array) $this->get('selectionData', array()) as $code => $map) : ?>
 
 			<div class="group-item card">
-				<input class="item-listid" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'product.lists.id', '' ) ) ); ?>"
-					value="<?php echo $enc->attr( $this->value( $map, 'product.lists.id' ) ); ?>" />
-				<div id="product-item-selection-group-item-<?php echo $enc->attr( $code ); ?>" class="header card-header collapsed" role="tab"
-					data-toggle="collapse" data-target="#product-item-selection-group-data-<?php echo $enc->attr( $code ); ?>"
-					aria-expanded="true" aria-controls="product-item-selection-group-data-<?php echo $enc->attr( $code ); ?>">
+				<input class="item-listid" type="hidden" name="<?php echo $enc->attr($this->formparam(array('selection', 'product.lists.id', ''))); ?>"
+					value="<?php echo $enc->attr($this->value($map, 'product.lists.id')); ?>" />
+				<div id="product-item-selection-group-item-<?php echo $enc->attr($code); ?>" class="header card-header collapsed" role="tab"
+					data-toggle="collapse" data-target="#product-item-selection-group-data-<?php echo $enc->attr($code); ?>"
+					aria-expanded="true" aria-controls="product-item-selection-group-data-<?php echo $enc->attr($code); ?>">
 					<div class="btn btn-secondary fa fa-files-o"></div>
 					<div class="btn btn-danger fa fa-trash"></div>
-					<span class="item-code header-label"><?php echo $enc->html( $code ); ?></span>
+					<span class="item-code header-label"><?php echo $enc->html($code); ?></span>
 				</div>
-				<div id="product-item-selection-group-data-<?php echo $enc->attr( $code ); ?>" class="card-block panel-collapse collapse">
+				<div id="product-item-selection-group-data-<?php echo $enc->attr($code); ?>" class="card-block panel-collapse collapse">
 					<div class="col-lg-6">
 						<div class="form-group row">
-							<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'ID' ) ); ?></label>
+							<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'ID')); ?></label>
 							<div class="col-sm-9">
-								<input class="item-id" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'product.id', '' ) ) ); ?>"
-									value="<?php echo $enc->attr( $this->value( $map, 'product.id' ) ); ?>" />
-								<p class="form-control-static group-item-id"><?php echo $enc->html( $this->value( $map, 'product.id' ) ); ?></p>
+								<input class="item-id" type="hidden" name="<?php echo $enc->attr($this->formparam(array('selection', 'product.id', ''))); ?>"
+									value="<?php echo $enc->attr($this->value($map, 'product.id')); ?>" />
+								<p class="form-control-static group-item-id"><?php echo $enc->html($this->value($map, 'product.id')); ?></p>
 							</div>
 						</div>
 						<div class="form-group row mandatory">
-							<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label>
+							<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Code')); ?></label>
 							<div class="col-sm-9">
-								<input class="form-control item-code" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'product.code', '' ) ) ); ?>"
-									placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'EAN, SKU or article number (required)' ) ); ?>"
-									value="<?php echo $enc->attr( $code ); ?>">
+								<input class="form-control item-code" type="text" name="<?php echo $enc->attr($this->formparam(array('selection', 'product.code', ''))); ?>"
+									placeholder="<?php echo $enc->attr($this->translate('admin', 'EAN, SKU or article number (required)')); ?>"
+									value="<?php echo $enc->attr($code); ?>">
 							</div>
 						</div>
 						<div class="form-group row mandatory">
-							<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+							<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Label')); ?></label>
 							<div class="col-sm-9">
-								<input class="form-control item-label" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'product.label', '' ) ) ); ?>"
-									placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'Internal name (required)' ) ); ?>"
-									value="<?php echo $enc->attr( $this->value( $map, 'product.label' ) ); ?>">
+								<input class="form-control item-label" type="text" name="<?php echo $enc->attr($this->formparam(array('selection', 'product.label', ''))); ?>"
+									placeholder="<?php echo $enc->attr($this->translate('admin', 'Internal name (required)')); ?>"
+									value="<?php echo $enc->attr($this->value($map, 'product.label')); ?>">
 							</div>
 						</div>
 					</div>
@@ -61,20 +61,20 @@ 
 						<table class="selection-item-attributes table table-default">
 							<thead>
 								<tr>
-									<th><?php echo $enc->html( $this->translate( 'admin', 'Variant attributes' ) ); ?></th>
+									<th><?php echo $enc->html($this->translate('admin', 'Variant attributes')); ?></th>
 									<th class="actions"><div class="btn btn-primary fa fa-plus"></div></th>
 								</tr>
 							</thead>
 							<tbody>
-<?php foreach( (array) $this->value( $map, 'attr', array() ) as $attrid => $list ) : ?>
+<?php foreach ((array) $this->value($map, 'attr', array()) as $attrid => $list) : ?>
 								<tr>
 									<td>
-										<input class="item-attr-ref" type="hidden" value="<?php echo $enc->attr( $code ); ?>"
-											name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'attr', 'ref', '' ) ) ); ?>" />
-										<input class="item-attr-label" type="hidden" value="<?php echo $enc->attr( $this->value( $list, 'label' ) ); ?>"
-											name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'attr', 'label', '' ) ) ); ?>" />
-										<select class="combobox item-attr-id" name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'attr', 'id', '' ) ) ); ?>">
-											<option value="<?php echo $enc->attr( $attrid ); ?>" ><?php echo $enc->html( $this->value( $list, 'label' ) ); ?></option>
+										<input class="item-attr-ref" type="hidden" value="<?php echo $enc->attr($code); ?>"
+											name="<?php echo $enc->attr($this->formparam(array('selection', 'attr', 'ref', ''))); ?>" />
+										<input class="item-attr-label" type="hidden" value="<?php echo $enc->attr($this->value($list, 'label')); ?>"
+											name="<?php echo $enc->attr($this->formparam(array('selection', 'attr', 'label', ''))); ?>" />
+										<select class="combobox item-attr-id" name="<?php echo $enc->attr($this->formparam(array('selection', 'attr', 'id', ''))); ?>">
+											<option value="<?php echo $enc->attr($attrid); ?>" ><?php echo $enc->html($this->value($list, 'label')); ?></option>
 										</select>
 									</td>
 									<td class="actions"><div class="btn btn-danger fa fa-trash"></div></td>
@@ -82,9 +82,9 @@ 
 <?php endforeach; ?>
 								<tr class="prototype">
 									<td>
-										<input class="item-attr-ref" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'attr', 'ref', '' ) ) ); ?>" value="" disabled="disabled" />
-										<input class="item-attr-label" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'attr', 'label', '' ) ) ); ?>" value="" disabled="disabled" />
-										<select class="combobox-prototype item-attr-id" name="<?php echo $enc->attr( $this->formparam( array( 'selection', 'attr', 'id', '' ) ) ); ?>" disabled="disabled"></select>
+										<input class="item-attr-ref" type="hidden" name="<?php echo $enc->attr($this->formparam(array('selection', 'attr', 'ref', ''))); ?>" value="" disabled="disabled" />
+										<input class="item-attr-label" type="hidden" name="<?php echo $enc->attr($this->formparam(array('selection', 'attr', 'label', ''))); ?>" value="" disabled="disabled" />
+										<select class="combobox-prototype item-attr-id" name="<?php echo $enc->attr($this->formparam(array('selection', 'attr', 'id', ''))); ?>" disabled="disabled"></select>
 									</td>
 									<td class="actions"><div class="btn btn-danger fa fa-trash"></div></td>
 								</tr>
@@ -97,6 +97,6 @@ 
 <?php endforeach; ?>
 
 		</div>
-<?php echo $this->get( 'selectionBody' ); ?>
+<?php echo $this->get('selectionBody'); ?>
 	</div>
 </div>

admin/jqadm/templates/product/item-physical-default.php

Spacing +21 added lines, -21 removed lines

@@ -5,10 +5,10 @@ 
  * @copyright Aimeos (aimeos.org), 2015
  */
 
-$items = $this->get( 'physicalItems', array() );
+$items = $this->get('physicalItems', array());
 
-$value = function( $type ) use ( $items ) {
-	return ( isset( $items[$type] ) ? $items[$type]->getValue() : '' );
+$value = function($type) use ($items) {
+	return (isset($items[$type]) ? $items[$type]->getValue() : '');
 };
 
 $enc = $this->encoder();
@@ -16,45 +16,45 @@ 
 ?>
 <div class="product-item-physical card panel">
 	<div id="product-item-physical" class="header card-header collapsed" role="tab" data-toggle="collapse" data-parent="#accordion" data-target="#product-item-physical-data" aria-expanded="false" aria-controls="product-item-physical-data">
-		<?php echo $enc->html( $this->translate( 'admin', 'Physical values' ) ); ?>
+		<?php echo $enc->html($this->translate('admin', 'Physical values')); ?>
 	</div>
 	<div id="product-item-physical-data" class="item-physical card-block panel-collapse collapse" role="tabpanel" aria-labelledby="product-item-physical">
 		<div class="col-lg-6">
 			<div class="form-group row optional">
-				<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Length' ) ); ?></label>
+				<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Length')); ?></label>
 				<div class="col-sm-9">
-					<input class="form-control item-package-length" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'physical', 'package-length' ) ) ); ?>"
-						placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'Product length, e.g. 30.0 (in yard, inch, etc.)' ) ); ?>"
-						value="<?php echo $enc->attr( $this->param( 'physical/package-length', $value( 'package-length' ) ) ); ?>" >
+					<input class="form-control item-package-length" type="text" name="<?php echo $enc->attr($this->formparam(array('physical', 'package-length'))); ?>"
+						placeholder="<?php echo $enc->attr($this->translate('admin', 'Product length, e.g. 30.0 (in yard, inch, etc.)')); ?>"
+						value="<?php echo $enc->attr($this->param('physical/package-length', $value('package-length'))); ?>" >
 				</div>
 			</div>
 			<div class="form-group row optional">
-				<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Width' ) ); ?></label>
+				<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Width')); ?></label>
 				<div class="col-sm-9">
-					<input class="form-control item-package-width" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'physical', 'package-width' ) ) ); ?>"
-						placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'Product width, e.g. 17.5 (in yard, inch etc.)' ) ); ?>"
-						value="<?php echo $enc->attr( $this->param( 'physical/package-width', $value( 'package-width' ) ) ); ?>" >
+					<input class="form-control item-package-width" type="text" name="<?php echo $enc->attr($this->formparam(array('physical', 'package-width'))); ?>"
+						placeholder="<?php echo $enc->attr($this->translate('admin', 'Product width, e.g. 17.5 (in yard, inch etc.)')); ?>"
+						value="<?php echo $enc->attr($this->param('physical/package-width', $value('package-width'))); ?>" >
 				</div>
 			</div>
 			<div class="form-group row optional">
-				<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Height' ) ); ?></label>
+				<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Height')); ?></label>
 				<div class="col-sm-9">
-					<input class="form-control item-package-height" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'physical', 'package-height' ) ) ); ?>"
-						placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'Product height, e.g. 20.0 (in yard, inch, etc.)' ) ); ?>"
-						value="<?php echo $enc->attr( $this->param( 'physical/package-height', $value( 'package-height' ) ) ); ?>" >
+					<input class="form-control item-package-height" type="text" name="<?php echo $enc->attr($this->formparam(array('physical', 'package-height'))); ?>"
+						placeholder="<?php echo $enc->attr($this->translate('admin', 'Product height, e.g. 20.0 (in yard, inch, etc.)')); ?>"
+						value="<?php echo $enc->attr($this->param('physical/package-height', $value('package-height'))); ?>" >
 				</div>
 			</div>
 		</div>
 		<div class="col-lg-6">
 			<div class="form-group row optional">
-				<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Weight' ) ); ?></label>
+				<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Weight')); ?></label>
 				<div class="col-sm-9">
-					<input class="form-control item-package-weight" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'physical', 'package-weight' ) ) ); ?>"
-						placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'Product weight, e.g. 1.25 (in pound, ounce, etc.)' ) ); ?>"
-						value="<?php echo $enc->attr( $this->param( 'physical/package-weight', $value( 'package-weight' ) ) ); ?>" >
+					<input class="form-control item-package-weight" type="text" name="<?php echo $enc->attr($this->formparam(array('physical', 'package-weight'))); ?>"
+						placeholder="<?php echo $enc->attr($this->translate('admin', 'Product weight, e.g. 1.25 (in pound, ounce, etc.)')); ?>"
+						value="<?php echo $enc->attr($this->param('physical/package-weight', $value('package-weight'))); ?>" >
 				</div>
 			</div>
 		</div>
-<?php echo $this->get( 'physicalBody' ); ?>
+<?php echo $this->get('physicalBody'); ?>
 	</div>
 </div>

admin/jqadm/templates/product/item-characteristic-default.php

Spacing +2 added lines, -2 removed lines

@@ -10,9 +10,9 @@
 ?>
 <div class="product-item-characteristic card panel">
 	<div id="product-item-characteristic" class="header card-header collapsed" role="tab" data-toggle="collapse" data-parent="#accordion" data-target="#product-item-characteristic-data" aria-expanded="false" aria-controls="product-item-characteristic-data">
-		<?php echo $enc->html( $this->translate( 'admin', 'Characteristics' ) ); ?>
+		<?php echo $enc->html($this->translate('admin', 'Characteristics')); ?>
 	</div>
 	<div id="product-item-characteristic-data" class="item-characteristic card-block panel-collapse collapse" role="tabpanel" aria-labelledby="product-item-characteristic">
-<?php echo $this->get( 'characteristicBody' ); ?>
+<?php echo $this->get('characteristicBody'); ?>
 	</div>
 </div>

admin/jqadm/templates/product/item-default.php

Spacing +58 added lines, -58 removed lines

@@ -5,99 +5,99 @@ 
  * @copyright Aimeos (aimeos.org), 2015
  */
 
-$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', array() );
+$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', array());
 
-$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', array() );
+$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', array());
 
-$params = $this->get( 'pageParams', array() );
-$params['id'] = $this->param( 'id', '' );
+$params = $this->get('pageParams', array());
+$params['id'] = $this->param('id', '');
 
 ?>
-<?php $this->block()->start( 'jqadm_content' ); ?>
+<?php $this->block()->start('jqadm_content'); ?>
 
-<form class="item item-product form-horizontal" method="POST" enctype="multipart/form-data" action="<?php echo $enc->attr( $this->url( $target, $cntl, $action, $params, array(), $config ) ); ?>">
+<form class="item item-product form-horizontal" method="POST" enctype="multipart/form-data" action="<?php echo $enc->attr($this->url($target, $cntl, $action, $params, array(), $config)); ?>">
 <?php echo $this->csrf()->formfield(); ?>
 
 	<div id="accordion" role="tablist" aria-multiselectable="true">
 
 		<div class="product-item card panel">
 			<div id="product-item" class="header card-header" role="tab" data-toggle="collapse" data-parent="#accordion" data-target="#product-item-data" aria-expanded="true" aria-controls="product-item-data">
-				<?php echo $enc->html( $this->translate( 'admin', 'Basic' ) ); ?> <span class="item-label"> - <?php echo $enc->html( $this->get( 'itemData/product.label' ) ); ?></span>
+				<?php echo $enc->html($this->translate('admin', 'Basic')); ?> <span class="item-label"> - <?php echo $enc->html($this->get('itemData/product.label')); ?></span>
 			</div>
 			<div id="product-item-data" class="item-basic card-block panel-collapse collapse in" role="tabpanel" aria-labelledby="product-item">
 				<div class="col-lg-6">
 					<div class="form-group row">
-						<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'ID' ) ); ?></label>
+						<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'ID')); ?></label>
 						<div class="col-sm-9">
-							<input class="item-id" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'product.id' ) ) ); ?>" value="<?php echo $enc->attr( $this->get( 'itemData/product.id' ) ); ?>" />
-							<p class="form-control-static item-id"><?php echo $enc->attr( $this->get( 'itemData/product.id' ) ); ?></p>
+							<input class="item-id" type="hidden" name="<?php echo $enc->attr($this->formparam(array('item', 'product.id'))); ?>" value="<?php echo $enc->attr($this->get('itemData/product.id')); ?>" />
+							<p class="form-control-static item-id"><?php echo $enc->attr($this->get('itemData/product.id')); ?></p>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Status' ) ); ?></label>
+						<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Status')); ?></label>
 						<div class="col-sm-9">
-							<select class="form-control c-select item-status" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'product.status' ) ) ); ?>">
-								<option value="1" <?php echo $selected( $this->get( 'itemData/product.status', 1 ), 1 ); ?>><?php echo $enc->html( $this->translate( 'admin', 'status:enabled' ) ); ?></option>
-								<option value="0" <?php echo $selected( $this->get( 'itemData/product.status', 1 ), 0 ); ?>><?php echo $enc->html( $this->translate( 'admin', 'status:disabled' ) ); ?></option>
-								<option value="-1" <?php echo $selected( $this->get( 'itemData/product.status', 1 ), -1 ); ?>><?php echo $enc->html( $this->translate( 'admin', 'status:review' ) ); ?></option>
-								<option value="-2" <?php echo $selected( $this->get( 'itemData/product.status', 1 ), -2 ); ?>><?php echo $enc->html( $this->translate( 'admin', 'status:archive' ) ); ?></option>
+							<select class="form-control c-select item-status" name="<?php echo $enc->attr($this->formparam(array('item', 'product.status'))); ?>">
+								<option value="1" <?php echo $selected($this->get('itemData/product.status', 1), 1); ?>><?php echo $enc->html($this->translate('admin', 'status:enabled')); ?></option>
+								<option value="0" <?php echo $selected($this->get('itemData/product.status', 1), 0); ?>><?php echo $enc->html($this->translate('admin', 'status:disabled')); ?></option>
+								<option value="-1" <?php echo $selected($this->get('itemData/product.status', 1), -1); ?>><?php echo $enc->html($this->translate('admin', 'status:review')); ?></option>
+								<option value="-2" <?php echo $selected($this->get('itemData/product.status', 1), -2); ?>><?php echo $enc->html($this->translate('admin', 'status:archive')); ?></option>
 							</select>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Type' ) ); ?></label>
+						<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Type')); ?></label>
 						<div class="col-sm-9">
-							<select class="form-control c-select item-typeid" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'product.typeid' ) ) ); ?>">
-<?php foreach( $this->get( 'itemTypes', array() ) as $id => $typeItem ) : ?>
-								<option value="<?php echo $enc->attr( $id ); ?>" data-code="<?php echo $enc->attr( $typeItem->getCode() ); ?>" <?php echo $selected( $this->get( 'itemData/product.typeid' ), $id ); ?>><?php echo $enc->html( $typeItem->getLabel() ); ?></option>
+							<select class="form-control c-select item-typeid" name="<?php echo $enc->attr($this->formparam(array('item', 'product.typeid'))); ?>">
+<?php foreach ($this->get('itemTypes', array()) as $id => $typeItem) : ?>
+								<option value="<?php echo $enc->attr($id); ?>" data-code="<?php echo $enc->attr($typeItem->getCode()); ?>" <?php echo $selected($this->get('itemData/product.typeid'), $id); ?>><?php echo $enc->html($typeItem->getLabel()); ?></option>
 <?php endforeach; ?>
 							</select>
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Code' ) ); ?></label>
+						<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Code')); ?></label>
 						<div class="col-sm-9">
-							<input class="form-control item-code" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'product.code' ) ) ); ?>"
-								placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'EAN, SKU or article number (required)' ) ); ?>"
-								value="<?php echo $enc->attr( $this->get( 'itemData/product.code' ) ); ?>" />
+							<input class="form-control item-code" type="text" name="<?php echo $enc->attr($this->formparam(array('item', 'product.code'))); ?>"
+								placeholder="<?php echo $enc->attr($this->translate('admin', 'EAN, SKU or article number (required)')); ?>"
+								value="<?php echo $enc->attr($this->get('itemData/product.code')); ?>" />
 						</div>
 					</div>
 					<div class="form-group row mandatory">
-						<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Label' ) ); ?></label>
+						<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Label')); ?></label>
 						<div class="col-sm-9">
-							<input class="form-control item-label" type="text" name="<?php echo $this->formparam( array( 'item', 'product.label' ) ); ?>"
-								placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'Internal name (required)' ) ); ?>"
-								value="<?php echo $enc->attr( $this->get( 'itemData/product.label' ) ); ?>" />
+							<input class="form-control item-label" type="text" name="<?php echo $this->formparam(array('item', 'product.label')); ?>"
+								placeholder="<?php echo $enc->attr($this->translate('admin', 'Internal name (required)')); ?>"
+								value="<?php echo $enc->attr($this->get('itemData/product.label')); ?>" />
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-3 form-control-label"><?php echo $enc->html( $this->translate( 'admin', 'Start date' ) ); ?></label>
+						<label class="col-sm-3 form-control-label"><?php echo $enc->html($this->translate('admin', 'Start date')); ?></label>
 						<div class="col-sm-9">
-							<input class="form-control item-datestart date" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'product.datestart' ) ) ); ?>"
-								placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
-								value="<?php echo $enc->attr( $this->get( 'itemData/product.datestart' ) ); ?>"
-								data-format="<?php echo $this->translate( 'admin', 'yy-mm-dd' ); ?>" />
+							<input class="form-control item-datestart date" type="text" name="<?php echo $enc->attr($this->formparam(array('item', 'product.datestart'))); ?>"
+								placeholder="<?php echo $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
+								value="<?php echo $enc->attr($this->get('itemData/product.datestart')); ?>"
+								data-format="<?php echo $this->translate('admin', 'yy-mm-dd'); ?>" />
 						</div>
 					</div>
 					<div class="form-group row optional">
-						<label class="col-sm-3 control-label"><?php echo $enc->html( $this->translate( 'admin', 'End date' ) ); ?></label>
+						<label class="col-sm-3 control-label"><?php echo $enc->html($this->translate('admin', 'End date')); ?></label>
 						<div class="col-sm-9">
-							<input class="form-control item-dateend date" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'product.dateend' ) ) ); ?>"
-								placeholder="<?php echo $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
-								value="<?php echo $enc->attr( $this->get( 'itemData/product.dateend' ) ); ?>"
-								data-format="<?php echo $this->translate( 'admin', 'yy-mm-dd' ); ?>" />
+							<input class="form-control item-dateend date" type="text" name="<?php echo $enc->attr($this->formparam(array('item', 'product.dateend'))); ?>"
+								placeholder="<?php echo $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
+								value="<?php echo $enc->attr($this->get('itemData/product.dateend')); ?>"
+								data-format="<?php echo $this->translate('admin', 'yy-mm-dd'); ?>" />
 						</div>
 					</div>
 				</div>
@@ -105,22 +105,22 @@ 
 					<table class="item-config table table-striped">
 						<thead>
 							<tr>
-								<th><?php echo $enc->html( $this->translate( 'admin', 'Option' ) ); ?></th>
-								<th><?php echo $enc->html( $this->translate( 'admin', 'Value' ) ); ?></th>
+								<th><?php echo $enc->html($this->translate('admin', 'Option')); ?></th>
+								<th><?php echo $enc->html($this->translate('admin', 'Value')); ?></th>
 								<th class="actions"><div class="btn btn-primary fa fa-plus"></div></th>
 							</tr>
 						</thead>
 						<tbody>
-<?php	foreach( (array) $this->get( 'itemData/config/key', array() ) as $idx => $key ) : ?>
+<?php	foreach ((array) $this->get('itemData/config/key', array()) as $idx => $key) : ?>
 							<tr class="config-item">
-								<td><input type="text" class="config-key form-control" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>" value="<?php echo $enc->attr( $this->get( 'itemData/config/key/' . $idx, $key ) ); ?>" /></td>
-								<td><input type="text" class="config-value form-control" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" value="<?php echo $enc->attr( $this->get( 'itemData/config/val/' . $idx ) ); ?>" /></td>
+								<td><input type="text" class="config-key form-control" name="<?php echo $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>" value="<?php echo $enc->attr($this->get('itemData/config/key/' . $idx, $key)); ?>" /></td>
+								<td><input type="text" class="config-value form-control" name="<?php echo $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" value="<?php echo $enc->attr($this->get('itemData/config/val/' . $idx)); ?>" /></td>
 								<td class="actions"><div class="btn btn-danger fa fa-trash"></div></td>
 							</tr>
 <?php	endforeach; ?>
 							<tr class="prototype">
-								<td><input type="text" class="config-key form-control" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'config', 'key', '' ) ) ); ?>" value="" disabled="disabled" /></td>
-								<td><input type="text" class="config-value form-control" name="<?php echo $enc->attr( $this->formparam( array( 'item', 'config', 'val', '' ) ) ); ?>" value="" disabled="disabled" /></td>
+								<td><input type="text" class="config-key form-control" name="<?php echo $enc->attr($this->formparam(array('item', 'config', 'key', ''))); ?>" value="" disabled="disabled" /></td>
+								<td><input type="text" class="config-value form-control" name="<?php echo $enc->attr($this->formparam(array('item', 'config', 'val', ''))); ?>" value="" disabled="disabled" /></td>
 								<td class="actions"><div class="btn btn-danger fa fa-trash"></div></td>
 							</tr>
 						</tbody>
@@ -129,16 +129,16 @@ 
 			</div>
 		</div>
 
-<?php echo $this->get( 'itemBody' ); ?>
+<?php echo $this->get('itemBody'); ?>
 
 	</div>
 
 	<div class="actions-group">
 		<button class="btn btn-primary">
-			<?php echo $enc->html( $this->translate( 'admin', 'Save' ) ); ?>
+			<?php echo $enc->html($this->translate('admin', 'Save')); ?>
 		</button>
-		<a class="btn btn-warning" href="<?php echo $enc->attr( $this->url( $listTarget, $listCntl, $listAction, $params, array(), $listConfig ) ); ?>">
-			<?php echo $enc->html( $this->translate( 'admin', 'Cancel' ) ); ?>
+		<a class="btn btn-warning" href="<?php echo $enc->attr($this->url($listTarget, $listCntl, $listAction, $params, array(), $listConfig)); ?>">
+			<?php echo $enc->html($this->translate('admin', 'Cancel')); ?>
 		</a>
 	</div>
 </form>
@@ -146,4 +146,4 @@ 
 <?php $this->block()->stop(); ?>
 
 
-<?php echo $this->render( $this->config( 'admin/jqadm/template/page', 'common/page-default.php' ) ); ?>
+<?php echo $this->render($this->config('admin/jqadm/template/page', 'common/page-default.php')); ?>

admin/jqadm/templates/product/item-category-default.php

Spacing +34 added lines, -34 removed lines

@@ -10,31 +10,31 @@ 
 ?>
 <div class="product-item-category card panel">
 	<div id="product-item-category" class="header card-header collapsed" role="tab" data-toggle="collapse" data-parent="#accordion" data-target="#product-item-category-data" aria-expanded="false" aria-controls="product-item-category-data">
-		<?php echo $enc->html( $this->translate( 'admin', 'Categories' ) ); ?>
+		<?php echo $enc->html($this->translate('admin', 'Categories')); ?>
 	</div>
 	<div id="product-item-category-data" class="item-category card-block panel-collapse collapse" role="tabpanel" aria-labelledby="product-item-category">
 		<div class="col-lg-6">
 			<table class="category-list table table-default">
 				<thead>
 					<tr>
-						<th><?php echo $enc->html( $this->translate( 'admin', 'Default' ) ); ?></th>
+						<th><?php echo $enc->html($this->translate('admin', 'Default')); ?></th>
 						<th class="actions"><div class="btn btn-primary fa fa-plus"></div></th>
 					</tr>
 				</thead>
 				<tbody>
-<?php $listTypeId = $this->get( 'categoryListTypes/default' ); ?>
-<?php foreach( $this->get( 'categoryData/catalog.lists.id', array() ) as $idx => $id ) : ?>
-<?php 	if( $this->get( 'categoryData/catalog.lists.typeid/' . $idx ) == $listTypeId ) : ?>
+<?php $listTypeId = $this->get('categoryListTypes/default'); ?>
+<?php foreach ($this->get('categoryData/catalog.lists.id', array()) as $idx => $id) : ?>
+<?php 	if ($this->get('categoryData/catalog.lists.typeid/' . $idx) == $listTypeId) : ?>
 					<tr>
 						<td>
-							<input class="item-listtypeid" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.lists.typeid', '' ) ) ); ?>"
-								value="<?php echo $enc->attr( $listTypeId ); ?>" />
-							<input class="item-listid" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.lists.id', '' ) ) ); ?>"
-								value="<?php echo $enc->attr( $id ); ?>" />
-							<input class="item-label" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.label', '' ) ) ); ?>"
-								value="<?php echo $enc->attr( $this->get( 'categoryData/catalog.label/' . $idx ) ); ?>" />
-							<select class="combobox item-id" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.id', '' ) ) ); ?>">
-								<option value="<?php echo $enc->attr( $this->get( 'categoryData/catalog.id/' . $idx ) ); ?>" ><?php echo $enc->html( $this->get( 'categoryData/catalog.label/' . $idx ) ); ?></option>
+							<input class="item-listtypeid" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.lists.typeid', ''))); ?>"
+								value="<?php echo $enc->attr($listTypeId); ?>" />
+							<input class="item-listid" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.lists.id', ''))); ?>"
+								value="<?php echo $enc->attr($id); ?>" />
+							<input class="item-label" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.label', ''))); ?>"
+								value="<?php echo $enc->attr($this->get('categoryData/catalog.label/' . $idx)); ?>" />
+							<select class="combobox item-id" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.id', ''))); ?>">
+								<option value="<?php echo $enc->attr($this->get('categoryData/catalog.id/' . $idx)); ?>" ><?php echo $enc->html($this->get('categoryData/catalog.label/' . $idx)); ?></option>
 							</select>
 						</td>
 						<td class="actions"><div class="btn btn-danger fa fa-trash"></div></td>
@@ -43,10 +43,10 @@ 
 <?php endforeach; ?>
 					<tr class="prototype">
 						<td>
-							<input class="item-listtypeid" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.lists.typeid', '' ) ) ); ?>" value="<?php echo $enc->attr( $listTypeId ); ?>" disabled="disabled" />
-							<input class="item-listid" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.lists.id', '' ) ) ); ?>" value="" disabled="disabled" />
-							<input class="item-label" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.label', '' ) ) ); ?>" value="" disabled="disabled" />
-							<select class="combobox-prototype item-id" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.id', '' ) ) ); ?>" disabled="disabled">
+							<input class="item-listtypeid" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.lists.typeid', ''))); ?>" value="<?php echo $enc->attr($listTypeId); ?>" disabled="disabled" />
+							<input class="item-listid" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.lists.id', ''))); ?>" value="" disabled="disabled" />
+							<input class="item-label" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.label', ''))); ?>" value="" disabled="disabled" />
+							<select class="combobox-prototype item-id" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.id', ''))); ?>" disabled="disabled">
 							</select>
 						</td>
 						<td class="actions"><div class="btn btn-danger fa fa-trash"></div></td>
@@ -58,24 +58,24 @@ 
 			<table class="category-list table table-default">
 				<thead>
 					<tr>
-						<th><?php echo $enc->html( $this->translate( 'admin', 'Promotion' ) ); ?></th>
+						<th><?php echo $enc->html($this->translate('admin', 'Promotion')); ?></th>
 						<th class="actions"><div class="btn btn-primary fa fa-plus"></div></th>
 					</tr>
 				</thead>
 				<tbody>
-<?php $listTypeId = $this->get( 'categoryListTypes/promotion' ); ?>
-<?php foreach( $this->get( 'categoryData/catalog.lists.id', array() ) as $idx => $id ) : ?>
-<?php 	if( $this->get( 'categoryData/catalog.lists.typeid/' . $idx ) == $listTypeId ) : ?>
+<?php $listTypeId = $this->get('categoryListTypes/promotion'); ?>
+<?php foreach ($this->get('categoryData/catalog.lists.id', array()) as $idx => $id) : ?>
+<?php 	if ($this->get('categoryData/catalog.lists.typeid/' . $idx) == $listTypeId) : ?>
 					<tr>
 						<td>
-							<input class="item-listtypeid" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.lists.typeid', '' ) ) ); ?>"
-								value="<?php echo $enc->attr( $listTypeId ); ?>" />
-							<input class="item-listid" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.lists.id', '' ) ) ); ?>"
-								value="<?php echo $enc->attr( $id ); ?>" />
-							<input class="item-label" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.label', '' ) ) ); ?>"
-								value="<?php echo $enc->attr( $this->get( 'categoryData/catalog.label/' . $idx ) ); ?>" />
-							<select class="combobox item-id" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.id', '' ) ) ); ?>">
-								<option value="<?php echo $enc->attr( $this->get( 'categoryData/catalog.id/' . $idx ) ); ?>" ><?php echo $enc->html( $this->get( 'categoryData/catalog.label/' . $idx ) ); ?></option>
+							<input class="item-listtypeid" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.lists.typeid', ''))); ?>"
+								value="<?php echo $enc->attr($listTypeId); ?>" />
+							<input class="item-listid" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.lists.id', ''))); ?>"
+								value="<?php echo $enc->attr($id); ?>" />
+							<input class="item-label" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.label', ''))); ?>"
+								value="<?php echo $enc->attr($this->get('categoryData/catalog.label/' . $idx)); ?>" />
+							<select class="combobox item-id" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.id', ''))); ?>">
+								<option value="<?php echo $enc->attr($this->get('categoryData/catalog.id/' . $idx)); ?>" ><?php echo $enc->html($this->get('categoryData/catalog.label/' . $idx)); ?></option>
 							</select>
 						</td>
 						<td class="actions"><div class="btn btn-danger fa fa-trash"></div></td>
@@ -84,10 +84,10 @@ 
 <?php endforeach; ?>
 					<tr class="prototype">
 						<td>
-							<input class="item-listtypeid" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.lists.typeid', '' ) ) ); ?>" value="<?php echo $enc->attr( $listTypeId ); ?>" disabled="disabled" />
-							<input class="item-listid" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.lists.id', '' ) ) ); ?>" value="" disabled="disabled" />
-							<input class="item-label" type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.label', '' ) ) ); ?>" value="" disabled="disabled" />
-							<select class="combobox-prototype item-id" name="<?php echo $enc->attr( $this->formparam( array( 'category', 'catalog.id', '' ) ) ); ?>" disabled="disabled">
+							<input class="item-listtypeid" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.lists.typeid', ''))); ?>" value="<?php echo $enc->attr($listTypeId); ?>" disabled="disabled" />
+							<input class="item-listid" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.lists.id', ''))); ?>" value="" disabled="disabled" />
+							<input class="item-label" type="hidden" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.label', ''))); ?>" value="" disabled="disabled" />
+							<select class="combobox-prototype item-id" name="<?php echo $enc->attr($this->formparam(array('category', 'catalog.id', ''))); ?>" disabled="disabled">
 							</select>
 						</td>
 						<td class="actions"><div class="btn btn-danger fa fa-trash"></div></td>
@@ -95,6 +95,6 @@ 
 				</tbody>
 			</table>
 		</div>
-		<?php echo $this->get( 'categoryBody' ); ?>
+		<?php echo $this->get('categoryBody'); ?>
 	</div>
 </div>