diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2018-11-11 18:20:10 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2018-11-18 09:14:43 +0000 |
| commit | 72cf66d48ef1f917238d9b0939a8aa33f257e274 (patch) | |
| tree | 82470df5770cf009c9881343d08530904fac4e4b | |
| parent | 00122bffbf32852fa45e225b3f7f94a1de0a7bbf (diff) | |
| download | webtrees-72cf66d48ef1f917238d9b0939a8aa33f257e274.tar.gz webtrees-72cf66d48ef1f917238d9b0939a8aa33f257e274.tar.bz2 webtrees-72cf66d48ef1f917238d9b0939a8aa33f257e274.zip | |
Rename Tree::getTreeId() to id()
66 files changed, 523 insertions, 523 deletions
diff --git a/app/Functions/FunctionsExport.php b/app/Functions/FunctionsExport.php index d3c4d5331f..c2dafe67f9 100644 --- a/app/Functions/FunctionsExport.php +++ b/app/Functions/FunctionsExport.php @@ -117,7 +117,7 @@ class FunctionsExport Database::prepare("SELECT o_id FROM `##other` WHERE o_type=? AND o_file=?") ->execute([ 'SUBN', - $tree->getTreeId(), + $tree->id(), ]) ->fetchOne(); if ($subn) { @@ -127,7 +127,7 @@ class FunctionsExport Database::prepare("SELECT o_id FROM `##other` WHERE o_type=? AND o_file=?") ->execute([ 'SUBM', - $tree->getTreeId(), + $tree->id(), ]) ->fetchOne(); if ($subm) { @@ -200,7 +200,7 @@ class FunctionsExport "SELECT m_id AS xref, m_gedcom AS gedcom" . " FROM `##media` WHERE m_file = :tree_id ORDER BY m_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($rows as $row) { @@ -216,7 +216,7 @@ class FunctionsExport "SELECT s_id AS xref, s_file AS gedcom_id, s_gedcom AS gedcom" . " FROM `##sources` WHERE s_file = :tree_id ORDER BY s_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($rows as $row) { @@ -231,7 +231,7 @@ class FunctionsExport "SELECT o_type AS type, o_id AS xref, o_gedcom AS gedcom" . " FROM `##other` WHERE o_file = :tree_id AND o_type NOT IN ('HEAD', 'TRLR') ORDER BY o_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($rows as $row) { @@ -258,7 +258,7 @@ class FunctionsExport "SELECT i_id AS xref, i_gedcom AS gedcom" . " FROM `##individuals` WHERE i_file = :tree_id ORDER BY i_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($rows as $row) { @@ -277,7 +277,7 @@ class FunctionsExport "SELECT f_id AS xref, f_gedcom AS gedcom" . " FROM `##families` WHERE f_file = :tree_id ORDER BY f_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($rows as $row) { diff --git a/app/Functions/FunctionsImport.php b/app/Functions/FunctionsImport.php index a14447377c..2cb809b9c6 100644 --- a/app/Functions/FunctionsImport.php +++ b/app/Functions/FunctionsImport.php @@ -602,7 +602,7 @@ class FunctionsImport */ public static function importRecord($gedrec, Tree $tree, $update) { - $tree_id = $tree->getTreeId(); + $tree_id = $tree->id(); // Escaped @ signs (only if importing from file) if (!$update) { @@ -829,7 +829,7 @@ class FunctionsImport )->execute([ 'place_id' => $place_id, 'xref' => $xref, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); } } @@ -853,7 +853,7 @@ class FunctionsImport } // Already imported? - $cache_key = $tree->getTreeId() . '/' . $place; + $cache_key = $tree->id() . '/' . $place; if (isset($cache[$cache_key])) { return $cache[$cache_key]; } @@ -871,7 +871,7 @@ class FunctionsImport "SELECT p_id FROM `##places`" . " WHERE p_file =:tree_id AND p_parent_id = :parent_id AND p_place = LEFT(:place, 150)" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'parent_id' => $parent_id, 'place' => $place, ])->fetchOne(); @@ -883,7 +883,7 @@ class FunctionsImport )->execute([ 'place' => $place, 'parent_id' => $parent_id, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'std_soundex' => Soundex::russell($place), 'dm_soundex' => Soundex::daitchMokotoff($place), ]); @@ -1096,7 +1096,7 @@ class FunctionsImport )->execute([ 'filename' => $file, 'title' => $titl, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchOne(); if (!$xref) { @@ -1118,7 +1118,7 @@ class FunctionsImport "INSERT INTO `##media` (m_id, m_file, m_gedcom) VALUES (:m_id, :m_file, :m_gedcom)" )->execute([ 'm_id' => $xref, - 'm_file' => $tree->getTreeId(), + 'm_file' => $tree->id(), 'm_gedcom' => $gedrec, ]); @@ -1127,7 +1127,7 @@ class FunctionsImport "INSERT INTO `##media_file` (m_id, m_file, multimedia_file_refn, multimedia_format, source_media_type, descriptive_title) VALUES (:m_id, :m_file, LEFT(:multimedia_file_refn, 512), LEFT(:multimedia_format, 4), LEFT(:source_media_type, 15), LEFT(:descriptive_title, 248))" )->execute([ 'm_id' => $xref, - 'm_file' => $tree->getTreeId(), + 'm_file' => $tree->id(), 'multimedia_file_refn' => $media_file->filename(), 'multimedia_format' => $media_file->format(), 'source_media_type' => $media_file->type(), @@ -1157,7 +1157,7 @@ class FunctionsImport " ORDER BY change_id" )->execute([ 'xref' => $xref, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($changes as $change) { if (empty($change->new_gedcom)) { @@ -1171,7 +1171,7 @@ class FunctionsImport "UPDATE `##change` SET status='accepted' WHERE status='pending' AND xref=? AND gedcom_id=?" )->execute([ $xref, - $tree->getTreeId(), + $tree->id(), ]); Log::addEditLog("Accepted change {$change->change_id} for {$xref} / {$change->gedcom_name} into database", $tree); } @@ -1192,7 +1192,7 @@ class FunctionsImport " WHERE status = 'pending' AND xref = :xref AND gedcom_id = :tree_id" )->execute([ 'xref' => $record->getXref(), - 'tree_id' => $record->getTree()->getTreeId(), + 'tree_id' => $record->getTree()->id(), ]); } @@ -1225,21 +1225,21 @@ class FunctionsImport "SELECT pl_p_id FROM `##placelinks` WHERE pl_gid=? AND pl_file=?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ])->fetchOneColumn(); Database::prepare( "DELETE FROM `##placelinks` WHERE pl_gid = ? AND pl_file = ?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "DELETE FROM `##dates` WHERE d_gid =? AND d_file = ?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); //-- delete any unlinked places @@ -1248,7 +1248,7 @@ class FunctionsImport "SELECT count(pl_p_id) FROM `##placelinks` WHERE pl_p_id=? AND pl_file=?" )->execute([ $p_id, - $tree->getTreeId(), + $tree->id(), ])->fetchOne(); if ($num === 0) { @@ -1256,7 +1256,7 @@ class FunctionsImport "DELETE FROM `##places` WHERE p_id=? AND p_file=?" )->execute([ $p_id, - $tree->getTreeId(), + $tree->id(), ]); } } @@ -1265,14 +1265,14 @@ class FunctionsImport "DELETE FROM `##name` WHERE n_id=? AND n_file=?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "DELETE FROM `##link` WHERE l_from=? AND l_file=?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); switch ($type) { @@ -1281,7 +1281,7 @@ class FunctionsImport "DELETE FROM `##individuals` WHERE i_id=? AND i_file=?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); break; @@ -1290,7 +1290,7 @@ class FunctionsImport "DELETE FROM `##families` WHERE f_id=? AND f_file=?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); break; @@ -1299,7 +1299,7 @@ class FunctionsImport "DELETE FROM `##sources` WHERE s_id=? AND s_file=?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); break; @@ -1308,14 +1308,14 @@ class FunctionsImport "DELETE FROM `##media` WHERE m_id=? AND m_file=?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "DELETE FROM `##media_file` WHERE m_id=? AND m_file=?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); break; @@ -1324,7 +1324,7 @@ class FunctionsImport "DELETE FROM `##other` WHERE o_id=? AND o_file=?" )->execute([ $gid, - $tree->getTreeId(), + $tree->id(), ]); break; } diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php index 5fede18cbd..4aa975fbf2 100644 --- a/app/GedcomRecord.php +++ b/app/GedcomRecord.php @@ -144,7 +144,7 @@ class GedcomRecord */ public static function getInstance(string $xref, Tree $tree, string $gedcom = null) { - $tree_id = $tree->getTreeId(); + $tree_id = $tree->id(); // Is this record already in the cache? if (isset(self::$gedcom_record_cache[$xref][$tree_id])) { @@ -727,7 +727,7 @@ class GedcomRecord */ public function __toString() { - return $this->xref . '@' . $this->tree->getTreeId(); + return $this->xref . '@' . $this->tree->id(); } /** @@ -874,7 +874,7 @@ class GedcomRecord " WHERE i_file = :tree_id AND l_type = :link AND l_to = :xref" . " ORDER BY n_sort COLLATE :collation" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'link' => $link, 'xref' => $this->xref, 'collation' => I18N::collation(), @@ -907,7 +907,7 @@ class GedcomRecord " LEFT JOIN `##name` ON f_file = n_file AND f_id = n_id AND n_num = 0" . " WHERE f_file = :tree_id AND l_type = :link AND l_to = :xref" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'link' => $link, 'xref' => $this->xref, ])->fetchAll(); @@ -939,7 +939,7 @@ class GedcomRecord " WHERE s_file = :tree_id AND l_type = :link AND l_to = :xref" . " ORDER BY s_name COLLATE :collation" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'link' => $link, 'xref' => $this->xref, 'collation' => I18N::collation(), @@ -971,7 +971,7 @@ class GedcomRecord " JOIN `##link` ON m_file = l_file AND m_id = l_from" . " WHERE m_file = :tree_id AND l_type = :link AND l_to = :xref" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'link' => $link, 'xref' => $this->xref, ])->fetchAll(); @@ -1004,7 +1004,7 @@ class GedcomRecord " WHERE o_file = :tree_id AND o_type = 'NOTE' AND l_type = :link AND l_to = :xref" . " ORDER BY n_sort COLLATE :collation" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'link' => $link, 'xref' => $this->xref, 'collation' => I18N::collation(), @@ -1038,7 +1038,7 @@ class GedcomRecord " WHERE o_file = :tree_id AND o_type = 'REPO' AND l_type = :link AND l_to = :xref" . " ORDER BY n_sort COLLATE :collation" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'link' => $link, 'xref' => $this->xref, 'collation' => I18N::collation(), @@ -1292,7 +1292,7 @@ class GedcomRecord Database::prepare( "INSERT INTO `##change` (gedcom_id, xref, old_gedcom, new_gedcom, user_id) VALUES (?, ?, ?, ?, ?)" )->execute([ - $this->tree->getTreeId(), + $this->tree->id(), $this->xref, $old_gedcom, $new_gedcom, @@ -1334,7 +1334,7 @@ class GedcomRecord Database::prepare( "INSERT INTO `##change` (gedcom_id, xref, old_gedcom, new_gedcom, user_id) VALUES (?, ?, ?, ?, ?)" )->execute([ - $this->tree->getTreeId(), + $this->tree->id(), $this->xref, $this->getGedcom(), $gedcom, @@ -1368,7 +1368,7 @@ class GedcomRecord Database::prepare( "INSERT INTO `##change` (gedcom_id, xref, old_gedcom, new_gedcom, user_id) VALUES (?, ?, ?, '', ?)" )->execute([ - $this->tree->getTreeId(), + $this->tree->id(), $this->xref, $this->getGedcom(), Auth::id(), diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 4de7262cae..111d7f4cc9 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -832,7 +832,7 @@ class AdminController extends AbstractBaseController } // Update records that link to the one we will be removing. - $ids = FunctionsDb::fetchAllLinks($xref2, $tree->getTreeId()); + $ids = FunctionsDb::fetchAllLinks($xref2, $tree->id()); foreach ($ids as $id) { $record = GedcomRecord::getInstance($id, $tree); @@ -860,7 +860,7 @@ class AdminController extends AbstractBaseController " WHERE gedcom_id=? AND setting_name='gedcomid' AND setting_value=?" )->execute([ $xref2, - $tree->getTreeId(), + $tree->id(), $xref1, ]); @@ -871,7 +871,7 @@ class AdminController extends AbstractBaseController " WHERE gedcom_id=? AND page_parameter IN (?, ?)" . " GROUP BY page_name" )->execute([ - $tree->getTreeId(), + $tree->id(), $xref1, $xref2, ])->fetchAssoc(); @@ -882,7 +882,7 @@ class AdminController extends AbstractBaseController " WHERE gedcom_id=? AND page_name=? AND page_parameter=?" )->execute([ $page_count, - $tree->getTreeId(), + $tree->id(), $page_name, $xref1, ]); @@ -892,7 +892,7 @@ class AdminController extends AbstractBaseController "DELETE FROM `##hit_counter`" . " WHERE gedcom_id=? AND page_parameter=?" )->execute([ - $tree->getTreeId(), + $tree->id(), $xref2, ]); @@ -916,7 +916,7 @@ class AdminController extends AbstractBaseController )->execute([ 'old_xref' => $xref1, 'new_xref' => $xref2, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); $record1->updateRecord($gedcom, true); @@ -1041,7 +1041,7 @@ class AdminController extends AbstractBaseController Database::prepare( "DELETE FROM `##default_resn` WHERE gedcom_id = :tree_id AND tag_type = :tag_type AND xref IS NULL" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'tag_type' => $tag_type, ]); } @@ -1049,7 +1049,7 @@ class AdminController extends AbstractBaseController Database::prepare( "DELETE FROM `##default_resn` WHERE gedcom_id = ? AND xref = ? AND tag_type IS NULL" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'xref' => $xref, ]); } @@ -1059,7 +1059,7 @@ class AdminController extends AbstractBaseController "REPLACE INTO `##default_resn` (gedcom_id, xref, tag_type, resn)" . " VALUES (:tree_id, NULLIF(:xref, ''), NULLIF(:tag_type, ''), :resn)" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'xref' => $xref, 'tag_type' => $tag_type, 'resn' => $resn, @@ -1104,12 +1104,12 @@ class AdminController extends AbstractBaseController foreach ($modules as $module) { foreach (Tree::getAll() as $tree) { - $key = 'access-' . $module->getName() . '-' . $tree->getTreeId(); + $key = 'access-' . $module->getName() . '-' . $tree->id(); $access_level = (int) $request->get($key, $module->defaultAccessLevel()); Database::prepare("REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (:module_name, :tree_id, :component, :access_level)")->execute([ 'module_name' => $module->getName(), - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'component' => $component, 'access_level' => $access_level, ]); @@ -1496,7 +1496,7 @@ class AdminController extends AbstractBaseController " LEFT JOIN `##name` ON (gedcom_id = n_file AND xref = n_id AND n_num = 0)" . " WHERE gedcom_id = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($restrictions as $restriction) { diff --git a/app/Http/Controllers/AdminLocationController.php b/app/Http/Controllers/AdminLocationController.php index 790920cbe0..00b625c914 100644 --- a/app/Http/Controllers/AdminLocationController.php +++ b/app/Http/Controllers/AdminLocationController.php @@ -503,7 +503,7 @@ class AdminLocationController extends AbstractBaseController LEFT JOIN `##places` t9 ON t8.p_parent_id = t9.p_id WHERE t1.p_file = :gedcom" )->execute([ - 'gedcom' => $tree->getTreeId(), + 'gedcom' => $tree->id(), ])->fetchOneColumn(); // ... and the placelocation table diff --git a/app/Http/Controllers/AdminPhpGedViewController.php b/app/Http/Controllers/AdminPhpGedViewController.php index 1a42e51858..5497b8ce2a 100644 --- a/app/Http/Controllers/AdminPhpGedViewController.php +++ b/app/Http/Controllers/AdminPhpGedViewController.php @@ -684,7 +684,7 @@ class AdminPhpGedViewController extends AbstractBaseController "INSERT IGNORE INTO `##user_gedcom_setting` (user_id, gedcom_id, setting_name, setting_value) VALUES (?, ?, ?, ?)" )->execute([ $setting->user_id, - $tree->getTreeId(), + $tree->id(), 'gedcomid', $value, ]); @@ -705,7 +705,7 @@ class AdminPhpGedViewController extends AbstractBaseController "INSERT IGNORE INTO `##user_gedcom_setting` (user_id, gedcom_id, setting_name, setting_value) VALUES (?, ?, ?, ?)" )->execute([ $setting->user_id, - $tree->getTreeId(), + $tree->id(), 'rootid', $value, ]); @@ -726,7 +726,7 @@ class AdminPhpGedViewController extends AbstractBaseController "INSERT IGNORE INTO `##user_gedcom_setting` (user_id, gedcom_id, setting_name, setting_value) VALUES (?, ?, ?, ?)" )->execute([ $setting->user_id, - $tree->getTreeId(), + $tree->id(), 'canedit', $value, ]); diff --git a/app/Http/Controllers/AdminTreesController.php b/app/Http/Controllers/AdminTreesController.php index c5d7525ddc..ee220396a2 100644 --- a/app/Http/Controllers/AdminTreesController.php +++ b/app/Http/Controllers/AdminTreesController.php @@ -83,11 +83,11 @@ class AdminTreesController extends AbstractBaseController " UNION " . "SELECT o_id AS xref, o_type AS type, o_gedcom AS gedrec FROM `##other` WHERE o_file=? AND o_type NOT IN ('HEAD', 'TRLR')" )->execute([ - $tree->getTreeId(), - $tree->getTreeId(), - $tree->getTreeId(), - $tree->getTreeId(), - $tree->getTreeId(), + $tree->id(), + $tree->id(), + $tree->id(), + $tree->id(), + $tree->id(), ])->fetchAll(); $records = []; @@ -106,7 +106,7 @@ class AdminTreesController extends AbstractBaseController " GROUP BY xref" . " ) AS t1" . " JOIN `##change` t2 USING (change_id)" - )->execute([$tree->getTreeId()])->fetchAll(); + )->execute([$tree->id()])->fetchAll(); foreach ($rows as $row) { if ($row->gedrec) { @@ -437,7 +437,7 @@ class AdminTreesController extends AbstractBaseController $rows = Database::prepare( "SELECT m_id, m_gedcom FROM `##media` WHERE m_file = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $path = $tree->getPreference('MEDIA_DIRECTORY'); foreach ($rows as $row) { @@ -609,7 +609,7 @@ class AdminTreesController extends AbstractBaseController // Just show the current tree, the default tree, and unimported trees if (count($all_trees) >= $multiple_tree_threshold) { $all_trees = array_filter($all_trees, function (Tree $x) use ($tree): bool { - return $x->getPreference('imported') === '0' || $tree->getTreeId() === $x->getTreeId() || $x->getName() === Site::getPreference('DEFAULT_GEDCOM'); + return $x->getPreference('imported') === '0' || $tree->id() === $x->id() || $x->getName() === Site::getPreference('DEFAULT_GEDCOM'); }); } @@ -644,7 +644,7 @@ class AdminTreesController extends AbstractBaseController $tree1 = Tree::findByName($tree1_name); $tree2 = Tree::findByName($tree2_name); - if ($tree1 !== null && $tree2 !== null && $tree1->getTreeId() !== $tree2->getTreeId()) { + if ($tree1 !== null && $tree2 !== null && $tree1->id() !== $tree2->id()) { $xrefs = $this->commonXrefs($tree1, $tree2); } else { $xrefs = []; @@ -681,88 +681,88 @@ class AdminTreesController extends AbstractBaseController "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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $tree2->id(), + $tree1->id(), ]); Database::prepare( "INSERT INTO `##media` (m_id, m_file, m_gedcom)" . " SELECT m_id, ?, m_gedcom FROM `##media` AS media2 WHERE m_file = ?" )->execute([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $tree2->id(), + $tree1->id(), ]); Database::prepare( "INSERT INTO `##media_file` (m_id, m_file, multimedia_file_refn, multimedia_format, source_media_type, descriptive_title)" . " SELECT m_id, ?, multimedia_file_refn, multimedia_format, source_media_type, descriptive_title FROM `##media_file` AS media_file2 WHERE m_file = ?" )->execute([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $tree2->id(), + $tree1->id(), ]); // This table may contain old (deleted) references, which could clash. IGNORE these. @@ -770,8 +770,8 @@ class AdminTreesController extends AbstractBaseController "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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $tree2->id(), + $tree1->id(), ]); // This table may contain old (deleted) references, which could clash. IGNORE these. @@ -779,8 +779,8 @@ class AdminTreesController extends AbstractBaseController "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([ - $tree2->getTreeId(), - $tree1->getTreeId(), + $tree2->id(), + $tree1->id(), ]); FlashMessages::addMessage(I18N::translate('The family trees have been merged successfully.'), 'success'); @@ -1101,7 +1101,7 @@ class AdminTreesController extends AbstractBaseController try { Database::prepare("UPDATE `##gedcom` SET gedcom_name = ? WHERE gedcom_id = ?")->execute([ $gedcom, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare("UPDATE `##site_setting` SET setting_value = ? WHERE setting_name='DEFAULT_GEDCOM' AND setting_value = ?")->execute([ $gedcom, @@ -1142,7 +1142,7 @@ class AdminTreesController extends AbstractBaseController "0 @$old_xref@ INDI\n", "0 @$new_xref@ INDI\n", $old_xref, - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1150,7 +1150,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " HUSB @$old_xref@", " HUSB @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1158,7 +1158,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " WIFE @$old_xref@", " WIFE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1166,7 +1166,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " CHIL @$old_xref@", " CHIL @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1174,7 +1174,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1182,7 +1182,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1190,7 +1190,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1198,28 +1198,28 @@ class AdminTreesController extends AbstractBaseController $old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##user_gedcom_setting` SET setting_value = ? WHERE setting_value = ? AND gedcom_id = ? AND setting_name IN ('gedcomid', 'rootid')" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); break; case 'FAM': @@ -1230,7 +1230,7 @@ class AdminTreesController extends AbstractBaseController "0 @$old_xref@ FAM\n", "0 @$new_xref@ FAM\n", $old_xref, - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1238,7 +1238,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " FAMC @$old_xref@", " FAMC @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1246,21 +1246,21 @@ class AdminTreesController extends AbstractBaseController $old_xref, " FAMS @$old_xref@", " FAMS @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); break; case 'SOUR': @@ -1271,7 +1271,7 @@ class AdminTreesController extends AbstractBaseController "0 @$old_xref@ SOUR\n", "0 @$new_xref@ SOUR\n", $old_xref, - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1279,7 +1279,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1287,7 +1287,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1295,7 +1295,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1303,7 +1303,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); break; case 'REPO': @@ -1314,7 +1314,7 @@ class AdminTreesController extends AbstractBaseController "0 @$old_xref@ REPO\n", "0 @$new_xref@ REPO\n", $old_xref, - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1322,7 +1322,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " REPO @$old_xref@", " REPO @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); break; case 'NOTE': @@ -1335,7 +1335,7 @@ class AdminTreesController extends AbstractBaseController "0 @$old_xref@ NOTE ", "0 @$new_xref@ NOTE ", $old_xref, - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1343,7 +1343,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1351,7 +1351,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1359,7 +1359,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1367,7 +1367,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1375,7 +1375,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); break; case 'OBJE': @@ -1386,14 +1386,14 @@ class AdminTreesController extends AbstractBaseController "0 @$old_xref@ OBJE\n", "0 @$new_xref@ OBJE\n", $old_xref, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##media_file` SET m_id = ? WHERE m_id = ? AND m_file = ?" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1401,7 +1401,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1409,7 +1409,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1417,7 +1417,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1425,7 +1425,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); 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 = ?" @@ -1433,7 +1433,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); break; default: @@ -1444,7 +1444,7 @@ class AdminTreesController extends AbstractBaseController "0 @$old_xref@ $type\n", "0 @$new_xref@ $type\n", $old_xref, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ?) SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?" @@ -1452,7 +1452,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " @$old_xref@", " @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ?) SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?" @@ -1460,7 +1460,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " @$old_xref@", " @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ?) SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?" @@ -1468,7 +1468,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " @$old_xref@", " @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ?) SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?" @@ -1476,7 +1476,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " @$old_xref@", " @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ?) SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?" @@ -1484,7 +1484,7 @@ class AdminTreesController extends AbstractBaseController $old_xref, " @$old_xref@", " @$new_xref@", - $tree->getTreeId(), + $tree->id(), ]); break; } @@ -1493,35 +1493,35 @@ class AdminTreesController extends AbstractBaseController )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##default_resn` SET xref = ? WHERE xref = ? AND gedcom_id = ?" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##hit_counter` SET page_parameter = ? WHERE page_parameter = ? AND gedcom_id = ?" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##link` SET l_from = ? WHERE l_from = ? AND l_file = ?" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); Database::prepare( "UPDATE `##link` SET l_to = ? WHERE l_to = ? AND l_file = ?" )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); unset($xrefs[$old_xref]); @@ -1532,7 +1532,7 @@ class AdminTreesController extends AbstractBaseController )->execute([ $new_xref, $old_xref, - $tree->getTreeId(), + $tree->id(), ]); } catch (\Exception $ex) { DebugBar::addThrowable($ex); @@ -1622,7 +1622,7 @@ class AdminTreesController extends AbstractBaseController } $rows = Database::prepare($sql)->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $graph = []; @@ -1680,7 +1680,7 @@ class AdminTreesController extends AbstractBaseController " WHERE i_file = ?" . " AND COALESCE(new_gedcom, i_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')" )->execute([ - $tree->getTreeId(), + $tree->id(), preg_quote($search), ])->fetchAll(); foreach ($rows as $row) { @@ -1700,7 +1700,7 @@ class AdminTreesController extends AbstractBaseController " WHERE f_file = ?" . " AND COALESCE(new_gedcom, f_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')" )->execute([ - $tree->getTreeId(), + $tree->id(), preg_quote($search), ])->fetchAll(); foreach ($rows as $row) { @@ -1739,7 +1739,7 @@ class AdminTreesController extends AbstractBaseController " WHERE i_file = ?" . " AND COALESCE(new_gedcom, i_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')" )->execute([ - $tree->getTreeId(), + $tree->id(), preg_quote($search), ])->fetchAll(); foreach ($rows as $row) { @@ -1761,7 +1761,7 @@ class AdminTreesController extends AbstractBaseController " WHERE f_file = ?" . " AND COALESCE(new_gedcom, f_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')" )->execute([ - $tree->getTreeId(), + $tree->id(), preg_quote($search), ])->fetchAll(); foreach ($rows as $row) { @@ -1817,17 +1817,17 @@ class AdminTreesController extends AbstractBaseController " SELECT o_id AS xref FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" . ") AS other_trees USING (xref)" )->execute([ - $tree1->getTreeId(), - $tree1->getTreeId(), - $tree1->getTreeId(), - $tree1->getTreeId(), - $tree1->getTreeId(), - $tree2->getTreeId(), - $tree2->getTreeId(), - $tree2->getTreeId(), - $tree2->getTreeId(), - $tree2->getTreeId(), - $tree2->getTreeId(), + $tree1->id(), + $tree1->id(), + $tree1->id(), + $tree1->id(), + $tree1->id(), + $tree2->id(), + $tree2->id(), + $tree2->id(), + $tree2->id(), + $tree2->id(), + $tree2->id(), ])->fetchAssoc(); } @@ -1846,7 +1846,7 @@ class AdminTreesController extends AbstractBaseController " GROUP BY n_full" . " HAVING COUNT(n_id) > 1" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $repositories = array_map(function (stdClass $x) use ($tree): array { @@ -1863,7 +1863,7 @@ class AdminTreesController extends AbstractBaseController " GROUP BY n_full" . " HAVING COUNT(n_id) > 1" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $sources = array_map(function (stdClass $x) use ($tree): array { @@ -1880,7 +1880,7 @@ class AdminTreesController extends AbstractBaseController " GROUP BY d_day, d_month, d_year, d_type, d_fact, n_type, n_full" . " HAVING COUNT(DISTINCT d_gid) > 1" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $individuals = array_map(function (stdClass $x) use ($tree): array { @@ -1896,7 +1896,7 @@ class AdminTreesController extends AbstractBaseController " GROUP BY LEAST(f_husb, f_wife), GREATEST(f_husb, f_wife)" . " HAVING COUNT(f_id) > 1" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $families = array_map(function (stdClass $x) use ($tree): array { @@ -1913,7 +1913,7 @@ class AdminTreesController extends AbstractBaseController " GROUP BY descriptive_title" . " HAVING COUNT(m_id) > 1" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $media = array_map(function (stdClass $x) use ($tree): array { @@ -1965,17 +1965,17 @@ class AdminTreesController extends AbstractBaseController " SELECT o_id AS xref FROM `##other` WHERE o_file <> :tree_id_11 AND o_type NOT IN ('HEAD', 'TRLR')" . ") AS other_trees USING (xref)" )->execute([ - 'tree_id_1' => $tree->getTreeId(), - 'tree_id_2' => $tree->getTreeId(), - 'tree_id_3' => $tree->getTreeId(), - 'tree_id_4' => $tree->getTreeId(), - 'tree_id_5' => $tree->getTreeId(), - 'tree_id_6' => $tree->getTreeId(), - 'tree_id_7' => $tree->getTreeId(), - 'tree_id_8' => $tree->getTreeId(), - 'tree_id_9' => $tree->getTreeId(), - 'tree_id_10' => $tree->getTreeId(), - 'tree_id_11' => $tree->getTreeId(), + 'tree_id_1' => $tree->id(), + 'tree_id_2' => $tree->id(), + 'tree_id_3' => $tree->id(), + 'tree_id_4' => $tree->id(), + 'tree_id_5' => $tree->id(), + 'tree_id_6' => $tree->id(), + 'tree_id_7' => $tree->id(), + 'tree_id_8' => $tree->id(), + 'tree_id_9' => $tree->id(), + 'tree_id_10' => $tree->id(), + 'tree_id_11' => $tree->id(), ])->fetchAssoc(); } diff --git a/app/Http/Controllers/AdminUsersController.php b/app/Http/Controllers/AdminUsersController.php index 3e78d48b1f..a4c2e40876 100644 --- a/app/Http/Controllers/AdminUsersController.php +++ b/app/Http/Controllers/AdminUsersController.php @@ -415,9 +415,9 @@ class AdminUsersController extends AbstractBaseController } foreach (Tree::getAll() as $tree) { - $path_length = (int) $request->get('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId()); - $gedcom_id = $request->get('gedcomid' . $tree->getTreeId(), ''); - $can_edit = $request->get('canedit' . $tree->getTreeId(), ''); + $path_length = (int) $request->get('RELATIONSHIP_PATH_LENGTH' . $tree->id()); + $gedcom_id = $request->get('gedcomid' . $tree->id(), ''); + $can_edit = $request->get('canedit' . $tree->id(), ''); // Do not allow a path length to be set if the individual ID is not if ($gedcom_id === '') { diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 3c9e1f703f..a446a323b2 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -121,7 +121,7 @@ class LoginController extends AbstractBaseController // Switch to a tree where we have a genealogy record (or keep to the current/default). $ged = Database::prepare("SELECT gedcom_name FROM `##gedcom` JOIN `##user_gedcom_setting` USING (gedcom_id)" . " WHERE setting_name = 'gedcomid' AND user_id = :user_id" . " ORDER BY gedcom_id = :tree_id DESC")->execute([ 'user_id' => Auth::user()->getUserId(), - 'tree_id' => $tree ? $tree->getTreeId() : 0, + 'tree_id' => $tree ? $tree->id() : 0, ])->fetchOne(); $url = route('tree-page', ['ged' => $ged]); diff --git a/app/Http/Controllers/AutocompleteController.php b/app/Http/Controllers/AutocompleteController.php index 0668f9b35f..74f676e754 100644 --- a/app/Http/Controllers/AutocompleteController.php +++ b/app/Http/Controllers/AutocompleteController.php @@ -103,7 +103,7 @@ class AutocompleteController extends AbstractBaseController )->execute([ 'xref' => $xref, 'term' => $like_query, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); // Filter for privacy @@ -124,7 +124,7 @@ class AutocompleteController extends AbstractBaseController )->execute([ 'xref' => $xref, 'term' => $query, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); // Filter for privacy foreach ($rows as $row) { diff --git a/app/Http/Controllers/BranchesController.php b/app/Http/Controllers/BranchesController.php index 4dd5c9f094..00c71be415 100644 --- a/app/Http/Controllers/BranchesController.php +++ b/app/Http/Controllers/BranchesController.php @@ -151,7 +151,7 @@ class BranchesController extends AbstractBaseController " AND (n_surn = ? OR n_surname = ?"; $args = [ - $tree->getTreeId(), + $tree->id(), '_MARNM', $surname, $surname, diff --git a/app/Http/Controllers/EditGedcomRecordController.php b/app/Http/Controllers/EditGedcomRecordController.php index 9080182587..335b52a557 100644 --- a/app/Http/Controllers/EditGedcomRecordController.php +++ b/app/Http/Controllers/EditGedcomRecordController.php @@ -136,7 +136,7 @@ class EditGedcomRecordController extends AbstractEditController if ($record && Auth::isEditor($record->getTree()) && $record->canShow() && $record->canEdit()) { // Delete links to this record - foreach (FunctionsDb::fetchAllLinks($record->getXref(), $record->getTree()->getTreeId()) as $xref) { + foreach (FunctionsDb::fetchAllLinks($record->getXref(), $record->getTree()->id()) as $xref) { $linker = GedcomRecord::getInstance($xref, $tree); $old_gedcom = $linker->getGedcom(); $new_gedcom = $this->removeLinks($old_gedcom, $record->getXref()); diff --git a/app/Http/Controllers/EditMediaController.php b/app/Http/Controllers/EditMediaController.php index ed864b4d36..355119d35d 100644 --- a/app/Http/Controllers/EditMediaController.php +++ b/app/Http/Controllers/EditMediaController.php @@ -620,7 +620,7 @@ class EditMediaController extends AbstractEditController " WHERE m_file = :tree_id" . " AND multimedia_file_refn NOT LIKE 'http://%' AND multimedia_file_refn NOT LIKE 'https://%'" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchOneColumn(); $disk_files = []; diff --git a/app/Http/Controllers/GedcomFileController.php b/app/Http/Controllers/GedcomFileController.php index 785ef09830..4443588521 100644 --- a/app/Http/Controllers/GedcomFileController.php +++ b/app/Http/Controllers/GedcomFileController.php @@ -48,7 +48,7 @@ class GedcomFileController extends AbstractBaseController Database::prepare( "SELECT imported FROM `##gedcom_chunk` WHERE gedcom_id = :tree_id FOR UPDATE" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); // What is the current import status? @@ -58,7 +58,7 @@ class GedcomFileController extends AbstractBaseController " SUM(LENGTH(chunk_data)) AS import_total" . " FROM `##gedcom_chunk` WHERE gedcom_id = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchOneRow(); // Finished? @@ -84,7 +84,7 @@ class GedcomFileController extends AbstractBaseController " ORDER BY gedcom_chunk_id" . " LIMIT 1" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchOneRow(); // If we are loading the first (header) record, make sure the encoding is UTF-8. @@ -127,7 +127,7 @@ class GedcomFileController extends AbstractBaseController " SET chunk_data=CONVERT(CONVERT(chunk_data USING ascii) USING utf8)" . " WHERE gedcom_id = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); break; case 'IBMPC': // IBMPC, IBM WINDOWS and MS-DOS could be anything. Mostly it means CP850. @@ -141,7 +141,7 @@ class GedcomFileController extends AbstractBaseController " SET chunk_data=CONVERT(CONVERT(chunk_data USING cp850) USING utf8)" . " WHERE gedcom_id = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); break; case 'ANSI': // ANSI could be anything. Most applications seem to treat it as latin1. @@ -157,7 +157,7 @@ class GedcomFileController extends AbstractBaseController " SET chunk_data=CONVERT(CONVERT(chunk_data USING latin1) USING utf8)" . " WHERE gedcom_id= = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); break; case 'CP1250': @@ -171,7 +171,7 @@ class GedcomFileController extends AbstractBaseController " SET chunk_data=CONVERT(CONVERT(chunk_data USING latin2) USING utf8)" . " WHERE gedcom_id = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); break; case 'MACINTOSH': @@ -181,7 +181,7 @@ class GedcomFileController extends AbstractBaseController " SET chunk_data=CONVERT(CONVERT(chunk_data USING macroman) USING utf8)" . " WHERE gedcom_id = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); break; case 'UTF8': diff --git a/app/Http/Controllers/HomePageController.php b/app/Http/Controllers/HomePageController.php index 7654bd6cd4..5976d1ec46 100644 --- a/app/Http/Controllers/HomePageController.php +++ b/app/Http/Controllers/HomePageController.php @@ -203,7 +203,7 @@ class HomePageController extends AbstractBaseController */ public function treePage(Tree $tree): Response { - $tree_id = $tree->getTreeId(); + $tree_id = $tree->id(); $access_level = Auth::accessLevel($tree); $main_blocks = $this->getBlocksForTreePage($tree_id, $access_level, 'main'); $side_blocks = $this->getBlocksForTreePage($tree_id, $access_level, 'side'); @@ -237,7 +237,7 @@ class HomePageController extends AbstractBaseController "SELECT * FROM `##block` WHERE block_id = :block_id AND gedcom_id = :tree_id AND user_id IS NULL" )->execute([ 'block_id' => $block_id, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchOneRow(); $module = $this->getBlockModule($tree, $block_id); @@ -312,8 +312,8 @@ class HomePageController extends AbstractBaseController */ public function treePageEdit(Tree $tree): Response { - $main_blocks = $this->getBlocksForTreePage($tree->getTreeId(), Auth::accessLevel($tree), 'main'); - $side_blocks = $this->getBlocksForTreePage($tree->getTreeId(), Auth::accessLevel($tree), 'side'); + $main_blocks = $this->getBlocksForTreePage($tree->id(), Auth::accessLevel($tree), 'main'); + $side_blocks = $this->getBlocksForTreePage($tree->id(), Auth::accessLevel($tree), 'side'); $all_blocks = $this->getAvailableTreeBlocks(); $title = I18N::translate('Change the “Home page” blocks'); $url_cancel = route('tree-page', ['ged' => $tree->getName()]); @@ -350,7 +350,7 @@ class HomePageController extends AbstractBaseController $side_blocks = (array) $request->get('side'); } - $this->updateTreeBlocks($tree->getTreeId(), $main_blocks, $side_blocks); + $this->updateTreeBlocks($tree->id(), $main_blocks, $side_blocks); return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()])); } @@ -365,7 +365,7 @@ class HomePageController extends AbstractBaseController */ public function userPage(Tree $tree, User $user): Response { - $tree_id = $tree->getTreeId(); + $tree_id = $tree->id(); $user_id = $user->getUserId(); $access_level = Auth::accessLevel($tree, $user); $main_blocks = $this->getBlocksForUserPage($tree_id, $user_id, $access_level, 'main'); @@ -475,8 +475,8 @@ class HomePageController extends AbstractBaseController */ public function userPageEdit(Tree $tree, User $user): Response { - $main_blocks = $this->getBlocksForUserPage($tree->getTreeId(), $user->getUserId(), Auth::accessLevel($tree, $user), 'main'); - $side_blocks = $this->getBlocksForUserPage($tree->getTreeId(), $user->getUserId(), Auth::accessLevel($tree, $user), 'side'); + $main_blocks = $this->getBlocksForUserPage($tree->id(), $user->getUserId(), Auth::accessLevel($tree, $user), 'main'); + $side_blocks = $this->getBlocksForUserPage($tree->id(), $user->getUserId(), Auth::accessLevel($tree, $user), 'side'); $all_blocks = $this->getAvailableUserBlocks(); $title = I18N::translate('Change the “My page” blocks'); $url_cancel = route('user-page', ['ged' => $tree->getName()]); diff --git a/app/Http/Controllers/LifespansChartController.php b/app/Http/Controllers/LifespansChartController.php index 2f6bc4cf55..233938a621 100644 --- a/app/Http/Controllers/LifespansChartController.php +++ b/app/Http/Controllers/LifespansChartController.php @@ -280,7 +280,7 @@ class LifespansChartController extends AbstractChartController " AND d_julianday2 >= :min_jd" . " AND d_fact NOT IN ('BAPL', 'ENDL', 'SLGC', 'SLGS', '_TODO', 'CHAN')" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'max_jd' => $end->maximumJulianDay(), 'min_jd' => $start->minimumJulianDay(), ])->fetchOneColumn(); @@ -305,7 +305,7 @@ class LifespansChartController extends AbstractChartController " WHERE `f_file`=:tree_id" . " AND `pl_p_id`=:place_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'place_id' => $place->getPlaceId(), ])->fetchOneColumn(); } diff --git a/app/Http/Controllers/ListController.php b/app/Http/Controllers/ListController.php index 7e576a5136..62709fc233 100644 --- a/app/Http/Controllers/ListController.php +++ b/app/Http/Controllers/ListController.php @@ -491,7 +491,7 @@ class ListController extends AbstractBaseController " GROUP BY 1" . " ORDER BY 1" )->execute([ - $tree->getTreeId(), + $tree->id(), ])->fetchOneColumn(); // Ensure we have an empty (top level) folder. @@ -524,7 +524,7 @@ class ListController extends AbstractBaseController " JOIN `##media_file` USING (m_id, m_file)" . " WHERE m_file = ?"; $args = [ - $tree->getTreeId(), + $tree->id(), ]; // Only show external files when we are looking at the root folder @@ -592,7 +592,7 @@ class ListController extends AbstractBaseController $rows = Database::prepare( "SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'NOTE' AND o_file = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $list = []; @@ -617,7 +617,7 @@ class ListController extends AbstractBaseController $rows = Database::prepare( "SELECT o_id AS xref, o_gedcom AS gedcom FROM `##other` WHERE o_type = 'REPO' AND o_file = ?" )->execute([ - $tree->getTreeId(), + $tree->id(), ])->fetchAll(); $list = []; @@ -642,7 +642,7 @@ class ListController extends AbstractBaseController $rows = Database::prepare( "SELECT s_id AS xref, s_gedcom AS gedcom FROM `##sources` WHERE s_file = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $list = []; @@ -763,7 +763,7 @@ class ListController extends AbstractBaseController "SELECT COUNT(n_id)" . " FROM `##name` " . ($fams ? " JOIN `##link` ON (n_id=l_from AND n_file=l_file AND l_type='FAMS') " : "") . - " WHERE n_file=" . $tree->getTreeId() . + " WHERE n_file=" . $tree->id() . ($marnm ? "" : " AND n_type!='_MARNM'"); // Fetch all the letters in our alphabet, whether or not there @@ -788,7 +788,7 @@ class ListController extends AbstractBaseController ($marnm ? "" : " AND n_type != '_MARNM'"); $args = [ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]; foreach ($this->localization_service->alphabet() as $n => $letter) { @@ -810,7 +810,7 @@ class ListController extends AbstractBaseController ($marnm ? "" : " AND n_type != '_MARNM'"); $args = [ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]; $count_no_surname = (int) Database::prepare($sql)->execute($args)->fetchOne(); @@ -841,7 +841,7 @@ class ListController extends AbstractBaseController "SELECT COUNT(DISTINCT n_id)" . " FROM `##name`" . ($fams ? " JOIN `##link` ON (n_id=l_from AND n_file=l_file AND l_type='FAMS') " : "") . - " WHERE n_file=" . $tree->getTreeId() . " " . + " WHERE n_file=" . $tree->id() . " " . ($marnm ? "" : " AND n_type!='_MARNM'"); $args = []; @@ -883,7 +883,7 @@ class ListController extends AbstractBaseController ($marnm ? "" : " AND n_type != '_MARNM'"); $args = [ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]; if ($surn) { @@ -937,7 +937,7 @@ class ListController extends AbstractBaseController ($marnm ? "" : " AND n_type != '_MARNM'"); $args = [ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collate' => I18N::collation(), ]; @@ -994,7 +994,7 @@ class ListController extends AbstractBaseController ($marnm ? "" : "AND n_type != '_MARNM'"); $args = [ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]; if ($surn) { diff --git a/app/Http/Controllers/PendingChangesController.php b/app/Http/Controllers/PendingChangesController.php index 2b7985eea3..6b3a32ddfd 100644 --- a/app/Http/Controllers/PendingChangesController.php +++ b/app/Http/Controllers/PendingChangesController.php @@ -59,7 +59,7 @@ class PendingChangesController extends AbstractBaseController " WHERE c.status = 'pending' AND gedcom_id = :tree_id" . " ORDER BY change_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($changes as $change) { @@ -110,7 +110,7 @@ class PendingChangesController extends AbstractBaseController " AND change_id <= :change_id" . " ORDER BY change_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'xref' => $xref, 'change_id' => $change_id, ])->fetchAll(); @@ -183,7 +183,7 @@ class PendingChangesController extends AbstractBaseController Database::prepare( "UPDATE `##change` SET status = 'rejected' WHERE status = 'pending' AND gedcom_id = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); return new RedirectResponse(route('show-pending', [ @@ -215,7 +215,7 @@ class PendingChangesController extends AbstractBaseController " AND xref = :xref" . " AND change_id >= :change_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'xref' => $xref, 'change_id' => $change_id, ]); @@ -310,11 +310,11 @@ class PendingChangesController extends AbstractBaseController $title = I18N::translate('Pending changes'); // If the current tree has changes, activate that tab. Otherwise activate the first tab. - if (empty($changes[$tree->getTreeId()])) { + if (empty($changes[$tree->id()])) { reset($changes); $active_tree_id = key($changes); } else { - $active_tree_id = $tree->getTreeId(); + $active_tree_id = $tree->id(); } return $this->viewResponse('pending-changes-page', [ diff --git a/app/Http/Controllers/PlaceHierarchyController.php b/app/Http/Controllers/PlaceHierarchyController.php index b20d4c0567..7c8b4c8fcc 100644 --- a/app/Http/Controllers/PlaceHierarchyController.php +++ b/app/Http/Controllers/PlaceHierarchyController.php @@ -171,7 +171,7 @@ class PlaceHierarchyController extends AbstractBaseController "SELECT DISTINCT pl_gid FROM `##placelinks` WHERE pl_p_id=:id AND pl_file=:gedcom" )->execute([ 'id' => $place->getPlaceId(), - 'gedcom' => $tree->getTreeId(), + 'gedcom' => $tree->id(), ])->fetchOneColumn(); foreach ($xrefs as $xref) { diff --git a/app/Http/Controllers/RelationshipsChartController.php b/app/Http/Controllers/RelationshipsChartController.php index 59db665d5a..c42bf6129f 100644 --- a/app/Http/Controllers/RelationshipsChartController.php +++ b/app/Http/Controllers/RelationshipsChartController.php @@ -231,13 +231,13 @@ class RelationshipsChartController extends AbstractChartController $rows = Database::prepare( "SELECT l_from, l_to FROM `##link` WHERE l_file = :tree_id AND l_type IN ('FAMS', 'FAMC')" )->execute([ - 'tree_id' => $individual1->getTree()->getTreeId(), + 'tree_id' => $individual1->getTree()->id(), ])->fetchAll(); // Optionally restrict the graph to the ancestors of the individuals. if ($ancestor) { - $ancestors = $this->allAncestors($individual1->getXref(), $individual2->getXref(), $individual1->getTree()->getTreeId()); - $exclude = $this->excludeFamilies($individual1->getXref(), $individual2->getXref(), $individual1->getTree()->getTreeId()); + $ancestors = $this->allAncestors($individual1->getXref(), $individual2->getXref(), $individual1->getTree()->id()); + $exclude = $this->excludeFamilies($individual1->getXref(), $individual2->getXref(), $individual1->getTree()->id()); } else { $ancestors = []; $exclude = []; diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index dfca93658c..3c04e71407 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -649,7 +649,7 @@ class SearchController extends AbstractBaseController foreach ($search_trees as $n => $tree) { $sql .= $n ? ', ' : ''; $sql .= ':tree_id_' . $n; - $args['tree_id_' . $n] = $tree->getTreeId(); + $args['tree_id_' . $n] = $tree->id(); } $sql .= ")"; @@ -709,7 +709,7 @@ class SearchController extends AbstractBaseController foreach ($search_trees as $n => $tree) { $sql .= $n ? ", " : ""; $sql .= ":tree_id_" . $n; - $args['tree_id_' . $n] = $tree->getTreeId(); + $args['tree_id_' . $n] = $tree->id(); } $sql .= ")"; @@ -758,7 +758,7 @@ class SearchController extends AbstractBaseController foreach ($search_trees as $n => $tree) { $sql .= $n ? ", " : ""; $sql .= ":tree_id_" . $n; - $args['tree_id_' . $n] = $tree->getTreeId(); + $args['tree_id_' . $n] = $tree->id(); } $sql .= ")"; @@ -897,7 +897,7 @@ class SearchController extends AbstractBaseController // Add the where clause $sql .= " WHERE ind.i_file=?"; - $bind[] = $tree->getTreeId(); + $bind[] = $tree->id(); foreach ($fields as $field_name => $field_value) { $parts = preg_split('/:/', $field_name . '::::'); @@ -1222,7 +1222,7 @@ class SearchController extends AbstractBaseController foreach ($search_trees as $n => $tree) { $sql .= $n ? ", " : ""; $sql .= ":tree_id_" . $n; - $args['tree_id_' . $n] = $tree->getTreeId(); + $args['tree_id_' . $n] = $tree->id(); } $sql .= ")"; @@ -1319,7 +1319,7 @@ class SearchController extends AbstractBaseController foreach ($search_trees as $n => $tree) { $sql .= $n ? ", " : ""; $sql .= ":tree_id_" . $n; - $args['tree_id_' . $n] = $tree->getTreeId(); + $args['tree_id_' . $n] = $tree->id(); } $sql .= ")"; @@ -1375,7 +1375,7 @@ class SearchController extends AbstractBaseController foreach ($search_trees as $n => $tree) { $sql .= $n ? ", " : ""; $sql .= ":tree_id_" . $n; - $args['tree_id_' . $n] = $tree->getTreeId(); + $args['tree_id_' . $n] = $tree->id(); } $sql .= ")"; @@ -1431,7 +1431,7 @@ class SearchController extends AbstractBaseController foreach ($search_trees as $n => $tree) { $sql .= $n ? ", " : ""; $sql .= ":tree_id_" . $n; - $args['tree_id_' . $n] = $tree->getTreeId(); + $args['tree_id_' . $n] = $tree->id(); } $sql .= ")"; diff --git a/app/Http/Middleware/PageHitCounter.php b/app/Http/Middleware/PageHitCounter.php index 62b4b8041b..bc5ac6b518 100644 --- a/app/Http/Middleware/PageHitCounter.php +++ b/app/Http/Middleware/PageHitCounter.php @@ -91,7 +91,7 @@ class PageHitCounter implements MiddlewareInterface break; case 'tree-page': - $page_hits = $this->countHit($this->tree, $page_name, 'gedcom:' . $this->tree->getTreeId()); + $page_hits = $this->countHit($this->tree, $page_name, 'gedcom:' . $this->tree->id()); break; case 'user-page': @@ -117,7 +117,7 @@ class PageHitCounter implements MiddlewareInterface */ private function countHit(Tree $tree, $page, $parameter): int { - $gedcom_id = $tree->getTreeId(); + $gedcom_id = $tree->id(); // Don't increment the counter while we stay on the same page. if ( @@ -172,7 +172,7 @@ class PageHitCounter implements MiddlewareInterface return (int) Database::prepare( "SELECT page_count FROM `##hit_counter` WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'page' => $page, 'parameter' => $parameter, ])->fetchOne(); diff --git a/app/Individual.php b/app/Individual.php index c9f9ea3fe6..f476fde081 100644 --- a/app/Individual.php +++ b/app/Individual.php @@ -73,12 +73,12 @@ class Individual extends GedcomRecord public static function load(Tree $tree, array $xrefs) { $args = [ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]; $placeholders = []; foreach (array_unique($xrefs) as $n => $xref) { - if (!isset(self::$gedcom_record_cache[$tree->getTreeId()][$xref])) { + if (!isset(self::$gedcom_record_cache[$tree->id()][$xref])) { $placeholders[] = ':x' . $n; $args['x' . $n] = $xref; } diff --git a/app/Log.php b/app/Log.php index eb5bd91a18..4a8a93047e 100644 --- a/app/Log.php +++ b/app/Log.php @@ -52,7 +52,7 @@ class Log $message, $request->getClientIp(), Auth::id(), - $tree ? $tree->getTreeId() : null, + $tree ? $tree->id() : null, ]); } diff --git a/app/Media.php b/app/Media.php index 3321eccc2f..70e587726c 100644 --- a/app/Media.php +++ b/app/Media.php @@ -65,7 +65,7 @@ class Media extends GedcomRecord "SELECT l_from FROM `##link` WHERE l_to = ? AND l_file = ?" )->execute([ $this->xref, - $this->tree->getTreeId(), + $this->tree->id(), ])->fetchOneColumn(); foreach ($linked_ids as $linked_id) { $linked_record = GedcomRecord::getInstance($linked_id, $this->tree); diff --git a/app/Module.php b/app/Module.php index c679dbd688..c9198ae246 100644 --- a/app/Module.php +++ b/app/Module.php @@ -280,7 +280,7 @@ class Module " WHERE gedcom_id = :tree_id AND component = :component AND status = 'enabled' AND access_level >= :access_level" . " ORDER BY CASE component WHEN 'menu' THEN menu_order WHEN 'sidebar' THEN sidebar_order WHEN 'tab' THEN tab_order ELSE 0 END, module_name" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'component' => $component, 'access_level' => Auth::accessLevel($tree), ])->fetchOneColumn(); diff --git a/app/Module/AbstractModule.php b/app/Module/AbstractModule.php index e39f1b8369..311f80dbbb 100644 --- a/app/Module/AbstractModule.php +++ b/app/Module/AbstractModule.php @@ -206,7 +206,7 @@ abstract class AbstractModule $access_level = Database::prepare( "SELECT access_level FROM `##module_privacy` WHERE gedcom_id = :gedcom_id AND module_name = :module_name AND component = :component" )->execute([ - 'gedcom_id' => $tree->getTreeId(), + 'gedcom_id' => $tree->id(), 'module_name' => $this->getName(), 'component' => $component, ])->fetchOne(); diff --git a/app/Module/BatchUpdateModule.php b/app/Module/BatchUpdateModule.php index 1aec119522..27de6ab069 100644 --- a/app/Module/BatchUpdateModule.php +++ b/app/Module/BatchUpdateModule.php @@ -273,7 +273,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface $tmp += Database::prepare( "SELECT i_id AS xref, 'INDI' AS type, i_gedcom AS gedcom FROM `##individuals` WHERE i_file = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); break; @@ -281,7 +281,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface $tmp += Database::prepare( "SELECT f_id AS xref, 'FAM' AS type, f_gedcom AS gedcom FROM `##families` WHERE f_file = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); break; @@ -289,7 +289,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface $tmp += Database::prepare( "SELECT s_id AS xref, 'SOUR' AS type, s_gedcom AS gedcom FROM `##sources` WHERE s_file = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); break; @@ -297,7 +297,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface $tmp += Database::prepare( "SELECT m_id AS xref, 'OBJE' AS type, m_gedcom AS gedcom FROM `##media` WHERE m_file = :tree_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); break; @@ -305,7 +305,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface $tmp += Database::prepare( "SELECT o_id AS xref, 'OBJE' AS type, o_gedcom AS gedcom FROM `##other` WHERE o_file = :tree_id AND o_type = :type" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'type' => $type, ])->fetchAll(); break; diff --git a/app/Module/DescendancyModule.php b/app/Module/DescendancyModule.php index 4cc5930863..32f6e72f36 100644 --- a/app/Module/DescendancyModule.php +++ b/app/Module/DescendancyModule.php @@ -66,7 +66,7 @@ class DescendancyModule extends AbstractModule implements ModuleSidebarInterface " ORDER BY n_sort" )->execute([ 'query' => $search, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($rows as $row) { diff --git a/app/Module/FamilyTreeFavoritesModule.php b/app/Module/FamilyTreeFavoritesModule.php index 1d47ff7ab8..5f540ed4fe 100644 --- a/app/Module/FamilyTreeFavoritesModule.php +++ b/app/Module/FamilyTreeFavoritesModule.php @@ -156,7 +156,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt "SELECT favorite_id, user_id, gedcom_id, xref, favorite_type, title, note, url" . " FROM `##favorite` WHERE gedcom_id = :tree_id AND user_id IS NULL" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($favorites as $favorite) { @@ -209,7 +209,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt "DELETE FROM `##favorite` WHERE favorite_id = :favorite_id AND gedcom_id = :tree_id" )->execute([ 'favorite_id' => $favorite_id, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); } @@ -231,7 +231,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt $favorite = Database::prepare( "SELECT * FROM `##favorite` WHERE gedcom_id = :gedcom_id AND user_id IS NULL AND url = :url" )->execute([ - 'gedcom_id' => $tree->getTreeId(), + 'gedcom_id' => $tree->id(), 'url' => $url, ])->fetchOneRow(); @@ -239,7 +239,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt Database::prepare( "INSERT INTO `##favorite` (gedcom_id, url, note, title) VALUES (:gedcom_id, :user_id, :url, :note, :title)" )->execute([ - 'gedcom_id' => $tree->getTreeId(), + 'gedcom_id' => $tree->id(), 'url' => $url, 'note' => $note, 'title' => $title, @@ -267,7 +267,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt $favorite = Database::prepare( "SELECT * FROM `##favorite` WHERE gedcom_id = :gedcom_id AND user_id IS NULL AND xref = :xref" )->execute([ - 'gedcom_id' => $tree->getTreeId(), + 'gedcom_id' => $tree->id(), 'xref' => $xref, ])->fetchOneRow(); @@ -275,7 +275,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt Database::prepare( "INSERT INTO `##favorite` (gedcom_id, xref, note) VALUES (:gedcom_id, :xref, :note)" )->execute([ - 'gedcom_id' => $tree->getTreeId(), + 'gedcom_id' => $tree->id(), 'xref' => $xref, 'note' => $note, ]); diff --git a/app/Module/FamilyTreeNewsModule.php b/app/Module/FamilyTreeNewsModule.php index e52d131fdd..5a39e9fc5a 100644 --- a/app/Module/FamilyTreeNewsModule.php +++ b/app/Module/FamilyTreeNewsModule.php @@ -87,7 +87,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac "SELECT news_id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) + :offset AS updated, subject, body FROM `##news` WHERE gedcom_id = :tree_id ORDER BY updated DESC" )->execute([ 'offset' => WT_TIMESTAMP_OFFSET, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); $content = view('modules/gedcom_news/list', [ @@ -170,7 +170,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac "SELECT subject, body FROM `##news` WHERE news_id = :news_id AND gedcom_id = :tree_id" )->execute([ 'news_id' => $news_id, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchOneRow(); } else { $row = (object) [ @@ -213,7 +213,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac 'subject' => $subject, 'body' => $body, 'news_id' => $news_id, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); } else { Database::prepare( @@ -221,7 +221,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac )->execute([ 'body' => $body, 'subject' => $subject, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); } @@ -250,7 +250,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac "DELETE FROM `##news` WHERE news_id = :news_id AND gedcom_id = :tree_id" )->execute([ 'news_id' => $news_id, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]); $url = route('tree-page', [ diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php index 4d70dc07a2..8f07105484 100644 --- a/app/Module/FamilyTreeStatisticsModule.php +++ b/app/Module/FamilyTreeStatisticsModule.php @@ -92,7 +92,7 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn " ORDER BY COUNT(n_surn) DESC" . " LIMIT :limit" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'limit' => $number_of_surnames, ])->fetchOneColumn(); @@ -103,7 +103,7 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn )->execute([ 'collate' => I18N::collation(), 'surname' => $top_surname, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAssoc(); $all_surnames[$top_surname] = $variants; diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php index 21aac5fe72..8a9f64aaf6 100644 --- a/app/Module/FrequentlyAskedQuestionsModule.php +++ b/app/Module/FrequentlyAskedQuestionsModule.php @@ -84,8 +84,8 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen " AND setting_name='languages' AND (setting_value LIKE CONCAT('%', :locale, '%') OR setting_value='')" )->execute([ 'module_name' => $this->getName(), - 'tree_id_1' => $tree->getTreeId(), - 'tree_id_2' => $tree->getTreeId(), + 'tree_id_1' => $tree->id(), + 'tree_id_2' => $tree->id(), 'locale' => WT_LOCALE, ])->fetchAll(); @@ -121,20 +121,20 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen " ORDER BY block_order" )->execute([ 'module_name' => $this->getName(), - 'tree_id_1' => $tree->getTreeId(), - 'tree_id_2' => $tree->getTreeId(), + 'tree_id_1' => $tree->id(), + 'tree_id_2' => $tree->id(), ])->fetchAll(); $min_block_order = Database::prepare( "SELECT MIN(block_order) FROM `##block` WHERE module_name = 'faq' AND (gedcom_id = :tree_id OR gedcom_id IS NULL)" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchOne(); $max_block_order = Database::prepare( "SELECT MAX(block_order) FROM `##block` WHERE module_name = 'faq' AND (gedcom_id = :tree_id OR gedcom_id IS NULL)" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchOne(); $title = I18N::translate('Frequently asked questions') . ' — ' . $tree->getTitle(); @@ -400,8 +400,8 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen " ORDER BY block_order" )->execute([ 'module_name' => $this->getName(), - 'tree_id_1' => $tree->getTreeId(), - 'tree_id_2' => $tree->getTreeId(), + 'tree_id_1' => $tree->id(), + 'tree_id_2' => $tree->id(), ])->fetchAll(); // Filter foreign languages. diff --git a/app/Module/RecentChangesModule.php b/app/Module/RecentChangesModule.php index ada94a27c3..58d306c62c 100644 --- a/app/Module/RecentChangesModule.php +++ b/app/Module/RecentChangesModule.php @@ -225,7 +225,7 @@ class RecentChangesModule extends AbstractModule implements ModuleBlockInterface $vars = [ 'days' => $days, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]; $xrefs = Database::prepare($sql)->execute($vars)->fetchOneColumn(); diff --git a/app/Module/RelationshipsChartModule.php b/app/Module/RelationshipsChartModule.php index 2a0bcf366a..2eb5e63adf 100644 --- a/app/Module/RelationshipsChartModule.php +++ b/app/Module/RelationshipsChartModule.php @@ -164,8 +164,8 @@ class RelationshipsChartModule extends AbstractModule implements ModuleConfigInt public function postAdminAction(Request $request): RedirectResponse { foreach (Tree::getAll() as $tree) { - $recursion = $request->get('relationship-recursion-' . $tree->getTreeId(), ''); - $ancestors = $request->get('relationship-ancestors-' . $tree->getTreeId(), ''); + $recursion = $request->get('relationship-recursion-' . $tree->id(), ''); + $ancestors = $request->get('relationship-ancestors-' . $tree->id(), ''); $tree->setPreference('RELATIONSHIP_RECURSION', $recursion); $tree->setPreference('RELATIONSHIP_ANCESTORS', $ancestors); diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php index b56c6d39e7..753e890286 100644 --- a/app/Module/ResearchTaskModule.php +++ b/app/Module/ResearchTaskModule.php @@ -74,7 +74,7 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface "SELECT DISTINCT d_gid FROM `##dates`" . " WHERE d_file = :tree_id AND d_fact = '_TODO' AND d_julianday1 < :jd" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'jd' => $end_jd, ])->fetchOneColumn(); diff --git a/app/Module/ReviewChangesModule.php b/app/Module/ReviewChangesModule.php index e78abbadc4..cb326da96a 100644 --- a/app/Module/ReviewChangesModule.php +++ b/app/Module/ReviewChangesModule.php @@ -131,7 +131,7 @@ class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface " WHERE status='pending'" . " AND gedcom_id=?" . " GROUP BY xref" - )->execute([$tree->getTreeId()])->fetchAll(); + )->execute([$tree->id()])->fetchAll(); foreach ($changes as $change) { $record = GedcomRecord::getInstance($change->xref, $tree); if ($record->canShow()) { diff --git a/app/Module/SiteMapModule.php b/app/Module/SiteMapModule.php index eb34535cde..08928396ad 100644 --- a/app/Module/SiteMapModule.php +++ b/app/Module/SiteMapModule.php @@ -110,7 +110,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface public function postAdminAction(Request $request): RedirectResponse { foreach (Tree::getAll() as $tree) { - $include_in_sitemap = (bool) $request->get('sitemap' . $tree->getTreeId()); + $include_in_sitemap = (bool) $request->get('sitemap' . $tree->id()); $tree->setPreference('include_in_sitemap', (string) $include_in_sitemap); } @@ -266,7 +266,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface " ORDER BY i_id" . " LIMIT :limit OFFSET :offset" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'limit' => $limit, 'offset' => $offset, ])->fetchAll(); @@ -296,7 +296,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface " ORDER BY m_id" . " LIMIT :limit OFFSET :offset" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'limit' => $limit, 'offset' => $offset, ])->fetchAll(); @@ -326,7 +326,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface " ORDER BY o_id" . " LIMIT :limit OFFSET :offset" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'limit' => $limit, 'offset' => $offset, ])->fetchAll(); @@ -356,7 +356,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface " ORDER BY o_id" . " LIMIT :limit OFFSET :offset" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'limit' => $limit, 'offset' => $offset, ])->fetchAll(); @@ -386,7 +386,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface " ORDER BY s_id" . " LIMIT :limit OFFSET :offset" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'limit' => $limit, 'offset' => $offset, ])->fetchAll(); diff --git a/app/Module/SlideShowModule.php b/app/Module/SlideShowModule.php index 80ec41fe7f..684285b312 100644 --- a/app/Module/SlideShowModule.php +++ b/app/Module/SlideShowModule.php @@ -72,7 +72,7 @@ class SlideShowModule extends AbstractModule implements ModuleBlockInterface " AND multimedia_format IN ('jpg', 'jpeg', 'png', 'gif', 'tiff', 'bmp')" . " AND source_media_type IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '')" )->execute([ - $tree->getTreeId(), + $tree->id(), $this->getBlockSetting($block_id, 'filter_audio', '0') ? 'audio' : null, $this->getBlockSetting($block_id, 'filter_book', '1') ? 'book' : null, $this->getBlockSetting($block_id, 'filter_card', '1') ? 'card' : null, diff --git a/app/Module/StoriesModule.php b/app/Module/StoriesModule.php index b4c366f951..edf1897bba 100644 --- a/app/Module/StoriesModule.php +++ b/app/Module/StoriesModule.php @@ -111,7 +111,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module )->execute([ 'module_name' => $this->getName(), 'xref' => $individual->getXref(), - 'tree_id' => $individual->getTree()->getTreeId(), + 'tree_id' => $individual->getTree()->id(), ])->fetchOneColumn(); $stories = []; @@ -188,7 +188,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module " AND gedcom_id = :tree_id" . " ORDER BY gedcom_id, xref" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'module_name' => $this->getName(), ])->fetchAll(); @@ -273,7 +273,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module Database::prepare( "UPDATE `##block` SET gedcom_id = :tree_id, xref = :xref WHERE block_id = :block_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'xref' => $xref, 'block_id' => $block_id, ]); @@ -281,7 +281,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module Database::prepare( "INSERT INTO `##block` (gedcom_id, xref, module_name, block_order) VALUES (:tree_id, :xref, 'stories', 0)" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'xref' => $xref, ]); @@ -347,7 +347,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module " ORDER BY xref" )->execute([ 'module_name' => $this->getName(), - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAll(); foreach ($stories as $story) { diff --git a/app/Module/TopPageViewsModule.php b/app/Module/TopPageViewsModule.php index d94126febf..ffeba18880 100644 --- a/app/Module/TopPageViewsModule.php +++ b/app/Module/TopPageViewsModule.php @@ -77,7 +77,7 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface " WHERE gedcom_id = :tree_id AND page_name IN ('individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php')" . " ORDER BY page_count DESC LIMIT :limit" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'limit' => (int) $num, ])->fetchAssoc(); diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php index e52af42e21..01cd62b4c5 100644 --- a/app/Module/TopSurnamesModule.php +++ b/app/Module/TopSurnamesModule.php @@ -82,7 +82,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface " ORDER BY COUNT(n_surn) DESC" . " LIMIT :limit" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'limit' => $num, ])->fetchOneColumn(); @@ -93,7 +93,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface )->execute([ 'collate' => I18N::collation(), 'surname' => $top_surname, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ])->fetchAssoc(); $variants = array_map(function (string $count): int { diff --git a/app/Module/UserFavoritesModule.php b/app/Module/UserFavoritesModule.php index 331974a354..8b0046f821 100644 --- a/app/Module/UserFavoritesModule.php +++ b/app/Module/UserFavoritesModule.php @@ -156,7 +156,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface "SELECT favorite_id, user_id, gedcom_id, xref, favorite_type, title, note, url" . " FROM `##favorite` WHERE gedcom_id = :tree_id AND user_id = :user_id" )->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'user_id' => $user->getUserId(), ])->fetchAll(); @@ -233,7 +233,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface $favorite = Database::prepare( "SELECT * FROM `##favorite` WHERE gedcom_id = :gedcom_id AND user_id = :user_id AND url = :url" )->execute([ - 'gedcom_id' => $tree->getTreeId(), + 'gedcom_id' => $tree->id(), 'user_id' => $user->getUserId(), 'url' => $url, ])->fetchOneRow(); @@ -242,7 +242,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface Database::prepare( "INSERT INTO `##favorite` (gedcom_id, user_id, url, note, title) VALUES (:gedcom_id, :user_id, :url, :note, :title)" )->execute([ - 'gedcom_id' => $tree->getTreeId(), + 'gedcom_id' => $tree->id(), 'user_id' => $user->getUserId(), 'url' => $url, 'note' => $note, @@ -272,7 +272,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface $favorite = Database::prepare( "SELECT * FROM `##favorite` WHERE gedcom_id = :gedcom_id AND user_id = :user_id AND xref = :xref" )->execute([ - 'gedcom_id' => $tree->getTreeId(), + 'gedcom_id' => $tree->id(), 'user_id' => $user->getUserId(), 'xref' => $xref, ])->fetchOneRow(); @@ -281,7 +281,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface Database::prepare( "INSERT INTO `##favorite` (gedcom_id, user_id, xref, note) VALUES (:gedcom_id, :user_id, :xref, :note)" )->execute([ - 'gedcom_id' => $tree->getTreeId(), + 'gedcom_id' => $tree->id(), 'user_id' => $user->getUserId(), 'xref' => $xref, 'note' => $note, diff --git a/app/Note.php b/app/Note.php index 033707aa2a..31574c7d77 100644 --- a/app/Note.php +++ b/app/Note.php @@ -77,7 +77,7 @@ class Note extends GedcomRecord "SELECT l_from FROM `##link` WHERE l_to=? AND l_file=?" )->execute([ $this->xref, - $this->tree->getTreeId(), + $this->tree->id(), ])->fetchOneColumn(); foreach ($linked_ids as $linked_id) { $linked_record = GedcomRecord::getInstance($linked_id, $this->tree); diff --git a/app/Place.php b/app/Place.php index 04a770b85d..8fd6489be2 100644 --- a/app/Place.php +++ b/app/Place.php @@ -71,7 +71,7 @@ class Place )->execute([ 'parent_id' => $place_id, 'place' => $place, - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -108,7 +108,7 @@ class Place " ORDER BY p_place COLLATE :collation" )->execute([ 'parent_id' => $this->getPlaceId(), - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'collation' => I18N::collation(), ])->fetchOneColumn(); foreach ($rows as $row) { @@ -252,7 +252,7 @@ class Place " ORDER BY CONCAT_WS(', ', p9.p_place, p8.p_place, p7.p_place, p6.p_place, p5.p_place, p4.p_place, p3.p_place, p2.p_place, p1.p_place) COLLATE :collate" ) ->execute([ - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collate' => I18N::collation(), ])->fetchOneColumn(); foreach ($rows as $row) { @@ -290,7 +290,7 @@ class Place )->execute([ 'filter_1' => preg_quote($filter), 'filter_2' => preg_quote($filter), - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collation' => I18N::collation(), ])->fetchOneColumn(); foreach ($rows as $row) { diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php index 3fac9d29db..6d38673e03 100644 --- a/app/Report/ReportParserGenerate.php +++ b/app/Report/ReportParserGenerate.php @@ -1871,7 +1871,7 @@ class ReportParserGenerate extends ReportParserBase " GROUP BY xref" . " )" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchAll(); $this->list = []; foreach ($rows as $row) { @@ -1883,7 +1883,7 @@ class ReportParserGenerate extends ReportParserBase $sql_join = ""; $sql_where = " WHERE i_file = :tree_id"; $sql_order_by = ""; - $sql_params = ['tree_id' => $this->tree->getTreeId()]; + $sql_params = ['tree_id' => $this->tree->id()]; foreach ($attrs as $attr => $value) { if (strpos($attr, 'filter') === 0 && $value) { $value = $this->substituteVars($value, false); @@ -1960,7 +1960,7 @@ class ReportParserGenerate extends ReportParserBase $sql_join = ""; $sql_where = " WHERE f_file = :tree_id"; $sql_order_by = ""; - $sql_params = ['tree_id' => $this->tree->getTreeId()]; + $sql_params = ['tree_id' => $this->tree->id()]; foreach ($attrs as $attr => $value) { if (strpos($attr, 'filter') === 0 && $value) { $value = $this->substituteVars($value, false); diff --git a/app/Select2.php b/app/Select2.php index 07aabee932..4d2e953c51 100644 --- a/app/Select2.php +++ b/app/Select2.php @@ -110,7 +110,7 @@ class Select2 extends Html )->execute([ 'query' => $query, 'xref' => $query, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collation' => I18N::collation(), ]); @@ -247,7 +247,7 @@ class Select2 extends Html $cursor = Database::prepare("SELECT i_id AS xref, i_gedcom AS gedcom, n_num" . " FROM `##individuals`" . " JOIN `##name` ON i_id = n_id AND i_file = n_file" . " WHERE (n_full LIKE CONCAT('%', REPLACE(:query, ' ', '%'), '%') OR i_id = :xref) AND i_file = :tree_id" . " ORDER BY n_full COLLATE :collation")->execute([ 'query' => $query, 'xref' => $query, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collation' => I18N::collation(), ]); @@ -314,7 +314,7 @@ class Select2 extends Html $cursor = Database::prepare("SELECT m_id AS xref, m_gedcom AS gedcom, n_full" . " FROM `##media`" . " JOIN `##name` ON m_id = n_id AND m_file = n_file" . " WHERE (n_full LIKE CONCAT('%', REPLACE(:query, ' ', '%'), '%') OR m_id = :xref) AND m_file = :tree_id" . " ORDER BY n_full COLLATE :collation")->execute([ 'query' => $query, 'xref' => $query, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collation' => I18N::collation(), ]); @@ -380,7 +380,7 @@ class Select2 extends Html $cursor = Database::prepare("SELECT o_id AS xref, o_gedcom AS gedcom, n_full" . " FROM `##other`" . " JOIN `##name` ON o_id = n_id AND o_file = n_file" . " WHERE (n_full LIKE CONCAT('%', REPLACE(:query, ' ', '%'), '%') OR o_id = :xref) AND o_file = :tree_id AND o_type='NOTE'" . " ORDER BY n_full COLLATE :collation")->execute([ 'query' => $query, 'xref' => $query, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collation' => I18N::collation(), ]); @@ -547,7 +547,7 @@ class Select2 extends Html $cursor = Database::prepare("SELECT o_id AS xref, o_gedcom AS gedcom, n_full" . " FROM `##other`" . " JOIN `##name` ON o_id = n_id AND o_file = n_file" . " WHERE (n_full LIKE CONCAT('%', REPLACE(:query, ' ', '%'), '%') OR o_id = :xref) AND o_file = :tree_id AND o_type = 'REPO'" . " ORDER BY n_full COLLATE :collation")->execute([ 'query' => $query, 'xref' => $query, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collation' => I18N::collation(), ]); @@ -613,7 +613,7 @@ class Select2 extends Html $cursor = Database::prepare("SELECT s_id AS xref, s_gedcom AS gedcom, n_full" . " FROM `##sources`" . " JOIN `##name` ON s_id = n_id AND s_file = n_file" . " WHERE (n_full LIKE CONCAT('%', REPLACE(:query, ' ', '%'), '%') OR s_id = :xref) AND s_file = :tree_id" . " ORDER BY n_full COLLATE :collation")->execute([ 'query' => $query, 'xref' => $query, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collation' => I18N::collation(), ]); @@ -684,7 +684,7 @@ class Select2 extends Html )->execute([ 'query' => $query, 'xref' => $query, - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), 'collation' => I18N::collation(), ]); diff --git a/app/Services/CalendarService.php b/app/Services/CalendarService.php index 4afd1c4993..a854b48165 100644 --- a/app/Services/CalendarService.php +++ b/app/Services/CalendarService.php @@ -104,7 +104,7 @@ class CalendarService $where .= " AND d_fact IN ({$incl_facts})"; } // Only get events from the current gedcom - $where .= " AND d_file=" . $tree->getTreeId(); + $where .= " AND d_file=" . $tree->id(); // Now fetch these events $ind_sql = "SELECT d_gid AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##individuals` {$where} AND d_gid=i_id AND d_file=i_file ORDER BY d_julianday1"; @@ -226,7 +226,7 @@ class CalendarService " WHERE d_type = :type AND d_file = :tree_id"; $args = [ 'type' => $anniv->format('%@'), - 'tree_id' => $tree->getTreeId(), + 'tree_id' => $tree->id(), ]; $where = ""; diff --git a/app/Stats.php b/app/Stats.php index 26634fb2c0..42c3232660 100644 --- a/app/Stats.php +++ b/app/Stats.php @@ -193,7 +193,7 @@ class Stats */ public function gedcomId(): int { - return $this->tree->getTreeId(); + return $this->tree->id(); } /** @@ -293,7 +293,7 @@ class Stats { $row = Database::prepare( "SELECT d_year, d_month, d_day FROM `##dates` WHERE d_julianday1 = (SELECT MAX(d_julianday1) FROM `##dates` WHERE d_file =? AND d_fact='CHAN') LIMIT 1" - )->execute([$this->tree->getTreeId()])->fetchOneRow(); + )->execute([$this->tree->id()])->fetchOneRow(); if ($row) { $date = new Date("{$row->d_day} {$row->d_month} {$row->d_year}"); @@ -365,7 +365,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -391,7 +391,7 @@ class Stats " FROM `##individuals` JOIN `##link` ON i_id = l_from AND i_file = l_file" . " WHERE l_file = :tree_id AND l_type = 'SOUR'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -460,7 +460,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##families` WHERE f_file = :tree_id" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -486,7 +486,7 @@ class Stats " FROM `##families` JOIN `##link` ON f_id = l_from AND f_file = l_file" . " WHERE l_file = :tree_id AND l_type = 'SOUR'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -555,7 +555,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##sources` WHERE s_file = :tree_id" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -589,7 +589,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##other` WHERE o_type='NOTE' AND o_file = :tree_id" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -623,7 +623,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##other` WHERE o_type='REPO' AND o_file = :tree_id" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -663,7 +663,7 @@ class Stats $opt = "IS NOT NULL"; $distinct = 'DISTINCT'; } - $params[] = $this->tree->getTreeId(); + $params[] = $this->tree->id(); $total = (int) Database::prepare( "SELECT COUNT({$distinct} n_surn COLLATE '" . I18N::collation() . "')" . @@ -688,7 +688,7 @@ class Stats { if ($params) { $qs = implode(',', array_fill(0, count($params), '?')); - $params[] = $this->tree->getTreeId(); + $params[] = $this->tree->id(); $total = (int) Database::prepare( "SELECT COUNT( n_givn) FROM `##name` WHERE n_givn IN ({$qs}) AND n_file=?" )->execute( @@ -698,7 +698,7 @@ class Stats $total = (int) Database::prepare( "SELECT COUNT(DISTINCT n_givn) FROM `##name` WHERE n_givn IS NOT NULL AND n_file=?" )->execute([ - $this->tree->getTreeId(), + $this->tree->id(), ])->fetchOne(); } @@ -715,7 +715,7 @@ class Stats public function totalEvents(array $events = []): string { $sql = "SELECT COUNT(*) AS tot FROM `##dates` WHERE d_file=?"; - $vars = [$this->tree->getTreeId()]; + $vars = [$this->tree->id()]; $no_types = [ 'HEAD', @@ -850,7 +850,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_sex = 'M'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -884,7 +884,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_sex = 'F'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -918,7 +918,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_sex = 'U'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -1022,7 +1022,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_gedcom NOT REGEXP '\\n1 (" . WT_EVENTS_DEAT . ")'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -1056,7 +1056,7 @@ class Stats return (int) Database::prepare( "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_gedcom REGEXP '\\n1 (" . WT_EVENTS_DEAT . ")'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); } @@ -1168,7 +1168,7 @@ class Stats return 0; } $sql = "SELECT COUNT(*) AS tot FROM `##media` WHERE m_file=?"; - $vars = [$this->tree->getTreeId()]; + $vars = [$this->tree->id()]; if ($type != 'all') { if ($type == 'unknown') { @@ -1492,10 +1492,10 @@ class Stats $rows = $this->runSql( "SELECT d_year, d_type, d_fact, d_gid" . " FROM `##dates`" . - " WHERE d_file={$this->tree->getTreeId()} AND d_fact IN ({$query_field}) AND d_julianday1=(" . + " WHERE d_file={$this->tree->id()} AND d_fact IN ({$query_field}) AND d_julianday1=(" . " SELECT {$dmod}( d_julianday1 )" . " FROM `##dates`" . - " WHERE d_file={$this->tree->getTreeId()} AND d_fact IN ({$query_field}) AND d_julianday1<>0 )" . + " WHERE d_file={$this->tree->id()} AND d_fact IN ({$query_field}) AND d_julianday1<>0 )" . " LIMIT 1" ); if (!isset($rows[0])) { @@ -1552,13 +1552,13 @@ class Stats $rows = Database::prepare( "SELECT i_gedcom AS ged FROM `##individuals` WHERE i_file = :tree_id AND i_gedcom LIKE '%\n2 PLAC %'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchAll(); } elseif ($what == 'FAM') { $rows = Database::prepare( "SELECT f_gedcom AS ged FROM `##families` WHERE f_file = :tree_id AND f_gedcom LIKE '%\n2 PLAC %'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchAll(); } $placelist = []; @@ -1600,7 +1600,7 @@ class Stats $join . " WHERE" . " p_id={$parent} AND" . - " p_file={$this->tree->getTreeId()}" . + " p_file={$this->tree->id()}" . " GROUP BY place" ); @@ -1623,7 +1623,7 @@ class Stats " JOIN `##placelinks` ON pl_file=p_file AND p_id=pl_p_id" . $join . " WHERE" . - " p_file={$this->tree->getTreeId()}" . + " p_file={$this->tree->id()}" . " AND p_parent_id='0'" . " GROUP BY country ORDER BY tot DESC, country ASC" ); @@ -1640,7 +1640,7 @@ class Stats { return (int) Database::prepare("SELECT COUNT(*) FROM `##places` WHERE p_file=?") - ->execute([$this->tree->getTreeId()]) + ->execute([$this->tree->id()]) ->fetchOne(); } @@ -1701,7 +1701,7 @@ class Stats " WHERE n_file = :tree_id" . " AND n_surn COLLATE :collate = :surname" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'collate' => I18N::collation(), 'surname' => $surname, ])->fetchAll(); @@ -1958,7 +1958,7 @@ class Stats $sql = "SELECT FLOOR(d_year/100+1) AS century, COUNT(*) AS total FROM `##dates` " . "WHERE " . - "d_file = {$this->tree->getTreeId()} AND " . + "d_file = {$this->tree->id()} AND " . "d_year <> 0 AND " . "d_fact='BIRT' AND " . "d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; @@ -1967,14 +1967,14 @@ class Stats "SELECT d_month, i_sex, COUNT(*) AS total FROM `##dates` " . "JOIN `##individuals` ON d_file = i_file AND d_gid = i_id " . "WHERE " . - "d_file={$this->tree->getTreeId()} AND " . + "d_file={$this->tree->id()} AND " . "d_fact='BIRT' AND " . "d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; } else { $sql = "SELECT d_month, COUNT(*) AS total FROM `##dates` " . "WHERE " . - "d_file={$this->tree->getTreeId()} AND " . + "d_file={$this->tree->id()} AND " . "d_fact='BIRT' AND " . "d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; } @@ -2044,7 +2044,7 @@ class Stats $sql = "SELECT FLOOR(d_year/100+1) AS century, COUNT(*) AS total FROM `##dates` " . "WHERE " . - "d_file={$this->tree->getTreeId()} AND " . + "d_file={$this->tree->id()} AND " . 'd_year<>0 AND ' . "d_fact='DEAT' AND " . "d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; @@ -2053,14 +2053,14 @@ class Stats "SELECT d_month, i_sex, COUNT(*) AS total FROM `##dates` " . "JOIN `##individuals` ON d_file = i_file AND d_gid = i_id " . "WHERE " . - "d_file={$this->tree->getTreeId()} AND " . + "d_file={$this->tree->id()} AND " . "d_fact='DEAT' AND " . "d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; } else { $sql = "SELECT d_month, COUNT(*) AS total FROM `##dates` " . "WHERE " . - "d_file={$this->tree->getTreeId()} AND " . + "d_file={$this->tree->id()} AND " . "d_fact='DEAT' AND " . "d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; } @@ -2322,7 +2322,7 @@ class Stats " WHERE" . " indi.i_id=birth.d_gid AND" . " birth.d_gid=death.d_gid AND" . - " death.d_file={$this->tree->getTreeId()} AND" . + " death.d_file={$this->tree->id()} AND" . " birth.d_file=death.d_file AND" . " birth.d_file=indi.i_file AND" . " birth.d_fact='BIRT' AND" . @@ -2387,7 +2387,7 @@ class Stats "WHERE " . " indi.i_id=birth.d_gid AND " . " birth.d_gid=death.d_gid AND " . - " death.d_file={$this->tree->getTreeId()} AND " . + " death.d_file={$this->tree->id()} AND " . " birth.d_file=death.d_file AND " . " birth.d_file=indi.i_file AND " . " birth.d_fact='BIRT' AND " . @@ -2483,7 +2483,7 @@ class Stats " WHERE" . " indi.i_id=birth.d_gid AND" . " indi.i_gedcom NOT REGEXP '\\n1 (" . WT_EVENTS_DEAT . ")' AND" . - " birth.d_file={$this->tree->getTreeId()} AND" . + " birth.d_file={$this->tree->id()} AND" . " birth.d_fact='BIRT' AND" . " birth.d_file=indi.i_file AND" . " birth.d_julianday1<>0" . @@ -2560,7 +2560,7 @@ class Stats " WHERE " . " indi.i_id=birth.d_gid AND " . " birth.d_gid=death.d_gid AND " . - " death.d_file=" . $this->tree->getTreeId() . " AND " . + " death.d_file=" . $this->tree->id() . " AND " . " birth.d_file=death.d_file AND " . " birth.d_file=indi.i_file AND " . " birth.d_fact='BIRT' AND " . @@ -2614,7 +2614,7 @@ class Stats " WHERE" . " indi.i_id=birth.d_gid AND" . " birth.d_gid=death.d_gid AND" . - " death.d_file={$this->tree->getTreeId()} AND" . + " death.d_file={$this->tree->id()} AND" . " birth.d_file=death.d_file AND" . " birth.d_file=indi.i_file AND" . " birth.d_fact='BIRT' AND" . @@ -2704,7 +2704,7 @@ class Stats " WHERE" . " indi.i_id=birth.d_gid AND" . " birth.d_gid=death.d_gid AND" . - " death.d_file={$this->tree->getTreeId()} AND" . + " death.d_file={$this->tree->id()} AND" . " birth.d_file=death.d_file AND" . " birth.d_file=indi.i_file AND" . " birth.d_fact='BIRT' AND" . @@ -3037,7 +3037,7 @@ class Stats ' FROM' . " `##dates`" . ' WHERE' . - " d_file={$this->tree->getTreeId()} AND" . + " d_file={$this->tree->id()} AND" . " d_gid<>'HEAD' AND" . " d_fact {$fact_query} AND" . ' d_julianday1<>0' . @@ -3208,14 +3208,14 @@ class Stats $rows = $this->runSql( " SELECT fam.f_id AS famid, fam.{$sex_field}, married.d_julianday2-birth.d_julianday1 AS age, indi.i_id AS i_id" . " FROM `##families` AS fam" . - " LEFT JOIN `##dates` AS birth ON birth.d_file = {$this->tree->getTreeId()}" . - " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->getTreeId()}" . - " LEFT JOIN `##individuals` AS indi ON indi.i_file = {$this->tree->getTreeId()}" . + " LEFT JOIN `##dates` AS birth ON birth.d_file = {$this->tree->id()}" . + " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->id()}" . + " LEFT JOIN `##individuals` AS indi ON indi.i_file = {$this->tree->id()}" . " WHERE" . " birth.d_gid = indi.i_id AND" . " married.d_gid = fam.f_id AND" . " indi.i_id = fam.{$sex_field} AND" . - " fam.f_file = {$this->tree->getTreeId()} AND" . + " fam.f_file = {$this->tree->id()} AND" . " birth.d_fact = 'BIRT' AND" . " married.d_fact = 'MARR' AND" . " birth.d_julianday1 <> 0 AND" . @@ -3285,10 +3285,10 @@ class Stats $hrows = $this->runSql( " SELECT DISTINCT fam.f_id AS family, MIN(husbdeath.d_julianday2-married.d_julianday1) AS age" . " FROM `##families` AS fam" . - " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->getTreeId()}" . - " LEFT JOIN `##dates` AS husbdeath ON husbdeath.d_file = {$this->tree->getTreeId()}" . + " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->id()}" . + " LEFT JOIN `##dates` AS husbdeath ON husbdeath.d_file = {$this->tree->id()}" . " WHERE" . - " fam.f_file = {$this->tree->getTreeId()} AND" . + " fam.f_file = {$this->tree->id()} AND" . " husbdeath.d_gid = fam.f_husb AND" . " husbdeath.d_fact = 'DEAT' AND" . " married.d_gid = fam.f_id AND" . @@ -3301,10 +3301,10 @@ class Stats $wrows = $this->runSql( " SELECT DISTINCT fam.f_id AS family, MIN(wifedeath.d_julianday2-married.d_julianday1) AS age" . " FROM `##families` AS fam" . - " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->getTreeId()}" . - " LEFT JOIN `##dates` AS wifedeath ON wifedeath.d_file = {$this->tree->getTreeId()}" . + " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->id()}" . + " LEFT JOIN `##dates` AS wifedeath ON wifedeath.d_file = {$this->tree->id()}" . " WHERE" . - " fam.f_file = {$this->tree->getTreeId()} AND" . + " fam.f_file = {$this->tree->id()} AND" . " wifedeath.d_gid = fam.f_wife AND" . " wifedeath.d_fact = 'DEAT' AND" . " married.d_gid = fam.f_id AND" . @@ -3317,10 +3317,10 @@ class Stats $drows = $this->runSql( " SELECT DISTINCT fam.f_id AS family, MIN(divorced.d_julianday2-married.d_julianday1) AS age" . " FROM `##families` AS fam" . - " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->getTreeId()}" . - " LEFT JOIN `##dates` AS divorced ON divorced.d_file = {$this->tree->getTreeId()}" . + " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->id()}" . + " LEFT JOIN `##dates` AS divorced ON divorced.d_file = {$this->tree->id()}" . " WHERE" . - " fam.f_file = {$this->tree->getTreeId()} AND" . + " fam.f_file = {$this->tree->id()} AND" . " married.d_gid = fam.f_id AND" . " married.d_fact = 'MARR' AND" . " divorced.d_gid = fam.f_id AND" . @@ -3454,7 +3454,7 @@ class Stats $rows = Database::prepare( $sql )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'limit' => $total, ])->fetchAll(); @@ -3518,16 +3518,16 @@ class Stats " parentfamily.l_to AS id," . " childbirth.d_julianday2-birth.d_julianday1 AS age" . " FROM `##link` AS parentfamily" . - " JOIN `##link` AS childfamily ON childfamily.l_file = {$this->tree->getTreeId()}" . - " JOIN `##dates` AS birth ON birth.d_file = {$this->tree->getTreeId()}" . - " JOIN `##dates` AS childbirth ON childbirth.d_file = {$this->tree->getTreeId()}" . + " JOIN `##link` AS childfamily ON childfamily.l_file = {$this->tree->id()}" . + " JOIN `##dates` AS birth ON birth.d_file = {$this->tree->id()}" . + " JOIN `##dates` AS childbirth ON childbirth.d_file = {$this->tree->id()}" . " WHERE" . " birth.d_gid = parentfamily.l_to AND" . " childfamily.l_to = childbirth.d_gid AND" . " childfamily.l_type = 'CHIL' AND" . " parentfamily.l_type = '{$sex_field}' AND" . " childfamily.l_from = parentfamily.l_from AND" . - " parentfamily.l_file = {$this->tree->getTreeId()} AND" . + " parentfamily.l_file = {$this->tree->id()} AND" . " birth.d_fact = 'BIRT' AND" . " childbirth.d_fact = 'BIRT' AND" . " birth.d_julianday1 <> 0 AND" . @@ -3597,7 +3597,7 @@ class Stats $sql = "SELECT FLOOR(d_year/100+1) AS century, COUNT(*) AS total" . " FROM `##dates`" . - " WHERE d_file={$this->tree->getTreeId()} AND d_year<>0 AND d_fact='MARR' AND d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; + " WHERE d_file={$this->tree->id()} AND d_year<>0 AND d_fact='MARR' AND d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; if ($year1 >= 0 && $year2 >= 0) { $sql .= " AND d_year BETWEEN '{$year1}' AND '{$year2}'"; } @@ -3610,11 +3610,11 @@ class Stats $sql = " SELECT fam.f_id AS fams, fam.f_husb, fam.f_wife, married.d_julianday2 AS age, married.d_month AS month, indi.i_id AS indi" . " FROM `##families` AS fam" . - " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->getTreeId()}" . - " LEFT JOIN `##individuals` AS indi ON indi.i_file = {$this->tree->getTreeId()}" . + " LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->id()}" . + " LEFT JOIN `##individuals` AS indi ON indi.i_file = {$this->tree->id()}" . " WHERE" . " married.d_gid = fam.f_id AND" . - " fam.f_file = {$this->tree->getTreeId()} AND" . + " fam.f_file = {$this->tree->id()} AND" . " married.d_fact = 'MARR' AND" . " married.d_julianday2 <> 0 AND" . $years . @@ -3624,7 +3624,7 @@ class Stats $sql = "SELECT d_month, COUNT(*) AS total" . " FROM `##dates`" . - " WHERE d_file={$this->tree->getTreeId()} AND d_fact='MARR'"; + " WHERE d_file={$this->tree->id()} AND d_fact='MARR'"; if ($year1 >= 0 && $year2 >= 0) { $sql .= " AND d_year BETWEEN '{$year1}' AND '{$year2}'"; } @@ -3687,7 +3687,7 @@ class Stats $sql = "SELECT FLOOR(d_year/100+1) AS century, COUNT(*) AS total" . " FROM `##dates`" . - " WHERE d_file={$this->tree->getTreeId()} AND d_year<>0 AND d_fact = 'DIV' AND d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; + " WHERE d_file={$this->tree->id()} AND d_year<>0 AND d_fact = 'DIV' AND d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')"; if ($year1 >= 0 && $year2 >= 0) { $sql .= " AND d_year BETWEEN '{$year1}' AND '{$year2}'"; } @@ -3700,11 +3700,11 @@ class Stats $sql = " SELECT fam.f_id AS fams, fam.f_husb, fam.f_wife, divorced.d_julianday2 AS age, divorced.d_month AS month, indi.i_id AS indi" . " FROM `##families` AS fam" . - " LEFT JOIN `##dates` AS divorced ON divorced.d_file = {$this->tree->getTreeId()}" . - " LEFT JOIN `##individuals` AS indi ON indi.i_file = {$this->tree->getTreeId()}" . + " LEFT JOIN `##dates` AS divorced ON divorced.d_file = {$this->tree->id()}" . + " LEFT JOIN `##individuals` AS indi ON indi.i_file = {$this->tree->id()}" . " WHERE" . " divorced.d_gid = fam.f_id AND" . - " fam.f_file = {$this->tree->getTreeId()} AND" . + " fam.f_file = {$this->tree->id()} AND" . " divorced.d_fact = 'DIV' AND" . " divorced.d_julianday2 <> 0 AND" . $years . @@ -3713,7 +3713,7 @@ class Stats } else { $sql = "SELECT d_month, COUNT(*) AS total FROM `##dates` " . - "WHERE d_file={$this->tree->getTreeId()} AND d_fact = 'DIV'"; + "WHERE d_file={$this->tree->id()} AND d_fact = 'DIV'"; if ($year1 >= 0 && $year2 >= 0) { $sql .= " AND d_year BETWEEN '{$year1}' AND '{$year2}'"; } @@ -3965,7 +3965,7 @@ class Stats "JOIN `##dates` AS birth ON (birth.d_gid=fam.f_husb AND birth.d_file=fam.f_file) " . "WHERE " . " '{$sex}' IN ('M', 'BOTH') AND " . - " married.d_file={$this->tree->getTreeId()} AND married.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND married.d_fact='MARR' AND " . + " married.d_file={$this->tree->id()} AND married.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND married.d_fact='MARR' AND " . " birth.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND birth.d_fact='BIRT' AND " . " married.d_julianday1>birth.d_julianday1 AND birth.d_julianday1<>0 " . "GROUP BY century, sex " . @@ -3979,7 +3979,7 @@ class Stats "JOIN `##dates` AS birth ON (birth.d_gid=fam.f_wife AND birth.d_file=fam.f_file) " . "WHERE " . " '{$sex}' IN ('F', 'BOTH') AND " . - " married.d_file={$this->tree->getTreeId()} AND married.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND married.d_fact='MARR' AND " . + " married.d_file={$this->tree->id()} AND married.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND married.d_fact='MARR' AND " . " birth.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND birth.d_fact='BIRT' AND " . " married.d_julianday1>birth.d_julianday1 AND birth.d_julianday1<>0 " . " GROUP BY century, sex ORDER BY century" @@ -4087,7 +4087,7 @@ class Stats "JOIN `##dates` AS birth ON (birth.d_gid=fam.f_husb AND birth.d_file=fam.f_file) " . "WHERE " . " '{$sex}' IN ('M', 'BOTH') AND {$years} " . - " married.d_file={$this->tree->getTreeId()} AND married.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND married.d_fact='MARR' AND " . + " married.d_file={$this->tree->id()} AND married.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND married.d_fact='MARR' AND " . " birth.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND birth.d_fact='BIRT' AND " . " married.d_julianday1>birth.d_julianday1 AND birth.d_julianday1<>0 " . "UNION ALL " . @@ -4100,7 +4100,7 @@ class Stats "JOIN `##dates` AS birth ON (birth.d_gid=fam.f_wife AND birth.d_file=fam.f_file) " . "WHERE " . " '{$sex}' IN ('F', 'BOTH') AND {$years} " . - " married.d_file={$this->tree->getTreeId()} AND married.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND married.d_fact='MARR' AND " . + " married.d_file={$this->tree->id()} AND married.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND married.d_fact='MARR' AND " . " birth.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@') AND birth.d_fact='BIRT' AND " . " married.d_julianday1>birth.d_julianday1 AND birth.d_julianday1<>0 " ); @@ -4522,7 +4522,7 @@ class Stats $n = (int) Database::prepare( "SELECT COUNT(DISTINCT f_husb) FROM `##families` WHERE f_file = :tree_id AND f_gedcom LIKE '%\\n1 MARR%'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); return I18N::number($n); @@ -4538,7 +4538,7 @@ class Stats $n = (int) Database::prepare( "SELECT COUNT(DISTINCT f_wife) FROM `##families` WHERE f_file = :tree_id AND f_gedcom LIKE '%\\n1 MARR%'" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); return I18N::number($n); @@ -4557,11 +4557,11 @@ class Stats " SELECT f_numchil AS tot, f_id AS id" . " FROM `##families`" . " WHERE" . - " f_file={$this->tree->getTreeId()}" . + " f_file={$this->tree->id()}" . " AND f_numchil = (" . " SELECT max( f_numchil )" . " FROM `##families`" . - " WHERE f_file ={$this->tree->getTreeId()}" . + " WHERE f_file ={$this->tree->id()}" . " )" . " LIMIT 1" ); @@ -4606,7 +4606,7 @@ class Stats "SELECT f_numchil AS tot, f_id AS id" . " FROM `##families`" . " WHERE" . - " f_file={$this->tree->getTreeId()}" . + " f_file={$this->tree->id()}" . " ORDER BY tot DESC" . " LIMIT " . $total ); @@ -4673,11 +4673,11 @@ class Stats " link2.l_to AS ch2," . " child1.d_julianday2-child2.d_julianday2 AS age" . " FROM `##link` AS link1" . - " LEFT JOIN `##dates` AS child1 ON child1.d_file = {$this->tree->getTreeId()}" . - " LEFT JOIN `##dates` AS child2 ON child2.d_file = {$this->tree->getTreeId()}" . - " LEFT JOIN `##link` AS link2 ON link2.l_file = {$this->tree->getTreeId()}" . + " LEFT JOIN `##dates` AS child1 ON child1.d_file = {$this->tree->id()}" . + " LEFT JOIN `##dates` AS child2 ON child2.d_file = {$this->tree->id()}" . + " LEFT JOIN `##link` AS link2 ON link2.l_file = {$this->tree->id()}" . " WHERE" . - " link1.l_file = {$this->tree->getTreeId()} AND" . + " link1.l_file = {$this->tree->id()} AND" . " link1.l_from = link2.l_from AND" . " link1.l_type = 'CHIL' AND" . " child1.d_gid = link1.l_to AND" . @@ -4820,10 +4820,10 @@ class Stats " child1.d_month as d_month" . $sql_sex1 . " FROM `##link` AS link1" . - " LEFT JOIN `##dates` AS child1 ON child1.d_file = {$this->tree->getTreeId()}" . + " LEFT JOIN `##dates` AS child1 ON child1.d_file = {$this->tree->id()}" . $sql_sex2 . " WHERE" . - " link1.l_file = {$this->tree->getTreeId()} AND" . + " link1.l_file = {$this->tree->id()} AND" . " link1.l_type = 'CHIL' AND" . " child1.d_gid = link1.l_to AND" . " child1.d_fact = 'BIRT' AND" . @@ -4923,7 +4923,7 @@ class Stats $rows = $this->runSql( " SELECT f_numchil AS tot, f_id AS id" . " FROM `##families`" . - " WHERE f_file={$this->tree->getTreeId()}" . + " WHERE f_file={$this->tree->id()}" . " ORDER BY tot DESC" . " LIMIT " . $total ); @@ -4964,7 +4964,7 @@ class Stats $total = (int) Database::prepare( "SELECT SUM(f_numchil) FROM `##families` WHERE f_file = :tree_id" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); return I18N::number($total); @@ -4980,7 +4980,7 @@ class Stats $average = (float) Database::prepare( "SELECT AVG(f_numchil) AS tot FROM `##families` WHERE f_file = :tree_id" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchOne(); return I18N::number($average, 2); @@ -5006,7 +5006,7 @@ class Stats " SELECT ROUND(AVG(f_numchil),2) AS num, FLOOR(d_year/100+1) AS century" . " FROM `##families`" . " JOIN `##dates` ON (d_file = f_file AND d_gid=f_id)" . - " WHERE f_file = {$this->tree->getTreeId()}" . + " WHERE f_file = {$this->tree->id()}" . " AND d_julianday1<>0" . " AND d_fact = 'MARR'" . " AND d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')" . @@ -5056,7 +5056,7 @@ class Stats "(SELECT count(i_sex) AS num FROM `##link` " . "LEFT OUTER JOIN `##individuals` " . "ON l_from=i_id AND l_file=i_file AND i_sex='M' AND l_type='FAMC' " . - "JOIN `##families` ON f_file=l_file AND f_id=l_to WHERE f_file={$this->tree->getTreeId()} GROUP BY l_to" . + "JOIN `##families` ON f_file=l_file AND f_id=l_to WHERE f_file={$this->tree->id()} GROUP BY l_to" . ") boys" . " GROUP BY num" . " ORDER BY num"; @@ -5066,7 +5066,7 @@ class Stats "(SELECT count(i_sex) AS num FROM `##link` " . "LEFT OUTER JOIN `##individuals` " . "ON l_from=i_id AND l_file=i_file AND i_sex='F' AND l_type='FAMC' " . - "JOIN `##families` ON f_file=l_file AND f_id=l_to WHERE f_file={$this->tree->getTreeId()} GROUP BY l_to" . + "JOIN `##families` ON f_file=l_file AND f_id=l_to WHERE f_file={$this->tree->id()} GROUP BY l_to" . ") girls" . " GROUP BY num" . " ORDER BY num"; @@ -5074,14 +5074,14 @@ class Stats $sql = "SELECT f_numchil, COUNT(*) AS total FROM `##families` "; if ($year1 >= 0 && $year2 >= 0) { $sql .= - "AS fam LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->getTreeId()}" + "AS fam LEFT JOIN `##dates` AS married ON married.d_file = {$this->tree->id()}" . " WHERE" . " married.d_gid = fam.f_id AND" - . " fam.f_file = {$this->tree->getTreeId()} AND" + . " fam.f_file = {$this->tree->id()} AND" . " married.d_fact = 'MARR' AND" . " married.d_year BETWEEN '{$year1}' AND '{$year2}'"; } else { - $sql .= "WHERE f_file={$this->tree->getTreeId()}"; + $sql .= "WHERE f_file={$this->tree->id()}"; } $sql .= ' GROUP BY f_numchil'; } @@ -5164,7 +5164,7 @@ class Stats $rows = $this->runSql( " SELECT COUNT(*) AS tot" . " FROM `##families`" . - " WHERE f_numchil = 0 AND f_file = {$this->tree->getTreeId()}" + " WHERE f_numchil = 0 AND f_file = {$this->tree->id()}" ); return (int) $rows[0]->tot; @@ -5192,7 +5192,7 @@ class Stats $rows = $this->runSql( " SELECT f_id AS family" . " FROM `##families` AS fam" . - " WHERE f_numchil = 0 AND fam.f_file = {$this->tree->getTreeId()}" + " WHERE f_numchil = 0 AND fam.f_file = {$this->tree->id()}" ); if (!isset($rows[0])) { return ''; @@ -5267,7 +5267,7 @@ class Stats " `##dates` AS married ON (married.d_file = fam.f_file AND married.d_gid = fam.f_id)" . " WHERE" . " f_numchil = 0 AND" . - " fam.f_file = {$this->tree->getTreeId()} AND" . + " fam.f_file = {$this->tree->id()} AND" . $years . " married.d_fact = 'MARR' AND" . " married.d_type IN ('@#DGREGORIAN@', '@#DJULIAN@')" . @@ -5334,11 +5334,11 @@ class Stats $rows = $this->runSql( "SELECT COUNT(*) AS tot, f_id AS id" . " FROM `##families`" . - " JOIN `##link` AS children ON children.l_file = {$this->tree->getTreeId()}" . - " JOIN `##link` AS mchildren ON mchildren.l_file = {$this->tree->getTreeId()}" . - " JOIN `##link` AS gchildren ON gchildren.l_file = {$this->tree->getTreeId()}" . + " JOIN `##link` AS children ON children.l_file = {$this->tree->id()}" . + " JOIN `##link` AS mchildren ON mchildren.l_file = {$this->tree->id()}" . + " JOIN `##link` AS gchildren ON gchildren.l_file = {$this->tree->id()}" . " WHERE" . - " f_file={$this->tree->getTreeId()} AND" . + " f_file={$this->tree->id()} AND" . " children.l_from=f_id AND" . " children.l_type='CHIL' AND" . " children.l_to=mchildren.l_from AND" . @@ -5462,7 +5462,7 @@ class Stats " ORDER BY COUNT(n_surn) DESC" . " LIMIT :limit" )->execute([ - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), 'limit' => $number_of_surnames, ])->fetchOneColumn(); @@ -5473,7 +5473,7 @@ class Stats )->execute([ 'collate' => I18N::collation(), 'surname' => $top_surname, - 'tree_id' => $this->tree->getTreeId(), + 'tree_id' => $this->tree->id(), ])->fetchAssoc(); if (array_sum($variants) > $threshold) { @@ -5663,7 +5663,7 @@ class Stats $sex_sql = "i_sex<>'U'"; break; } - $ged_id = $this->tree->getTreeId(); + $ged_id = $this->tree->id(); $rows = Database::prepare("SELECT n_givn, COUNT(*) AS num FROM `##name` JOIN `##individuals` ON (n_id=i_id AND n_file=i_file) WHERE n_file={$ged_id} AND n_type<>'_MARNM' AND n_givn NOT IN ('@P.N.', '') AND LENGTH(n_givn)>1 AND {$sex_sql} GROUP BY n_id, n_givn") ->fetchAll(); @@ -6479,7 +6479,7 @@ class Stats if ($page_name === '') { // index.php?ctype=gedcom $page_name = 'index.php'; - $page_parameter = 'gedcom:' . $this->tree->getTreeId(); + $page_parameter = 'gedcom:' . $this->tree->id(); } elseif ($page_name == 'index.php') { // index.php?ctype=user $user = User::findByIdentifier($page_parameter); @@ -6786,7 +6786,7 @@ class Stats { try { $number = (int) Database::prepare("SELECT COUNT(*) FROM `##news` WHERE gedcom_id = ?") - ->execute([$this->tree->getTreeId()]) + ->execute([$this->tree->id()]) ->fetchOne(); } catch (PDOException $ex) { DebugBar::addThrowable($ex); diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php index 483bd5ae9a..8cda158a18 100644 --- a/app/Theme/AbstractTheme.php +++ b/app/Theme/AbstractTheme.php @@ -1198,7 +1198,7 @@ abstract class AbstractTheme } else { $active = ''; } - $submenus[] = new Menu(e($tree->getTitle()), route('tree-page', ['ged' => $tree->getName()]), $active . 'menu-tree-' . $tree->getTreeId()); + $submenus[] = new Menu(e($tree->getTitle()), route('tree-page', ['ged' => $tree->getName()]), $active . 'menu-tree-' . $tree->id()); } return new Menu(I18N::translate('Family trees'), '#', 'menu-tree', [], $submenus); @@ -1246,10 +1246,10 @@ abstract class AbstractTheme " EXISTS(SELECT 1 FROM `##other` WHERE o_file = ? AND o_type='NOTE') AS note," . " EXISTS(SELECT 1 FROM `##media` WHERE m_file = ?) AS obje" )->execute([ - $this->tree->getTreeId(), - $this->tree->getTreeId(), - $this->tree->getTreeId(), - $this->tree->getTreeId(), + $this->tree->id(), + $this->tree->id(), + $this->tree->id(), + $this->tree->id(), ])->fetchOneRow(); $submenus = [ diff --git a/app/Tree.php b/app/Tree.php index fb6fffc2e8..f39f9e502e 100644 --- a/app/Tree.php +++ b/app/Tree.php @@ -30,7 +30,7 @@ use function substr_compare; class Tree { /** @var int The tree's ID number */ - private $tree_id; + private $id; /** @var string The tree's name */ private $name; @@ -60,13 +60,13 @@ class Tree * Create a tree object. This is a private constructor - it can only * be called from Tree::getAll() to ensure proper initialisation. * - * @param int $tree_id + * @param int $id * @param string $tree_name * @param string $tree_title */ - private function __construct($tree_id, $tree_name, $tree_title) + private function __construct($id, $tree_name, $tree_title) { - $this->tree_id = $tree_id; + $this->id = $id; $this->name = $tree_name; $this->title = $tree_title; $this->fact_privacy = []; @@ -82,7 +82,7 @@ class Tree 'priv_user' => Auth::PRIV_USER, 'priv_none' => Auth::PRIV_NONE, 'priv_hide' => Auth::PRIV_HIDE, - 'tree_id' => $this->tree_id, + 'tree_id' => $this->id, ])->fetchAll(); foreach ($rows as $row) { @@ -103,9 +103,9 @@ class Tree * * @return int */ - public function getTreeId(): int + public function id(): int { - return $this->tree_id; + return $this->id; } /** @@ -171,7 +171,7 @@ class Tree if (empty($this->preferences)) { $this->preferences = Database::prepare( "SELECT setting_name, setting_value FROM `##gedcom_setting` WHERE gedcom_id = ?" - )->execute([$this->tree_id])->fetchAssoc(); + )->execute([$this->id])->fetchAssoc(); } return $this->preferences[$setting_name] ?? $default; @@ -192,7 +192,7 @@ class Tree "REPLACE INTO `##gedcom_setting` (gedcom_id, setting_name, setting_value)" . " VALUES (:tree_id, :setting_name, LEFT(:setting_value, 255))" )->execute([ - 'tree_id' => $this->tree_id, + 'tree_id' => $this->id, 'setting_name' => $setting_name, 'setting_value' => $setting_value, ]); @@ -223,7 +223,7 @@ class Tree "SELECT setting_name, setting_value FROM `##user_gedcom_setting` WHERE user_id = ? AND gedcom_id = ?" )->execute([ $user->getUserId(), - $this->tree_id, + $this->id, ])->fetchAssoc(); } @@ -247,7 +247,7 @@ class Tree Database::prepare( "DELETE FROM `##user_gedcom_setting` WHERE gedcom_id = :tree_id AND user_id = :user_id AND setting_name = :setting_name" )->execute([ - 'tree_id' => $this->tree_id, + 'tree_id' => $this->id, 'user_id' => $user->getUserId(), 'setting_name' => $setting_name, ]); @@ -256,7 +256,7 @@ class Tree "REPLACE INTO `##user_gedcom_setting` (user_id, gedcom_id, setting_name, setting_value) VALUES (:user_id, :tree_id, :setting_name, LEFT(:setting_value, 255))" )->execute([ 'user_id' => $user->getUserId(), - 'tree_id' => $this->tree_id, + 'tree_id' => $this->id, 'setting_name' => $setting_name, 'setting_value' => $setting_value, ]); @@ -331,7 +331,7 @@ class Tree public static function findById($tree_id): Tree { foreach (self::getAll() as $tree) { - if ($tree->tree_id == $tree_id) { + if ($tree->id == $tree_id) { return $tree; } } @@ -366,7 +366,7 @@ class Tree { $list = []; foreach (self::getAll() as $tree) { - $list[$tree->tree_id] = $tree->title; + $list[$tree->id] = $tree->title; } return $list; @@ -484,7 +484,7 @@ class Tree ]); // Update our cache - self::$trees[$tree->tree_id] = $tree; + self::$trees[$tree->id] = $tree; return $tree; } @@ -499,7 +499,7 @@ class Tree return (bool) Database::prepare( "SELECT 1 FROM `##change` WHERE status = 'pending' AND gedcom_id = :tree_id" )->execute([ - 'tree_id' => $this->tree_id, + 'tree_id' => $this->id, ])->fetchOne(); } @@ -515,23 +515,23 @@ class Tree */ public function deleteGenealogyData(bool $keep_media) { - Database::prepare("DELETE FROM `##gedcom_chunk` WHERE gedcom_id = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##individuals` WHERE i_file = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##families` WHERE f_file = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##sources` WHERE s_file = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##other` WHERE o_file = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##places` WHERE p_file = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##placelinks` WHERE pl_file = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##name` WHERE n_file = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##dates` WHERE d_file = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##change` WHERE gedcom_id = ?")->execute([$this->tree_id]); + Database::prepare("DELETE FROM `##gedcom_chunk` WHERE gedcom_id = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##individuals` WHERE i_file = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##families` WHERE f_file = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##sources` WHERE s_file = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##other` WHERE o_file = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##places` WHERE p_file = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##placelinks` WHERE pl_file = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##name` WHERE n_file = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##dates` WHERE d_file = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##change` WHERE gedcom_id = ?")->execute([$this->id]); if ($keep_media) { - Database::prepare("DELETE FROM `##link` WHERE l_file =? AND l_type<>'OBJE'")->execute([$this->tree_id]); + Database::prepare("DELETE FROM `##link` WHERE l_file =? AND l_type<>'OBJE'")->execute([$this->id]); } else { - Database::prepare("DELETE FROM `##link` WHERE l_file =?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##media` WHERE m_file =?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##media_file` WHERE m_file =?")->execute([$this->tree_id]); + Database::prepare("DELETE FROM `##link` WHERE l_file =?")->execute([$this->id]); + Database::prepare("DELETE FROM `##media` WHERE m_file =?")->execute([$this->id]); + Database::prepare("DELETE FROM `##media_file` WHERE m_file =?")->execute([$this->id]); } } @@ -549,16 +549,16 @@ class Tree $this->deleteGenealogyData(false); - Database::prepare("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE gedcom_id=?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##block` WHERE gedcom_id = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##user_gedcom_setting` WHERE gedcom_id = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##gedcom_setting` WHERE gedcom_id = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##module_privacy` WHERE gedcom_id = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##hit_counter` WHERE gedcom_id = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##default_resn` WHERE gedcom_id = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##gedcom_chunk` WHERE gedcom_id = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##log` WHERE gedcom_id = ?")->execute([$this->tree_id]); - Database::prepare("DELETE FROM `##gedcom` WHERE gedcom_id = ?")->execute([$this->tree_id]); + Database::prepare("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE gedcom_id=?")->execute([$this->id]); + Database::prepare("DELETE FROM `##block` WHERE gedcom_id = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##user_gedcom_setting` WHERE gedcom_id = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##gedcom_setting` WHERE gedcom_id = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##module_privacy` WHERE gedcom_id = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##hit_counter` WHERE gedcom_id = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##default_resn` WHERE gedcom_id = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##gedcom_chunk` WHERE gedcom_id = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##log` WHERE gedcom_id = ?")->execute([$this->id]); + Database::prepare("DELETE FROM `##gedcom` WHERE gedcom_id = ?")->execute([$this->id]); // After updating the database, we need to fetch a new (sorted) copy self::$trees = []; @@ -585,11 +585,11 @@ class Tree "SELECT m_gedcom AS gedcom, m_id AS xref, 5 AS n FROM `##media` WHERE m_file = :tree_id_5" . " ORDER BY n, LENGTH(xref), xref" )->execute([ - 'tree_id_1' => $this->tree_id, - 'tree_id_2' => $this->tree_id, - 'tree_id_3' => $this->tree_id, - 'tree_id_4' => $this->tree_id, - 'tree_id_5' => $this->tree_id, + 'tree_id_1' => $this->id, + 'tree_id_2' => $this->id, + 'tree_id_3' => $this->id, + 'tree_id_4' => $this->id, + 'tree_id_5' => $this->id, ]); $buffer = FunctionsExport::reformatRecord(FunctionsExport::gedcomHeader($this, 'UTF-8')); @@ -644,7 +644,7 @@ class Tree Database::prepare( "INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)" )->execute([ - $this->tree_id, + $this->id, substr($file_data, 0, $pos), ]); $file_data = substr($file_data, $pos); @@ -653,7 +653,7 @@ class Tree Database::prepare( "INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)" )->execute([ - $this->tree_id, + $this->id, $file_data, ]); @@ -739,7 +739,7 @@ class Tree Database::prepare( "INSERT INTO `##change` (gedcom_id, xref, old_gedcom, new_gedcom, user_id) VALUES (?, ?, '', ?, ?)" )->execute([ - $this->tree_id, + $this->id, $xref, $gedcom, Auth::id(), @@ -779,7 +779,7 @@ class Tree Database::prepare( "INSERT INTO `##change` (gedcom_id, xref, old_gedcom, new_gedcom, user_id) VALUES (?, ?, '', ?, ?)" )->execute([ - $this->tree_id, + $this->id, $xref, $gedcom, Auth::id(), @@ -819,7 +819,7 @@ class Tree Database::prepare( "INSERT INTO `##change` (gedcom_id, xref, old_gedcom, new_gedcom, user_id) VALUES (?, ?, '', ?, ?)" )->execute([ - $this->tree_id, + $this->id, $xref, $gedcom, Auth::id(), @@ -859,7 +859,7 @@ class Tree $xref = (string) Database::prepare( "SELECT MIN(i_id) FROM `##individuals` WHERE i_file = :tree_id" )->execute([ - 'tree_id' => $this->getTreeId(), + 'tree_id' => $this->id(), ])->fetchOne(); $individual = Individual::getInstance($xref, $this); @@ -895,7 +895,7 @@ class Tree $xref = (string) Database::prepare( "SELECT MIN(i_id) FROM `##individuals` WHERE i_file = :tree_id" )->execute([ - 'tree_id' => $this->getTreeId(), + 'tree_id' => $this->id(), ])->fetchOne(); $individual = Individual::getInstance($xref, $this); diff --git a/app/User.php b/app/User.php index 8eba4f7af6..37cbb3c3e5 100644 --- a/app/User.php +++ b/app/User.php @@ -185,7 +185,7 @@ class User " FROM `##user_gedcom_setting`" . " WHERE gedcom_id = :tree_id AND setting_name = 'gedcomid' AND setting_value = :xref" )->execute([ - 'tree_id' => $individual->getTree()->getTreeId(), + 'tree_id' => $individual->getTree()->id(), 'xref' => $individual->getXref(), ])->fetchOne(); diff --git a/resources/views/admin/control-panel-tree-list.phtml b/resources/views/admin/control-panel-tree-list.phtml index 4e3d82b57b..393c2b30b4 100644 --- a/resources/views/admin/control-panel-tree-list.phtml +++ b/resources/views/admin/control-panel-tree-list.phtml @@ -1,7 +1,7 @@ <?php use Fisharebest\Webtrees\I18N; ?> <?php foreach ($all_trees as $tree) : ?> - <tr class="<?= $changes[$tree->getTreeId()] ? 'danger' : '' ?>"> + <tr class="<?= $changes[$tree->id()] ? 'danger' : '' ?>"> <th scope="row"> <a href="<?= e(route('tree-page', ['ged' => $tree->getName()])) ?>"> <?= e($tree->getName()) ?> @@ -15,9 +15,9 @@ </a> </td> <td class="text-right"> - <?php if ($changes[$tree->getTreeId()]) : ?> + <?php if ($changes[$tree->id()]) : ?> <a href="<?= e(route('show-pending', ['ged' => $tree->getName(), 'url' => route('admin-control-panel')])) ?>"> - <?= I18N::number($changes[$tree->getTreeId()]) ?> + <?= I18N::number($changes[$tree->id()]) ?> <span class="sr-only"><?= I18N::translate('Pending changes') ?> <?= e($tree->getTitle()) ?></span> </a> <?php else : ?> @@ -25,54 +25,54 @@ <?php endif ?> </td> <td class="d-none d-sm-table-cell text-right"> - <?php if ($individuals[$tree->getTreeId()]) : ?> + <?php if ($individuals[$tree->id()]) : ?> <a href="<?= e(route('individual-list', ['ged' => $tree->getName()])) ?>"> - <?= I18N::number($individuals[$tree->getTreeId()]) ?> + <?= I18N::number($individuals[$tree->id()]) ?> </a> <?php else : ?> - <?php endif ?> </td> <td class="d-none d-lg-table-cell text-right"> - <?php if ($families[$tree->getTreeId()]) : ?> + <?php if ($families[$tree->id()]) : ?> <a href="<?= e(route('family-list', ['ged' => $tree->getName()])) ?>"> - <?= I18N::number($families[$tree->getTreeId()]) ?> + <?= I18N::number($families[$tree->id()]) ?> </a> <?php else : ?> - <?php endif ?> </td> <td class="d-none d-sm-table-cell text-right"> - <?php if ($sources[$tree->getTreeId()]) : ?> + <?php if ($sources[$tree->id()]) : ?> <a href="<?= e(route('source-list', ['ged' => $tree->getName()])) ?>"> - <?= I18N::number($sources[$tree->getTreeId()]) ?> + <?= I18N::number($sources[$tree->id()]) ?> </a> <?php else : ?> - <?php endif ?> </td> <td class="d-none d-lg-table-cell text-right"> - <?php if ($repositories[$tree->getTreeId()]) : ?> + <?php if ($repositories[$tree->id()]) : ?> <a href="<?= e(route('repository-list', ['ged' => $tree->getName()])) ?>"> - <?= I18N::number($repositories[$tree->getTreeId()]) ?> + <?= I18N::number($repositories[$tree->id()]) ?> </a> <?php else : ?> - <?php endif ?> </td> <td class="d-none d-sm-table-cell text-right"> - <?php if ($media[$tree->getTreeId()]) : ?> + <?php if ($media[$tree->id()]) : ?> <a href="<?= e(route('media-list', ['ged' => $tree->getName()])) ?>"> - <?= I18N::number($media[$tree->getTreeId()]) ?> + <?= I18N::number($media[$tree->id()]) ?> </a> <?php else : ?> - <?php endif ?> </td> <td class="d-none d-lg-table-cell text-right"> - <?php if ($notes[$tree->getTreeId()]) : ?> + <?php if ($notes[$tree->id()]) : ?> <a href="<?= e(route('note-list', ['ged' => $tree->getName()])) ?>"> - <?= I18N::number($media[$tree->getTreeId()]) ?> + <?= I18N::number($media[$tree->id()]) ?> </a> <?php else : ?> - diff --git a/resources/views/admin/fix-level-0-media-action.phtml b/resources/views/admin/fix-level-0-media-action.phtml index d678c2a75a..8d350ad90d 100644 --- a/resources/views/admin/fix-level-0-media-action.phtml +++ b/resources/views/admin/fix-level-0-media-action.phtml @@ -4,7 +4,7 @@ class="btn btn-primary btn-small mb-1 wt-fix-button" data-confirm="<?= I18N::translate('Move the media object?') ?>" data-fact-id="<?= e($fact->getFactId()) ?>" - data-tree-id="<?= e($tree->getTreeId()) ?>" + data-tree-id="<?= e($tree->id()) ?>" data-individual-xref="<?= e($individual->getXref()) ?>" data-media-xref="<?= e($media->getXref()) ?>" type="button" diff --git a/resources/views/admin/import-complete.phtml b/resources/views/admin/import-complete.phtml index 63c7d7be71..4fcf15e068 100644 --- a/resources/views/admin/import-complete.phtml +++ b/resources/views/admin/import-complete.phtml @@ -1,4 +1,4 @@ <script> - $("#import<?= e($tree->getTreeId()) ?>").addClass("d-none"); - $("#actions<?= e($tree->getTreeId()) ?>").removeClass("d-none"); + $("#import<?= e($tree->id()) ?>").addClass("d-none"); + $("#actions<?= e($tree->id()) ?>").removeClass("d-none"); </script> diff --git a/resources/views/admin/import-fail.phtml b/resources/views/admin/import-fail.phtml index 2300bfca31..766898a09e 100644 --- a/resources/views/admin/import-fail.phtml +++ b/resources/views/admin/import-fail.phtml @@ -3,5 +3,5 @@ </div> <script> - $("#actions<?= e($tree->getTreeId()) ?>").removeClass("d-none"); + $("#actions<?= e($tree->id()) ?>").removeClass("d-none"); </script> diff --git a/resources/views/admin/import-progress.phtml b/resources/views/admin/import-progress.phtml index 357b53c653..54f54b21d0 100644 --- a/resources/views/admin/import-progress.phtml +++ b/resources/views/admin/import-progress.phtml @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<div class="progress" id="progress<?= e($tree->getTreeId()) ?>"> +<div class="progress" id="progress<?= e($tree->id()) ?>"> <div class="progress-bar" role="progressbar" @@ -14,6 +14,6 @@ </div> <script> - $("#import<?= e($tree->getTreeId()) ?>") + $("#import<?= e($tree->id()) ?>") .load("<?= route('import', ['ged' => $tree->getName()]) ?>", {}); </script> diff --git a/resources/views/admin/module-components.phtml b/resources/views/admin/module-components.phtml index c043c2eaed..a9bbaee30e 100644 --- a/resources/views/admin/module-components.phtml +++ b/resources/views/admin/module-components.phtml @@ -44,7 +44,7 @@ <?= e($tree->getTitle()) ?> </td> <td> - <?= Bootstrap4::select(FunctionsEdit::optionsAccessLevels(), $module->getAccessLevel($tree, $component), ['name' => 'access-' . $module->getName() . '-' . $tree->getTreeId()]) ?> + <?= Bootstrap4::select(FunctionsEdit::optionsAccessLevels(), $module->getAccessLevel($tree, $component), ['name' => 'access-' . $module->getName() . '-' . $tree->id()]) ?> </td> </tr> <?php endforeach ?> diff --git a/resources/views/admin/trees.phtml b/resources/views/admin/trees.phtml index c9fb5860b4..bc2643d551 100644 --- a/resources/views/admin/trees.phtml +++ b/resources/views/admin/trees.phtml @@ -20,30 +20,30 @@ <?php foreach ($all_trees as $managed_tree) : ?> <?php if (Auth::isManager($managed_tree)) : ?> <div class="card"> - <div class="card-header" role="tab" id="card-tree-header-<?= $managed_tree->getTreeId() ?>"> + <div class="card-header" role="tab" id="card-tree-header-<?= $managed_tree->id() ?>"> <h2 class="mb-0"> <?= view('icons/tree') ?> - <a data-toggle="collapse" data-parent="#accordion" href="#card-tree-content-<?= $managed_tree->getTreeId() ?>" <?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? 'aria-expanded="true"' : '' ?> aria-controls="card-tree-content-<?= $managed_tree->getTreeId() ?>"> + <a data-toggle="collapse" data-parent="#accordion" href="#card-tree-content-<?= $managed_tree->id() ?>" <?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? 'aria-expanded="true"' : '' ?> aria-controls="card-tree-content-<?= $managed_tree->id() ?>"> <?= e($managed_tree->getName()) ?> — <?= e($managed_tree->getTitle()) ?> </a> </h2> </div> - <div id="card-tree-content-<?= $managed_tree->getTreeId() ?>" class="collapse<?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $managed_tree->getTreeId() ?>"> + <div id="card-tree-content-<?= $managed_tree->id() ?>" class="collapse<?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $managed_tree->id() ?>"> <div class="card-body"> - <?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1")->execute([$managed_tree->getTreeId()])->fetchOne() ?> + <?php $importing = Database::prepare("SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1")->execute([$managed_tree->id()])->fetchOne() ?> <?php if ($importing) : ?> - <div id="import<?= $managed_tree->getTreeId() ?>" class="col-xs-12"> + <div id="import<?= $managed_tree->id() ?>" class="col-xs-12"> <div class="progress"> <?= I18N::translate('Calculating…') ?> </div> </div> <?php View::push('javascript'); ?> <script> - $("#import<?= $managed_tree->getTreeId() ?>").load("<?= route('import', ['ged' => $managed_tree->getName()]) ?>", {}); + $("#import<?= $managed_tree->id() ?>").load("<?= route('import', ['ged' => $managed_tree->getName()]) ?>", {}); </script> <?php View::endpush() ?> <?php endif ?> - <div class="row<?= $importing ? ' d-none' : '' ?>" id="actions<?= $managed_tree->getTreeId() ?>"> + <div class="row<?= $importing ? ' d-none' : '' ?>" id="actions<?= $managed_tree->id() ?>"> <div class="col-sm-6 col-md-3"> <h3> <a href="<?= e(route('tree-page', ['ged' => $managed_tree->getName()])) ?>"> @@ -84,13 +84,13 @@ <!-- DELETE --> <li> <span class="fa-li"><?= view('icons/delete') ?></span> - <a href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->getTitle())) ?>" onclick="if (confirm(this.dataset.confirm)) { document.delete_form<?= $managed_tree->getTreeId() ?>.submit(); } return false;"> + <a href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->getTitle())) ?>" onclick="if (confirm(this.dataset.confirm)) { document.delete_form<?= $managed_tree->id() ?>.submit(); } return false;"> <?= I18N::translate('Delete') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> </span> </a> - <form name="delete_form<?= $managed_tree->getTreeId() ?>" method="post" action="<?= route('admin-trees-delete', ['ged' => $managed_tree->getName()]) ?>"> + <form name="delete_form<?= $managed_tree->id() ?>" method="post" action="<?= route('admin-trees-delete', ['ged' => $managed_tree->getName()]) ?>"> <?= csrf_field() ?> <!-- A11Y - forms need submit buttons, but they look ugly here --> <button class="sr-only" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->getTitle())) ?>" onclick="return confirm(this.dataset.confirm)" type="submit"> @@ -105,11 +105,11 @@ <?php if ($managed_tree->getName() === Site::getPreference('DEFAULT_GEDCOM')) : ?> <?= I18N::translate('Default family tree') ?> <?php else : ?> - <a href="#" onclick="document.defaultform<?= $managed_tree->getTreeId() ?>.submit();"> + <a href="#" onclick="document.defaultform<?= $managed_tree->id() ?>.submit();"> <?= I18N::translate('Set as default') ?> <span class="sr-only"><?= e($managed_tree->getTitle()) ?></span> </a> - <form name="defaultform<?= $managed_tree->getTreeId() ?>" method="post" action="<?= route('admin-trees-default', ['ged' => $managed_tree->getName()]) ?>"> + <form name="defaultform<?= $managed_tree->id() ?>" method="post" action="<?= route('admin-trees-default', ['ged' => $managed_tree->getName()]) ?>"> <?= csrf_field() ?> <!-- A11Y - forms need submit buttons, but they look ugly here --> <button class="sr-only" type="submit"> diff --git a/resources/views/admin/users-edit.phtml b/resources/views/admin/users-edit.phtml index 3d96379fb0..55000fcee0 100644 --- a/resources/views/admin/users-edit.phtml +++ b/resources/views/admin/users-edit.phtml @@ -313,7 +313,7 @@ <?= e($tree->getTitle()) ?> </td> <td> - <select class="form-control" name="canedit<?= $tree->getTreeId() ?>"> + <select class="form-control" name="canedit<?= $tree->id() ?>"> <?php foreach ($roles as $role => $description) : ?> <option value="<?= $role ?>" <?= $role === $tree->getUserPreference($user, 'canedit') ? 'selected' : '' ?>> @@ -323,10 +323,10 @@ </select> </td> <td> - <?= FunctionsEdit::formControlIndividual($tree, Individual::getInstance($tree->getUserPreference($user, 'gedcomid'), $tree), ['id' => 'gedcomid' . $tree->getTreeId(), 'name' => 'gedcomid' . $tree->getTreeId()]) ?> + <?= FunctionsEdit::formControlIndividual($tree, Individual::getInstance($tree->getUserPreference($user, 'gedcomid'), $tree), ['id' => 'gedcomid' . $tree->id(), 'name' => 'gedcomid' . $tree->id()]) ?> </td> <td> - <select class="form-control" name="RELATIONSHIP_PATH_LENGTH<?= $tree->getTreeId() ?>" id="RELATIONSHIP_PATH_LENGTH<?= $tree->getTreeId() ?>" class="relpath"> + <select class="form-control" name="RELATIONSHIP_PATH_LENGTH<?= $tree->id() ?>" id="RELATIONSHIP_PATH_LENGTH<?= $tree->id() ?>" class="relpath"> <?php for ($n = 0; $n <= 10; ++$n) : ?> <option value="<?= $n ?>" <?= $tree->getUserPreference($user, 'RELATIONSHIP_PATH_LENGTH') == $n ? 'selected' : '' ?>> <?= $n ?: I18N::translate('No') ?> diff --git a/resources/views/lists/media-table.phtml b/resources/views/lists/media-table.phtml index f49d76adc1..3831379758 100644 --- a/resources/views/lists/media-table.phtml +++ b/resources/views/lists/media-table.phtml @@ -7,13 +7,13 @@ // to process privacy for every record in the tree $count_individuals = Database::prepare( "SELECT l_to, COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); $count_families = Database::prepare( "SELECT l_to, COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); $count_sources = Database::prepare( "SELECT l_to, COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); ?> <table diff --git a/resources/views/lists/notes-table.phtml b/resources/views/lists/notes-table.phtml index b075831034..08f39d7b36 100644 --- a/resources/views/lists/notes-table.phtml +++ b/resources/views/lists/notes-table.phtml @@ -7,16 +7,16 @@ // to process privacy for every record in the tree $count_individuals = Database::prepare( "SELECT l_to, COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); $count_families = Database::prepare( "SELECT l_to, COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); $count_media = Database::prepare( "SELECT l_to, COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); $count_sources = Database::prepare( "SELECT l_to, COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); ?> <table diff --git a/resources/views/lists/repositories-table.phtml b/resources/views/lists/repositories-table.phtml index d721378911..21aacc911a 100644 --- a/resources/views/lists/repositories-table.phtml +++ b/resources/views/lists/repositories-table.phtml @@ -7,7 +7,7 @@ // to process privacy for every record in the tree $count_sources = Database::prepare( "SELECT l_to, COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'REPO' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); ?> <table diff --git a/resources/views/lists/sources-table.phtml b/resources/views/lists/sources-table.phtml index ba54733288..2961dbcbea 100644 --- a/resources/views/lists/sources-table.phtml +++ b/resources/views/lists/sources-table.phtml @@ -7,16 +7,16 @@ // to process privacy for every record in the tree $count_individuals = Database::prepare( "SELECT l_to, COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); $count_families = Database::prepare( "SELECT l_to, COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); $count_media = Database::prepare( "SELECT l_to, COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); $count_notes = Database::prepare( "SELECT l_to, COUNT(*) FROM `##other` JOIN `##link` ON l_from = o_id AND l_file = o_file AND o_type = 'NOTE' AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to" -)->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc(); +)->execute(['tree_id' => $tree->id()])->fetchAssoc(); ?> <table diff --git a/resources/views/modules/relationships_chart/config.phtml b/resources/views/modules/relationships_chart/config.phtml index 13c20ce21d..7519f9e367 100644 --- a/resources/views/modules/relationships_chart/config.phtml +++ b/resources/views/modules/relationships_chart/config.phtml @@ -13,12 +13,12 @@ <?php foreach ($all_trees as $tree) : ?> <h2><?= e($tree->getTitle()) ?></h2> <div class="row form-group"> - <label class="col-sm-3 col-form-label" for="relationship-ancestors-<?= $tree->getTreeId() ?>"> + <label class="col-sm-3 col-form-label" for="relationship-ancestors-<?= $tree->id() ?>"> <?= /* I18N: Configuration option */ I18N::translate('Relationships') ?> </label> <div class="col-sm-9"> - <?= Bootstrap4::select($ancestors_options, $tree->getPreference('RELATIONSHIP_ANCESTORS', $default_ancestors), ['id' => 'relationship-ancestors-' . $tree->getTreeId(), 'name' => 'relationship-ancestors-' . $tree->getTreeId()]) ?> + <?= Bootstrap4::select($ancestors_options, $tree->getPreference('RELATIONSHIP_ANCESTORS', $default_ancestors), ['id' => 'relationship-ancestors-' . $tree->id(), 'name' => 'relationship-ancestors-' . $tree->id()]) ?> </div> </div> @@ -29,7 +29,7 @@ I18N::translate('How much recursion to use when searching for relationships') ?> </legend> <div class="col-sm-9"> - <?= Bootstrap4::radioButtons('relationship-recursion-' . $tree->getTreeId(), $recursion_options, $tree->getPreference('RELATIONSHIP_RECURSION', $default_recursion), true) ?> + <?= Bootstrap4::radioButtons('relationship-recursion-' . $tree->id(), $recursion_options, $tree->getPreference('RELATIONSHIP_RECURSION', $default_recursion), true) ?> </div> </div> </fieldset> diff --git a/resources/views/modules/sitemap/config.phtml b/resources/views/modules/sitemap/config.phtml index 5f3f12e255..6e509ae665 100644 --- a/resources/views/modules/sitemap/config.phtml +++ b/resources/views/modules/sitemap/config.phtml @@ -17,7 +17,7 @@ <?= csrf_field() ?> <?php foreach ($all_trees as $tree) : ?> - <?= Bootstrap4::checkbox($tree->getTitle(), false, ['name' => 'sitemap' . $tree->getTreeId(), 'checked' => (bool) $tree->getPreference('include_in_sitemap')]) ?> + <?= Bootstrap4::checkbox($tree->getTitle(), false, ['name' => 'sitemap' . $tree->id(), 'checked' => (bool) $tree->getPreference('include_in_sitemap')]) ?> <?php endforeach ?> <button type="submit" class="btn btn-primary"> |