Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com

1 files changed, 40 insertions, 40 deletions

diff --git a/admin_site_merge.php b/admin_site_merge.php
index c07178a72f..7299517b21 100644
--- a/admin_site_merge.php
+++ b/admin_site_merge.php
@@ -27,7 +27,7 @@ use WT\Auth;
 
 define('WT_SCRIPT_NAME', 'admin_site_merge.php');
 require './includes/session.php';
-require_once WT_ROOT.'includes/functions/functions_edit.php';
+require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
 $controller = new WT_Controller_Page;
 $controller
@@ -46,9 +46,9 @@ $ged2   = WT_Filter::post('ged2', null, $ged);
 $keep1  = WT_Filter::postArray('keep1');
 $keep2  = WT_Filter::postArray('keep2');
 
-if ($action!='choose') {
-	if ($gid1==$gid2 && $ged1==$ged2) {
-		$action='choose';
+if ($action != 'choose') {
+	if ($gid1 == $gid2 && $ged1 == $ged2) {
+		$action = 'choose';
 		echo '<span class="error">', WT_I18N::translate('You entered the same IDs.  You cannot merge the same records.'), '</span>';
 	} else {
 		$rec1 = WT_GedcomRecord::getInstance($gid1, WT_Tree::getIdFromName($ged1));
@@ -56,27 +56,27 @@ if ($action!='choose') {
 
 		if (!$rec1) {
 			echo '<span class="error">', WT_I18N::translate('Unable to find record with ID'), ':</span> ', $gid1, ', ', $ged;
-			$action='choose';
+			$action = 'choose';
 		} elseif (!$rec2) {
 			echo '<span class="error">', WT_I18N::translate('Unable to find record with ID'), ':</span> ', $gid2, ', ', $ged2;
-			$action='choose';
+			$action = 'choose';
 		} elseif ($rec1::RECORD_TYPE != $rec2::RECORD_TYPE) {
 			echo '<span class="error">', WT_I18N::translate('Records are not the same type.  Cannot merge records that are not the same type.'), '</span>';
-			$action='choose';
+			$action = 'choose';
 		} else {
 			$facts1 = array();
 			$facts2 = array();
 			foreach ($rec1->getFacts() as $fact) {
 				if (!$fact->isPendingDeletion()) {
-					$facts1[$fact->getFactId()]=$fact;
+					$facts1[$fact->getFactId()] = $fact;
 				}
 			}
 			foreach ($rec2->getFacts() as $fact) {
 				if (!$fact->isPendingDeletion()) {
-					$facts2[$fact->getFactId()]=$fact;
+					$facts2[$fact->getFactId()] = $fact;
 				}
 			}
-			if ($action=='select') {
+			if ($action == 'select') {
 				echo '<div id="merge2"><h3>', WT_I18N::translate('Merge records'), '</h3>';
 				echo '<form method="post" action="admin_site_merge.php">';
 				echo WT_I18N::translate('The following facts were exactly the same in both records and will be merged automatically.'), '<br>';
@@ -91,7 +91,7 @@ if ($action!='choose') {
 					foreach ($facts2 as $fact_id2 => $fact2) {
 						if ($fact_id1 == $fact_id2) {
 							echo '<tr><td><input type="checkbox" name="keep1[]" value="', $fact_id1, '" checked="checked"';
-							if ($ged1!=$ged2 && $fact1->getTarget()) {
+							if ($ged1 != $ged2 && $fact1->getTarget()) {
 								// Don't change links when merging remote facts.
 								echo ' readonly="readonly"';
 							}
@@ -114,7 +114,7 @@ if ($action!='choose') {
 				foreach ($facts1 as $n=>$fact1) {
 					if ($fact1->getTag() != 'CHAN') {
 						echo '<tr><td><input type="checkbox" name="keep1[]" value="', $n, '" checked="checked"';
-						if ($ged1!=$ged2 && $fact1->getTarget()) {
+						if ($ged1 != $ged2 && $fact1->getTarget()) {
 							// Don't change links when merging remote facts.
 							echo ' readonly="readonly"';
 						}
@@ -128,7 +128,7 @@ if ($action!='choose') {
 				foreach ($facts2 as $n=>$fact2) {
 					if ($fact2->getTag() != 'CHAN') {
 						echo '<tr><td><input type="checkbox" name="keep2[]" value="', $n, '"';
-						if ($ged1==$ged2 || !$fact2->getTarget()) {
+						if ($ged1 == $ged2 || !$fact2->getTarget()) {
 							// Don't merge links from different trees.  What would they point to!
 							echo ' checked="checked"';
 						} else {
@@ -143,17 +143,17 @@ if ($action!='choose') {
 				echo '</table>';
 				echo '<input type="submit" value="', WT_I18N::translate('save'), '">';
 				echo '</form></div>';
-			} elseif ($action=='merge') {
+			} elseif ($action == 'merge') {
 				echo '<div id="merge3"><h3>', WT_I18N::translate('Merge records'), '</h3>';
-				if ($GEDCOM==$ged2) {
+				if ($GEDCOM == $ged2) {
 					//-- replace all the records that linked to gid2
-					$ids=fetch_all_links($gid2, WT_GED_ID);
+					$ids = fetch_all_links($gid2, WT_GED_ID);
 					foreach ($ids as $id) {
-						$record=WT_GedcomRecord::getInstance($id);
+						$record = WT_GedcomRecord::getInstance($id);
 						if (!$record->isPendingDeletion()) {
 							echo WT_I18N::translate('Updating linked record'), ' ', $id, '<br>';
-							$gedcom=str_replace("@$gid2@", "@$gid1@", $record->getGedcom());
-							$gedcom=preg_replace(
+							$gedcom = str_replace("@$gid2@", "@$gid1@", $record->getGedcom());
+							$gedcom = preg_replace(
 								'/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))((?:\n1.*(?:\n[2-9].*)*)*\1)/',
 								'$2',
 								$gedcom
@@ -163,26 +163,26 @@ if ($action!='choose') {
 					}
 					// Update any linked user-accounts
 					WT_DB::prepare(
-						"UPDATE `##user_gedcom_setting`".
-						" SET setting_value=?".
+						"UPDATE `##user_gedcom_setting`" .
+						" SET setting_value=?" .
 						" WHERE gedcom_id=? AND setting_name='gedcomid' AND setting_value=?"
 					)->execute(array($gid2, WT_GED_ID, $gid1));
 
 					// Merge hit counters
-					$hits=WT_DB::prepare(
-						"SELECT page_name, SUM(page_count)".
-						" FROM `##hit_counter`".
-						" WHERE gedcom_id=? AND page_parameter IN (?, ?)".
+					$hits = WT_DB::prepare(
+						"SELECT page_name, SUM(page_count)" .
+						" FROM `##hit_counter`" .
+						" WHERE gedcom_id=? AND page_parameter IN (?, ?)" .
 						" GROUP BY page_name"
 					)->execute(array(WT_GED_ID, $gid1, $gid2))->fetchAssoc();
 					foreach ($hits as $page_name=>$page_count) {
 						WT_DB::prepare(
-							"UPDATE `##hit_counter` SET page_count=?".
+							"UPDATE `##hit_counter` SET page_count=?" .
 							" WHERE gedcom_id=? AND page_name=? AND page_parameter=?"
 						)->execute(array($page_count, WT_GED_ID, $page_name, $gid1));
 					}
 					WT_DB::prepare(
-						"DELETE FROM `##hit_counter`".
+						"DELETE FROM `##hit_counter`" .
 						" WHERE gedcom_id=? AND page_parameter=?"
 					)->execute(array(WT_GED_ID, $gid2));
 				}
@@ -207,10 +207,10 @@ if ($action!='choose') {
 					'<p>',
 						WT_I18N::translate(
 							'Record %s successfully updated.',
-							'<a href="'.$rec1->getHtmlUrl().'">'.$rec1->getXref().'</a>'
+							'<a href="' . $rec1->getHtmlUrl() . '">' . $rec1->getXref() . '</a>'
 						),
 					'</p';
-				$fav_count=update_favorites($gid2, $gid1);
+				$fav_count = update_favorites($gid2, $gid1);
 				if ($fav_count > 0) {
 					echo '<p>', $fav_count, ' ', WT_I18N::translate('favorites updated.'), '<p>';
 				}
@@ -219,7 +219,7 @@ if ($action!='choose') {
 		}
 	}
 }
-if ($action=='choose') {
+if ($action == 'choose') {
 	$controller->addInlineJavascript('
 	function iopen_find(textbox, gedselect) {
 		ged = gedselect.options[gedselect.selectedIndex].value;
@@ -245,13 +245,13 @@ if ($action=='choose') {
 		WT_I18N::translate('Merge to ID:'),
 		'</td><td>
 		<select name="ged" tabindex="4" onchange="jQuery(\'#gid1\').data(\'autocomplete-ged\', jQuery(this).val());"';
-	if (count(WT_Tree::getAll())==1) {
+	if (count(WT_Tree::getAll()) == 1) {
 		echo 'style="width:1px;visibility:hidden;"';
 	}
 	echo ' >';
 	foreach (WT_Tree::getAll() as $tree) {
 		echo '<option value="', $tree->tree_name_html, '"';
-		if (empty($ged) && $tree->tree_id==WT_GED_ID || !empty($ged) && $ged==$tree->tree_name) {
+		if (empty($ged) && $tree->tree_id == WT_GED_ID || !empty($ged) && $ged == $tree->tree_name) {
 			echo ' selected="selected"';
 		}
 		echo ' dir="auto">', $tree->tree_title_html, '</option>';
@@ -259,20 +259,20 @@ if ($action=='choose') {
 	echo
 		'</select>
 		<input data-autocomplete-type="INDI" type="text" name="gid1" id="gid1" value="', $gid1, '" size="10" tabindex="1" autofocus="autofocus">
-		<a href="#" onclick="iopen_find(document.merge.gid1, document.merge.ged);" tabindex="6" class="icon-button_indi" title="'.WT_I18N::translate('Find an individual').'"></a>
-		<a href="#" onclick="fopen_find(document.merge.gid1, document.merge.ged);" tabindex="8" class="icon-button_family" title="'.WT_I18N::translate('Find a family').'"></a>
-		<a href="#" onclick="sopen_find(document.merge.gid1, document.merge.ged);" tabindex="10" class="icon-button_source" title="'.WT_I18N::translate('Find a source').'"></a>
+		<a href="#" onclick="iopen_find(document.merge.gid1, document.merge.ged);" tabindex="6" class="icon-button_indi" title="'.WT_I18N::translate('Find an individual') . '"></a>
+		<a href="#" onclick="fopen_find(document.merge.gid1, document.merge.ged);" tabindex="8" class="icon-button_family" title="'.WT_I18N::translate('Find a family') . '"></a>
+		<a href="#" onclick="sopen_find(document.merge.gid1, document.merge.ged);" tabindex="10" class="icon-button_source" title="'.WT_I18N::translate('Find a source') . '"></a>
 		</td></tr><tr><td>',
 		WT_I18N::translate('Merge from ID:'),
 		'</td><td>
 		<select name="ged2" tabindex="5" onchange="jQuery(\'#gid2\').data(\'autocomplete-ged\', jQuery(this).val());"';
-	if (count(WT_Tree::getAll())==1) {
+	if (count(WT_Tree::getAll()) == 1) {
 		echo 'style="width:1px;visibility:hidden;"';
 	}
 	echo ' >';
 	foreach (WT_Tree::getAll() as $tree) {
 		echo '<option value="', $tree->tree_name_html, '"';
-		if (empty($ged2) && $tree->tree_id==WT_GED_ID || !empty($ged2) && $ged2==$tree->tree_name) {
+		if (empty($ged2) && $tree->tree_id == WT_GED_ID || !empty($ged2) && $ged2 == $tree->tree_name) {
 			echo ' selected="selected"';
 		}
 		echo ' dir="auto">', $tree->tree_title_html, '</option>';
@@ -280,9 +280,9 @@ if ($action=='choose') {
 	echo
 		'</select>
 		<input data-autocomplete-type="INDI" type="text" name="gid2" id="gid2" value="', $gid2, '" size="10" tabindex="2">
-		<a href="#" onclick="iopen_find(document.merge.gid2, document.merge.ged2);" tabindex="7" class="icon-button_indi" title="'.WT_I18N::translate('Find an individual').'"></a>
-		<a href="#" onclick="fopen_find(document.merge.gid2, document.merge.ged2);" tabindex="9" class="icon-button_family" title="'.WT_I18N::translate('Find a family').'"></a>
-		<a href="#" onclick="sopen_find(document.merge.gid2, document.merge.ged2);" tabindex="11" class="icon-button_source" title="'.WT_I18N::translate('Find a source').'"></a>
+		<a href="#" onclick="iopen_find(document.merge.gid2, document.merge.ged2);" tabindex="7" class="icon-button_indi" title="'.WT_I18N::translate('Find an individual') . '"></a>
+		<a href="#" onclick="fopen_find(document.merge.gid2, document.merge.ged2);" tabindex="9" class="icon-button_family" title="'.WT_I18N::translate('Find a family') . '"></a>
+		<a href="#" onclick="sopen_find(document.merge.gid2, document.merge.ged2);" tabindex="11" class="icon-button_source" title="'.WT_I18N::translate('Find a source') . '"></a>
 		</td></tr></table>
 		<input type="submit" value="', WT_I18N::translate('next'), '" tabindex="3">
 		</form></div>';