@@ -44,13 +44,11 @@ |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | $status = 200; |
| 47 | - } |
|
| 48 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 47 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 49 | 48 | { |
| 50 | 49 | $status = 404; |
| 51 | 50 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 52 | - } |
|
| 53 | - catch( \Exception $e ) |
|
| 51 | + } catch( \Exception $e ) |
|
| 54 | 52 | { |
| 55 | 53 | $status = $e->getCode() >= 100 && $e->getCode() < 600 ? $e->getCode() : 500; |
| 56 | 54 | $view->errors = $this->getErrorDetails( $e ); |
@@ -126,8 +126,7 @@ |
||
| 126 | 126 | foreach( $items as $item ) { |
| 127 | 127 | $data[] = $entryFcn( $item ); |
| 128 | 128 | } |
| 129 | - } |
|
| 130 | - else |
|
| 129 | + } else |
|
| 131 | 130 | { |
| 132 | 131 | $data = $entryFcn( $items ); |
| 133 | 132 | } |
@@ -144,23 +144,19 @@ discard block |
||
| 144 | 144 | $this->setCached( 'body', $uid, $prefixes, $confkey, $html, $this->tags, $this->expire ); |
| 145 | 145 | |
| 146 | 146 | return $html; |
| 147 | - } |
|
| 148 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 147 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 149 | 148 | { |
| 150 | 149 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 151 | 150 | $view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error ); |
| 152 | - } |
|
| 153 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 151 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 154 | 152 | { |
| 155 | 153 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 156 | 154 | $view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error ); |
| 157 | - } |
|
| 158 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 155 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 159 | 156 | { |
| 160 | 157 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 161 | 158 | $view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error ); |
| 162 | - } |
|
| 163 | - catch( \Exception $e ) |
|
| 159 | + } catch( \Exception $e ) |
|
| 164 | 160 | { |
| 165 | 161 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
| 166 | 162 | $view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error ); |
@@ -168,8 +164,7 @@ discard block |
||
| 168 | 164 | } |
| 169 | 165 | |
| 170 | 166 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 171 | - } |
|
| 172 | - else |
|
| 167 | + } else |
|
| 173 | 168 | { |
| 174 | 169 | $html = $this->modifyBody( $html, $uid ); |
| 175 | 170 | } |
@@ -234,13 +229,11 @@ discard block |
||
| 234 | 229 | $this->setCached( 'header', $uid, $prefixes, $confkey, $html, $this->tags, $this->expire ); |
| 235 | 230 | |
| 236 | 231 | return $html; |
| 237 | - } |
|
| 238 | - catch( \Exception $e ) |
|
| 232 | + } catch( \Exception $e ) |
|
| 239 | 233 | { |
| 240 | 234 | $this->logException( $e ); |
| 241 | 235 | } |
| 242 | - } |
|
| 243 | - else |
|
| 236 | + } else |
|
| 244 | 237 | { |
| 245 | 238 | $html = $this->modifyHeader( $html, $uid ); |
| 246 | 239 | } |
@@ -349,23 +342,19 @@ discard block |
||
| 349 | 342 | try |
| 350 | 343 | { |
| 351 | 344 | parent::process(); |
| 352 | - } |
|
| 353 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 345 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 354 | 346 | { |
| 355 | 347 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 356 | 348 | $view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error ); |
| 357 | - } |
|
| 358 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 349 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 359 | 350 | { |
| 360 | 351 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 361 | 352 | $view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error ); |
| 362 | - } |
|
| 363 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 353 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 364 | 354 | { |
| 365 | 355 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 366 | 356 | $view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error ); |
| 367 | - } |
|
| 368 | - catch( \Exception $e ) |
|
| 357 | + } catch( \Exception $e ) |
|
| 369 | 358 | { |
| 370 | 359 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
| 371 | 360 | $view->pageErrorList = array_merge( $view->get( 'pageErrorList', [] ), $error ); |