fisharebest / webtrees

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>

app/Database.php

Spacing +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 		// Create the underlying PDO object
 		self::$pdo = new PDO(
 			(substr($DBHOST, 0, 1) === '/' ?
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
 			),
 			$DBUSER, $DBPASS,
 			array(

app/File.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		try {
 			$fp = fsockopen($scheme . $host, $port, $errno, $errstr, 5);
 
-			fputs($fp, "GET $path?$query HTTP/1.0\r\nHost: $host\r\nConnection: Close\r\n\r\n");
+			fputs($fp, "get $path?$query HTTP/1.0\r\nHost: $host\r\nConnection: Close\r\n\r\n");
 
 			// The first part of the response include the HTTP headers
 			$response = fread($fp, 65536);

app/Module/StoriesModule.php

Braces +5 added lines, -2 removed lines

@@ -389,8 +389,11 @@
 						<a href="<?php echo $individual->getHtmlUrl(); ?>#stories">
 							<?php echo $individual->getFullName(); ?>
 						</a>
-						<?php else: ?>
-							<?php echo $story->xref; ?>
+						<?php else {
+	: ?>
+							<?php echo $story->xref;
+}
+?>
 						<?php endif; ?>
 						</td>
 						<td>

calendar.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -67,14 +67,14 @@
 	if (strlen($match[1]) > strlen($match[2])) {
 		$match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
 	}
-	$ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
+	$ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
 	$view     = 'year';
 } else {
 	// advanced-year "decade/century wildcard"
 	if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
 		$y1       = $match[1] . str_replace('?', '0', $match[2]);
 		$y2       = $match[1] . str_replace('?', '9', $match[2]);
-		$ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
+		$ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
 		$view     = 'year';
 	} else {
 		if ($year < 0) {

medialist.php

Braces +5 added lines, -2 removed lines

@@ -110,10 +110,13 @@
 						</option>
 					</select>
 				</td>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<td class="descriptionbox wrap"></td>
 					<td class="optionbox wrap"></td>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 			</tr>
 			<tr>
 				<td class="descriptionbox wrap">

search_advanced.php

Braces +92 added lines, -23 removed lines

@@ -154,10 +154,22 @@ 
 				<input type="text" id="value<?php echo $i; ?>" name="values[<?php echo $i; ?>]" value="<?php echo Filter::escapeHtml($controller->getValue($i)); ?>"<?php echo substr($controller->getField($i), -4) == 'PLAC' ? 'data-autocomplete-type="PLAC"' : ''; ?>>
 			<?php if (preg_match("/^NAME:/", $currentFieldSearch) > 0) { ?>
 				<select name="fields[<?php echo $i; ?>]">
-					<option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-					<option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-					<option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-					<option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+					<option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+					<option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+					<option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+					<option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 				</select>
 			<?php } else { ?>
 			<input type="hidden" name="fields[<?php echo $i; ?>]" value="<?php echo $controller->getField($i); ?>">
@@ -166,9 +178,18 @@ 
 				?>
 				<select name="plusminus[<?php echo $i; ?>]">
 					<option value=""><?php echo I18N::translate('Exact date'); ?></option>
-					<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 2, I18N::number(2)); ?></option>
-					<option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 5, I18N::number(5)); ?></option>
-					<option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 10) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 10, I18N::number(10)); ?></option>
+					<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) {
+	echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 2, I18N::number(2)); ?></option>
+					<option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) {
+	echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 5, I18N::number(5)); ?></option>
+					<option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 10) {
+	echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 10, I18N::number(10)); ?></option>
 				</select>
 			<?php } ?>
 		</td>
@@ -216,10 +237,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:GIVN:' . $fatherGivnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 	</tr>
@@ -231,10 +264,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:SURN:' . $fatherSurnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 	</tr>
@@ -252,10 +297,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:GIVN:' . $motherGivnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 		<?php $j++; ?>
@@ -267,10 +324,22 @@ 
 		<td class="list_value">
 			<input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:SURN:' . $motherSurnOption)); ?>">
 			<select name="fields[<?php echo $j; ?>]">
-				<option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-				<option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-				<option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-				<option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') {
+	'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+				<option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') {
+	echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
 			</select>
 		</td>
 		<?php $j++; ?>

admin.php

Braces +35 added lines, -14 removed lines

@@ -611,8 +611,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; ?>
@@ -774,9 +777,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()]): ?>
@@ -784,9 +790,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()]): ?>
@@ -794,9 +803,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()]): ?>
@@ -804,9 +816,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()]): ?>
@@ -814,9 +829,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()]): ?>
@@ -824,9 +842,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; ?>