Completed
Push — develop ( 70d429...67953b )
by Greg
16:12 queued 08:01
created
medialist.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,8 @@  discard block
 block discarded – undo
109 109
 						</option>
110 110
 					</select>
111 111
 				</td>
112
-				<?php else: ?>
112
+				<?php else {
113
+	: ?>
113 114
 					<td class="descriptionbox wrap"></td>
114 115
 					<td class="optionbox wrap"></td>
115 116
 				<?php endif ?>
@@ -133,6 +134,7 @@  discard block
 block discarded – undo
133 134
 						<?php
134 135
 						foreach (['10', '20', '30', '40', '50', '75', '100', '125', '150', '200'] as $selectEntry) {
135 136
 							echo '<option value="', $selectEntry, '" ';
137
+}
136 138
 							if ($selectEntry == $max) {
137 139
 								echo 'selected';
138 140
 							}
Please login to merge, or discard this patch.
admin_users.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -770,13 +770,15 @@
 block discarded – undo
770 770
 		<p>
771 771
 		<?php if ($ucnt): ?>
772 772
 			<input type="submit" value="<?= I18N::translate('delete') ?>">
773
-			<?php else: ?>
773
+			<?php else {
774
+	: ?>
774 775
 			<?= I18N::translate('Nothing found to cleanup') ?>
775 776
 			<?php endif ?>
776 777
 		</p>
777 778
 	</form>
778 779
 	<?php
779 780
 	break;
781
+}
780 782
 
781 783
 case 'cleanup2':
782 784
 	foreach (User::all() as $user) {
Please login to merge, or discard this patch.
search_advanced.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -154,7 +154,8 @@  discard block
 block discarded – undo
154 154
 				<input type="text" id="value<?= $i ?>" name="values[<?= $i ?>]" value="<?= Filter::escapeHtml($controller->getValue($i)) ?>"<?= substr($controller->getField($i), -4) == 'PLAC' ? 'data-autocomplete-type="PLAC"' : '' ?>>
155 155
 			<?php if (preg_match('/^NAME:/', $currentFieldSearch) > 0) { ?>
156 156
 				<select name="fields[<?= $i ?>]">
157
-					<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Exact') ?></option>
157
+					<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) {
158
+	echo 'selected' ?>><?= I18N::translate('Exact') ?></option>
158 159
 					<option value="<?= $currentField ?>:BEGINS" <?php if (preg_match('/:BEGINS$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Begins with') ?></option>
159 160
 					<option value="<?= $currentField ?>:CONTAINS" <?php if (preg_match('/:CONTAINS$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Contains') ?></option>
160 161
 					<option value="<?= $currentField ?>:SDX" <?php if (preg_match('/:SDX$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Sounds like') ?></option>
@@ -176,6 +177,7 @@  discard block
 block discarded – undo
176 177
 		//-- relative fields
177 178
 		if ($i == 0 && $fct > 4) {
178 179
 			$j = $fct;
180
+}
179 181
 			// Get the current options for Father’s and Mother’s name searches
180 182
 			$fatherGivnOption = 'SDX';
181 183
 			$fatherSurnOption = 'SDX';
Please login to merge, or discard this patch.
app/Module/BatchUpdateModule.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -235,7 +235,8 @@  discard block
 block discarded – undo
235 235
 					<?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
236 236
 					<?php // page, which makes them all again!  ?>
237 237
 					<script>reset_reload();</script>
238
-			<?php else: ?>
238
+			<?php else {
239
+	: ?>
239 240
 					<hr>
240 241
 					<div id="batch_update2" class="col-sm-12">
241 242
 						<?php if ($this->curr_xref): ?>
@@ -273,6 +274,7 @@  discard block
 block discarded – undo
273 274
 		foreach (array_keys($this->all_xrefs) as $key) {
274 275
 			if ($key > $xref) {
275 276
 				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
277
+}
276 278
 				if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) {
277 279
 					return $key;
278 280
 				}
Please login to merge, or discard this patch.
message.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,8 @@  discard block
 block discarded – undo
128 128
 				<div class="form-control"><?= Filter::escapeHtml(Auth::user()->getRealName()) ?></div>
129 129
 			</div>
130 130
 		</div>
131
-	<?php else: ?>
131
+	<?php else {
132
+	: ?>
132 133
 		<div class="form-group row">
133 134
 			<label class="col-sm-3 col-form-label" for="from-name">
134 135
 				<?= I18N::translate('Your name') ?>
@@ -186,6 +187,7 @@  discard block
 block discarded – undo
186 187
 function recipients($to) {
187 188
 	if ($to === 'all') {
188 189
 		$recipients =	User::all();
190
+}
189 191
 	} elseif ($to === 'last_6mo') {
190 192
 		$recipients = array_filter(User::all(), function(User $user) {
191 193
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;
Please login to merge, or discard this patch.
app/Module/StoriesModule.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -381,7 +381,8 @@  discard block
 block discarded – undo
381 381
 						<a href="<?= $individual->getHtmlUrl() ?>#tab-stories">
382 382
 							<?= $individual->getFullName() ?>
383 383
 						</a>
384
-						<?php else: ?>
384
+						<?php else {
385
+	: ?>
385 386
 							<?= $story->xref ?>
386 387
 						<?php endif ?>
387 388
 						</td>
@@ -410,6 +411,7 @@  discard block
 block discarded – undo
410 411
 	 */
411 412
 	private function showList() {
412 413
 		global $controller, $WT_TREE;
414
+}
413 415
 
414 416
 		$controller = new PageController;
415 417
 		$controller
Please login to merge, or discard this patch.
placelist.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -200,7 +200,8 @@  discard block
 block discarded – undo
200 200
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
201 201
 				<?php if (empty($myindilist)): ?>
202 202
 					<p><?= I18N::translate('No results found.') ?></p>
203
-				<?php else: ?>
203
+				<?php else {
204
+	: ?>
204 205
 					<?= FunctionsPrintLists::individualTable($myindilist) ?>
205 206
 				<?php endif ?>
206 207
 			</div>
@@ -216,6 +217,7 @@  discard block
 block discarded – undo
216 217
 		<?php
217 218
 	}
218 219
 	echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
220
+}
219 221
 
220 222
 	if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
221 223
 		$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);
Please login to merge, or discard this patch.
app/Module/FamilyNavigatorModule.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -140,7 +140,8 @@  discard block
 block discarded – undo
140 140
 					<div class="font9">
141 141
 						<?= $spouse->getLifeSpan() ?>
142 142
 					</div>
143
-					<?php else: ?>
143
+					<?php else {
144
+	: ?>
144 145
 						<?= $spouse->getFullName() ?>
145 146
 					<?php endif ?>
146 147
 				</td>
@@ -150,6 +151,7 @@  discard block
 block discarded – undo
150 151
 
151 152
 		foreach ($family->getChildren() as $child) {
152 153
 			$menu = new Menu(Functions::getCloseRelationshipName($controller->record, $child));
154
+}
153 155
 			$menu->addSubmenu(new Menu($this->getFamily($child)));
154 156
 			?>
155 157
 			<tr>
@@ -166,7 +168,8 @@  discard block
 block discarded – undo
166 168
 					<div class="font9">
167 169
 						<?= $child->getLifeSpan() ?>
168 170
 					</div>
169
-					<?php else: ?>
171
+					<?php else {
172
+	: ?>
170 173
 						<?= $child->getFullName() ?>
171 174
 					<?php endif ?>
172 175
 				</td>
@@ -186,6 +189,7 @@  discard block
 block discarded – undo
186 189
 	private function getHTML($person, $showUnknown = false) {
187 190
 		if ($person instanceof Individual) {
188 191
 			return sprintf(self::LNK, $person->getHtmlUrl(), $person->getFullName());
192
+}
189 193
 		} elseif ($showUnknown) {
190 194
 			return sprintf(self::MSG, I18N::translate('unknown'));
191 195
 		} else {
Please login to merge, or discard this patch.
relationship.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,8 @@  discard block
 block discarded – undo
82 82
 				<?php if ($ancestors_only === '1'): ?>
83 83
 					<input type="hidden" name="ancestors" value="1">
84 84
 					<?= I18N::translate('Find relationships via ancestors') ?>
85
-				<?php else: ?>
85
+				<?php else {
86
+	: ?>
86 87
 					<?= Bootstrap4::radioButtons('ancestors', ['0' => I18N::translate('Find any relationship'), '1' => I18N::translate('Find relationships via ancestors')], $ancestors, false) ?>
87 88
 			<?php endif ?>
88 89
 			</div>
@@ -115,6 +116,7 @@  discard block
 block discarded – undo
115 116
 if ($person1 && $person2) {
116 117
 	if (I18N::direction() === 'ltr') {
117 118
 		$diagonal1        = Theme::theme()->parameter('image-dline');
119
+}
118 120
 		$diagonal2        = Theme::theme()->parameter('image-dline2');
119 121
 	} else {
120 122
 		$diagonal1        = Theme::theme()->parameter('image-dline2');
Please login to merge, or discard this patch.