diff options
24 files changed, 908 insertions, 836 deletions
diff --git a/admin_pgv_to_wt.php b/admin_pgv_to_wt.php index 2b4caf8395..3a4053b736 100644 --- a/admin_pgv_to_wt.php +++ b/admin_pgv_to_wt.php @@ -123,8 +123,8 @@ if ($PGV_PATH) { $controller->pageHeader(); echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), - 'admin_trees_manage.php' => I18N::translate('Manage family trees'), + route('admin-control-panel') => I18N::translate('Control panel'), + route('admin-trees') => I18N::translate('Manage family trees'), ], $controller->getPageTitle()); ?> diff --git a/admin_trees_check.php b/admin_trees_check.php index c3ed20294b..fa9c83fdde 100644 --- a/admin_trees_check.php +++ b/admin_trees_check.php @@ -115,8 +115,8 @@ $RECORD_LINKS = [ $errors = false; echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), - 'admin_trees_manage.php' => I18N::translate('Manage family trees'), + route('admin-control-panel') => I18N::translate('Control panel'), + route('admin-trees') => I18N::translate('Manage family trees'), ], $controller->getPageTitle()); ?> diff --git a/admin_trees_config.php b/admin_trees_config.php index 61bd4b0047..ba3c80fb78 100644 --- a/admin_trees_config.php +++ b/admin_trees_config.php @@ -216,7 +216,7 @@ switch (Filter::post('action')) { } FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', e($WT_TREE->getTitle())), 'success'); - header('Location: admin_trees_manage.php'); + header('Location: ' . route('admin-trees')); return; } @@ -234,8 +234,8 @@ default: $controller->pageHeader(); echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), - 'admin_trees_manage.php' => I18N::translate('Manage family trees'), + route('admin-control-panel') => I18N::translate('Control panel'), + route('admin-trees') => I18N::translate('Manage family trees'), ], $controller->getPageTitle()); ?> diff --git a/admin_trees_download.php b/admin_trees_download.php index 281e334316..6f295776fd 100644 --- a/admin_trees_download.php +++ b/admin_trees_download.php @@ -125,8 +125,8 @@ if ($action === 'download') { $controller->pageHeader(); echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), - 'admin_trees_manage.php' => I18N::translate('Manage family trees'), + route('admin-control-panel') => I18N::translate('Control panel'), + route('admin-trees') => I18N::translate('Manage family trees'), ], $controller->getPageTitle()); ?> diff --git a/admin_trees_duplicates.php b/admin_trees_duplicates.php index 79e6314663..1b437e86ed 100644 --- a/admin_trees_duplicates.php +++ b/admin_trees_duplicates.php @@ -141,8 +141,8 @@ $all_duplicates = [ ]; echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), - 'admin_trees_manage.php' => I18N::translate('Manage family trees'), + route('admin-control-panel') => I18N::translate('Control panel'), + route('admin-trees') => I18N::translate('Manage family trees'), ], $controller->getPageTitle()); ?> diff --git a/admin_trees_export.php b/admin_trees_export.php index dda082ce74..e90d09571a 100644 --- a/admin_trees_export.php +++ b/admin_trees_export.php @@ -46,4 +46,4 @@ if (Auth::isManager($WT_TREE) && Filter::checkCsrf()) { } } -header('Location: admin_trees_manage.php'); +header('Location: ' . route('admin-trees')); diff --git a/admin_trees_manage.php b/admin_trees_manage.php deleted file mode 100644 index 3d50b530e9..0000000000 --- a/admin_trees_manage.php +++ /dev/null @@ -1,803 +0,0 @@ -<?php -/** - * webtrees: online genealogy - * Copyright (C) 2018 webtrees development team - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -namespace Fisharebest\Webtrees; - -use Fisharebest\Webtrees\Controller\PageController; -use Fisharebest\Webtrees\Functions\Functions; - -/** @global Tree $WT_TREE */ -global $WT_TREE; - -require 'includes/session.php'; - -$controller = new PageController; -$controller - ->restrictAccess(Auth::isAdmin() || Auth::isManager($WT_TREE)) - ->setPageTitle(I18N::translate('Manage family trees')); - -// Show a reduced page when there are more than a certain number of trees -$multiple_tree_threshold = (int) Site::getPreference('MULTIPLE_TREE_THRESHOLD', '500'); - -// Note that glob() returns false instead of an empty array when open_basedir_restriction -// is in force and no files are found. See PHP bug #47358. -if (defined('GLOB_BRACE')) { - $gedcom_files = glob(WT_DATA_DIR . '*.{ged,Ged,GED}', GLOB_NOSORT | GLOB_BRACE) ?: []; -} else { - $gedcom_files = array_merge( - glob(WT_DATA_DIR . '*.ged', GLOB_NOSORT) ?: [], - glob(WT_DATA_DIR . '*.Ged', GLOB_NOSORT) ?: [], - glob(WT_DATA_DIR . '*.GED', GLOB_NOSORT) ?: [] - ); -} -// Process POST actions -switch (Filter::post('action')) { - case 'delete': - $gedcom_id = Filter::postInteger('gedcom_id'); - if (Filter::checkCsrf() && $gedcom_id) { - $tree = Tree::findById($gedcom_id); - FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', e($tree->getTitle())), 'success'); - $tree->delete(); - } - header('Location: admin_trees_manage.php'); - - return; - case 'setdefault': - if (Filter::checkCsrf()) { - Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged')); - FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', e($WT_TREE->getTitle())), 'success'); - } - header('Location: admin_trees_manage.php'); - - return; - case 'new_tree': - $basename = basename(Filter::post('tree_name')); - $tree_title = Filter::post('tree_title'); - - if (Filter::checkCsrf() && $basename && $tree_title) { - if (Tree::findByName($basename)) { - FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', e($basename)), 'danger'); - } else { - Tree::create($basename, $tree_title); - FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', e($basename)), 'success'); - } - } - header('Location: admin_trees_manage.php?ged=' . rawurlencode($basename)); - - return; - case 'replace_upload': - $gedcom_id = Filter::postInteger('gedcom_id'); - $keep_media = Filter::post('keep_media', '1', '0'); - $GEDCOM_MEDIA_PATH = Filter::post('GEDCOM_MEDIA_PATH'); - $WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0'); - $tree = Tree::findById($gedcom_id); - - if (Filter::checkCsrf() && $tree) { - $tree->setPreference('keep_media', $keep_media); - $tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH); - $tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES); - if (isset($_FILES['tree_name'])) { - if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) { - $tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']); - } else { - FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger'); - } - } else { - FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger'); - } - } - header('Location: admin_trees_manage.php'); - - return; - case 'replace_import': - $basename = basename(Filter::post('tree_name')); - $gedcom_id = Filter::postInteger('gedcom_id'); - $keep_media = Filter::post('keep_media', '1', '0'); - $GEDCOM_MEDIA_PATH = Filter::post('GEDCOM_MEDIA_PATH'); - $WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0'); - $tree = Tree::findById($gedcom_id); - - if (Filter::checkCsrf() && $tree) { - $tree->setPreference('keep_media', $keep_media); - $tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH); - $tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES); - if ($basename) { - $tree->importGedcomFile(WT_DATA_DIR . $basename, $basename); - } else { - FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger'); - } - } - header('Location: admin_trees_manage.php'); - - return; - - case 'synchronize': - if (Filter::checkCsrf()) { - $basenames = []; - - foreach ($gedcom_files as $gedcom_file) { - $filemtime = filemtime($gedcom_file); // Only import files that have changed - $basename = basename($gedcom_file); - $basenames[] = $basename; - - $tree = Tree::findByName($basename); - if (!$tree) { - $tree = Tree::create($basename, $basename); - } - if ($tree->getPreference('filemtime') != $filemtime) { - $tree->importGedcomFile($gedcom_file, $basename); - $tree->setPreference('filemtime', $filemtime); - FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', e($basename)), 'success'); - } - } - - foreach (Tree::getAll() as $tree) { - if (!in_array($tree->getName(), $basenames)) { - FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', e($tree->getTitle())), 'success'); - $tree->delete(); - } - } - } - header('Location: admin_trees_manage.php'); - - return; -} - -$default_tree_title = /* I18N: Default name for a new tree */ I18N::translate('My family tree'); -$default_tree_name = 'tree'; -$default_tree_number = 1; -$existing_trees = Tree::getNameList(); -while (array_key_exists($default_tree_name . $default_tree_number, $existing_trees)) { - $default_tree_number++; -} -$default_tree_name .= $default_tree_number; - -// Process GET actions -switch (Filter::get('action')) { - case 'importform': - $controller - ->setPageTitle(I18N::translate('Import a GEDCOM file') . ' — ' . e($WT_TREE->getTitle())) - ->pageHeader(); - - echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), - 'admin_trees_manage.php' => I18N::translate('Manage family trees'), - ], $controller->getPageTitle()); - ?> - - <h1><?= $controller->getPageTitle() ?></h1> - <?php - - $tree = Tree::findById(Filter::getInteger('gedcom_id')); - // Check it exists - if (!$tree) { - break; - } - $gedcom_filename = $tree->getPreference('gedcom_filename') - ?> - <p> - <?= /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file.', e($tree->getTitle())) ?> - </p> - <form class="form form-horizontal" name="gedcomimportform" 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="gedcom_id" value="<?= $tree->getTreeId() ?>"> - <input type="hidden" id="gedcom_filename" value="<?= e($gedcom_filename) ?>"> - <?= Filter::getCsrf() ?> - - <fieldset class="form-group"> - <div class="row"> - <legend class="col-form-label col-sm-3"> - <?= /* I18N: A configuration setting */ I18N::translate('Select a GEDCOM file to import') ?> - </legend> - <div class="col-sm-9"> - <div class="row"> - <label class="col-sm-3"> - <input type="radio" name="action" id="import-computer" value="replace_upload" checked> - <?= I18N::translate('A file on your computer') ?> - </label> - <div class="col-sm-9"> - <div class="btn btn-default"> - <input type="file" name="tree_name" id="import-computer-file"> - </div> - </div> - </div> - <div class="row"> - <label class="col-sm-3"> - <input type="radio" name="action" id="import-server" value="replace_import"> - <?= I18N::translate('A file on the server') ?> - </label> - <div class="col-sm-9"> - <div class="input-group"> - <span class="input-group-prepend"> - <?= WT_DATA_DIR ?> - </span> - <?php - $d = opendir(WT_DATA_DIR); - $files = []; - while (($f = readdir($d)) !== false) { - if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) { - $fp = fopen(WT_DATA_DIR . $f, 'rb'); - $header = fread($fp, 64); - fclose($fp); - if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) { - $files[] = $f; - } - } - } - echo '<select name="tree_name" class="form-control" id="import-server-file">'; - echo '<option value=""></option>'; - sort($files); - foreach ($files as $gedcom_file) { - echo '<option value="', e($gedcom_file), '" '; - if ($gedcom_file === $gedcom_filename) { - echo ' selected'; - } - echo'>', e($gedcom_file), '</option>'; - } - if (empty($files)) { - echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>'; - } - echo '</select>'; - ?> - </div> - </div> - </div> - </div> - </div> - </fieldset> - - <hr> - - <fieldset class="form-group"> - <div class="row"> - <legend class="col-form-label col-sm-3"> - <?= I18N::translate('Import preferences') ?> - </legend> - <div class="col-sm-9"> - <label> - <input type="checkbox" name="keep_media" value="1" <?= $tree->getPreference('keep_media') ? 'checked' : '' ?>> - <?= /* I18N: A configuration setting */ I18N::translate('Keep media objects') ?> - </label> - <p class="small text-muted"> - <?= I18N::translate('If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file.') ?> - </p> - <label> - <input type="checkbox" name="WORD_WRAPPED_NOTES" value="1" <?= $tree->getPreference('WORD_WRAPPED_NOTES') ? 'checked' : '' ?>> - <?= I18N::translate('Add spaces where long lines were wrapped') ?> - </label> - <p class="small text-muted"> - <?= I18N::translate('If you created this GEDCOM file using genealogy software that omits spaces when splitting long lines, then select this option to reinsert the missing spaces.') ?> - </p> - <label for="GEDCOM_MEDIA_PATH"> - <?= /* I18N: A media path (e.g. c:\aaa\bbb\ccc\ddd.jpeg) in a GEDCOM file */ I18N::translate('Remove the GEDCOM media path from filenames') ?> - </label> - <input - class="form-control" - dir="ltr" - id="GEDCOM_MEDIA_PATH" - maxlength="255" - name="GEDCOM_MEDIA_PATH" - type="text" - value="<?= e($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')) ?>" - > - <p class="small text-muted"> - <?= /* I18N: Help text for the “GEDCOM media path” configuration setting. A “path” is something like “C:\Documents\Genealogy\Photos\John_Smith.jpeg” */ I18N::translate('Some genealogy software creates GEDCOM files that contain media filenames with full paths. These paths will not exist on the web-server. To allow webtrees to find the file, the first part of the path must be removed.') ?> - <?= /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>') ?> - </p> - </div> - </div> - </fieldset> - - <div class="row form-group"> - <div class="offset-sm-3 col-sm-9"> - <button type="submit" class="btn btn-primary"> - <?= /* I18N: A button label. */ I18N::translate('continue') ?> - </button> - </div> - </div> - </form> - - <script> - function checkGedcomImportForm (message) { - var oldFile = $('#gedcom_filename').val(); - var method = $('input[name=action]:checked').val(); - var newFile = method === 'replace_import' ? $('#import-server-file').val() : $('#import-computer-file').val(); - - // Some browsers include c:\fakepath\ in the filename. - newFile = newFile.replace(/.*[/\\]/, ''); - if (newFile !== oldFile && oldFile !== '') { - return window.confirm(message); - } else { - return true; - } - } - - document.getElementById("import-computer-file").addEventListener("click", function () { - document.getElementById("import-computer").checked = true; - }); - document.getElementById("import-server-file").addEventListener("focus", function () { - document.getElementById("import-server").checked = true; - }); - </script> - - <?php - - return; -} - -if (!Tree::getAll()) { - FlashMessages::addMessage(I18N::translate('You need to create a family tree.'), 'info'); -} - -$controller->pageHeader(); - -$all_trees = Tree::getAll(); -// On sites with hundreds or thousands of trees, this page becomes very large. -// 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 ($WT_TREE) { - return $x->getPreference('imported') === '0' || $WT_TREE->getTreeId() === $x->getTreeId() || $x->getName() === Site::getPreference('DEFAULT_GEDCOM'); - }); -} - -// List the gedcoms available to this user -echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), -], $controller->getPageTitle()); -?> - -<h1><?= $controller->getPageTitle() ?></h1> - -<div id="accordion" role="tablist" aria-multiselectable="true"> - <?php foreach ($all_trees as $tree): ?> - <?php if (Auth::isManager($tree)): ?> - <div class="card"> - <div class="card-header" role="tab" id="card-tree-header-<?= $tree->getTreeId() ?>"> - <h2 class="mb-0"> - <i class="fas fa-tree fa-fw"></i> - <a data-toggle="collapse" data-parent="#accordion" href="#card-tree-content-<?= $tree->getTreeId() ?>" <?= $tree == $WT_TREE || $tree->getPreference('imported') === '0' ? 'aria-expanded="true"' : '' ?> aria-controls="card-tree-content-<?= $tree->getTreeId() ?>"> - <?= e($tree->getName()) ?> — <?= e($tree->getTitle()) ?> - </a> - </h2> - </div> - <div id="card-tree-content-<?= $tree->getTreeId() ?>" class="collapse<?= $tree == $WT_TREE || $tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $tree->getTreeId() ?>"> - <div class="card-body"> - <?php - $importing = Database::prepare( - "SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1" - )->execute([$tree->getTreeId()])->fetchOne(); - if ($importing) { - ?> - <div id="import<?= $tree->getTreeId() ?>" class="col-xs-12"> - <div class="progress"> - <?= I18N::translate('Calculating…') ?> - </div> - </div> - <?php $controller->addInlineJavascript('$("#import' . $tree->getTreeId() . '").load("' . route('import', ['ged' => $tree->getName()]) . '", {});'); - } - ?> - <div class="row<?= $importing ? ' d-none' : '' ?>" id="actions<?= $tree->getTreeId() ?>"> - <div class="col-sm-6 col-md-3"> - <h3> - <a href="<?= e(route('tree-page', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Family tree') ?> - </a> - </h3> - <ul class="fa-ul"> - <!-- PREFERENCES --> - <li> - <span class="fa-li"><i class="fas fa-cogs"></i></span> - <a href="<?= e(Html::url('admin_trees_config.php', ['ged' => $tree->getName(), 'action' => 'general'])) ?>"> - <?= I18N::translate('Preferences') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- PRIVACY --> - <li> - <span class="fa-li"><i class="fas fa-lock"></i></span> - <a href="<?= e(route('tree-privacy', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Privacy') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- HOME PAGE BLOCKS--> - <li> - <span class="fa-li"><i class="fas fa-th-large"></i></span> - <a href="<?= e(route('tree-page-edit', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Change the “Home page” blocks') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- DELETE --> - <li> - <span class="fa-li"><i class="far fa-trash-alt"></i></span> - <a href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($tree->getTitle())) ?>" onclick="if (confirm(this.dataset.confirm)) { document.delete_form<?= $tree->getTreeId() ?>.submit(); } return false;"> - <?= I18N::translate('Delete') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - <form name="delete_form<?= $tree->getTreeId() ?>" method="post"> - <input type="hidden" name="action" value="delete"> - <input type="hidden" name="gedcom_id" value="<?= $tree->getTreeId() ?>"> - <?= Filter::getCsrf() ?> - <!-- 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($tree->getTitle())) ?>" onclick="return confirm(this.dataset.confirm)" type="submit"> - <?= I18N::translate('Delete') ?> - </button> - </form> - </li> - <!-- SET AS DEFAULT --> - <?php if (count(Tree::getAll()) > 1): ?> - <li> - <span class="fa-li"><i class="far fa-star"></i></span> - <?php if ($tree->getName() === Site::getPreference('DEFAULT_GEDCOM')): ?> - <?= I18N::translate('Default family tree') ?> - <?php else: ?> - <a href="#" onclick="document.defaultform<?= $tree->getTreeId() ?>.submit();"> - <?= I18N::translate('Set as default') ?> - <span class="sr-only"><?= e($tree->getTitle()) ?></span> - </a> - <form name="defaultform<?= $tree->getTreeId() ?>" method="post"> - <input type="hidden" name="action" value="setdefault"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> - <?= Filter::getCsrf() ?> - <!-- A11Y - forms need submit buttons, but they look ugly here --> - <button class="sr-only" type="submit"> - <?= I18N::translate('Set as default') ?> - </button> - </form> - <?php endif ?> - </li> - <?php endif ?> - </ul> - </div> - <div class="col-sm-6 col-md-3"> - <h3> - <?= /* I18N: Individuals, sources, dates, places, etc. */ I18N::translate('Genealogy data') ?> - </h3> - <ul class="fa-ul"> - <!-- FIND DUPLICATES --> - <li> - <span class="fa-li"><i class="far fa-copy"></i></span> - <a href="<?= e(Html::url('admin_trees_duplicates.php', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Find duplicates') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- MERGE --> - <li> - <span class="fa-li"><i class="fas fa-code-branch"></i></span> - <a href="<?= e(route('merge-records', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Merge records') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- UPDATE PLACE NAMES --> - <li> - <span class="fa-li"><i class="fas fa-map-marker-alt"></i></span> - <a href="<?= e(Html::url('admin_trees_places.php', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Update place names') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- CHECK FOR ERRORS --> - <li> - <span class="fa-li"><i class="fas fa-check"></i></span> - <a href="<?= e(Html::url('admin_trees_check.php', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Check for errors') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- UNCONNECTED INDIVIDUALS --> - <li> - <span class="fa-li"><i class="fas fa-unlink"></i></span> - <a href="<?= e(Html::url('admin_trees_unconnected.php', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Find unrelated individuals') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- RENUMBER --> - <li> - <span class="fa-li"><i class="fas fa-sort-numeric-down"></i></span> - <a href="<?= e(Html::url('admin_trees_renumber.php', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Renumber') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- CHANGES --> - <li> - <span class="fa-li"><i class="fas fa-th-list"></i></span> - <a href="<?= route('admin-changes-log', ['ged' => $tree->getName()]) ?>"> - <?= I18N::translate('Changes log') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - </ul> - </div> - <div class="clearfix visible-sm-block"></div> - <div class="col-sm-6 col-md-3"> - <h3> - <?= I18N::translate('Add unlinked records') ?> - </h3> - <ul class="fa-ul"> - <!-- UNLINKED INDIVIDUAL --> - <li> - <span class="fa-li"><i class="far fa-user"></i></span> - <a href="edit_interface.php?action=add_unlinked_indi&ged=<?= e($tree->getName()) ?>"> - <?= I18N::translate('Individual') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- UNLINKED SOURCE --> - <li> - <span class="fa-li"><i class="fas fa-book"></i></span> - <a href="#" data-href="<?= e(route('create-source', ['tree' => $tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> - <?= I18N::translate('Source') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- UNLINKED REPOSITORY --> - <li> - <span class="fa-li"><i class="fas fa-university"></i></span> - <a href="#" data-href="<?= e(route('create-repository', ['tree' => $tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> - <?= I18N::translate('Repository') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- UNLINKED MEDIA OBJECT --> - <li> - <span class="fa-li"><i class="far fa-image"></i></span> - <a href="#" data-href="<?= e(route('create-media-object', ['tree' => $tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> - - <?= I18N::translate('Media object') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- UNLINKED NOTE --> - <li> - <span class="fa-li"><i class="fas fa-paragraph"></i></span> - <a href="#" data-href="<?= e(route('create-note-object', ['tree' => $tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - <?= I18N::translate('Shared note') ?> - </a> - </li> - <!-- UNLINKED SUBMITTER --> - <li> - <span class="fa-li"><i class="far fa-user"></i></span> - <a href="#" data-href="<?= e(route('create-submitter', ['tree' => $tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - <?= I18N::translate('Submitter') ?> - </a> - </li> - </ul> - </div> - <div class="col-sm-6 col-md-3"> - <h3> - <?= I18N::translate('GEDCOM file') ?> - </h3> - <ul class="fa-ul"> - <!-- DOWNLOAD/Export --> - <li> - <span class="fa-li"><i class="fas fa-download"></i></span> - <a href="<?= e(Html::url('admin_trees_download.php', ['ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Export') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - <!-- UPLOAD/IMPORT --> - <li> - <span class="fa-li"><i class="fas fa-upload"></i></span> - <a href="<?= e(Html::url('admin_trees_manage.php', ['action' => 'importform', 'gedcom_id' => $tree->getTreeId(), 'ged' => $tree->getName()])) ?>"> - <?= I18N::translate('Import') ?> - <span class="sr-only"> - <?= e($tree->getTitle()) ?> - </span> - </a> - </li> - </ul> - </div> - </div> - </div> - </div> - </div> - <?php endif ?> - <?php endforeach ?> - - <?php if (Auth::isAdmin()): ?> - <div class="card"> - <div class="card-header" id="card-tree-create-header"> - <h2 class="mb-0"> - <i class="fas fa-plus fa-fw"></i> - <a data-toggle="collapse" data-parent="#accordion" href="#card-tree-create-content" aria-controls="card-tree-create-content"> - <?= I18N::translate('Create a family tree') ?> - </a> - </h2> - </div> - <div id="card-tree-create-content" class="collapse<?= empty(Tree::getAll()) ? ' show' : '' ?>" role="tabpanel" aria-labelledby="card-tree-create-header"> - <div class="card-body"> - <form class="form-horizontal" method="post"> - <?= Filter::getCsrf() ?> - <input type="hidden" name="action" value="new_tree"> - <div class="row form-group"> - <label for="tree_title" class="col-sm-2 col-form-label"> - <?= I18N::translate('Family tree title') ?> - </label> - <div class="col-sm-10"> - <input - class="form-control" - id="tree_title" - maxlength="255" - name="tree_title" - required - type="text" - placeholder="<?= $default_tree_title ?>" - > - </div> - </div> - <div class="row form-group"> - <label for="tree_name" class="col-sm-2 col-form-label"> - <?= I18N::translate('URL') ?> - </label> - <div class="col-sm-10"> - <div class="input-group" dir="ltr"> - <div class="input-group-prepend"> - <span class="input-group-text"> - <?= WT_BASE_URL ?>?ged= - </span> - </div> - <input - class="form-control" - id="tree_name" - maxlength="31" - name="tree_name" - pattern="[^<>&"#^$*?{}()\[\]/\\]*" - required - type="text" - value="<?= $default_tree_name ?>" - > - </div> - <p class="small text-muted"> - <?= I18N::translate('Avoid spaces and punctuation. A family name might be a good choice.') ?> - </p> - </div> - </div> - <div class="row form-group"> - <div class="offset-sm-2 col-sm-10"> - <button type="submit" class="btn btn-primary"> - <i class="fas fa-check" aria-hidden="true"></i> - <?= /* I18N: A button label. */ I18N::translate('create') ?> - </button> - <p class="small text-muted"> - <?= I18N::translate('After creating the family tree, you will be able to import data from a GEDCOM file.') ?> - </p> - </div> - </div> - </form> - </div> - </div> - </div> - <?php endif ?> - - <!-- display link to PhpGedView-WT transfer wizard on first visit to this page, before any GEDCOM is loaded --> - <?php if (empty(Tree::getAll()) && count(User::all()) === 1): ?> - <div class="card"> - <div class="card-header" id="card-pgv-wizard-header"> - <h2 class="mb-0"> - <i class="fas fa-magic fa-fw"></i> - <a data-toggle="collapse" data-parent="#accordion" href="#card-pgv-wizard-content" aria-controls="card-pgv-wizard-content"> - <?= I18N::translate('PhpGedView to webtrees transfer wizard') ?> - </a> - </h2> - </div> - <div id="card-pgv-wizard-content" class="collapse show" role="tabpanel" aria-labelledby="card-pgv-wizard-header"> - <div class="card-body"> - <p> - <?= I18N::translate('The PhpGedView to webtrees wizard is an automated process to assist administrators make the move from a PhpGedView installation to a new webtrees one. It will transfer all PhpGedView GEDCOM and other database information directly to your new webtrees database. The following requirements are necessary:') ?> - </p> - <ul> - <li> - <?= I18N::translate('webtrees’ database must be on the same server as PhpGedView’s') ?> - </li> - <li> - <?= /* I18N: %s is a number */ I18N::translate('PhpGedView must be version 4.2.3, or any SVN up to #%s', I18N::digits(7101)) ?> - </li> - <li> - <?= I18N::translate('All changes in PhpGedView must be accepted') ?> - </li> - <li> - <?= I18N::translate('All existing PhpGedView users must have distinct email addresses') ?> - </li> - </ul> - <p> - <?= I18N::translate('<b>Important note:</b> The transfer wizard is not able to assist with moving media items. You will need to set up and move or copy your media configuration and objects separately after the transfer wizard is finished.') ?> - </p> - <p> - <a href="admin_pgv_to_wt.php"> - <?= I18N::translate('PhpGedView to webtrees transfer wizard') ?> - </a> - </p> - </div> - </div> - </div> - <?php endif ?> - - <!-- BULK LOAD/SYNCHRONISE GEDCOM FILES --> - <?php if (count($gedcom_files) >= $multiple_tree_threshold): ?> - <div class="panel panel-default"> - <div class="panel-heading"> - <h2 class="panel-title"> - <i class="fas fa-sync-alt fa-fw"></i> - <a data-toggle="collapse" data-parent="#accordion" href="#synchronize-gedcom-files"> - <?= I18N::translate('Synchronize family trees with GEDCOM files') ?> - </a> - </h2> - </div> - <div id="synchronize-gedcom-files" class="panel-collapse collapse"> - <div class="panel-body"> - <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"> - <?= Filter::getCsrf() ?> - <input type="hidden" name="action" value="synchronize"> - <button type="submit" class="btn btn-danger"> - <i class="fas fa-sync"></i> - <?= /* I18N: A button label. */ I18N::translate('continue') ?> - </button> - <p class="small text-muted"> - <?= I18N::translate('Caution! This may take a long time. Be patient.') ?> - </p> - </form> - </div> - </div> - </div> - <?php endif ?> -</div> - -<?= view('modals/ajax') ?> diff --git a/admin_trees_merge.php b/admin_trees_merge.php index 7d79ced12d..7393836b6e 100644 --- a/admin_trees_merge.php +++ b/admin_trees_merge.php @@ -29,8 +29,8 @@ $controller ->pageHeader(); echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), - 'admin_trees_manage.php' => I18N::translate('Manage family trees'), + route('admin-control-panel') => I18N::translate('Control panel'), + route('admin-trees') => I18N::translate('Manage family trees'), ], $controller->getPageTitle()); ?> diff --git a/admin_trees_places.php b/admin_trees_places.php index 445a23c7e4..993a0259ea 100644 --- a/admin_trees_places.php +++ b/admin_trees_places.php @@ -80,8 +80,8 @@ $controller ->pageHeader(); echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), - 'admin_trees_manage.php' => I18N::translate('Manage family trees'), + route('admin-control-panel') => I18N::translate('Control panel'), + route('admin-trees') => I18N::translate('Manage family trees'), ], $controller->getPageTitle()); ?> diff --git a/admin_trees_unconnected.php b/admin_trees_unconnected.php index f55c713731..8f237405cc 100644 --- a/admin_trees_unconnected.php +++ b/admin_trees_unconnected.php @@ -70,8 +70,8 @@ foreach ($components as $key => $component) { } echo Bootstrap4::breadcrumbs([ - route('admin-control-panel') => I18N::translate('Control panel'), - 'admin_trees_manage.php' => I18N::translate('Manage family trees'), + route('admin-control-panel') => I18N::translate('Control panel'), + route('admin-trees') => I18N::translate('Manage family trees'), ], $controller->getPageTitle()); ?> diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 9269333d01..09333f387c 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -468,6 +468,7 @@ class AdminController extends AbstractBaseController { WT_ROOT . 'admin_site_info.php', WT_ROOT . 'admin_site_merge.php', WT_ROOT . 'admin_site_readme.php', + WT_ROOT . 'admin_trees_manage.php', WT_ROOT . 'admin_users_bulk.php', WT_ROOT . 'assets/js-1.7.7', WT_ROOT . 'autocomplete.php', @@ -1586,7 +1587,7 @@ class AdminController extends AbstractBaseController { } - return new RedirectResponse(Html::url('admin_trees_manage.php', ['ged' => $tree->getName()])); + return new RedirectResponse(route('admin-trees', ['ged' => $tree->getName()])); } /** diff --git a/app/Http/Controllers/AdminTreesController.php b/app/Http/Controllers/AdminTreesController.php new file mode 100644 index 0000000000..cbfd51cd1a --- /dev/null +++ b/app/Http/Controllers/AdminTreesController.php @@ -0,0 +1,293 @@ +<?php +/** + * webtrees: online genealogy + * Copyright (C) 2018 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Http\Controllers; + +use Fisharebest\Webtrees\FlashMessages; +use Fisharebest\Webtrees\Functions\Functions; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Site; +use Fisharebest\Webtrees\Tree; +use Fisharebest\Webtrees\User; +use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; + +/** + * Controller for tree administration. + */ +class AdminTreesController extends AbstractBaseController { + // Show a reduced page when there are more than a certain number of trees + const MULTIPLE_TREE_THRESHOLD = 500; + + protected $layout = 'layouts/administration'; + + /** + * @param Request $request + * + * @return Response + */ + public function index(Request $request): Response { + /** @var Tree $tree */ + $tree = $request->attributes->get('tree'); + + $multiple_tree_threshold = (int) Site::getPreference('MULTIPLE_TREE_THRESHOLD', self::MULTIPLE_TREE_THRESHOLD); + $gedcom_files = $this->gedcomFiles(WT_DATA_DIR); + + $all_trees = Tree::getAll(); + + // On sites with hundreds or thousands of trees, this page becomes very large. + // 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) { + return $x->getPreference('imported') === '0' || $tree->getTreeId() === $x->getTreeId() || $x->getName() === Site::getPreference('DEFAULT_GEDCOM'); + }); + } + + $default_tree_name = $this->generateNewTreeName(); + $default_tree_title = I18N::translate('My family tree'); + + $all_users = User::all(); + + $title = I18N::translate('Manage family trees'); + + return $this->viewResponse('admin/trees', [ + 'all_trees' => $all_trees, + 'all_users' => $all_users, + 'default_tree_name' => $default_tree_name, + 'default_tree_title' => $default_tree_title, + 'gedcom_files' => $gedcom_files, + 'multiple_tree_threshold' => $multiple_tree_threshold, + 'title' => $title, + ]); + } + + /** + * Generate a unqiue name for new trees + * + * @return string + */ + private function generateNewTreeName(): string { + $tree_name = 'tree'; + $tree_number = 1; + $existing_trees = Tree::getNameList(); + + while (array_key_exists($tree_name . $tree_number, $existing_trees)) { + $tree_number++; + } + + return $tree_name . $tree_number; + } + + /** + * @param Request $request + * + * @return Response + */ + public function importForm(Request $request): Response { + /** @var Tree $tree */ + $tree = $request->attributes->get('tree'); + + $default_gedcom_file = $tree->getPreference('gedcom_filename'); + $gedcom_media_path = $tree->getPreference('GEDCOM_MEDIA_PATH'); + $gedcom_files = $this->gedcomFiles(WT_DATA_DIR); + + $title = I18N::translate('Import a GEDCOM file') . ' — ' . e($tree->getTitle()); + + return $this->viewResponse('admin/tree-import', [ + 'default_gedcom_file' => $default_gedcom_file, + 'gedcom_files' => $gedcom_files, + 'gedcom_media_path' => $gedcom_media_path, + 'title' => $title, + ]); + } + + /** + * @param Request $request + * + * @return RedirectResponse + */ + public function importAction(Request $request): RedirectResponse { + /** @var Tree $tree */ + $tree = $request->attributes->get('tree'); + + $source = $request->get('source'); + $keep_media = (bool) $request->get('keep_media'); + $WORD_WRAPPED_NOTES = (bool) $request->get('WORD_WRAPPED_NOTES'); + $GEDCOM_MEDIA_PATH = $request->get('GEDCOM_MEDIA_PATH'); + + // Save these choices as defaults + $tree->setPreference('keep_media', $keep_media ? '1' : '0'); + $tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES ? '1' : '0'); + $tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH); + + if ($source === 'client') { + if (isset($_FILES['tree_name'])) { + if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) { + $tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']); + } else { + FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger'); + } + } else { + FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger'); + } + } + + if ($source === 'server') { + $basename = basename($request->get('tree_name')); + + if ($basename) { + $tree->importGedcomFile(WT_DATA_DIR . $basename, $basename); + } else { + FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger'); + } + } + + $url = route('admin-trees', ['ged' => $tree->getName()]); + + return new RedirectResponse($url); + } + + /** + * @param Request $request + * + * @return RedirectResponse + */ + public function create(Request $request): RedirectResponse { + /** @var Tree $tree */ + $tree = $request->attributes->get('tree'); + + $tree_name = $request->get('tree_name', ''); + $tree_title = $request->get('tree_title', ''); + + // We use the tree name as a file name, so no directory separators allowed. + $tree_name = basename($tree_name); + + if ($tree_name !== '' && $tree_title !== '') { + if (Tree::findByName($tree_name)) { + 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'); + } + } + + $url = route('admin-trees', ['ged' => $tree->getName()]); + + return new RedirectResponse($url); + } + + /** + * @param Request $request + * + * @return RedirectResponse + */ + public function delete(Request $request): RedirectResponse { + /** @var Tree $tree */ + $tree = $request->attributes->get('tree'); + + FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ + I18N::translate('The family tree “%s” has been deleted.', e($tree->getTitle())), 'success'); + + $tree->delete(); + + $url = route('admin-trees'); + + return new RedirectResponse($url); + } + + /** + * @param Request $request + * + * @return RedirectResponse + */ + public function synchronize(Request $request): RedirectResponse { + /** @var Tree $tree */ + $tree = $request->attributes->get('tree'); + + $gedcom_files = $this->gedcomFiles(WT_DATA_DIR); + + foreach ($gedcom_files as $gedcom_file) { + // Only import files that have changed + $filemtime = (string) filemtime(WT_DATA_DIR . $gedcom_file); + + $tree = Tree::findByName($gedcom_file) ?? Tree::create($gedcom_file, $gedcom_file); + + if ($tree->getPreference('filemtime') !== $filemtime) { + $tree->importGedcomFile(WT_DATA_DIR . $gedcom_file, $gedcom_file); + $tree->setPreference('filemtime', $filemtime); + + FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', e($gedcom_file)), 'success'); + } + } + + foreach (Tree::getAll() as $tree) { + if (!in_array($tree->getName(), $gedcom_files)) { + FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', e($tree->getTitle())), 'success'); + $tree->delete(); + } + } + + $url = route('admin-trees', ['ged' => $tree->getName()]); + + return new RedirectResponse($url); + } + + /** + * @param Request $request + * + * @return RedirectResponse + */ + public function setDefault(Request $request): RedirectResponse { + /** @var Tree $tree */ + $tree = $request->attributes->get('tree'); + + Site::setPreference('DEFAULT_GEDCOM', $tree->getName()); + + FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ + I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', e($tree->getTitle())), 'success'); + + $url = route('admin-trees'); + + return new RedirectResponse($url); + } + + /** + * Find a list of GEDCOM files in a folder + * + * @param string $folder + * + * @return array + */ + private function gedcomFiles(string $folder): array { + $d = opendir($folder); + $files = []; + while (($f = readdir($d)) !== false) { + if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) { + $fp = fopen(WT_DATA_DIR . $f, 'rb'); + $header = fread($fp, 64); + fclose($fp); + if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) { + $files[] = $f; + } + } + } + sort($files); + + return $files; + } +} diff --git a/app/Http/Controllers/ErrorController.php b/app/Http/Controllers/ErrorController.php index 92b6c58268..3a813dfaf1 100644 --- a/app/Http/Controllers/ErrorController.php +++ b/app/Http/Controllers/ErrorController.php @@ -55,7 +55,7 @@ class ErrorController extends AbstractBaseController { // No tree or tree not imported? if (Auth::isAdmin()) { - return new RedirectResponse(Html::url('admin_trees_manage.php', [])); + return new RedirectResponse(route('admin-trees', ['ged' => $tree->getName()])); } return $this->viewResponse('errors/no-tree-access', [ 'title' => '' ]); diff --git a/app/Tree.php b/app/Tree.php index 6252ff9719..eaf10cf160 100644 --- a/app/Tree.php +++ b/app/Tree.php @@ -601,7 +601,6 @@ class Tree { // Don’t allow the user to cancel the request. We do not want to be left with an incomplete transaction. ignore_user_abort(true); - Database::beginTransaction(); $this->deleteGenealogyData($this->getPreference('keep_media')); $this->setPreference('gedcom_filename', $filename); $this->setPreference('imported', '0'); @@ -626,7 +625,6 @@ class Tree { "INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)" )->execute([$this->tree_id, $file_data]); - Database::commit(); fclose($fp); } diff --git a/edit_interface.php b/edit_interface.php index dfd2636520..57c1158457 100644 --- a/edit_interface.php +++ b/edit_interface.php @@ -660,7 +660,7 @@ case 'add_unlinked_indi_action': if (Filter::post('goto') === 'new') { header('Location: ' . $new_indi->url()); } else { - header('Location: admin_trees_manage.php'); + header('Location: ' . route('admin-trees')); } break; @@ -1551,7 +1551,7 @@ function print_indi_form($nextaction, Individual $person = null, Family $family $xref = $family->getXref(); $cancel_url = $family->url(); } else { - $cancel_url = 'admin_trees_manage.php'; + $cancel_url = route('admin-trees'); $xref = 'new'; } diff --git a/resources/views/admin/changes-log.php b/resources/views/admin/changes-log.php index 0ab530998a..6675b1be0e 100644 --- a/resources/views/admin/changes-log.php +++ b/resources/views/admin/changes-log.php @@ -1,9 +1,8 @@ <?php use Fisharebest\Webtrees\Bootstrap4; ?> <?php use Fisharebest\Webtrees\FontAwesome; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?php use Fisharebest\Webtrees\View; ?> -<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), 'admin_trees_manage.php' => I18N::translate('Manage family trees'), $title]]) ?> +<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees') => I18N::translate('Manage family trees'), $title]]) ?> <h1><?= $title ?></h1> diff --git a/resources/views/admin/control-panel-manager.php b/resources/views/admin/control-panel-manager.php index 1f34b64f25..7dd4ba606a 100644 --- a/resources/views/admin/control-panel-manager.php +++ b/resources/views/admin/control-panel-manager.php @@ -61,7 +61,7 @@ </a> </th> <td> - <?= FontAwesome::linkIcon('preferences', I18N::translate('Manage family trees'), ['href' => Html::url('admin_trees_manage.php', ['ged' => $tree->getName()])]) ?> + <?= FontAwesome::linkIcon('preferences', I18N::translate('Manage family trees'), ['href' => route('admin-trees', ['ged' => $tree->getName()])]) ?> </td> <td class="text-right"> <?php if ($changes[$tree->getTreeId()]): ?> diff --git a/resources/views/admin/control-panel.php b/resources/views/admin/control-panel.php index 888407e98a..1386171c18 100644 --- a/resources/views/admin/control-panel.php +++ b/resources/views/admin/control-panel.php @@ -137,7 +137,7 @@ </a> </th> <td> - <?= FontAwesome::linkIcon('preferences', I18N::translate('Manage family trees'), ['href' => Html::url('admin_trees_manage.php', ['ged' => $tree->getName()])]) ?> + <?= FontAwesome::linkIcon('preferences', I18N::translate('Manage family trees'), ['href' => route('admin-trees', ['ged' => $tree->getName()])]) ?> </td> <td class="text-right"> <?php if ($changes[$tree->getTreeId()]): ?> @@ -240,7 +240,7 @@ <ul class="fa-ul"> <li> <span class="fa-li"><i class="fas fa-wrench"></i></span> - <a href="<?= e(Html::url('admin_trees_manage.php', [])) ?>"> + <a href="<?= e(route('admin-trees', ['ged' => $tree->getName()])) ?>"> <?= I18N::translate('Manage family trees') ?> </a> </li> diff --git a/resources/views/admin/merge-records-step-1.php b/resources/views/admin/merge-records-step-1.php index b4f202941c..fe3c350c60 100644 --- a/resources/views/admin/merge-records-step-1.php +++ b/resources/views/admin/merge-records-step-1.php @@ -3,7 +3,7 @@ <?php use Fisharebest\Webtrees\I18N; ?> <?php use Fisharebest\Webtrees\View; ?> -<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), 'admin_trees_manage.php' => I18N::translate('Manage family trees'), $title]]) ?> +<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees') => I18N::translate('Manage family trees'), $title]]) ?> <h1><?= $title ?></h1> diff --git a/resources/views/admin/merge-records-step-2.php b/resources/views/admin/merge-records-step-2.php index e7a3607cdf..4fd0787162 100644 --- a/resources/views/admin/merge-records-step-2.php +++ b/resources/views/admin/merge-records-step-2.php @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), 'admin_trees_manage.php' => I18N::translate('Manage family trees'), $title]]) ?> +<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees') => I18N::translate('Manage family trees'), $title]]) ?> <h1><?= $title ?></h1> diff --git a/resources/views/admin/tree-import.php b/resources/views/admin/tree-import.php new file mode 100644 index 0000000000..fb6d7f9602 --- /dev/null +++ b/resources/views/admin/tree-import.php @@ -0,0 +1,141 @@ +<?php use Fisharebest\Webtrees\I18N; ?> +<?php use Fisharebest\Webtrees\View; ?> + +<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), 'admin-trees' => I18N::translate('Manage family trees'), $title]]) ?> + +<h1><?= $title ?></h1> + +<div class="alert alert-warning"> + <?= /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file.', e($tree->getTitle())) ?> +</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" id="gedcom_filename" value="<?= e($default_gedcom_file) ?>"> + <?= csrf_field() ?> + + <fieldset class="form-group"> + <div class="row"> + <legend class="col-form-label col-sm-3"> + <?= I18N::translate('Select a GEDCOM file to import') ?> + </legend> + <div class="col-sm-9"> + <div class="row form-group"> + <label class="col-sm-3"> + <input type="radio" name="source" id="import-computer" value="client" checked> + <?= I18N::translate('A file on your computer') ?> + </label> + <div class="col-sm-9"> + <div class="btn btn-default"> + <input type="file" class="form-control-file" name="tree_name" id="import-computer-file"> + </div> + </div> + </div> + <div class="row"> + <label class="col-sm-3"> + <input type="radio" name="source" id="import-server" value="server"> + <?= I18N::translate('A file on the server') ?> + </label> + <div class="col-sm-9"> + <div class="input-group"> + <div class="input-group-prepend"> + <span class="input-group-text"> + <?= WT_DATA_DIR ?> + </span> + </div> + <select name="tree_name" class="form-control" id="import-server-file"> + <option value=""></option> + <?php foreach ($gedcom_files as $gedcom_file): ?> + <option value="<?= e($gedcom_file) ?>" <?= $gedcom_file === $default_gedcom_file? 'selected' : '' ?>> + <?= e($gedcom_file) ?> + </option> + <?php endforeach ?> + <?php if (empty($gedcom_files)): ?> + <option disabled selected> + <?= I18N::translate('No GEDCOM files found.') ?> + </option> + <?php endif ?> + </select> + </div> + </div> + </div> + </div> + </div> + </fieldset> + + <hr> + + <fieldset class="form-group"> + <div class="row"> + <legend class="col-form-label col-sm-3"> + <?= I18N::translate('Import preferences') ?> + </legend> + <div class="col-sm-9"> + <label> + <input type="checkbox" name="keep_media" value="1" <?= $tree->getPreference('keep_media') ? 'checked' : '' ?>> + <?= /* I18N: A configuration setting */ I18N::translate('Keep media objects') ?> + </label> + <p class="small text-muted"> + <?= I18N::translate('If you have created media objects in webtrees, and have subsequently edited this GEDCOM file using genealogy software that deletes media objects, then select this option to merge the current media objects with the new GEDCOM file.') ?> + </p> + <label> + <input type="checkbox" name="WORD_WRAPPED_NOTES" value="1" <?= $tree->getPreference('WORD_WRAPPED_NOTES') ? 'checked' : '' ?>> + <?= I18N::translate('Add spaces where long lines were wrapped') ?> + </label> + <p class="small text-muted"> + <?= I18N::translate('If you created this GEDCOM file using genealogy software that omits spaces when splitting long lines, then select this option to reinsert the missing spaces.') ?> + </p> + <label for="GEDCOM_MEDIA_PATH"> + <?= /* I18N: A media path (e.g. c:\aaa\bbb\ccc\ddd.jpeg) in a GEDCOM file */ I18N::translate('Remove the GEDCOM media path from filenames') ?> + </label> + <input + class="form-control" + dir="ltr" + id="GEDCOM_MEDIA_PATH" + maxlength="255" + name="GEDCOM_MEDIA_PATH" + type="text" + value="<?= e($gedcom_media_path) ?>" + > + <p class="small text-muted"> + <?= /* I18N: Help text for the “GEDCOM media path” configuration setting. A “path” is something like “C:\Documents\Genealogy\Photos\John_Smith.jpeg” */ I18N::translate('Some genealogy software creates GEDCOM files that contain media filenames with full paths. These paths will not exist on the web-server. To allow webtrees to find the file, the first part of the path must be removed.') ?> + <?= /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>') ?> + </p> + </div> + </div> + </fieldset> + + <div class="row form-group"> + <div class="offset-sm-3 col-sm-9"> + <button type="submit" class="btn btn-primary"> + <?= /* I18N: A button label. */ I18N::translate('continue') ?> + </button> + </div> + </div> +</form> + +<?php View::push('javascript') ?> +<script> + function checkGedcomImportForm (message) { + var oldFile = $('#gedcom_filename').val(); + var method = $('input[name=action]:checked').val(); + var newFile = method === 'replace_import' ? $('#import-server-file').val() : $('#import-computer-file').val(); + + // Some browsers include c:\fakepath\ in the filename. + newFile = newFile.replace(/.*[/\\]/, ''); + if (newFile !== oldFile && oldFile !== '') { + return window.confirm(message); + } else { + return true; + } + } + + document.getElementById("import-computer-file").addEventListener("click", function () { + document.getElementById("import-computer").checked = true; + }); + + document.getElementById("import-server-file").addEventListener("focus", function () { + document.getElementById("import-server").checked = true; + }); +</script> +<?php View::endpush() ?> diff --git a/resources/views/admin/tree-privacy.php b/resources/views/admin/tree-privacy.php index beb8f9eb6d..fc43cc730f 100644 --- a/resources/views/admin/tree-privacy.php +++ b/resources/views/admin/tree-privacy.php @@ -5,7 +5,7 @@ <?php use Fisharebest\Webtrees\Site; ?> <?php use Fisharebest\Webtrees\View; ?> -<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), 'admin_trees_manage.php' => I18N::translate('Manage family trees'), $title]]) ?> +<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees') => I18N::translate('Manage family trees'), $title]]) ?> <h1><?= $title ?></h1> @@ -273,7 +273,7 @@ <?= FontAwesome::decorativeIcon('save') ?> <?= I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="admin_trees_manage.php?ged=<?= e($tree->getName()) ?>"> + <a class="btn btn-secondary" href="<?= route('admin-trees', ['ged' => $tree->getName()]) ?>"> <?= FontAwesome::decorativeIcon('cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/admin/trees.php b/resources/views/admin/trees.php new file mode 100644 index 0000000000..b75c0dc6e5 --- /dev/null +++ b/resources/views/admin/trees.php @@ -0,0 +1,436 @@ +<?php use Fisharebest\Webtrees\Auth; ?> +<?php use Fisharebest\Webtrees\Database; ?> +<?php use Fisharebest\Webtrees\Html; ?> +<?php use Fisharebest\Webtrees\I18N; ?> +<?php use Fisharebest\Webtrees\Site; ?> +<?php use Fisharebest\Webtrees\View; ?> + +<?= view('admin/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), $title]]) ?> + +<h1><?= $title ?></h1> + +<?php if (empty($all_trees)): ?> + <div class="alert alert-info"> + <?= I18N::translate('You need to create a family tree.') ?> + </div> +<?php endif ?> + +<div id="accordion" role="tablist" aria-multiselectable="true"> + <?php foreach ($all_trees as $managed_tree): ?> + <?php if (Auth::isManager($managed_tree)): ?> + <div class="card"> + <div class="card-header" role="tab" id="card-tree-header-<?= $managed_tree->getTreeId() ?>"> + <h2 class="mb-0"> + <i class="fas fa-tree fa-fw"></i> + <a data-toggle="collapse" data-parent="#accordion" href="#card-tree-content-<?= $managed_tree->getTreeId() ?>" <?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? 'aria-expanded="true"' : '' ?> aria-controls="card-tree-content-<?= $managed_tree->getTreeId() ?>"> + <?= e($managed_tree->getName()) ?> — <?= e($managed_tree->getTitle()) ?> + </a> + </h2> + </div> + <div id="card-tree-content-<?= $managed_tree->getTreeId() ?>" class="collapse<?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="panel-tree-header-<?= $managed_tree->getTreeId() ?>"> + <div class="card-body"> + <?php $importing = Database::prepare( "SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id = ? AND imported = '0' LIMIT 1" )->execute([$managed_tree->getTreeId()])->fetchOne() ?> + <?php if ($importing): ?> + <div id="import<?= $managed_tree->getTreeId() ?>" class="col-xs-12"> + <div class="progress"> + <?= I18N::translate('Calculating…') ?> + </div> + </div> + <?php View::push('javascript'); ?> + <script> + $("#import<?= $managed_tree->getTreeId() ?>").load("<?= route('import', ['ged' => $managed_tree->getName()]) ?>", {}); + </script> + <?php View::endpush() ?> + <?php endif ?> + <div class="row<?= $importing ? ' d-none' : '' ?>" id="actions<?= $managed_tree->getTreeId() ?>"> + <div class="col-sm-6 col-md-3"> + <h3> + <a href="<?= e(route('tree-page', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Family tree') ?> + </a> + </h3> + <ul class="fa-ul"> + <!-- PREFERENCES --> + <li> + <span class="fa-li"><i class="fas fa-cogs"></i></span> + <a href="<?= e(Html::url('admin_trees_config.php', ['ged' => $managed_tree->getName(), 'action' => 'general'])) ?>"> + <?= I18N::translate('Preferences') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- PRIVACY --> + <li> + <span class="fa-li"><i class="fas fa-lock"></i></span> + <a href="<?= e(route('tree-privacy', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Privacy') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- HOME PAGE BLOCKS--> + <li> + <span class="fa-li"><i class="fas fa-th-large"></i></span> + <a href="<?= e(route('tree-page-edit', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Change the “Home page” blocks') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- DELETE --> + <li> + <span class="fa-li"><i class="far fa-trash-alt"></i></span> + <a href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->getTitle())) ?>" onclick="if (confirm(this.dataset.confirm)) { document.delete_form<?= $managed_tree->getTreeId() ?>.submit(); } return false;"> + <?= I18N::translate('Delete') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + <form name="delete_form<?= $managed_tree->getTreeId() ?>" method="post" action="<?= route('admin-trees-delete', ['ged' => $tree->getName()]) ?>"> + <?= csrf_field() ?> + <!-- A11Y - forms need submit buttons, but they look ugly here --> + <button class="sr-only" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->getTitle())) ?>" onclick="return confirm(this.dataset.confirm)" type="submit"> + <?= I18N::translate('Delete') ?> + </button> + </form> + </li> + <!-- SET AS DEFAULT --> + <?php if (count($all_trees) > 1): ?> + <li> + <span class="fa-li"><i class="far fa-star"></i></span> + <?php if ($managed_tree->getName() === Site::getPreference('DEFAULT_GEDCOM')): ?> + <?= I18N::translate('Default family tree') ?> + <?php else: ?> + <a href="#" onclick="document.defaultform<?= $managed_tree->getTreeId() ?>.submit();"> + <?= I18N::translate('Set as default') ?> + <span class="sr-only"><?= e($managed_tree->getTitle()) ?></span> + </a> + <form name="defaultform<?= $managed_tree->getTreeId() ?>" method="post" action="<?= route('admin-trees-default', ['ged' => $managed_tree->getName()]) ?>"> + <?= csrf_field() ?> + <!-- A11Y - forms need submit buttons, but they look ugly here --> + <button class="sr-only" type="submit"> + <?= I18N::translate('Set as default') ?> + </button> + </form> + <?php endif ?> + </li> + <?php endif ?> + </ul> + </div> + <div class="col-sm-6 col-md-3"> + <h3> + <?= /* I18N: Individuals, sources, dates, places, etc. */ I18N::translate('Genealogy data') ?> + </h3> + <ul class="fa-ul"> + <!-- FIND DUPLICATES --> + <li> + <span class="fa-li"><i class="far fa-copy"></i></span> + <a href="<?= e(Html::url('admin_trees_duplicates.php', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Find duplicates') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- MERGE --> + <li> + <span class="fa-li"><i class="fas fa-code-branch"></i></span> + <a href="<?= e(route('merge-records', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Merge records') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- UPDATE PLACE NAMES --> + <li> + <span class="fa-li"><i class="fas fa-map-marker-alt"></i></span> + <a href="<?= e(Html::url('admin_trees_places.php', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Update place names') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- CHECK FOR ERRORS --> + <li> + <span class="fa-li"><i class="fas fa-check"></i></span> + <a href="<?= e(Html::url('admin_trees_check.php', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Check for errors') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- UNCONNECTED INDIVIDUALS --> + <li> + <span class="fa-li"><i class="fas fa-unlink"></i></span> + <a href="<?= e(Html::url('admin_trees_unconnected.php', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Find unrelated individuals') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- RENUMBER --> + <li> + <span class="fa-li"><i class="fas fa-sort-numeric-down"></i></span> + <a href="<?= e(Html::url('admin_trees_renumber.php', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Renumber') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- CHANGES --> + <li> + <span class="fa-li"><i class="fas fa-th-list"></i></span> + <a href="<?= route('admin-changes-log', ['ged' => $managed_tree->getName()]) ?>"> + <?= I18N::translate('Changes log') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + </ul> + </div> + <div class="clearfix visible-sm-block"></div> + <div class="col-sm-6 col-md-3"> + <h3> + <?= I18N::translate('Add unlinked records') ?> + </h3> + <ul class="fa-ul"> + <!-- UNLINKED INDIVIDUAL --> + <li> + <span class="fa-li"><i class="far fa-user"></i></span> + <a href="edit_interface.php?action=add_unlinked_indi&ged=<?= e($managed_tree->getName()) ?>"> + <?= I18N::translate('Individual') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- UNLINKED SOURCE --> + <li> + <span class="fa-li"><i class="fas fa-book"></i></span> + <a href="#" data-href="<?= e(route('create-source', ['tree' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <?= I18N::translate('Source') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- UNLINKED REPOSITORY --> + <li> + <span class="fa-li"><i class="fas fa-university"></i></span> + <a href="#" data-href="<?= e(route('create-repository', ['tree' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <?= I18N::translate('Repository') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- UNLINKED MEDIA OBJECT --> + <li> + <span class="fa-li"><i class="far fa-image"></i></span> + <a href="#" data-href="<?= e(route('create-media-object', ['tree' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + + <?= I18N::translate('Media object') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- UNLINKED NOTE --> + <li> + <span class="fa-li"><i class="fas fa-paragraph"></i></span> + <a href="#" data-href="<?= e(route('create-note-object', ['tree' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + <?= I18N::translate('Shared note') ?> + </a> + </li> + <!-- UNLINKED SUBMITTER --> + <li> + <span class="fa-li"><i class="far fa-user"></i></span> + <a href="#" data-href="<?= e(route('create-submitter', ['tree' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + <?= I18N::translate('Submitter') ?> + </a> + </li> + </ul> + </div> + <div class="col-sm-6 col-md-3"> + <h3> + <?= I18N::translate('GEDCOM file') ?> + </h3> + <ul class="fa-ul"> + <!-- DOWNLOAD/Export --> + <li> + <span class="fa-li"><i class="fas fa-download"></i></span> + <a href="<?= e(Html::url('admin_trees_download.php', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Export') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + <!-- UPLOAD/IMPORT --> + <li> + <span class="fa-li"><i class="fas fa-upload"></i></span> + <a href="<?= e(route('admin-trees-import', ['ged' => $managed_tree->getName()])) ?>"> + <?= I18N::translate('Import') ?> + <span class="sr-only"> + <?= e($managed_tree->getTitle()) ?> + </span> + </a> + </li> + </ul> + </div> + </div> + </div> + </div> + </div> + <?php endif ?> + <?php endforeach ?> + + <?php if (Auth::isAdmin()): ?> + <div class="card"> + <div class="card-header" id="card-tree-create-header"> + <h2 class="mb-0"> + <i class="fas fa-plus fa-fw"></i> + <a data-toggle="collapse" data-parent="#accordion" href="#card-tree-create-content" aria-controls="card-tree-create-content"> + <?= I18N::translate('Create a family tree') ?> + </a> + </h2> + </div> + <div id="card-tree-create-content" class="collapse<?= empty($all_trees) ? ' show' : '' ?>" role="tabpanel" aria-labelledby="card-tree-create-header"> + <div class="card-body"> + <form class="form-horizontal" method="post" action="<?= e(route('admin-trees-create')) ?>"> + <?= csrf_field() ?> + <div class="row form-group"> + <label for="tree_title" class="col-sm-2 col-form-label"> + <?= I18N::translate('Family tree title') ?> + </label> + <div class="col-sm-10"> + <input class="form-control" id="tree_title" maxlength="255" name="tree_title" required type="text" placeholder="<?= $default_tree_title ?>"> + </div> + </div> + <div class="row form-group"> + <label for="tree_name" class="col-sm-2 col-form-label"> + <?= I18N::translate('URL') ?> + </label> + <div class="col-sm-10"> + <div class="input-group" dir="ltr"> + <div class="input-group-prepend"> + <span class="input-group-text"> + <?= WT_BASE_URL ?>?ged= + </span> + </div> + <input class="form-control" id="tree_name" maxlength="31" name="tree_name" pattern="[^<>&"#^$*?{}()\[\]/\\]*" required type="text" value="<?= $default_tree_name ?>"> + </div> + <p class="small text-muted"> + <?= I18N::translate('Avoid spaces and punctuation. A family name might be a good choice.') ?> + </p> + </div> + </div> + <div class="row form-group"> + <div class="offset-sm-2 col-sm-10"> + <button type="submit" class="btn btn-primary"> + <i class="fas fa-check" aria-hidden="true"></i> + <?= /* I18N: A button label. */ I18N::translate('create') ?> + </button> + <p class="small text-muted"> + <?= I18N::translate('After creating the family tree, you will be able to import data from a GEDCOM file.') ?> + </p> + </div> + </div> + </form> + </div> + </div> + </div> + <?php endif ?> + + <!-- display link to PhpGedView-WT transfer wizard on first visit to this page, before any GEDCOM is loaded --> + <?php if (empty($all_trees) && count($all_users) === 1): ?> + <div class="card"> + <div class="card-header" id="card-pgv-wizard-header"> + <h2 class="mb-0"> + <i class="fas fa-magic fa-fw"></i> + <a data-toggle="collapse" data-parent="#accordion" href="#card-pgv-wizard-content" aria-controls="card-pgv-wizard-content"> + <?= I18N::translate('PhpGedView to webtrees transfer wizard') ?> + </a> + </h2> + </div> + <div id="card-pgv-wizard-content" class="collapse show" role="tabpanel" aria-labelledby="card-pgv-wizard-header"> + <div class="card-body"> + <p> + <?= I18N::translate('The PhpGedView to webtrees wizard is an automated process to assist administrators make the move from a PhpGedView installation to a new webtrees one. It will transfer all PhpGedView GEDCOM and other database information directly to your new webtrees database. The following requirements are necessary:') ?> + </p> + <ul> + <li> + <?= I18N::translate('webtrees’ database must be on the same server as PhpGedView’s') ?> + </li> + <li> + <?= /* I18N: %s is a number */ I18N::translate('PhpGedView must be version 4.2.3, or any SVN up to #%s', I18N::digits(7101)) ?> + </li> + <li> + <?= I18N::translate('All changes in PhpGedView must be accepted') ?> + </li> + <li> + <?= I18N::translate('All existing PhpGedView users must have distinct email addresses') ?> + </li> + </ul> + <p> + <?= I18N::translate('<b>Important note:</b> The transfer wizard is not able to assist with moving media items. You will need to set up and move or copy your media configuration and objects separately after the transfer wizard is finished.') ?> + </p> + <p> + <a href="admin_pgv_to_wt.php"> + <?= I18N::translate('PhpGedView to webtrees transfer wizard') ?> + </a> + </p> + </div> + </div> + </div> + <?php endif ?> + + <!-- BULK LOAD/SYNCHRONISE GEDCOM FILES --> + <?php if (count($gedcom_files) >= $multiple_tree_threshold): ?> + <div class="card"> + <div class="card-header" id="card-tree-create-header"> + <h2 class="mb-0"> + <i class="fas fa-sync-alt fa-fw"></i> + <a data-toggle="collapse" data-parent="#accordion" href="#synchronize-gedcom-files"> + <?= I18N::translate('Synchronize family trees with GEDCOM files') ?> + </a> + </h2> + </div> + + <div id="synchronize-gedcom-files" class="panel-collapse collapse"> + <div class="card-body"> + <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()])) ?>"> + <?= csrf_field() ?> + <button type="submit" class="btn btn-danger"> + <i class="fas fa-sync"></i> + <?= /* I18N: A button label. */ I18N::translate('continue') ?> + </button> + <p class="small text-muted"> + <?= I18N::translate('Caution! This may take a long time. Be patient.') ?> + </p> + </form> + </div> + </div> + </div> + <?php endif ?> +</div> + +<?= view('modals/ajax') ?> diff --git a/routes/web.php b/routes/web.php index 936de5841e..a86ac6c1fc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -44,6 +44,13 @@ if (Auth::isAdmin()) { 'GET:admin-webtrees1-thumbs' => 'AdminController@webtrees1Thumbnails', 'POST:admin-webtrees1-thumbs-action' => 'AdminController@webtrees1ThumbnailsAction', 'GET:admin-webtrees1-thumbs-data' => 'AdminController@webtrees1ThumbnailsData', + 'GET:admin-trees-import' => 'AdminTreesController@importForm', + 'POST:admin-trees-import' => 'AdminTreesController@importAction', + 'POST:admin-trees-create' => 'AdminTreesController@create', + 'POST:admin-trees-default' => 'AdminTreesController@setDefault', + 'POST:admin-trees-delete' => 'AdminTreesController@delete', + 'POST:admin-trees-sync' => 'AdminTreesController@synchronize', + 'GET:admin-trees' => 'AdminTreesController@index', 'GET:tree-page-default-edit' => 'HomePageController@treePageDefaultEdit', 'POST:tree-page-default-update' => 'HomePageController@treePageDefaultUpdate', 'GET:user-page-default-edit' => 'HomePageController@userPageDefaultEdit', |