| @@ -74,7 +74,7 @@ discard block | ||
| 74 | 74 | * Creates a new resource | 
| 75 | 75 | * | 
| 76 | 76 | * @return string|null admin output to display or null for redirecting to the list | 
| 77 | - */ | |
| 77 | + */ | |
| 78 | 78 | public function create() | 
| 79 | 79 |  	{ | 
| 80 | 80 | return $this->client->create(); | 
| @@ -85,7 +85,7 @@ discard block | ||
| 85 | 85 | * Deletes a resource | 
| 86 | 86 | * | 
| 87 | 87 | * @return string|null admin output to display or null for redirecting to the list | 
| 88 | - */ | |
| 88 | + */ | |
| 89 | 89 | public function delete() | 
| 90 | 90 |  	{ | 
| 91 | 91 | return $this->client->delete(); | 
| @@ -96,7 +96,7 @@ discard block | ||
| 96 | 96 | * Returns a single resource | 
| 97 | 97 | * | 
| 98 | 98 | * @return string|null admin output to display or null for redirecting to the list | 
| 99 | - */ | |
| 99 | + */ | |
| 100 | 100 | public function get() | 
| 101 | 101 |  	{ | 
| 102 | 102 | return $this->client->get(); | 
| @@ -107,7 +107,7 @@ discard block | ||
| 107 | 107 | * Saves the data | 
| 108 | 108 | * | 
| 109 | 109 | * @return string|null admin output to display or null for redirecting to the list | 
| 110 | - */ | |
| 110 | + */ | |
| 111 | 111 | public function save() | 
| 112 | 112 |  	{ | 
| 113 | 113 | return $this->client->save(); | 
| @@ -118,7 +118,7 @@ discard block | ||
| 118 | 118 | * Returns a list of resource according to the conditions | 
| 119 | 119 | * | 
| 120 | 120 | * @return string admin output to display | 
| 121 | - */ | |
| 121 | + */ | |
| 122 | 122 | public function search() | 
| 123 | 123 |  	{ | 
| 124 | 124 | return $this->client->search(); | 
| @@ -35,8 +35,11 @@ | ||
| 35 | 35 | <?= $enc->html( $this->get( 'itemData/locale.id' ) ); ?> - | 
| 36 | 36 | <?php if( $this->get( 'itemData/locale.currencyid' ) ) : ?> | 
| 37 | 37 | <?= $enc->html( $this->get( 'itemData/locale.languageid' ) . '/' . $this->get( 'itemData/locale.currencyid' ) ); ?> | 
| 38 | - <?php else : ?> | |
| 39 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> | |
| 38 | +			<?php else { | |
| 39 | + : ?> | |
| 40 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); | |
| 41 | +} | |
| 42 | +?> | |
| 40 | 43 | <?php endif; ?> | 
| 41 | 44 | <span class="navbar-secondary">(<?= $enc->html( $this->site()->match( $this->get( 'itemData/locale.siteid' ) ) ); ?>)</span> | 
| 42 | 45 | </span> | 
| @@ -133,8 +133,11 @@ | ||
| 133 | 133 | </option> | 
| 134 | 134 | <?php endforeach; ?> | 
| 135 | 135 | </select> | 
| 136 | - <?php else : ?> | |
| 137 | - <?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); ?> | |
| 136 | +							<?php else { | |
| 137 | + : ?> | |
| 138 | + <?php $language = ( ( $item = reset( $languages ) ) !== false ? $item->getId() : '' ); | |
| 139 | +} | |
| 140 | +?> | |
| 138 | 141 | <input class="item-languageid" type="hidden" name="<?= $enc->attr( $this->formparam( array( 'item', 'customer.languageid' ) ) ); ?>" value="<?= $enc->attr( $language ); ?>" /> | 
| 139 | 142 | <?php endif; ?> | 
| 140 | 143 | </div> | 
| @@ -374,8 +374,11 @@ | ||
| 374 | 374 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> | 
| 375 | 375 |  									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> | 
| 376 | 376 | </a> | 
| 377 | - <?php else : ?> | |
| 378 | - <?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) | |
| 377 | +							<?php else { | |
| 378 | + : ?> | |
| 379 | + <?= $enc->html( $refId ); | |
| 380 | +} | |
| 381 | +?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) | |
| 379 | 382 | <?php endif; ?> | 
| 380 | 383 | </td> | 
| 381 | 384 | <?php endif; ?> | 
| @@ -374,8 +374,11 @@ | ||
| 374 | 374 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> | 
| 375 | 375 |  									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> | 
| 376 | 376 | </a> | 
| 377 | - <?php else : ?> | |
| 378 | - <?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) | |
| 377 | +							<?php else { | |
| 378 | + : ?> | |
| 379 | + <?= $enc->html( $refId ); | |
| 380 | +} | |
| 381 | +?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) | |
| 379 | 382 | <?php endif; ?> | 
| 380 | 383 | </td> | 
| 381 | 384 | <?php endif; ?> | 
| @@ -39,8 +39,7 @@ | ||
| 39 | 39 | $controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); | 
| 40 | 40 | $action = $this->config( 'admin/jqadm/url/get/action', 'get' ); | 
| 41 | 41 | $config = $this->config( 'admin/jqadm/url/get/config', [] ); | 
| 42 | -} | |
| 43 | -else | |
| 42 | +} else | |
| 44 | 43 |  { | 
| 45 | 44 | $target = $this->config( 'admin/jqadm/url/search/target' ); | 
| 46 | 45 | $controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); | 
| @@ -161,7 +161,6 @@ | ||
| 161 | 161 | * | 
| 162 | 162 | * You can add, remove or reorder the links in the navigation bar by | 
| 163 | 163 | * setting a new list of client resource names. | 
| 164 | - | |
| 165 | 164 | * In the configuration files of extensions, you should only add entries using | 
| 166 | 165 | * one of these lines: | 
| 167 | 166 | * | 
| @@ -262,8 +262,11 @@ discard block | ||
| 262 | 262 | <?php foreach( $this->pageSiteList as $siteItem ) : ?> | 
| 263 | 263 | <?php if( $siteItem->getId() === $this->pageSiteTree->getId() ) : ?> | 
| 264 | 264 | <?php $siteFcn( $this->pageSiteTree ); ?> | 
| 265 | - <?php else : ?> | |
| 266 | - <?php $siteFcn( $siteItem ); ?> | |
| 265 | +								<?php else { | |
| 266 | + : ?> | |
| 267 | + <?php $siteFcn( $siteItem ); | |
| 268 | +} | |
| 269 | +?> | |
| 267 | 270 | <?php endif; ?> | 
| 268 | 271 | <?php endforeach; ?> | 
| 269 | 272 | </ul> | 
| @@ -295,9 +298,12 @@ discard block | ||
| 295 | 298 | </li> | 
| 296 | 299 | |
| 297 | 300 | <?php endif; ?> | 
| 298 | - <?php else : ?> | |
| 301 | +					<?php else { | |
| 302 | + : ?> | |
| 299 | 303 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> | 
| 300 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> | |
| 304 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); | |
| 305 | +} | |
| 306 | +?> | |
| 301 | 307 | |
| 302 | 308 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> | 
| 303 | 309 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" | 
| @@ -344,10 +350,13 @@ discard block | ||
| 344 | 350 | </li> | 
| 345 | 351 | |
| 346 | 352 | <?php endif; ?> | 
| 347 | - <?php else : ?> | |
| 353 | +					<?php else { | |
| 354 | + : ?> | |
| 348 | 355 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> | 
| 349 | 356 | |
| 350 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> | |
| 357 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); | |
| 358 | +} | |
| 359 | +?> | |
| 351 | 360 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> | 
| 352 | 361 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" | 
| 353 | 362 | title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>" | 
| @@ -374,8 +374,11 @@ | ||
| 374 | 374 | aria-label="<?= $enc->attr( $this->translate( 'admin', 'Show' ) ); ?>"> | 
| 375 | 375 |  									<?= $enc->html( $refId ); ?> - <?= $enc->html( $refItem->getLabel() . ' (' . $refItem->getCode() . ')' ); ?> | 
| 376 | 376 | </a> | 
| 377 | - <?php else : ?> | |
| 378 | - <?= $enc->html( $refId ); ?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) | |
| 377 | +							<?php else { | |
| 378 | + : ?> | |
| 379 | + <?= $enc->html( $refId ); | |
| 380 | +} | |
| 381 | +?> (<?= $enc->html( $this->translate( 'admin', 'not available any more' ) ); ?>) | |
| 379 | 382 | <?php endif; ?> | 
| 380 | 383 | </td> | 
| 381 | 384 | <?php endif; ?> | 
| @@ -305,8 +305,7 @@ | ||
| 305 | 305 |  			{ | 
| 306 | 306 | $propItem = $propItems[$entry['product.property.id']]; | 
| 307 | 307 | unset( $propItems[$entry['product.property.id']] ); | 
| 308 | - } | |
| 309 | - else | |
| 308 | + } else | |
| 310 | 309 |  			{ | 
| 311 | 310 | $propItem = $manager->createItem(); | 
| 312 | 311 | } |