fisharebest / webtrees

admin.php

Braces +39 added lines, -16 removed lines

@@ -523,10 +523,12 @@ 
 	version_compare(PHP_VERSION, '7.0', '<') && date('Y-m-d') >= '2016-08-28'
 ) {
 	$server_warnings[] = I18N::translate('Your web server is using PHP version %s, which is no longer maintained.  You should upgrade to a later version.', PHP_VERSION);
-} else
+} else {
 
 ?>
-<h1><?php echo $controller->getPageTitle(); ?></h1>
+<h1><?php echo $controller->getPageTitle();
+}
+?></h1>
 
 <p>
 	<?php echo I18N::translate('These pages provide access to all the configuration settings and management tools for this webtrees site.'); ?>
@@ -579,8 +581,11 @@ 
 					<a href="admin_site_upgrade.php" class="error">
 						<?php echo /* I18N: %s is a version number */ I18N::translate('Upgrade to webtrees %s.', Filter::escapeHtml($latest_version)); ?>
 					</a>
-					<?php else: ?>
-						<?php echo I18N::translate('This is the latest version of webtrees.  No upgrade is available.'); ?>
+					<?php else {
+	: ?>
+						<?php echo I18N::translate('This is the latest version of webtrees.  No upgrade is available.');
+}
+?>
 					<?php endif; ?>
 				</p>
 				<?php endif; ?>
@@ -742,9 +747,12 @@ 
 									<?php echo I18N::number($changes[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Pending changes'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($individuals[$tree->getTreeId()]): ?>
@@ -752,9 +760,12 @@ 
 									<?php echo I18N::number($individuals[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Individuals'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($families[$tree->getTreeId()]): ?>
@@ -762,9 +773,12 @@ 
 									<?php echo I18N::number($families[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Families'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($sources[$tree->getTreeId()]): ?>
@@ -772,9 +786,12 @@ 
 									<?php echo I18N::number($sources[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Sources'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($repositories[$tree->getTreeId()]): ?>
@@ -782,9 +799,12 @@ 
 									<?php echo I18N::number($repositories[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Repositories'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($media[$tree->getTreeId()]): ?>
@@ -792,9 +812,12 @@ 
 									<?php echo I18N::number($media[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Media objects'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 						</tr>
 						<?php endforeach; ?>

admin_media.php

Braces +10 added lines, -4 removed lines

@@ -648,16 +648,22 @@
 					<div dir="ltr">
 						<?php if (count($media_folders) > 1): ?>
 						<?php echo WT_DATA_DIR, FunctionsEdit::selectEditControl('media_folder', $media_folders, null, $media_folder, 'onchange="this.form.submit();"'); ?>
-						<?php else: ?>
-						<?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder); ?>
+						<?php else {
+	: ?>
+						<?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder);
+}
+?>
 						<input type="hidden" name="media_folder" value="<?php echo Filter::escapeHtml($media_folder); ?>">
 						<?php endif; ?>
 					</div>
 
 					<?php if (count($media_paths) > 1): ?>
 					<?php echo FunctionsEdit::selectEditControl('media_path', $media_paths, null, $media_path, 'onchange="this.form.submit();"'); ?>
-					<?php else: ?>
-					<?php echo Filter::escapeHtml($media_path); ?>
+					<?php else {
+	: ?>
+					<?php echo Filter::escapeHtml($media_path);
+}
+?>
 					<input type="hidden" name="media_path" value="<?php echo Filter::escapeHtml($media_path); ?>">
 					<?php endif; ?>
 

admin_module_reports.php

Braces +5 added lines, -2 removed lines

@@ -74,8 +74,11 @@
 				<td class="col-xs-2">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 						<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-						<?php echo $module->getTitle(); ?>
+					<?php else {
+	: ?>
+						<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

admin_module_tabs.php

Braces +5 added lines, -2 removed lines

@@ -98,8 +98,11 @@
 				<td class="col-xs-1">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 					<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-					<?php echo $module->getTitle(); ?>
+					<?php else {
+	: ?>
+					<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

admin_site_merge.php

Braces +20 added lines, -8 removed lines

@@ -232,9 +232,12 @@ 
 				<?php endforeach; ?>
 				</tbody>
 			</table>
-			<?php else: ?>
+			<?php else {
+	: ?>
 			<p>
-				<?php echo I18N::translate('No matching facts found'); ?>
+				<?php echo I18N::translate('No matching facts found');
+}
+?>
 			</p>
 			<?php endif; ?>
 		</div>
@@ -279,9 +282,12 @@ 
 							<?php endforeach; ?>
 							</tbody>
 						</table>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<p>
-							<?php echo I18N::translate('No matching facts found'); ?>
+							<?php echo I18N::translate('No matching facts found');
+}
+?>
 						</p>
 					<?php endif; ?>
 				</div>
@@ -325,9 +331,12 @@ 
 							<?php endforeach; ?>
 							</tbody>
 						</table>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<p>
-							<?php echo I18N::translate('No matching facts found'); ?>
+							<?php echo I18N::translate('No matching facts found');
+}
+?>
 						</p>
 					<?php endif; ?>
 				</div>
@@ -341,10 +350,13 @@ 
 	</button>
 </form>
 
-<?php else: ?>
+<?php else {
+	: ?>
 
 <form class="form form-horizontal">
-	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
+	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml();
+}
+?>">
 	<p><?php echo /* I18N: Records are indviduals, sources, etc. */ I18N::translate('Select two records to merge.'); ?></p>
 
 	<div class="form-group">

admin_trees_config.php

Braces +10 added lines, -4 removed lines

@@ -554,18 +554,24 @@
 					<div class="bg-danger text-danger">
 						<?php echo $resn->xref, ' — ', I18N::translate('this record does not exist'); ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 					<div class="text-muted">
-						<?php echo I18N::translate('All records'); ?>
+						<?php echo I18N::translate('All records');
+}
+?>
 					</div>
 					<?php endif; ?>
 				</td>
 				<td>
 					<?php if ($resn->tag_label): ?>
 					<?php echo $resn->tag_label; ?>
-					<?php else: ?>
+					<?php else {
+	: ?>
 					<div class="text-muted">
-						<?php echo I18N::translate('All facts and events'); ?>
+						<?php echo I18N::translate('All facts and events');
+}
+?>
 					</div>
 					<?php endif; ?>
 				</td>

admin_trees_duplicates.php

Braces +5 added lines, -2 removed lines

@@ -177,8 +177,11 @@
 	</li>
 <?php endforeach; ?>
 </ul>
-<?php else: ?>
-<p><?php echo I18N::translate('No duplicates have been found.'); ?></p>
+<?php else {
+	: ?>
+<p><?php echo I18N::translate('No duplicates have been found.');
+}
+?></p>
 <?php endif; ?>
 
 <?php endforeach; ?>

admin_trees_manage.php

Braces +5 added lines, -2 removed lines

@@ -433,8 +433,11 @@
 									<i class="fa fa-li fa-star"></i>
 									<?php if ($tree->getName() == Site::getPreference('DEFAULT_GEDCOM')): ?>
 										<?php echo I18N::translate('Default family tree'); ?>
-									<?php else: ?>
-										<a href="#" onclick="document.defaultform<?php echo $tree->getTreeId(); ?>.submit();">
+									<?php else {
+	: ?>
+										<a href="#" onclick="document.defaultform<?php echo $tree->getTreeId();
+}
+?>.submit();">
 											<?php echo I18N::translate('Set as default'); ?>
 											<span class="sr-only">
 										<?php echo $tree->getTitleHtml(); ?>

admin_users.php

Braces +5 added lines, -2 removed lines

@@ -791,8 +791,11 @@
 		<p>
 		<?php if ($ucnt): ?>
 			<input type="submit" value="<?php echo I18N::translate('delete'); ?>">
-			<?php else: ?>
-			<?php echo I18N::translate('Nothing found to cleanup'); ?>
+			<?php else {
+	: ?>
+			<?php echo I18N::translate('Nothing found to cleanup');
+}
+?>
 			<?php endif; ?>
 		</p>
 	</form>