diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-01-02 13:13:41 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-01-02 13:13:41 +0000 |
| commit | 0ffeeba4e3f5ea6058ed79356d2376e008ad9708 (patch) | |
| tree | da730eb6de949e4267574cbcd42330abc2f0602b | |
| parent | ebe5dedea78a49a5a7929e6fae429ca5dd0e2bda (diff) | |
| download | webtrees-0ffeeba4e3f5ea6058ed79356d2376e008ad9708.tar.gz webtrees-0ffeeba4e3f5ea6058ed79356d2376e008ad9708.tar.bz2 webtrees-0ffeeba4e3f5ea6058ed79356d2376e008ad9708.zip | |
Migrate to new admin modules (no longer use editgedcoms.php)
| -rw-r--r-- | admin_trees_manage.php | 2 | ||||
| -rw-r--r-- | downloadgedcom.php | 4 | ||||
| -rw-r--r-- | editgedcoms.php | 346 | ||||
| -rw-r--r-- | export_gedcom.php | 2 | ||||
| -rw-r--r-- | import.php | 4 | ||||
| -rw-r--r-- | includes/session.php | 2 |
6 files changed, 7 insertions, 353 deletions
diff --git a/admin_trees_manage.php b/admin_trees_manage.php index 23cabef8d1..cb939d909b 100644 --- a/admin_trees_manage.php +++ b/admin_trees_manage.php @@ -265,7 +265,7 @@ foreach ($gedcoms as $gedcom_id=>$gedcom_name) { help_link('upload_gedcom'), '</td>', // delete - '<td><a href="editgedcoms.php?action=delete&ged=', rawurlencode($gedcom_name), '" onclick="return confirm(\''.htmlspecialchars(WT_I18N::translate('Permanently delete the GEDCOM %s and all its settings?', $gedcom_name)),'\');">', WT_I18N::translate('Delete'), '</a>', + '<td><a href="', WT_SCRIPT_NAME, '?action=delete&ged=', rawurlencode($gedcom_name), '" onclick="return confirm(\''.htmlspecialchars(WT_I18N::translate('Permanently delete the GEDCOM %s and all its settings?', $gedcom_name)),'\');">', WT_I18N::translate('Delete'), '</a>', help_link('delete_gedcom'), '</td></tr></table></td></tr></table><br />'; } diff --git a/downloadgedcom.php b/downloadgedcom.php index 2eb6b0723e..c17c8f3447 100644 --- a/downloadgedcom.php +++ b/downloadgedcom.php @@ -50,7 +50,7 @@ $_SESSION['exportConvPath'] = $conv_path; // remember this for the next Download $_SESSION['exportConvSlashes'] = $conv_slashes; if (!WT_USER_GEDCOM_ADMIN || !$ged) { - header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.'editgedcoms.php'); + header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.'admin_trees_manage.php'); exit; } @@ -150,7 +150,7 @@ print_header(WT_I18N::translate('Download GEDCOM')); </td></tr> <tr><td class="facts_label03" colspan="2"> <input type="submit" value="<?php echo WT_I18N::translate('Download Now'); ?>" /> - <input type="button" value="<?php echo WT_I18N::translate('Back'); ?>" onclick="window.location='editgedcoms.php';"/></td></tr> + <input type="button" value="<?php echo WT_I18N::translate('Back'); ?>" onclick="window.location='admin_trees_manage.php';"/></td></tr> </table> </form> <?php diff --git a/editgedcoms.php b/editgedcoms.php deleted file mode 100644 index 49daac9df5..0000000000 --- a/editgedcoms.php +++ /dev/null @@ -1,346 +0,0 @@ -<?php -/** - * UI for online updating of the config file. - * - * webtrees: Web based Family History software - * Copyright (C) 2010 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 2 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, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * @version $Id$ - */ - -define('WT_SCRIPT_NAME', 'editgedcoms.php'); -require './includes/session.php'; - -// The gedcom admin page is for managers only! -if (!WT_USER_GEDCOM_ADMIN) { - header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.'login.php?url='.WT_SCRIPT_NAME); - exit; -} - -// Which directory contains our data files? -$INDEX_DIRECTORY=get_site_setting('INDEX_DIRECTORY'); - -// Don't allow the user to cancel the request. We do not want to be left -// with an incomplete transaction. -ignore_user_abort(true); - -function import_gedcom_file($gedcom_id, $file_name) { - // Read the file in blocks of roughly 64K. Ensure that each block - // contains complete gedcom records. This will ensure we don't split - // multi-byte characters, as well as simplifying the code to import - // each block. - - $file_data=''; - $fp=fopen($file_name, 'rb'); - - WT_DB::exec("START TRANSACTION"); - WT_DB::prepare("DELETE FROM `##gedcom_chunk` WHERE gedcom_id=?")->execute(array($gedcom_id)); - - while (!feof($fp)) { - $file_data.=fread($fp, 65536); - // There is no strrpos() function that searches for substrings :-( - for ($pos=strlen($file_data)-1; $pos>0; --$pos) { - if ($file_data[$pos]=='0' && ($file_data[$pos-1]=="\n" || $file_data[$pos-1]=="\r")) { - // We've found the last record boundary in this chunk of data - break; - } - } - if ($pos) { - WT_DB::prepare( - "INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)" - )->execute(array($gedcom_id, substr($file_data, 0, $pos))); - $file_data=substr($file_data, $pos); - } - } - WT_DB::prepare( - "INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)" - )->execute(array($gedcom_id, $file_data)); - - WT_DB::exec("COMMIT"); - fclose($fp); -} - -// Process GET actions -switch (safe_GET('action')) { -case 'delete': - $ged=safe_GET('ged'); - delete_gedcom(get_id_from_gedcom($ged)); - break; -} - -// Process POST actions -switch (safe_POST('action')) { -case 'setdefault': - set_site_setting('DEFAULT_GEDCOM', safe_POST('default_ged')); - break; -case 'add_ged': - $ged_name=basename(safe_POST('ged_name')); - $gedcom_id=get_id_from_gedcom($ged_name); - // check it doesn't already exist before we create it - if (!$gedcom_id && file_exists($INDEX_DIRECTORY.$ged_name)) { - $gedcom_id=get_id_from_gedcom($ged_name, true); - import_gedcom_file($gedcom_id, $INDEX_DIRECTORY.$ged_name); - } - header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.WT_SCRIPT_NAME); - exit; -case 'new_ged': - $ged_name=basename(safe_POST('ged_name')); - $gedcom_id=get_id_from_gedcom($ged_name); - // check it doesn't already exist before we create it - if (!$gedcom_id) { - $gedcom_id=get_id_from_gedcom($ged_name, true); - // I18N: This should be a common/default/placeholder name of a person. Put slashes around the surname. - $john_doe=WT_I18N::translate('John /DOE/'); - $note=WT_I18N::translate('Edit this individual and replace their details with your own'); - WT_DB::prepare("DELETE FROM `##gedcom_chunk` WHERE gedcom_id=?")->execute(array($gedcom_id)); - WT_DB::prepare( - "INSERT INTO `##gedcom_chunk` (gedcom_id, chunk_data) VALUES (?, ?)" - )->execute(array( - $gedcom_id, - "0 HEAD\n0 @I1@ INDI\n1 NAME {$john_doe}\n1 SEX M\n1 BIRT\n2 DATE 01 JAN 1850\n2 NOTE {$note}\n0 TRLR\n" - )); - } - break; -case 'upload_ged': - foreach ($_FILES as $FILE) { - if ($FILE['error']==0 && is_readable($FILE['tmp_name'])) { - $ged_name=$FILE['name']; - $gedcom_id=get_id_from_gedcom($ged_name); - // check it doesn't already exist before we create it - if (!$gedcom_id) { - $gedcom_id=get_id_from_gedcom($ged_name, true); - import_gedcom_file($gedcom_id, $FILE['tmp_name']); - } - } - } - header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.WT_SCRIPT_NAME); - exit; -case 'replace_upload': - $gedcom_id=safe_POST('gedcom_id'); - // Make sure the gedcom still exists - if (get_gedcom_from_id($gedcom_id)) { - foreach ($_FILES as $FILE) { - if ($FILE['error']==0 && is_readable($FILE['tmp_name'])) { - import_gedcom_file($gedcom_id, $FILE['tmp_name']); - } - } - } - header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.WT_SCRIPT_NAME); - exit; -case 'replace_import': - $gedcom_id=safe_POST('gedcom_id'); - // Make sure the gedcom still exists - if (get_gedcom_from_id($gedcom_id)) { - $ged_name=basename(safe_POST('ged_name')); - import_gedcom_file($gedcom_id, $INDEX_DIRECTORY.$ged_name); - } - header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.WT_SCRIPT_NAME); - exit; -} - -$gedcoms=get_all_gedcoms(); - -print_header(WT_I18N::translate('GEDCOM administration')); - -echo '<p class="center"><input TYPE="button" VALUE="', WT_I18N::translate('Return to Administration page'), '" onclick="javascript:window.location=\'admin.php\'" /></p>'; - -echo '<h2 class="center">', WT_I18N::translate('GEDCOM administration'), '</h2>'; - -// Process GET actions -switch (safe_GET('action')) { -case 'uploadform': -case 'importform': - $gedcom_id=safe_GET('gedcom_id'); - $gedcom_name=get_gedcom_from_id($gedcom_id); - // Check it exists - if (!$gedcom_name) { - break; - } - echo '<p>', WT_I18N::translate('This will delete all the genealogical data from <b>%s</b> and replace it with data from another GEDCOM.', $gedcom_name), '</p>'; - // the javascript in the next line strips any path associated with the file before comparing it to the current GEDCOM name (both Chrome and IE8 include c:\fakepath\ in the filename). - echo '<form name="replaceform" method="post" enctype="multipart/form-data" action="', WT_SCRIPT_NAME, '" onsubmit="var newfile = document.replaceform.ged_name.value; newfile = newfile.substr(newfile.lastIndexOf(\'\\\\\')+1); if (newfile!=\'', htmlspecialchars($gedcom_name), '\') return confirm(\'', htmlspecialchars(WT_I18N::translate('You have selected a GEDCOM with a different name. Is this correct?')), '\'); else return true;">'; - echo '<input type="hidden" name="gedcom_id" value="', $gedcom_id, '" />'; - if (safe_GET('action')=='uploadform') { - echo '<input type="hidden" name="action" value="replace_upload" />'; - echo '<input type="file" name="ged_name" />'; - } else { - echo '<input type="hidden" name="action" value="replace_import" />'; - $d=opendir($INDEX_DIRECTORY); - $files=array(); - while (($f=readdir($d))!==false) { - if (!is_dir($INDEX_DIRECTORY.$f) && is_readable($INDEX_DIRECTORY.$f)) { - $fp=fopen($INDEX_DIRECTORY.$f, 'rb'); - $header=fread($fp, 64); - fclose($fp); - if (preg_match('/^('.WT_UTF8_BOM.')?0 *HEAD/', $header)) { - $files[]=$f; - } - } - } - if ($files) { - echo $INDEX_DIRECTORY, '<select name="ged_name" />'; - foreach ($files as $file) { - echo '<option value="', htmlspecialchars($file), '"'; - if ($file==$gedcom_name) { - echo ' selected="selected"'; - } - echo'>', htmlspecialchars($file), '</option>'; - } - echo '</select>'; - } else { - echo '<p>', WT_I18N::translate('No GEDCOM files found. You need to copy files to the <b>%s</b> directory on your server.', $INDEX_DIRECTORY); - echo '</form>'; - echo '<br /><br />'; - echo '<form name="cancel" method="get" action="', WT_SCRIPT_NAME, '"><input type="submit" value="', WT_I18N::translate('Cancel'), '" /></form>'; - print_footer(); - exit; - } - } - echo '<br /><br /><input type="checkbox" name="keep_media', $gedcom_id, '" value="1">'; - echo WT_I18N::translate('If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM.'); - echo '<br /><br /><input type="submit" value="', WT_I18N::translate('Save'), '" /></form>'; - echo '</form>'; - echo '<form name="cancel" method="get" action="', WT_SCRIPT_NAME, '"><input type="submit" value="', WT_I18N::translate('Cancel'), '" /></form>'; - print_footer(); - exit; -} - - -// List the gedcoms available to this user -foreach ($gedcoms as $gedcom_id=>$gedcom_name) { - if (userGedcomAdmin(WT_USER_ID, $gedcom_id)) { - - echo - '<table class="gedcom_table" width="100%">', - '<tr><td class="list_label" width="20%">', WT_I18N::translate('GEDCOM name'), - '</td><td class="list_value"><a href="index.php?ctype=gedcom&ged=', rawurlencode($gedcom_name), '">', htmlspecialchars($gedcom_name), ' - ', - WT_I18N::translate('%s', get_gedcom_setting($gedcom_id, 'title')), '</a>', - '</td></tr><tr><td class="list_label">', WT_I18N::translate('GEDCOM administration'), - '</td><td class="list_value">'; - - // The third row shows an optional progress bar and a list of maintenance options - $importing=WT_DB::prepare( - "SELECT 1 FROM `##gedcom_chunk` WHERE gedcom_id=? AND imported=0 LIMIT 1" - )->execute(array($gedcom_id))->fetchOne(); - if ($importing) { - echo - '<div id="import', $gedcom_id, '"></div>', - WT_JS_START, - 'jQuery("#import', $gedcom_id, '").load("import.php?gedcom_id=', $gedcom_id, '&keep_media=', safe_POST('keep_media'.$gedcom_id), '");', - WT_JS_END, - '<table border="0" width="100%" id="actions', $gedcom_id, '" style="display:none">'; - } else { - echo '<table border="0" width="100%" id="actions', $gedcom_id, '">'; - } - echo - '<tr align="center">', - // configuration - '<td><a href="editconfig_gedcom.php?ged=', rawurlencode($gedcom_name), '">', WT_I18N::translate('Configuration'), '</a>', - '</td>', - // export - '<td><a href="javascript:" onclick="window.open(\'', "export_gedcom.php?export=", rawurlencode($gedcom_name), '\', \'_blank\',\'left=50,top=50,width=500,height=500,resizable=1,scrollbars=1\');">', WT_I18N::translate('Export'), '</a>', - '</td>', - // import - '<td><a href="', WT_SCRIPT_NAME, '?action=importform&gedcom_id=', $gedcom_id, '">', WT_I18N::translate('Import'), '</a>', - '</td>', - // download - '<td><a href="downloadgedcom.php?ged=', rawurlencode($gedcom_name),'">', WT_I18N::translate('Download'), '</a>', - '</td>', - // upload - '<td><a href="', WT_SCRIPT_NAME, '?action=uploadform&gedcom_id=', $gedcom_id, '">', WT_I18N::translate('Upload'), '</a>', - '</td>', - // delete - '<td><a href="editgedcoms.php?action=delete&ged=', rawurlencode($gedcom_name), '" onclick="return confirm(\''.htmlspecialchars(WT_I18N::translate('Permanently delete the GEDCOM %s and all its settings?', $gedcom_name)),'\');">', WT_I18N::translate('Delete'), '</a>', - '</td></tr></table></td></tr></table><br />'; - } -} - -// Options for creating new gedcoms and setting defaults -if (WT_USER_IS_ADMIN) { - echo - '<br/><table class="gedcom_table"><tr>', - '<td class="list_label">', WT_I18N::translate('Default GEDCOM'), help_link('default_gedcom'), '</td>', - '<td class="list_label">', WT_I18N::translate('Add a new GEDCOM'), '</td>', - '<td class="list_label">', WT_I18N::translate('Upload a new GEDCOM'), '</td>', - '<td class="list_label">', WT_I18N::translate('Create a new GEDCOM'), '</td>', - '</tr><tr>', - '<td class="list_value_wrap">', - '<form name="defaultform" method="post" action="', WT_SCRIPT_NAME, '">', - '<input type="hidden" name="action" value="setdefault" />', - '<select name="default_ged" class="header_select" onchange="document.defaultform.submit();">'; - $DEFAULT_GEDCOM=get_site_setting('DEFAULT_GEDCOM'); - if (empty($DEFAULT_GEDCOM)) { - echo '<option value="" selected="selected"></option>'; - } - foreach ($gedcoms as $gedcom_name) { - echo '<option value="', urlencode($gedcom_name), '"'; - if ($DEFAULT_GEDCOM==$gedcom_name) echo ' selected="selected"'; - echo '>', htmlspecialchars($gedcom_name), '</option>'; - } - echo - '</select>', - '</form></td>', - '<td class="list_value_wrap">', - '<form name="addform" method="post" action="', WT_SCRIPT_NAME, '">', - $INDEX_DIRECTORY, - '<input type="hidden" name="action" value="add_ged" />', - '<select name="ged_name" onchange="document.addform.submit();" />', - '<option>', WT_I18N::translate('Select a file'), '</option>', - $d=opendir($INDEX_DIRECTORY); - $files=false; - while (($f=readdir($d))!==false) { - if (!in_array($f, $gedcoms) && !is_dir($INDEX_DIRECTORY.$f) && is_readable($INDEX_DIRECTORY.$f)) { - $fp=fopen($INDEX_DIRECTORY.$f, 'rb'); - $header=fread($fp, 64); - fclose($fp); - if (preg_match('/^('.WT_UTF8_BOM.')?0 *HEAD/', $header)) { - echo '<option>', htmlspecialchars($f), '</option>'; - $files=true; - } - } - } - echo - '</select>', - '</form>', - '</td>', - '<td class="list_value_wrap">', - '<form name="uploadform" method="post" action="', WT_SCRIPT_NAME, '" enctype="multipart/form-data">', - '<input type="hidden" name="action" value="upload_ged" />', - '<input type="file" name="ged_name" onchange="document.uploadform.submit();" />', - '</form>', - '</td>', - '<td class="list_value_wrap">', - '<form name="createform" method="post" action="', WT_SCRIPT_NAME, '">', - '<input type="hidden" name="action" value="new_ged" />', - '<input name="ged_name" />', - ' <input type="submit" value="', WT_I18N::translate('Save') , '"/>', - '</form>', - '</td>', - '</tr></table><br/>'; - - // display link to PGV-WT transfer wizard on first visit to this page, before any GEDCOM is loaded - if (count($gedcoms)==0 && get_user_count()==1) { - echo - '<div class="center">', - '<a style="color:green; font-weight:bold;" href="pgv_to_wt.php">', - WT_I18N::translate('Click here for PhpGedView to <b>webtrees</b> transfer wizard'), - '</a>', - help_link('PGV_WIZARD'), - '</div>'; - } -} -print_footer(); diff --git a/export_gedcom.php b/export_gedcom.php index 787d3d69ab..63ad48c1b9 100644 --- a/export_gedcom.php +++ b/export_gedcom.php @@ -42,7 +42,7 @@ foreach (get_all_gedcoms() as $ged_id=>$gedcom) { // If we don't have permission to administer any gedcoms, redirect to // this page, which will force a login and provide a list. if (empty($gedcoms)) { - header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.'editgedcoms.php'); + header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.'admin_trees_manage.php'); } // Which gedcom have we requested to export diff --git a/import.php b/import.php index 4ad560c087..9210ad1633 100644 --- a/import.php +++ b/import.php @@ -2,7 +2,7 @@ /** * Perform an incremental import of a gedcom file. * - * For each gedcom that needs importing, editgedcoms.php will create + * For each gedcom that needs importing, admin_trees_manage.php will create * a <div id="importNNN"></div>, where NNN is the gedcom ID. * It will then call import.php to load the div's contents using AJAX. * @@ -67,7 +67,7 @@ $row=WT_DB::prepare( if ($row->import_offset==$row->import_total) { set_gedcom_setting($gedcom_id, 'imported', true); - // Finished? Show the maintenance links, similar to editgedcoms.php + // Finished? Show the maintenance links, similar to admin_trees_manage.php WT_DB::exec("COMMIT"); echo WT_JS_START, diff --git a/includes/session.php b/includes/session.php index 35b0124b84..33e20fa1db 100644 --- a/includes/session.php +++ b/includes/session.php @@ -419,7 +419,7 @@ if (!isset($_SESSION['wt_user'])) $_SESSION['wt_user'] = ''; if (WT_SCRIPT_NAME!='help_text.php') { if (!get_gedcom_setting(WT_GED_ID, 'imported') && !in_array(WT_SCRIPT_NAME, array('editconfig_gedcom.php', 'help_text.php', 'editgedcoms.php', 'downloadgedcom.php', 'logs.php', 'login.php', 'siteconfig.php', 'admin.php', 'addmedia.php', 'client.php', 'gedcheck.php', 'useradmin.php', 'export_gedcom.php', 'edit_changes.php', 'import.php', 'pgv_to_wt.php'))) { - header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.'editgedcoms.php'); + header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH.'admin.php'); exit; } |
