summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2011-01-01 23:32:25 +0000
committerfisharebest <fisharebest@gmail.com>2011-01-01 23:32:25 +0000
commit2f031619accff927cfecb175ad33b057da4f095d (patch)
treef230c3e309254440665c445205d887a1bad89d9f
parente0711ef912c97b8c5cb5e27d5e395c98804a464b (diff)
downloadwebtrees-2f031619accff927cfecb175ad33b057da4f095d.tar.gz
webtrees-2f031619accff927cfecb175ad33b057da4f095d.tar.bz2
webtrees-2f031619accff927cfecb175ad33b057da4f095d.zip
Merge admin.php and administration.php - Link to user_admin.php should be useradmin.php
-rw-r--r--admin.php12
-rw-r--r--admin_users_list.php2
2 files changed, 7 insertions, 7 deletions
diff --git a/admin.php b/admin.php
index d2ce7f86f7..dd1a572844 100644
--- a/admin.php
+++ b/admin.php
@@ -122,33 +122,33 @@ foreach(get_all_users() as $user_id=>$user_name) {
echo
'<table>',
'<tr><td>', WT_I18N::translate('Total number of users'), '</td><td>', $totusers, '</td></tr>',
- '<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="user_admin.php?action=listusers&amp;filter=adminusers">', WT_I18N::translate('Administrators'), '</a></td><td>', $adminusers, '</td></tr>',
+ '<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="useradmin.php?action=listusers&amp;filter=adminusers">', WT_I18N::translate('Administrators'), '</a></td><td>', $adminusers, '</td></tr>',
'<tr><td colspan="2">', WT_I18N::translate('Managers'), '</td></tr>';
foreach ($gedadmin as $key=>$geds) {
- echo '<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="user_admin.php?action=listusers&amp;filter=gedadmin&amp;ged='.rawurlencode($geds['ged']), '">', $geds['name'], '</a></td><td>', $geds['number'], '</td></tr>';
+ echo '<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="useradmin.php?action=listusers&amp;filter=gedadmin&amp;ged='.rawurlencode($geds['ged']), '">', $geds['name'], '</a></td><td>', $geds['number'], '</td></tr>';
}
echo '<tr><td>';
if ($warnusers == 0) {
echo WT_I18N::translate('Users with warnings');
} else {
- echo '<a href="user_admin.php?action=listusers&amp;filter=warnings">', WT_I18N::translate('Users with warnings'), '</a>';
+ echo '<a href="useradmin.php?action=listusers&amp;filter=warnings">', WT_I18N::translate('Users with warnings'), '</a>';
}
echo '</td><td>', $warnusers, '</td></tr><tr><td>';
if ($applusers == 0) {
echo WT_I18N::translate('Unverified by User');
} else {
- echo '<a href="user_admin.php?action=listusers&amp;filter=usunver">', WT_I18N::translate('Unverified by User'), '</a>';
+ echo '<a href="useradmin.php?action=listusers&amp;filter=usunver">', WT_I18N::translate('Unverified by User'), '</a>';
}
echo '</td><td>', $applusers, '</td></tr><tr><td>';
if ($nverusers == 0) {
echo WT_I18N::translate('Unverified by Administrator');
} else {
- echo '<a href="user_admin.php?action=listusers&amp;filter=admunver">', WT_I18N::translate('Unverified by Administrator'), '</a>';
+ echo '<a href="useradmin.php?action=listusers&amp;filter=admunver">', WT_I18N::translate('Unverified by Administrator'), '</a>';
}
echo '</td><td>', $nverusers, '</td></tr>';
echo '<tr><td colspan="2">', WT_I18N::translate('Users\' languages'), '</td></tr>';
foreach ($userlang as $key=>$ulang) {
- echo '<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;<a href="user_admin.php?action=listusers&amp;filter=language&amp;usrlang=', $key, '">', $ulang['langname'], '</a></td><td>', $ulang['number'], '</td></tr>';
+ echo '<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;<a href="useradmin.php?action=listusers&amp;filter=language&amp;usrlang=', $key, '">', $ulang['langname'], '</a></td><td>', $ulang['number'], '</td></tr>';
}
echo
'</tr>',
diff --git a/admin_users_list.php b/admin_users_list.php
index 424506f2d7..8c8a222ff5 100644
--- a/admin_users_list.php
+++ b/admin_users_list.php
@@ -348,7 +348,7 @@ ob_start();
echo '</td>',
'<td>';
if (WT_USER_ID!=$user_id)
- echo "<a href=\"user_admin.php?action=deleteuser&amp;username=", rawurlencode($user_name)."&amp;sort={$sort}&amp;filter={$filter}&amp;usrlang={$usrlang}&amp;ged=", rawurlencode($ged), "\" onclick=\"return confirm('", WT_I18N::translate('Are you sure you want to delete the user'), " $user_name');\"><img src=\"images/delete.png\" alt=\"", WT_I18N::translate('Delete'), "\" title=\"", WT_I18N::translate('Delete'), "\" /></a>";
+ echo "<a href=\"useradmin.php?action=deleteuser&amp;username=", rawurlencode($user_name)."&amp;sort={$sort}&amp;filter={$filter}&amp;usrlang={$usrlang}&amp;ged=", rawurlencode($ged), "\" onclick=\"return confirm('", WT_I18N::translate('Are you sure you want to delete the user'), " $user_name');\"><img src=\"images/delete.png\" alt=\"", WT_I18N::translate('Delete'), "\" title=\"", WT_I18N::translate('Delete'), "\" /></a>";
echo '</td>',
'</tr>';
}