Completed
Pull Request — master (#91)
by Simon
03:50
created
client/html/templates/catalog/lists/header-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,8 +59,11 @@
 block discarded – undo
59 59
 
60 60
 	<?php elseif( ( $search = $this->param( 'f_search', null ) ) != null ) : /// Product search hint with user provided search string (%1$s) ?>
61 61
 		<title><?= $enc->html( sprintf( $this->translate( 'client', 'Result for "%1$s"' ), strip_tags( $search ) ) ); ?></title>
62
-	<?php else : ?>
63
-		<title><?= $enc->html( $this->translate( 'client', 'Our products' ) ); ?></title>
62
+	<?php else {
63
+	: ?>
64
+		<title><?= $enc->html( $this->translate( 'client', 'Our products' ) );
65
+}
66
+?></title>
64 67
 	<?php endif; ?>
65 68
 
66 69
 
Please login to merge, or discard this patch.
client/html/templates/checkout/standard/body-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,8 +64,11 @@
 block discarded – undo
64 64
 						<a href="<?= $enc->attr( $this->url( $checkoutTarget, $checkoutController, $checkoutAction, array( 'c_step' => $name ), [], $checkoutConfig ) ); ?>">
65 65
 							<?= $enc->html( $this->translate( 'client', $name ) ); ?>
66 66
 						</a>
67
-					<?php else : ?>
68
-						<?= $enc->html( $this->translate( 'client', $name ) ); ?>
67
+					<?php else {
68
+	: ?>
69
+						<?= $enc->html( $this->translate( 'client', $name ) );
70
+}
71
+?>
69 72
 					<?php endif; ?>
70 73
 				</li>
71 74
 
Please login to merge, or discard this patch.
client/html/templates/common/partials/selection-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -156,10 +156,13 @@
 block discarded – undo
156 156
 						<?php endforeach; ?>
157 157
 					</ul>
158 158
 
159
-				<?php else : ?>
159
+				<?php else {
160
+	: ?>
160 161
 
161 162
 					<select class="form-control select-list"
162
-						name="<?= $enc->attr( $this->formparam( array( 'b_prod', 0, 'attrvarid', $code ) ) ); ?>"
163
+						name="<?= $enc->attr( $this->formparam( array( 'b_prod', 0, 'attrvarid', $code ) ) );
164
+}
165
+?>"
163 166
 						data-index="<?= $index++; ?>" data-type="<?= $enc->attr( $code ); ?>" >
164 167
 
165 168
 						<?php if( $preselect === false ) : ?>
Please login to merge, or discard this patch.
client/html/templates/common/partials/attribute-standard.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -132,8 +132,11 @@  discard block
 block discarded – undo
132 132
 											$this->translate( 'currency', $priceItem->getCurrencyId() ),
133 133
 											( $value < 0 ? '−' : '+' )
134 134
 										), $enc::TRUST ); ?>
135
-									<?php else : ?>
136
-										<?= $enc->html( $attribute->getName(), $enc::TRUST ); ?>
135
+									<?php else {
136
+	: ?>
137
+										<?= $enc->html( $attribute->getName(), $enc::TRUST );
138
+}
139
+?>
137 140
 									<?php endif; ?>
138 141
 
139 142
 								</label>
@@ -142,10 +145,13 @@  discard block
 block discarded – undo
142 145
 						<?php endforeach; ?>
143 146
 					</ul>
144 147
 
145
-				<?php else : ?>
148
+				<?php else {
149
+	: ?>
146 150
 
147 151
 					<input type="hidden" value="1"
148
-						name="<?= $enc->attr( $this->formparam( array( 'b_prod', 0, 'attrconfid', 'qty', '' ) ) ); ?>"
152
+						name="<?= $enc->attr( $this->formparam( array( 'b_prod', 0, 'attrconfid', 'qty', '' ) ) );
153
+}
154
+?>"
149 155
 					/>
150 156
 
151 157
 					<select class="form-control select-list" name="<?= $enc->attr( $this->formparam( array( 'b_prod', 0, 'attrconfid', 'id', '' ) ) ); ?>">
@@ -165,8 +171,11 @@  discard block
 block discarded – undo
165 171
 										$this->translate( 'currency', $priceItem->getCurrencyId() ),
166 172
 										( $value < 0 ? '−' : '+' )
167 173
 									), $enc::TRUST ); ?>
168
-								<?php else : ?>
169
-									<?= $enc->html( $attribute->getName(), $enc::TRUST ); ?>
174
+								<?php else {
175
+	: ?>
176
+									<?= $enc->html( $attribute->getName(), $enc::TRUST );
177
+}
178
+?>
170 179
 								<?php endif; ?>
171 180
 
172 181
 							</option>
Please login to merge, or discard this patch.
client/html/templates/common/summary/service-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,11 @@
 block discarded – undo
38 38
 						<span class="name">
39 39
 							<?php if( $attribute->getName() != '' ) : ?>
40 40
 								<?= $enc->html( $attribute->getName() ); ?>
41
-							<?php else : ?>
42
-								<?= $enc->html( $this->translate( 'client/code', $attribute->getCode() ) ); ?>
41
+							<?php else {
42
+	: ?>
43
+								<?= $enc->html( $this->translate( 'client/code', $attribute->getCode() ) );
44
+}
45
+?>
43 46
 							<?php endif; ?>
44 47
 						</span>
45 48
 
Please login to merge, or discard this patch.
client/html/templates/email/account/text-body-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,8 +20,11 @@
 block discarded – undo
20 20
 
21 21
 <?php if( ( $pass = $this->get( 'extAccountPassword' ) ) !== null ) : ?>
22 22
 	<?= $this->translate( 'client', 'Password' ); ?>: <?= $pass; ?>
23
-<?php else : ?>
24
-	<?= $this->translate( 'client', 'Password' ); ?>: <?= $this->translate( 'client', 'Like entered by you' ); ?>
23
+<?php else {
24
+	: ?>
25
+	<?= $this->translate( 'client', 'Password' );
26
+}
27
+?>: <?= $this->translate( 'client', 'Like entered by you' ); ?>
25 28
 <?php endif; ?>
26 29
 
27 30
 
Please login to merge, or discard this patch.
client/html/templates/account/favorite/body-standard.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
 
126 126
 							<?php if( ( $mediaItem = reset( $mediaItems ) ) !== false ) : ?>
127 127
 								<div class="media-item" style="background-image: url('<?= $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
 
132 135
 							<h3 class="name"><?= $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3>
133 136
 							<div class="price-list">
Please login to merge, or discard this patch.
client/html/templates/account/watch/body-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -126,9 +126,12 @@
 block discarded – undo
126 126
 
127 127
 							<?php if( ( $mediaItem = reset( $mediaItems ) ) !== false ) : ?>
128 128
 								<div class="media-item" style="background-image: url('<?= $this->content( $mediaItem->getPreview() ); ?>')"></div>
129
-							<?php else : ?>
129
+							<?php else {
130
+	: ?>
130 131
 								<div class="media-item"></div>
131
-							<?php endif; ?>
132
+							<?php endif;
133
+}
134
+?>
132 135
 
133 136
 							<h3 class="name"><?= $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3>
134 137
 
Please login to merge, or discard this patch.
client/html/src/Client/Html/Email/Payment/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -522,12 +522,10 @@
 block discarded – undo
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
 			}
Please login to merge, or discard this patch.