Completed
Push — master ( 86ce10...3f6ef7 )
by Aimeos
07:57
created
client/html/src/Client/Html/Account/Favorite/Standard.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -82,23 +82,19 @@  discard block
 block discarded – undo
82 82
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
83 83
 			}
84 84
 			$view->favoriteBody = $html;
85
-		}
86
-		catch( \Aimeos\Client\Html\Exception $e )
85
+		} catch( \Aimeos\Client\Html\Exception $e )
87 86
 		{
88 87
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
89 88
 			$view->favoriteErrorList = $view->get( 'favoriteErrorList', array() ) + $error;
90
-		}
91
-		catch( \Aimeos\Controller\Frontend\Exception $e )
89
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
92 90
 		{
93 91
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
94 92
 			$view->favoriteErrorList = $view->get( 'favoriteErrorList', array() ) + $error;
95
-		}
96
-		catch( \Aimeos\MShop\Exception $e )
93
+		} catch( \Aimeos\MShop\Exception $e )
97 94
 		{
98 95
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
99 96
 			$view->favoriteErrorList = $view->get( 'favoriteErrorList', array() ) + $error;
100
-		}
101
-		catch( \Exception $e )
97
+		} catch( \Exception $e )
102 98
 		{
103 99
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
104 100
 
@@ -178,8 +174,7 @@  discard block
 block discarded – undo
178 174
 			$default = 'account/favorite/header-default.php';
179 175
 
180 176
 			return $view->render( $view->config( $tplconf, $default ) );
181
-		}
182
-		catch( \Exception $e )
177
+		} catch( \Exception $e )
183 178
 		{
184 179
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
185 180
 		}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Account/History/Standard.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -103,23 +103,19 @@  discard block
 block discarded – undo
103 103
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
104 104
 			}
105 105
 			$view->historyBody = $html;
106
-		}
107
-		catch( \Aimeos\Client\Html\Exception $e )
106
+		} catch( \Aimeos\Client\Html\Exception $e )
108 107
 		{
109 108
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
110 109
 			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
111
-		}
112
-		catch( \Aimeos\Controller\Frontend\Exception $e )
110
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
113 111
 		{
114 112
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
115 113
 			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
116
-		}
117
-		catch( \Aimeos\MShop\Exception $e )
114
+		} catch( \Aimeos\MShop\Exception $e )
118 115
 		{
119 116
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
120 117
 			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
121
-		}
122
-		catch( \Exception $e )
118
+		} catch( \Exception $e )
123 119
 		{
124 120
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
125 121
 
@@ -199,8 +195,7 @@  discard block
 block discarded – undo
199 195
 			$default = 'account/history/header-default.php';
200 196
 
201 197
 			return $view->render( $view->config( $tplconf, $default ) );
202
-		}
203
-		catch( \Exception $e )
198
+		} catch( \Exception $e )
204 199
 		{
205 200
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
206 201
 		}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Account/Download/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -203,8 +203,7 @@  discard block
 block discarded – undo
203 203
 			}
204 204
 
205 205
 			parent::process();
206
-		}
207
-		catch( \Exception $e )
206
+		} catch( \Exception $e )
208 207
 		{
209 208
 			$context->getLogger()->log( $e->getMessage() );
210 209
 		}
@@ -252,13 +251,11 @@  discard block
 block discarded – undo
252 251
 			$response->withHeader( 'Expires', '0' );
253 252
 
254 253
 			$response->withBody( $response->createStream( $fs->reads( $value ) ) );
255
-		}
256
-		elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false )
254
+		} elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false )
257 255
 		{
258 256
 			$response->withHeader( 'Location', $value );
259 257
 			$response->withStatus( 303 );
260
-		}
261
-		else
258
+		} else
262 259
 		{
263 260
 			$response->withStatus( 404 );
264 261
 		}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Account/Watch/Standard.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -82,23 +82,19 @@  discard block
 block discarded – undo
82 82
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
83 83
 			}
84 84
 			$view->watchBody = $html;
85
-		}
86
-		catch( \Aimeos\Client\Html\Exception $e )
85
+		} catch( \Aimeos\Client\Html\Exception $e )
87 86
 		{
88 87
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
89 88
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
90
-		}
91
-		catch( \Aimeos\Controller\Frontend\Exception $e )
89
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
92 90
 		{
93 91
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
94 92
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
95
-		}
96
-		catch( \Aimeos\MShop\Exception $e )
93
+		} catch( \Aimeos\MShop\Exception $e )
97 94
 		{
98 95
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
99 96
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
100
-		}
101
-		catch( \Exception $e )
97
+		} catch( \Exception $e )
102 98
 		{
103 99
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
104 100
 
@@ -178,8 +174,7 @@  discard block
 block discarded – undo
178 174
 			$default = 'account/watch/header-default.php';
179 175
 
180 176
 			return $view->render( $view->config( $tplconf, $default ) );
181
-		}
182
-		catch( \Exception $e )
177
+		} catch( \Exception $e )
183 178
 		{
184 179
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
185 180
 		}
Please login to merge, or discard this patch.
client/html/templates/email/common/text-summary-address-body-default.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -61,8 +61,7 @@  discard block
 block discarded – undo
61 61
 			$addr->getWebsite(),
62 62
 			$addr->getVatID()
63 63
 		) ) ) );
64
-	}
65
-	catch( Exception $e ) { ; }
64
+	} catch( Exception $e ) { ; }
66 65
 ?>
67 66
 
68 67
 
@@ -111,8 +110,7 @@  discard block
 block discarded – undo
111 110
 			$addr->getWebsite(),
112 111
 			$addr->getVatID()
113 112
 		) ) ) );
114
-	}
115
-	catch( Exception $e )
113
+	} catch( Exception $e )
116 114
 	{
117 115
 		echo strip_tags( $this->translate( 'client', 'like billing address' ) );
118 116
 	}
Please login to merge, or discard this patch.
client/html/templates/email/common/html-salutation-body-default.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,7 @@
 block discarded – undo
25 25
 		$addr->getFirstName(),
26 26
 		$addr->getLastName()
27 27
 	);
28
-}
29
-catch( Exception $e )
28
+} catch( Exception $e )
30 29
 {
31 30
 	$string = $this->translate( 'client/html/email', 'Dear Sir or Madam' );
32 31
 }
Please login to merge, or discard this patch.
client/html/templates/email/common/text-summary-detail-body-default.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,8 +27,7 @@  discard block
 block discarded – undo
27 27
 	$priceRebate = $price->getRebate();
28 28
 	$priceTaxflag = $price->getTaxFlag();
29 29
 	$priceCurrency = $this->translate( 'client/currency', $price->getCurrencyId() );
30
-}
31
-catch( Exception $e )
30
+} catch( Exception $e )
32 31
 {
33 32
 	$priceValue = '0.00';
34 33
 	$priceRebate = '0.00';
@@ -42,8 +41,7 @@  discard block
 block discarded – undo
42 41
 	$deliveryPriceItem = $this->extOrderBaseItem->getService( 'delivery' )->getPrice();
43 42
 	$deliveryPriceService = $deliveryPriceItem->getCosts();
44 43
 	$deliveryPriceValue = $deliveryPriceItem->getValue();
45
-}
46
-catch( Exception $e )
44
+} catch( Exception $e )
47 45
 {
48 46
 	$deliveryPriceValue = '0.00';
49 47
 	$deliveryPriceService = '0.00';
@@ -54,8 +52,7 @@  discard block
 block discarded – undo
54 52
 	$paymentPriceItem = $this->extOrderBaseItem->getService( 'payment' )->getPrice();
55 53
 	$paymentPriceService = $paymentPriceItem->getCosts();
56 54
 	$paymentPriceValue = $paymentPriceItem->getValue();
57
-}
58
-catch( Exception $e )
55
+} catch( Exception $e )
59 56
 {
60 57
 	$paymentPriceValue = '0.00';
61 58
 	$paymentPriceService = '0.00';
Please login to merge, or discard this patch.
client/html/templates/email/common/text-salutation-body-default.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,7 @@
 block discarded – undo
23 23
 		$addr->getFirstName(),
24 24
 		$addr->getLastName()
25 25
 	);
26
-}
27
-catch( Exception $e )
26
+} catch( Exception $e )
28 27
 {
29 28
 	$string = $this->translate( 'client/html/email', 'Dear Sir or Madam' );
30 29
 }
Please login to merge, or discard this patch.
client/html/templates/account/watch/body-default.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,9 +125,12 @@
 block discarded – undo
125 125
 <?php			$mediaItems = $productItem->getRefItems( 'media', 'default', 'default' ); ?>
126 126
 <?php			if( ( $mediaItem = reset( $mediaItems ) ) !== false ) : ?>
127 127
 				<div class="media-item" style="background-image: url('<?php echo $this->content( $mediaItem->getPreview() ); ?>')"></div>
128
-<?php			else : ?>
128
+<?php			else {
129
+    : ?>
129 130
 				<div class="media-item"></div>
130
-<?php			endif; ?>
131
+<?php			endif;
132
+}
133
+?>
131 134
 				<h3 class="name"><?php echo $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3>
132 135
 				<div class="price-list">
133 136
 <?php			echo $this->partial( $this->config( 'client/html/common/partials/price', 'common/partials/price-default.php' ), array( 'prices' => $prices ) ); ?>
Please login to merge, or discard this patch.