@@ -95,8 +95,7 @@ |
||
95 | 95 | $textStock[$level], |
96 | 96 | date_create( $date )->format( $dateFormat ) |
97 | 97 | ); |
98 | - } |
|
99 | - else |
|
98 | + } else |
|
100 | 99 | { |
101 | 100 | $text = sprintf( $textStockIn, |
102 | 101 | $typeText[$stockType], |
@@ -146,8 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | $html = $view->render( $view->config( $tplconf, $default ) ); |
148 | 148 | $this->setBasketCached( $key, $html ); |
149 | - } |
|
150 | - else |
|
149 | + } else |
|
151 | 150 | { |
152 | 151 | $html = $this->modifyBody( $html, $uid ); |
153 | 152 | } |
@@ -216,8 +215,7 @@ discard block |
||
216 | 215 | { |
217 | 216 | $this->logException( $e ); |
218 | 217 | } |
219 | - } |
|
220 | - else |
|
218 | + } else |
|
221 | 219 | { |
222 | 220 | $html = $this->modifyHeader( $html, $uid ); |
223 | 221 | } |
@@ -102,22 +102,22 @@ |
||
102 | 102 | catch( \Aimeos\Client\Html\Exception $e ) |
103 | 103 | { |
104 | 104 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
105 | - $view->miniErrorList = array_merge($view->get( 'miniErrorList', [] ), $error); |
|
105 | + $view->miniErrorList = array_merge( $view->get( 'miniErrorList', [] ), $error ); |
|
106 | 106 | } |
107 | 107 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
108 | 108 | { |
109 | 109 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
110 | - $view->miniErrorList = array_merge($view->get( 'miniErrorList', [] ), $error); |
|
110 | + $view->miniErrorList = array_merge( $view->get( 'miniErrorList', [] ), $error ); |
|
111 | 111 | } |
112 | 112 | catch( \Aimeos\MShop\Exception $e ) |
113 | 113 | { |
114 | 114 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
115 | - $view->miniErrorList = array_merge($view->get( 'miniErrorList', [] ), $error); |
|
115 | + $view->miniErrorList = array_merge( $view->get( 'miniErrorList', [] ), $error ); |
|
116 | 116 | } |
117 | 117 | catch( \Exception $e ) |
118 | 118 | { |
119 | 119 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
120 | - $view->miniErrorList = array_merge($view->get( 'miniErrorList', [] ), $error); |
|
120 | + $view->miniErrorList = array_merge( $view->get( 'miniErrorList', [] ), $error ); |
|
121 | 121 | $this->logException( $e ); |
122 | 122 | } |
123 | 123 |
@@ -190,8 +190,7 @@ discard block |
||
190 | 190 | } |
191 | 191 | |
192 | 192 | $html = $view->render( $view->config( $tplconf, $default ) ); |
193 | - } |
|
194 | - else |
|
193 | + } else |
|
195 | 194 | { |
196 | 195 | $html = $this->modifyBody( $html, $uid ); |
197 | 196 | } |
@@ -261,8 +260,7 @@ discard block |
||
261 | 260 | { |
262 | 261 | $this->logException( $e ); |
263 | 262 | } |
264 | - } |
|
265 | - else |
|
263 | + } else |
|
266 | 264 | { |
267 | 265 | $html = $this->modifyHeader( $html, $uid ); |
268 | 266 | } |
@@ -170,22 +170,22 @@ discard block |
||
170 | 170 | catch( \Aimeos\Client\Html\Exception $e ) |
171 | 171 | { |
172 | 172 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
173 | - $view->detailErrorList = array_merge($view->get( 'detailErrorList', [] ), $error); |
|
173 | + $view->detailErrorList = array_merge( $view->get( 'detailErrorList', [] ), $error ); |
|
174 | 174 | } |
175 | 175 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
176 | 176 | { |
177 | 177 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
178 | - $view->detailErrorList = array_merge($view->get( 'detailErrorList', [] ), $error); |
|
178 | + $view->detailErrorList = array_merge( $view->get( 'detailErrorList', [] ), $error ); |
|
179 | 179 | } |
180 | 180 | catch( \Aimeos\MShop\Exception $e ) |
181 | 181 | { |
182 | 182 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
183 | - $view->detailErrorList = array_merge($view->get( 'detailErrorList', [] ), $error); |
|
183 | + $view->detailErrorList = array_merge( $view->get( 'detailErrorList', [] ), $error ); |
|
184 | 184 | } |
185 | 185 | catch( \Exception $e ) |
186 | 186 | { |
187 | 187 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
188 | - $view->detailErrorList = array_merge($view->get( 'detailErrorList', [] ), $error); |
|
188 | + $view->detailErrorList = array_merge( $view->get( 'detailErrorList', [] ), $error ); |
|
189 | 189 | $this->logException( $e ); |
190 | 190 | } |
191 | 191 | |
@@ -394,22 +394,22 @@ discard block |
||
394 | 394 | catch( \Aimeos\Client\Html\Exception $e ) |
395 | 395 | { |
396 | 396 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
397 | - $view->detailErrorList = array_merge($view->get( 'detailErrorList', [] ), $error); |
|
397 | + $view->detailErrorList = array_merge( $view->get( 'detailErrorList', [] ), $error ); |
|
398 | 398 | } |
399 | 399 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
400 | 400 | { |
401 | 401 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
402 | - $view->detailErrorList = array_merge($view->get( 'detailErrorList', [] ), $error); |
|
402 | + $view->detailErrorList = array_merge( $view->get( 'detailErrorList', [] ), $error ); |
|
403 | 403 | } |
404 | 404 | catch( \Aimeos\MShop\Exception $e ) |
405 | 405 | { |
406 | 406 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
407 | - $view->detailErrorList = array_merge($view->get( 'detailErrorList', [] ), $error); |
|
407 | + $view->detailErrorList = array_merge( $view->get( 'detailErrorList', [] ), $error ); |
|
408 | 408 | } |
409 | 409 | catch( \Exception $e ) |
410 | 410 | { |
411 | 411 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
412 | - $view->detailErrorList = array_merge($view->get( 'detailErrorList', [] ), $error); |
|
412 | + $view->detailErrorList = array_merge( $view->get( 'detailErrorList', [] ), $error ); |
|
413 | 413 | $this->logException( $e ); |
414 | 414 | } |
415 | 415 | } |
@@ -205,8 +205,7 @@ discard block |
||
205 | 205 | } |
206 | 206 | |
207 | 207 | $html = $view->render( $this->getTemplatePath( $tplconf, $default ) ); |
208 | - } |
|
209 | - else |
|
208 | + } else |
|
210 | 209 | { |
211 | 210 | $html = $this->modifyBody( $html, $uid ); |
212 | 211 | } |
@@ -290,8 +289,7 @@ discard block |
||
290 | 289 | { |
291 | 290 | $this->logException( $e ); |
292 | 291 | } |
293 | - } |
|
294 | - else |
|
292 | + } else |
|
295 | 293 | { |
296 | 294 | $html = $this->modifyHeader( $html, $uid ); |
297 | 295 | } |
@@ -185,22 +185,22 @@ discard block |
||
185 | 185 | catch( \Aimeos\Client\Html\Exception $e ) |
186 | 186 | { |
187 | 187 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
188 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
188 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
189 | 189 | } |
190 | 190 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
191 | 191 | { |
192 | 192 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
193 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
193 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
194 | 194 | } |
195 | 195 | catch( \Aimeos\MShop\Exception $e ) |
196 | 196 | { |
197 | 197 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
198 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
198 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
199 | 199 | } |
200 | 200 | catch( \Exception $e ) |
201 | 201 | { |
202 | 202 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
203 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
203 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
204 | 204 | $this->logException( $e ); |
205 | 205 | } |
206 | 206 | |
@@ -417,22 +417,22 @@ discard block |
||
417 | 417 | catch( \Aimeos\Client\Html\Exception $e ) |
418 | 418 | { |
419 | 419 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
420 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
420 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
421 | 421 | } |
422 | 422 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
423 | 423 | { |
424 | 424 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
425 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
425 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
426 | 426 | } |
427 | 427 | catch( \Aimeos\MShop\Exception $e ) |
428 | 428 | { |
429 | 429 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
430 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
430 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
431 | 431 | } |
432 | 432 | catch( \Exception $e ) |
433 | 433 | { |
434 | 434 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
435 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
435 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
436 | 436 | $this->logException( $e ); |
437 | 437 | } |
438 | 438 | } |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | |
658 | 658 | if( $catids != null ) |
659 | 659 | { |
660 | - $controller = \Aimeos\Controller\Frontend::create( $context, 'catalog' )->uses($domains); |
|
660 | + $controller = \Aimeos\Controller\Frontend::create( $context, 'catalog' )->uses( $domains ); |
|
661 | 661 | $listCatPath = $controller->getPath( is_array( $catids ) ? reset( $catids ) : $catids ); |
662 | 662 | |
663 | 663 | if( ( $categoryItem = end( $listCatPath ) ) !== false ) { |
@@ -249,13 +249,11 @@ |
||
249 | 249 | $response->withHeader( 'Expires', '0' ); |
250 | 250 | |
251 | 251 | $response->withBody( $response->createStream( $fs->reads( $value ) ) ); |
252 | - } |
|
253 | - elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false ) |
|
252 | + } elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false ) |
|
254 | 253 | { |
255 | 254 | $response->withHeader( 'Location', $value ); |
256 | 255 | $response->withStatus( 303 ); |
257 | - } |
|
258 | - else |
|
256 | + } else |
|
259 | 257 | { |
260 | 258 | $response->withStatus( 404 ); |
261 | 259 | } |
@@ -522,12 +522,10 @@ |
||
522 | 522 | { |
523 | 523 | throw new \Aimeos\Client\Html\Exception( $e->getMessage() ); |
524 | 524 | } |
525 | - } |
|
526 | - else if( function_exists( 'mime_content_type' ) ) |
|
525 | + } else if( function_exists( 'mime_content_type' ) ) |
|
527 | 526 | { |
528 | 527 | $mimetype = mime_content_type( $filename ); |
529 | - } |
|
530 | - else |
|
528 | + } else |
|
531 | 529 | { |
532 | 530 | $mimetype = 'application/binary'; |
533 | 531 | } |
@@ -24,9 +24,12 @@ |
||
24 | 24 | |
25 | 25 | <?php if( ( $mediaItem = reset( $mediaItems ) ) !== false ) : ?> |
26 | 26 | <div class="media-item" style="background-image: url('<?= $this->content( $mediaItem->getPreview() ); ?>')"></div> |
27 | - <?php else : ?> |
|
27 | + <?php else { |
|
28 | + : ?> |
|
28 | 29 | <div class="media-item"></div> |
29 | - <?php endif; ?> |
|
30 | + <?php endif; |
|
31 | +} |
|
32 | +?> |
|
30 | 33 | |
31 | 34 | <h3 class="name"><?= $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3> |
32 | 35 |
@@ -71,9 +71,12 @@ |
||
71 | 71 | </a> |
72 | 72 | </li> |
73 | 73 | <?php endforeach; ?> |
74 | - <?php else : ?> |
|
74 | + <?php else { |
|
75 | + : ?> |
|
75 | 76 | <li> |
76 | - <a href="<?= $enc->attr( $this->url( $listTarget, $listController, $listAction, $params, [], $listConfig ) ); ?>"> |
|
77 | + <a href="<?= $enc->attr( $this->url( $listTarget, $listController, $listAction, $params, [], $listConfig ) ); |
|
78 | +} |
|
79 | +?>"> |
|
77 | 80 | <?= $enc->html( $this->translate( 'client', 'Your search result' ), $enc::TRUST ); ?> |
78 | 81 | </a> |
79 | 82 | </li> |
@@ -103,7 +103,10 @@ |
||
103 | 103 | <?php $current = $params; if( is_array( $current['f_optid'] ) ) { unset( $current['f_optid'][$key] ); } ?> |
104 | 104 | <?php elseif( isset( $oneIds[$attrType] ) && ( $key = array_search( $id, (array) $oneIds[$attrType] ) ) !== false ) : ?> |
105 | 105 | <?php $current = $params; if( is_array( $current['f_oneid'][$attrType] ) ) { unset( $current['f_oneid'][$attrType][$key] ); } ?> |
106 | - <?php else : continue; ?> |
|
106 | + <?php else { |
|
107 | + : continue; |
|
108 | +} |
|
109 | +?> |
|
107 | 110 | <?php endif; ?> |
108 | 111 | <li class="attr-item"> |
109 | 112 | <a class="attr-name" href="<?= $enc->attr( $this->url( $listTarget, $listController, $listAction, $current, [], $listConfig ) ); ?>"> |