fisharebest / webtrees

login.php

Braces +12 added lines, -4 removed lines

@@ -52,10 +52,18 @@
 $password        = Filter::post('password');
 
 // These parameters may come from the URL which is emailed to users.
-if (!$action)        $action        = Filter::get('action');
-if (!$user_name)     $user_name     = Filter::get('user_name');
-if (!$user_hashcode) $user_hashcode = Filter::get('user_hashcode');
-if (!$url)           $url           = Filter::get('url');
+if (!$action) {
+	$action        = Filter::get('action');
+}
+if (!$user_name) {
+	$user_name     = Filter::get('user_name');
+}
+if (!$user_hashcode) {
+	$user_hashcode = Filter::get('user_hashcode');
+}
+if (!$url) {
+	$url           = Filter::get('url');
+}
 
 $message = '';
 

app/Module/GoogleMapsModule.php

Braces +55 added lines, -29 removed lines

@@ -825,7 +825,9 @@ 
 			$person = $this->ancestors[$i];
 			if (!empty($person)) {
 				$name = $person->getFullName();
-				if ($name == I18N::translate('Private')) $priv++;
+				if ($name == I18N::translate('Private')) {
+					$priv++;
+				}
 				$place = $person->getBirthPlace();
 				if (empty($place)) {
 					$latlongval[$i] = null;
@@ -1715,8 +1717,9 @@ 
 
 				if ($row['pl_place'] != '') {
 					$placestr2 = $mapstr_edit . $id . "&level=" . $level . $mapstr3 . $mapstr5 . I18N::translate('Zoom=') . $row['pl_zoom'] . $mapstr6 . $row['pl_placerequested'] . $mapstr8;
-					if ($row['pl_place'] === 'unknown')
-						$matched[$x]++;
+					if ($row['pl_place'] === 'unknown') {
+											$matched[$x]++;
+					}
 				} else {
 					if ($levels[$z] === 'unknown') {
 						$placestr2 = $mapstr_add . $id . "&amp;level=" . $level . $mapstr3 . $mapstr7 . "<strong>" . I18N::translate('unknown') . "</strong>" . $mapstr8; $matched[$x]++;
@@ -2828,8 +2831,9 @@ 
 			$parent[$level] = $place2['place'];
 			$this->printHowManyPeople($level + 1, $parent);
 			echo '<br>', I18N::translate('This place has no coordinates');
-			if (Auth::isAdmin())
-				echo "<br><a href='module.php?mod=googlemap&amp;mod_action=admin_places&amp;parent=", $levelm, "&amp;display=inactive'>", I18N::translate('Geographic data'), "</a>";
+			if (Auth::isAdmin()) {
+							echo "<br><a href='module.php?mod=googlemap&amp;mod_action=admin_places&amp;parent=", $levelm, "&amp;display=inactive'>", I18N::translate('Geographic data'), "</a>";
+			}
 			echo "</div>\", icon_type, \"", str_replace(array('&lrm;', '&rlm;'), array(WT_UTF8_LRM, WT_UTF8_RLM), addslashes($place2['place'])), "\");\n";
 		} else {
 			$lati = str_replace(array('N', 'S', ','), array('', '-', '.'), $place2['lati']);
@@ -3030,7 +3034,8 @@ 
 		ob_start(); // TODO: rewrite print_gm_markers, and the functions called therein, to either return text or add JS directly.
 
 		if ($numfound == 0 && $level > 0) {
-			if (isset($levelo[($level - 1)])) {  // ** BH not sure yet what this if statement is for ... TODO **
+			if (isset($levelo[($level - 1)])) {
+// ** BH not sure yet what this if statement is for ... TODO **
 				// show the current place on the map
 
 				$place = Database::prepare("SELECT pl_id as place_id, pl_place as place, pl_lati as lati, pl_long as `long`, pl_zoom as zoom, pl_icon as icon FROM `##placelocation` WHERE pl_id=?")
@@ -3305,10 +3310,11 @@ 
 			$place_name       = $row->pl_place;
 			$place_icon       = $row->pl_icon;
 			$selected_country = explode("/", $place_icon);
-			if (isset($selected_country[1]) && $selected_country[1] != "flags")
-				$selected_country = $selected_country[1];
-			else
-				$selected_country = "Countries";
+			if (isset($selected_country[1]) && $selected_country[1] != "flags") {
+							$selected_country = $selected_country[1];
+			} else {
+							$selected_country = "Countries";
+			}
 			$parent_id         = $row->pl_parent_id;
 			$level             = $row->pl_level;
 			$zoomfactor        = $row->pl_zoom;
@@ -3387,8 +3393,9 @@ 
 			} else {
 				echo '<b>', $place_name;
 			}
-			if (count($where_am_i) > 0)
-				echo ', ', Filter::escapeHtml(str_replace('Unknown', I18N::translate('unknown'), implode(I18N::$list_separator, array_reverse($where_am_i, true)))), '</b><br>';
+			if (count($where_am_i) > 0) {
+							echo ', ', Filter::escapeHtml(str_replace('Unknown', I18N::translate('unknown'), implode(I18N::$list_separator, array_reverse($where_am_i, true)))), '</b><br>';
+			}
 			echo '</b><br>';
 		}
 
@@ -3897,7 +3904,8 @@ 
 			}
 
 			function showLocation_level(address) {
-				address += '<?php if ($level > 0) echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))) ?>';
+				address += '<?php if ($level > 0) {
+	echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))) ?>';
 				geocoder.geocode({'address': address}, addAddressToMap);
 			}
 
@@ -3946,6 +3954,7 @@ 
 				</td>
 				<?php
 					$exp = explode(".", $place_lati);
+}
 					if (isset($exp[1])) {
 						$precision1 = strlen($exp[1]);
 					} else {
@@ -3958,13 +3967,15 @@ 
 						$precision2 = -1;
 					}
 					($precision1 > $precision2) ? ($precision = $precision1) : ($precision = $precision2);
-					if ($precision == -1) ($level > 3) ? ($precision = 3) : ($precision = $level);
-					elseif ($precision > 5) {
+					if ($precision == -1) {
+						($level > 3) ? ($precision = 3) : ($precision = $level);
+					} elseif ($precision > 5) {
 						$precision = 5;
 					}
 				?>
 				<td class="optionbox" colspan="2">
-					<input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_0') ?>">
+					<input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_0')) {
+	echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_0') ?>">
 					<label for="new_prec_0"><?php echo I18N::translate('Country') ?></label>
 					<input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if ($precision == $this->getSetting('GM_PRECISION_1')) echo 'checked' ?> value="<?php echo $this->getSetting('GM_PRECISION_1') ?>">
 					<label for="new_prec_1"><?php echo I18N::translate('State') ?></label>
@@ -3986,8 +3997,13 @@ 
 				<td class="optionbox" colspan="2">
 					<input type="text" id="NEW_PLACE_LATI" name="NEW_PLACE_LATI" placeholder="<?php echo /* I18N: Measure of latitude/longitude */ I18N::translate('degrees') ?>" value="<?php echo abs($place_lati) ?>" size="20" onchange="updateMap();">
 					<select name="LATI_CONTROL" onchange="updateMap();">
-						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected"; echo ">", I18N::translate('north') ?></option>
-						<option value="PL_S" <?php if ($place_lati < 0) echo "selected"; echo ">", I18N::translate('south') ?></option>
+						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected";
+}
+echo ">", I18N::translate('north') ?></option>
+						<option value="PL_S" <?php if ($place_lati < 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('south') ?></option>
 					</select>
 				</td>
 			</tr>
@@ -3996,8 +4012,14 @@ 
 				<td class="optionbox" colspan="2">
 					<input type="text" id="NEW_PLACE_LONG" name="NEW_PLACE_LONG" placeholder="<?php echo I18N::translate('degrees') ?>" value="<?php echo abs($place_long) ?>" size="20" onchange="updateMap();">
 					<select name="LONG_CONTROL" onchange="updateMap();">
-						<option value="PL_E" <?php if ($place_long >= 0) echo "selected"; echo ">", I18N::translate('east') ?></option>
-						<option value="PL_W" <?php if ($place_long < 0) echo "selected"; echo ">", I18N::translate('west') ?></option>
+						<option value="PL_E" <?php if ($place_long >= 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('east') ?></option>
+						<option value="PL_W" <?php if ($place_long < 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('west') ?></option>
 					</select>
 				</td>
 			</tr>
@@ -4210,8 +4232,9 @@ 
 				$parent    = array_reverse($parent);
 				$parent_id = 0;
 				for ($i = 0; $i < count($parent); $i++) {
-					if (!isset($default_zoom_level[$i]))
-						$default_zoom_level[$i] = $default_zoom_level[$i - 1];
+					if (!isset($default_zoom_level[$i])) {
+											$default_zoom_level[$i] = $default_zoom_level[$i - 1];
+					}
 					$escparent               = $parent[$i];
 					if ($escparent == '') {
 						$escparent = 'Unknown';
@@ -4451,7 +4474,8 @@ 
 						Database::prepare("SELECT pl_id, pl_long, pl_lati, pl_zoom, pl_icon FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place")
 						->execute(array($i, $parent_id, $escparent))
 						->fetchOneRow();
-					if (empty($row)) {       // this name does not yet exist: create entry
+					if (empty($row)) {
+// this name does not yet exist: create entry
 						if (!Filter::postBool('updateonly')) {
 							$highestIndex = $highestIndex + 1;
 							if (($i + 1) == count($parent)) {
@@ -4590,14 +4614,16 @@ 
 		echo '<th>', I18N::translate('Icon'), '</th>';
 		echo '<th>';
 		echo I18N::translate('Edit'), '</th><th>', I18N::translate('Delete'), '</th></tr>';
-		if (count($placelist) == 0)
-			echo '<tr><td colspan="7">', I18N::translate('No places found'), '</td></tr>';
+		if (count($placelist) == 0) {
+					echo '<tr><td colspan="7">', I18N::translate('No places found'), '</td></tr>';
+		}
 		foreach ($placelist as $place) {
 			echo '<tr><td><a href="module.php?mod=googlemap&mod_action=admin_places&parent=', $place['place_id'], '&inactive=', $inactive, '">';
-			if ($place['place'] != 'Unknown')
-					echo Filter::escapeHtml($place['place']), '</a></td>';
-				else
-					echo I18N::translate('unknown'), '</a></td>';
+			if ($place['place'] != 'Unknown') {
+								echo Filter::escapeHtml($place['place']), '</a></td>';
+			} else {
+									echo I18N::translate('unknown'), '</a></td>';
+				}
 			echo '<td>', $place['lati'], '</td>';
 			echo '<td>', $place['long'], '</td>';
 			echo '<td>', $place['zoom'], '</td>';

admin.php

Braces +39 added lines, -16 removed lines

@@ -528,10 +528,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.'); ?>
@@ -584,8 +586,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; ?>
@@ -747,9 +752,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()]): ?>
@@ -757,9 +765,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()]): ?>
@@ -767,9 +778,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()]): ?>
@@ -777,9 +791,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()]): ?>
@@ -787,9 +804,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()]): ?>
@@ -797,9 +817,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; ?>

app/Module/BatchUpdateModule.php

Braces +10 added lines, -4 removed lines

@@ -236,12 +236,15 @@ 
 					<?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
 					<?php // page, which makes them all again!  ?>
 					<script>reset_reload();</script>
-			<?php else: ?>
+			<?php else {
+	: ?>
 					<hr>
 					<div id="batch_update2" class="col-sm-12">
 						<?php if ($this->curr_xref): ?>
 							<?php // Create an object, so we can get the latest version of the name. ?>
-								<?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE); ?>
+								<?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE);
+}
+?>
 							<div class="form-group">
 								<?php echo self::createSubmitButton(I18N::translate('previous'), $this->prev_xref) ?>
 					<?php echo self::createSubmitButton(I18N::translate('next'), $this->next_xref) ?>
@@ -253,8 +256,11 @@ 
 							<div class="form-group">
 							<?php echo implode(' ', $this->PLUGIN->getActionButtons($this->curr_xref, $this->record)); ?>
 							</div>
-						<?php else: ?>
-							<div class="alert alert-info"><?php echo I18N::translate('Nothing found.'); ?></div>
+						<?php else {
+	: ?>
+							<div class="alert alert-info"><?php echo I18N::translate('Nothing found.');
+}
+?></div>
 					<?php endif; ?>
 					</div>
 				<?php endif; ?>

app/I18N.php

Braces +2 added lines, -1 removed lines

@@ -421,7 +421,8 @@
 				$translation  = new Translation($translation_file);
 				$translations = array_merge($translations, $translation->asArray());
 			}
-			if ($cache_dir_exists && is_writeable($cache_file)) { // During setup, we may not have been able to create it.
+			if ($cache_dir_exists && is_writeable($cache_file)) {
+// During setup, we may not have been able to create it.
 				file_put_contents($cache_file, '<' . '?php return ' . var_export($translations, true) . ';');
 			}
 		} else {