fisharebest / webtrees

relationship.php

Braces +5 added lines, -2 removed lines

@@ -101,7 +101,8 @@ 
 					<?php if ($max_recursion == 0): ?>
 						<?php echo I18N::translate('Find the closest relationships') ?>
 						<input type="hidden" name="recursion" value="0">
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<label>
 							<input type="radio" name="recursion" value="0" <?php echo $recursion == 0 ? 'checked' : '' ?>>
 							<?php echo I18N::translate('Find the closest relationships') ?>
@@ -113,7 +114,9 @@ 
 								<?php echo I18N::translate('Find all possible relationships') ?>
 							<?php else: ?>
 								<?php echo I18N::translate('Find other relationships') ?>
-							<?php endif; ?>
+							<?php endif;
+}
+?>
 						</label>
 					<?php endif; ?>
 				</td>

app/Controller/RelationshipController.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 			while (list(, $next) = each($queue)) {
 				// For each family on the path
 				for ($n = count($next['path']) - 2; $n >= 1; $n -= 2) {
-					$exclude   = $next['exclude'];
+					$exclude = $next['exclude'];
 					if (count($exclude) >= $recursion) {
 						continue;
 					}

app/Theme/AbstractTheme.php

Doc Comments +11 added lines, -11 removed lines

@@ -1115,7 +1115,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1130,7 +1130,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1145,7 +1145,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1160,7 +1160,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1192,7 +1192,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1207,7 +1207,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1222,7 +1222,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1237,7 +1237,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1267,7 +1267,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1280,7 +1280,7 @@ 
 	/**
 	 * Generate a menu item for the statistics charts.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1295,7 +1295,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */

app/Module/GoogleMapsModule.php

Switch Indentation +12 added lines, -12 removed lines

@@ -2035,18 +2035,18 @@
 								'tooltip'      => $birth->getPlace()->getGedcomName(),
 							);
 \							switch ($child->getSex()) {
-							case'F':
-								$gmark['fact_label'] = I18N::translate('daughter');
-								$gmark['class']      = 'person_boxF';
-								break;
-							case 'M':
-								$gmark['fact_label'] = I18N::translate('son');
-								$gmark['class']      = 'person_box';
-								break;
-							default:
-								$gmark['fact_label'] = I18N::translate('child');
-								$gmark['class']      = 'person_boxNN';
-								break;
+case'F':
+	$gmark['fact_label'] = I18N::translate('daughter');
+	$gmark['class']      = 'person_boxF';
+	break;
+case 'M':
+	$gmark['fact_label'] = I18N::translate('son');
+	$gmark['class']      = 'person_box';
+	break;
+default:
+	$gmark['fact_label'] = I18N::translate('child');
+	$gmark['class']      = 'person_boxNN';
+	break;
 							}
 							$gmarks[] = $gmark;
 						} else {

Spacing +1 added lines, -1 removed lines

@@ -2469,7 +2469,7 @@
 			if ($key == 0) {
 				$key_mark = 0;
 			}
-			else if ($gmark['place'] == $gmarks[$key-1]['place']) {
+			else if ($gmark['place'] == $gmarks[$key - 1]['place']) {
 				$key_mark = $key_mark;
 			} else {
 				$key_mark++;

Braces +20 added lines, -8 removed lines

@@ -2468,8 +2468,7 @@ 
 			echo '<td class="facts_label">';
 			if ($key == 0) {
 				$key_mark = 0;
-			}
-			else if ($gmark['place'] == $gmarks[$key-1]['place']) {
+			} else if ($gmark['place'] == $gmarks[$key-1]['place']) {
 				$key_mark = $key_mark;
 			} else {
 				$key_mark++;
@@ -3024,7 +3023,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=?")
@@ -3857,7 +3857,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);
 			}
 
@@ -3902,8 +3903,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" id="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>
@@ -3912,8 +3918,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" id="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>