diff --git a/htdocs/davical.php b/htdocs/admin.php
similarity index 100%
rename from htdocs/davical.php
rename to htdocs/admin.php
diff --git a/inc/interactive-page.php b/inc/interactive-page.php
index e4115bcd..5a776f98 100644
--- a/inc/interactive-page.php
+++ b/inc/interactive-page.php
@@ -9,6 +9,9 @@ $wiki_help = '';
if ( isset($_SERVER['SCRIPT_NAME']) ) {
$wiki_help = preg_replace('#^.*/#', '', $_SERVER['SCRIPT_NAME']);
$wiki_help = preg_replace('#\.php.*$#', '', $wiki_help);
+ if ( $wiki_help == 'admin' ) {
+ $wiki_help .= '/' . $_GET['t'] . '/' . $_GET['action'];
+ }
$wiki_help = 'w/Help/'.$wiki_help;
}
@@ -20,10 +23,10 @@ $help_menu->AddOption(translate('Request Feature'),'http://davical.uservoice.com
$help_menu->AddOption(translate('Report Bug'),'http://sourceforge.net/tracker/?func=add&group_id=179845&atid=890785',translate('Report a bug in the system'), false, 9000, true );
$user_menu = new MenuSet('submenu', 'submenu', 'submenu_active');
-$user_menu->AddOption(translate('View My Details'),$c->base_url.'/usr.php?user_no='.$session->user_no,translate('View my own user record'));
-$user_menu->AddOption(translate('List Users'),$c->base_url.'/davical.php?action=browse&t=principal&type=1');
-$user_menu->AddOption(translate('List Resources'),$c->base_url.'/davical.php?action=browse&t=principal&type=2');
-$user_menu->AddOption(translate('List Groups'),$c->base_url.'/davical.php?action=browse&t=principal&type=3');
+$user_menu->AddOption(translate('View My Details'),$c->base_url.'/admin.php?action=edit&t=principal&id='.$session->principal_id,translate('View my own principal record'));
+$user_menu->AddOption(translate('List Users'),$c->base_url.'/admin.php?action=browse&t=principal&type=1');
+$user_menu->AddOption(translate('List Resources'),$c->base_url.'/admin.php?action=browse&t=principal&type=2');
+$user_menu->AddOption(translate('List Groups'),$c->base_url.'/admin.php?action=browse&t=principal&type=3');
$admin_menu = new MenuSet('submenu', 'submenu', 'submenu_active');
if ( $session->AllowedTo('Admin' )) {
@@ -31,7 +34,7 @@ if ( $session->AllowedTo('Admin' )) {
$admin_menu->AddOption(translate('Upgrade Database'),$c->base_url.'/upgrade.php',translate('Upgrade DAViCal database schema') );
$admin_menu->AddOption(translate('Import Calendars'),$c->base_url.'/tools.php',translate('Operations on your calendar') );
$admin_menu->AddOption( translate('Relationships'), $c->base_url.'/relationship_types.php', translate('Browse all relationship types') );
- $user_menu->AddOption(translate('New User'),$c->base_url.'/usr.php?create',translate('Add a new user'));
+ $user_menu->AddOption(translate('New User'),$c->base_url.'/admin.php?action=edit&t=principal',translate('Add a new principal (user, resource or group)'));
}
$related_menu = new MenuSet('related', 'menu', 'menu_active');
diff --git a/inc/ui/collection-edit.php b/inc/ui/collection-edit.php
index 1348407c..81eb5a9e 100644
--- a/inc/ui/collection-edit.php
+++ b/inc/ui/collection-edit.php
@@ -260,7 +260,7 @@ EOTEMPLATE;
$browser = new Browser(translate('Collection Grants'));
$browser->AddColumn( 'to_principal', translate('To ID'), 'right', '##principal_link##' );
-$rowurl = $c->base_url . '/davical.php?action=edit&t=collection&id=';
+$rowurl = $c->base_url . '/admin.php?action=edit&t=collection&id=';
$browser->AddHidden( 'principal_link', "'' || to_principal || ''" );
$browser->AddHidden( 'grant_privileges', 'privileges' );
$browser->AddColumn( 'displayname', translate('Display Name') );
@@ -268,8 +268,8 @@ $browser->AddColumn( 'privs', translate('Privileges'), '', '', 'privileges_list(
$browser->AddColumn( 'members', translate('Has Members'), '', '', 'has_members_list(principal_id)' );
if ( $can_write_collection ) {
- $del_link = "Delete";
- $edit_link = "Edit";
+ $del_link = "Delete";
+ $edit_link = "Edit";
$browser->AddColumn( 'action', 'Action', 'center', '', "'$edit_link $del_link'" );
}
diff --git a/inc/ui/principal-browse.php b/inc/ui/principal-browse.php
index 787fedb3..7eb45837 100644
--- a/inc/ui/principal-browse.php
+++ b/inc/ui/principal-browse.php
@@ -12,7 +12,7 @@ if ( isset($principal_type) ) {
$browser->AddColumn( 'principal_id', translate('ID'), 'right', '##principal_link##' );
$browser->AddColumn( 'username', translate('Name') );
-$rowurl = $c->base_url . '/davical.php?action=edit&t=principal&id=';
+$rowurl = $c->base_url . '/admin.php?action=edit&t=principal&id=';
$browser->AddHidden( 'principal_link', "'' || principal_id || ''" );
$browser->AddColumn( 'displayname', translate('Display Name') );
$browser->AddColumn( 'email', translate('EMail') );
diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php
index 2637199a..fa6c1910 100644
--- a/inc/ui/principal-edit.php
+++ b/inc/ui/principal-edit.php
@@ -173,7 +173,7 @@ $c->stylesheets[] = 'css/browse.css';
$c->scripts[] = 'js/browse.js';
$browser->AddColumn( 'group_id', translate('ID'), 'right', '##principal_link##' );
-$rowurl = $c->base_url . '/davical.php?action=edit&t=principal&id=';
+$rowurl = $c->base_url . '/admin.php?action=edit&t=principal&id=';
$browser->AddHidden( 'principal_link', "'' || principal_id || ''" );
$browser->AddColumn( 'displayname', translate('Display Name') );
$browser->AddColumn( 'member_of', translate('Is Member of'), '', '', 'is_member_of_list(principal_id)' );
@@ -239,7 +239,7 @@ EOTEMPLATE;
$browser = new Browser(translate('Group Members'));
$browser->AddColumn( 'group_id', translate('ID'), 'right', '##principal_link##' );
- $rowurl = $c->base_url . '/davical.php?action=edit&t=principal&id=';
+ $rowurl = $c->base_url . '/admin.php?action=edit&t=principal&id=';
$browser->AddHidden( 'principal_id' );
$browser->AddHidden( 'principal_link', "'' || principal_id || ''" );
$browser->AddColumn( 'displayname', translate('Display Name') );
@@ -247,7 +247,7 @@ EOTEMPLATE;
$browser->AddColumn( 'members', translate('Has Members'), '', '', 'has_members_list(principal_id)' );
if ( $can_write_principal ) {
- $del_link = "Delete";
+ $del_link = "Delete";
$browser->AddColumn( 'action', 'Action', 'center', '', "'$edit_link $del_link'" );
}
@@ -351,7 +351,7 @@ EOTEMPLATE;
$browser = new Browser(translate('Principal Grants'));
$browser->AddColumn( 'to_principal', translate('To ID'), 'right', '##principal_link##' );
-$rowurl = $c->base_url . '/davical.php?action=edit&t=principal&id=';
+$rowurl = $c->base_url . '/admin.php?action=edit&t=principal&id=';
$browser->AddHidden( 'principal_link', "'' || to_principal || ''" );
$browser->AddHidden( 'grant_privileges', 'privileges' );
$browser->AddColumn( 'displayname', translate('Display Name') );
@@ -359,8 +359,8 @@ $browser->AddColumn( 'privs', translate('Privileges'), '', '', 'privileges_list(
$browser->AddColumn( 'members', translate('Has Members'), '', '', 'has_members_list(principal_id)' );
if ( $can_write_principal ) {
- $del_link = "Delete";
- $edit_link = "Edit";
+ $del_link = "Delete";
+ $edit_link = "Edit";
$browser->AddColumn( 'action', 'Action', 'center', '', "'$edit_link $del_link'" );
}
@@ -394,7 +394,7 @@ if ( $can_write_principal ) {
$browser = new Browser(translate('Principal Collections'));
$browser->AddColumn( 'collection_id', translate('ID'), 'right', '##collection_link##' );
-$rowurl = $c->base_url . '/davical.php?action=edit&t=collection&id=';
+$rowurl = $c->base_url . '/admin.php?action=edit&t=collection&id=';
$browser->AddHidden( 'collection_link', "'' || collection_id || ''" );
$browser->AddColumn( 'dav_name', translate('Path') );
$browser->AddColumn( 'dav_displayname', translate('Display Name') );