diff options
198 files changed, 545 insertions, 545 deletions
diff --git a/app/Date/AbstractCalendarDate.php b/app/Date/AbstractCalendarDate.php index 3fd5237cb3..8443f9628f 100644 --- a/app/Date/AbstractCalendarDate.php +++ b/app/Date/AbstractCalendarDate.php @@ -985,7 +985,7 @@ abstract class AbstractCalendarDate 'month' => $this->formatGedcomMonth(), 'day' => $this->formatGedcomDay(), 'view' => $view, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } } diff --git a/app/Functions/FunctionsCharts.php b/app/Functions/FunctionsCharts.php index fc174aafe2..ea153cd5a1 100644 --- a/app/Functions/FunctionsCharts.php +++ b/app/Functions/FunctionsCharts.php @@ -329,17 +329,17 @@ class FunctionsCharts echo '<br>'; echo '<a href="' . e(route('add-child-to-family', [ 'gender' => 'U', - 'ged' => $family->getTree()->getName(), + 'ged' => $family->getTree()->name(), 'xref' => $family->getXref(), ])) . '">' . I18N::translate('Add a child to this family') . '</a>'; echo ' <a class="icon-sex_m_15x15" href="' . e(route('add-child-to-family', [ 'gender' => 'M', - 'ged' => $family->getTree()->getName(), + 'ged' => $family->getTree()->name(), 'xref' => $family->getXref(), ])) . '" title="', I18N::translate('son'), '"></a>'; echo ' <a class="icon-sex_f_15x15" href="' . e(route('add-child-to-family', [ 'gender' => 'F', - 'ged' => $family->getTree()->getName(), + 'ged' => $family->getTree()->name(), 'xref' => $family->getXref(), ])) . '" title="', I18N::translate('daughter'), '"></a>'; echo '<br><br>'; diff --git a/app/Functions/FunctionsEdit.php b/app/Functions/FunctionsEdit.php index 9be5eec64a..73e1aa37db 100644 --- a/app/Functions/FunctionsEdit.php +++ b/app/Functions/FunctionsEdit.php @@ -687,7 +687,7 @@ class FunctionsEdit $html .= '<div class="input-group">' . '<span class="input-group-btn">' . - '<button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#wt-ajax-modal" data-href="' . e(route('create-note-object', ['ged' => $tree->getName()])) . '" data-select-id="' . $id . '" title="' . I18N::translate('Create a shared note') . '">' . + '<button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#wt-ajax-modal" data-href="' . e(route('create-note-object', ['ged' => $tree->name()])) . '" data-select-id="' . $id . '" title="' . I18N::translate('Create a shared note') . '">' . '' . view('icons/add') . '<' . '/button>' . '</span>' . @@ -699,7 +699,7 @@ class FunctionsEdit } elseif ($fact === 'OBJE') { $html .= '<div class="input-group">' . - '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-media-object', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a media object') . '">' . view('icons/add') . '</button></span>' . + '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-media-object', ['ged' => $tree->name()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a media object') . '">' . view('icons/add') . '</button></span>' . self::formControlMediaObject($tree, Media::getInstance($value, $tree), [ 'id' => $id, 'name' => $name, @@ -722,7 +722,7 @@ class FunctionsEdit 'value' => $value, 'type' => 'text', 'data-autocomplete-url' => route('autocomplete-place', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'query' => 'QUERY', ]), ]) . '>'; @@ -744,7 +744,7 @@ class FunctionsEdit } elseif ($fact === 'REPO') { $html .= '<div class="input-group">' . - '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-repository', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a repository') . '">' . view('icons/add') . '</button></span>' . + '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-repository', ['ged' => $tree->name()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a repository') . '">' . view('icons/add') . '</button></span>' . self::formControlRepository($tree, Repository::getInstance($value, $tree), [ 'id' => $id, 'name' => $name, @@ -771,7 +771,7 @@ class FunctionsEdit } elseif ($fact === 'SOUR') { $html .= '<div class="input-group">' . - '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-source', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a source') . '">' . view('icons/add') . '</button></span>' . + '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-source', ['ged' => $tree->name()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a source') . '">' . view('icons/add') . '</button></span>' . self::formControlSource($tree, Source::getInstance($value, $tree), [ 'id' => $id, 'name' => $name, @@ -782,7 +782,7 @@ class FunctionsEdit } elseif ($fact === 'SUBM') { $html .= '<div class="input-group">' . - '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-submitter', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a submitter') . '">' . view('icons/add') . '</button></span>' . + '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-submitter', ['ged' => $tree->name()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a submitter') . '">' . view('icons/add') . '</button></span>' . self::formControlSubmitter($tree, GedcomRecord::getInstance($value, $tree), [ 'id' => $id, 'name' => $name, diff --git a/app/Functions/FunctionsExport.php b/app/Functions/FunctionsExport.php index c2dafe67f9..2237f139da 100644 --- a/app/Functions/FunctionsExport.php +++ b/app/Functions/FunctionsExport.php @@ -92,7 +92,7 @@ class FunctionsExport $DATE = "\n1 DATE " . strtoupper(date('d M Y')) . "\n2 TIME " . date('H:i:s'); $GEDC = "\n1 GEDC\n2 VERS 5.5.1\n2 FORM Lineage-Linked"; $CHAR = "\n1 CHAR " . $char; - $FILE = "\n1 FILE " . $tree->getName(); + $FILE = "\n1 FILE " . $tree->name(); $LANG = ''; $COPR = ''; $SUBN = ''; diff --git a/app/Functions/FunctionsPrint.php b/app/Functions/FunctionsPrint.php index 5ac4c951b4..0d585a439a 100644 --- a/app/Functions/FunctionsPrint.php +++ b/app/Functions/FunctionsPrint.php @@ -509,7 +509,7 @@ class FunctionsPrint if (!$newRow) { echo '</select>'; /* I18N: A button label. */ - echo ' <input type="button" value="', I18N::translate('add'), '" onclick="return paste_fact(\'' . e($tree->getName()) . '\',\'' . e($record->getXref()) . '\', \'#newClipboardFact\');"> '; + echo ' <input type="button" value="', I18N::translate('add'), '" onclick="return paste_fact(\'' . e($tree->name()) . '\',\'' . e($record->getXref()) . '\', \'#newClipboardFact\');"> '; echo '</form></td></tr>', "\n"; } } @@ -565,7 +565,7 @@ class FunctionsPrint echo '<form onsubmit="if ($("#add-fact").val() === null) {event.preventDefault();}">'; echo '<input type="hidden" name="route" value="add-fact">'; echo '<input type="hidden" name="xref" value="' . e($record->getXref()) . '">'; - echo '<input type="hidden" name="ged" value="' . e($tree->getName()) . '">'; + echo '<input type="hidden" name="ged" value="' . e($tree->name()) . '">'; echo '<select id="add-fact" name="fact">'; echo '<option value="" disabled selected>' . I18N::translate('<select>') . '</option>'; foreach ($translated_addfacts as $fact => $fact_name) { @@ -584,7 +584,7 @@ class FunctionsPrint echo '<a href="' . e(route('add-fact', [ 'fact' => $fact, 'xref' => $record->getXref(), - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ])) . '">', GedcomTag::getLabel($fact), '</a>'; } echo '</span>'; diff --git a/app/Functions/FunctionsPrintFacts.php b/app/Functions/FunctionsPrintFacts.php index 6fb324d88a..088462b117 100644 --- a/app/Functions/FunctionsPrintFacts.php +++ b/app/Functions/FunctionsPrintFacts.php @@ -202,19 +202,19 @@ class FunctionsPrintFacts 'href' => route('edit-fact', [ 'xref' => $parent->getXref(), 'fact_id' => $fact->id(), - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]), ]) ?> <?= FontAwesome::linkIcon('copy', I18N::translate('Copy'), [ 'class' => 'btn btn-link', 'href' => '#', - 'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', + 'onclick' => 'return copy_fact("' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', ]) ?> <?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), [ 'class' => 'btn btn-link', 'data-confirm' => I18N::translate('Are you sure you want to delete this fact?'), 'href' => '#', - 'onclick' => 'return delete_fact(this.dataset.confirm, "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', + 'onclick' => 'return delete_fact(this.dataset.confirm, "' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', ]) ?> </div> <?php @@ -541,7 +541,7 @@ class FunctionsPrintFacts $values[] = '<a href="' . e(route('relationships', [ 'xref1' => $associate->getXref(), 'xref2' => $person->getXref(), - 'ged' => $person->getTree()->getName(), + 'ged' => $person->getTree()->name(), ])) . '" rel="nofollow">' . $relationship_name . '</a>'; } $value = implode(' — ', $values); @@ -780,7 +780,7 @@ class FunctionsPrintFacts echo '<a href="' . e(route('edit-fact', [ 'xref' => $parent->getXref(), 'fact_id' => $fact->id(), - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ])) . '" title="', I18N::translate('Edit'), '">'; if ($tree->getPreference('SHOW_FACT_ICONS')) { if ($level == 1) { @@ -798,20 +798,20 @@ class FunctionsPrintFacts 'href' => route('edit-fact', [ 'xref' => $parent->getXref(), 'fact_id' => $fact->id(), - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]), ]); echo FontAwesome::linkIcon('copy', I18N::translate('Copy'), [ 'class' => 'btn btn-link', 'href' => '#', - 'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', + 'onclick' => 'return copy_fact("' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', ]); } echo FontAwesome::linkIcon('delete', I18N::translate('Delete'), [ 'class' => 'btn btn-link', 'data-confirm' => I18N::translate('Are you sure you want to delete this fact?'), 'href' => '#', - 'onclick' => 'return delete_fact(this.dataset.confirm, "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', + 'onclick' => 'return delete_fact(this.dataset.confirm, "' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', ]); } else { echo GedcomTag::getLabel($factname, $parent); @@ -1023,19 +1023,19 @@ class FunctionsPrintFacts 'href' => route('edit-fact', [ 'xref' => $parent->getXref(), 'fact_id' => $fact->id(), - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]), ]); echo FontAwesome::linkIcon('copy', I18N::translate('Copy'), [ 'class' => 'btn btn-link', 'href' => '#', - 'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', + 'onclick' => 'return copy_fact("' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', ]); echo FontAwesome::linkIcon('delete', I18N::translate('Delete'), [ 'class' => 'btn btn-link', 'data-confirm' => I18N::translate('Are you sure you want to delete this fact?'), 'href' => '#', - 'onclick' => 'return delete_fact(this.dataset.confirm, "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', + 'onclick' => 'return delete_fact(this.dataset.confirm, "' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', ]); echo '</div>'; } @@ -1173,13 +1173,13 @@ class FunctionsPrintFacts echo FontAwesome::linkIcon('copy', I18N::translate('Copy'), [ 'class' => 'btn btn-link', 'href' => '#', - 'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', + 'onclick' => 'return copy_fact("' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', ]); echo FontAwesome::linkIcon('delete', I18N::translate('Delete'), [ 'class' => 'btn btn-link', 'data-confirm' => I18N::translate('Are you sure you want to delete this fact?'), 'href' => '#', - 'onclick' => 'return delete_fact(this.dataset.confirm", "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', + 'onclick' => 'return delete_fact(this.dataset.confirm", "' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");', ]); echo '</div>'; } else { diff --git a/app/Functions/FunctionsPrintLists.php b/app/Functions/FunctionsPrintLists.php index 2af96ea0d2..468bb67444 100644 --- a/app/Functions/FunctionsPrintLists.php +++ b/app/Functions/FunctionsPrintLists.php @@ -57,7 +57,7 @@ class FunctionsPrintLists } $url = route($route, [ 'surname' => $surn, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); $html .= '<a style="font-size:' . $size . '%" href="' . e($url) . '">'; if ($totals) { @@ -91,12 +91,12 @@ class FunctionsPrintLists if ($surn) { $url = route($route, [ 'surname' => $surn, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $url = route($route, [ 'alpha' => ',', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } // If all the surnames are just case variants, then merge them into one diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php index 4aa975fbf2..a95a87d0eb 100644 --- a/app/GedcomRecord.php +++ b/app/GedcomRecord.php @@ -362,7 +362,7 @@ class GedcomRecord { return route(static::ROUTE_NAME, [ 'xref' => $this->getXref(), - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), ]); } diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 9c7acc32f1..35994b7d10 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -132,7 +132,7 @@ class AccountController extends AbstractBaseController // Switch to the new language now Session::put('locale', $language); - return new RedirectResponse(route('my-account', ['ged' => $tree->getName()])); + return new RedirectResponse(route('my-account', ['ged' => $tree->name()])); } /** diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 111d7f4cc9..711cfd52f7 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -155,7 +155,7 @@ class AdminController extends AbstractBaseController $tree_list = []; foreach (Tree::getAll() as $tree) { if (Auth::isManager($tree)) { - $tree_list[$tree->getName()] = $tree->getTitle(); + $tree_list[$tree->name()] = $tree->getTitle(); } } @@ -521,7 +521,7 @@ class AdminController extends AbstractBaseController }, $facts); return [ - $tree->getName(), + $tree->name(), $media->displayImage(100, 100, 'fit', ['class' => 'img-thumbnail']), '<a href="' . e($media->url()) . '">' . $media->getFullName() . '</a>', '<a href="' . e($individual->url()) . '">' . $individual->getFullName() . '</a>', @@ -929,7 +929,7 @@ class AdminController extends AbstractBaseController $record2_name ), 'success'); - return new RedirectResponse(route('merge-records', ['ged' => $tree->getName()])); + return new RedirectResponse(route('merge-records', ['ged' => $tree->name()])); } /** @@ -997,7 +997,7 @@ class AdminController extends AbstractBaseController */ public function treePrivacyEdit(Tree $tree): Response { - $title = e($tree->getName()) . ' — ' . I18N::translate('Privacy'); + $title = e($tree->name()) . ' — ' . I18N::translate('Privacy'); $all_tags = $this->tagsForPrivacy($tree); $privacy_constants = $this->privacyConstants(); $privacy_restrictions = $this->privacyRestrictions($tree); @@ -1087,7 +1087,7 @@ class AdminController extends AbstractBaseController } - return new RedirectResponse(route('admin-trees', ['ged' => $tree->getName()])); + return new RedirectResponse(route('admin-trees', ['ged' => $tree->name()])); } /** diff --git a/app/Http/Controllers/AdminTreesController.php b/app/Http/Controllers/AdminTreesController.php index ee220396a2..dd3d4007de 100644 --- a/app/Http/Controllers/AdminTreesController.php +++ b/app/Http/Controllers/AdminTreesController.php @@ -300,7 +300,7 @@ class AdminTreesController extends AbstractBaseController { return '<b><a href="' . e(route('record', [ 'xref' => $xref, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ])) . '">' . $xref . '</a></b>'; } @@ -333,10 +333,10 @@ class AdminTreesController extends AbstractBaseController FlashMessages::addMessage(I18N::translate('The family tree “%s” already exists.', e($tree_name)), 'danger'); } else { $tree = Tree::create($tree_name, $tree_title); - FlashMessages::addMessage(I18N::translate('The family tree “%s” has been created.', e($tree->getName())), 'success'); + FlashMessages::addMessage(I18N::translate('The family tree “%s” has been created.', e($tree->name())), 'success'); } - $url = route('admin-trees', ['ged' => $tree->getName()]); + $url = route('admin-trees', ['ged' => $tree->name()]); return new RedirectResponse($url); } @@ -417,7 +417,7 @@ class AdminTreesController extends AbstractBaseController $encoding = $convert ? 'ANSI' : 'UTF-8'; // What to call the downloaded file - $download_filename = $tree->getName(); + $download_filename = $tree->name(); if (strtolower(substr($download_filename, -4, 4)) != '.ged') { $download_filename .= '.ged'; } @@ -494,7 +494,7 @@ class AdminTreesController extends AbstractBaseController */ public function exportServer(Tree $tree): RedirectResponse { - $filename = WT_DATA_DIR . $tree->getName(); + $filename = WT_DATA_DIR . $tree->name(); // Force a ".ged" suffix if (strtolower(substr($filename, -4)) != '.ged') { @@ -520,7 +520,7 @@ class AdminTreesController extends AbstractBaseController } $url = route('admin-trees', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); @@ -567,7 +567,7 @@ class AdminTreesController extends AbstractBaseController } } - $url = route('admin-trees', ['ged' => $tree->getName()]); + $url = route('admin-trees', ['ged' => $tree->name()]); return new RedirectResponse($url); } @@ -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->id() === $x->id() || $x->getName() === Site::getPreference('DEFAULT_GEDCOM'); + return $x->getPreference('imported') === '0' || $tree->id() === $x->id() || $x->name() === Site::getPreference('DEFAULT_GEDCOM'); }); } @@ -786,12 +786,12 @@ class AdminTreesController extends AbstractBaseController FlashMessages::addMessage(I18N::translate('The family trees have been merged successfully.'), 'success'); $url = route('admin-trees', [ - 'ged' => $tree2->getName(), + 'ged' => $tree2->name(), ]); } else { $url = route('admin-trees-merge', [ - 'tree1_name' => $tree1->getName(), - 'tree2_name' => $tree2->getName(), + 'tree1_name' => $tree1->name(), + 'tree2_name' => $tree2->name(), ]); } @@ -848,7 +848,7 @@ class AdminTreesController extends AbstractBaseController FlashMessages::addMessage($feedback, 'success'); $url = route('admin-trees-places', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'replace' => $replace, 'search' => $search, ]); @@ -1097,7 +1097,7 @@ class AdminTreesController extends AbstractBaseController } $gedcom = $request->get('gedcom'); - if ($gedcom && $gedcom !== $tree->getName()) { + if ($gedcom && $gedcom !== $tree->name()) { try { Database::prepare("UPDATE `##gedcom` SET gedcom_name = ? WHERE gedcom_id = ?")->execute([ $gedcom, @@ -1105,7 +1105,7 @@ class AdminTreesController extends AbstractBaseController ]); Database::prepare("UPDATE `##site_setting` SET setting_value = ? WHERE setting_name='DEFAULT_GEDCOM' AND setting_value = ?")->execute([ $gedcom, - $tree->getName(), + $tree->name(), ]); } catch (\Exception $ex) { DebugBar::addThrowable($ex); @@ -1116,7 +1116,7 @@ class AdminTreesController extends AbstractBaseController FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', e($tree->getTitle())), 'success'); - $url = route('admin-trees', ['ged' => $tree->getName()]); + $url = route('admin-trees', ['ged' => $tree->name()]); return new RedirectResponse($url); } @@ -1547,7 +1547,7 @@ class AdminTreesController extends AbstractBaseController } } - $url = route('admin-trees-renumber', ['ged' => $tree->getName()]); + $url = route('admin-trees-renumber', ['ged' => $tree->name()]); return new RedirectResponse($url); } @@ -1559,7 +1559,7 @@ class AdminTreesController extends AbstractBaseController */ public function setDefault(Tree $tree): RedirectResponse { - Site::setPreference('DEFAULT_GEDCOM', $tree->getName()); + Site::setPreference('DEFAULT_GEDCOM', $tree->name()); /* I18N: %s is the name of a family tree */ FlashMessages::addMessage(I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', e($tree->getTitle())), 'success'); @@ -1576,7 +1576,7 @@ class AdminTreesController extends AbstractBaseController */ public function synchronize(Tree $tree): RedirectResponse { - $url = route('admin-trees', ['ged' => $tree->getName()]); + $url = route('admin-trees', ['ged' => $tree->name()]); $gedcom_files = $this->gedcomFiles(WT_DATA_DIR); @@ -1595,7 +1595,7 @@ class AdminTreesController extends AbstractBaseController } foreach (Tree::getAll() as $tree) { - if (!in_array($tree->getName(), $gedcom_files)) { + if (!in_array($tree->name(), $gedcom_files)) { FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', e($tree->getTitle())), 'success'); $tree->delete(); } diff --git a/app/Http/Controllers/AdminUpgradeController.php b/app/Http/Controllers/AdminUpgradeController.php index ddc38f4dc5..80dcd1db23 100644 --- a/app/Http/Controllers/AdminUpgradeController.php +++ b/app/Http/Controllers/AdminUpgradeController.php @@ -144,7 +144,7 @@ class AdminUpgradeController extends AbstractBaseController foreach (Tree::getAll() as $tree) { $route = route('upgrade', [ 'step' => 'Export', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); $export_steps[$route] = I18N::translate('Export all the family trees to GEDCOM files…') . ' ' . e($tree->getTitle()); @@ -204,7 +204,7 @@ class AdminUpgradeController extends AbstractBaseController */ private function wizardStepExport(Tree $tree): Response { - $filename = WT_DATA_DIR . $tree->getName() . date('-Y-m-d') . '.ged'; + $filename = WT_DATA_DIR . $tree->name() . date('-Y-m-d') . '.ged'; try { $stream = fopen($filename, 'w'); diff --git a/app/Http/Controllers/AncestorsChartController.php b/app/Http/Controllers/AncestorsChartController.php index 4cd1295089..50f2acc222 100644 --- a/app/Http/Controllers/AncestorsChartController.php +++ b/app/Http/Controllers/AncestorsChartController.php @@ -179,7 +179,7 @@ class AncestorsChartController extends AbstractChartController echo '</td><td>'; if ($sosa > 1) { echo FontAwesome::linkIcon('arrow-down', I18N::translate('Ancestors of %s', $individual->getFullName()), ['href' => route('ancestors', ['xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => self::CHART_STYLE_LIST, ]), diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index a446a323b2..715e1d94ed 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -51,7 +51,7 @@ class LoginController extends AbstractBaseController { // Already logged in? if (Auth::check()) { - $ged = $tree !== null ? $tree->getName() : ''; + $ged = $tree !== null ? $tree->name() : ''; return new RedirectResponse(route('user-page', ['ged' => $ged])); } @@ -207,6 +207,6 @@ class LoginController extends AbstractBaseController return new RedirectResponse(route('tree-page')); } - return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()])); + return new RedirectResponse(route('tree-page', ['ged' => $tree->name()])); } } diff --git a/app/Http/Controllers/BranchesController.php b/app/Http/Controllers/BranchesController.php index 00c71be415..cd75864c3a 100644 --- a/app/Http/Controllers/BranchesController.php +++ b/app/Http/Controllers/BranchesController.php @@ -261,7 +261,7 @@ class BranchesController extends AbstractBaseController $sosa_html = ' <a class="details1 ' . $individual->getBoxStyle() . '" title="' . I18N::translate('Sosa') . '" href="' . e(route('relationships', [ 'xref1' => $individual->getXref(), 'xref2' => $ancestors[1]->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ])) . '" rel="nofollow">' . $sosa . '</a>' . self::sosaGeneration($sosa); } else { $sosa_class = ''; @@ -300,7 +300,7 @@ class BranchesController extends AbstractBaseController $sosa_class = 'search_hit'; $sosa_html = ' <a class="details1 ' . $spouse->getBoxStyle() . '" title="' . I18N::translate('Sosa') . '" href="' . e(route('relationships', [ 'xref2' => $ancestors[1]->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ])) . '" rel="nofollow"> ' . $sosa . ' </a>' . self::sosaGeneration($sosa); } else { $sosa_class = ''; diff --git a/app/Http/Controllers/DescendantsChartController.php b/app/Http/Controllers/DescendantsChartController.php index e8afc9797c..0745c0ba60 100644 --- a/app/Http/Controllers/DescendantsChartController.php +++ b/app/Http/Controllers/DescendantsChartController.php @@ -188,7 +188,7 @@ class DescendantsChartController extends AbstractChartController echo '<td>'; foreach ($person->getChildFamilies() as $cfamily) { foreach ($cfamily->getSpouses() as $parent) { - echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->getTree()->getName(), + echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->getTree()->name(), 'xref' => $parent->getXref(), 'generations' => $generations, ]), @@ -271,7 +271,7 @@ class DescendantsChartController extends AbstractChartController if ($spouse) { foreach ($spouse->getChildFamilies() as $cfamily) { foreach ($cfamily->getSpouses() as $parent) { - echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->getTree()->getName(), + echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->getTree()->name(), 'xref' => $parent->getXref(), 'generations' => $generations, ]), diff --git a/app/Http/Controllers/EditIndividualController.php b/app/Http/Controllers/EditIndividualController.php index a5b5fc9147..36b6b9575d 100644 --- a/app/Http/Controllers/EditIndividualController.php +++ b/app/Http/Controllers/EditIndividualController.php @@ -565,7 +565,7 @@ class EditIndividualController extends AbstractEditController return new RedirectResponse($new_indi->url()); } - return new RedirectResponse(route('admin-trees', ['ged' => $tree->getName()])); + return new RedirectResponse(route('admin-trees', ['ged' => $tree->name()])); } /** diff --git a/app/Http/Controllers/EditMediaController.php b/app/Http/Controllers/EditMediaController.php index 355119d35d..32c502e39e 100644 --- a/app/Http/Controllers/EditMediaController.php +++ b/app/Http/Controllers/EditMediaController.php @@ -102,7 +102,7 @@ class EditMediaController extends AbstractEditController $title = trim(preg_replace('/\s+/', ' ', $title)); if ($media === null || $media->isPendingDeletion() || !$media->canEdit()) { - return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()])); + return new RedirectResponse(route('tree-page', ['ged' => $tree->name()])); } $file = $this->uploadFile($request, $tree); @@ -192,7 +192,7 @@ class EditMediaController extends AbstractEditController // Media object oes not exist? Media object is read-only? if ($media === null || $media->isPendingDeletion() || !$media->canEdit()) { - return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()])); + return new RedirectResponse(route('tree-page', ['ged' => $tree->name()])); } // Find the fact we are editing. @@ -205,7 +205,7 @@ class EditMediaController extends AbstractEditController // Media file does not exist? if ($media_file === null) { - return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()])); + return new RedirectResponse(route('tree-page', ['ged' => $tree->name()])); } // We can edit the file as either a URL or a folder/file diff --git a/app/Http/Controllers/ErrorController.php b/app/Http/Controllers/ErrorController.php index b48de5aab9..10e2cfb6e9 100644 --- a/app/Http/Controllers/ErrorController.php +++ b/app/Http/Controllers/ErrorController.php @@ -45,7 +45,7 @@ class ErrorController extends AbstractBaseController { // The tree exists, we have access to it, and it is fully imported. if ($tree instanceof Tree && $tree->getPreference('imported') === '1') { - return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()])); + return new RedirectResponse(route('tree-page', ['ged' => $tree->name()])); } // Not logged in? diff --git a/app/Http/Controllers/HomePageController.php b/app/Http/Controllers/HomePageController.php index 5976d1ec46..aa4deda588 100644 --- a/app/Http/Controllers/HomePageController.php +++ b/app/Http/Controllers/HomePageController.php @@ -54,7 +54,7 @@ class HomePageController extends AbstractBaseController return $this->viewResponse('modules/edit-block-config', [ 'block' => $block, 'block_id' => $block_id, - 'cancel_url' => route('tree-page', ['ged' => $tree->getName()]), + 'cancel_url' => route('tree-page', ['ged' => $tree->name()]), 'title' => $title, 'tree' => $tree, ]); @@ -76,7 +76,7 @@ class HomePageController extends AbstractBaseController $block->saveBlockConfiguration($request, $block_id); - return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()])); + return new RedirectResponse(route('tree-page', ['ged' => $tree->name()])); } /** @@ -132,7 +132,7 @@ class HomePageController extends AbstractBaseController return $this->viewResponse('modules/edit-block-config', [ 'block' => $block, 'block_id' => $block_id, - 'cancel_url' => route('user-page', ['ged' => $tree->getName()]), + 'cancel_url' => route('user-page', ['ged' => $tree->name()]), 'title' => $title, 'tree' => $tree, ]); @@ -154,7 +154,7 @@ class HomePageController extends AbstractBaseController $block->saveBlockConfiguration($request, $block_id); - return new RedirectResponse(route('user-page', ['ged' => $tree->getName()])); + return new RedirectResponse(route('user-page', ['ged' => $tree->name()])); } /** @@ -316,8 +316,8 @@ class HomePageController extends AbstractBaseController $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()]); - $url_save = route('tree-page-update', ['ged' => $tree->getName()]); + $url_cancel = route('tree-page', ['ged' => $tree->name()]); + $url_save = route('tree-page-update', ['ged' => $tree->name()]); return $this->viewResponse('edit-blocks-page', [ 'all_blocks' => $all_blocks, @@ -352,7 +352,7 @@ class HomePageController extends AbstractBaseController $this->updateTreeBlocks($tree->id(), $main_blocks, $side_blocks); - return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()])); + return new RedirectResponse(route('tree-page', ['ged' => $tree->name()])); } /** @@ -479,8 +479,8 @@ class HomePageController extends AbstractBaseController $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()]); - $url_save = route('user-page-update', ['ged' => $tree->getName()]); + $url_cancel = route('user-page', ['ged' => $tree->name()]); + $url_save = route('user-page-update', ['ged' => $tree->name()]); return $this->viewResponse('edit-blocks-page', [ 'all_blocks' => $all_blocks, @@ -516,7 +516,7 @@ class HomePageController extends AbstractBaseController $this->updateUserBlocks($user->getUserId(), $main_blocks, $side_blocks); - return new RedirectResponse(route('user-page', ['ged' => $tree->getName()])); + return new RedirectResponse(route('user-page', ['ged' => $tree->name()])); } /** diff --git a/app/Http/Controllers/HourglassChartController.php b/app/Http/Controllers/HourglassChartController.php index 3b93a6675e..f2ef8efc08 100644 --- a/app/Http/Controllers/HourglassChartController.php +++ b/app/Http/Controllers/HourglassChartController.php @@ -261,7 +261,7 @@ class HourglassChartController extends AbstractChartController 'data-route' => 'hourglass-add-desc', 'data-xref' => $pid, 'data-spouses' => $show_spouse, - 'data-tree' => $individual->getTree()->getName(), + 'data-tree' => $individual->getTree()->name(), ]); //-- move the arrow up to line up with the correct box @@ -308,7 +308,7 @@ class HourglassChartController extends AbstractChartController 'xref' => $spouse->getXref(), 'generations' => $generations, 'show_spouse' => (int) $show_spouse, - 'ged' => $spouse->getTree()->getName(), + 'ged' => $spouse->getTree()->name(), ])) . '" class="name1">' . $spouse->getFullName() . '</a>'; } foreach ($family->getChildren() as $child) { @@ -316,7 +316,7 @@ class HourglassChartController extends AbstractChartController 'xref' => $child->getXref(), 'generations' => $generations, 'show_spouse' => (int) $show_spouse, - 'ged' => $child->getTree()->getName(), + 'ged' => $child->getTree()->name(), ])) . '" class="name1">' . $child->getFullName() . '</a>'; } } @@ -331,7 +331,7 @@ class HourglassChartController extends AbstractChartController 'xref' => $husb->getXref(), 'generations' => $generations, 'show_spouse' => (int) $show_spouse, - 'ged' => $husb->getTree()->getName(), + 'ged' => $husb->getTree()->name(), ])) . '" class="name1">' . $husb->getFullName() . '</a>'; } $wife = $family->getWife(); @@ -340,7 +340,7 @@ class HourglassChartController extends AbstractChartController 'xref' => $wife->getXref(), 'generations' => $generations, 'show_spouse' => (int) $show_spouse, - 'ged' => $wife->getTree()->getName(), + 'ged' => $wife->getTree()->name(), ])) . '" class="name1">' . $wife->getFullName() . '</a>'; } } @@ -359,7 +359,7 @@ class HourglassChartController extends AbstractChartController 'xref' => $child->getXref(), 'generations' => $generations, 'show_spouse' => (int) $show_spouse, - 'ged' => $child->getTree()->getName(), + 'ged' => $child->getTree()->name(), ])) . '" class="name1">' . $child->getFullName() . '</a>'; } } @@ -424,7 +424,7 @@ class HourglassChartController extends AbstractChartController 'data-route' => 'hourglass-add-asc', 'data-xref' => $ARID, 'data-spouses' => (int) $show_spouse, - 'data-tree' => $family->getHusband()->getTree()->getName(), + 'data-tree' => $family->getHusband()->getTree()->name(), ]); } @@ -461,7 +461,7 @@ class HourglassChartController extends AbstractChartController 'data-route' => 'hourglass-add-asc', 'data-xref' => $ARID, 'data-spouses' => (int) $show_spouse, - 'data-tree' => $family->getWife()->getTree()->getName(), + 'data-tree' => $family->getWife()->getTree()->name(), ]); } diff --git a/app/Http/Controllers/IndividualController.php b/app/Http/Controllers/IndividualController.php index 1253ef4fda..9de1070681 100644 --- a/app/Http/Controllers/IndividualController.php +++ b/app/Http/Controllers/IndividualController.php @@ -322,11 +322,11 @@ class IndividualController extends AbstractBaseController 'class' => 'btn btn-link', 'data-confirm' => I18N::translate('Are you sure you want to delete this fact?'), 'href' => '#', - 'onclick' => 'return delete_fact(this.dataset.confirm", "' . e($individual->getTree()->getName()) . '", "' . e($individual->getXref()) . '", "' . $fact->id() . '");', + 'onclick' => 'return delete_fact(this.dataset.confirm", "' . e($individual->getTree()->name()) . '", "' . e($individual->getXref()) . '", "' . $fact->id() . '");', ]) . FontAwesome::linkIcon('edit', I18N::translate('Edit the name'), [ 'class' => 'btn btn-link', - 'href' => route('edit-name', ['xref' => $individual->getXref(), 'fact_id' => $fact->id(), 'ged' => $individual->getTree()->getName()]), + 'href' => route('edit-name', ['xref' => $individual->getXref(), 'fact_id' => $fact->id(), 'ged' => $individual->getTree()->name()]), ]); } else { $edit_links = ''; @@ -379,7 +379,7 @@ class IndividualController extends AbstractBaseController 'class' => 'btn btn-link', 'href' => route('edit-fact', ['xref' => $individual->getXref(), 'fact_id' => $fact->id(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), ]); } else { diff --git a/app/Http/Controllers/ListController.php b/app/Http/Controllers/ListController.php index 62709fc233..84c63969cb 100644 --- a/app/Http/Controllers/ListController.php +++ b/app/Http/Controllers/ListController.php @@ -121,7 +121,7 @@ class ListController extends AbstractBaseController $surname = ''; $legend = I18N::translate('All'); $params = [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'show_all' => 'yes', ]; $show = 'indi'; @@ -130,7 +130,7 @@ class ListController extends AbstractBaseController $surname = ''; $legend = I18N::translate('All') . ', ' . e($falpha) . '…'; $params = [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'show_all' => 'yes', ]; $show = 'indi'; @@ -139,7 +139,7 @@ class ListController extends AbstractBaseController $surname = ''; $legend = I18N::translate('All'); $params = [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'show_all' => 'yes', ]; $show = $request->get('show', 'surn'); @@ -155,7 +155,7 @@ class ListController extends AbstractBaseController $legend = implode('/', array_keys($this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families))); } $params = [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'surname' => $surname, 'falpha' => $falpha, ]; @@ -175,7 +175,7 @@ class ListController extends AbstractBaseController $legend = I18N::translateContext('Unknown surname', '…'); $params = [ 'alpha' => $alpha, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]; $show = 'indi'; // SURN list makes no sense here } elseif ($alpha === ',') { @@ -183,7 +183,7 @@ class ListController extends AbstractBaseController $legend = I18N::translate('None'); $params = [ 'alpha' => $alpha, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]; $show = 'indi'; // SURN list makes no sense here } elseif ($alpha) { @@ -191,14 +191,14 @@ class ListController extends AbstractBaseController $legend = e($alpha) . '…'; $params = [ 'alpha' => $alpha, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]; $show = $request->get('show', 'surn'); } else { $show_all = 'no'; $legend = '…'; $params = [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]; $show = 'none'; // Don't show lists until something is chosen } @@ -215,7 +215,7 @@ class ListController extends AbstractBaseController <?php foreach ($this->surnameAlpha($tree, $show_marnm === 'yes', $families) as $letter => $count): ?> <li class="wt-initials-list-item d-flex"> <?php if ($count > 0): ?> - <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->getName()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : ''?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> + <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : ''?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> <?php else: ?> <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span> diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php index 280d008c16..c39b9d6e3a 100644 --- a/app/Http/Controllers/MessageController.php +++ b/app/Http/Controllers/MessageController.php @@ -211,7 +211,7 @@ class MessageController extends AbstractBaseController if ($this->deliverMessage($tree, $from_email, $from_name, $to_user, $subject, $body, $url, $ip)) { FlashMessages::addMessage(I18N::translate('The message was successfully sent to %s.', e($to_user->getRealName())), 'success'); - $url = $url ?: route('tree-page', ['ged' => $tree->getName()]); + $url = $url ?: route('tree-page', ['ged' => $tree->name()]); return new RedirectResponse($url); } @@ -301,7 +301,7 @@ class MessageController extends AbstractBaseController if ($this->deliverMessage($tree, $user->getEmail(), $user->getRealName(), $to_user, $subject, $body, $url, $ip)) { FlashMessages::addMessage(I18N::translate('The message was successfully sent to %s.', e($to_user->getRealName())), 'success'); - $url = $url ?: route('tree-page', ['ged' => $tree->getName()]); + $url = $url ?: route('tree-page', ['ged' => $tree->name()]); return new RedirectResponse($url); } diff --git a/app/Http/Controllers/PedigreeChartController.php b/app/Http/Controllers/PedigreeChartController.php index 9fbb88bebe..bebbdea547 100644 --- a/app/Http/Controllers/PedigreeChartController.php +++ b/app/Http/Controllers/PedigreeChartController.php @@ -367,7 +367,7 @@ class PedigreeChartController extends AbstractChartController if ($spouse) { $html .= '<a class="name1" href="' . e(route('pedigree', [ 'xref' => $spouse->getXref(), - 'ged' => $spouse->getTree()->getName(), + 'ged' => $spouse->getTree()->name(), 'generations' => $this->generations, 'orientation' => $this->orientation, ])) . '">' . $spouse->getFullName() . '</a>'; @@ -376,7 +376,7 @@ class PedigreeChartController extends AbstractChartController foreach ($children as $sibling) { $html .= '<a class="name1" href="' . e(route('pedigree', [ 'xref' => $sibling->getXref(), - 'ged' => $sibling->getTree()->getName(), + 'ged' => $sibling->getTree()->name(), 'generations' => $this->generations, 'orientation' => $this->orientation, ])) . '">' . $sibling->getFullName() . '</a>'; @@ -394,7 +394,7 @@ class PedigreeChartController extends AbstractChartController foreach ($siblings as $sibling) { $html .= '<a class="name1" href="' . e(route('pedigree', [ 'xref' => $sibling->getXref(), - 'ged' => $sibling->getTree()->getName(), + 'ged' => $sibling->getTree()->name(), 'generations' => $this->generations, 'orientation' => $this->orientation, ])) . '">' . $sibling->getFullName() . '</a>'; @@ -430,7 +430,7 @@ class PedigreeChartController extends AbstractChartController } $html .= '<a class="' . $this->arrows->prevGen . '" href="' . e(route('pedigree', [ 'xref' => $this->nodes[$rootParentId]['indi']->getXref(), - 'ged' => $this->nodes[$rootParentId]['indi']->getTree()->getName(), + 'ged' => $this->nodes[$rootParentId]['indi']->getTree()->name(), 'generations' => $this->generations, 'orientation' => $this->orientation, ])) . '"></a>'; diff --git a/app/Http/Controllers/PendingChangesController.php b/app/Http/Controllers/PendingChangesController.php index 6b3a32ddfd..6bd4683efd 100644 --- a/app/Http/Controllers/PendingChangesController.php +++ b/app/Http/Controllers/PendingChangesController.php @@ -77,11 +77,11 @@ class PendingChangesController extends AbstractBaseController 'change_id' => $change->change_id, ]); - Log::addEditLog('Accepted change ' . $change->change_id . ' for ' . $change->xref . ' / ' . $tree->getName(), $tree); + Log::addEditLog('Accepted change ' . $change->change_id . ' for ' . $change->xref . ' / ' . $tree->name(), $tree); } return new RedirectResponse(route('show-pending', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'url' => $url, ])); } @@ -129,11 +129,11 @@ class PendingChangesController extends AbstractBaseController 'change_id' => $change->change_id, ]); - Log::addEditLog('Accepted change ' . $change->change_id . ' for ' . $change->xref . ' / ' . $tree->getName(), $tree); + Log::addEditLog('Accepted change ' . $change->change_id . ' for ' . $change->xref . ' / ' . $tree->name(), $tree); } return new RedirectResponse(route('show-pending', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'url' => $url, ])); } @@ -187,7 +187,7 @@ class PendingChangesController extends AbstractBaseController ]); return new RedirectResponse(route('show-pending', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'url' => $url, ])); } @@ -221,7 +221,7 @@ class PendingChangesController extends AbstractBaseController ]); return new RedirectResponse(route('show-pending', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'url' => $url, ])); } @@ -261,7 +261,7 @@ class PendingChangesController extends AbstractBaseController */ public function showChanges(Request $request, Tree $tree): Response { - $url = $request->get('url', route('tree-page', ['ged' => $tree->getName()])); + $url = $request->get('url', route('tree-page', ['ged' => $tree->name()])); $rows = Database::prepare( "SELECT c.*, UNIX_TIMESTAMP(c.change_time) + :offset AS change_timestamp, u.user_name, u.real_name, g.gedcom_name, new_gedcom, old_gedcom" . diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 3c04e71407..5c2712b1b3 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -187,7 +187,7 @@ class SearchController extends AbstractBaseController $search_tree_names = (array) $request->get('search_trees', []); $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool { - return in_array($tree->getName(), $search_tree_names); + return in_array($tree->name(), $search_tree_names); }); if (empty($search_trees)) { @@ -293,7 +293,7 @@ class SearchController extends AbstractBaseController $search_tree_names = (array) $request->get('search_trees', []); $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool { - return in_array($tree->getName(), $search_tree_names); + return in_array($tree->name(), $search_tree_names); }); if (empty($search_trees)) { @@ -420,7 +420,7 @@ class SearchController extends AbstractBaseController 'search' => $search, 'replace' => $replace, 'context' => $context, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); diff --git a/app/Http/Controllers/TimelineChartController.php b/app/Http/Controllers/TimelineChartController.php index 46c7b334fd..12ceef6440 100644 --- a/app/Http/Controllers/TimelineChartController.php +++ b/app/Http/Controllers/TimelineChartController.php @@ -80,7 +80,7 @@ class TimelineChartController extends AbstractChartController }); $remove_urls[$xref] = route('timeline', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'scale' => $scale, 'xrefs' => $tmp, ]); @@ -93,20 +93,20 @@ class TimelineChartController extends AbstractChartController $title = I18N::translate('Timeline'); $chart_url = route('timeline-chart', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'scale' => $scale, 'xrefs' => $xrefs, ]); $zoom_in_url = route('timeline', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'scale' => min(self::SCALE_MAX, $scale + (int) ($scale * 0.2 + 1)), 'xrefs' => $xrefs, ]); $zoom_out_url = route('timeline', [ 'route' => 'timeline', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), 'scale' => max(self::SCALE_MIN, $scale - (int) ($scale * 0.2 + 1)), 'xrefs' => $xrefs, ]); diff --git a/app/MediaFile.php b/app/MediaFile.php index 9c342816b3..44d6680330 100644 --- a/app/MediaFile.php +++ b/app/MediaFile.php @@ -378,7 +378,7 @@ class MediaFile { return route('media-download', [ 'xref' => $this->media->getXref(), - 'ged' => $this->media->getTree()->getName(), + 'ged' => $this->media->getTree()->name(), 'fact_id' => $this->fact_id, ]); } @@ -412,7 +412,7 @@ class MediaFile $url = $url_builder->getUrl('index.php', [ 'route' => 'media-thumbnail', 'xref' => $this->media->getXref(), - 'ged' => $this->media->getTree()->getName(), + 'ged' => $this->media->getTree()->name(), 'fact_id' => $this->fact_id, 'w' => $width, 'h' => $height, diff --git a/app/Module/AhnentafelReportModule.php b/app/Module/AhnentafelReportModule.php index 605968cb11..09a4b11e40 100644 --- a/app/Module/AhnentafelReportModule.php +++ b/app/Module/AhnentafelReportModule.php @@ -74,7 +74,7 @@ class AhnentafelReportModule extends AbstractModule implements ModuleReportInter { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/AncestorsChartModule.php b/app/Module/AncestorsChartModule.php index f39ae268c3..d4722f86e9 100644 --- a/app/Module/AncestorsChartModule.php +++ b/app/Module/AncestorsChartModule.php @@ -72,7 +72,7 @@ class AncestorsChartModule extends AbstractModule implements ModuleChartInterfac { return new Menu( $this->getTitle(), - route('ancestors', ['ged' => $individual->getTree()->getName(), + route('ancestors', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), ]), 'menu-chart-ancestry', diff --git a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php index 86b346cd91..25b66b1a86 100644 --- a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php +++ b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php @@ -153,7 +153,7 @@ abstract class BatchUpdateBasePlugin return preg_replace( "/@([^#@\n]+)@/m", '<a href="' . e(route('edit-raw-record', [ - 'ged' => $record->getTree()->getName(), + 'ged' => $record->getTree()->name(), 'xref' => $record->getXref(), ])) . '">@\\1@</a>', $gedrec diff --git a/app/Module/BirthDeathMarriageReportModule.php b/app/Module/BirthDeathMarriageReportModule.php index 931c88da59..92fe4ae825 100644 --- a/app/Module/BirthDeathMarriageReportModule.php +++ b/app/Module/BirthDeathMarriageReportModule.php @@ -74,7 +74,7 @@ class BirthDeathMarriageReportModule extends AbstractModule implements ModuleRep { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/BirthReportModule.php b/app/Module/BirthReportModule.php index 8ce79ab6c7..79bd993b00 100644 --- a/app/Module/BirthReportModule.php +++ b/app/Module/BirthReportModule.php @@ -66,7 +66,7 @@ class BirthReportModule extends AbstractModule implements ModuleReportInterface { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/CemeteryReportModule.php b/app/Module/CemeteryReportModule.php index 769c5d602e..8896e7c89e 100644 --- a/app/Module/CemeteryReportModule.php +++ b/app/Module/CemeteryReportModule.php @@ -66,7 +66,7 @@ class CemeteryReportModule extends AbstractModule implements ModuleReportInterfa { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/ChangeReportModule.php b/app/Module/ChangeReportModule.php index 3257b29e38..ed5de3fd48 100644 --- a/app/Module/ChangeReportModule.php +++ b/app/Module/ChangeReportModule.php @@ -66,7 +66,7 @@ class ChangeReportModule extends AbstractModule implements ModuleReportInterface { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/ChartsBlockModule.php b/app/Module/ChartsBlockModule.php index 9cf5bf02c2..341bb42f60 100644 --- a/app/Module/ChartsBlockModule.php +++ b/app/Module/ChartsBlockModule.php @@ -82,7 +82,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface $title = I18N::translate('Pedigree of %s', $person->getFullName()); $chart_url = route('pedigree-chart', [ 'xref' => $person->getXref(), - 'ged' => $person->getTree()->getName(), + 'ged' => $person->getTree()->name(), 'generations' => 3, 'layout' => PedigreeChartController::PORTRAIT, ]); @@ -95,7 +95,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface $title = I18N::translate('Descendants of %s', $person->getFullName()); $chart_url = route('descendants-chart', [ 'xref' => $person->getXref(), - 'ged' => $person->getTree()->getName(), + 'ged' => $person->getTree()->name(), 'generations' => 2, 'chart_style' => 0, ]); @@ -108,7 +108,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface $title = I18N::translate('Hourglass chart of %s', $person->getFullName()); $chart_url = route('hourglass-chart', [ 'xref' => $person->getXref(), - 'ged' => $person->getTree()->getName(), + 'ged' => $person->getTree()->name(), 'generations' => 2, 'layout' => PedigreeChartController::PORTRAIT, ]); @@ -135,12 +135,12 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php index ad06299bd5..c5f9d7303f 100644 --- a/app/Module/ClippingsCartModule.php +++ b/app/Module/ClippingsCartModule.php @@ -118,7 +118,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface new Menu($this->getTitle(), route('module', [ 'module' => 'clippings', 'action' => 'Show', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]), 'menu-clippings-cart', ['rel' => 'nofollow']), ]; @@ -129,7 +129,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface 'module' => 'clippings', 'action' => $action, 'xref' => $xref, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); $submenus[] = new Menu(I18N::translate('Add to the clippings cart'), $add_route, 'menu-clippings-add', ['rel' => 'nofollow']); @@ -139,12 +139,12 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface $submenus[] = new Menu(I18N::translate('Empty the clippings cart'), route('module', [ 'module' => 'clippings', 'action' => 'Empty', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]), 'menu-clippings-empty', ['rel' => 'nofollow']); $submenus[] = new Menu(I18N::translate('Download'), route('module', [ 'module' => 'clippings', 'action' => 'DownloadForm', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]), 'menu-clippings-download', ['rel' => 'nofollow']); } @@ -166,7 +166,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface $cart = Session::get('cart', []); - $xrefs = array_keys($cart[$tree->getName()] ?? []); + $xrefs = array_keys($cart[$tree->name()] ?? []); // Create a new/empty .ZIP file $temp_zip_file = tempnam(sys_get_temp_dir(), 'webtrees-zip-'); @@ -183,7 +183,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface Database::prepare("SELECT o_gedcom FROM `##other` WHERE o_type=? AND o_file=?") ->execute([ 'SUBN', - $tree->getName(), + $tree->name(), ]) ->fetchOne(); if ($subn) { @@ -193,7 +193,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface Database::prepare("SELECT o_gedcom FROM `##other` WHERE o_type=? AND o_file=?") ->execute([ 'SUBM', - $tree->getName(), + $tree->name(), ]) ->fetchOne(); if ($subm) { @@ -321,14 +321,14 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface */ public function getEmptyAction(Tree $tree): RedirectResponse { - $cart = Session::get('cart', []); - $cart[$tree->getName()] = []; + $cart = Session::get('cart', []); + $cart[$tree->name()] = []; Session::put('cart', $cart); $url = route('module', [ 'module' => 'clippings', 'action' => 'Show', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); @@ -345,13 +345,13 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface $xref = $request->get('xref', ''); $cart = Session::get('cart', []); - unset($cart[$tree->getName()][$xref]); + unset($cart[$tree->name()][$xref]); Session::put('cart', $cart); $url = route('module', [ 'module' => 'clippings', 'action' => 'Show', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); @@ -923,7 +923,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface { $cart = Session::get('cart', []); - $xrefs = array_keys($cart[$tree->getName()] ?? []); + $xrefs = array_keys($cart[$tree->name()] ?? []); // Fetch all the records in the cart. $records = array_map(function (string $xref) use ($tree): GedcomRecord { @@ -952,7 +952,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface { $cart = Session::get('cart', []); - $tree_name = $record->getTree()->getName(); + $tree_name = $record->getTree()->name(); // Add this record $cart[$tree_name][$record->getXref()] = true; @@ -976,7 +976,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface { $cart = Session::get('cart', []); - return empty($cart[$tree->getName()]); + return empty($cart[$tree->name()]); } /** diff --git a/app/Module/CompactTreeChartModule.php b/app/Module/CompactTreeChartModule.php index b77de61c01..544fbc54fb 100644 --- a/app/Module/CompactTreeChartModule.php +++ b/app/Module/CompactTreeChartModule.php @@ -74,7 +74,7 @@ class CompactTreeChartModule extends AbstractModule implements ModuleChartInterf $this->getTitle(), route('compact-tree', [ 'xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-compact', ['rel' => 'nofollow'] diff --git a/app/Module/DeathReportModule.php b/app/Module/DeathReportModule.php index 941431103a..0085c8b884 100644 --- a/app/Module/DeathReportModule.php +++ b/app/Module/DeathReportModule.php @@ -66,7 +66,7 @@ class DeathReportModule extends AbstractModule implements ModuleReportInterface { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/DescendancyChartModule.php b/app/Module/DescendancyChartModule.php index 597768dbe9..69e544056d 100644 --- a/app/Module/DescendancyChartModule.php +++ b/app/Module/DescendancyChartModule.php @@ -72,7 +72,7 @@ class DescendancyChartModule extends AbstractModule implements ModuleChartInterf { return new Menu( $this->getTitle(), - route('descendants', ['ged' => $individual->getTree()->getName(), + route('descendants', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), ]), 'menu-chart-descendants', diff --git a/app/Module/DescendancyModule.php b/app/Module/DescendancyModule.php index 32f6e72f36..ee1f3cb417 100644 --- a/app/Module/DescendancyModule.php +++ b/app/Module/DescendancyModule.php @@ -150,7 +150,7 @@ class DescendancyModule extends AbstractModule implements ModuleSidebarInterface '<a class="sb_desc_indi" href="' . e(route('module', [ 'module' => 'descendancy', 'action' => 'Descendants', - 'ged' => $person->getTree()->getName(), + 'ged' => $person->getTree()->name(), 'xref' => $person->getXref(), ])) . '">' . '<i class="plusminus ' . $icon . '"></i>' . diff --git a/app/Module/DescendancyReportModule.php b/app/Module/DescendancyReportModule.php index 73fae46e51..6358bb1774 100644 --- a/app/Module/DescendancyReportModule.php +++ b/app/Module/DescendancyReportModule.php @@ -66,7 +66,7 @@ class DescendancyReportModule extends AbstractModule implements ModuleReportInte { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/FactSourcesReportModule.php b/app/Module/FactSourcesReportModule.php index 4556e4bb3c..d0fff28c94 100644 --- a/app/Module/FactSourcesReportModule.php +++ b/app/Module/FactSourcesReportModule.php @@ -66,7 +66,7 @@ class FactSourcesReportModule extends AbstractModule implements ModuleReportInte { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/FamilyBookChartModule.php b/app/Module/FamilyBookChartModule.php index 3f1a8d5ec8..75b38f302a 100644 --- a/app/Module/FamilyBookChartModule.php +++ b/app/Module/FamilyBookChartModule.php @@ -72,7 +72,7 @@ class FamilyBookChartModule extends AbstractModule implements ModuleChartInterfa { return new Menu( $this->getTitle(), - route('family-book', ['ged' => $individual->getTree()->getName(), + route('family-book', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), ]), 'menu-chart-familybook', diff --git a/app/Module/FamilyGroupReportModule.php b/app/Module/FamilyGroupReportModule.php index 1c1922450f..01e3f41bbe 100644 --- a/app/Module/FamilyGroupReportModule.php +++ b/app/Module/FamilyGroupReportModule.php @@ -66,7 +66,7 @@ class FamilyGroupReportModule extends AbstractModule implements ModuleReportInte { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/FamilyTreeFavoritesModule.php b/app/Module/FamilyTreeFavoritesModule.php index 5f540ed4fe..990745d49d 100644 --- a/app/Module/FamilyTreeFavoritesModule.php +++ b/app/Module/FamilyTreeFavoritesModule.php @@ -188,7 +188,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt } } - $url = route('tree-page', ['ged' => $tree->getName()]); + $url = route('tree-page', ['ged' => $tree->name()]); return new RedirectResponse($url); } @@ -213,7 +213,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt ]); } - $url = route('tree-page', ['ged' => $tree->getName()]); + $url = route('tree-page', ['ged' => $tree->name()]); return new RedirectResponse($url); } diff --git a/app/Module/FamilyTreeNewsModule.php b/app/Module/FamilyTreeNewsModule.php index 5a39e9fc5a..e3f549c8ba 100644 --- a/app/Module/FamilyTreeNewsModule.php +++ b/app/Module/FamilyTreeNewsModule.php @@ -226,7 +226,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac } $url = route('tree-page', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); @@ -254,7 +254,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac ]); $url = route('tree-page', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php index 8f07105484..c1b131ba02 100644 --- a/app/Module/FamilyTreeStatisticsModule.php +++ b/app/Module/FamilyTreeStatisticsModule.php @@ -144,12 +144,12 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/FanChartModule.php b/app/Module/FanChartModule.php index 2d16ea5860..c3f7652f38 100644 --- a/app/Module/FanChartModule.php +++ b/app/Module/FanChartModule.php @@ -77,7 +77,7 @@ class FanChartModule extends AbstractModule implements ModuleChartInterface $this->getTitle(), route('fan', [ 'xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-fanchart', ['rel' => 'nofollow'] diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php index 8a9f64aaf6..f97e7d0740 100644 --- a/app/Module/FrequentlyAskedQuestionsModule.php +++ b/app/Module/FrequentlyAskedQuestionsModule.php @@ -93,7 +93,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen return new Menu($this->getTitle(), route('module', [ 'module' => 'faq', 'action' => 'Show', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]), 'menu-help'); } @@ -171,7 +171,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen $url = route('module', [ 'module' => 'faq', 'action' => 'Admin', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); @@ -224,7 +224,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen $url = route('module', [ 'module' => 'faq', 'action' => 'Admin', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); @@ -277,7 +277,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen $url = route('module', [ 'module' => 'faq', 'action' => 'Admin', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); @@ -373,7 +373,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen $url = route('module', [ 'module' => 'faq', 'action' => 'Admin', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); diff --git a/app/Module/HourglassChartModule.php b/app/Module/HourglassChartModule.php index 9cedd0d5e9..d28d3b66aa 100644 --- a/app/Module/HourglassChartModule.php +++ b/app/Module/HourglassChartModule.php @@ -74,7 +74,7 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac $this->getTitle(), route('hourglass', [ 'xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-hourglass', ['rel' => 'nofollow'] diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php index 0e7f520e55..7a496bf074 100644 --- a/app/Module/HtmlBlockModule.php +++ b/app/Module/HtmlBlockModule.php @@ -83,12 +83,12 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/IndividualFamiliesReportModule.php b/app/Module/IndividualFamiliesReportModule.php index 86eb149101..c13f662999 100644 --- a/app/Module/IndividualFamiliesReportModule.php +++ b/app/Module/IndividualFamiliesReportModule.php @@ -66,7 +66,7 @@ class IndividualFamiliesReportModule extends AbstractModule implements ModuleRep { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/IndividualReportModule.php b/app/Module/IndividualReportModule.php index bc6cd61f59..f19bf37065 100644 --- a/app/Module/IndividualReportModule.php +++ b/app/Module/IndividualReportModule.php @@ -66,7 +66,7 @@ class IndividualReportModule extends AbstractModule implements ModuleReportInter { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/InteractiveTree/TreeView.php b/app/Module/InteractiveTree/TreeView.php index 6eac8aab10..9513381c73 100644 --- a/app/Module/InteractiveTree/TreeView.php +++ b/app/Module/InteractiveTree/TreeView.php @@ -58,7 +58,7 @@ class TreeView return [ $html, - 'var ' . $this->name . 'Handler = new TreeViewHandler("' . $this->name . '", "' . e($individual->getTree()->getName()) . '");', + 'var ' . $this->name . 'Handler = new TreeViewHandler("' . $this->name . '", "' . e($individual->getTree()->name()) . '");', ]; } @@ -147,7 +147,7 @@ class TreeView 'module' => 'tree', 'action' => 'Treeview', 'xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]); $hmtl = $this->getThumbnail($individual); diff --git a/app/Module/InteractiveTreeModule.php b/app/Module/InteractiveTreeModule.php index 261fda0aa0..c93261bb05 100644 --- a/app/Module/InteractiveTreeModule.php +++ b/app/Module/InteractiveTreeModule.php @@ -116,7 +116,7 @@ class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface 'module' => $this->getName(), 'action' => 'Treeview', 'xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-tree', ['rel' => 'nofollow'] diff --git a/app/Module/LifespansChartModule.php b/app/Module/LifespansChartModule.php index f03e384d8a..b324d685aa 100644 --- a/app/Module/LifespansChartModule.php +++ b/app/Module/LifespansChartModule.php @@ -74,7 +74,7 @@ class LifespansChartModule extends AbstractModule implements ModuleChartInterfac $this->getTitle(), route('lifespans', [ 'xrefs[]' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-lifespan', ['rel' => 'nofollow'] diff --git a/app/Module/LoggedInUsersModule.php b/app/Module/LoggedInUsersModule.php index 0f2e0af5ee..c285567d09 100644 --- a/app/Module/LoggedInUsersModule.php +++ b/app/Module/LoggedInUsersModule.php @@ -90,7 +90,7 @@ class LoggedInUsersModule extends AbstractModule implements ModuleBlockInterface } $content .= ' - ' . e($user->getUserName()); if (Auth::id() !== $user->getUserId() && $user->getPreference('contactmethod') !== 'none') { - $content .= '<a href="' . e(route('message', ['to' => $user->getUserName(), 'ged' => $tree->getName()])) . '" class="btn btn-link" title="' . I18N::translate('Send a message') . '">' . view('icons/email') . '</a>'; + $content .= '<a href="' . e(route('message', ['to' => $user->getUserName(), 'ged' => $tree->name()])) . '" class="btn btn-link" title="' . I18N::translate('Send a message') . '">' . view('icons/email') . '</a>'; } $content .= '</div>'; } diff --git a/app/Module/MarriageReportModule.php b/app/Module/MarriageReportModule.php index ddedb3985a..b30ded4c5f 100644 --- a/app/Module/MarriageReportModule.php +++ b/app/Module/MarriageReportModule.php @@ -66,7 +66,7 @@ class MarriageReportModule extends AbstractModule implements ModuleReportInterfa { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/MissingFactsReportModule.php b/app/Module/MissingFactsReportModule.php index 7debcb138f..539894c7c8 100644 --- a/app/Module/MissingFactsReportModule.php +++ b/app/Module/MissingFactsReportModule.php @@ -66,7 +66,7 @@ class MissingFactsReportModule extends AbstractModule implements ModuleReportInt { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/OccupationReportModule.php b/app/Module/OccupationReportModule.php index 8cc041f567..98f058e18f 100644 --- a/app/Module/OccupationReportModule.php +++ b/app/Module/OccupationReportModule.php @@ -66,7 +66,7 @@ class OccupationReportModule extends AbstractModule implements ModuleReportInter { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/OnThisDayModule.php b/app/Module/OnThisDayModule.php index c2543de0d2..13f1480d08 100644 --- a/app/Module/OnThisDayModule.php +++ b/app/Module/OnThisDayModule.php @@ -147,12 +147,12 @@ class OnThisDayModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/PedigreeChartModule.php b/app/Module/PedigreeChartModule.php index e5618ddc57..56473cd349 100644 --- a/app/Module/PedigreeChartModule.php +++ b/app/Module/PedigreeChartModule.php @@ -74,7 +74,7 @@ class PedigreeChartModule extends AbstractModule implements ModuleChartInterface $this->getTitle(), route('pedigree', [ 'xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-pedigree', ['rel' => 'nofollow'] diff --git a/app/Module/PedigreeMapModule.php b/app/Module/PedigreeMapModule.php index 69837a6816..583b28ef0f 100644 --- a/app/Module/PedigreeMapModule.php +++ b/app/Module/PedigreeMapModule.php @@ -93,7 +93,7 @@ class PedigreeMapModule extends AbstractModule implements ModuleChartInterface 'module' => $this->getName(), 'action' => 'PedigreeMap', 'xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-pedigreemap', ['rel' => 'nofollow'] diff --git a/app/Module/PedigreeReportModule.php b/app/Module/PedigreeReportModule.php index 32bf947733..b0dad20ac9 100644 --- a/app/Module/PedigreeReportModule.php +++ b/app/Module/PedigreeReportModule.php @@ -66,7 +66,7 @@ class PedigreeReportModule extends AbstractModule implements ModuleReportInterfa { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/RecentChangesModule.php b/app/Module/RecentChangesModule.php index 58d306c62c..f9f15b42ec 100644 --- a/app/Module/RecentChangesModule.php +++ b/app/Module/RecentChangesModule.php @@ -102,12 +102,12 @@ class RecentChangesModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/RelatedIndividualsReportModule.php b/app/Module/RelatedIndividualsReportModule.php index 4f17d1a1b6..4d5ab0b47a 100644 --- a/app/Module/RelatedIndividualsReportModule.php +++ b/app/Module/RelatedIndividualsReportModule.php @@ -66,7 +66,7 @@ class RelatedIndividualsReportModule extends AbstractModule implements ModuleRep { return new Menu( $this->getTitle(), - route('report-setup', ['ged' => $tree->getName(), + route('report-setup', ['ged' => $tree->name(), 'report' => $this->getName(), ]), 'menu-report-' . $this->getName(), diff --git a/app/Module/RelationshipsChartModule.php b/app/Module/RelationshipsChartModule.php index 2eb5e63adf..02d8646c3e 100644 --- a/app/Module/RelationshipsChartModule.php +++ b/app/Module/RelationshipsChartModule.php @@ -93,7 +93,7 @@ class RelationshipsChartModule extends AbstractModule implements ModuleConfigInt route('relationships', [ 'xref1' => $gedcomid, 'xref2' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-relationship', ['rel' => 'nofollow'] @@ -104,7 +104,7 @@ class RelationshipsChartModule extends AbstractModule implements ModuleConfigInt I18N::translate('Relationships'), route('relationships', [ 'xref1' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-relationship', ['rel' => 'nofollow'] diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php index 753e890286..042e0b0e4f 100644 --- a/app/Module/ResearchTaskModule.php +++ b/app/Module/ResearchTaskModule.php @@ -104,12 +104,12 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/ReviewChangesModule.php b/app/Module/ReviewChangesModule.php index cb326da96a..4792132d53 100644 --- a/app/Module/ReviewChangesModule.php +++ b/app/Module/ReviewChangesModule.php @@ -117,7 +117,7 @@ class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface if (Auth::isEditor($tree) && $tree->hasPendingEdit()) { $content = ''; if (Auth::isModerator($tree)) { - $content .= '<a href="' . e(route('show-pending', ['ged' => $tree->getName()])) . '">' . I18N::translate('There are pending changes for you to moderate.') . '</a><br>'; + $content .= '<a href="' . e(route('show-pending', ['ged' => $tree->name()])) . '">' . I18N::translate('There are pending changes for you to moderate.') . '</a><br>'; } if ($sendmail === '1') { $last_email_timestamp = (int) Site::getPreference('LAST_CHANGE_EMAIL'); @@ -144,12 +144,12 @@ class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/SlideShowModule.php b/app/Module/SlideShowModule.php index 684285b312..caaad22ef7 100644 --- a/app/Module/SlideShowModule.php +++ b/app/Module/SlideShowModule.php @@ -133,12 +133,12 @@ class SlideShowModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/StatisticsChartModule.php b/app/Module/StatisticsChartModule.php index 627263448e..1520750c4d 100644 --- a/app/Module/StatisticsChartModule.php +++ b/app/Module/StatisticsChartModule.php @@ -72,7 +72,7 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa { return new Menu( $this->getTitle(), - route('statistics', ['ged' => $individual->getTree()->getName()]), + route('statistics', ['ged' => $individual->getTree()->name()]), 'menu-chart-statistics', ['rel' => 'nofollow'] ); diff --git a/app/Module/StoriesModule.php b/app/Module/StoriesModule.php index edf1897bba..be465ab788 100644 --- a/app/Module/StoriesModule.php +++ b/app/Module/StoriesModule.php @@ -166,7 +166,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module $menu = new Menu($this->getTitle(), route('module', [ 'module' => $this->getName(), 'action' => 'ShowList', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]), 'menu-story'); return $menu; @@ -295,7 +295,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module $url = route('module', [ 'module' => 'stories', 'action' => 'Admin', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); @@ -326,7 +326,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module $url = route('module', [ 'module' => 'stories', 'action' => 'Admin', - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); diff --git a/app/Module/TimelineChartModule.php b/app/Module/TimelineChartModule.php index 0798a96ee2..1e8400d442 100644 --- a/app/Module/TimelineChartModule.php +++ b/app/Module/TimelineChartModule.php @@ -74,7 +74,7 @@ class TimelineChartModule extends AbstractModule implements ModuleChartInterface $this->getTitle(), route('timeline', [ 'xrefs[]' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'menu-chart-timeline', ['rel' => 'nofollow'] diff --git a/app/Module/TopGivenNamesModule.php b/app/Module/TopGivenNamesModule.php index bd363b9a2c..2d801923f0 100644 --- a/app/Module/TopGivenNamesModule.php +++ b/app/Module/TopGivenNamesModule.php @@ -99,12 +99,12 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/TopPageViewsModule.php b/app/Module/TopPageViewsModule.php index ffeba18880..62f6fb7a32 100644 --- a/app/Module/TopPageViewsModule.php +++ b/app/Module/TopPageViewsModule.php @@ -102,12 +102,12 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php index 01cd62b4c5..3e8695e923 100644 --- a/app/Module/TopSurnamesModule.php +++ b/app/Module/TopSurnamesModule.php @@ -139,12 +139,12 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/UpcomingAnniversariesModule.php b/app/Module/UpcomingAnniversariesModule.php index 1b0e459c26..8631e94c04 100644 --- a/app/Module/UpcomingAnniversariesModule.php +++ b/app/Module/UpcomingAnniversariesModule.php @@ -166,12 +166,12 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Module/UserFavoritesModule.php b/app/Module/UserFavoritesModule.php index 8b0046f821..2d29400944 100644 --- a/app/Module/UserFavoritesModule.php +++ b/app/Module/UserFavoritesModule.php @@ -189,7 +189,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface } } - $url = route('user-page', ['ged' => $tree->getName()]); + $url = route('user-page', ['ged' => $tree->name()]); return new RedirectResponse($url); } @@ -214,7 +214,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface ]); } - $url = route('user-page', ['ged' => $tree->getName()]); + $url = route('user-page', ['ged' => $tree->name()]); return new RedirectResponse($url); } diff --git a/app/Module/UserJournalModule.php b/app/Module/UserJournalModule.php index b2f15d6d16..6771997d2c 100644 --- a/app/Module/UserJournalModule.php +++ b/app/Module/UserJournalModule.php @@ -220,7 +220,7 @@ class UserJournalModule extends AbstractModule implements ModuleBlockInterface } $url = route('user-page', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); @@ -248,7 +248,7 @@ class UserJournalModule extends AbstractModule implements ModuleBlockInterface ]); $url = route('user-page', [ - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); return new RedirectResponse($url); diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php index 1797050b59..5592a8b836 100644 --- a/app/Module/UserMessagesModule.php +++ b/app/Module/UserMessagesModule.php @@ -69,9 +69,9 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface } if ($request->get('ctype') === 'user') { - $url = route('user-page', ['ged' => $tree->getName()]); + $url = route('user-page', ['ged' => $tree->name()]); } else { - $url = route('tree-page', ['ged' => $tree->getName()]); + $url = route('tree-page', ['ged' => $tree->name()]); } return new RedirectResponse($url); @@ -102,10 +102,10 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface $content = ''; if (!empty($users)) { - $url = route('user-page', ['ged' => $tree->getName()]); + $url = route('user-page', ['ged' => $tree->name()]); $content .= '<form onsubmit="return $("#to").val() !== """>'; $content .= '<input type="hidden" name="route" value="message">'; - $content .= '<input type="hidden" name="ged" value="' . e($tree->getName()) . '">'; + $content .= '<input type="hidden" name="ged" value="' . e($tree->name()) . '">'; $content .= '<input type="hidden" name="url" value="' . e($url) . '">'; $content .= '<label for="to">' . I18N::translate('Send a message') . '</label>'; $content .= '<select id="to" name="to">'; @@ -121,7 +121,7 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface 'action' => 'DeleteMessage', 'module' => $this->getName(), 'ctype' => $ctype, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ])) . '" data-confirm="' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '" onsubmit="return confirm(this.dataset.confirm);">'; $content .= csrf_field(); @@ -158,7 +158,7 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface $reply_url = route('message', [ 'to' => $user->getUserName(), 'subject' => $message->subject, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); $content .= '<a class="btn btn-primary" href="' . e($reply_url) . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> '; } diff --git a/app/Module/UserWelcomeModule.php b/app/Module/UserWelcomeModule.php index 36f65adc29..15ca1fbfb7 100644 --- a/app/Module/UserWelcomeModule.php +++ b/app/Module/UserWelcomeModule.php @@ -64,7 +64,7 @@ class UserWelcomeModule extends AbstractModule implements ModuleBlockInterface $links[] = [ 'url' => route('pedigree', [ 'xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'title' => I18N::translate('Default chart'), 'icon' => 'icon-pedigree', diff --git a/app/Module/WelcomeBlockModule.php b/app/Module/WelcomeBlockModule.php index a5ff0e2193..633246f6a3 100644 --- a/app/Module/WelcomeBlockModule.php +++ b/app/Module/WelcomeBlockModule.php @@ -63,7 +63,7 @@ class WelcomeBlockModule extends AbstractModule implements ModuleBlockInterface $links[] = [ 'url' => route('pedigree', [ 'xref' => $individual->getXref(), - 'ged' => $individual->getTree()->getName(), + 'ged' => $individual->getTree()->name(), ]), 'title' => I18N::translate('Default chart'), 'icon' => 'icon-pedigree', diff --git a/app/Module/YahrzeitModule.php b/app/Module/YahrzeitModule.php index a5eb5ae9c5..018f8b4609 100644 --- a/app/Module/YahrzeitModule.php +++ b/app/Module/YahrzeitModule.php @@ -154,12 +154,12 @@ class YahrzeitModule extends AbstractModule implements ModuleBlockInterface if ($ctype === 'gedcom' && Auth::isManager($tree)) { $config_url = route('tree-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } elseif ($ctype === 'user' && Auth::check()) { $config_url = route('user-page-block-edit', [ 'block_id' => $block_id, - 'ged' => $tree->getName(), + 'ged' => $tree->name(), ]); } else { $config_url = ''; diff --git a/app/Place.php b/app/Place.php index 8fd6489be2..c8b1aff0dc 100644 --- a/app/Place.php +++ b/app/Place.php @@ -127,7 +127,7 @@ class Place { return e(route('place-hierarchy', [ 'parent' => array_reverse($this->gedcom_place), - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), ])); } diff --git a/app/Select2.php b/app/Select2.php index 4d2e953c51..783af64fd7 100644 --- a/app/Select2.php +++ b/app/Select2.php @@ -79,7 +79,7 @@ class Select2 extends Html */ public static function familyConfig(Tree $tree): array { - $url = route('select2-family', ['ged' => $tree->getName()]); + $url = route('select2-family', ['ged' => $tree->name()]); return self::commonConfig() + ['data-ajax--url' => $url]; } @@ -225,7 +225,7 @@ class Select2 extends Html */ public static function individualConfig(Tree $tree): array { - $url = route('select2-individual', ['ged' => $tree->getName()]); + $url = route('select2-individual', ['ged' => $tree->name()]); return self::commonConfig() + ['data-ajax--url' => $url]; } @@ -292,7 +292,7 @@ class Select2 extends Html */ public static function mediaObjectConfig(Tree $tree): array { - $url = route('select2-media', ['ged' => $tree->getName()]); + $url = route('select2-media', ['ged' => $tree->name()]); return self::commonConfig() + ['data-ajax--url' => $url]; } @@ -358,7 +358,7 @@ class Select2 extends Html */ public static function noteConfig(Tree $tree): array { - $url = route('select2-note', ['ged' => $tree->getName()]); + $url = route('select2-note', ['ged' => $tree->name()]); return self::commonConfig() + ['data-ajax--url' => $url]; } @@ -424,7 +424,7 @@ class Select2 extends Html */ public static function placeConfig(Tree $tree): array { - $url = route('select2-place', ['ged' => $tree->getName()]); + $url = route('select2-place', ['ged' => $tree->name()]); return self::commonConfig() + ['data-ajax--url' => $url]; } @@ -525,7 +525,7 @@ class Select2 extends Html */ public static function repositoryConfig(Tree $tree): array { - $url = route('select2-repository', ['ged' => $tree->getName()]); + $url = route('select2-repository', ['ged' => $tree->name()]); return self::commonConfig() + ['data-ajax--url' => $url]; } @@ -591,7 +591,7 @@ class Select2 extends Html */ public static function sourceConfig(Tree $tree): array { - $url = route('select2-source', ['ged' => $tree->getName()]); + $url = route('select2-source', ['ged' => $tree->name()]); return self::commonConfig() + ['data-ajax--url' => $url]; } @@ -657,7 +657,7 @@ class Select2 extends Html */ public static function submitterConfig(Tree $tree): array { - $url = route('select2-submitter', ['ged' => $tree->getName()]); + $url = route('select2-submitter', ['ged' => $tree->name()]); return self::commonConfig() + ['data-ajax--url' => $url]; } diff --git a/app/Stats.php b/app/Stats.php index 42c3232660..2e03a02bea 100644 --- a/app/Stats.php +++ b/app/Stats.php @@ -183,7 +183,7 @@ class Stats */ public function gedcomFilename(): string { - return $this->tree->getName(); + return $this->tree->name(); } /** @@ -6110,7 +6110,7 @@ class Stats if ($type == 'list') { $content .= '<br>'; } - $content .= '<a href="' . e(route('message', ['to' => $user->getUserName(), 'ged' => $this->tree->getName()])) . '" class="btn btn-link" title="' . I18N::translate('Send a message') . '">' . view('icons/email') . '</a>'; + $content .= '<a href="' . e(route('message', ['to' => $user->getUserName(), 'ged' => $this->tree->name()])) . '" class="btn btn-link" title="' . I18N::translate('Send a message') . '">' . view('icons/email') . '</a>'; } if ($type == 'list') { $content .= '</li>'; diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php index 8cda158a18..d09bd61afa 100644 --- a/app/Theme/AbstractTheme.php +++ b/app/Theme/AbstractTheme.php @@ -204,7 +204,7 @@ abstract class AbstractTheme if ($analytics_id) { // Add extra dimensions (i.e. filtering categories) $dimensions = (object) [ - 'dimension1' => $this->tree ? $this->tree->getName() : '-', + 'dimension1' => $this->tree ? $this->tree->name() : '-', 'dimension2' => $this->tree ? Auth::accessLevel($this->tree) : '-', ]; @@ -304,7 +304,7 @@ abstract class AbstractTheme return '<a href="mailto:' . e($user->getEmail()) . '">' . e($user->getRealName()) . '</a>'; default: $url = route(Auth::check() ? 'message' : 'contact', [ - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), 'to' => $user->getUserName(), 'url' => $this->request->getRequestUri(), ]); @@ -506,7 +506,7 @@ abstract class AbstractTheme '<div class="col wt-header-search">' . '<form class="wt-header-search-form" role="search">' . '<input type="hidden" name="route" value="search-quick">' . - '<input type="hidden" name="ged" value="' . e($this->tree->getName()) . '">' . + '<input type="hidden" name="ged" value="' . e($this->tree->name()) . '">' . $this->formQuickSearchFields() . '</form>' . '</div>'; @@ -735,7 +735,7 @@ abstract class AbstractTheme } return - '<div data-xref="' . e($individual->getXref()) . '" data-tree="' . e($individual->getTree()->getName()) . '" class="person_box_template ' . $person_box_class . ' box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; height: ' . $this->parameter('chart-box-y') . 'px">' . + '<div data-xref="' . e($individual->getXref()) . '" data-tree="' . e($individual->getTree()->name()) . '" class="person_box_template ' . $person_box_class . ' box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; height: ' . $this->parameter('chart-box-y') . 'px">' . $icons . '<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' . $thumbnail . @@ -790,7 +790,7 @@ abstract class AbstractTheme } return - '<div data-xref="' . e($individual->getXref()) . '" data-tree="' . e($individual->getTree()->getName()) . '" class="person_box_template ' . $person_box_class . ' box-style2">' . + '<div data-xref="' . e($individual->getXref()) . '" data-tree="' . e($individual->getTree()->name()) . '" class="person_box_template ' . $person_box_class . ' box-style2">' . $icons . '<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' . $thumbnail . @@ -1038,17 +1038,17 @@ abstract class AbstractTheme // Day view new Menu(I18N::translate('Day'), route('calendar', [ 'view' => 'day', - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), ]), 'menu-calendar-day', ['rel' => 'nofollow']), // Month view new Menu(I18N::translate('Month'), route('calendar', [ 'view' => 'month', - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), ]), 'menu-calendar-month', ['rel' => 'nofollow']), //Year view new Menu(I18N::translate('Year'), route('calendar', [ 'view' => 'year', - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), ]), 'menu-calendar-year', ['rel' => 'nofollow']), ]); } @@ -1061,11 +1061,11 @@ abstract class AbstractTheme public function menuChangeBlocks() { if (Auth::check() && $this->request->get('route') === 'user-page') { - return new Menu(I18N::translate('Customize this page'), route('user-page-edit', ['ged' => $this->tree->getName()]), 'menu-change-blocks'); + return new Menu(I18N::translate('Customize this page'), route('user-page-edit', ['ged' => $this->tree->name()]), 'menu-change-blocks'); } if (Auth::isManager($this->tree) && $this->request->get('route') === 'tree-page') { - return new Menu(I18N::translate('Customize this page'), route('tree-page-edit', ['ged' => $this->tree->getName()]), 'menu-change-blocks'); + return new Menu(I18N::translate('Customize this page'), route('tree-page-edit', ['ged' => $this->tree->name()]), 'menu-change-blocks'); } return null; @@ -1163,7 +1163,7 @@ abstract class AbstractTheme $url = route('module', [ 'module' => 'user_favorites', 'action' => 'AddFavorite', - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), 'xref' => $controller->record->getXref(), ]); @@ -1188,7 +1188,7 @@ abstract class AbstractTheme public function menuHomePage() { if (count(Tree::getAll()) === 1 || Site::getPreference('ALLOW_CHANGE_GEDCOM') !== '1') { - return new Menu(I18N::translate('Family tree'), route('tree-page', ['ged' => $this->tree->getName()]), 'menu-tree'); + return new Menu(I18N::translate('Family tree'), route('tree-page', ['ged' => $this->tree->name()]), 'menu-tree'); } $submenus = []; @@ -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->id()); + $submenus[] = new Menu(e($tree->getTitle()), route('tree-page', ['ged' => $tree->name()]), $active . 'menu-tree-' . $tree->id()); } return new Menu(I18N::translate('Family trees'), '#', 'menu-tree', [], $submenus); @@ -1288,7 +1288,7 @@ abstract class AbstractTheme public function menuListsBranches($surname): Menu { return new Menu(I18N::translate('Branches'), route('branches', [ - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), 'surname' => $surname, ]), 'menu-branches', ['rel' => 'nofollow']); } @@ -1303,7 +1303,7 @@ abstract class AbstractTheme public function menuListsFamilies($surname): Menu { return new Menu(I18N::translate('Families'), route('family-list', [ - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), 'surname' => $surname, ]), 'menu-list-indi'); } @@ -1318,7 +1318,7 @@ abstract class AbstractTheme public function menuListsIndividuals($surname): Menu { return new Menu(I18N::translate('Individuals'), route('individual-list', [ - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), 'surname' => $surname, ]), 'menu-list-indi'); } @@ -1330,7 +1330,7 @@ abstract class AbstractTheme */ public function menuListsMedia(): Menu { - return new Menu(I18N::translate('Media objects'), route('media-list', ['ged' => $this->tree->getName()]), 'menu-list-obje', ['rel' => 'nofollow']); + return new Menu(I18N::translate('Media objects'), route('media-list', ['ged' => $this->tree->name()]), 'menu-list-obje', ['rel' => 'nofollow']); } /** @@ -1340,7 +1340,7 @@ abstract class AbstractTheme */ public function menuListsNotes(): Menu { - return new Menu(I18N::translate('Shared notes'), route('note-list', ['ged' => $this->tree->getName()]), 'menu-list-note', ['rel' => 'nofollow']); + return new Menu(I18N::translate('Shared notes'), route('note-list', ['ged' => $this->tree->name()]), 'menu-list-note', ['rel' => 'nofollow']); } /** @@ -1350,7 +1350,7 @@ abstract class AbstractTheme */ protected function menuListsPlaces(): Menu { - return new Menu(I18N::translate('Place hierarchy'), route('place-hierarchy', ['ged' => $this->tree->getName()]), 'menu-list-plac', ['rel' => 'nofollow']); + return new Menu(I18N::translate('Place hierarchy'), route('place-hierarchy', ['ged' => $this->tree->name()]), 'menu-list-plac', ['rel' => 'nofollow']); } /** @@ -1360,7 +1360,7 @@ abstract class AbstractTheme */ public function menuListsRepositories(): Menu { - return new Menu(I18N::translate('Repositories'), route('repository-list', ['ged' => $this->tree->getName()]), 'menu-list-repo', ['rel' => 'nofollow']); + return new Menu(I18N::translate('Repositories'), route('repository-list', ['ged' => $this->tree->name()]), 'menu-list-repo', ['rel' => 'nofollow']); } /** @@ -1370,7 +1370,7 @@ abstract class AbstractTheme */ public function menuListsSources(): Menu { - return new Menu(I18N::translate('Sources'), route('source-list', ['ged' => $this->tree->getName()]), 'menu-list-sour', ['rel' => 'nofollow']); + return new Menu(I18N::translate('Sources'), route('source-list', ['ged' => $this->tree->name()]), 'menu-list-sour', ['rel' => 'nofollow']); } /** @@ -1459,7 +1459,7 @@ abstract class AbstractTheme */ public function menuMyPage(): Menu { - return new Menu(I18N::translate('My page'), route('user-page', ['ged' => $this->tree->getName()]), 'menu-mypage'); + return new Menu(I18N::translate('My page'), route('user-page', ['ged' => $this->tree->name()]), 'menu-mypage'); } /** @@ -1497,7 +1497,7 @@ abstract class AbstractTheme I18N::translate('My pedigree'), route('pedigree', [ 'xref' => $gedcomid, - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), ]), 'menu-mypedigree' ); @@ -1515,7 +1515,7 @@ abstract class AbstractTheme { if ($this->pendingChangesExist()) { $url = route('show-pending', [ - 'ged' => $this->tree ? $this->tree->getName() : '', + 'ged' => $this->tree ? $this->tree->name() : '', 'url' => $this->request->getRequestUri(), ]); @@ -1566,7 +1566,7 @@ abstract class AbstractTheme */ public function menuSearchGeneral(): Menu { - return new Menu(I18N::translate('General search'), route('search-general', ['ged' => $this->tree->getName()]), 'menu-search-general', ['rel' => 'nofollow']); + return new Menu(I18N::translate('General search'), route('search-general', ['ged' => $this->tree->name()]), 'menu-search-general', ['rel' => 'nofollow']); } /** @@ -1577,7 +1577,7 @@ abstract class AbstractTheme public function menuSearchPhonetic(): Menu { /* I18N: search using “sounds like”, rather than exact spelling */ - return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']); + return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->name(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']); } /** @@ -1587,7 +1587,7 @@ abstract class AbstractTheme */ public function menuSearchAdvanced(): Menu { - return new Menu(I18N::translate('Advanced search'), route('search-advanced', ['ged' => $this->tree->getName()]), 'menu-search-advanced', ['rel' => 'nofollow']); + return new Menu(I18N::translate('Advanced search'), route('search-advanced', ['ged' => $this->tree->name()]), 'menu-search-advanced', ['rel' => 'nofollow']); } /** @@ -1599,7 +1599,7 @@ abstract class AbstractTheme { if (Auth::isEditor($this->tree)) { return new Menu(I18N::translate('Search and replace'), route('search-replace', [ - 'ged' => $this->tree->getName(), + 'ged' => $this->tree->name(), 'action' => 'replace', ]), 'menu-search-replace'); } @@ -1780,7 +1780,7 @@ abstract class AbstractTheme */ public function pendingChangesLink(): string { - return '<a href="' . e(route('show-pending', ['ged' => $this->tree->getName()])) . '">' . $this->pendingChangesLinkText() . '</a>'; + return '<a href="' . e(route('show-pending', ['ged' => $this->tree->name()])) . '">' . $this->pendingChangesLinkText() . '</a>'; } /** diff --git a/app/Tree.php b/app/Tree.php index f39f9e502e..d948ee8bee 100644 --- a/app/Tree.php +++ b/app/Tree.php @@ -61,13 +61,13 @@ class Tree * be called from Tree::getAll() to ensure proper initialisation. * * @param int $id - * @param string $tree_name + * @param string $name * @param string $tree_title */ - private function __construct($id, $tree_name, $tree_title) + private function __construct($id, $name, $tree_title) { $this->id = $id; - $this->name = $tree_name; + $this->name = $name; $this->title = $tree_title; $this->fact_privacy = []; $this->individual_privacy = []; @@ -113,7 +113,7 @@ class Tree * * @return string */ - public function getName(): string + public function name(): string { return $this->name; } diff --git a/resources/views/admin/broadcast.phtml b/resources/views/admin/broadcast.phtml index 18fc808f5d..dddc705240 100644 --- a/resources/views/admin/broadcast.phtml +++ b/resources/views/admin/broadcast.phtml @@ -7,7 +7,7 @@ <form method="post" action="<?= e(route('broadcast')) ?>"> <?= csrf_field() ?> <input type="hidden" name="url" value="<?= e($url) ?>"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label" for="from"> diff --git a/resources/views/admin/control-panel-tree-list.phtml b/resources/views/admin/control-panel-tree-list.phtml index 393c2b30b4..0db1c932f8 100644 --- a/resources/views/admin/control-panel-tree-list.phtml +++ b/resources/views/admin/control-panel-tree-list.phtml @@ -3,20 +3,20 @@ <?php foreach ($all_trees as $tree) : ?> <tr class="<?= $changes[$tree->id()] ? 'danger' : '' ?>"> <th scope="row"> - <a href="<?= e(route('tree-page', ['ged' => $tree->getName()])) ?>"> - <?= e($tree->getName()) ?> + <a href="<?= e(route('tree-page', ['ged' => $tree->name()])) ?>"> + <?= e($tree->name()) ?> - <?= e($tree->getTitle()) ?> </a> </th> <td> - <a href="<?= e(route('admin-trees', ['ged' => $tree->getName()])) ?>" title="<?= I18N::translate('Preferences') ?>"> + <a href="<?= e(route('admin-trees', ['ged' => $tree->name()])) ?>" title="<?= I18N::translate('Preferences') ?>"> <?= view('icons/preferences') ?> </a> </td> <td class="text-right"> <?php if ($changes[$tree->id()]) : ?> - <a href="<?= e(route('show-pending', ['ged' => $tree->getName(), 'url' => route('admin-control-panel')])) ?>"> + <a href="<?= e(route('show-pending', ['ged' => $tree->name(), 'url' => route('admin-control-panel')])) ?>"> <?= I18N::number($changes[$tree->id()]) ?> <span class="sr-only"><?= I18N::translate('Pending changes') ?> <?= e($tree->getTitle()) ?></span> </a> @@ -26,7 +26,7 @@ </td> <td class="d-none d-sm-table-cell text-right"> <?php if ($individuals[$tree->id()]) : ?> - <a href="<?= e(route('individual-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('individual-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($individuals[$tree->id()]) ?> </a> <?php else : ?> @@ -35,7 +35,7 @@ </td> <td class="d-none d-lg-table-cell text-right"> <?php if ($families[$tree->id()]) : ?> - <a href="<?= e(route('family-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('family-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($families[$tree->id()]) ?> </a> <?php else : ?> @@ -44,7 +44,7 @@ </td> <td class="d-none d-sm-table-cell text-right"> <?php if ($sources[$tree->id()]) : ?> - <a href="<?= e(route('source-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('source-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($sources[$tree->id()]) ?> </a> <?php else : ?> @@ -53,7 +53,7 @@ </td> <td class="d-none d-lg-table-cell text-right"> <?php if ($repositories[$tree->id()]) : ?> - <a href="<?= e(route('repository-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('repository-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($repositories[$tree->id()]) ?> </a> <?php else : ?> @@ -62,7 +62,7 @@ </td> <td class="d-none d-sm-table-cell text-right"> <?php if ($media[$tree->id()]) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($media[$tree->id()]) ?> </a> <?php else : ?> @@ -71,7 +71,7 @@ </td> <td class="d-none d-lg-table-cell text-right"> <?php if ($notes[$tree->id()]) : ?> - <a href="<?= e(route('note-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('note-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($media[$tree->id()]) ?> </a> <?php else : ?> diff --git a/resources/views/admin/control-panel.phtml b/resources/views/admin/control-panel.phtml index 7240987756..255cf7de26 100644 --- a/resources/views/admin/control-panel.phtml +++ b/resources/views/admin/control-panel.phtml @@ -170,7 +170,7 @@ <ul class="fa-ul"> <li> <span class="fa-li"><?= view('icons/preferences') ?></span> - <a href="<?= e(route('admin-trees', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('Manage family trees') ?> </a> </li> @@ -226,13 +226,13 @@ <ul class="fa-ul"> <li> <span class="fa-li"><?= view('icons/preferences') ?></span> - <a href="<?= e(route('admin-users', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('admin-users', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('User administration') ?> </a> </li> <li> <span class="fa-li"><?= view('icons/preferences') ?></span> - <a href="<?= e(route('admin-users-create', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('admin-users-create', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('Add a user') ?> </a> </li> diff --git a/resources/views/admin/import-progress.phtml b/resources/views/admin/import-progress.phtml index 54f54b21d0..b594c87721 100644 --- a/resources/views/admin/import-progress.phtml +++ b/resources/views/admin/import-progress.phtml @@ -15,5 +15,5 @@ <script> $("#import<?= e($tree->id()) ?>") - .load("<?= route('import', ['ged' => $tree->getName()]) ?>", {}); + .load("<?= route('import', ['ged' => $tree->name()]) ?>", {}); </script> diff --git a/resources/views/admin/merge-records-step-1.phtml b/resources/views/admin/merge-records-step-1.phtml index 60adec8727..c029598270 100644 --- a/resources/views/admin/merge-records-step-1.phtml +++ b/resources/views/admin/merge-records-step-1.phtml @@ -8,7 +8,7 @@ <form> <input type="hidden" name="route" value="merge-records"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label" for="record-type"> <?= I18N::translate('Select two records to merge.') ?> diff --git a/resources/views/admin/merge-records-step-2.phtml b/resources/views/admin/merge-records-step-2.phtml index b456ef435b..8ec42b5d69 100644 --- a/resources/views/admin/merge-records-step-2.phtml +++ b/resources/views/admin/merge-records-step-2.phtml @@ -5,7 +5,7 @@ <h1><?= $title ?></h1> -<form action="<?= e(route('merge-records', ['ged' => $tree->getName(), 'xref1' => $record1->getXref(), 'xref2' => $record2->getXref()])) ?>" method="POST"> +<form action="<?= e(route('merge-records', ['ged' => $tree->name(), 'xref1' => $record1->getXref(), 'xref2' => $record2->getXref()])) ?>" method="POST"> <?= csrf_field() ?> <p> <?= I18N::translate('Select the facts and events to keep from both records.') ?> diff --git a/resources/views/admin/trees-duplicates.phtml b/resources/views/admin/trees-duplicates.phtml index 55723dc222..032ed38649 100644 --- a/resources/views/admin/trees-duplicates.phtml +++ b/resources/views/admin/trees-duplicates.phtml @@ -20,7 +20,7 @@ <?php endforeach ?> <?php if (count($duplicates) === 2) : ?> — - <a href="<?= e(route('merge-records', ['ged' => $tree->getName(), 'xref1' => $duplicates[0]->getXref(), 'xref2' => $duplicates[1]->getXref()])) ?>"> + <a href="<?= e(route('merge-records', ['ged' => $tree->name(), 'xref1' => $duplicates[0]->getXref(), 'xref2' => $duplicates[1]->getXref()])) ?>"> <?= I18N::translate('Merge') ?> </a> <?php endif ?> diff --git a/resources/views/admin/trees-export.phtml b/resources/views/admin/trees-export.phtml index fb7c822782..ce9c355143 100644 --- a/resources/views/admin/trees-export.phtml +++ b/resources/views/admin/trees-export.phtml @@ -23,7 +23,7 @@ <form class="form form-horizontal"> <input type="hidden" name="route" value="admin-trees-download"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <!-- DOWNLOAD OPTIONS --> <fieldset class="form-group"> diff --git a/resources/views/admin/trees-import.phtml b/resources/views/admin/trees-import.phtml index 4b3370b99e..4589405556 100644 --- a/resources/views/admin/trees-import.phtml +++ b/resources/views/admin/trees-import.phtml @@ -10,7 +10,7 @@ </div> <form class="form form-horizontal" method="post" enctype="multipart/form-data" onsubmit="return checkGedcomImportForm('<?= e(I18N::translate('You have selected a GEDCOM file with a different name. Is this correct?')) ?>');"> - <input type="hidden" name="ged" value="<?= $tree->getName() ?>"> + <input type="hidden" name="ged" value="<?= $tree->name() ?>"> <input type="hidden" id="gedcom_filename" value="<?= e($default_gedcom_file) ?>"> <?= csrf_field() ?> diff --git a/resources/views/admin/trees-merge.phtml b/resources/views/admin/trees-merge.phtml index 4ad15c3435..659642be84 100644 --- a/resources/views/admin/trees-merge.phtml +++ b/resources/views/admin/trees-merge.phtml @@ -1,7 +1,7 @@ <?php use Fisharebest\Webtrees\Bootstrap4; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->getName()]) => I18N::translate('Manage family trees '), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->name()]) => I18N::translate('Manage family trees '), $title]]) ?> <h1><?= $title ?></h1> diff --git a/resources/views/admin/trees-places.phtml b/resources/views/admin/trees-places.phtml index cc1d6a07e8..9871423f0e 100644 --- a/resources/views/admin/trees-places.phtml +++ b/resources/views/admin/trees-places.phtml @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->getName()]) => I18N::translate('Manage family trees '), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->name()]) => I18N::translate('Manage family trees '), $title]]) ?> <h1><?= $title ?></h1> @@ -10,7 +10,7 @@ <form> <input type="hidden" name="route" value="admin-trees-places"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <dl> <dt> @@ -49,7 +49,7 @@ <?php } ?> </ul> - <form method="post" action="<?= e(route('admin-trees-places', ['ged' => $tree->getName(), 'search' => $search, 'replace' => $replace])) ?>"> + <form method="post" action="<?= e(route('admin-trees-places', ['ged' => $tree->name(), 'search' => $search, 'replace' => $replace])) ?>"> <?= csrf_field() ?> <button class="btn btn-primary" type="submit" value="update" name="confirm"><?= /* I18N: A button label. */ I18N::translate('update') ?></button> diff --git a/resources/views/admin/trees-preferences.phtml b/resources/views/admin/trees-preferences.phtml index 29a8bd9603..1350413072 100644 --- a/resources/views/admin/trees-preferences.phtml +++ b/resources/views/admin/trees-preferences.phtml @@ -8,7 +8,7 @@ <form class="form-horizontal" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="action" value="general"> @@ -52,7 +52,7 @@ name="gedcom" required type="text" - value="<?= e($tree->getName()) ?>" + value="<?= e($tree->name()) ?>" > </div> <p class="small text-muted"> @@ -1135,7 +1135,7 @@ <?= view('icons/save') ?> <?= I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('admin-trees', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('admin-trees', ['ged' => $tree->name()])) ?>"> <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/admin/trees-privacy.phtml b/resources/views/admin/trees-privacy.phtml index 081a51bb89..7fc712cb28 100644 --- a/resources/views/admin/trees-privacy.phtml +++ b/resources/views/admin/trees-privacy.phtml @@ -10,7 +10,7 @@ <form method="POST"> <input type="hidden" name="route" value="tree-privacy"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= csrf_field() ?> <!-- REQUIRE_AUTHENTICATION --> @@ -272,7 +272,7 @@ <?= view('icons/save') ?> <?= I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="<?= route('admin-trees', ['ged' => $tree->getName()]) ?>"> + <a class="btn btn-secondary" href="<?= route('admin-trees', ['ged' => $tree->name()]) ?>"> <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/admin/trees-renumber.phtml b/resources/views/admin/trees-renumber.phtml index 8bacaac9bd..ee032ef37d 100644 --- a/resources/views/admin/trees-renumber.phtml +++ b/resources/views/admin/trees-renumber.phtml @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->getName()]) => I18N::translate('Manage family trees '), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->name()]) => I18N::translate('Manage family trees '), $title]]) ?> <h1><?= $title ?></h1> diff --git a/resources/views/admin/trees-unconnected.phtml b/resources/views/admin/trees-unconnected.phtml index f8d6a7557b..273f54ba85 100644 --- a/resources/views/admin/trees-unconnected.phtml +++ b/resources/views/admin/trees-unconnected.phtml @@ -1,13 +1,13 @@ <?php use Fisharebest\Webtrees\Bootstrap4; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->getName()]) => I18N::translate('Manage family trees '), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->name()]) => I18N::translate('Manage family trees '), $title]]) ?> <h1><?= $title ?></h1> <form class="form-inline"> <input type="hidden" name="route" value="admin-trees-unconnected""> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= Bootstrap4::checkbox(I18N::translate('Include associates'), true, ['checked' => $associates, 'name' => 'associates']) ?> <button type="submit"> <?= I18N::translate('update') ?> diff --git a/resources/views/admin/trees.phtml b/resources/views/admin/trees.phtml index bc2643d551..0c172335d3 100644 --- a/resources/views/admin/trees.phtml +++ b/resources/views/admin/trees.phtml @@ -24,7 +24,7 @@ <h2 class="mb-0"> <?= view('icons/tree') ?> <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()) ?> + <?= e($managed_tree->name()) ?> — <?= e($managed_tree->getTitle()) ?> </a> </h2> </div> @@ -39,14 +39,14 @@ </div> <?php View::push('javascript'); ?> <script> - $("#import<?= $managed_tree->id() ?>").load("<?= route('import', ['ged' => $managed_tree->getName()]) ?>", {}); + $("#import<?= $managed_tree->id() ?>").load("<?= route('import', ['ged' => $managed_tree->name()]) ?>", {}); </script> <?php View::endpush() ?> <?php endif ?> <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()])) ?>"> + <a href="<?= e(route('tree-page', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Family tree') ?> </a> </h3> @@ -54,7 +54,7 @@ <!-- PREFERENCES --> <li> <span class="fa-li"><?= view('icons/preferences') ?></span> - <a href="<?= e(route('admin-trees-preferences', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-preferences', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Preferences') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -64,7 +64,7 @@ <!-- PRIVACY --> <li> <span class="fa-li"><?= view('icons/lock') ?></span> - <a href="<?= e(route('tree-privacy', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('tree-privacy', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Privacy') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -74,7 +74,7 @@ <!-- HOME PAGE BLOCKS--> <li> <span class="fa-li"><?= view('icons/block') ?></span> - <a href="<?= e(route('tree-page-edit', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('tree-page-edit', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Change the “Home page” blocks') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -90,7 +90,7 @@ <?= e($managed_tree->getTitle()) ?> </span> </a> - <form name="delete_form<?= $managed_tree->id() ?>" 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->name()]) ?>"> <?= 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"> @@ -102,14 +102,14 @@ <?php if (count($all_trees) > 1) : ?> <li> <span class="fa-li"><?= view('icons/favorite') ?></span> - <?php if ($managed_tree->getName() === Site::getPreference('DEFAULT_GEDCOM')) : ?> + <?php if ($managed_tree->name() === Site::getPreference('DEFAULT_GEDCOM')) : ?> <?= I18N::translate('Default family tree') ?> <?php else : ?> <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->id() ?>" 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->name()]) ?>"> <?= csrf_field() ?> <!-- A11Y - forms need submit buttons, but they look ugly here --> <button class="sr-only" type="submit"> @@ -129,7 +129,7 @@ <!-- FIND DUPLICATES --> <li> <span class="fa-li"><?= view('icons/copy') ?></span> - <a href="<?= e(route('admin-trees-duplicates', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-duplicates', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Find duplicates') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -139,7 +139,7 @@ <!-- MERGE --> <li> <span class="fa-li"><?= view('icons/merge') ?></span> - <a href="<?= e(route('merge-records', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('merge-records', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Merge records') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -149,7 +149,7 @@ <!-- UPDATE PLACE NAMES --> <li> <span class="fa-li"><?= view('icons/location') ?></span> - <a href="<?= e(route('admin-trees-places', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-places', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Update place names') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -159,7 +159,7 @@ <!-- CHECK FOR ERRORS --> <li> <span class="fa-li"><?= view('icons/warning') ?></span> - <a href="<?= e(route('admin-trees-check', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-check', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Check for errors') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -169,7 +169,7 @@ <!-- UNCONNECTED INDIVIDUALS --> <li> <span class="fa-li"><?= view('icons/unlink') ?></span> - <a href="<?= e(route('admin-trees-unconnected', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-unconnected', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Find unrelated individuals') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -179,7 +179,7 @@ <!-- RENUMBER --> <li> <span class="fa-li"><?= view('icons/sort') ?></span> - <a href="<?= e(route('admin-trees-renumber', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-renumber', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Renumber') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -189,7 +189,7 @@ <!-- CHANGES --> <li> <span class="fa-li"><?= view('icons/edit') ?></span> - <a href="<?= route('admin-changes-log', ['ged' => $managed_tree->getName()]) ?>"> + <a href="<?= route('admin-changes-log', ['ged' => $managed_tree->name()]) ?>"> <?= I18N::translate('Changes log') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -207,7 +207,7 @@ <!-- UNLINKED INDIVIDUAL --> <li> <span class="fa-li"><?= view('icons/individual') ?></span> - <a href="<?= e(route('add-unlinked-individual', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('add-unlinked-individual', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Individual') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -217,7 +217,7 @@ <!-- UNLINKED SOURCE --> <li> <span class="fa-li"><?= view('icons/source') ?></span> - <a href="#" data-href="<?= e(route('create-source', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-source', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Source') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -227,7 +227,7 @@ <!-- UNLINKED REPOSITORY --> <li> <span class="fa-li"><?= view('icons/repository') ?></span> - <a href="#" data-href="<?= e(route('create-repository', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-repository', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Repository') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -237,7 +237,7 @@ <!-- UNLINKED MEDIA OBJECT --> <li> <span class="fa-li"><?= view('icons/media') ?></span> - <a href="#" data-href="<?= e(route('create-media-object', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-media-object', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Media object') ?> <span class="sr-only"> @@ -248,7 +248,7 @@ <!-- UNLINKED NOTE --> <li> <span class="fa-li"><?= view('icons/note') ?></span> - <a href="#" data-href="<?= e(route('create-note-object', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-note-object', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> </span> @@ -258,7 +258,7 @@ <!-- UNLINKED SUBMITTER --> <li> <span class="fa-li"><?= view('icons/submitter') ?></span> - <a href="#" data-href="<?= e(route('create-submitter', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-submitter', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> </span> @@ -275,7 +275,7 @@ <!-- DOWNLOAD/Export --> <li> <span class="fa-li"><?= view('icons/download') ?></span> - <a href="<?= e(route('admin-trees-export', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-export', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Export') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -285,7 +285,7 @@ <!-- UPLOAD/IMPORT --> <li> <span class="fa-li"><?= view('icons/upload') ?></span> - <a href="<?= e(route('admin-trees-import', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-import', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Import') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -418,7 +418,7 @@ <p> <?= I18N::translate('Create, update, and delete a family tree for every GEDCOM file in the data folder.') ?> </p> - <form method="post" class="form form-horizontal" action="<?= e(route('admin-trees-sync', ['ged' => $tree->getName()])) ?>"> + <form method="post" class="form form-horizontal" action="<?= e(route('admin-trees-sync', ['ged' => $tree->name()])) ?>"> <?= csrf_field() ?> <button type="submit" class="btn btn-danger"> <?= view('icons/save') ?> diff --git a/resources/views/admin/webtrees1-thumbnails-form.phtml b/resources/views/admin/webtrees1-thumbnails-form.phtml index 184c614005..2c87579cf7 100644 --- a/resources/views/admin/webtrees1-thumbnails-form.phtml +++ b/resources/views/admin/webtrees1-thumbnails-form.phtml @@ -3,7 +3,7 @@ <form action="<?= e(route('admin-webtrees1-thumbs-action')) ?>" method="POST"> <input type="hidden" name="thumbnail" value="<?= e($thumbnail) ?>"> <?php foreach ($media as $medium) : ?> - <input type="hidden" name="ged[]" value="<?= e($medium->getTree()->getName()) ?>"> + <input type="hidden" name="ged[]" value="<?= e($medium->getTree()->name()) ?>"> <input type="hidden" name="xref[]" value="<?= e($medium->getXref()) ?>"> <?php endforeach ?> <div class="btn-group"> diff --git a/resources/views/ancestors-page.phtml b/resources/views/ancestors-page.phtml index 35e8a0ebaa..6e902188a5 100644 --- a/resources/views/ancestors-page.phtml +++ b/resources/views/ancestors-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-ancestors-chart d-print-none"> <input type="hidden" name="route" value="ancestors"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -48,4 +48,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-ancestors-chart" data-ajax-url="<?= e(route('ancestors-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'generations' => $generations, 'chart_style' => $chart_style, 'show_cousins' => $show_cousins])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-ancestors-chart" data-ajax-url="<?= e(route('ancestors-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => $chart_style, 'show_cousins' => $show_cousins])) ?>"></div> diff --git a/resources/views/branches-page.phtml b/resources/views/branches-page.phtml index d8ba95276c..da0f6e5c83 100644 --- a/resources/views/branches-page.phtml +++ b/resources/views/branches-page.phtml @@ -7,7 +7,7 @@ <form class="wt-page-options wt-page-options-branches d-print-none"> <input type="hidden" name="route" value="branches"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-form-label col-sm-3 wt-page-options-label" for="surname"> @@ -42,5 +42,5 @@ </form> <?php if ($surname !== '') : ?> - <div class="wt-ajax-load wt-page-content wt-chart wt-branches" data-ajax-url="<?= e(route('branches-list', ['surname' => $surname, 'soundex_std' => $soundex_std, 'soundex_dm' => $soundex_dm, 'ged' => $tree->getName()])) ?>"></div> + <div class="wt-ajax-load wt-page-content wt-chart wt-branches" data-ajax-url="<?= e(route('branches-list', ['surname' => $surname, 'soundex_std' => $soundex_std, 'soundex_dm' => $soundex_dm, 'ged' => $tree->name()])) ?>"></div> <?php endif ?> diff --git a/resources/views/calendar-page.phtml b/resources/views/calendar-page.phtml index fbecea6294..304079b680 100644 --- a/resources/views/calendar-page.phtml +++ b/resources/views/calendar-page.phtml @@ -26,12 +26,12 @@ </th> <td class="wt-page-options-value" colspan="3"> <?php for ($d = 1; $d <= $days_in_month; $d++) : ?> - <a <?= $d === $cal_date->day() ? 'class="error"' : '' ?> href="<?= e(route('calendar', ['cal' => $cal, 'day' => $d, 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a <?= $d === $cal_date->day() ? 'class="error"' : '' ?> href="<?= e(route('calendar', ['cal' => $cal, 'day' => $d, 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= (new Date($cal_date->format("%@ {$d} %O %E")))->minimumDate()->format('%j') ?> </a> | <?php endfor ?> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $today->day(), 'month' => $today_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $today->day(), 'month' => $today_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->name()])) ?>" rel="nofollow"> <b><?php $tmp = new Date($today->format('%@ %A %O %E')); echo $tmp->display() ?></b> </a> </td> @@ -42,7 +42,7 @@ </th> <td class="wt-page-options-value" colspan="3"> <?php foreach ($months as $m => $month_name) : ?> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $m, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $m, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?php if ($m === $cal_month) : ?> <span class="error"><?= e($month_name) ?></span> <?php else : ?> @@ -50,7 +50,7 @@ <?php endif ?> </a> | <?php endforeach ?> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => min($cal_date->day(), $today->daysInMonth()), 'month' => $today_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => min($cal_date->day(), $today->daysInMonth()), 'month' => $today_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->name()])) ?>" rel="nofollow"> <b><?= $today->format('%F %Y') ?></b> </a> </td> @@ -60,15 +60,15 @@ <label for="year"><?= I18N::translate('Year') ?></label> </th> <td class="wt-page-options-value"> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year() === 1 ? -1 : $cal_date->year() - 1, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year() === 1 ? -1 : $cal_date->year() - 1, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> -1 </a> <input type="text" id="year" name="year" value="<?= $year ?>" size="4"> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year() === -1 ? 1 : $cal_date->year() + 1, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year() === -1 ? 1 : $cal_date->year() + 1, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> +1 </a> | - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= $today->format('%Y') ?> </a> <?= FunctionsPrint::helpLink('annivers_year_select') ?> @@ -93,16 +93,16 @@ </select> <?php endif ?> - <a title="<?= I18N::translate('All individuals') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => '', 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a title="<?= I18N::translate('All individuals') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => '', 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> <i class="<?= $filtersx === '' ? 'icon-sex_m_15x15' : 'icon-sex_m_9x9' ?>"></i> <i class="<?= $filtersx === '' ? 'icon-sex_f_15x15' : 'icon-sex_f_9x9' ?>"></i> </a> | - <a title="<?= I18N::translate('Males') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => 'M', 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a title="<?= I18N::translate('Males') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => 'M', 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> <i class="<?= $filtersx === 'M' ? 'icon-sex_m_15x15' : 'icon-sex_m_9x9' ?>"></i> </a> | - <a title="<?= I18N::translate('Females') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => 'F', 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a title="<?= I18N::translate('Females') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => 'F', 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> <i class="<?= $filtersx === 'F' ? 'icon-sex_f_15x15' : 'icon-sex_f_9x9' ?>"></i> </a> @@ -145,15 +145,15 @@ <table class="w-100"> <tr> <td class="topbottombar"> - <a class="<?= $view === 'day' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a class="<?= $view === 'day' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= I18N::translate('View this day') ?> </a> | - <a class="<?= $view === 'month' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a class="<?= $view === 'month' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= I18N::translate('View this month') ?> </a> | - <a class="<?= $view === 'year' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'year', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a class="<?= $view === 'year' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'year', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= I18N::translate('View this year') ?> </a> </td> @@ -166,7 +166,7 @@ if ($n++) { echo ' | '; } - echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->day(), 'month' => $tmp->format('%O'), 'year' => $tmp->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) . '" rel="nofollow">', $cal_name, '</a>'; + echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->day(), 'month' => $tmp->format('%O'), 'year' => $tmp->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->name()])) . '" rel="nofollow">', $cal_name, '</a>'; } } ?> </td> @@ -174,6 +174,6 @@ </table> </form> -<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->getName(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx])) ?>"></div> +<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->name(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx])) ?>"></div> <?= view('modals/ajax') ?> diff --git a/resources/views/compact-tree-arrow.phtml b/resources/views/compact-tree-arrow.phtml index 6f6b14cd36..00ab56b5dd 100644 --- a/resources/views/compact-tree-arrow.phtml +++ b/resources/views/compact-tree-arrow.phtml @@ -4,5 +4,5 @@ <?php if ($individual === null) : ?> <?= FontAwesome::decorativeIcon($class) ?> <?php else : ?> - <?= FontAwesome::linkIcon($class, I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName()])]) ?> + <?= FontAwesome::linkIcon($class, I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name()])]) ?> <?php endif; diff --git a/resources/views/compact-tree-page.phtml b/resources/views/compact-tree-page.phtml index 1662639fd9..aac7831be9 100644 --- a/resources/views/compact-tree-page.phtml +++ b/resources/views/compact-tree-page.phtml @@ -7,7 +7,7 @@ <form class="wt-page-options wt-page-options-compact-chart d-print-none"> <input type="hidden" name="route" value="compact-tree"> - <input type="hidden" name="ged" value="<?= e($individual->getTree()->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($individual->getTree()->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -26,4 +26,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-compact-chart" data-ajax-url="<?= e(route('compact-tree-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName()])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-compact-chart" data-ajax-url="<?= e(route('compact-tree-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name()])) ?>"></div> diff --git a/resources/views/contact-page.phtml b/resources/views/contact-page.phtml index e0d3ce9dc1..9de42e80f6 100644 --- a/resources/views/contact-page.phtml +++ b/resources/views/contact-page.phtml @@ -4,7 +4,7 @@ <form method="post" action="<?= e(route('contact')) ?>"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="url" value="<?= e($url) ?>"> <div class="form-group row"> diff --git a/resources/views/descendants-page.phtml b/resources/views/descendants-page.phtml index 475639592c..162c28f8d3 100644 --- a/resources/views/descendants-page.phtml +++ b/resources/views/descendants-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-descendants-chart d-print-none"> <input type="hidden" name="route" value="descendants"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -48,4 +48,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-descendants-chart" data-ajax-url="<?= e(route('descendants-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'generations' => $generations, 'chart_style' => $chart_style])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-descendants-chart" data-ajax-url="<?= e(route('descendants-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => $chart_style])) ?>"></div> diff --git a/resources/views/edit-account-page.phtml b/resources/views/edit-account-page.phtml index f4b807db06..0873e02f8e 100644 --- a/resources/views/edit-account-page.phtml +++ b/resources/views/edit-account-page.phtml @@ -24,7 +24,7 @@ <form class="wt-page-options wt-page-options-my-account" method="post" onsubmit="return checkform(this);"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="user-name"> @@ -190,7 +190,7 @@ </form> <?php if ($show_delete_option) : ?> - <form action="<?= e(route('delete-account', ['ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('delete-account', ['ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <div class="row form-group"> <div class="col-sm-3 wt-page-options-label"></div> diff --git a/resources/views/edit/add-fact.phtml b/resources/views/edit/add-fact.phtml index aa4a6952e3..5e7d41c67d 100644 --- a/resources/views/edit/add-fact.phtml +++ b/resources/views/edit/add-fact.phtml @@ -9,7 +9,7 @@ <h2 class="wt-page-title"><?= $title ?></h2> -<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->getName(), 'xref' => $record->getXref()])) ?>" method="post"> +<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->name(), 'xref' => $record->getXref()])) ?>" method="post"> <?= csrf_field() ?> <?php FunctionsEdit::createAddForm($tree, $fact) ?> diff --git a/resources/views/edit/change-family-members.phtml b/resources/views/edit/change-family-members.phtml index 687862239e..ec140cad2e 100644 --- a/resources/views/edit/change-family-members.phtml +++ b/resources/views/edit/change-family-members.phtml @@ -7,7 +7,7 @@ <form class="wt-page-content" name="changefamform" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($family->getXref()) ?>"> <div class="form-group row"> diff --git a/resources/views/edit/edit-fact.phtml b/resources/views/edit/edit-fact.phtml index 7e858c7083..c8ac5a1c0b 100644 --- a/resources/views/edit/edit-fact.phtml +++ b/resources/views/edit/edit-fact.phtml @@ -9,7 +9,7 @@ <h2 class="wt-page-title"><?= $title ?></h2> -<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->getName(), 'xref' => $record->getXref(), 'fact_id' => $edit_fact->id()])) ?>" method="post"> <?= csrf_field() ?> +<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->name(), 'xref' => $record->getXref(), 'fact_id' => $edit_fact->id()])) ?>" method="post"> <?= csrf_field() ?> <?php FunctionsEdit::createEditForm($edit_fact) ?> @@ -112,7 +112,7 @@ I18N::translate('cancel') ?> </a> <?php if ($can_edit_raw) : ?> - <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $record->getXref(), 'fact_id' => $edit_fact->id(), 'ged' => $tree->getName()])) ?>"> + <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $record->getXref(), 'fact_id' => $edit_fact->id(), 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif; ?> diff --git a/resources/views/edit/new-individual.phtml b/resources/views/edit/new-individual.phtml index a764421f30..b47dadc331 100644 --- a/resources/views/edit/new-individual.phtml +++ b/resources/views/edit/new-individual.phtml @@ -128,7 +128,7 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR <h2 class="wt-page-title"><?= $title ?></h2> <form method="post" onsubmit="return checkform();"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="action" value="<?= e($nextaction) ?>"> <input type="hidden" name="fact_id" value="<?= e($name_fact_id) ?>"> <input type="hidden" name="xref" value="<?= e($xref) ?>"> @@ -333,7 +333,7 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR </a> <?php if ($name_fact instanceof Fact && (Auth::isAdmin() || $tree->getPreference('SHOW_GEDCOM_RECORD'))) : ?> - <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $xref, 'fact_id' => $name_fact->id(), 'ged' => $tree->getName()])) ?>"> + <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $xref, 'fact_id' => $name_fact->id(), 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/edit/raw-gedcom-fact.phtml b/resources/views/edit/raw-gedcom-fact.phtml index 839a24e847..cab24087dc 100644 --- a/resources/views/edit/raw-gedcom-fact.phtml +++ b/resources/views/edit/raw-gedcom-fact.phtml @@ -5,7 +5,7 @@ <form class="wt-page-content" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($fact->record()->getTree()->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($fact->record()->getTree()->name()) ?>"> <input type="hidden" name="xref" value="<?= e($fact->record()->getXref()) ?>"> <input type="hidden" name="fact_id" value="<?= e($fact->getFactId()) ?>"> diff --git a/resources/views/edit/raw-gedcom-record.phtml b/resources/views/edit/raw-gedcom-record.phtml index d107f85917..eb658d92a3 100644 --- a/resources/views/edit/raw-gedcom-record.phtml +++ b/resources/views/edit/raw-gedcom-record.phtml @@ -6,7 +6,7 @@ <form class="wt-page-content" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($record->getXref()) ?>"> <p class="text-muted small"> diff --git a/resources/views/emails/pending-changes-html.phtml b/resources/views/emails/pending-changes-html.phtml index 3270465529..bc48127416 100644 --- a/resources/views/emails/pending-changes-html.phtml +++ b/resources/views/emails/pending-changes-html.phtml @@ -9,7 +9,7 @@ <ul> <li> - <a href="<?= e(route('show-pending', ['ged' => $tree->getName()], true)) ?>"> + <a href="<?= e(route('show-pending', ['ged' => $tree->name()], true)) ?>"> <?= e($tree->getTitle()) ?> </a> </li> diff --git a/resources/views/emails/pending-changes-text.phtml b/resources/views/emails/pending-changes-text.phtml index 3d448e283b..8d51a28c4d 100644 --- a/resources/views/emails/pending-changes-text.phtml +++ b/resources/views/emails/pending-changes-text.phtml @@ -4,4 +4,4 @@ <?= I18N::translate('There are pending changes for you to moderate.') ?> -<?= $tree->getTitle() ?> - <?= route('show-pending', ['ged' => $tree->getName()], true) ?> +<?= $tree->getTitle() ?> - <?= route('show-pending', ['ged' => $tree->name()], true) ?> diff --git a/resources/views/emails/register-user-html.phtml b/resources/views/emails/register-user-html.phtml index cdc184914e..5ded2c974f 100644 --- a/resources/views/emails/register-user-html.phtml +++ b/resources/views/emails/register-user-html.phtml @@ -12,8 +12,8 @@ </p> <p> - <a href="<?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->getName()], true)) ?>"> - <?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->getName()], true)) ?> + <a href="<?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>"> + <?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?> </a> </p> diff --git a/resources/views/emails/register-user-text.phtml b/resources/views/emails/register-user-text.phtml index f1ddd92efb..3018919818 100644 --- a/resources/views/emails/register-user-text.phtml +++ b/resources/views/emails/register-user-text.phtml @@ -5,6 +5,6 @@ <?= I18N::translate('Follow this link to verify your email address.') ?> -<?= route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->getName()], true) ?> +<?= route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true) ?> <?= I18N::translate('If you didn’t request an account, you can just delete this message.'); diff --git a/resources/views/family-book-page.phtml b/resources/views/family-book-page.phtml index bbfbb68ee5..39053b9c8c 100644 --- a/resources/views/family-book-page.phtml +++ b/resources/views/family-book-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-family-book-chart d-print-none"> <input type="hidden" name="route" value="family-book"> - <input type="hidden" name="ged" value="<?= e($individual->getTree()->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($individual->getTree()->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -56,4 +56,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-family-book-chart" data-ajax-url="<?= e(route('family-book-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'book_size' => $book_size, 'generations' => $generations, 'show_spouse' => (int) $show_spouse])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-family-book-chart" data-ajax-url="<?= e(route('family-book-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'book_size' => $book_size, 'generations' => $generations, 'show_spouse' => (int) $show_spouse])) ?>"></div> diff --git a/resources/views/family-page-menu.phtml b/resources/views/family-page-menu.phtml index d09cffcec2..e71f6c3606 100644 --- a/resources/views/family-page-menu.phtml +++ b/resources/views/family-page-menu.phtml @@ -8,30 +8,30 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-fam-change" href="<?= e(route('change-family-members', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-change" href="<?= e(route('change-family-members', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Change family members') ?> </a> - <a class="dropdown-item menu-fam-addchil" href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-addchil" href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Add a child to this family') ?> </a> <?php if ($record->getNumberOfChildren() > 1) : ?> - <a class="dropdown-item menu-fam-orderchil" href="<?= e(route('reorder-children', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-orderchil" href="<?= e(route('reorder-children', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Re-order children') ?> </a> <?php endif ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-fam-del" href="#" data-confirm="<?= I18N::translate('Deleting the family will unlink all of the individuals from each other but will leave the individuals in place. Are you sure you want to delete this family?') ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-fam-del" href="#" data-confirm="<?= I18N::translate('Deleting the family will unlink all of the individuals from each other but will leave the individuals in place. Are you sure you want to delete this family?') ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-fam-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml index d7a5d91298..9cac6c292e 100644 --- a/resources/views/family-page.phtml +++ b/resources/views/family-page.phtml @@ -7,13 +7,13 @@ <?php if ($record->isPendingDeletion()) : ?> <?php if (Auth::isModerator($record->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($record->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($record->isPendingAddition()) : ?> <?php if (Auth::isModerator($record->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($record->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> @@ -45,13 +45,13 @@ <?php FunctionsCharts::printFamilyParents($record) ?> <?php if (Auth::isEditor($record->getTree())) : ?> <?php if ($record->getHusband() === null) : ?> - <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'famtag' => 'HUSB'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->name(), 'xref' => $record->getXref(), 'famtag' => 'HUSB'])) ?>"> <?= I18N::translate('Add a father') ?> </a> <br> <?php endif ?> <?php if ($record->getWife() === null) : ?> - <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'famtag' => 'WIFE'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->name(), 'xref' => $record->getXref(), 'famtag' => 'WIFE'])) ?>"> <?= I18N::translate('Add a mother') ?> </a> <br> @@ -84,7 +84,7 @@ <?= I18N::translate('Note') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'fact' => 'NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref(), 'fact' => 'NOTE'])) ?>"> <?= I18N::translate('Add a note') ?> </a> </td> @@ -95,7 +95,7 @@ <?= I18N::translate('Shared note') ?> </th> <td class="optionbox"> - <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> <?= I18N::translate('Add a shared note') ?> </a> </td> @@ -107,7 +107,7 @@ <?= I18N::translate('Media object') ?> </th> <td class="optionbox"> - <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'fact' => 'OBJE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref(), 'fact' => 'OBJE'])) ?>"> <?= I18N::translate('Add a media object') ?> </a> </td> @@ -119,7 +119,7 @@ <?= I18N::translate('Source') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'fact' => 'SOUR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref(), 'fact' => 'SOUR'])) ?>"> <?= I18N::translate('Add a source citation') ?> </a> </td> diff --git a/resources/views/fan-page.phtml b/resources/views/fan-page.phtml index 92cc09650a..0dc2f482cb 100644 --- a/resources/views/fan-page.phtml +++ b/resources/views/fan-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-fan-chart d-print-none"> <input type="hidden" name="route" value="fan"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -61,4 +61,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-fan-chart" data-ajax-url="<?= e(route('fan-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'generations' => $generations, 'chart_style' => $chart_style, 'fan_width' => $fan_width])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-fan-chart" data-ajax-url="<?= e(route('fan-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => $chart_style, 'fan_width' => $fan_width])) ?>"></div> diff --git a/resources/views/forgot-password-page.phtml b/resources/views/forgot-password-page.phtml index 52bc200191..7802408854 100644 --- a/resources/views/forgot-password-page.phtml +++ b/resources/views/forgot-password-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-forgot-password" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label wt-page-options-label" for="identifier"> diff --git a/resources/views/gedcom-record-page-menu.phtml b/resources/views/gedcom-record-page-menu.phtml index a5e3d6715d..3ac9a1385a 100644 --- a/resources/views/gedcom-record-page-menu.phtml +++ b/resources/views/gedcom-record-page-menu.phtml @@ -8,14 +8,14 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/gedcom-record-page.phtml b/resources/views/gedcom-record-page.phtml index 205c379d74..a4ccbe7f72 100644 --- a/resources/views/gedcom-record-page.phtml +++ b/resources/views/gedcom-record-page.phtml @@ -6,13 +6,13 @@ <?php if ($record->isPendingDeletion()) : ?> <?php if (Auth::isModerator($record->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This record has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This record has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($record->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($record->isPendingAddition()) : ?> <?php if (Auth::isModerator($record->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This record has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This record has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($record->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> diff --git a/resources/views/hourglass-page.phtml b/resources/views/hourglass-page.phtml index c4bb15fea4..cf6f8111ca 100644 --- a/resources/views/hourglass-page.phtml +++ b/resources/views/hourglass-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-hourglass-chart d-print-none"> <input type="hidden" name="route" value="hourglass"> - <input type="hidden" name="ged" value="<?= e($individual->getTree()->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($individual->getTree()->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -47,4 +47,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-hourglass-chart" data-ajax-url="<?= e(route('hourglass-chart', ['xref' => $individual->getXref(), 'generations' => $generations, 'show_spouse' => $show_spouse, 'ged' => $individual->getTree()->getName()])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-hourglass-chart" data-ajax-url="<?= e(route('hourglass-chart', ['xref' => $individual->getXref(), 'generations' => $generations, 'show_spouse' => $show_spouse, 'ged' => $individual->getTree()->name()])) ?>"></div> diff --git a/resources/views/individual-page-menu.phtml b/resources/views/individual-page-menu.phtml index 500e39cbd0..6c5ed3e8fa 100644 --- a/resources/views/individual-page-menu.phtml +++ b/resources/views/individual-page-menu.phtml @@ -9,37 +9,37 @@ </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> <?php if ($count_sex === 0) : ?> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Edit the gender') ?> </a> <?php endif ?> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-name', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-name', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Add a name') ?> </a> <?php if ($count_names > 1) : ?> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('reorder-names', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('reorder-names', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Re-order names') ?> </a> <?php endif ?> <?php if (empty($individual->getFacts('SEX'))) : ?> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Edit the gender') ?> </a> <?php endif ?> - <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($individual->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($individual->getXref()) ?>', '<?= e($individual->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($individual->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($individual->getXref()) ?>', '<?= e($individual->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $individual->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml index 5cc7f264ba..8fb15ee971 100644 --- a/resources/views/individual-page.phtml +++ b/resources/views/individual-page.phtml @@ -7,7 +7,7 @@ <?php if (Auth::isModerator($individual->getTree())) : ?> <?= view('components/alert-warning-dismissible', [ 'alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ - I18N::translate('This individual has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes'), + I18N::translate('This individual has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes'), ]) ?> <?php elseif (Auth::isEditor($individual->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This individual has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> @@ -16,7 +16,7 @@ <?php if (Auth::isModerator($individual->getTree())) : ?> <?= view('components/alert-warning-dismissible', [ 'alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ - I18N::translate('This individual has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes'), + I18N::translate('This individual has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes'), ]) ?> <?php elseif (Auth::isEditor($individual->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This individual has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> @@ -65,7 +65,7 @@ <?php if (Auth::isEditor($individual->getTree())) : ?> <?php if (count($individual->getFacts('OBJE')) > 1) : ?> <div> - <a href="<?= e(route('reorder-media', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('reorder-media', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Re-order media') ?> </a> </div> @@ -73,7 +73,7 @@ <?php if ($individual->getTree()->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($individual->getTree())) : ?> <div> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'OBJE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'fact' => 'OBJE'])) ?>"> <?= I18N::translate('Add a media object') ?> </a> </div> @@ -97,7 +97,7 @@ <ul class="nav nav-tabs flex-wrap"> <?php foreach ($tabs as $tab) : ?> <li class="nav-item"> - <a class="nav-link<?= $tab->isGrayedOut($individual) ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" data-href="<?= e(route('individual-tab', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'module' => $tab->getName()])) ?>" href="#<?= $tab->getName() ?>"> + <a class="nav-link<?= $tab->isGrayedOut($individual) ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" data-href="<?= e(route('individual-tab', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'module' => $tab->getName()])) ?>" href="#<?= $tab->getName() ?>"> <?= $tab->getTitle() ?> </a> </li> diff --git a/resources/views/interactive-tree-page.phtml b/resources/views/interactive-tree-page.phtml index 496caa9f71..12b58fbf47 100644 --- a/resources/views/interactive-tree-page.phtml +++ b/resources/views/interactive-tree-page.phtml @@ -10,7 +10,7 @@ <input type="hidden" name="route" value="module"> <input type="hidden" name="module" value="tree"> <input type="hidden" name="action" value="Treeview"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> diff --git a/resources/views/layouts/default.phtml b/resources/views/layouts/default.phtml index ce125d36e9..3e6faf2d9a 100644 --- a/resources/views/layouts/default.phtml +++ b/resources/views/layouts/default.phtml @@ -62,7 +62,7 @@ <div class="col wt-header-search"> <form class="wt-header-search-form" role="search"> <input type="hidden" name="route" value="search-quick"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="input-group"> <label class="sr-only" for="quick-search"><?= I18N::translate('Search') ?></label> <input type="search" class="form-control wt-header-search-field" id="quick-search" name="query" size="15" placeholder="<?= I18N::translate('Search') ?>"> diff --git a/resources/views/lifespans-page.phtml b/resources/views/lifespans-page.phtml index 079a3221e5..b633e97da6 100644 --- a/resources/views/lifespans-page.phtml +++ b/resources/views/lifespans-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-lifespans-chart d-print-none"> <input type="hidden" name="route" value="lifespans"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?php foreach ($xrefs as $xref) : ?> <input name="xrefs[]" type="hidden" value="<?= e($xref) ?>"> @@ -67,7 +67,7 @@ <button type="submit" class="btn btn-primary" type="submit"> <?= /* I18N: A button label. */ I18N::translate('add') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('lifespans', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('lifespans', ['ged' => $tree->name()])) ?>"> <?= /* I18N: A button label. */ I18N::translate('reset') ?> </a> </div> @@ -75,4 +75,4 @@ </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-timeline-chart" data-ajax-url="<?= e(route('lifespans-chart', ['ged' => $tree->getName(), 'xrefs' => $xrefs, 'subtitle' => $subtitle])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-timeline-chart" data-ajax-url="<?= e(route('lifespans-chart', ['ged' => $tree->name(), 'xrefs' => $xrefs, 'subtitle' => $subtitle])) ?>"></div> diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml index 6e545aa3ad..8fd74ee734 100644 --- a/resources/views/lists/individuals-table.phtml +++ b/resources/views/lists/individuals-table.phtml @@ -256,7 +256,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <td class="center" data-sort="<?= $key ?>"> <?php if ($sosa) : ?> - <a href="<?= e(route('relationships', ['xref1' => $individuals[1]->getXref(), 'xref2' => $individual->getXref(), 'ged' => $individual->getTree()->getName()])) ?>" title="<?= I18N::translate('Relationships') ?>" rel="nofollow"> + <a href="<?= e(route('relationships', ['xref1' => $individuals[1]->getXref(), 'xref2' => $individual->getXref(), 'ged' => $individual->getTree()->name()])) ?>" title="<?= I18N::translate('Relationships') ?>" rel="nofollow"> <?= I18N::number($key) ?> </a> <?php endif ?> diff --git a/resources/views/lists/surnames-table.phtml b/resources/views/lists/surnames-table.phtml index 7506b8aa93..19bac44961 100644 --- a/resources/views/lists/surnames-table.phtml +++ b/resources/views/lists/surnames-table.phtml @@ -27,17 +27,17 @@ <?php foreach ($surns as $spfxsurn => $indis) : ?> <?php if ($spfxsurn) : ?> <?php if ($surn !== '') : ?> - <a href="<?= route($route, ['surname' => $surn, 'ged' => $tree->getName()]) ?>" dir="auto"> + <a href="<?= route($route, ['surname' => $surn, 'ged' => $tree->name()]) ?>" dir="auto"> <?= e($spfxsurn) ?> </a> <?php else : ?> - <a href="<?= route($route, ['alpha' => ',', 'ged' => $tree->getName()]) ?>" dir="auto"> + <a href="<?= route($route, ['alpha' => ',', 'ged' => $tree->name()]) ?>" dir="auto"> <?= e($spfxsurn) ?> </a> <?php endif ?> <?php else : ?> <!-- No surname, but a value from "2 SURN"? A common workaround for toponyms, etc. --> - <a href="<?= route($route, ['surname' => $surn, 'ged' => $tree->getName()]) ?>" dir="auto"><?= e($surn) ?></a> + <a href="<?= route($route, ['surname' => $surn, 'ged' => $tree->name()]) ?>" dir="auto"><?= e($surn) ?></a> <?php endif ?> <br> <?php endforeach ?> diff --git a/resources/views/media-list-page.phtml b/resources/views/media-list-page.phtml index 679172b50c..aa2bbc6368 100644 --- a/resources/views/media-list-page.phtml +++ b/resources/views/media-list-page.phtml @@ -12,7 +12,7 @@ </h2> <form class="wt-page-options wt-page-options-media-list d-print-none"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="route" value="media-list"> <input type="hidden" name="action" value="1"> <input type="hidden" name="search" value="yes"> @@ -62,7 +62,7 @@ <button type="submit" name="action" value="1" class="btn btn-primary"> <?= /* I18N: A button label. */ I18N::translate('search') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('media-list', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('media-list', ['ged' => $tree->name()])) ?>"> <?= /* I18N: A button label. */ I18N::translate('reset') ?> </a> </div> @@ -76,14 +76,14 @@ <div class="row text-center"> <div class="col"> <?php if ($page > 1) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => 1])) ?>"> <?= I18N::translate('first') ?> </a> <?php endif ?> </div> <div class="col"> <?php if ($page > 1) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page - 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page - 1])) ?>"> <?= I18N::translate('previous') ?> </a> <?php endif ?> @@ -93,14 +93,14 @@ </div> <div class="col"> <?php if ($page < $pages) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page + 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page + 1])) ?>"> <?= I18N::translate('next') ?> </a> <?php endif ?> </div> <div class="col"> <?php if ($page < $pages) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $pages])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $pages])) ?>"> <?= I18N::translate('last') ?> </a> <?php endif ?> @@ -175,14 +175,14 @@ <div class="row text-center"> <div class="col"> <?php if ($page > 1) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => 1])) ?>"> <?= I18N::translate('first') ?> </a> <?php endif ?> </div> <div class="col"> <?php if ($page > 1) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page - 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page - 1])) ?>"> <?= I18N::translate('previous') ?> </a> <?php endif ?> @@ -192,14 +192,14 @@ </div> <div class="col"> <?php if ($page < $pages) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page + 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page + 1])) ?>"> <?= I18N::translate('next') ?> </a> <?php endif ?> </div> <div class="col"> <?php if ($page < $pages) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $pages])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $pages])) ?>"> <?= I18N::translate('last') ?> </a> <?php endif ?> diff --git a/resources/views/media-page-menu.phtml b/resources/views/media-page-menu.phtml index 0094231fec..de323b312a 100644 --- a/resources/views/media-page-menu.phtml +++ b/resources/views/media-page-menu.phtml @@ -11,31 +11,31 @@ <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> <?php if (false && Module::getModuleByName('GEDFact_assistant')) : ?> - <a class="dropdown-item menu-obje-link" href="#" onclick="return ilinkitem('<?= e($record->getXref()) ?>','manage','<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-obje-link" href="#" onclick="return ilinkitem('<?= e($record->getXref()) ?>','manage','<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Manage the links') ?> </a> <?php else : ?> - <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-individual', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-individual', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Link this media object to an individual') ?> </a> - <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-family', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-family', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Link this media object to a family') ?> </a> - <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-source', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-source', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Link this media object to a source') ?> </a> <?php endif ?> - <a class="dropdown-item menu-obje-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-obje-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-obje-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-obje-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/media-page.phtml b/resources/views/media-page.phtml index f9458eeea9..cf47bba253 100644 --- a/resources/views/media-page.phtml +++ b/resources/views/media-page.phtml @@ -8,13 +8,13 @@ <?php if ($media->isPendingDeletion()) : ?> <?php if (Auth::isModerator($media->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($media->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This media object has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($media->isPendingAddition()) : ?> <?php if (Auth::isModerator($media->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($media->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This media object has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> @@ -71,9 +71,9 @@ <?= I18N::translate('Media file') ?> <?php if ($media->canEdit()) : ?> <div class="editfacts"> - <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => '#', 'data-toggle' => 'modal', 'data-target' => '#wt-ajax-modal', 'data-href' => route('edit-media-file', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref(), 'fact_id' => $media_file->factId()])]) ?> + <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => '#', 'data-toggle' => 'modal', 'data-target' => '#wt-ajax-modal', 'data-href' => route('edit-media-file', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref(), 'fact_id' => $media_file->factId()])]) ?> <?php if (count($media->mediaFiles()) > 1) : ?> - <?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . e($media->getTree()->getName()) . '", , "' . e($media->getXref()) . '", "' . $media_file->factId() . '");']) ?> + <?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . e($media->getTree()->name()) . '", , "' . e($media->getXref()) . '", "' . $media_file->factId() . '");']) ?> <?php endif ?> </div> <?php endif ?> @@ -120,7 +120,7 @@ <?= I18N::translate('Source') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref(), 'fact' => 'SOUR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref(), 'fact' => 'SOUR'])) ?>"> <?= I18N::translate('Add a source citation') ?> </a> </td> @@ -130,7 +130,7 @@ <?= I18N::translate('Shared note') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> <?= I18N::translate('Add a shared note') ?> </a> </td> @@ -140,7 +140,7 @@ <?= I18N::translate('Restriction') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref(), 'fact' => 'RESN'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref(), 'fact' => 'RESN'])) ?>"> <?= I18N::translate('Add a restriction') ?> </a> </td> @@ -150,7 +150,7 @@ <?= I18N::translate('Media file') ?> </th> <td> - <a href="#" data-href="<?= e(route('add-media-file', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('add-media-file', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Add a media file') ?> </a> </td> diff --git a/resources/views/message-page.phtml b/resources/views/message-page.phtml index f0c3613c9a..ed3259cad0 100644 --- a/resources/views/message-page.phtml +++ b/resources/views/message-page.phtml @@ -5,7 +5,7 @@ <form method="post" action="<?= e(route('message')) ?>"> <?= csrf_field() ?> <input type="hidden" name="url" value="<?= e($url) ?>"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label" for="from"> diff --git a/resources/views/modals/add-media-file.phtml b/resources/views/modals/add-media-file.phtml index f2ddfe97ec..bbfcee1905 100644 --- a/resources/views/modals/add-media-file.phtml +++ b/resources/views/modals/add-media-file.phtml @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<form action="<?= e(route('add-media-file', ['xref' => $media->getXref(), 'ged' => $media->getTree()->getName()])) ?>" enctype="multipart/form-data" method="POST"> +<form action="<?= e(route('add-media-file', ['xref' => $media->getXref(), 'ged' => $media->getTree()->name()])) ?>" enctype="multipart/form-data" method="POST"> <?= csrf_field() ?> <?= view('modals/header', ['title' => I18N::translate('Add a media file')]) ?> diff --git a/resources/views/modals/create-family.phtml b/resources/views/modals/create-family.phtml index a5bf3ab994..09420bee1c 100644 --- a/resources/views/modals/create-family.phtml +++ b/resources/views/modals/create-family.phtml @@ -5,7 +5,7 @@ <div class="modal wt-modal-create-record" id="modal-create-family"> <form action="<?= e(route('create-family')) ?>" id="form-create-family"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="modal-dialog modal-lg" role="document"> <div class="modal-content"> <div class="modal-header"> diff --git a/resources/views/modals/create-media-object.phtml b/resources/views/modals/create-media-object.phtml index 06dade7474..26fa69108a 100644 --- a/resources/views/modals/create-media-object.phtml +++ b/resources/views/modals/create-media-object.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-media-object')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a media object')]) ?> diff --git a/resources/views/modals/create-note-object.phtml b/resources/views/modals/create-note-object.phtml index 968bcb93b7..d1cf9d7f6c 100644 --- a/resources/views/modals/create-note-object.phtml +++ b/resources/views/modals/create-note-object.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-note-object')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a shared note')]) ?> diff --git a/resources/views/modals/create-repository.phtml b/resources/views/modals/create-repository.phtml index 5f6f21abf2..2fe82ff154 100644 --- a/resources/views/modals/create-repository.phtml +++ b/resources/views/modals/create-repository.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-repository')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a repository')]) ?> diff --git a/resources/views/modals/create-source.phtml b/resources/views/modals/create-source.phtml index 387f1567b9..0bc7ed6494 100644 --- a/resources/views/modals/create-source.phtml +++ b/resources/views/modals/create-source.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-source')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a source')]) ?> diff --git a/resources/views/modals/create-submitter.phtml b/resources/views/modals/create-submitter.phtml index 8a7c8d9512..8dac93c235 100644 --- a/resources/views/modals/create-submitter.phtml +++ b/resources/views/modals/create-submitter.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-submitter')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a submitter')]) ?> diff --git a/resources/views/modals/edit-media-file.phtml b/resources/views/modals/edit-media-file.phtml index 7db7b7ade5..9ac91330ca 100644 --- a/resources/views/modals/edit-media-file.phtml +++ b/resources/views/modals/edit-media-file.phtml @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<form action="<?= e(route('edit-media-file', ['xref' => $media->getXref(), 'ged' => $media->getTree()->getName(), 'fact_id' => $media_file->factId()])) ?>" enctype="multipart/form-data" method="POST"> +<form action="<?= e(route('edit-media-file', ['xref' => $media->getXref(), 'ged' => $media->getTree()->name(), 'fact_id' => $media_file->factId()])) ?>" enctype="multipart/form-data" method="POST"> <?= csrf_field() ?> <?= view('modals/header', ['title' => I18N::translate('Edit a media file')]) ?> diff --git a/resources/views/modals/link-media-to-family.phtml b/resources/views/modals/link-media-to-family.phtml index dea7f4463c..f9d92f22a9 100644 --- a/resources/views/modals/link-media-to-family.phtml +++ b/resources/views/modals/link-media-to-family.phtml @@ -3,7 +3,7 @@ <form action="<?= e(route('link-media-to-record')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($media->getXref()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Link this media object to a family')]) ?> diff --git a/resources/views/modals/link-media-to-individual.phtml b/resources/views/modals/link-media-to-individual.phtml index 9a99c61840..31cb2044b5 100644 --- a/resources/views/modals/link-media-to-individual.phtml +++ b/resources/views/modals/link-media-to-individual.phtml @@ -3,7 +3,7 @@ <form action="<?= e(route('link-media-to-record')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($media->getXref()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Link this media object to an individual')]) ?> diff --git a/resources/views/modals/link-media-to-source.phtml b/resources/views/modals/link-media-to-source.phtml index d0de9aa62b..d3fe184a3d 100644 --- a/resources/views/modals/link-media-to-source.phtml +++ b/resources/views/modals/link-media-to-source.phtml @@ -3,7 +3,7 @@ <form action="<?= e(route('link-media-to-record')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($media->getXref()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Link this media object to a source')]) ?> diff --git a/resources/views/modules/batch_update/admin.phtml b/resources/views/modules/batch_update/admin.phtml index d56426fec5..7eb79aab69 100644 --- a/resources/views/modules/batch_update/admin.phtml +++ b/resources/views/modules/batch_update/admin.phtml @@ -15,7 +15,7 @@ <div class="row form-group"> <label class="col-sm-3 col-form-label"><?= I18N::translate('Family tree') ?></label> <div class="col-sm-9"> - <?= Bootstrap4::select($trees, $tree->getName(), ['id' => 'ged', 'name' => 'ged', 'onchange' => 'this.form.submit();']) ?> + <?= Bootstrap4::select($trees, $tree->name(), ['id' => 'ged', 'name' => 'ged', 'onchange' => 'this.form.submit();']) ?> </div> </div> <div class="row form-group"> diff --git a/resources/views/modules/census-assistant.phtml b/resources/views/modules/census-assistant.phtml index 9aa70dbb20..2eee2aafe3 100644 --- a/resources/views/modules/census-assistant.phtml +++ b/resources/views/modules/census-assistant.phtml @@ -105,7 +105,7 @@ document.querySelector('#census-assistant-class').value = census; document.querySelector('#census-assistant-title').value = censusYear + ' ' + censusPlace + ' - <?= I18N::translate('Census transcript') ?> - <?= strip_tags($individual->getFullName()) ?> - <?= I18N::translate('Household') ?>'; - fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusHeader', 'ged' => $individual->getTree()->getName()]) ?>&census=' + census) + fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusHeader', 'ged' => $individual->getTree()->name()]) ?>&census=' + census) .then(function (response) { return response.text(); }) @@ -135,7 +135,7 @@ var headTd = document.querySelector('#census-assistant-table td'); var head = headTd === null ? xref : headTd.innerHTML; - fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusIndividual', 'ged' => $individual->getTree()->getName()]) ?>&census=' + encodeURIComponent(census) + '&xref=' + encodeURIComponent(xref) + '&head=' + encodeURIComponent(head), {credentials: 'same-origin'}) + fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusIndividual', 'ged' => $individual->getTree()->name()]) ?>&census=' + encodeURIComponent(census) + '&xref=' + encodeURIComponent(xref) + '&head=' + encodeURIComponent(head), {credentials: 'same-origin'}) .then(function (response) { return response.text(); }) @@ -153,7 +153,7 @@ var indi_selector = document.querySelector('#census-assistant-individual'); var xref = indi_selector.options[indi_selector.selectedIndex].value; - fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusIndividual', 'ged' => $individual->getTree()->getName()]) ?>&census=' + encodeURIComponent(census) + '&xref=' + encodeURIComponent(xref) + '&head=' + encodeURIComponent(xref), {credentials: 'same-origin'}) + fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusIndividual', 'ged' => $individual->getTree()->name()]) ?>&census=' + encodeURIComponent(census) + '&xref=' + encodeURIComponent(xref) + '&head=' + encodeURIComponent(xref), {credentials: 'same-origin'}) .then(function (response) { return response.text(); }) diff --git a/resources/views/modules/clippings/download.phtml b/resources/views/modules/clippings/download.phtml index 6b6c82aa0a..a531c7ee96 100644 --- a/resources/views/modules/clippings/download.phtml +++ b/resources/views/modules/clippings/download.phtml @@ -7,7 +7,7 @@ <input type="hidden" name="route" value="module"> <input type="hidden" name="module" value="clippings"> <input type="hidden" name="action" value="Download"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?php if ($is_manager) : ?> <div class="row form-group"> @@ -60,7 +60,7 @@ <?= FontAwesome::decorativeIcon('download') ?> <?= I18N::translate('download') ?> </button> - <a href="<?= e(route('module', ['module' => 'clippings', 'action' => 'Show', 'ged' => $tree->getName()])) ?>" class="btn btn-secondary"> + <a href="<?= e(route('module', ['module' => 'clippings', 'action' => 'Show', 'ged' => $tree->name()])) ?>" class="btn btn-secondary"> <?= FontAwesome::decorativeIcon('cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/modules/clippings/show.phtml b/resources/views/modules/clippings/show.phtml index c33a0d4f50..20f4bfdb82 100644 --- a/resources/views/modules/clippings/show.phtml +++ b/resources/views/modules/clippings/show.phtml @@ -43,7 +43,7 @@ </a> </td> <td> - <form method="post" action="<?= e(route('module', ['module' => 'clippings', 'action' => 'Remove', 'ged' => $tree->getName(), 'xref' => $record->getXref()])) ?>"> + <form method="post" action="<?= e(route('module', ['module' => 'clippings', 'action' => 'Remove', 'ged' => $tree->name(), 'xref' => $record->getXref()])) ?>"> <?= csrf_field() ?> <button type="submit" class="btn btn-link" title="<?= I18N::translate('Remove') ?>"> <i class="icon-remove"></i> diff --git a/resources/views/modules/descendancy/sidebar.phtml b/resources/views/modules/descendancy/sidebar.phtml index 5d8763b807..20e1c49c4a 100644 --- a/resources/views/modules/descendancy/sidebar.phtml +++ b/resources/views/modules/descendancy/sidebar.phtml @@ -1,7 +1,7 @@ <?php use Fisharebest\Webtrees\I18N; ?> <?php use Fisharebest\Webtrees\View; ?> -<form method="post" action="<?= e(route('module', ['module' => 'descendancy', 'action' => 'Descendants', 'ged' => $tree->getName()])) ?>" onsubmit="return false;"> +<form method="post" action="<?= e(route('module', ['module' => 'descendancy', 'action' => 'Descendants', 'ged' => $tree->name()])) ?>" onsubmit="return false;"> <input type="search" name="sb_desc_name" id="sb_desc_name" placeholder="<?= I18N::translate('Search') ?>"> </form> @@ -16,7 +16,7 @@ function dsearchQ() { var query = $("#sb_desc_name").val(); if (query.length>1) { - $("#sb_desc_content").load(<?= json_encode(route('module', ['module' => 'descendancy', 'action' => 'Search', 'ged' => $tree->getName()])) ?> + "&search=" + encodeURIComponent(query)); + $("#sb_desc_content").load(<?= json_encode(route('module', ['module' => 'descendancy', 'action' => 'Search', 'ged' => $tree->name()])) ?> + "&search=" + encodeURIComponent(query)); } } diff --git a/resources/views/modules/faq/config.phtml b/resources/views/modules/faq/config.phtml index 6c20ef39ee..9cccb4c751 100644 --- a/resources/views/modules/faq/config.phtml +++ b/resources/views/modules/faq/config.phtml @@ -19,13 +19,13 @@ <label for="ged" class="sr-only"> <?= I18N::translate('Family tree') ?> </label> - <?= Bootstrap4::select($tree_names, $tree->getName(), ['id' => 'ged', 'name' => 'ged']) ?> + <?= Bootstrap4::select($tree_names, $tree->name(), ['id' => 'ged', 'name' => 'ged']) ?> <input type="submit" class="btn btn-primary" value="<?= I18N::translate('show') ?>"> </form> </p> <p> - <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link"> + <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->name()])) ?>" class="btn btn-link"> <?= view('icons/add') ?> <?= /* I18N: FAQ = “Frequently Asked Question” */ I18N::translate('Add an FAQ') ?> @@ -62,7 +62,7 @@ </td> <td> <?php if ($faq->block_order != $min_block_order) : ?> - <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveUp', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveUp', 'block_id' => $faq->block_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-secondary"> <?= view('icons/arrow-up') ?> @@ -73,7 +73,7 @@ </td> <td> <?php if ($faq->block_order != $max_block_order) : ?> - <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveDown', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveDown', 'block_id' => $faq->block_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-secondary"> <?= view('icons/arrow-down') ?> @@ -83,13 +83,13 @@ <?php endif ?> </td> <td> - <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" class="btn btn-primary"> + <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'block_id' => $faq->block_id, 'ged' => $tree->name()])) ?>" class="btn btn-primary"> <?= view('icons/edit') ?> <?= I18N::translate('Edit') ?> </a> </td> <td> - <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminDelete', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminDelete', 'block_id' => $faq->block_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-danger" onclick="return confirm(this.dataset.confirm);" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($faq->header)) ?>"> <?= view('icons/delete') ?> diff --git a/resources/views/modules/faq/edit.phtml b/resources/views/modules/faq/edit.phtml index 206f1109aa..1438f5c452 100644 --- a/resources/views/modules/faq/edit.phtml +++ b/resources/views/modules/faq/edit.phtml @@ -2,7 +2,7 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-modules') => I18N::translate('Modules'), route('module', ['module' => 'faq', 'action' => 'Admin', 'ged' => $tree->getName()]) => I18N::translate('Frequently asked questions'), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-modules') => I18N::translate('Modules'), route('module', ['module' => 'faq', 'action' => 'Admin', 'ged' => $tree->name()]) => I18N::translate('Frequently asked questions'), $title]]) ?> <h1><?= $title ?></h1> @@ -58,7 +58,7 @@ </label> <div class="col-sm-9"> - <?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->getName(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?> + <?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->name(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?> <p class="small text-muted"> <?= /* I18N: FAQ = “Frequently Asked Question” */ I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?> diff --git a/resources/views/modules/gedcom_favorites/favorites.phtml b/resources/views/modules/gedcom_favorites/favorites.phtml index 5ca167dabb..ab190e1c45 100644 --- a/resources/views/modules/gedcom_favorites/favorites.phtml +++ b/resources/views/modules/gedcom_favorites/favorites.phtml @@ -18,7 +18,7 @@ </div> <?php if ($is_manager) : ?> - <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->getName(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->name(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-link btn-sm" data-confirm="<?= I18N::translate('Are you sure you want to remove this item from your list of favorites?') ?>" onclick="return confirm(this.dataset.confirm);"> <?= I18N::translate('Remove') ?> @@ -35,7 +35,7 @@ </a> </div> <div id="add_fav<?= e($block_id) ?>" style="display: none;"> - <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'AddFavorite', 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'AddFavorite', 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <div class="add_fav_ref"> <input type="radio" name="fav_category" value="record" checked onclick="$('#xref<?= e($block_id) ?>').removeAttr('disabled'); $('#url, #title').attr('disabled','disabled').val('');"> diff --git a/resources/views/modules/gedcom_news/edit.phtml b/resources/views/modules/gedcom_news/edit.phtml index 1da2e6525b..8fa6fd5a21 100644 --- a/resources/views/modules/gedcom_news/edit.phtml +++ b/resources/views/modules/gedcom_news/edit.phtml @@ -37,7 +37,7 @@ <?= I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('tree-page', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('tree-page', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('cancel') ?> </a> </td> diff --git a/resources/views/modules/gedcom_news/list.phtml b/resources/views/modules/gedcom_news/list.phtml index 979e917fb3..435e28f7c5 100644 --- a/resources/views/modules/gedcom_news/list.phtml +++ b/resources/views/modules/gedcom_news/list.phtml @@ -22,9 +22,9 @@ <?php if (Auth::isManager($tree)) : ?> <hr> - <form action="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'DeleteNews', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'DeleteNews', 'news_id' => $article->news_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> - <a class="btn btn-link" href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>"> + <a class="btn btn-link" href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'news_id' => $article->news_id, 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit') ?> </a> | @@ -42,7 +42,7 @@ <?php if (Auth::isManager($tree)) : ?> <p> - <a href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Add a news article') ?> </a> </p> diff --git a/resources/views/modules/notes/tab.phtml b/resources/views/modules/notes/tab.phtml index bbb5b1e216..d746883ff8 100644 --- a/resources/views/modules/notes/tab.phtml +++ b/resources/views/modules/notes/tab.phtml @@ -34,7 +34,7 @@ <?= I18N::translate('Note') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'fact' => 'NOTE'])) ?>"> <?= I18N::translate('Add a note') ?> </a> </td> @@ -44,7 +44,7 @@ <?= I18N::translate('Shared note') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> <?= I18N::translate('Add a shared note') ?> </a> </td> diff --git a/resources/views/modules/pedigree-map/pedigree-map-page.phtml b/resources/views/modules/pedigree-map/pedigree-map-page.phtml index fc85f6dffa..f084a839b8 100644 --- a/resources/views/modules/pedigree-map/pedigree-map-page.phtml +++ b/resources/views/modules/pedigree-map/pedigree-map-page.phtml @@ -8,7 +8,7 @@ <input type="hidden" name="route" value="module"> <input type="hidden" name="module" value="<?= $module ?>"> <input type="hidden" name="action" value="PedigreeMap"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> diff --git a/resources/views/modules/pedigree-map/pedigree-map.phtml b/resources/views/modules/pedigree-map/pedigree-map.phtml index 411903b049..f31215824d 100644 --- a/resources/views/modules/pedigree-map/pedigree-map.phtml +++ b/resources/views/modules/pedigree-map/pedigree-map.phtml @@ -152,7 +152,7 @@ reference: reference, type: mapType, generations: Generations, - ged: <?= json_encode($tree->getName()) ?> + ged: <?= json_encode($tree->name()) ?> }) .done(function (data, textStatus, jqXHR) { if (jqXHR.status === 200 && data.features.length === 1) { diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml index 08b0fab15c..c1781d1482 100644 --- a/resources/views/modules/relatives/family.phtml +++ b/resources/views/modules/relatives/family.phtml @@ -42,7 +42,7 @@ <tr> <th scope="row"></th> <td> - <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'famtag' => 'HUSB'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->name(), 'xref' => $family->getXref(), 'famtag' => 'HUSB'])) ?>"> <?= I18N::translate('Add a husband to this family') ?> </a> </td> @@ -79,7 +79,7 @@ <tr> <th scope="row"></th> <td> - <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'famtag' => 'WIFE'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->name(), 'xref' => $family->getXref(), 'famtag' => 'WIFE'])) ?>"> <?= I18N::translate('Add a wife to this family') ?> </a> </td> @@ -122,7 +122,7 @@ <th scope="row"> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'fact' => 'MARR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $family->getTree()->name(), 'xref' => $family->getXref(), 'fact' => 'MARR'])) ?>"> <?= I18N::translate('Add marriage details') ?> </a> </td> @@ -190,13 +190,13 @@ <tr> <th scope="row"> <?php if (count($family->getChildren()) > 1) : ?> - <a href="<?= e(route('reorder-children', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>"> + <a href="<?= e(route('reorder-children', ['ged' => $family->getTree()->name(), 'xref' => $family->getXref()])) ?>"> <i class="icon-media-shuffle"></i> <?= I18N::translate('Re-order children') ?> </a> <?php endif; ?> </th> <td> - <a href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>"> + <a href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $family->getTree()->name(), 'xref' => $family->getXref()])) ?>"> <?php if ($type == 'FAMS') : ?> <?= I18N::translate('Add a son or daughter') ?> <?php else : ?> @@ -204,9 +204,9 @@ <?php endif ?> </a> - <a href="<?= e(route('add-child-to-family', ['gender' => 'M', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>" class="icon-sex_m_15x15"></a> + <a href="<?= e(route('add-child-to-family', ['gender' => 'M', 'ged' => $family->getTree()->name(), 'xref' => $family->getXref()])) ?>" class="icon-sex_m_15x15"></a> - <a href="<?= e(route('add-child-to-family', ['gender' => 'F', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>" class="icon-sex_f_15x15"></a> + <a href="<?= e(route('add-child-to-family', ['gender' => 'F', 'ged' => $family->getTree()->name(), 'xref' => $family->getXref()])) ?>" class="icon-sex_f_15x15"></a> </td> </tr> <?php endif ?> diff --git a/resources/views/modules/relatives/tab.phtml b/resources/views/modules/relatives/tab.phtml index 38e1fd4692..2329da77c5 100644 --- a/resources/views/modules/relatives/tab.phtml +++ b/resources/views/modules/relatives/tab.phtml @@ -20,14 +20,14 @@ <tbody> <tr> <td> - <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'M'])) ?>"> + <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'gender' => 'M'])) ?>"> <?= I18N::translate('Add a father') ?> </a> </td> </tr> <tr> <td> - <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'F'])) ?>"> + <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'gender' => 'F'])) ?>"> <?= I18N::translate('Add a mother') ?> </a> </td> @@ -87,7 +87,7 @@ <?php if (count($spouse_families) > 1) : ?> <tr> <td> - <a href="<?= e(route('reorder-spouses', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('reorder-spouses', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Re-order families') ?> </a> </td> @@ -95,7 +95,7 @@ <?php endif ?> <tr> <td> - <a href="<?= e(route('link-child-to-family', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('link-child-to-family', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Link this individual to an existing family as a child') ?> </a> </td> @@ -103,7 +103,7 @@ <tr> <td> - <a href="<?= e(route('add-spouse-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('add-spouse-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?php if ($individual->getSex() !== 'F') : ?> <?= I18N::translate('Add a wife') ?> <?php else : ?> @@ -115,7 +115,7 @@ <tr> <td> - <a href="<?= e(route('link-spouse-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('link-spouse-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?php if ($individual->getSex() !== 'F') : ?> <?= I18N::translate('Add a wife using an existing individual') ?> <?php else : ?> @@ -127,7 +127,7 @@ <tr> <td> - <a href="<?= e(route('add-child-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'U'])) ?>"> + <a href="<?= e(route('add-child-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'gender' => 'U'])) ?>"> <?= I18N::translate('Add a child to create a one-parent family') ?> </a> </td> diff --git a/resources/views/modules/sources_tab/tab.phtml b/resources/views/modules/sources_tab/tab.phtml index 7bb486123a..5beb995847 100644 --- a/resources/views/modules/sources_tab/tab.phtml +++ b/resources/views/modules/sources_tab/tab.phtml @@ -32,7 +32,7 @@ <?= I18N::translate('Source') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'SOUR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'fact' => 'SOUR'])) ?>"> <?= I18N::translate('Add a source citation') ?> </a> </td> diff --git a/resources/views/modules/stories/config.phtml b/resources/views/modules/stories/config.phtml index 82026dd0a8..2bc0b1e5c0 100644 --- a/resources/views/modules/stories/config.phtml +++ b/resources/views/modules/stories/config.phtml @@ -14,14 +14,14 @@ <?= I18N::translate('Family tree') ?> </label> - <?= Bootstrap4::select($tree_names, $tree->getName(), ['id' => 'ged', 'name' => 'ged']) ?> + <?= Bootstrap4::select($tree_names, $tree->name(), ['id' => 'ged', 'name' => 'ged']) ?> <button type="submit" class="btn btn-primary"> <?= I18N::translate('show') ?> </button> </form> <p> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->name()])) ?>" class="btn btn-link"> <?= view('icons/add') ?> <?= I18N::translate('Add a story') ?> </a> @@ -52,13 +52,13 @@ <?= e($story->title) ?> </td> <td> - <a class="btn btn-primary" href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>"> + <a class="btn btn-primary" href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->name(), 'block_id' => $story->block_id])) ?>"> <?= view('icons/edit') ?> <?= I18N::translate('Edit') ?> </a> </td> <td> - <form action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminDelete', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminDelete', 'ged' => $tree->name(), 'block_id' => $story->block_id])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-danger" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($story->title)) ?>" onclick="return confirm(this.dataset.confirm);"> <?= view('icons/delete') ?> diff --git a/resources/views/modules/stories/edit.phtml b/resources/views/modules/stories/edit.phtml index 7265dd04cc..991c719412 100644 --- a/resources/views/modules/stories/edit.phtml +++ b/resources/views/modules/stories/edit.phtml @@ -1,11 +1,11 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-modules') => I18N::translate('Modules'), route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->getName()]) => I18N::translate('Stories'), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-modules') => I18N::translate('Modules'), route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->name()]) => I18N::translate('Stories'), $title]]) ?> <h1><?= $title ?></h1> -<form class="form-horizontal" method="post" action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $block_id, 'ged' => $tree->getName()])) ?>"> +<form class="form-horizontal" method="post" action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $block_id, 'ged' => $tree->name()])) ?>"> <?= csrf_field() ?> <div class="row form-group"> @@ -51,7 +51,7 @@ <?= I18N::translate('save') ?> </button> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->getName()])) ?>" class="btn btn-secondary"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->name()])) ?>" class="btn btn-secondary"> <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/modules/stories/tab.phtml b/resources/views/modules/stories/tab.phtml index f22a01abce..14817994ae 100644 --- a/resources/views/modules/stories/tab.phtml +++ b/resources/views/modules/stories/tab.phtml @@ -10,7 +10,7 @@ </div> <?php if ($is_admin) : ?> <div class="story_edit"> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $story->block_id, 'ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $story->block_id, 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit the story') ?> </a> </div> @@ -19,7 +19,7 @@ <?php if ($is_admin && empty($stories)) : ?> <div> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'xref' => $individual->getXref(), 'ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'xref' => $individual->getXref(), 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Add a story') ?> </a> </div> diff --git a/resources/views/modules/user_blog/edit.phtml b/resources/views/modules/user_blog/edit.phtml index 1998d123d7..642a8db6eb 100644 --- a/resources/views/modules/user_blog/edit.phtml +++ b/resources/views/modules/user_blog/edit.phtml @@ -37,7 +37,7 @@ <?= I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('user-page', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('user-page', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('cancel') ?> </a> </td> diff --git a/resources/views/modules/user_blog/list.phtml b/resources/views/modules/user_blog/list.phtml index 10115ce0b3..e60e26f8a7 100644 --- a/resources/views/modules/user_blog/list.phtml +++ b/resources/views/modules/user_blog/list.phtml @@ -22,9 +22,9 @@ <?php if (Auth::isManager($tree)) : ?> <hr> - <form action="<?= e(route('module', ['module' => 'user_blog', 'action' => 'DeleteJournal', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'user_blog', 'action' => 'DeleteJournal', 'news_id' => $article->news_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> - <a class="btn btn-link" href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>"> + <a class="btn btn-link" href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'news_id' => $article->news_id, 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit') ?> </a> | @@ -41,7 +41,7 @@ <?php endif ?> <p> - <a href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Add a news article') ?> </a> </p> diff --git a/resources/views/modules/user_favorites/favorites.phtml b/resources/views/modules/user_favorites/favorites.phtml index fb32842a35..437de77802 100644 --- a/resources/views/modules/user_favorites/favorites.phtml +++ b/resources/views/modules/user_favorites/favorites.phtml @@ -17,7 +17,7 @@ </div> </div> - <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->getName(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->name(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-link btn-sm" data-confirm="<?= I18N::translate('Are you sure you want to remove this item from your list of favorites?') ?>" onclick="return confirm(this.dataset.confirm);"> <?= I18N::translate('Remove') ?> @@ -32,7 +32,7 @@ </a> </div> <div id="add_fav<?= e($block_id) ?>" style="display: none;"> - <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'AddFavorite', 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'AddFavorite', 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <div class="add_fav_ref"> <input type="radio" name="fav_category" value="record" checked onclick="$('#xref<?= e($block_id) ?>').removeAttr('disabled'); $('#url, #title').attr('disabled','disabled').val('');"> diff --git a/resources/views/note-page-menu.phtml b/resources/views/note-page-menu.phtml index 04d671aa70..c8ed01d7ae 100644 --- a/resources/views/note-page-menu.phtml +++ b/resources/views/note-page-menu.phtml @@ -8,14 +8,14 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-note-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-note-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-note-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-note-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/note-page.phtml b/resources/views/note-page.phtml index 8581f1d304..cf69fe5992 100644 --- a/resources/views/note-page.phtml +++ b/resources/views/note-page.phtml @@ -7,13 +7,13 @@ <?php if ($note->isPendingDeletion()) : ?> <?php if (Auth::isModerator($note->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This note has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This note has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($note->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This note has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($note->isPendingAddition()) : ?> <?php if (Auth::isModerator($note->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This note has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This note has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($note->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This note has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> @@ -75,7 +75,7 @@ <?= I18N::translate('Shared note') ?> <?php if (Auth::isEditor($note->getTree())) : ?> <div class="editfacts"> - <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => route('edit-note-object', ['xref' => $note->getXref(), 'ged' => $note->getTree()->getName()])]) ?> + <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => route('edit-note-object', ['xref' => $note->getXref(), 'ged' => $note->getTree()->name()])]) ?> </div> <?php endif ?> </th> diff --git a/resources/views/pedigree-page.phtml b/resources/views/pedigree-page.phtml index ec6faa6a9e..b8677d4374 100644 --- a/resources/views/pedigree-page.phtml +++ b/resources/views/pedigree-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-pedigree-chart d-print-none"> <input type="hidden" name="route" value="pedigree"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -45,4 +45,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-pedigree-chart" data-ajax-url="<?= e(route('pedigree-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'generations' => $generations, 'orientation' => $orientation])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-pedigree-chart" data-ajax-url="<?= e(route('pedigree-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'orientation' => $orientation])) ?>"></div> diff --git a/resources/views/pending-changes-page.phtml b/resources/views/pending-changes-page.phtml index 20829a3725..728d46b9bf 100644 --- a/resources/views/pending-changes-page.phtml +++ b/resources/views/pending-changes-page.phtml @@ -95,14 +95,14 @@ <?php endforeach ?> <div class="d-flex justify-content-between"> - <form action="<?= e(route('accept-all-changes', ['ged' => $tree->getName(), 'url' => $url])) ?>" method="POST"> + <form action="<?= e(route('accept-all-changes', ['ged' => $tree->name(), 'url' => $url])) ?>" method="POST"> <?= csrf_field() ?> <button class="btn btn-primary" type="submit"> <?= I18N::translate('Accept all changes') ?> </button> </form> - <form action="<?= e(route('reject-all-changes', ['ged' => $tree->getName(), 'url' => $url])) ?>" method="POST"> + <form action="<?= e(route('reject-all-changes', ['ged' => $tree->name(), 'url' => $url])) ?>" method="POST"> <?= csrf_field() ?> <button class="btn btn-secondary" type="submit" data-confirm="<?= I18N::translate('Are you sure you want to reject all the changes to this family tree?') ?>" onclick="return confirm(this.dataset.confirm);"> <?= I18N::translate('Reject all changes') ?> diff --git a/resources/views/places-page.phtml b/resources/views/places-page.phtml index 06e1e3e1da..24796556c8 100644 --- a/resources/views/places-page.phtml +++ b/resources/views/places-page.phtml @@ -5,7 +5,7 @@ <h4><?= $title ?></h4> <h5 class="center"> <?php if ($current) : ?> - <a href="<?= e(route('place-hierarchy', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('place-hierarchy', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('World') ?> </a> <?php else : ?> @@ -29,13 +29,13 @@ <?= $content ?> <div class="center"> <?php if ($showeventslink) : ?> - <a class="formField" href= <?= e(route('place-hierarchy', ['ged' => $tree->getName(), 'parent' => $parent, 'action' => 'hierarchy-e'])) ?>> + <a class="formField" href= <?= e(route('place-hierarchy', ['ged' => $tree->name(), 'parent' => $parent, 'action' => 'hierarchy-e'])) ?>> <?= I18N::translate('View table of events occurring in %s', $place) ?> </a> | <?php endif ?> - <a href="<?= e(route('place-hierarchy', ['ged' => $tree->getName(), 'action' => key($nextaction)])) ?>"> + <a href="<?= e(route('place-hierarchy', ['ged' => $tree->name(), 'action' => key($nextaction)])) ?>"> <?= current($nextaction) ?> </a> </div> diff --git a/resources/views/register-page.phtml b/resources/views/register-page.phtml index 6df8c44f53..0117870a68 100644 --- a/resources/views/register-page.phtml +++ b/resources/views/register-page.phtml @@ -13,7 +13,7 @@ <form autocomplete="off" class="wt-page-options wt-page-options-register" method="post" action="<?= e(route('register')) ?>"> <?= csrf_field() ?> - <input name="ged" type="hidden" value="<?= e($tree->getName()) ?>"> + <input name="ged" type="hidden" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label wt-page-options-label" for="realname"> diff --git a/resources/views/relationships-page.phtml b/resources/views/relationships-page.phtml index 9756829d6a..d43d5a8486 100644 --- a/resources/views/relationships-page.phtml +++ b/resources/views/relationships-page.phtml @@ -9,7 +9,7 @@ <form class="wt-page-options wt-page-options-relationships-chart d-print-none"> <input type="hidden" name="route" value="relationships"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref1"> @@ -82,7 +82,7 @@ <div class="wt-ajax-load wt-page-content wt-chart wt-relationships-chart" data-ajax-url="<?= e(route('relationships-chart', [ 'xref1' => $individual1->getXref(), 'xref2' => $individual2->getXref(), - 'ged' => $individual2->getTree()->getName(), + 'ged' => $individual2->getTree()->name(), 'recursion' => $recursion, 'ancestors' => $ancestors, ])) ?>"></div> diff --git a/resources/views/report-select-page.phtml b/resources/views/report-select-page.phtml index 31fcbbeaee..dd3bdb382d 100644 --- a/resources/views/report-select-page.phtml +++ b/resources/views/report-select-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-report-select"> <input type="hidden" name="route" value="report-setup"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="report"> <?= I18N::translate('Report') ?> diff --git a/resources/views/report-setup-page.phtml b/resources/views/report-setup-page.phtml index 117c77962c..4b57f51a2c 100644 --- a/resources/views/report-setup-page.phtml +++ b/resources/views/report-setup-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-report-setup"> <input type="hidden" name="route" value="report-run"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="report" value="<?= e($report) ?>"> <div class="row form-group"> diff --git a/resources/views/repository-page-menu.phtml b/resources/views/repository-page-menu.phtml index 385bb9d66c..5d2fdef2b1 100644 --- a/resources/views/repository-page-menu.phtml +++ b/resources/views/repository-page-menu.phtml @@ -8,14 +8,14 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-repo-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-repo-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-repo-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-repo-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/repository-page.phtml b/resources/views/repository-page.phtml index 41ae46c090..70010496ce 100644 --- a/resources/views/repository-page.phtml +++ b/resources/views/repository-page.phtml @@ -6,13 +6,13 @@ <?php if ($repository->isPendingDeletion()) : ?> <?php if (Auth::isModerator($repository->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This repository has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This repository has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($repository->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This repository has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($repository->isPendingAddition()) : ?> <?php if (Auth::isModerator($repository->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This repository has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $repository->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This repository has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $repository->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($repository->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This repository has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> diff --git a/resources/views/search-general-page.phtml b/resources/views/search-general-page.phtml index bf682c0e1d..060b7c2315 100644 --- a/resources/views/search-general-page.phtml +++ b/resources/views/search-general-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-search hidden-print mb-4" name="searchform"> <input type="hidden" name="route" value="search-general"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="query"> <?= I18N::translate('Search for') ?> @@ -74,7 +74,7 @@ <?php foreach ($all_trees as $tree) : ?> <div class="col px-0"> <label class="form-check-label"> - <input class="form-check form-check-input" type="checkbox" <?= in_array($tree, $search_trees) ? 'checked' : '' ?> value="<?= ($tree->getName()) ?>" name="search_trees[]"> + <input class="form-check form-check-input" type="checkbox" <?= in_array($tree, $search_trees) ? 'checked' : '' ?> value="<?= $tree->name() ?>" name="search_trees[]"> <?= e($tree->getTitle()) ?> </label> </div> diff --git a/resources/views/search-phonetic-page.phtml b/resources/views/search-phonetic-page.phtml index 4d32a0e4a5..c78a0568fc 100644 --- a/resources/views/search-phonetic-page.phtml +++ b/resources/views/search-phonetic-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-ancestors-chart hidden-print mb-4" name="searchform"> <input type="hidden" name="route" value="search-phonetic"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="firstname"> <?= I18N::translate('Given name') ?> @@ -74,7 +74,7 @@ <?php foreach ($all_trees as $tree) : ?> <div class="col px-0"> <label class="form-check-label"> - <input class="form-check form-check-input" type="checkbox" <?= in_array($tree, $search_trees) ? 'checked' : '' ?> value="<?= ($tree->getName()) ?>" name="search_trees[]"> + <input class="form-check form-check-input" type="checkbox" <?= in_array($tree, $search_trees) ? 'checked' : '' ?> value="<?= $tree->name() ?>" name="search_trees[]"> <?= e($tree->getTitle()) ?> </label> </div> diff --git a/resources/views/search-replace-page.phtml b/resources/views/search-replace-page.phtml index 0a379e7825..575ece5c01 100644 --- a/resources/views/search-replace-page.phtml +++ b/resources/views/search-replace-page.phtml @@ -5,7 +5,7 @@ <?= $title ?> </h2> -<form class="wt-page-options wt-page-options-ancestors-chart hidden-print" method="post" action="<?= e(route('search-replace', ['ged' => $tree->getName()])) ?>"> +<form class="wt-page-options wt-page-options-ancestors-chart hidden-print" method="post" action="<?= e(route('search-replace', ['ged' => $tree->name()])) ?>"> <?= csrf_field() ?> <div class="row form-group"> diff --git a/resources/views/source-page-menu.phtml b/resources/views/source-page-menu.phtml index 570d1287bf..0f62a493c7 100644 --- a/resources/views/source-page-menu.phtml +++ b/resources/views/source-page-menu.phtml @@ -8,14 +8,14 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-sour-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-sour-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-sour-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-sour-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/source-page.phtml b/resources/views/source-page.phtml index e2d9c34937..4726389448 100644 --- a/resources/views/source-page.phtml +++ b/resources/views/source-page.phtml @@ -6,13 +6,13 @@ <?php if ($source->isPendingDeletion()) : ?> <?php if (Auth::isModerator($source->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($source->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This source has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($source->isPendingAddition()) : ?> <?php if (Auth::isModerator($source->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($source->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This source has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> @@ -75,7 +75,7 @@ <?= I18N::translate('Media object') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $source->getTree()->getName(), 'xref' => $source->getXref(), 'fact' => 'OBJE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $source->getTree()->name(), 'xref' => $source->getXref(), 'fact' => 'OBJE'])) ?>"> <?= I18N::translate('Add a media object') ?> </a> </td> diff --git a/resources/views/statistics-chart-custom.phtml b/resources/views/statistics-chart-custom.phtml index 54f4b222a3..0e53a565e3 100644 --- a/resources/views/statistics-chart-custom.phtml +++ b/resources/views/statistics-chart-custom.phtml @@ -89,7 +89,7 @@ use Fisharebest\Webtrees\I18N; </h3> <form id="own-stats-form" action="<?= e(route('statistics-chart')) ?>" onsubmit="return loadCustomChart();" class="wt-page-options wt-page-options-statistics"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <div class="col-sm-2 wt-page-options-label"> <?= I18N::translate('Chart type') ?> diff --git a/resources/views/statistics-page.phtml b/resources/views/statistics-page.phtml index 6c713abdff..1dde58378e 100644 --- a/resources/views/statistics-page.phtml +++ b/resources/views/statistics-page.phtml @@ -8,22 +8,22 @@ <div class="wt-page-content wt-chart wt-statistics-chart" id="statistics-tabs"> <ul class="nav nav-tabs" role="tablist"> <li class="nav-item"> - <a class="nav-link" href="#individual-statistics" data-toggle="tab" data-href="<?= e(route('statistics-individuals', ['ged' => $tree->getName()])) ?>" role="tab"> + <a class="nav-link" href="#individual-statistics" data-toggle="tab" data-href="<?= e(route('statistics-individuals', ['ged' => $tree->name()])) ?>" role="tab"> <?= I18N::translate('Individuals') ?> </a> </li> <li class="nav-item"> - <a class="nav-link" href="#family-statistics" data-toggle="tab" data-href="<?= e(route('statistics-families', ['ged' => $tree->getName()])) ?>" role="tab"> + <a class="nav-link" href="#family-statistics" data-toggle="tab" data-href="<?= e(route('statistics-families', ['ged' => $tree->name()])) ?>" role="tab"> <?= I18N::translate('Families') ?> </a> </li> <li class="nav-item"> - <a class="nav-link" href="#other-statistics" data-toggle="tab" data-href="<?= e(route('statistics-other', ['ged' => $tree->getName()])) ?>" role="tab"> + <a class="nav-link" href="#other-statistics" data-toggle="tab" data-href="<?= e(route('statistics-other', ['ged' => $tree->name()])) ?>" role="tab"> <?= I18N::translate('Others') ?> </a> </li> <li class="nav-item"> - <a class="nav-link" href="#custom-statistics" data-toggle="tab" data-href="<?= e(route('statistics-options', ['ged' => $tree->getName()])) ?>" role="tab"> + <a class="nav-link" href="#custom-statistics" data-toggle="tab" data-href="<?= e(route('statistics-options', ['ged' => $tree->name()])) ?>" role="tab"> <?= I18N::translate('Custom') ?> </a> </li> diff --git a/resources/views/timeline-page.phtml b/resources/views/timeline-page.phtml index 3daf2b6c6d..5231fa0859 100644 --- a/resources/views/timeline-page.phtml +++ b/resources/views/timeline-page.phtml @@ -7,7 +7,7 @@ <form class="wt-page-options wt-page-options-timeline-chart d-print-none"> <input type="hidden" name="route" value="timeline"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="scale" value="<?= e($scale) ?>"> <?php foreach ($individuals as $individual) : ?> @@ -31,7 +31,7 @@ <div class="col-sm-9 wt-page-options-value"> <input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */ I18N::translate('add') ?>"> - <a class="btn btn-secondary" href="<?= e(route('timeline', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('timeline', ['ged' => $tree->name()])) ?>"> <?= /* I18N: A button label. */ I18N::translate('reset') ?> </a> </div> diff --git a/resources/views/tree-page-block.phtml b/resources/views/tree-page-block.phtml index 5f9f973758..45d0aab484 100644 --- a/resources/views/tree-page-block.phtml +++ b/resources/views/tree-page-block.phtml @@ -1,5 +1,5 @@ <?php if ($block->loadAjax()) : ?> - <div class="wt-ajax-load" data-ajax-url="<?= e(route('tree-page-block', ['ged' => $tree->getName(), 'block_id' => $block_id])) ?>"> + <div class="wt-ajax-load" data-ajax-url="<?= e(route('tree-page-block', ['ged' => $tree->name(), 'block_id' => $block_id])) ?>"> </div> <?php else : ?> <?= $block->getBlock($tree, $block_id) ?> diff --git a/resources/views/user-page-block.phtml b/resources/views/user-page-block.phtml index 51e8838bbc..7a711f8b62 100644 --- a/resources/views/user-page-block.phtml +++ b/resources/views/user-page-block.phtml @@ -1,5 +1,5 @@ <?php if ($block->loadAjax()) : ?> - <div class="wt-ajax-load" data-ajax-url="<?= e(route('user-page-block', ['ged' => $tree->getName(), 'block_id' => $block_id])) ?>"> + <div class="wt-ajax-load" data-ajax-url="<?= e(route('user-page-block', ['ged' => $tree->name(), 'block_id' => $block_id])) ?>"> </div> <?php else : ?> <?= $block->getBlock($tree, $block_id) ?> |