diff options
Diffstat (limited to 'app/Controller')
| -rw-r--r-- | app/Controller/AncestryController.php | 2 | ||||
| -rw-r--r-- | app/Controller/BranchesController.php | 8 | ||||
| -rw-r--r-- | app/Controller/DescendancyController.php | 4 | ||||
| -rw-r--r-- | app/Controller/FamilyController.php | 12 | ||||
| -rw-r--r-- | app/Controller/FanchartController.php | 21 | ||||
| -rw-r--r-- | app/Controller/IndividualController.php | 6 | ||||
| -rw-r--r-- | app/Controller/MediaController.php | 6 | ||||
| -rw-r--r-- | app/Controller/NoteController.php | 4 | ||||
| -rw-r--r-- | app/Controller/PageController.php | 8 | ||||
| -rw-r--r-- | app/Controller/RepositoryController.php | 6 | ||||
| -rw-r--r-- | app/Controller/SourceController.php | 6 |
11 files changed, 43 insertions, 40 deletions
diff --git a/app/Controller/AncestryController.php b/app/Controller/AncestryController.php index e743e5e8b2..8ebc074477 100644 --- a/app/Controller/AncestryController.php +++ b/app/Controller/AncestryController.php @@ -83,7 +83,7 @@ class AncestryController extends ChartController { echo '</td>'; echo '<td>'; if ($sosa > 1) { - print_url_arrow('?rootid=' . $pid . '&PEDIGREE_GENERATIONS=' . $this->generations . '&show_full=' . $this->showFull() . '&chart_style=' . $this->chart_style . '&ged=' . WT_GEDURL, $label, 3); + print_url_arrow('?rootid=' . $pid . '&PEDIGREE_GENERATIONS=' . $this->generations . '&show_full=' . $this->showFull() . '&chart_style=' . $this->chart_style . '&ged=' . $person->getTree()->getNameUrl(), $label, 3); } echo '</td>'; echo '<td class="details1"> <span dir="ltr" class="person_box' . (($sosa == 1) ? 'NN' : (($sosa % 2) ? 'F' : '')) . '"> ', $sosa, ' </span> '; diff --git a/app/Controller/BranchesController.php b/app/Controller/BranchesController.php index 96c67ee76f..b04db7b3c9 100644 --- a/app/Controller/BranchesController.php +++ b/app/Controller/BranchesController.php @@ -39,6 +39,8 @@ class BranchesController extends PageController { * Create a branches list controller */ public function __construct() { + global $WT_TREE; + parent::__construct(); $this->surname = Filter::get('surname'); @@ -49,7 +51,7 @@ class BranchesController extends PageController { $this->setPageTitle(/* I18N: %s is a surname */ I18N::translate('Branches of the %s family', Filter::escapeHtml($this->surname))); $this->loadIndividuals(); - $self = Individual::getInstance(WT_USER_GEDCOM_ID); + $self = Individual::getInstance($WT_TREE->getUserPreference(Auth::user(), 'gedcomid')); if ($self) { $this->loadAncestors($self, 1); } @@ -198,7 +200,7 @@ class BranchesController extends PageController { $sosa = array_search($individual, $this->ancestors, true); if ($sosa) { $sosa_class = 'search_hit'; - $sosa_html = ' <a class="details1 ' . $individual->getBoxStyle() . '" title="' . I18N::translate('Sosa') . '" href="relationship.php?pid2=' . WT_USER_ROOT_ID . '&pid1=' . $individual->getXref() . '">' . $sosa . '</a>' . self::sosaGeneration($sosa); + $sosa_html = ' <a class="details1 ' . $individual->getBoxStyle() . '" title="' . I18N::translate('Sosa') . '" href="relationship.php?pid2=' . $WT_TREE->getUserPreference(Auth::user(), 'rootid') . '&pid1=' . $individual->getXref() . '">' . $sosa . '</a>' . self::sosaGeneration($sosa); } else { $sosa_class = ''; $sosa_html = ''; @@ -234,7 +236,7 @@ class BranchesController extends PageController { $sosa = array_search($spouse, $this->ancestors, true); if ($sosa) { $sosa_class = 'search_hit'; - $sosa_html = ' <a class="details1 ' . $spouse->getBoxStyle() . '" title="' . I18N::translate('Sosa') . '" href="relationship.php?pid2=' . WT_USER_ROOT_ID . '&pid1=' . $spouse->getXref() . '"> ' . $sosa . ' </a>' . self::sosaGeneration($sosa); + $sosa_html = ' <a class="details1 ' . $spouse->getBoxStyle() . '" title="' . I18N::translate('Sosa') . '" href="relationship.php?pid2=' . $WT_TREE->getUserPreference(Auth::user(), 'rootid') . '&pid1=' . $spouse->getXref() . '"> ' . $sosa . ' </a>' . self::sosaGeneration($sosa); } else { $sosa_class = ''; $sosa_html = ''; diff --git a/app/Controller/DescendancyController.php b/app/Controller/DescendancyController.php index e4d71c39e2..4a634d8892 100644 --- a/app/Controller/DescendancyController.php +++ b/app/Controller/DescendancyController.php @@ -107,7 +107,7 @@ class DescendancyController extends ChartController { echo '<td>'; foreach ($person->getChildFamilies() as $cfamily) { foreach ($cfamily->getSpouses() as $parent) { - print_url_arrow('?rootid=' . $parent->getXref() . '&generations=' . $this->generations . '&chart_style=' . $this->chart_style . '&show_full=' . $this->showFull() . '&ged=' . WT_GEDURL, I18N::translate('Start at parents'), 2); + print_url_arrow('?rootid=' . $parent->getXref() . '&generations=' . $this->generations . '&chart_style=' . $this->chart_style . '&show_full=' . $this->showFull() . '&ged=' . $parent->getTree()->getNameUrl(), I18N::translate('Start at parents'), 2); // only show the arrow for one of the parents break; } @@ -186,7 +186,7 @@ class DescendancyController extends ChartController { if ($spouse) { foreach ($spouse->getChildFamilies() as $cfamily) { foreach ($cfamily->getSpouses() as $parent) { - print_url_arrow('?rootid=' . $parent->getXref() . '&generations=' . $this->generations . '&chart_style=' . $this->chart_style . '&show_full=' . $this->showFull() . '&ged=' . WT_GEDURL, I18N::translate('Start at parents'), 2); + print_url_arrow('?rootid=' . $parent->getXref() . '&generations=' . $this->generations . '&chart_style=' . $this->chart_style . '&show_full=' . $this->showFull() . '&ged=' . $parent->getTree()->getNameUrl(), I18N::translate('Start at parents'), 2); // only show the arrow for one of the parents break; } diff --git a/app/Controller/FamilyController.php b/app/Controller/FamilyController.php index 5f9504ea39..c78db3aa1d 100644 --- a/app/Controller/FamilyController.php +++ b/app/Controller/FamilyController.php @@ -86,7 +86,7 @@ class FamilyController extends GedcomRecordController { // edit menu $menu = new Menu(I18N::translate('Edit'), '#', 'menu-fam'); - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { // edit_fam / members $submenu = new Menu(I18N::translate('Change family members'), '#', 'menu-fam-change'); $submenu->setOnclick("return change_family_members('" . $this->record->getXref() . "');"); @@ -106,14 +106,14 @@ class FamilyController extends GedcomRecordController { } // delete - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $submenu = new Menu(I18N::translate('Delete'), '#', 'menu-fam-del'); $submenu->setOnclick("return delete_family('" . 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?') . "', '" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); } // edit raw - if (Auth::isAdmin() || WT_USER_CAN_EDIT && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { + if (Auth::isAdmin() || Auth::isEditor($this->record->getTree()) && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { $submenu = new Menu(I18N::translate('Edit raw GEDCOM'), '#', 'menu-fam-editraw'); $submenu->setOnclick("return edit_raw('" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); @@ -159,7 +159,7 @@ class FamilyController extends GedcomRecordController { * Print the facts */ public function printFamilyFacts() { - global $linkToID, $WT_TREE; + global $linkToID; $linkToID = $this->record->getXref(); // -- Tell addmedia.php what to link to @@ -173,7 +173,7 @@ class FamilyController extends GedcomRecordController { echo '<tr><td class="messagebox" colspan="2">', I18N::translate('No facts for this family.'), '</td></tr>'; } - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { print_add_new_fact($this->record->getXref(), $indifacts, 'FAM'); echo '<tr><td class="descriptionbox">'; @@ -188,7 +188,7 @@ class FamilyController extends GedcomRecordController { echo "<a href=\"#\" onclick=\"return add_new_record('" . $this->record->getXref() . "','SHARED_NOTE');\">", I18N::translate('Add a new shared note'), '</a>'; echo '</td></tr>'; - if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= WT_USER_ACCESS_LEVEL) { + if ($this->record->getTree()->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($this->record->getTree())) { echo '<tr><td class="descriptionbox">'; echo I18N::translate('Media object'); echo '</td><td class="optionbox">'; diff --git a/app/Controller/FanchartController.php b/app/Controller/FanchartController.php index 4ef7da9f34..62bca2d628 100644 --- a/app/Controller/FanchartController.php +++ b/app/Controller/FanchartController.php @@ -335,7 +335,7 @@ class FanchartController extends ChartController { // add action url $pid = $person->getXref(); $imagemap .= '" href="#' . $pid . '"'; - $tempURL = 'fanchart.php?rootid=' . $pid . '&generations=' . $this->generations . '&fan_width=' . $this->fan_width . '&fan_style=' . $this->fan_style . '&ged=' . WT_GEDURL; + $tempURL = 'fanchart.php?rootid=' . $pid . '&generations=' . $this->generations . '&fan_width=' . $this->fan_width . '&fan_style=' . $this->fan_style . '&ged=' . $person->getTree()->getNameUrl(); $html .= '<div id="' . $pid . '" class="fan_chart_menu">'; $html .= '<div class="person_box"><div class="details1">'; $html .= '<a href="' . $person->getHtmlUrl() . '" class="name1">' . $name; @@ -344,20 +344,21 @@ class FanchartController extends ChartController { } $html .= '</a>'; $html .= '<ul class="charts">'; - $html .= '<li><a href="pedigree.php?rootid=' . $pid . '&ged=' . WT_GEDURL . '" >' . I18N::translate('Pedigree') . '</a></li>'; + $html .= '<li><a href="pedigree.php?rootid=' . $pid . '&ged=' . $person->getTree()->getNameUrl() . '" >' . I18N::translate('Pedigree') . '</a></li>'; if (Module::getModuleByName('googlemap')) { - $html .= '<li><a href="module.php?mod=googlemap&mod_action=pedigree_map&rootid=' . $pid . '&ged=' . WT_GEDURL . '">' . I18N::translate('Pedigree map') . '</a></li>'; + $html .= '<li><a href="module.php?mod=googlemap&mod_action=pedigree_map&rootid=' . $pid . '&ged=' . $person->getTree()->getNameUrl() . '">' . I18N::translate('Pedigree map') . '</a></li>'; } - if (WT_USER_GEDCOM_ID && WT_USER_GEDCOM_ID != $pid) { - $html .= '<li><a href="relationship.php?pid1=' . WT_USER_GEDCOM_ID . '&pid2=' . $pid . '&ged=' . WT_GEDURL . '">' . I18N::translate('Relationship to me') . '</a></li>'; + $gedcomid = $person->getTree()->getUserPreference(Auth::user(), 'gedcomid'); + if ($gedcomid && $gedcomid != $pid) { + $html .= '<li><a href="relationship.php?pid1=' . $gedcomid . '&pid2=' . $pid . '&ged=' . $person->getTree()->getNameUrl() . '">' . I18N::translate('Relationship to me') . '</a></li>'; } - $html .= '<li><a href="descendancy.php?rootid=' . $pid . '&ged=' . WT_GEDURL . '" >' . I18N::translate('Descendants') . '</a></li>'; - $html .= '<li><a href="ancestry.php?rootid=' . $pid . '&ged=' . WT_GEDURL . '">' . I18N::translate('Ancestors') . '</a></li>'; - $html .= '<li><a href="compact.php?rootid=' . $pid . '&ged=' . WT_GEDURL . '">' . I18N::translate('Compact tree') . '</a></li>'; + $html .= '<li><a href="descendancy.php?rootid=' . $pid . '&ged=' . $person->getTree()->getNameUrl() . '" >' . I18N::translate('Descendants') . '</a></li>'; + $html .= '<li><a href="ancestry.php?rootid=' . $pid . '&ged=' . $person->getTree()->getNameUrl() . '">' . I18N::translate('Ancestors') . '</a></li>'; + $html .= '<li><a href="compact.php?rootid=' . $pid . '&ged=' . $person->getTree()->getNameUrl() . '">' . I18N::translate('Compact tree') . '</a></li>'; $html .= '<li><a href="' . $tempURL . '">' . I18N::translate('Fan chart') . '</a></li>'; - $html .= '<li><a href="hourglass.php?rootid=' . $pid . '&ged=' . WT_GEDURL . '">' . I18N::translate('Hourglass chart') . '</a></li>'; + $html .= '<li><a href="hourglass.php?rootid=' . $pid . '&ged=' . $person->getTree()->getNameUrl() . '">' . I18N::translate('Hourglass chart') . '</a></li>'; if (Module::getModuleByName('tree')) { - $html .= '<li><a href="module.php?mod=tree&mod_action=treeview&ged=' . WT_GEDURL . '&rootid=' . $pid . '">' . I18N::translate('Interactive tree') . '</a></li>'; + $html .= '<li><a href="module.php?mod=tree&mod_action=treeview&ged=' . $person->getTree()->getNameUrl() . '&rootid=' . $pid . '">' . I18N::translate('Interactive tree') . '</a></li>'; } $html .= '</ul>'; // spouse(s) and children diff --git a/app/Controller/IndividualController.php b/app/Controller/IndividualController.php index e9f4ac29de..583a1d3be5 100644 --- a/app/Controller/IndividualController.php +++ b/app/Controller/IndividualController.php @@ -269,7 +269,7 @@ class IndividualController extends GedcomRecordController { // will copy the first submenu - which may be edit-raw or delete. // As a temporary solution, make it edit the name $menu->setOnclick("return false;"); - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { foreach ($this->record->getFacts() as $fact) { if ($fact->getTag() === 'NAME' && $fact->canEdit()) { $menu->setOnclick("return edit_name('" . $this->record->getXref() . "', '" . $fact->getFactId() . "');"); @@ -303,14 +303,14 @@ class IndividualController extends GedcomRecordController { } // delete - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $submenu = new Menu(I18N::translate('Delete'), '#', 'menu-indi-del'); $submenu->setOnclick("return delete_individual('" . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJS(Filter::unescapeHtml($this->record->getFullName()))) . "', '" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); } // edit raw - if (Auth::isAdmin() || WT_USER_CAN_EDIT && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { + if (Auth::isAdmin() || Auth::isEditor($this->record->getTree()) && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { $submenu = new Menu(I18N::translate('Edit raw GEDCOM'), '#', 'menu-indi-editraw'); $submenu->setOnclick("return edit_raw('" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); diff --git a/app/Controller/MediaController.php b/app/Controller/MediaController.php index cb2713a545..cad29e5b42 100644 --- a/app/Controller/MediaController.php +++ b/app/Controller/MediaController.php @@ -41,7 +41,7 @@ class MediaController extends GedcomRecordController { // edit menu $menu = new Menu(I18N::translate('Edit'), '#', 'menu-obje'); - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $submenu = new Menu(I18N::translate('Edit media object'), '#', 'menu-obje-edit'); $submenu->setOnclick("window.open('addmedia.php?action=editmedia&pid={$this->record->getXref()}', '_blank', edit_window_specs)"); $menu->addSubmenu($submenu); @@ -67,14 +67,14 @@ class MediaController extends GedcomRecordController { } // delete - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $submenu = new Menu(I18N::translate('Delete'), '#', 'menu-obje-del'); $submenu->setOnclick("return delete_media('" . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJS(Filter::unescapeHtml($this->record->getFullName()))) . "', '" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); } // edit raw - if (Auth::isAdmin() || WT_USER_CAN_EDIT && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { + if (Auth::isAdmin() || Auth::isEditor($this->record->getTree()) && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { $submenu = new Menu(I18N::translate('Edit raw GEDCOM'), '#', 'menu-obje-editraw'); $submenu->setOnclick("return edit_raw('" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); diff --git a/app/Controller/NoteController.php b/app/Controller/NoteController.php index 3e4d643581..ab83d482e0 100644 --- a/app/Controller/NoteController.php +++ b/app/Controller/NoteController.php @@ -41,14 +41,14 @@ class NoteController extends GedcomRecordController { // edit menu $menu = new Menu(I18N::translate('Edit'), '#', 'menu-note'); - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $submenu = new Menu(I18N::translate('Edit note'), '#', 'menu-note-edit'); $submenu->setOnclick('return edit_note(\'' . $this->record->getXref() . '\');'); $menu->addSubmenu($submenu); } // delete - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $submenu = new Menu(I18N::translate('Delete'), '#', 'menu-note-del'); $submenu->setOnclick("return delete_note('" . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJS(Filter::unescapeHtml($this->record->getFullName()))) . "', '" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); diff --git a/app/Controller/PageController.php b/app/Controller/PageController.php index 99af6abc16..fff0fda65f 100644 --- a/app/Controller/PageController.php +++ b/app/Controller/PageController.php @@ -217,11 +217,11 @@ class PageController extends BaseController { static $individual; // Only query the DB once. - if (!$individual && WT_USER_ROOT_ID) { - $individual = Individual::getInstance(WT_USER_ROOT_ID); + if (!$individual && $WT_TREE->getUserPreference(Auth::user(), 'rootid')) { + $individual = Individual::getInstance($WT_TREE->getUserPreference(Auth::user(), 'rootid')); } - if (!$individual && WT_USER_GEDCOM_ID) { - $individual = Individual::getInstance(WT_USER_GEDCOM_ID); + if (!$individual && $WT_TREE->getUserPreference(Auth::user(), 'gedcomid')) { + $individual = Individual::getInstance($WT_TREE->getUserPreference(Auth::user(), 'gedcomid')); } if (!$individual) { $individual = Individual::getInstance($WT_TREE->getPreference('PEDIGREE_ROOT_ID')); diff --git a/app/Controller/RepositoryController.php b/app/Controller/RepositoryController.php index 736aec1faa..e9573d9828 100644 --- a/app/Controller/RepositoryController.php +++ b/app/Controller/RepositoryController.php @@ -41,7 +41,7 @@ class RepositoryController extends GedcomRecordController { // edit menu $menu = new Menu(I18N::translate('Edit'), '#', 'menu-repo'); - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $fact = $this->record->getFirstFact('NAME'); $submenu = new Menu(I18N::translate('Edit repository'), '#', 'menu-repo-edit'); if ($fact) { @@ -55,14 +55,14 @@ class RepositoryController extends GedcomRecordController { } // delete - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $submenu = new Menu(I18N::translate('Delete'), '#', 'menu-repo-del'); $submenu->setOnclick("return delete_repository('" . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJS(Filter::unescapeHtml($this->record->getFullName()))) . "', '" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); } // edit raw - if (Auth::isAdmin() || WT_USER_CAN_EDIT && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { + if (Auth::isAdmin() || Auth::isEditor($this->record->getTree()) && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { $submenu = new Menu(I18N::translate('Edit raw GEDCOM'), '#', 'menu-repo-editraw'); $submenu->setOnclick("return edit_raw('" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); diff --git a/app/Controller/SourceController.php b/app/Controller/SourceController.php index 3d513ccb1d..916d188547 100644 --- a/app/Controller/SourceController.php +++ b/app/Controller/SourceController.php @@ -41,7 +41,7 @@ class SourceController extends GedcomRecordController { // edit menu $menu = new Menu(I18N::translate('Edit'), '#', 'menu-sour'); - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $fact = $this->record->getFirstFact('TITL'); $submenu = new Menu(I18N::translate('Edit source'), '#', 'menu-sour-edit'); if ($fact) { @@ -55,14 +55,14 @@ class SourceController extends GedcomRecordController { } // delete - if (WT_USER_CAN_EDIT) { + if (Auth::isEditor($this->record->getTree())) { $submenu = new Menu(I18N::translate('Delete'), '#', 'menu-sour-del'); $submenu->setOnclick("return delete_source('" . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJS(Filter::unescapeHtml($this->record->getFullName()))) . "', '" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); } // edit raw - if (Auth::isAdmin() || WT_USER_CAN_EDIT && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { + if (Auth::isAdmin() || Auth::isEditor($this->record->getTree()) && $this->record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) { $submenu = new Menu(I18N::translate('Edit raw GEDCOM'), '#', 'menu-sour-editraw'); $submenu->setOnclick("return edit_raw('" . $this->record->getXref() . "');"); $menu->addSubmenu($submenu); |
