aimeos / ai-admin-jqadm

admin/jqadm/templates/attribute/item-image-property-standard.php

Spacing +22 added lines, -22 removed lines

@@ -17,14 +17,14 @@ 
 		<thead>
 			<tr>
 				<th colspan="3">
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Media properties' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Media properties')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Non-shared properties for the media item' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Non-shared properties for the media item')); ?>
 					</div>
 				</th>
 				<th class="actions">
-					<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+					<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 						v-on:click="addPropertyItem(idx)">
 					</div>
 				</th>
@@ -37,48 +37,48 @@ 
 
 				<td class="property-type">
 					<input class="item-propertyid" type="hidden" v-bind:value="propdata['media.property.id']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.id' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
-					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.typeid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.id'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
+					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.typeid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.typeid']" >
 
-						<?php foreach( $this->get( 'propertyTypes', [] ) as $id => $item ) : ?>
-							<option value="<?= $enc->attr( $id ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr( $id ) ?>'" >
-								<?= $enc->html( $item->getLabel() ); ?>
+						<?php foreach ($this->get('propertyTypes', []) as $id => $item) : ?>
+							<option value="<?= $enc->attr($id); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr($id) ?>'" >
+								<?= $enc->html($item->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 
 					</select>
 				</td>
 				<td class="property-language">
-					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.languageid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.languageid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.languageid']" >
 
 						<option v-bind:value="null">
-							<?= $enc->html( $this->translate( 'admin', 'All' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'All')); ?>
 						</option>
 
-						<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-							<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-								<?= $enc->html( $langItem->getLabel() ); ?>
+						<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+							<option value="<?= $enc->attr($langId); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr($langId) ?>'" >
+								<?= $enc->html($langItem->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 					</select>
 				</td>
 				<td class="property-value">
-					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.value' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
-						placeholder="<?= $enc->attr( $this->translate( 'admin', 'Property value (required)' ) ); ?>"
+					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.value'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						placeholder="<?= $enc->attr($this->translate('admin', 'Property value (required)')); ?>"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.value']" >
 				</td>
 
 				<td class="actions">
-					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removePropertyItem(idx, propidx)">
 					</div>
 				</td>
@@ -87,6 +87,6 @@ 
 		</tbody>
 	</table>
 
-	<?= $this->get( 'propertyBody' ); ?>
+	<?= $this->get('propertyBody'); ?>
 
 </div>

admin/jqadm/src/Admin/JQAdm/Attribute/Image/Standard.php

Braces +2 added lines, -4 removed lines

@@ -138,14 +138,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +77 added lines, -77 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Attribute\Image;
 
-sprintf( 'image' ); // for translation
+sprintf('image'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, true );
+		$view->imageData = $this->toArray($view->item, true);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,13 +62,13 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
 
-		$itemData = $this->toArray( $view->item );
-		$data = array_replace_recursive( $itemData, $view->param( 'image', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('image', []));
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['media.siteid'] = $siteid;
 			$data[$idx]['media.url'] = $itemData[$idx]['media.url'];
@@ -79,11 +79,11 @@ 
 		$view->imageData = $data;
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -95,15 +95,15 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($this->getContext());
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 	}
 
@@ -115,16 +115,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item );
+		$view->imageData = $this->toArray($view->item);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('image', []));
 			$view->imageBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->imageBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'attribute-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-image' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'attribute-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('attribute-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -170,7 +170,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/attribute/image/decorators/excludes
 		 * Excludes decorators added by the "common" option from the attribute JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/attribute/image/decorators/excludes
 		 * @see admin/jqadm/attribute/image/decorators/global
 		 */
-		return $this->createSubClient( 'attribute/image/' . $type, $name );
+		return $this->createSubClient('attribute/image/' . $type, $name);
 	}
 
 
@@ -255,23 +255,23 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
 
-		$typeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute/lists/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute/lists/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'media.type.domain', 'attribute' ) );
-		$search->setSortations( array( $search->sort( '+', 'media.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'attribute'));
+		$search->setSortations(array($search->sort('+', 'media.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'attribute.lists.type.domain', 'media' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'attribute.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'attribute.lists.type.domain', 'media'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'attribute.lists.type.label')));
 
-		$view->imageListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->imageTypes = $typeManager->searchItems( $search );
+		$view->imageListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->imageTypes = $typeManager->searchItems($search);
 
 		return $view;
 	}
@@ -317,7 +317,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/attribute/image/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/attribute/image/standard/subparts', []);
 	}
 
 
@@ -327,59 +327,59 @@ 
 	 * @param \Aimeos\MShop\Attribute\Item\Iface $item Attribute item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Attribute\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Attribute\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$mediaManager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'attribute/lists' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
+		$mediaManager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'attribute/lists');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
 
-		$listItems = $item->getListItems( 'media', null, null, false );
+		$listItems = $item->getListItems('media', null, null, false);
 		$files = (array) $this->getView()->request()->getUploadedFiles();
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			if( ( $listItem = $item->getListItem( 'media', $entry['attribute.lists.type'], $entry['media.id'] ) ) === null ) {
+			if (($listItem = $item->getListItem('media', $entry['attribute.lists.type'], $entry['media.id'])) === null) {
 				$listItem = $listManager->createItem();
 			}
 
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				$refItem = $mediaManager->createItem();
 			}
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 
-			if( ( $file = $this->getValue( $files, 'image/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE ) {
-				$cntl->add( $refItem, $file );
+			if (($file = $this->getValue($files, 'image/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE) {
+				$cntl->add($refItem, $file);
 			}
 
 			$conf = [];
 
-			foreach( (array) $this->getValue( $entry, 'config/key' ) as $num => $key )
+			foreach ((array) $this->getValue($entry, 'config/key') as $num => $key)
 			{
-				if( trim( $key ) !== '' && ( $val = $this->getValue( $entry, 'config/val/' . $num ) ) !== null ) {
-					$conf[$key] = trim( $val );
+				if (trim($key) !== '' && ($val = $this->getValue($entry, 'config/val/' . $num)) !== null) {
+					$conf[$key] = trim($val);
 				}
 			}
 
-			$listItem->fromArray( $entry );
-			$listItem->setPosition( $idx );
-			$listItem->setConfig( $conf );
+			$listItem->fromArray($entry);
+			$listItem->setPosition($idx);
+			$listItem->setConfig($conf);
 
-			$item->addListItem( 'media', $listItem, $refItem );
+			$item->addListItem('media', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 
 		return $item;
@@ -393,20 +393,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Attribute\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Attribute\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['attribute.lists.siteid'] = $siteId;
 				$list['attribute.lists.id'] = '';
@@ -414,10 +414,10 @@ 
 				$list['media.id'] = null;
 			}
 
-			$list['attribute.lists.datestart'] = str_replace( ' ', 'T', $list['attribute.lists.datestart'] );
-			$list['attribute.lists.dateend'] = str_replace( ' ', 'T', $list['attribute.lists.dateend'] );
+			$list['attribute.lists.datestart'] = str_replace(' ', 'T', $list['attribute.lists.datestart']);
+			$list['attribute.lists.dateend'] = str_replace(' ', 'T', $list['attribute.lists.dateend']);
 
-			foreach( $list['attribute.lists.config'] as $key => $val )
+			foreach ($list['attribute.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -436,7 +436,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/attribute/image/template-item
 		 * Relative path to the HTML body template of the image subpart for attributes.
@@ -460,6 +460,6 @@ 
 		$tplconf = 'admin/jqadm/attribute/image/template-item';
 		$default = 'attribute/item-image-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/templates/catalog/item-image-property-standard.php

Spacing +22 added lines, -22 removed lines

@@ -17,14 +17,14 @@ 
 		<thead>
 			<tr>
 				<th colspan="3">
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Media properties' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Media properties')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Non-shared properties for the media item' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Non-shared properties for the media item')); ?>
 					</div>
 				</th>
 				<th class="actions">
-					<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+					<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 						v-on:click="addPropertyItem(idx)">
 					</div>
 				</th>
@@ -37,48 +37,48 @@ 
 
 				<td class="property-type">
 					<input class="item-propertyid" type="hidden" v-bind:value="propdata['media.property.id']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.id' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
-					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.typeid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.id'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
+					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.typeid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.typeid']" >
 
-						<?php foreach( $this->get( 'propertyTypes', [] ) as $id => $item ) : ?>
-							<option value="<?= $enc->attr( $id ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr( $id ) ?>'" >
-								<?= $enc->html( $item->getLabel() ); ?>
+						<?php foreach ($this->get('propertyTypes', []) as $id => $item) : ?>
+							<option value="<?= $enc->attr($id); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr($id) ?>'" >
+								<?= $enc->html($item->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 
 					</select>
 				</td>
 				<td class="property-language">
-					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.languageid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.languageid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.languageid']" >
 
 						<option v-bind:value="null">
-							<?= $enc->html( $this->translate( 'admin', 'All' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'All')); ?>
 						</option>
 
-						<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-							<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-								<?= $enc->html( $langItem->getLabel() ); ?>
+						<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+							<option value="<?= $enc->attr($langId); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr($langId) ?>'" >
+								<?= $enc->html($langItem->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 					</select>
 				</td>
 				<td class="property-value">
-					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.value' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
-						placeholder="<?= $enc->attr( $this->translate( 'admin', 'Property value (required)' ) ); ?>"
+					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.value'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						placeholder="<?= $enc->attr($this->translate('admin', 'Property value (required)')); ?>"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.value']" >
 				</td>
 
 				<td class="actions">
-					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removePropertyItem(idx, propidx)">
 					</div>
 				</td>
@@ -87,6 +87,6 @@ 
 		</tbody>
 	</table>
 
-	<?= $this->get( 'propertyBody' ); ?>
+	<?= $this->get('propertyBody'); ?>
 
 </div>

admin/jqadm/templates/supplier/item-image-property-standard.php

Spacing +22 added lines, -22 removed lines

@@ -17,14 +17,14 @@ 
 		<thead>
 			<tr>
 				<th colspan="3">
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Media properties' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Media properties')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Non-shared properties for the media item' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Non-shared properties for the media item')); ?>
 					</div>
 				</th>
 				<th class="actions">
-					<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+					<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 						v-on:click="addPropertyItem(idx)">
 					</div>
 				</th>
@@ -37,48 +37,48 @@ 
 
 				<td class="property-type">
 					<input class="item-propertyid" type="hidden" v-bind:value="propdata['media.property.id']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.id' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
-					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.typeid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.id'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
+					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.typeid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.typeid']" >
 
-						<?php foreach( $this->get( 'propertyTypes', [] ) as $id => $item ) : ?>
-							<option value="<?= $enc->attr( $id ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr( $id ) ?>'" >
-								<?= $enc->html( $item->getLabel() ); ?>
+						<?php foreach ($this->get('propertyTypes', []) as $id => $item) : ?>
+							<option value="<?= $enc->attr($id); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr($id) ?>'" >
+								<?= $enc->html($item->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 
 					</select>
 				</td>
 				<td class="property-language">
-					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.languageid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.languageid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.languageid']" >
 
 						<option v-bind:value="null">
-							<?= $enc->html( $this->translate( 'admin', 'All' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'All')); ?>
 						</option>
 
-						<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-							<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-								<?= $enc->html( $langItem->getLabel() ); ?>
+						<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+							<option value="<?= $enc->attr($langId); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr($langId) ?>'" >
+								<?= $enc->html($langItem->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 					</select>
 				</td>
 				<td class="property-value">
-					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.value' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
-						placeholder="<?= $enc->attr( $this->translate( 'admin', 'Property value (required)' ) ); ?>"
+					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.value'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						placeholder="<?= $enc->attr($this->translate('admin', 'Property value (required)')); ?>"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.value']" >
 				</td>
 
 				<td class="actions">
-					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removePropertyItem(idx, propidx)">
 					</div>
 				</td>
@@ -87,6 +87,6 @@ 
 		</tbody>
 	</table>
 
-	<?= $this->get( 'propertyBody' ); ?>
+	<?= $this->get('propertyBody'); ?>
 
 </div>

admin/jqadm/templates/service/item-image-property-standard.php

Spacing +22 added lines, -22 removed lines

@@ -17,14 +17,14 @@ 
 		<thead>
 			<tr>
 				<th colspan="3">
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Media properties' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Media properties')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Non-shared properties for the media item' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Non-shared properties for the media item')); ?>
 					</div>
 				</th>
 				<th class="actions">
-					<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+					<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 						v-on:click="addPropertyItem(idx)">
 					</div>
 				</th>
@@ -37,48 +37,48 @@ 
 
 				<td class="property-type">
 					<input class="item-propertyid" type="hidden" v-bind:value="propdata['media.property.id']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.id' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
-					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.typeid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.id'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
+					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.typeid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.typeid']" >
 
-						<?php foreach( $this->get( 'propertyTypes', [] ) as $id => $item ) : ?>
-							<option value="<?= $enc->attr( $id ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr( $id ) ?>'" >
-								<?= $enc->html( $item->getLabel() ); ?>
+						<?php foreach ($this->get('propertyTypes', []) as $id => $item) : ?>
+							<option value="<?= $enc->attr($id); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr($id) ?>'" >
+								<?= $enc->html($item->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 
 					</select>
 				</td>
 				<td class="property-language">
-					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.languageid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.languageid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.languageid']" >
 
 						<option v-bind:value="null">
-							<?= $enc->html( $this->translate( 'admin', 'All' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'All')); ?>
 						</option>
 
-						<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-							<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-								<?= $enc->html( $langItem->getLabel() ); ?>
+						<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+							<option value="<?= $enc->attr($langId); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr($langId) ?>'" >
+								<?= $enc->html($langItem->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 					</select>
 				</td>
 				<td class="property-value">
-					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.value' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
-						placeholder="<?= $enc->attr( $this->translate( 'admin', 'Property value (required)' ) ); ?>"
+					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.value'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						placeholder="<?= $enc->attr($this->translate('admin', 'Property value (required)')); ?>"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.value']" >
 				</td>
 
 				<td class="actions">
-					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removePropertyItem(idx, propidx)">
 					</div>
 				</td>
@@ -87,6 +87,6 @@ 
 		</tbody>
 	</table>
 
-	<?= $this->get( 'propertyBody' ); ?>
+	<?= $this->get('propertyBody'); ?>
 
 </div>

admin/jqadm/templates/product/item-image-property-standard.php

Spacing +22 added lines, -22 removed lines

@@ -17,14 +17,14 @@ 
 		<thead>
 			<tr>
 				<th colspan="3">
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Media properties' ) ); ?></span>
+					<span class="help"><?= $enc->html($this->translate('admin', 'Media properties')); ?></span>
 					<div class="form-text text-muted help-text">
-						<?= $enc->html( $this->translate( 'admin', 'Non-shared properties for the media item' ) ); ?>
+						<?= $enc->html($this->translate('admin', 'Non-shared properties for the media item')); ?>
 					</div>
 				</th>
 				<th class="actions">
-					<div class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
+					<div class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
 						v-on:click="addPropertyItem(idx)">
 					</div>
 				</th>
@@ -37,48 +37,48 @@ 
 
 				<td class="property-type">
 					<input class="item-propertyid" type="hidden" v-bind:value="propdata['media.property.id']"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.id' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
-					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.typeid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.id'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )" />
+					<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.typeid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.typeid']" >
 
-						<?php foreach( $this->get( 'propertyTypes', [] ) as $id => $item ) : ?>
-							<option value="<?= $enc->attr( $id ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr( $id ) ?>'" >
-								<?= $enc->html( $item->getLabel() ); ?>
+						<?php foreach ($this->get('propertyTypes', []) as $id => $item) : ?>
+							<option value="<?= $enc->attr($id); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.typeid'] == '<?= $enc->attr($id) ?>'" >
+								<?= $enc->html($item->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 
 					</select>
 				</td>
 				<td class="property-language">
-					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.languageid' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+					<select class="form-control custom-select item-languageid" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.languageid'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.languageid']" >
 
 						<option v-bind:value="null">
-							<?= $enc->html( $this->translate( 'admin', 'All' ) ); ?>
+							<?= $enc->html($this->translate('admin', 'All')); ?>
 						</option>
 
-						<?php foreach( $this->get( 'pageLangItems', [] ) as $langId => $langItem ) : ?>
-							<option value="<?= $enc->attr( $langId ); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr( $langId ) ?>'" >
-								<?= $enc->html( $langItem->getLabel() ); ?>
+						<?php foreach ($this->get('pageLangItems', []) as $langId => $langItem) : ?>
+							<option value="<?= $enc->attr($langId); ?>" v-bind:selected="items[idx]['property'][propidx]['media.property.languageid'] == '<?= $enc->attr($langId) ?>'" >
+								<?= $enc->html($langItem->getLabel()); ?>
 							</option>
 						<?php endforeach; ?>
 					</select>
 				</td>
 				<td class="property-value">
-					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						v-bind:name="'<?= $enc->attr( $this->formparam( array( 'image', 'idx', 'property', 'propidx', 'media.property.value' ) ) ); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
-						placeholder="<?= $enc->attr( $this->translate( 'admin', 'Property value (required)' ) ); ?>"
+					<input class="form-control item-value" type="text" required="required" tabindex="<?= $this->get('tabindex'); ?>"
+						v-bind:name="'<?= $enc->attr($this->formparam(array('image', 'idx', 'property', 'propidx', 'media.property.value'))); ?>'.replace( 'idx', idx ).replace( 'propidx', propidx )"
+						placeholder="<?= $enc->attr($this->translate('admin', 'Property value (required)')); ?>"
 						v-bind:readonly="checkSite('media.siteid', idx)"
 						v-model="items[idx]['property'][propidx]['media.property.value']" >
 				</td>
 
 				<td class="actions">
-					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
+					<div v-if="!checkSite('media.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
 						v-on:click.stop="removePropertyItem(idx, propidx)">
 					</div>
 				</td>
@@ -87,6 +87,6 @@ 
 		</tbody>
 	</table>
 
-	<?= $this->get( 'propertyBody' ); ?>
+	<?= $this->get('propertyBody'); ?>
 
 </div>

admin/jqadm/src/Admin/JQAdm/Service/Image/Standard.php

Braces +2 added lines, -4 removed lines

@@ -145,14 +145,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +77 added lines, -77 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Service\Image;
 
-sprintf( 'image' ); // for translation
+sprintf('image'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, true );
+		$view->imageData = $this->toArray($view->item, true);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,13 +62,13 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
 
-		$itemData = $this->toArray( $view->item );
-		$data = array_replace_recursive( $itemData, $view->param( 'image', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('image', []));
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['media.siteid'] = $siteid;
 			$data[$idx]['media.url'] = $itemData[$idx]['media.url'];
@@ -79,11 +79,11 @@ 
 		$view->imageData = $data;
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -95,15 +95,15 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($this->getContext());
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 	}
 
@@ -115,16 +115,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item );
+		$view->imageData = $this->toArray($view->item);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('image', []));
 			$view->imageBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->imageBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'service-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item-image' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'service-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('service-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -170,7 +170,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/service/image/decorators/excludes
 		 * Excludes decorators added by the "common" option from the service JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/service/image/decorators/excludes
 		 * @see admin/jqadm/service/image/decorators/global
 		 */
-		return $this->createSubClient( 'service/image/' . $type, $name );
+		return $this->createSubClient('service/image/' . $type, $name);
 	}
 
 
@@ -255,23 +255,23 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
 
-		$typeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service/lists/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service/lists/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'media.type.domain', 'service' ) );
-		$search->setSortations( array( $search->sort( '+', 'media.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'service'));
+		$search->setSortations(array($search->sort('+', 'media.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'service.lists.type.domain', 'media' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'service.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'service.lists.type.domain', 'media'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'service.lists.type.label')));
 
-		$view->imageListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->imageTypes = $typeManager->searchItems( $search );
+		$view->imageListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->imageTypes = $typeManager->searchItems($search);
 
 		return $view;
 	}
@@ -317,7 +317,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/service/image/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/service/image/standard/subparts', []);
 	}
 
 
@@ -327,59 +327,59 @@ 
 	 * @param \Aimeos\MShop\Service\Item\Iface $item Service item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Service\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Service\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$mediaManager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'service/lists' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
+		$mediaManager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'service/lists');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
 
-		$listItems = $item->getListItems( 'media', null, null, false );
+		$listItems = $item->getListItems('media', null, null, false);
 		$files = (array) $this->getView()->request()->getUploadedFiles();
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			if( ( $listItem = $item->getListItem( 'media', $entry['service.lists.type'], $entry['media.id'] ) ) === null ) {
+			if (($listItem = $item->getListItem('media', $entry['service.lists.type'], $entry['media.id'])) === null) {
 				$listItem = $listManager->createItem();
 			}
 
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				$refItem = $mediaManager->createItem();
 			}
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 
-			if( ( $file = $this->getValue( $files, 'image/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE ) {
-				$cntl->add( $refItem, $file );
+			if (($file = $this->getValue($files, 'image/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE) {
+				$cntl->add($refItem, $file);
 			}
 
 			$conf = [];
 
-			foreach( (array) $this->getValue( $entry, 'config/key' ) as $num => $key )
+			foreach ((array) $this->getValue($entry, 'config/key') as $num => $key)
 			{
-				if( trim( $key ) !== '' && ( $val = $this->getValue( $entry, 'config/val/' . $num ) ) !== null ) {
-					$conf[$key] = trim( $val );
+				if (trim($key) !== '' && ($val = $this->getValue($entry, 'config/val/' . $num)) !== null) {
+					$conf[$key] = trim($val);
 				}
 			}
 
-			$listItem->fromArray( $entry );
-			$listItem->setPosition( $idx );
-			$listItem->setConfig( $conf );
+			$listItem->fromArray($entry);
+			$listItem->setPosition($idx);
+			$listItem->setConfig($conf);
 
-			$item->addListItem( 'media', $listItem, $refItem );
+			$item->addListItem('media', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 
 		return $item;
@@ -393,20 +393,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Service\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Service\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['service.lists.siteid'] = $siteId;
 				$list['service.lists.id'] = '';
@@ -414,10 +414,10 @@ 
 				$list['media.id'] = null;
 			}
 
-			$list['service.lists.datestart'] = str_replace( ' ', 'T', $list['service.lists.datestart'] );
-			$list['service.lists.dateend'] = str_replace( ' ', 'T', $list['service.lists.dateend'] );
+			$list['service.lists.datestart'] = str_replace(' ', 'T', $list['service.lists.datestart']);
+			$list['service.lists.dateend'] = str_replace(' ', 'T', $list['service.lists.dateend']);
 
-			foreach( $list['service.lists.config'] as $key => $val )
+			foreach ($list['service.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -436,7 +436,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/service/image/template-item
 		 * Relative path to the HTML body template of the image subpart for services.
@@ -460,6 +460,6 @@ 
 		$tplconf = 'admin/jqadm/service/image/template-item';
 		$default = 'service/item-image-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Service/Image/Property/Standard.php

Braces +1 added lines, -2 removed lines

@@ -291,8 +291,7 @@
 				{
 					$propItem = $propItems[$entry['media.property.id']];
 					unset( $propItems[$entry['media.property.id']] );
-				}
-				else
+				} else
 				{
 					$propItem = $propManager->createItem();
 				}

Spacing +42 added lines, -42 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Service\Image\Property;
 
-sprintf( 'property' ); // for translation
+sprintf('property'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, $view->get( 'imageData', [] ), true );
+		$view->imageData = $this->toArray($view->item, $view->get('imageData', []), true);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,13 +62,13 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
-		$data = $view->get( 'imageData', [] );
+		$data = $view->get('imageData', []);
 
-		foreach( $data as $index => $entry )
+		foreach ($data as $index => $entry)
 		{
-			foreach( $view->value( $entry, 'property', [] ) as $idx => $y ) {
+			foreach ($view->value($entry, 'property', []) as $idx => $y) {
 				$data[$index]['property'][$idx]['service.lists.siteid'] = $siteid;
 			}
 		}
@@ -76,11 +76,11 @@ 
 		$view->propertyData = $data;
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -91,16 +91,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, $view->get( 'imageData', [] ) );
+		$view->imageData = $this->toArray($view->item, $view->get('imageData', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -111,10 +111,10 @@ 
 	{
 		$view = $this->getView();
 
-		$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+		$view->item = $this->fromArray($view->item, $view->param('image', []));
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->save();
 		}
 	}
@@ -127,7 +127,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/service/image/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the service JQAdm client
@@ -202,7 +202,7 @@ 
 		 * @see admin/jqadm/service/image/property/decorators/excludes
 		 * @see admin/jqadm/service/image/property/decorators/global
 		 */
-		return $this->createSubClient( 'service/image/property/' . $type, $name );
+		return $this->createSubClient('service/image/property/' . $type, $name);
 	}
 
 
@@ -212,15 +212,15 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/property/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/property/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'media.property.type.domain', 'service' ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('==', 'media.property.type.domain', 'service'));
+		$search->setSlice(0, 0x7fffffff);
 
-		$view->propertyTypes = $manager->searchItems( $search );
+		$view->propertyTypes = $manager->searchItems($search);
 
 		return $view;
 	}
@@ -266,7 +266,7 @@ 
 		 * @since 2018.01
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/service/image/property/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/service/image/property/standard/subparts', []);
 	}
 
 
@@ -276,32 +276,32 @@ 
 	 * @param \Aimeos\MShop\Service\Item\Iface $item Service item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Service\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Service\Item\Iface $item, array $data)
 	{
-		$propManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/property' );
+		$propManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/property');
 		$index = 0;
 
-		foreach( $item->getRefItems( 'media', null, null, false ) as $refItem )
+		foreach ($item->getRefItems('media', null, null, false) as $refItem)
 		{
-			$propItems = $refItem->getPropertyItems( null, false );
+			$propItems = $refItem->getPropertyItems(null, false);
 
-			foreach( (array) $this->getValue( $data, $index . '/property', [] ) as $entry )
+			foreach ((array) $this->getValue($data, $index . '/property', []) as $entry)
 			{
-				if( isset( $propItems[$entry['media.property.id']] ) )
+				if (isset($propItems[$entry['media.property.id']]))
 				{
 					$propItem = $propItems[$entry['media.property.id']];
-					unset( $propItems[$entry['media.property.id']] );
+					unset($propItems[$entry['media.property.id']]);
 				}
 				else
 				{
 					$propItem = $propManager->createItem();
 				}
 
-				$propItem->fromArray( $entry );
-				$refItem->addPropertyItem( $propItem );
+				$propItem->fromArray($entry);
+				$refItem->addPropertyItem($propItem);
 			}
 
-			$refItem->deletePropertyItems( $propItems );
+			$refItem->deletePropertyItems($propItems);
 			$index++;
 		}
 
@@ -317,18 +317,18 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Service\Item\Iface $item, array $data, $copy = false )
+	protected function toArray(\Aimeos\MShop\Service\Item\Iface $item, array $data, $copy = false)
 	{
 		$idx = 0;
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getRefItems( 'media', null, null, false ) as $mediaItem )
+		foreach ($item->getRefItems('media', null, null, false) as $mediaItem)
 		{
-			foreach( $mediaItem->getPropertyItems( null, false )  as $propItem )
+			foreach ($mediaItem->getPropertyItems(null, false)  as $propItem)
 			{
-				$list = $propItem->toArray( true );
+				$list = $propItem->toArray(true);
 
-				if( $copy === true )
+				if ($copy === true)
 				{
 					$list['media.property.siteid'] = $siteId;
 					$list['media.property.id'] = '';
@@ -350,7 +350,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/service/image/property/template-item
 		 * Relative path to the HTML body template of the image subpart for services.
@@ -374,6 +374,6 @@ 
 		$tplconf = 'admin/jqadm/service/image/property/template-item';
 		$default = 'service/item-image-property-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file

admin/jqadm/src/Admin/JQAdm/Product/Image/Standard.php

Braces +2 added lines, -4 removed lines

@@ -145,14 +145,12 @@
 			}
 
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'product-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Spacing +94 added lines, -94 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace Aimeos\Admin\JQAdm\Product\Image;
 
-sprintf( 'image' ); // for translation
+sprintf('image'); // for translation
 
 
 /**
@@ -42,16 +42,16 @@ 
 	 */
 	public function copy()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item, true );
+		$view->imageData = $this->toArray($view->item, true);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->copy();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -62,13 +62,13 @@ 
 	 */
 	public function create()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 		$siteid = $this->getContext()->getLocale()->getSiteId();
 
-		$itemData = $this->toArray( $view->item );
-		$data = array_replace_recursive( $itemData, $view->param( 'image', [] ) );
+		$itemData = $this->toArray($view->item);
+		$data = array_replace_recursive($itemData, $view->param('image', []));
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
 			$data[$idx]['media.siteid'] = $siteid;
 			$data[$idx]['media.url'] = $itemData[$idx]['media.url'];
@@ -79,11 +79,11 @@ 
 		$view->imageData = $data;
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->create();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -95,15 +95,15 @@ 
 		parent::delete();
 
 		$item = $this->getView()->item;
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $this->getContext() );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($this->getContext());
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 	}
 
@@ -115,16 +115,16 @@ 
 	 */
 	public function get()
 	{
-		$view = $this->addViewData( $this->getView() );
+		$view = $this->addViewData($this->getView());
 
-		$view->imageData = $this->toArray( $view->item );
+		$view->imageData = $this->toArray($view->item);
 		$view->imageBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->imageBody .= $client->get();
 		}
 
-		return $this->render( $view );
+		return $this->render($view);
 	}
 
 
@@ -137,26 +137,26 @@ 
 
 		try
 		{
-			$view->item = $this->fromArray( $view->item, $view->param( 'image', [] ) );
+			$view->item = $this->fromArray($view->item, $view->param('image', []));
 			$view->imageBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->imageBody .= $client->save();
 			}
 
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-image' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-image' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$error = array( 'product-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
-			$view->errors = $view->get( 'errors', [] ) + $error;
-			$this->logException( $e );
+			$error = array('product-item-image' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine());
+			$view->errors = $view->get('errors', []) + $error;
+			$this->logException($e);
 		}
 
 		throw new \Aimeos\Admin\JQAdm\Exception();
@@ -170,7 +170,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/image/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -245,7 +245,7 @@ 
 		 * @see admin/jqadm/product/image/decorators/excludes
 		 * @see admin/jqadm/product/image/decorators/global
 		 */
-		return $this->createSubClient( 'product/image/' . $type, $name );
+		return $this->createSubClient('product/image/' . $type, $name);
 	}
 
 
@@ -257,24 +257,24 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Lists\Iface[] $attrListItems Product list items referencing variant attributes
 	 * @return \Aimeos\MShop\Media\Item\Iface Modified media item
 	 */
-	protected function addMediaAttributes( \Aimeos\MShop\Media\Item\Iface $mediaItem, array $attrListItems )
+	protected function addMediaAttributes(\Aimeos\MShop\Media\Item\Iface $mediaItem, array $attrListItems)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/lists' );
-		$listItems = $mediaItem->getListItems( 'attribute', 'variant', null, false );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/lists');
+		$listItems = $mediaItem->getListItems('attribute', 'variant', null, false);
 
-		foreach( $attrListItems as $listItem )
+		foreach ($attrListItems as $listItem)
 		{
-			if( ( $litem = $mediaItem->getListItem( 'attribute', 'variant', $listItem->getRefId() ) ) !== null )
+			if (($litem = $mediaItem->getListItem('attribute', 'variant', $listItem->getRefId())) !== null)
 			{
-				unset( $listItems[$litem->getId()] );
+				unset($listItems[$litem->getId()]);
 				continue;
 			}
 
-			$litem = $listManager->createItem( 'variant', 'attribute' )->setRefId( $listItem->getRefId() );
-			$mediaItem->addListItem( 'attribute', $litem );
+			$litem = $listManager->createItem('variant', 'attribute')->setRefId($listItem->getRefId());
+			$mediaItem->addListItem('attribute', $litem);
 		}
 
-		return $mediaItem->deleteListItems( $listItems );
+		return $mediaItem->deleteListItems($listItems);
 	}
 
 
@@ -284,23 +284,23 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface View object with assigned parameters
 	 */
-	protected function addViewData( \Aimeos\MW\View\Iface $view )
+	protected function addViewData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
 
-		$typeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media/type' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists/type' );
+		$typeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media/type');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists/type');
 
-		$search = $typeManager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'media.type.domain', 'product' ) );
-		$search->setSortations( array( $search->sort( '+', 'media.type.label' ) ) );
+		$search = $typeManager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'product'));
+		$search->setSortations(array($search->sort('+', 'media.type.label')));
 
-		$listSearch = $listTypeManager->createSearch( true )->setSlice( 0, 0x7fffffff );
-		$listSearch->setConditions( $listSearch->compare( '==', 'product.lists.type.domain', 'media' ) );
-		$listSearch->setSortations( array( $listSearch->sort( '+', 'product.lists.type.label' ) ) );
+		$listSearch = $listTypeManager->createSearch(true)->setSlice(0, 0x7fffffff);
+		$listSearch->setConditions($listSearch->compare('==', 'product.lists.type.domain', 'media'));
+		$listSearch->setSortations(array($listSearch->sort('+', 'product.lists.type.label')));
 
-		$view->imageListTypes = $this->sortType( $listTypeManager->searchItems( $listSearch ) );
-		$view->imageTypes = $typeManager->searchItems( $search );
+		$view->imageListTypes = $this->sortType($listTypeManager->searchItems($listSearch));
+		$view->imageTypes = $typeManager->searchItems($search);
 
 		return $view;
 	}
@@ -346,7 +346,7 @@ 
 		 * @since 2017.07
 		 * @category Developer
 		 */
-		return $this->getContext()->getConfig()->get( 'admin/jqadm/product/image/standard/subparts', [] );
+		return $this->getContext()->getConfig()->get('admin/jqadm/product/image/standard/subparts', []);
 	}
 
 
@@ -356,66 +356,66 @@ 
 	 * @param \Aimeos\MShop\Product\Item\Iface $item Product item object without referenced domain items
 	 * @param string[] $data Data array
 	 */
-	protected function fromArray( \Aimeos\MShop\Product\Item\Iface $item, array $data )
+	protected function fromArray(\Aimeos\MShop\Product\Item\Iface $item, array $data)
 	{
 		$context = $this->getContext();
 
-		$mediaManager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$mediaTypeManager = \Aimeos\MShop\Factory::createManager( $context, 'media/type' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
+		$mediaManager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$mediaTypeManager = \Aimeos\MShop\Factory::createManager($context, 'media/type');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
 
-		$listItems = $item->getListItems( 'media', null, null, false );
+		$listItems = $item->getListItems('media', null, null, false);
 		$files = (array) $this->getView()->request()->getUploadedFiles();
 
-		foreach( $data as $idx => $entry )
+		foreach ($data as $idx => $entry)
 		{
-			$type = $mediaTypeManager->getItem( $entry['media.typeid'] )->getCode();
-			$listType = $listTypeManager->getItem( $entry['product.lists.typeid'] )->getCode();
+			$type = $mediaTypeManager->getItem($entry['media.typeid'])->getCode();
+			$listType = $listTypeManager->getItem($entry['product.lists.typeid'])->getCode();
 
-			if( ( $listItem = $item->getListItem( 'media', $listType, $entry['media.id'] ) ) === null ) {
-				$listItem = $listManager->createItem( $listType, 'media' );
+			if (($listItem = $item->getListItem('media', $listType, $entry['media.id'])) === null) {
+				$listItem = $listManager->createItem($listType, 'media');
 			}
 
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
-				$refItem = $mediaManager->createItem( $type, 'product' );
+			if (($refItem = $listItem->getRefItem()) === null) {
+				$refItem = $mediaManager->createItem($type, 'product');
 			}
 
-			$refItem->fromArray( $entry );
+			$refItem->fromArray($entry);
 
-			if( ( $file = $this->getValue( $files, 'image/' . $idx . '/file' ) ) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE ) {
-				$cntl->add( $refItem, $file );
+			if (($file = $this->getValue($files, 'image/' . $idx . '/file')) !== null && $file->getError() !== UPLOAD_ERR_NO_FILE) {
+				$cntl->add($refItem, $file);
 			}
 
 			$conf = [];
 
-			foreach( (array) $this->getValue( $entry, 'config/key' ) as $num => $key )
+			foreach ((array) $this->getValue($entry, 'config/key') as $num => $key)
 			{
-				if( trim( $key ) !== '' && ( $val = $this->getValue( $entry, 'config/val/' . $num ) ) !== null ) {
-					$conf[$key] = trim( $val );
+				if (trim($key) !== '' && ($val = $this->getValue($entry, 'config/val/' . $num)) !== null) {
+					$conf[$key] = trim($val);
 				}
 			}
 
-			$listItem->fromArray( $entry );
-			$listItem->setPosition( $idx );
-			$listItem->setConfig( $conf );
+			$listItem->fromArray($entry);
+			$listItem->setPosition($idx);
+			$listItem->setConfig($conf);
 
-			$attrListItems = $item->getListItems( 'attribute', 'variant', null, false );
-			$refItem = $this->addMediaAttributes( $refItem, $attrListItems );
-			$item->addListItem( 'media', $listItem, $refItem );
+			$attrListItems = $item->getListItems('attribute', 'variant', null, false);
+			$refItem = $this->addMediaAttributes($refItem, $attrListItems);
+			$item->addListItem('media', $listItem, $refItem);
 
-			unset( $listItems[$listItem->getId()] );
+			unset($listItems[$listItem->getId()]);
 		}
 
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$cntl->delete( $refItem );
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$cntl->delete($refItem);
 			}
 
-			$item->deleteListItem( 'media', $listItem, $refItem );
+			$item->deleteListItem('media', $listItem, $refItem);
 		}
 
 		return $item;
@@ -429,20 +429,20 @@ 
 	 * @param boolean $copy True if items should be copied, false if not
 	 * @return string[] Multi-dimensional associative list of item data
 	 */
-	protected function toArray( \Aimeos\MShop\Product\Item\Iface $item, $copy = false )
+	protected function toArray(\Aimeos\MShop\Product\Item\Iface $item, $copy = false)
 	{
 		$data = [];
 		$siteId = $this->getContext()->getLocale()->getSiteId();
 
-		foreach( $item->getListItems( 'media', null, null, false ) as $listItem )
+		foreach ($item->getListItems('media', null, null, false) as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) === null ) {
+			if (($refItem = $listItem->getRefItem()) === null) {
 				continue;
 			}
 
-			$list = $listItem->toArray( true ) + $refItem->toArray( true );
+			$list = $listItem->toArray(true) + $refItem->toArray(true);
 
-			if( $copy === true )
+			if ($copy === true)
 			{
 				$list['product.lists.siteid'] = $siteId;
 				$list['product.lists.id'] = '';
@@ -450,10 +450,10 @@ 
 				$list['media.id'] = null;
 			}
 
-			$list['product.lists.datestart'] = str_replace( ' ', 'T', $list['product.lists.datestart'] );
-			$list['product.lists.dateend'] = str_replace( ' ', 'T', $list['product.lists.dateend'] );
+			$list['product.lists.datestart'] = str_replace(' ', 'T', $list['product.lists.datestart']);
+			$list['product.lists.dateend'] = str_replace(' ', 'T', $list['product.lists.dateend']);
 
-			foreach( $list['product.lists.config'] as $key => $val )
+			foreach ($list['product.lists.config'] as $key => $val)
 			{
 				$list['config']['key'][] = $key;
 				$list['config']['val'][] = $val;
@@ -472,7 +472,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with data assigned
 	 * @return string HTML output
 	 */
-	protected function render( \Aimeos\MW\View\Iface $view )
+	protected function render(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jqadm/product/image/template-item
 		 * Relative path to the HTML body template of the image subpart for products.
@@ -496,6 +496,6 @@ 
 		$tplconf = 'admin/jqadm/product/image/template-item';
 		$default = 'product/item-image-standard.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 }
\ No newline at end of file