fisharebest / webtrees

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>

themes/_custom/theme.php

Braces +10 added lines, -5 removed lines

@@ -31,14 +31,16 @@ 
  * Only the first two functions are required: themeId() and themeName().
  * The rest are just examples, and should be removed in actual themes.
  */
-class MyTheme extends WebtreesTheme {
+class MyTheme extends WebtreesTheme
+{
 	/**
 	 * Give your theme a unique identifier. Themes beginning with an underscore
 	 * are reserved for internal use.
 	 *
 	 * {@inheritdoc}
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return '_custom';
 	}
 
@@ -51,7 +53,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return 'Custom theme';
 	}
 
@@ -60,7 +63,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function stylesheets() {
+	public function stylesheets()
+	{
 		$css_files   = parent::stylesheets();
 		// Put a version number in the URL, to prevent browsers from caching old versions.
 		$css_files[] = WT_BASE_URL . 'themes/_custom/custom-v1.0.css';
@@ -75,7 +79,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function menuLists($surname) {
+	public function menuLists($surname)
+	{
 		// Start with the default "Lists" menu.
 		$menu = parent::menuLists($surname);
 		// Remove the "notes" sub-menu.

statisticsplot.php

Braces +30 added lines, -15 removed lines

@@ -36,7 +36,8 @@ 
  *
  * @return int
  */
-function month_of_birth($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_birth($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -92,7 +93,8 @@ 
  *
  * @return int
  */
-function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -148,7 +150,8 @@ 
  *
  * @return int
  */
-function month_of_death($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_death($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -204,7 +207,8 @@ 
  *
  * @return int
  */
-function month_of_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -245,7 +249,8 @@ 
  *
  * @return int
  */
-function month_of_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_first_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -298,7 +303,8 @@ 
  *
  * @return int
  */
-function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats) {
+function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -350,7 +356,8 @@ 
  *
  * @return int
  */
-function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats) {
+function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -402,7 +409,8 @@ 
  *
  * @return int
  */
-function age_at_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function age_at_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -456,7 +464,8 @@ 
  *
  * @return int
  */
-function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -533,7 +542,8 @@ 
  *
  * @return int
  */
-function number_of_children($z_axis, array $z_boundaries, Stats $stats) {
+function number_of_children($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -575,7 +585,8 @@ 
  * @param int $x
  * @param int $val
  */
-function fill_y_data($z, $x, $val) {
+function fill_y_data($z, $x, $val)
+{
 	global $ydata, $xmax, $x_boundaries, $zmax, $z_boundaries, $xgiven, $zgiven;
 	//-- calculate index $i out of given z value
 	//-- calculate index $j out of given x value
@@ -612,7 +623,8 @@ 
  * @param string      $ytitle
  * @param string[]    $legend
  */
-function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend) {
+function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend)
+{
 	global $percentage, $male_female, $ymax, $scalefactor, $datastring, $imgurl;
 
 	// Google Chart API only allows text encoding for numbers less than 100
@@ -752,7 +764,8 @@ 
  *
  * @param string $x_axis_boundaries
  */
-function calculate_axis($x_axis_boundaries) {
+function calculate_axis($x_axis_boundaries)
+{
 	global $x_axis, $xdata, $xmax, $x_boundaries;
 
 	// Calculate xdata and zdata elements out of chart values
@@ -801,7 +814,8 @@ 
  *
  * @return string
  */
-function format_range_of_numbers($x, $y) {
+function format_range_of_numbers($x, $y)
+{
 	return /* I18N: A range of numbers */ I18N::translate(
 		'%1$s–%2$s',
 		I18N::number($x),
@@ -814,7 +828,8 @@ 
  *
  * @param string $boundaries_z_axis
  */
-function calculate_legend($boundaries_z_axis) {
+function calculate_legend($boundaries_z_axis)
+{
 	global $legend, $zmax, $z_boundaries;
 
 	// calculate the legend values

admin_trees_check.php

Braces +10 added lines, -5 removed lines

@@ -223,7 +223,8 @@ 
  *
  * @return string
  */
-function link_message($type1, $xref1, $type2, $xref2) {
+function link_message($type1, $xref1, $type2, $xref2)
+{
 	return /* I18N: The placeholders are GEDCOM XREFs and tags. e.g. “INDI I123 contains a FAMC link to F234.” */ I18N::translate(
 		'%1$s %2$s has a %3$s link to %4$s.',
 		format_type($type1),
@@ -240,7 +241,8 @@ 
  *
  * @return string
  */
-function format_link($xref) {
+function format_link($xref)
+{
 	return '<b><a href="gedrecord.php?pid=' . $xref . '">' . $xref . '</a></b>';
 }
 
@@ -251,7 +253,8 @@ 
  *
  * @return string
  */
-function format_type($type) {
+function format_type($type)
+{
 	return '<b title="' . strip_tags(GedcomTag::getLabel($type)) . '">' . $type . '</b>';
 }
 
@@ -262,7 +265,8 @@ 
  *
  * @return string
  */
-function error($message) {
+function error($message)
+{
 	global $errors;
 	$errors = true;
 
@@ -276,7 +280,8 @@ 
  *
  * @return string
  */
-function warning($message) {
+function warning($message)
+{
 	global $errors;
 	$errors = true;
 

admin_trees_manage.php

Braces +5 added lines, -2 removed lines

@@ -436,8 +436,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(); ?>

message.php

Braces +2 added lines, -1 removed lines

@@ -208,7 +208,8 @@
  *
  * @return bool
  */
-function addMessage($message) {
+function addMessage($message)
+{
 	global $WT_TREE;
 
 	$success = true;

admin_site_merge.php

Braces +20 added lines, -8 removed lines

@@ -236,9 +236,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>
@@ -283,9 +286,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>
@@ -329,9 +335,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>
@@ -345,10 +354,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.php

Braces +35 added lines, -14 removed lines

@@ -633,8 +633,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; ?>
@@ -796,9 +799,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()]): ?>
@@ -806,9 +812,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()]): ?>
@@ -816,9 +825,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()]): ?>
@@ -826,9 +838,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()]): ?>
@@ -836,9 +851,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()]): ?>
@@ -846,9 +864,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_module_sidebar.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>