fisharebest / webtrees

admin_trees_renumber.php

Indentation +236 added lines, -236 removed lines

@@ -29,259 +29,259 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate(/* I18N: Renumber the records in a family tree */ 'Renumber family tree') . ' — ' . $WT_TREE->getTitleHtml())
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate(/* I18N: Renumber the records in a family tree */ 'Renumber family tree') . ' — ' . $WT_TREE->getTitleHtml())
+    ->pageHeader();
 
 // Every XREF used by this tree and also used by some other tree
 $xrefs = Database::prepare(
-	"SELECT xref, type FROM (" .
-	" SELECT i_id AS xref, 'INDI' AS type FROM `##individuals` WHERE i_file = ?" .
-	"  UNION " .
-	" SELECT f_id AS xref, 'FAM' AS type FROM `##families` WHERE f_file = ?" .
-	"  UNION " .
-	" SELECT s_id AS xref, 'SOUR' AS type FROM `##sources` WHERE s_file = ?" .
-	"  UNION " .
-	" SELECT m_id AS xref, 'OBJE' AS type FROM `##media` WHERE m_file = ?" .
-	"  UNION " .
-	" SELECT o_id AS xref, o_type AS type FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
-	") AS this_tree JOIN (" .
-	" SELECT xref FROM `##change` WHERE gedcom_id <> ?" .
-	"  UNION " .
-	" SELECT i_id AS xref FROM `##individuals` WHERE i_file <> ?" .
-	"  UNION " .
-	" SELECT f_id AS xref FROM `##families` WHERE f_file <> ?" .
-	"  UNION " .
-	" SELECT s_id AS xref FROM `##sources` WHERE s_file <> ?" .
-	"  UNION " .
-	" SELECT m_id AS xref FROM `##media` WHERE m_file <> ?" .
-	"  UNION " .
-	" SELECT o_id AS xref FROM `##other` WHERE o_file <> ? AND o_type NOT IN ('HEAD', 'TRLR')" .
-	") AS other_trees USING (xref)"
+    "SELECT xref, type FROM (" .
+    " SELECT i_id AS xref, 'INDI' AS type FROM `##individuals` WHERE i_file = ?" .
+    "  UNION " .
+    " SELECT f_id AS xref, 'FAM' AS type FROM `##families` WHERE f_file = ?" .
+    "  UNION " .
+    " SELECT s_id AS xref, 'SOUR' AS type FROM `##sources` WHERE s_file = ?" .
+    "  UNION " .
+    " SELECT m_id AS xref, 'OBJE' AS type FROM `##media` WHERE m_file = ?" .
+    "  UNION " .
+    " SELECT o_id AS xref, o_type AS type FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
+    ") AS this_tree JOIN (" .
+    " SELECT xref FROM `##change` WHERE gedcom_id <> ?" .
+    "  UNION " .
+    " SELECT i_id AS xref FROM `##individuals` WHERE i_file <> ?" .
+    "  UNION " .
+    " SELECT f_id AS xref FROM `##families` WHERE f_file <> ?" .
+    "  UNION " .
+    " SELECT s_id AS xref FROM `##sources` WHERE s_file <> ?" .
+    "  UNION " .
+    " SELECT m_id AS xref FROM `##media` WHERE m_file <> ?" .
+    "  UNION " .
+    " SELECT o_id AS xref FROM `##other` WHERE o_file <> ? AND o_type NOT IN ('HEAD', 'TRLR')" .
+    ") AS other_trees USING (xref)"
 )->execute(array(
-	$WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(),
-	$WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(),
+    $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(),
+    $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(),
 ))->fetchAssoc();
 
 echo '<h1>', $controller->getPageTitle(), '</h1>';
 
 if (Filter::get('action') === 'renumber') {
-	foreach ($xrefs as $old_xref => $type) {
-		Database::beginTransaction();
-		Database::exec(
-			"LOCK TABLE `##individuals` WRITE," .
-			" `##families` WRITE," .
-			" `##sources` WRITE," .
-			" `##media` WRITE," .
-			" `##other` WRITE," .
-			" `##name` WRITE," .
-			" `##placelinks` WRITE," .
-			" `##change` WRITE," .
-			" `##next_id` WRITE," .
-			" `##dates` WRITE," .
-			" `##default_resn` WRITE," .
-			" `##hit_counter` WRITE," .
-			" `##link` WRITE," .
-			" `##user_gedcom_setting` WRITE"
-		);
-		$new_xref = $WT_TREE->getNewXref($type);
-		switch ($type) {
-		case 'INDI':
-			Database::prepare(
-				"UPDATE `##individuals` SET i_id = ?, i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_id = ? AND i_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ INDI\n", "0 @$new_xref@ INDI\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'HUSB') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " HUSB @$old_xref@", " HUSB @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'WIFE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " WIFE @$old_xref@", " WIFE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'CHIL') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " CHIL @$old_xref@", " CHIL @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = '_ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = '_ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##user_gedcom_setting` SET setting_value = ? WHERE setting_value = ? AND gedcom_id = ? AND setting_name IN ('gedcomid', 'rootid')"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			break;
-		case 'FAM':
-			Database::prepare(
-				"UPDATE `##families` SET f_id = ?, f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_id = ? AND f_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ FAM\n", "0 @$new_xref@ FAM\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMC') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " FAMC @$old_xref@", " FAMC @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMS') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " FAMS @$old_xref@", " FAMS @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			break;
-		case 'SOUR':
-			Database::prepare(
-				"UPDATE `##sources` SET s_id = ?, s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_id = ? AND s_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ SOUR\n", "0 @$new_xref@ SOUR\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'SOUR') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'SOUR') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'SOUR') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'SOUR') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'REPO':
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ REPO\n", "0 @$new_xref@ REPO\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'REPO') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " REPO @$old_xref@", " REPO @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'NOTE':
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(REPLACE(o_gedcom, ?, ?), ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ NOTE\n", "0 @$new_xref@ NOTE\n", "0 @$old_xref@ NOTE ", "0 @$new_xref@ NOTE ", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'NOTE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'NOTE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'NOTE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'NOTE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'NOTE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'OBJE':
-			Database::prepare(
-				"UPDATE `##media` SET m_id = ?, m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_id = ? AND m_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ OBJE\n", "0 @$new_xref@ OBJE\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'OBJE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'OBJE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'OBJE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'OBJE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'OBJE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		default:
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ $type\n", "0 @$new_xref@ $type\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ?) SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ?) SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ?) SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ?) SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ?) SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		}
-		Database::prepare(
-			"UPDATE `##name` SET n_id = ? WHERE n_id = ? AND n_file = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		Database::prepare(
-			"UPDATE `##default_resn` SET xref = ? WHERE xref = ? AND gedcom_id = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		Database::prepare(
-			"UPDATE `##hit_counter` SET page_parameter = ? WHERE page_parameter = ? AND gedcom_id = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		Database::prepare(
-			"UPDATE `##link` SET l_from = ? WHERE l_from = ? AND l_file = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		Database::prepare(
-			"UPDATE `##link` SET l_to = ? WHERE l_to = ? AND l_file = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		echo '<p>', I18N::translate('The record %1$s has been renamed to %2$s.', $old_xref, $new_xref), '</p>';
-		unset($xrefs[$old_xref]);
-		Database::exec("UNLOCK TABLES");
-		Database::commit();
+    foreach ($xrefs as $old_xref => $type) {
+        Database::beginTransaction();
+        Database::exec(
+            "LOCK TABLE `##individuals` WRITE," .
+            " `##families` WRITE," .
+            " `##sources` WRITE," .
+            " `##media` WRITE," .
+            " `##other` WRITE," .
+            " `##name` WRITE," .
+            " `##placelinks` WRITE," .
+            " `##change` WRITE," .
+            " `##next_id` WRITE," .
+            " `##dates` WRITE," .
+            " `##default_resn` WRITE," .
+            " `##hit_counter` WRITE," .
+            " `##link` WRITE," .
+            " `##user_gedcom_setting` WRITE"
+        );
+        $new_xref = $WT_TREE->getNewXref($type);
+        switch ($type) {
+        case 'INDI':
+            Database::prepare(
+                "UPDATE `##individuals` SET i_id = ?, i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_id = ? AND i_file = ?"
+            )->execute(array($new_xref, "0 @$old_xref@ INDI\n", "0 @$new_xref@ INDI\n", $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'HUSB') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+            )->execute(array($old_xref, " HUSB @$old_xref@", " HUSB @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'WIFE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+            )->execute(array($old_xref, " WIFE @$old_xref@", " WIFE @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'CHIL') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+            )->execute(array($old_xref, " CHIL @$old_xref@", " CHIL @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+            )->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = '_ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+            )->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+            )->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = '_ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+            )->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
+            )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
+            )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##user_gedcom_setting` SET setting_value = ? WHERE setting_value = ? AND gedcom_id = ? AND setting_name IN ('gedcomid', 'rootid')"
+            )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+            break;
+        case 'FAM':
+            Database::prepare(
+                "UPDATE `##families` SET f_id = ?, f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_id = ? AND f_file = ?"
+            )->execute(array($new_xref, "0 @$old_xref@ FAM\n", "0 @$new_xref@ FAM\n", $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMC') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+            )->execute(array($old_xref, " FAMC @$old_xref@", " FAMC @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMS') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+            )->execute(array($old_xref, " FAMS @$old_xref@", " FAMS @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
+            )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
+            )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+            break;
+        case 'SOUR':
+            Database::prepare(
+                "UPDATE `##sources` SET s_id = ?, s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_id = ? AND s_file = ?"
+            )->execute(array($new_xref, "0 @$old_xref@ SOUR\n", "0 @$new_xref@ SOUR\n", $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'SOUR') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+            )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'SOUR') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+            )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'SOUR') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+            )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'SOUR') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+            )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+            break;
+        case 'REPO':
+            Database::prepare(
+                "UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
+            )->execute(array($new_xref, "0 @$old_xref@ REPO\n", "0 @$new_xref@ REPO\n", $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'REPO') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+            )->execute(array($old_xref, " REPO @$old_xref@", " REPO @$new_xref@", $WT_TREE->getTreeId()));
+            break;
+        case 'NOTE':
+            Database::prepare(
+                "UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(REPLACE(o_gedcom, ?, ?), ?, ?) WHERE o_id = ? AND o_file = ?"
+            )->execute(array($new_xref, "0 @$old_xref@ NOTE\n", "0 @$new_xref@ NOTE\n", "0 @$old_xref@ NOTE ", "0 @$new_xref@ NOTE ", $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'NOTE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+            )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'NOTE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+            )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'NOTE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+            )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'NOTE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+            )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'NOTE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+            )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+            break;
+        case 'OBJE':
+            Database::prepare(
+                "UPDATE `##media` SET m_id = ?, m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_id = ? AND m_file = ?"
+            )->execute(array($new_xref, "0 @$old_xref@ OBJE\n", "0 @$new_xref@ OBJE\n", $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'OBJE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+            )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'OBJE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+            )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'OBJE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+            )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'OBJE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+            )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'OBJE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+            )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+            break;
+        default:
+            Database::prepare(
+                "UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
+            )->execute(array($new_xref, "0 @$old_xref@ $type\n", "0 @$new_xref@ $type\n", $old_xref, $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ?) SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+            )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ?) SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+            )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ?) SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+            )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ?) SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+            )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+            Database::prepare(
+                "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ?) SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+            )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+            break;
+        }
+        Database::prepare(
+            "UPDATE `##name` SET n_id = ? WHERE n_id = ? AND n_file = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        Database::prepare(
+            "UPDATE `##default_resn` SET xref = ? WHERE xref = ? AND gedcom_id = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        Database::prepare(
+            "UPDATE `##hit_counter` SET page_parameter = ? WHERE page_parameter = ? AND gedcom_id = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        Database::prepare(
+            "UPDATE `##link` SET l_from = ? WHERE l_from = ? AND l_file = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        Database::prepare(
+            "UPDATE `##link` SET l_to = ? WHERE l_to = ? AND l_file = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        echo '<p>', I18N::translate('The record %1$s has been renamed to %2$s.', $old_xref, $new_xref), '</p>';
+        unset($xrefs[$old_xref]);
+        Database::exec("UNLOCK TABLES");
+        Database::commit();
 
-		try {
-			Database::prepare(
-				"UPDATE `##favorite` SET xref = ? WHERE xref = ? AND gedcom_id = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		} catch (\Exception $ex) {
-			// Perhaps the favorites module was not installed?
-		}
+        try {
+            Database::prepare(
+                "UPDATE `##favorite` SET xref = ? WHERE xref = ? AND gedcom_id = ?"
+            )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        } catch (\Exception $ex) {
+            // Perhaps the favorites module was not installed?
+        }
 
-		// How much time do we have left?
-		if (microtime(true) - WT_START_TIME > ini_get('max_execution_time') - 2) {
-			echo '<p>', I18N::translate('The server’s time limit has been reached.'), '</p>';
-			break;
-		}
-	}
-	if ($xrefs) {
+        // How much time do we have left?
+        if (microtime(true) - WT_START_TIME > ini_get('max_execution_time') - 2) {
+            echo '<p>', I18N::translate('The server’s time limit has been reached.'), '</p>';
+            break;
+        }
+    }
+    if ($xrefs) {
 
-	}
+    }
 } else {
-	echo '<p>', I18N::translate('In a family tree, each record has an internal reference number (called an “XREF”) such as “F123” or “R14”.'), '</p>';
-	echo '<p>', I18N::translate('You can renumber the records in a family tree, so that these internal reference numbers are not duplicated in any other family tree.'), '</p>';
+    echo '<p>', I18N::translate('In a family tree, each record has an internal reference number (called an “XREF”) such as “F123” or “R14”.'), '</p>';
+    echo '<p>', I18N::translate('You can renumber the records in a family tree, so that these internal reference numbers are not duplicated in any other family tree.'), '</p>';
 }
 
 echo '<p>', I18N::plural(
-	'This family tree has %s record which uses the same “XREF” as another family tree.',
-	'This family tree has %s records which use the same “XREF” as another family tree.',
-	count($xrefs), count($xrefs)
+    'This family tree has %s record which uses the same “XREF” as another family tree.',
+    'This family tree has %s records which use the same “XREF” as another family tree.',
+    count($xrefs), count($xrefs)
 ), '</p>';
 
 if ($xrefs) {
-	// We use GET (not POST) for this update operation - because we want the user to
-	// be able to press F5 to continue after a timeout.
-	echo '<form>';
-	echo '<p>', I18N::translate('You can renumber this family tree.'), '</p>';
-	echo '<button type="submit" class="btn btn-primary">';
-	echo '<i class="fa fa-check"></i> ', /* I18N: A button label. */ I18N::translate('continue');
-	echo '</button>';
-	echo '<input type="hidden" name="action" value="renumber">';
-	echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
-	echo '</form>';
-	echo '<p>', I18N::translate('Caution! This may take a long time. Be patient.'), '</p>';
+    // We use GET (not POST) for this update operation - because we want the user to
+    // be able to press F5 to continue after a timeout.
+    echo '<form>';
+    echo '<p>', I18N::translate('You can renumber this family tree.'), '</p>';
+    echo '<button type="submit" class="btn btn-primary">';
+    echo '<i class="fa fa-check"></i> ', /* I18N: A button label. */ I18N::translate('continue');
+    echo '</button>';
+    echo '<input type="hidden" name="action" value="renumber">';
+    echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
+    echo '</form>';
+    echo '<p>', I18N::translate('Caution! This may take a long time. Be patient.'), '</p>';
 }

admin_module_reports.php

Indentation +13 added lines, -13 removed lines

@@ -24,29 +24,29 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(I18N::translate('Reports'));
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(I18N::translate('Reports'));
 
 $action  = Filter::post('action');
 $modules = Module::getAllModulesByComponent('report');
 
 if ($action === 'update_mods' && Filter::checkCsrf()) {
-	foreach ($modules as $module) {
-		foreach (Tree::getAll() as $tree) {
-			$access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
-			Database::prepare(
-				"REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'report', ?)"
-			)->execute(array($module->getName(), $tree->getTreeId(), $access_level));
-		}
-	}
+    foreach ($modules as $module) {
+        foreach (Tree::getAll() as $tree) {
+            $access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
+            Database::prepare(
+                "REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'report', ?)"
+            )->execute(array($module->getName(), $tree->getTreeId(), $access_level));
+        }
+    }
 
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+    return;
 }
 
 $controller
-	->pageHeader();
+    ->pageHeader();
 
 ?>
 <ol class="breadcrumb small">

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>

editnews.php

Indentation +39 added lines, -39 removed lines

@@ -31,9 +31,9 @@ 
 
 $controller = new SimpleController;
 $controller
-	->setPageTitle(I18N::translate('Add/edit a journal/news entry'))
-	->restrictAccess(Auth::isMember($WT_TREE))
-	->pageHeader();
+    ->setPageTitle(I18N::translate('Add/edit a journal/news entry'))
+    ->restrictAccess(Auth::isMember($WT_TREE))
+    ->pageHeader();
 
 $action    = Filter::get('action', 'compose|save', 'compose');
 $news_id   = Filter::getInteger('news_id');
@@ -45,43 +45,43 @@ 
 
 switch ($action) {
 case 'compose':
-	if (Module::getModuleByName('ckeditor')) {
-		CkeditorModule::enableEditor($controller);
-	}
+    if (Module::getModuleByName('ckeditor')) {
+        CkeditorModule::enableEditor($controller);
+    }
 
-	echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
-	echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
-	if ($news_id) {
-		$news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
-	} else {
-		$news              = array();
-		$news['user_id']   = $user_id;
-		$news['gedcom_id'] = $gedcom_id;
-		$news['date']      = WT_TIMESTAMP;
-		$news['subject']   = '';
-		$news['body']      = '';
-	}
-	echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
-	echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
-	echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
-	echo '<table>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
-	echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
-	echo '<tr><td>';
-	echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
-	echo '</td></tr>';
-	echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
-	echo '</table>';
-	echo '</form>';
-	break;
+    echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
+    echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
+    if ($news_id) {
+        $news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
+    } else {
+        $news              = array();
+        $news['user_id']   = $user_id;
+        $news['gedcom_id'] = $gedcom_id;
+        $news['date']      = WT_TIMESTAMP;
+        $news['subject']   = '';
+        $news['body']      = '';
+    }
+    echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
+    echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
+    echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
+    echo '<table>';
+    echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
+    echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
+    echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
+    echo '<tr><td>';
+    echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
+    echo '</td></tr>';
+    echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
+    echo '</table>';
+    echo '</form>';
+    break;
 case 'save':
-	if ($news_id) {
-		Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
-	} else {
-		Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
-	}
+    if ($news_id) {
+        Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
+    } else {
+        Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
+    }
 
-	$controller->addInlineJavascript('window.opener.location.reload();window.close();');
-	break;
+    $controller->addInlineJavascript('window.opener.location.reload();window.close();');
+    break;
 }

themes/_custom/theme.php

Indentation +50 added lines, -50 removed lines

@@ -32,61 +32,61 @@
  * The rest are just examples, and should be removed in actual themes.
  */
 class MyTheme extends WebtreesTheme {
-	/**
-	 * Give your theme a unique identifier. Themes beginning with an underscore
-	 * are reserved for internal use.
-	 *
-	 * {@inheritdoc}
-	 */
-	public function themeId() {
-		return '_custom';
-	}
+    /**
+     * Give your theme a unique identifier. Themes beginning with an underscore
+     * are reserved for internal use.
+     *
+     * {@inheritdoc}
+     */
+    public function themeId() {
+        return '_custom';
+    }
 
-	/**
-	 * Give your theme a name. This is shown to the users.
-	 * Use HTML entities where appropriate. e.g. “Black & white”.
-	 *
-	 * You could use switch($this->locale) {} to provide a translated versions
-	 * of the theme name.
-	 *
-	 * {@inheritdoc}
-	 */
-	public function themeName() {
-		return 'Custom theme';
-	}
+    /**
+     * Give your theme a name. This is shown to the users.
+     * Use HTML entities where appropriate. e.g. “Black & white”.
+     *
+     * You could use switch($this->locale) {} to provide a translated versions
+     * of the theme name.
+     *
+     * {@inheritdoc}
+     */
+    public function themeName() {
+        return 'Custom theme';
+    }
 
-	/**
-	 * This is an example function which shows how to add an additional CSS file to the theme.
-	 *
-	 * {@inheritdoc}
-	 */
-	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';
+    /**
+     * This is an example function which shows how to add an additional CSS file to the theme.
+     *
+     * {@inheritdoc}
+     */
+    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';
 
-		return $css_files;
-	}
+        return $css_files;
+    }
 
-	/**
-	 * This is an example function which shows one way to remove an entry from a menu.
-	 *
-	 * @param string $surname The significant surname for the page.
-	 *
-	 * {@inheritdoc}
-	 */
-	public function menuLists($surname) {
-		// Start with the default "Lists" menu.
-		$menu = parent::menuLists($surname);
-		// Remove the "notes" sub-menu.
-		$submenus = array_filter($menu->getSubmenus(), function (Menu $menu) {
-			return $menu->getClass() !== 'menu-list-note';
-		});
-		// Replace the sub-menus
-		$menu->setSubmenus($submenus);
+    /**
+     * This is an example function which shows one way to remove an entry from a menu.
+     *
+     * @param string $surname The significant surname for the page.
+     *
+     * {@inheritdoc}
+     */
+    public function menuLists($surname) {
+        // Start with the default "Lists" menu.
+        $menu = parent::menuLists($surname);
+        // Remove the "notes" sub-menu.
+        $submenus = array_filter($menu->getSubmenus(), function (Menu $menu) {
+            return $menu->getClass() !== 'menu-list-note';
+        });
+        // Replace the sub-menus
+        $menu->setSubmenus($submenus);
 
-		return $menu;
-	}
+        return $menu;
+    }
 }
 
 return new MyTheme; // This script must return a theme object.

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.

lifespan.php

Indentation +4 added lines, -4 removed lines

@@ -25,9 +25,9 @@ 
 
 $controller = new LifespanController;
 $controller
-	->restrictAccess(Module::isActiveChart($WT_TREE, 'lifespans_chart'))
-	->pageHeader()
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL);
+    ->restrictAccess(Module::isActiveChart($WT_TREE, 'lifespans_chart'))
+    ->pageHeader()
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL);
 
 ?>
 <div id="lifespan-page">
@@ -126,7 +126,7 @@ 
 </div>
 <?php
 $controller
-	->addInlineJavascript("
+    ->addInlineJavascript("
 		autocomplete();
 		var scale = jQuery('#lifespan-scale'),
 			barHeight = jQuery('#lifespan-people').children().first().outerHeight();

admin_module_charts.php

Indentation +13 added lines, -13 removed lines

@@ -24,29 +24,29 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(I18N::translate('Charts'));
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(I18N::translate('Charts'));
 
 $action  = Filter::post('action');
 $modules = Module::getAllModulesByComponent('chart');
 
 if ($action === 'update_mods' && Filter::checkCsrf()) {
-	foreach ($modules as $module) {
-		foreach (Tree::getAll() as $tree) {
-			$access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
-			Database::prepare(
-				"REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'chart', ?)"
-			)->execute(array($module->getName(), $tree->getTreeId(), $access_level));
-		}
-	}
+    foreach ($modules as $module) {
+        foreach (Tree::getAll() as $tree) {
+            $access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
+            Database::prepare(
+                "REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'chart', ?)"
+            )->execute(array($module->getName(), $tree->getTreeId(), $access_level));
+        }
+    }
 
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+    return;
 }
 
 $controller
-	->pageHeader();
+    ->pageHeader();
 
 ?>
 <ol class="breadcrumb small">

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>

find.php

Indentation +376 added lines, -376 removed lines

@@ -41,66 +41,66 @@ 
 $qs        = Filter::get('tags');
 
 if ($subclick === 'all') {
-	$all = true;
+    $all = true;
 }
 
 $embed = substr($choose, 0, 1) === '1';
 
 switch ($type) {
 case 'indi':
-	$controller->setPageTitle(I18N::translate('Find an individual'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find an individual'));
+    break;
 case 'fam':
-	$controller->setPageTitle(I18N::translate('Find a family'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a family'));
+    break;
 case 'media':
-	$controller->setPageTitle(I18N::translate('Find a media object'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a media object'));
+    break;
 case 'place':
-	$controller->setPageTitle(I18N::translate('Find a place'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a place'));
+    break;
 case 'repo':
-	$controller->setPageTitle(I18N::translate('Find a repository'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a repository'));
+    break;
 case 'note':
-	$controller->setPageTitle(I18N::translate('Find a shared note'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a shared note'));
+    break;
 case 'source':
-	$controller->setPageTitle(I18N::translate('Find a source'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a source'));
+    break;
 case 'specialchar':
-	$controller->setPageTitle(I18N::translate('Find a special character'));
-	break;
+    $controller->setPageTitle(I18N::translate('Find a special character'));
+    break;
 case 'factINDI':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("INDI");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("INDI");');
+    break;
 case 'factFAM':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("FAM");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("FAM");');
+    break;
 case 'factSOUR':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("SOUR");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("SOUR");');
+    break;
 case 'factREPO':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("REPO");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("REPO");');
+    break;
 case 'factNAME':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("NAME");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("NAME");');
+    break;
 case 'factPLAC':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("PLAC");');
-	break;
+    $controller
+        ->setPageTitle(I18N::translate('Find a fact or event'))
+        ->addInlineJavascript('initPickFact("PLAC");');
+    break;
 }
 $controller->pageHeader();
 
@@ -140,41 +140,41 @@ 
 
 // Show indi and hide the rest
 if ($type == "indi") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filterindi" method="get" onsubmit="return checknames(this);" action="find.php">
 	<input type="hidden" name="callback" value="' . $callback . '">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="indi">
 	<span>', /* I18N: Label for search field */ I18N::translate('Name contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<input type="submit" value="', I18N::translate('search'), '">
 	</form></div>';
 }
 
 // Show fam and hide the rest
 if ($type == "fam") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filterfam" method="get" onsubmit="return checknames(this);" action="find.php">
 	<input type="hidden" name="callback" value="' . $callback . '">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="fam">
 	<span>', I18N::translate('Name contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<input type="submit" value="', I18N::translate('search'), '">
 	</form></div>';
 }
 
 // Show media and hide the rest
 if ($type == 'media') {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filtermedia" method="get" action="find.php">
 	<input type="hidden" name="choose" value="', $choose, '">
 	<input type="hidden" name="action" value="filter">
@@ -183,17 +183,17 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Media contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>',
-	'<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>',
+    '<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</p></form></div>';
 }
 
 // Show place and hide the rest
 if ($type == "place") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filterplace" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="place">
@@ -201,17 +201,17 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Place contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</p></form></div>';
 }
 
 // Show repo and hide the rest
 if ($type == "repo") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filterrepo" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="repo">
@@ -219,10 +219,10 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Repository contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</td></tr></table>
 	</p></form></div>';
@@ -230,7 +230,7 @@ 
 
 // Show Shared Notes and hide the rest
 if ($type == "note") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filternote" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="note">
@@ -238,17 +238,17 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Shared note contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</p></form></div>';
 }
 
 // Show source and hide the rest
 if ($type == "source") {
-	echo '<div id="find-header">
+    echo '<div id="find-header">
 	<form name="filtersource" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="source">
@@ -256,43 +256,43 @@ 
 	<input type="hidden" name="subclick">
 	<span>', /* I18N: Label for search field */ I18N::translate('Source contains'), '</span>
 	<input type="text" name="filter" value="';
-	if ($filter) {
-		echo $filter;
-	}
-	echo '" autofocus>
+    if ($filter) {
+        echo $filter;
+    }
+    echo '" autofocus>
 	<p><input type="submit" name="search" value="', I18N::translate('search'), '" onclick="this.form.subclick.value=this.name">
 	</p></form></div>';
 }
 
 // Show specialchar and hide the rest
 if ($type == 'specialchar') {
-	$language_filter       = Filter::get('language_filter', null, Auth::user()->getPreference('default_language_filter'));
-	$specialchar_languages = SpecialChars::allLanguages();
-	if (!array_key_exists($language_filter, $specialchar_languages)) {
-		$language_filter = 'en';
-	}
-	Auth::user()->setPreference('default_language_filter', $language_filter);
-	$action = 'filter';
-	echo '<div id="find-header">
+    $language_filter       = Filter::get('language_filter', null, Auth::user()->getPreference('default_language_filter'));
+    $specialchar_languages = SpecialChars::allLanguages();
+    if (!array_key_exists($language_filter, $specialchar_languages)) {
+        $language_filter = 'en';
+    }
+    Auth::user()->setPreference('default_language_filter', $language_filter);
+    $action = 'filter';
+    echo '<div id="find-header">
 	<form name="filterspecialchar" method="get" action="find.php">
 	<input type="hidden" name="action" value="filter">
 	<input type="hidden" name="type" value="specialchar">
 	<input type="hidden" name="callback" value="' . $callback . '">
 	<p><select id="language_filter" name="language_filter" onchange="submit();">';
-	foreach (SpecialChars::allLanguages() as $lanuguage_tag => $language_name) {
-		echo '<option value="' . $lanuguage_tag . '" ';
-		if ($lanuguage_tag === $language_filter) {
-			echo 'selected';
-		}
-		echo '>', $language_name, '</option>';
-	}
-	echo '</select>
+    foreach (SpecialChars::allLanguages() as $lanuguage_tag => $language_name) {
+        echo '<option value="' . $lanuguage_tag . '" ';
+        if ($lanuguage_tag === $language_filter) {
+            echo 'selected';
+        }
+        echo '>', $language_name, '</option>';
+    }
+    echo '</select>
 	</p></form></div>';
 }
 
 // Show facts
 if ($type == "factINDI" || $type == "factFAM" || $type == "factSOUR" || $type == "factREPO" || $type == "factNAME" || $type == "factPLAC") {
-	echo '<div id="find-facts-header">
+    echo '<div id="find-facts-header">
 	<form name="filterfacts" method="get" action="find.php"
 	input type="hidden" name="type" value="facts">
 	<input type="hidden" name="tags" value="', $qs, '">
@@ -300,18 +300,18 @@ 
 	<table class="list_table width100" border="0">
 	<tr><td class="list_label" style="padding: 5px; font-weight: normal; white-space: normal;">';
 
-	$all           = strlen($qs) ? explode(',', strtoupper($qs)) : array();
-	$preselDefault = array();
-	$preselCustom  = array();
-	foreach ($all as $one) {
-		if (GedcomTag::isTag($one)) {
-			$preselDefault[] = $one;
-		} else {
-			$preselCustom[] = $one;
-		}
-	}
-
-	echo '<script>'; ?>
+    $all           = strlen($qs) ? explode(',', strtoupper($qs)) : array();
+    $preselDefault = array();
+    $preselCustom  = array();
+    foreach ($all as $one) {
+        if (GedcomTag::isTag($one)) {
+            $preselDefault[] = $one;
+        } else {
+            $preselCustom[] = $one;
+        }
+    }
+
+    echo '<script>'; ?>
 	// A class representing a default tag
 	function DefaultTag(id, name, selected) {
 		this.Id=id;
@@ -402,81 +402,81 @@ 
 		switch (factType) {
 			case "INDI":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('INDI') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('INDI') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "FAM":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('FAM') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('FAM') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "SOUR":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('SOUR') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('SOUR') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "REPO":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('REPO') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('REPO') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "PLAC":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('PLAC') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('PLAC') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			case "NAME":
 				DefaultTags=[<?php
-				$firstFact = true;
-				foreach (GedcomTag::getPicklistFacts('NAME') as $factId => $factName) {
-					if ($firstFact) {
-						$firstFact = false;
-					} else {
-						echo ',';
-					}
-					echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
-				}
-				?>];
+                $firstFact = true;
+                foreach (GedcomTag::getPicklistFacts('NAME') as $factId => $factName) {
+                    if ($firstFact) {
+                        $firstFact = false;
+                    } else {
+                        echo ',';
+                    }
+                    echo 'new DefaultTag("' . addslashes($factId) . '","' . addslashes($factName) . '",preselectedDefaultTags.indexOf("\\x01' . addslashes($factId) . '\\x01")>=0)';
+                }
+                ?>];
 				break;
 			default:
 				DefaultTags=[];
@@ -513,7 +513,7 @@ 
 		return false;
 	}
 	<?php echo '</script>';
-	echo '<div id="layDefinedTags"><table id="tabDefinedTags">
+    echo '<div id="layDefinedTags"><table id="tabDefinedTags">
 		<thead><tr>
 			<th></th>
 			<th>', I18N::translate('Tag'), '</th>
@@ -541,221 +541,221 @@ 
 }
 
 if ($action === 'filter') {
-	$filter       = trim($filter);
-	$filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
-
-	// Output Individual
-	if ($type === 'indi') {
-		echo '<div id="find-output">';
-		$myindilist = FunctionsDb::searchIndividualNames($filter_array, array($WT_TREE));
-		if ($myindilist) {
-			echo '<ul>';
-			usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			foreach ($myindilist as $indi) {
-				echo $indi->formatList('li', true);
-			}
-			echo '</ul>
+    $filter       = trim($filter);
+    $filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
+
+    // Output Individual
+    if ($type === 'indi') {
+        echo '<div id="find-output">';
+        $myindilist = FunctionsDb::searchIndividualNames($filter_array, array($WT_TREE));
+        if ($myindilist) {
+            echo '<ul>';
+            usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            foreach ($myindilist as $indi) {
+                echo $indi->formatList('li', true);
+            }
+            echo '</ul>
 			<p>', I18N::translate('Total individuals: %s', count($myindilist)), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Family
-	if ($type == "fam") {
-		echo '<div id="find-output">';
-		// Get the famrecs with hits on names from the family table
-		// Get the famrecs with hits in the gedcom record from the family table
-		$myfamlist = array_unique(array_merge(
-			FunctionsDb::searchFamilyNames($filter_array, array($WT_TREE)),
-			FunctionsDb::searchFamilies($filter_array, array($WT_TREE))
-		));
-
-		if ($myfamlist) {
-			echo '<ul>';
-			usort($myfamlist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			foreach ($myfamlist as $family) {
-				echo $family->formatList('li', true);
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Family
+    if ($type == "fam") {
+        echo '<div id="find-output">';
+        // Get the famrecs with hits on names from the family table
+        // Get the famrecs with hits in the gedcom record from the family table
+        $myfamlist = array_unique(array_merge(
+            FunctionsDb::searchFamilyNames($filter_array, array($WT_TREE)),
+            FunctionsDb::searchFamilies($filter_array, array($WT_TREE))
+        ));
+
+        if ($myfamlist) {
+            echo '<ul>';
+            usort($myfamlist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            foreach ($myfamlist as $family) {
+                echo $family->formatList('li', true);
+            }
+            echo '</ul>
 			<p>', I18N::translate('Total families: %s', count($myfamlist)), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Media
-	if ($type === 'media') {
-		$medialist = QueryMedia::mediaList('', 'include', 'title', $filter, '');
-
-		echo '<div id="find-output">';
-
-		if ($medialist) {
-			foreach ($medialist as $media) {
-				echo '<div class="find-media-media">';
-				echo '<div class="find-media-thumb">', $media->displayImage(), '</div>';
-				echo '<div class="find-media-details">', $media->getFullName(), '</div>';
-				if (!$embed) {
-					echo '<p><a href="#" dir="auto" onclick="pasteid(\'', $media->getXref(), '\');">', $media->getFilename(), '</a></p>';
-				} else {
-					echo '<p><a href="#" dir="auto" onclick="pasteid(\'', $media->getXref(), '\', \'', '\', \'', Filter::escapeJs($media->getFilename()), '\');">', Filter::escapeHtml($media->getFilename()), '</a></p> ';
-				}
-				if ($media->fileExists()) {
-					$imgsize = $media->getImageAttributes();
-					echo GedcomTag::getLabelValue('__IMAGE_SIZE__', $imgsize['WxH']);
-				}
-				echo '<ul>';
-				$found = false;
-				foreach ($media->linkedIndividuals('OBJE') as $indindividual) {
-					echo '<li>', $indindividual->getFullName(), '</li>';
-					$found = true;
-				}
-				foreach ($media->linkedFamilies('OBJE') as $family) {
-					echo '<li>', $family->getFullName(), '</li>';
-					$found = true;
-				}
-				foreach ($media->linkedSources('OBJE') as $source) {
-					echo '<li>', $source->getFullName(), '</li>';
-					$found = true;
-				}
-				foreach ($media->linkedNotes('OBJE') as $note) {
-					// Invalid GEDCOM - you cannot link a NOTE to an OBJE
-					echo '<li>', $note->getFullName(), '</li>';
-					$found = true;
-				}
-				foreach ($media->linkedRepositories('OBJE') as $repository) {
-					// Invalid GEDCOM - you cannot link a REPO to an OBJE
-					echo '<li>', $repository->getFullName(), '</li>';
-					$found = true;
-				}
-				if (!$found) {
-					echo '<li>', I18N::translate('This media object is not linked to any other record.'), '</li>';
-				}
-				echo '</ul>';
-				echo '</div>'; // close div="find-media-media"
-			}
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Places
-	if ($type == "place") {
-		echo '<div id="find-output">';
-		if (!$filter || $all) {
-			$places = Place::allPlaces($WT_TREE);
-		} else {
-			$places = Place::findPlaces($filter, $WT_TREE);
-		}
-		if ($places) {
-			echo '<ul>';
-			foreach ($places as $place) {
-				echo '<li><a href="#" onclick="pasteid(\'', Filter::escapeJs($place->getGedcomName()), '\');">';
-				if (!$filter || $all) {
-					echo $place->getReverseName(); // When displaying all names, sort/display by the country, then region, etc.
-				} else {
-					echo $place->getFullName(); // When we’ve searched for a place, sort by this place
-				}
-				echo '</a></li>';
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Media
+    if ($type === 'media') {
+        $medialist = QueryMedia::mediaList('', 'include', 'title', $filter, '');
+
+        echo '<div id="find-output">';
+
+        if ($medialist) {
+            foreach ($medialist as $media) {
+                echo '<div class="find-media-media">';
+                echo '<div class="find-media-thumb">', $media->displayImage(), '</div>';
+                echo '<div class="find-media-details">', $media->getFullName(), '</div>';
+                if (!$embed) {
+                    echo '<p><a href="#" dir="auto" onclick="pasteid(\'', $media->getXref(), '\');">', $media->getFilename(), '</a></p>';
+                } else {
+                    echo '<p><a href="#" dir="auto" onclick="pasteid(\'', $media->getXref(), '\', \'', '\', \'', Filter::escapeJs($media->getFilename()), '\');">', Filter::escapeHtml($media->getFilename()), '</a></p> ';
+                }
+                if ($media->fileExists()) {
+                    $imgsize = $media->getImageAttributes();
+                    echo GedcomTag::getLabelValue('__IMAGE_SIZE__', $imgsize['WxH']);
+                }
+                echo '<ul>';
+                $found = false;
+                foreach ($media->linkedIndividuals('OBJE') as $indindividual) {
+                    echo '<li>', $indindividual->getFullName(), '</li>';
+                    $found = true;
+                }
+                foreach ($media->linkedFamilies('OBJE') as $family) {
+                    echo '<li>', $family->getFullName(), '</li>';
+                    $found = true;
+                }
+                foreach ($media->linkedSources('OBJE') as $source) {
+                    echo '<li>', $source->getFullName(), '</li>';
+                    $found = true;
+                }
+                foreach ($media->linkedNotes('OBJE') as $note) {
+                    // Invalid GEDCOM - you cannot link a NOTE to an OBJE
+                    echo '<li>', $note->getFullName(), '</li>';
+                    $found = true;
+                }
+                foreach ($media->linkedRepositories('OBJE') as $repository) {
+                    // Invalid GEDCOM - you cannot link a REPO to an OBJE
+                    echo '<li>', $repository->getFullName(), '</li>';
+                    $found = true;
+                }
+                if (!$found) {
+                    echo '<li>', I18N::translate('This media object is not linked to any other record.'), '</li>';
+                }
+                echo '</ul>';
+                echo '</div>'; // close div="find-media-media"
+            }
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Places
+    if ($type == "place") {
+        echo '<div id="find-output">';
+        if (!$filter || $all) {
+            $places = Place::allPlaces($WT_TREE);
+        } else {
+            $places = Place::findPlaces($filter, $WT_TREE);
+        }
+        if ($places) {
+            echo '<ul>';
+            foreach ($places as $place) {
+                echo '<li><a href="#" onclick="pasteid(\'', Filter::escapeJs($place->getGedcomName()), '\');">';
+                if (!$filter || $all) {
+                    echo $place->getReverseName(); // When displaying all names, sort/display by the country, then region, etc.
+                } else {
+                    echo $place->getFullName(); // When we’ve searched for a place, sort by this place
+                }
+                echo '</a></li>';
+            }
+            echo '</ul>
 			<p>', I18N::translate('Places found'), ' ', count($places), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Repositories
-	if ($type == "repo") {
-		echo '<div id="find-output">';
-		if ($filter) {
-			$repo_list = FunctionsDb::searchRepositories($filter_array, array($WT_TREE));
-		} else {
-			$repo_list = FunctionsDb::getRepositoryList($WT_TREE);
-		}
-		if ($repo_list) {
-			usort($repo_list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			echo '<ul>';
-			foreach ($repo_list as $repo) {
-				echo '<li><a href="', $repo->getHtmlUrl(), '" onclick="pasteid(\'', $repo->getXref(), '\');"><span class="list_item">', $repo->getFullName(), '</span></a></li>';
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Repositories
+    if ($type == "repo") {
+        echo '<div id="find-output">';
+        if ($filter) {
+            $repo_list = FunctionsDb::searchRepositories($filter_array, array($WT_TREE));
+        } else {
+            $repo_list = FunctionsDb::getRepositoryList($WT_TREE);
+        }
+        if ($repo_list) {
+            usort($repo_list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            echo '<ul>';
+            foreach ($repo_list as $repo) {
+                echo '<li><a href="', $repo->getHtmlUrl(), '" onclick="pasteid(\'', $repo->getXref(), '\');"><span class="list_item">', $repo->getFullName(), '</span></a></li>';
+            }
+            echo '</ul>
 			<p>', I18N::translate('Repositories found'), " ", count($repo_list), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Shared Notes
-	if ($type == "note") {
-		echo '<div id="find-output">';
-		if ($filter) {
-			$mynotelist = FunctionsDb::searchNotes($filter_array, array($WT_TREE));
-		} else {
-			$mynotelist = FunctionsDb::getNoteList($WT_TREE);
-		}
-		if ($mynotelist) {
-			usort($mynotelist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			echo '<ul>';
-			foreach ($mynotelist as $note) {
-				echo '<li><a href="', $note->getHtmlUrl(), '" onclick="pasteid(\'', $note->getXref(), '\');"><span class="list_item">', $note->getFullName(), '</span></a></li>';
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Shared Notes
+    if ($type == "note") {
+        echo '<div id="find-output">';
+        if ($filter) {
+            $mynotelist = FunctionsDb::searchNotes($filter_array, array($WT_TREE));
+        } else {
+            $mynotelist = FunctionsDb::getNoteList($WT_TREE);
+        }
+        if ($mynotelist) {
+            usort($mynotelist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            echo '<ul>';
+            foreach ($mynotelist as $note) {
+                echo '<li><a href="', $note->getHtmlUrl(), '" onclick="pasteid(\'', $note->getXref(), '\');"><span class="list_item">', $note->getFullName(), '</span></a></li>';
+            }
+            echo '</ul>
 			<p>', I18N::translate('Shared notes found'), ' ', count($mynotelist), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Sources
-	if ($type == "source") {
-		echo '<div id="find-output">';
-		if ($filter) {
-			$mysourcelist = FunctionsDb::searchSources($filter_array, array($WT_TREE));
-		} else {
-			$mysourcelist = FunctionsDb::getSourceList($WT_TREE);
-		}
-		if ($mysourcelist) {
-			usort($mysourcelist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			echo '<ul>';
-			foreach ($mysourcelist as $source) {
-				echo '<li><a href="', $source->getHtmlUrl(), '" onclick="pasteid(\'', $source->getXref(), '\', \'',
-					Filter::escapeJs($source->getFullName()), '\');"><span class="list_item">',
-					$source->getFullName(), '</span></a></li>';
-			}
-			echo '</ul>
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Sources
+    if ($type == "source") {
+        echo '<div id="find-output">';
+        if ($filter) {
+            $mysourcelist = FunctionsDb::searchSources($filter_array, array($WT_TREE));
+        } else {
+            $mysourcelist = FunctionsDb::getSourceList($WT_TREE);
+        }
+        if ($mysourcelist) {
+            usort($mysourcelist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            echo '<ul>';
+            foreach ($mysourcelist as $source) {
+                echo '<li><a href="', $source->getHtmlUrl(), '" onclick="pasteid(\'', $source->getXref(), '\', \'',
+                    Filter::escapeJs($source->getFullName()), '\');"><span class="list_item">',
+                    $source->getFullName(), '</span></a></li>';
+            }
+            echo '</ul>
 			<p>', I18N::translate('Total sources: %s', count($mysourcelist)), '</p>';
-		} else {
-			echo '<p>', I18N::translate('No results found.'), '</p>';
-		}
-		echo '</div>';
-	}
-
-	// Output Special Characters
-	if ($type == "specialchar") {
-		echo '<div id="find-output-special"><p>';
-		// lower case special characters
-		foreach (SpecialChars::create($language_filter)->upper() as $special_character) {
-			echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
-		}
-		echo '</p><p>';
-		//upper case special characters
-		foreach (SpecialChars::create($language_filter)->lower() as $special_character) {
-			echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
-		}
-		echo '</p><p>';
-		// other special characters (not letters)
-		foreach (SpecialChars::create($language_filter)->other() as $special_character) {
-			echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
-		}
-		echo '</p></div>';
-	}
+        } else {
+            echo '<p>', I18N::translate('No results found.'), '</p>';
+        }
+        echo '</div>';
+    }
+
+    // Output Special Characters
+    if ($type == "specialchar") {
+        echo '<div id="find-output-special"><p>';
+        // lower case special characters
+        foreach (SpecialChars::create($language_filter)->upper() as $special_character) {
+            echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
+        }
+        echo '</p><p>';
+        //upper case special characters
+        foreach (SpecialChars::create($language_filter)->lower() as $special_character) {
+            echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
+        }
+        echo '</p><p>';
+        // other special characters (not letters)
+        foreach (SpecialChars::create($language_filter)->other() as $special_character) {
+            echo '<a class="largechars" href="#" onclick="return window.opener.paste_char(\'', $special_character, '\');">', $special_character, '</a> ';
+        }
+        echo '</p></div>';
+    }
 }
 echo '<button onclick="window.close();">', I18N::translate('close'), '</button>';
 echo "</div>";

search.php

Indentation +3 added lines, -3 removed lines

@@ -23,9 +23,9 @@
 
 $controller = new SearchController;
 $controller
-	->pageHeader()
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('autocomplete();');
+    ->pageHeader()
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('autocomplete();');
 
 ?>
 <script>

admin_trees_merge.php

Indentation +153 added lines, -153 removed lines

@@ -30,9 +30,9 @@ 
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Merge family trees'))
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Merge family trees'))
+    ->pageHeader();
 
 ?>
 <ol class="breadcrumb small">
@@ -49,157 +49,157 @@ 
 $tree2_id = Filter::post('tree2_id');
 
 if ($tree1_id && $tree2_id != $tree1_id) {
-	// Every XREF used by both trees
-	$xrefs = Database::prepare(
-		"SELECT xref, type FROM (" .
-		" SELECT i_id AS xref, 'INDI' AS type FROM `##individuals` WHERE i_file = ?" .
-		"  UNION " .
-		" SELECT f_id AS xref, 'FAM' AS type FROM `##families` WHERE f_file = ?" .
-		"  UNION " .
-		" SELECT s_id AS xref, 'SOUR' AS type FROM `##sources` WHERE s_file = ?" .
-		"  UNION " .
-		" SELECT m_id AS xref, 'OBJE' AS type FROM `##media` WHERE m_file = ?" .
-		"  UNION " .
-		" SELECT o_id AS xref, o_type AS type FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
-		") AS this_tree JOIN (" .
-		" SELECT xref FROM `##change` WHERE gedcom_id = ?" .
-		"  UNION " .
-		" SELECT i_id AS xref FROM `##individuals` WHERE i_file = ?" .
-		"  UNION " .
-		" SELECT f_id AS xref FROM `##families` WHERE f_file = ?" .
-		"  UNION " .
-		" SELECT s_id AS xref FROM `##sources` WHERE s_file = ?" .
-		"  UNION " .
-		" SELECT m_id AS xref FROM `##media` WHERE m_file = ?" .
-		"  UNION " .
-		" SELECT o_id AS xref FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
-		") AS other_trees USING (xref)"
-	)->execute(array(
-		$tree1_id, $tree1_id, $tree1_id, $tree1_id, $tree1_id,
-		$tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id,
-	))->fetchAssoc();
+    // Every XREF used by both trees
+    $xrefs = Database::prepare(
+        "SELECT xref, type FROM (" .
+        " SELECT i_id AS xref, 'INDI' AS type FROM `##individuals` WHERE i_file = ?" .
+        "  UNION " .
+        " SELECT f_id AS xref, 'FAM' AS type FROM `##families` WHERE f_file = ?" .
+        "  UNION " .
+        " SELECT s_id AS xref, 'SOUR' AS type FROM `##sources` WHERE s_file = ?" .
+        "  UNION " .
+        " SELECT m_id AS xref, 'OBJE' AS type FROM `##media` WHERE m_file = ?" .
+        "  UNION " .
+        " SELECT o_id AS xref, o_type AS type FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
+        ") AS this_tree JOIN (" .
+        " SELECT xref FROM `##change` WHERE gedcom_id = ?" .
+        "  UNION " .
+        " SELECT i_id AS xref FROM `##individuals` WHERE i_file = ?" .
+        "  UNION " .
+        " SELECT f_id AS xref FROM `##families` WHERE f_file = ?" .
+        "  UNION " .
+        " SELECT s_id AS xref FROM `##sources` WHERE s_file = ?" .
+        "  UNION " .
+        " SELECT m_id AS xref FROM `##media` WHERE m_file = ?" .
+        "  UNION " .
+        " SELECT o_id AS xref FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
+        ") AS other_trees USING (xref)"
+    )->execute(array(
+        $tree1_id, $tree1_id, $tree1_id, $tree1_id, $tree1_id,
+        $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id,
+    ))->fetchAssoc();
 
-	if ($xrefs) {
-		$tree1 = Tree::findById($tree1_id);
-		$tree2 = Tree::findById($tree2_id);
-		echo
-			'<p>', I18N::translate('In a family tree, each record has an internal reference number (called an “XREF”) such as “F123” or “R14”.'), '</p>',
-			'<p>',
-			I18N::plural(
-				/* I18N: An XREF is the identification number used in GEDCOM files. */
-				'The two family trees have %1$s record which uses the same “XREF”.',
-				'The two family trees have %1$s records which use the same “XREF”.',
-				count($xrefs), count($xrefs)
-			),
-			'</p>',
-			'<p>',
-			I18N::translate('You must renumber the records in one of the trees before you can merge them.'),
-			'</p>',
-			'<p>',
-			'<a class="current" href="admin_trees_renumber.php?ged=', $tree1->getNameUrl(), '">',
-			I18N::translate('Renumber family tree'), ' — ', $tree1->getTitleHtml(),
-			'</a>',
-			'</p>',
-			'<p>',
-			'<a class="current" href="admin_trees_renumber.php?ged=', $tree2->getNameUrl(), '">',
-			I18N::translate('Renumber family tree'), ' — ', $tree2->getTitleHtml(),
-			'</a>',
-			'</p>';
-	} else {
-		Database::beginTransaction();
-		Database::exec(
-			"LOCK TABLE" .
-			" `##individuals` WRITE," .
-			" `##individuals` AS individuals2 READ," .
-			" `##families` WRITE," .
-			" `##families` AS families2 READ," .
-			" `##sources` WRITE," .
-			" `##sources` AS sources2 READ," .
-			" `##media` WRITE," .
-			" `##media` AS media2 READ," .
-			" `##other` WRITE," .
-			" `##other` AS other2 READ," .
-			" `##name` WRITE," .
-			" `##name` AS name2 READ," .
-			" `##placelinks` WRITE," .
-			" `##placelinks` AS placelinks2 READ," .
-			" `##change` WRITE," .
-			" `##change` AS change2 READ," .
-			" `##dates` WRITE," .
-			" `##dates` AS dates2 READ," .
-			" `##default_resn` WRITE," .
-			" `##default_resn` AS default_resn2 READ," .
-			" `##hit_counter` WRITE," .
-			" `##hit_counter` AS hit_counter2 READ," .
-			" `##link` WRITE," .
-			" `##link` AS link2 READ"
-		);
-		Database::prepare(
-			"INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom)" .
-			" SELECT i_id, ?, i_rin, i_sex, i_gedcom FROM `##individuals` AS individuals2 WHERE i_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil)" .
-			" SELECT f_id, ?, f_husb, f_wife, f_gedcom, f_numchil FROM `##families` AS families2 WHERE f_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom)" .
-			" SELECT s_id, ?, s_name, s_gedcom FROM `##sources` AS sources2 WHERE s_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom)" .
-			" SELECT m_id, m_ext, m_type, m_titl, m_filename, ?, m_gedcom FROM `##media` AS media2 WHERE m_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom)" .
-			" SELECT o_id, ?, o_type, o_gedcom FROM `##other` AS other2 WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##name` (n_file, n_id, n_num, n_type, n_sort, n_full, n_surname, n_surn, n_givn, n_soundex_givn_std, n_soundex_surn_std, n_soundex_givn_dm, n_soundex_surn_dm)" .
-			" SELECT ?, n_id, n_num, n_type, n_sort, n_full, n_surname, n_surn, n_givn, n_soundex_givn_std, n_soundex_surn_std, n_soundex_givn_dm, n_soundex_surn_dm FROM `##name` AS name2 WHERE n_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##placelinks` (pl_p_id, pl_gid, pl_file)" .
-			" SELECT pl_p_id, pl_gid, ? FROM `##placelinks` AS placelinks2 WHERE pl_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##dates` (d_day, d_month, d_mon, d_year, d_julianday1, d_julianday2, d_fact, d_gid, d_file, d_type)" .
-			" SELECT d_day, d_month, d_mon, d_year, d_julianday1, d_julianday2, d_fact, d_gid, ?, d_type FROM `##dates` AS dates2 WHERE d_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##default_resn` (gedcom_id, xref, tag_type, resn)" .
-			" SELECT ?, xref, tag_type, resn FROM `##default_resn` AS default_resn2 WHERE gedcom_id = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::prepare(
-			"INSERT INTO `##link` (l_file, l_from, l_type, l_to)" .
-			" SELECT ?, l_from, l_type, l_to FROM `##link` AS link2 WHERE l_file = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		// This table may contain old (deleted) references, which could clash. IGNORE these.
-		Database::prepare(
-			"INSERT IGNORE INTO `##change` (change_time, status, gedcom_id, xref, old_gedcom, new_gedcom, user_id)" .
-			" SELECT change_time, status, ?, xref, old_gedcom, new_gedcom, user_id FROM `##change` AS change2 WHERE gedcom_id = ?"
-		)->execute(array($tree2_id, $tree1_id));
-		// This table may contain old (deleted) references, which could clash. IGNORE these.
-		Database::prepare(
-			"INSERT IGNORE INTO `##hit_counter` (gedcom_id, page_name, page_parameter, page_count)" .
-			" SELECT ?, page_name, page_parameter, page_count FROM `##hit_counter` AS hit_counter2 WHERE gedcom_id = ? AND page_name <> 'index.php'"
-		)->execute(array($tree2_id, $tree1_id));
-		Database::exec("UNLOCK TABLES");
-		Database::commit();
-		echo '<p>', I18N::translate('The family trees have been merged successfully.'), '</p>';
-	}
+    if ($xrefs) {
+        $tree1 = Tree::findById($tree1_id);
+        $tree2 = Tree::findById($tree2_id);
+        echo
+            '<p>', I18N::translate('In a family tree, each record has an internal reference number (called an “XREF”) such as “F123” or “R14”.'), '</p>',
+            '<p>',
+            I18N::plural(
+                /* I18N: An XREF is the identification number used in GEDCOM files. */
+                'The two family trees have %1$s record which uses the same “XREF”.',
+                'The two family trees have %1$s records which use the same “XREF”.',
+                count($xrefs), count($xrefs)
+            ),
+            '</p>',
+            '<p>',
+            I18N::translate('You must renumber the records in one of the trees before you can merge them.'),
+            '</p>',
+            '<p>',
+            '<a class="current" href="admin_trees_renumber.php?ged=', $tree1->getNameUrl(), '">',
+            I18N::translate('Renumber family tree'), ' — ', $tree1->getTitleHtml(),
+            '</a>',
+            '</p>',
+            '<p>',
+            '<a class="current" href="admin_trees_renumber.php?ged=', $tree2->getNameUrl(), '">',
+            I18N::translate('Renumber family tree'), ' — ', $tree2->getTitleHtml(),
+            '</a>',
+            '</p>';
+    } else {
+        Database::beginTransaction();
+        Database::exec(
+            "LOCK TABLE" .
+            " `##individuals` WRITE," .
+            " `##individuals` AS individuals2 READ," .
+            " `##families` WRITE," .
+            " `##families` AS families2 READ," .
+            " `##sources` WRITE," .
+            " `##sources` AS sources2 READ," .
+            " `##media` WRITE," .
+            " `##media` AS media2 READ," .
+            " `##other` WRITE," .
+            " `##other` AS other2 READ," .
+            " `##name` WRITE," .
+            " `##name` AS name2 READ," .
+            " `##placelinks` WRITE," .
+            " `##placelinks` AS placelinks2 READ," .
+            " `##change` WRITE," .
+            " `##change` AS change2 READ," .
+            " `##dates` WRITE," .
+            " `##dates` AS dates2 READ," .
+            " `##default_resn` WRITE," .
+            " `##default_resn` AS default_resn2 READ," .
+            " `##hit_counter` WRITE," .
+            " `##hit_counter` AS hit_counter2 READ," .
+            " `##link` WRITE," .
+            " `##link` AS link2 READ"
+        );
+        Database::prepare(
+            "INSERT INTO `##individuals` (i_id, i_file, i_rin, i_sex, i_gedcom)" .
+            " SELECT i_id, ?, i_rin, i_sex, i_gedcom FROM `##individuals` AS individuals2 WHERE i_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##families` (f_id, f_file, f_husb, f_wife, f_gedcom, f_numchil)" .
+            " SELECT f_id, ?, f_husb, f_wife, f_gedcom, f_numchil FROM `##families` AS families2 WHERE f_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##sources` (s_id, s_file, s_name, s_gedcom)" .
+            " SELECT s_id, ?, s_name, s_gedcom FROM `##sources` AS sources2 WHERE s_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##media` (m_id, m_ext, m_type, m_titl, m_filename, m_file, m_gedcom)" .
+            " SELECT m_id, m_ext, m_type, m_titl, m_filename, ?, m_gedcom FROM `##media` AS media2 WHERE m_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##other` (o_id, o_file, o_type, o_gedcom)" .
+            " SELECT o_id, ?, o_type, o_gedcom FROM `##other` AS other2 WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##name` (n_file, n_id, n_num, n_type, n_sort, n_full, n_surname, n_surn, n_givn, n_soundex_givn_std, n_soundex_surn_std, n_soundex_givn_dm, n_soundex_surn_dm)" .
+            " SELECT ?, n_id, n_num, n_type, n_sort, n_full, n_surname, n_surn, n_givn, n_soundex_givn_std, n_soundex_surn_std, n_soundex_givn_dm, n_soundex_surn_dm FROM `##name` AS name2 WHERE n_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##placelinks` (pl_p_id, pl_gid, pl_file)" .
+            " SELECT pl_p_id, pl_gid, ? FROM `##placelinks` AS placelinks2 WHERE pl_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##dates` (d_day, d_month, d_mon, d_year, d_julianday1, d_julianday2, d_fact, d_gid, d_file, d_type)" .
+            " SELECT d_day, d_month, d_mon, d_year, d_julianday1, d_julianday2, d_fact, d_gid, ?, d_type FROM `##dates` AS dates2 WHERE d_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##default_resn` (gedcom_id, xref, tag_type, resn)" .
+            " SELECT ?, xref, tag_type, resn FROM `##default_resn` AS default_resn2 WHERE gedcom_id = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::prepare(
+            "INSERT INTO `##link` (l_file, l_from, l_type, l_to)" .
+            " SELECT ?, l_from, l_type, l_to FROM `##link` AS link2 WHERE l_file = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        // This table may contain old (deleted) references, which could clash. IGNORE these.
+        Database::prepare(
+            "INSERT IGNORE INTO `##change` (change_time, status, gedcom_id, xref, old_gedcom, new_gedcom, user_id)" .
+            " SELECT change_time, status, ?, xref, old_gedcom, new_gedcom, user_id FROM `##change` AS change2 WHERE gedcom_id = ?"
+        )->execute(array($tree2_id, $tree1_id));
+        // This table may contain old (deleted) references, which could clash. IGNORE these.
+        Database::prepare(
+            "INSERT IGNORE INTO `##hit_counter` (gedcom_id, page_name, page_parameter, page_count)" .
+            " SELECT ?, page_name, page_parameter, page_count FROM `##hit_counter` AS hit_counter2 WHERE gedcom_id = ? AND page_name <> 'index.php'"
+        )->execute(array($tree2_id, $tree1_id));
+        Database::exec("UNLOCK TABLES");
+        Database::commit();
+        echo '<p>', I18N::translate('The family trees have been merged successfully.'), '</p>';
+    }
 } else {
-	echo '<form method="post">';
-	echo '<input type="hidden" name="go" value="1">';
-	echo '<p>', I18N::translate(/* I18N: Copy all the records from [family tree 1] into [family tree 2] */
-		'Copy all the records from %1$s into %2$s.',
-		FunctionsEdit::selectEditControl('tree1_id', Tree::getIdList(), '', null),
-		FunctionsEdit::selectEditControl('tree2_id', Tree::getIdList(), '', null)
-	),
-	'</p>';
+    echo '<form method="post">';
+    echo '<input type="hidden" name="go" value="1">';
+    echo '<p>', I18N::translate(/* I18N: Copy all the records from [family tree 1] into [family tree 2] */
+        'Copy all the records from %1$s into %2$s.',
+        FunctionsEdit::selectEditControl('tree1_id', Tree::getIdList(), '', null),
+        FunctionsEdit::selectEditControl('tree2_id', Tree::getIdList(), '', null)
+    ),
+    '</p>';
 
-	echo '<button type="submit" class="btn btn-primary">';
-	echo '<i class="fa fa-check"></i> ', /* I18N: A button label. */ I18N::translate('continue');
-	echo '</button>';
-	echo '</form>';
+    echo '<button type="submit" class="btn btn-primary">';
+    echo '<i class="fa fa-check"></i> ', /* I18N: A button label. */ I18N::translate('continue');
+    echo '</button>';
+    echo '</form>';
 }