@@ -53,8 +53,7 @@ discard block |
||
| 53 | 53 | } else { |
| 54 | 54 | $taxrates[$taxrate] = $price; |
| 55 | 55 | } |
| 56 | - } |
|
| 57 | - catch( \Exception $e ) { ; } // if delivery service isn't available |
|
| 56 | + } catch( \Exception $e ) { ; } // if delivery service isn't available |
|
| 58 | 57 | |
| 59 | 58 | try |
| 60 | 59 | { |
@@ -66,8 +65,7 @@ discard block |
||
| 66 | 65 | } else { |
| 67 | 66 | $taxrates[$taxrate] = $price; |
| 68 | 67 | } |
| 69 | - } |
|
| 70 | - catch( \Exception $e ) { ; } // if payment service isn't available |
|
| 68 | + } catch( \Exception $e ) { ; } // if payment service isn't available |
|
| 71 | 69 | |
| 72 | 70 | return $taxrates; |
| 73 | 71 | } |
@@ -104,23 +104,19 @@ discard block |
||
| 104 | 104 | $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
| 105 | 105 | } |
| 106 | 106 | $view->selectBody = $html; |
| 107 | - } |
|
| 108 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 107 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 109 | 108 | { |
| 110 | 109 | $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 111 | 110 | $view->selectErrorList = $view->get( 'selectErrorList', array() ) + $error; |
| 112 | - } |
|
| 113 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 111 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 114 | 112 | { |
| 115 | 113 | $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 116 | 114 | $view->selectErrorList = $view->get( 'selectErrorList', array() ) + $error; |
| 117 | - } |
|
| 118 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 115 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 119 | 116 | { |
| 120 | 117 | $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 121 | 118 | $view->selectErrorList = $view->get( 'selectErrorList', array() ) + $error; |
| 122 | - } |
|
| 123 | - catch( \Exception $e ) |
|
| 119 | + } catch( \Exception $e ) |
|
| 124 | 120 | { |
| 125 | 121 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 126 | 122 | |
@@ -200,8 +196,7 @@ discard block |
||
| 200 | 196 | $default = 'locale/select/header-default.php'; |
| 201 | 197 | |
| 202 | 198 | return $view->render( $view->config( $tplconf, $default ) ); |
| 203 | - } |
|
| 204 | - catch( \Exception $e ) |
|
| 199 | + } catch( \Exception $e ) |
|
| 205 | 200 | { |
| 206 | 201 | $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 207 | 202 | } |
@@ -104,23 +104,19 @@ discard block |
||
| 104 | 104 | $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
| 105 | 105 | } |
| 106 | 106 | $view->standardBody = $html; |
| 107 | - } |
|
| 108 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 107 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 109 | 108 | { |
| 110 | 109 | $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 111 | 110 | $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error; |
| 112 | - } |
|
| 113 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 111 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 114 | 112 | { |
| 115 | 113 | $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 116 | 114 | $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error; |
| 117 | - } |
|
| 118 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 115 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 119 | 116 | { |
| 120 | 117 | $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 121 | 118 | $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error; |
| 122 | - } |
|
| 123 | - catch( \Exception $e ) |
|
| 119 | + } catch( \Exception $e ) |
|
| 124 | 120 | { |
| 125 | 121 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 126 | 122 | |
@@ -174,8 +170,7 @@ discard block |
||
| 174 | 170 | $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
| 175 | 171 | } |
| 176 | 172 | $view->standardHeader = $html; |
| 177 | - } |
|
| 178 | - catch( \Exception $e ) |
|
| 173 | + } catch( \Exception $e ) |
|
| 179 | 174 | { |
| 180 | 175 | $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 181 | 176 | return ''; |
@@ -357,31 +352,26 @@ discard block |
||
| 357 | 352 | |
| 358 | 353 | $controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' ); |
| 359 | 354 | $controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT ); |
| 360 | - } |
|
| 361 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 355 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 362 | 356 | { |
| 363 | 357 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 364 | 358 | $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error; |
| 365 | - } |
|
| 366 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 359 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 367 | 360 | { |
| 368 | 361 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 369 | 362 | $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error; |
| 370 | - } |
|
| 371 | - catch( \Aimeos\MShop\Plugin\Provider\Exception $e ) |
|
| 363 | + } catch( \Aimeos\MShop\Plugin\Provider\Exception $e ) |
|
| 372 | 364 | { |
| 373 | 365 | $errors = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 374 | 366 | $errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) ); |
| 375 | 367 | |
| 376 | 368 | $view->summaryErrorCodes = $e->getErrorCodes(); |
| 377 | 369 | $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors; |
| 378 | - } |
|
| 379 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 370 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 380 | 371 | { |
| 381 | 372 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 382 | 373 | $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error; |
| 383 | - } |
|
| 384 | - catch( \Exception $e ) |
|
| 374 | + } catch( \Exception $e ) |
|
| 385 | 375 | { |
| 386 | 376 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 387 | 377 | |
@@ -423,8 +413,7 @@ discard block |
||
| 423 | 413 | $controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' ); |
| 424 | 414 | $action = $view->config( 'client/html/catalog/detail/url/action', 'detail' ); |
| 425 | 415 | $config = $view->config( 'client/html/catalog/detail/url/config', array() ); |
| 426 | - } |
|
| 427 | - else |
|
| 416 | + } else |
|
| 428 | 417 | { |
| 429 | 418 | $params = $context->getSession()->get( 'aimeos/catalog/lists/params/last' . $site, array() ); |
| 430 | 419 | |
@@ -92,23 +92,19 @@ discard block |
||
| 92 | 92 | $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
| 93 | 93 | } |
| 94 | 94 | $view->relatedBody = $html; |
| 95 | - } |
|
| 96 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 95 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 97 | 96 | { |
| 98 | 97 | $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 99 | 98 | $view->relatedErrorList = $view->get( 'relatedErrorList', array() ) + $error; |
| 100 | - } |
|
| 101 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 99 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 102 | 100 | { |
| 103 | 101 | $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 104 | 102 | $view->relatedErrorList = $view->get( 'relatedErrorList', array() ) + $error; |
| 105 | - } |
|
| 106 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 103 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 107 | 104 | { |
| 108 | 105 | $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 109 | 106 | $view->relatedErrorList = $view->get( 'relatedErrorList', array() ) + $error; |
| 110 | - } |
|
| 111 | - catch( \Exception $e ) |
|
| 107 | + } catch( \Exception $e ) |
|
| 112 | 108 | { |
| 113 | 109 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 114 | 110 | |
@@ -162,8 +158,7 @@ discard block |
||
| 162 | 158 | $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
| 163 | 159 | } |
| 164 | 160 | $view->relatedHeader = $html; |
| 165 | - } |
|
| 166 | - catch( \Exception $e ) |
|
| 161 | + } catch( \Exception $e ) |
|
| 167 | 162 | { |
| 168 | 163 | $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 169 | 164 | return ''; |
@@ -121,23 +121,19 @@ discard block |
||
| 121 | 121 | $output .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
| 122 | 122 | } |
| 123 | 123 | $view->miniBody = $output; |
| 124 | - } |
|
| 125 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 124 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 126 | 125 | { |
| 127 | 126 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 128 | 127 | $view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error; |
| 129 | - } |
|
| 130 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 128 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 131 | 129 | { |
| 132 | 130 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 133 | 131 | $view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error; |
| 134 | - } |
|
| 135 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 132 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 136 | 133 | { |
| 137 | 134 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 138 | 135 | $view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error; |
| 139 | - } |
|
| 140 | - catch( \Exception $e ) |
|
| 136 | + } catch( \Exception $e ) |
|
| 141 | 137 | { |
| 142 | 138 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 143 | 139 | |
@@ -170,8 +166,7 @@ discard block |
||
| 170 | 166 | |
| 171 | 167 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 172 | 168 | $this->setBasketCached( $key, $html ); |
| 173 | - } |
|
| 174 | - else |
|
| 169 | + } else |
|
| 175 | 170 | { |
| 176 | 171 | $html = $this->modifyBody( $html, $uid ); |
| 177 | 172 | } |
@@ -235,13 +230,11 @@ discard block |
||
| 235 | 230 | |
| 236 | 231 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 237 | 232 | $this->setBasketCached( $key, $html ); |
| 238 | - } |
|
| 239 | - catch( \Exception $e ) |
|
| 233 | + } catch( \Exception $e ) |
|
| 240 | 234 | { |
| 241 | 235 | $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 242 | 236 | } |
| 243 | - } |
|
| 244 | - else |
|
| 237 | + } else |
|
| 245 | 238 | { |
| 246 | 239 | $html = $this->modifyHeader( $html, $uid ); |
| 247 | 240 | } |
@@ -610,8 +610,7 @@ |
||
| 610 | 610 | $key = $this->getParamHash( $prefixes, $uid . ':' . $confkey . ':' . $type, $cfg ); |
| 611 | 611 | |
| 612 | 612 | $context->getCache()->set( $key, $value, array_unique( $tags ), $expire ); |
| 613 | - } |
|
| 614 | - catch( \Exception $e ) |
|
| 613 | + } catch( \Exception $e ) |
|
| 615 | 614 | { |
| 616 | 615 | $msg = sprintf( 'Unable to set cache entry: %1$s', $e->getMessage() ); |
| 617 | 616 | $context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::NOTICE ); |
@@ -134,23 +134,19 @@ discard block |
||
| 134 | 134 | $output .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
| 135 | 135 | } |
| 136 | 136 | $view->stageBody = $output; |
| 137 | - } |
|
| 138 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 137 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 139 | 138 | { |
| 140 | 139 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 141 | 140 | $view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error; |
| 142 | - } |
|
| 143 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 141 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 144 | 142 | { |
| 145 | 143 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 146 | 144 | $view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error; |
| 147 | - } |
|
| 148 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 145 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 149 | 146 | { |
| 150 | 147 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 151 | 148 | $view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error; |
| 152 | - } |
|
| 153 | - catch( \Exception $e ) |
|
| 149 | + } catch( \Exception $e ) |
|
| 154 | 150 | { |
| 155 | 151 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 156 | 152 | |
@@ -184,8 +180,7 @@ discard block |
||
| 184 | 180 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 185 | 181 | |
| 186 | 182 | $this->setCached( 'body', $uid, $prefixes, $confkey, $html, $tags, $expire ); |
| 187 | - } |
|
| 188 | - else |
|
| 183 | + } else |
|
| 189 | 184 | { |
| 190 | 185 | $html = $this->modifyBody( $html, $uid ); |
| 191 | 186 | } |
@@ -221,8 +216,7 @@ discard block |
||
| 221 | 216 | $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
| 222 | 217 | } |
| 223 | 218 | $view->stageHeader = $html; |
| 224 | - } |
|
| 225 | - catch( \Exception $e ) |
|
| 219 | + } catch( \Exception $e ) |
|
| 226 | 220 | { |
| 227 | 221 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 228 | 222 | } |
@@ -254,8 +248,7 @@ discard block |
||
| 254 | 248 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 255 | 249 | |
| 256 | 250 | $this->setCached( 'header', $uid, $prefixes, $confkey, $html, $tags, $expire ); |
| 257 | - } |
|
| 258 | - else |
|
| 251 | + } else |
|
| 259 | 252 | { |
| 260 | 253 | $html = $this->modifyHeader( $html, $uid ); |
| 261 | 254 | } |
@@ -362,23 +355,19 @@ discard block |
||
| 362 | 355 | try |
| 363 | 356 | { |
| 364 | 357 | parent::process(); |
| 365 | - } |
|
| 366 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 358 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 367 | 359 | { |
| 368 | 360 | $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 369 | 361 | $view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error; |
| 370 | - } |
|
| 371 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 362 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 372 | 363 | { |
| 373 | 364 | $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 374 | 365 | $view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error; |
| 375 | - } |
|
| 376 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 366 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 377 | 367 | { |
| 378 | 368 | $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 379 | 369 | $view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error; |
| 380 | - } |
|
| 381 | - catch( \Exception $e ) |
|
| 370 | + } catch( \Exception $e ) |
|
| 382 | 371 | { |
| 383 | 372 | $context = $this->getContext(); |
| 384 | 373 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
@@ -156,23 +156,19 @@ discard block |
||
| 156 | 156 | $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
| 157 | 157 | } |
| 158 | 158 | $view->listBody = $html; |
| 159 | - } |
|
| 160 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 159 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 161 | 160 | { |
| 162 | 161 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 163 | 162 | $view->listErrorList = $view->get( 'listErrorList', array() ) + $error; |
| 164 | - } |
|
| 165 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 163 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 166 | 164 | { |
| 167 | 165 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 168 | 166 | $view->listErrorList = $view->get( 'listErrorList', array() ) + $error; |
| 169 | - } |
|
| 170 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 167 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 171 | 168 | { |
| 172 | 169 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 173 | 170 | $view->listErrorList = $view->get( 'listErrorList', array() ) + $error; |
| 174 | - } |
|
| 175 | - catch( \Exception $e ) |
|
| 171 | + } catch( \Exception $e ) |
|
| 176 | 172 | { |
| 177 | 173 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 178 | 174 | |
@@ -206,8 +202,7 @@ discard block |
||
| 206 | 202 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 207 | 203 | |
| 208 | 204 | $this->setCached( 'body', $uid, $prefixes, $confkey, $html, $tags, $expire ); |
| 209 | - } |
|
| 210 | - else |
|
| 205 | + } else |
|
| 211 | 206 | { |
| 212 | 207 | $html = $this->modifyBody( $html, $uid ); |
| 213 | 208 | } |
@@ -243,8 +238,7 @@ discard block |
||
| 243 | 238 | $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
| 244 | 239 | } |
| 245 | 240 | $view->listHeader = $html; |
| 246 | - } |
|
| 247 | - catch( \Exception $e ) |
|
| 241 | + } catch( \Exception $e ) |
|
| 248 | 242 | { |
| 249 | 243 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 250 | 244 | } |
@@ -276,8 +270,7 @@ discard block |
||
| 276 | 270 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 277 | 271 | |
| 278 | 272 | $this->setCached( 'header', $uid, $prefixes, $confkey, $html, $tags, $expire ); |
| 279 | - } |
|
| 280 | - else |
|
| 273 | + } else |
|
| 281 | 274 | { |
| 282 | 275 | $html = $this->modifyHeader( $html, $uid ); |
| 283 | 276 | } |
@@ -390,23 +383,19 @@ discard block |
||
| 390 | 383 | $context->getSession()->set( 'aimeos/catalog/lists/params/last/' . $site, $params ); |
| 391 | 384 | |
| 392 | 385 | parent::process(); |
| 393 | - } |
|
| 394 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 386 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 395 | 387 | { |
| 396 | 388 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 397 | 389 | $view->listErrorList = $view->get( 'listErrorList', array() ) + $error; |
| 398 | - } |
|
| 399 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 390 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 400 | 391 | { |
| 401 | 392 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 402 | 393 | $view->listErrorList = $view->get( 'listErrorList', array() ) + $error; |
| 403 | - } |
|
| 404 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 394 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 405 | 395 | { |
| 406 | 396 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 407 | 397 | $view->listErrorList = $view->get( 'listErrorList', array() ) + $error; |
| 408 | - } |
|
| 409 | - catch( \Exception $e ) |
|
| 398 | + } catch( \Exception $e ) |
|
| 410 | 399 | { |
| 411 | 400 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 412 | 401 | |
@@ -211,23 +211,19 @@ discard block |
||
| 211 | 211 | $output .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
| 212 | 212 | } |
| 213 | 213 | $view->detailBody = $output; |
| 214 | - } |
|
| 215 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 214 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 216 | 215 | { |
| 217 | 216 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 218 | 217 | $view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error; |
| 219 | - } |
|
| 220 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 218 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 221 | 219 | { |
| 222 | 220 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 223 | 221 | $view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error; |
| 224 | - } |
|
| 225 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 222 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 226 | 223 | { |
| 227 | 224 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 228 | 225 | $view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error; |
| 229 | - } |
|
| 230 | - catch( \Exception $e ) |
|
| 226 | + } catch( \Exception $e ) |
|
| 231 | 227 | { |
| 232 | 228 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 233 | 229 | |
@@ -261,8 +257,7 @@ discard block |
||
| 261 | 257 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 262 | 258 | |
| 263 | 259 | $this->setCached( 'body', $uid, $prefixes, $confkey, $html, $tags, $expire ); |
| 264 | - } |
|
| 265 | - else |
|
| 260 | + } else |
|
| 266 | 261 | { |
| 267 | 262 | $html = $this->modifyBody( $html, $uid ); |
| 268 | 263 | } |
@@ -299,8 +294,7 @@ discard block |
||
| 299 | 294 | $output .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
| 300 | 295 | } |
| 301 | 296 | $view->detailHeader = $output; |
| 302 | - } |
|
| 303 | - catch( \Exception $e ) |
|
| 297 | + } catch( \Exception $e ) |
|
| 304 | 298 | { |
| 305 | 299 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 306 | 300 | } |
@@ -332,8 +326,7 @@ discard block |
||
| 332 | 326 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 333 | 327 | |
| 334 | 328 | $this->setCached( 'header', $uid, $prefixes, $confkey, $html, $tags, $expire ); |
| 335 | - } |
|
| 336 | - else |
|
| 329 | + } else |
|
| 337 | 330 | { |
| 338 | 331 | $html = $this->modifyHeader( $html, $uid ); |
| 339 | 332 | } |
@@ -446,23 +439,19 @@ discard block |
||
| 446 | 439 | $context->getSession()->set( 'aimeos/catalog/detail/params/last' . $site, $params ); |
| 447 | 440 | |
| 448 | 441 | parent::process(); |
| 449 | - } |
|
| 450 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 442 | + } catch( \Aimeos\Client\Html\Exception $e ) |
|
| 451 | 443 | { |
| 452 | 444 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 453 | 445 | $view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error; |
| 454 | - } |
|
| 455 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 446 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 456 | 447 | { |
| 457 | 448 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 458 | 449 | $view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error; |
| 459 | - } |
|
| 460 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 450 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 461 | 451 | { |
| 462 | 452 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 463 | 453 | $view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error; |
| 464 | - } |
|
| 465 | - catch( \Exception $e ) |
|
| 454 | + } catch( \Exception $e ) |
|
| 466 | 455 | { |
| 467 | 456 | $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
| 468 | 457 | |