diff --git a/htdocs/users.php b/htdocs/users.php index 95b19bd1..3ca41b60 100644 --- a/htdocs/users.php +++ b/htdocs/users.php @@ -23,7 +23,7 @@ require_once("interactive-page.php"); $browser->AddColumn( 'user_no', translate('No.'), 'right', '##user_link##' ); $browser->AddColumn( 'username', translate('Name') ); - $browser->AddHidden( 'user_link', "'base_url/user.php?user_no=' || user_no || '\">' || user_no || ''" ); + $browser->AddHidden( 'user_link', "'base_url/usr.php?user_no=' || user_no || '\">' || user_no || ''" ); $browser->AddColumn( 'fullname', translate('Full Name') ); $browser->AddColumn( 'email', translate('EMail') ); $browser->AddColumn( 'relations', translate('Relationships'), '', '', 'relationship_list(user_no)' ); @@ -47,7 +47,7 @@ require_once("interactive-page.php"); $c->page_title = translate("Calendar Users"); if ( $session->AllowedTo("Admin") ) - $user_menu->AddOption(translate("New User"),"$c->base_url/user.php?create",translate("Add a new user"), false, 10); + $user_menu->AddOption(translate("New User"),"$c->base_url/usr.php?create",translate("Add a new user"), false, 10); $active_menu_pattern = "#^$c->base_url/user#"; diff --git a/htdocs/user.php b/htdocs/usr.php similarity index 90% rename from htdocs/user.php rename to htdocs/usr.php index b36a71ff..4aab8c12 100644 --- a/htdocs/user.php +++ b/htdocs/usr.php @@ -77,14 +77,14 @@ } if ( $session->AllowedTo("Admin") ) - $user_menu->AddOption(translate("New User"),"$c->base_url/user.php?create",translate("Add a new user"), false, 10); + $user_menu->AddOption(translate("New User"),"$c->base_url/usr.php?create",translate("Add a new user"), false, 10); if ( $user->user_no > 0 ) { if ( $user->AllowedTo('update') ) { - $user_menu->AddOption( translate($user->EditMode?"View":"Edit")." ".$user->Values->fullname, "$c->base_url/user.php?user_no=$user->user_no".($user->EditMode?"":"&edit=1"), translate(($user->EditMode?"View":"Edit")." this user record"), true, 900 ); + $user_menu->AddOption( translate($user->EditMode?"View":"Edit")." ".$user->Values->fullname, "$c->base_url/usr.php?user_no=$user->user_no".($user->EditMode?"":"&edit=1"), translate(($user->EditMode?"View":"Edit")." this user record"), true, 900 ); } else { - $user_menu->AddOption( translate("View")." ".$user->Values->fullname, "$c->base_url/user.php?user_no=$user->user_no", translate("View this user record"), true, 900 ); + $user_menu->AddOption( translate("View")." ".$user->Values->fullname, "$c->base_url/usr.php?user_no=$user->user_no", translate("View this user record"), true, 900 ); } } diff --git a/inc/RSCDSUser.php b/inc/RSCDSUser.php index 9b504286..b690e6c3 100644 --- a/inc/RSCDSUser.php +++ b/inc/RSCDSUser.php @@ -107,13 +107,13 @@ class RSCDSUser extends User $browser = new Browser(""); - $browser->AddHidden( 'user_link', "'base_url/user.php?user_no=' || user_no || '\">' || fullname || ''" ); + $browser->AddHidden( 'user_link', "'base_url/usr.php?user_no=' || user_no || '\">' || fullname || ''" ); $browser->AddColumn( 'rt_name', translate('Relationship') ); $browser->AddColumn( 'fullname', translate('Linked To'), 'left', '##user_link##' ); $browser->AddHidden( 'confers' ); $browser->AddColumn( 'email', translate('EMail') ); if ( $ef->EditMode ) { // && $session->AllowedTo("MaintainRelationships") ) { - $browser->AddColumn( 'delete', translate('Delete'), 'centre', '', "'base_url/user.php?edit=1&user_no=$this->user_no&action=delete_relationship&to_user=' || user_no || '\">Delete'" ); + $browser->AddColumn( 'delete', translate('Delete'), 'centre', '', "'base_url/usr.php?edit=1&user_no=$this->user_no&action=delete_relationship&to_user=' || user_no || '\">Delete'" ); } $browser->SetJoins( 'relationship NATURAL JOIN relationship_type rt LEFT JOIN usr ON (to_user = user_no)' ); @@ -189,7 +189,7 @@ EOSQL; if ( $title == null ) $title = i18n("Relationships to this user"); $browser = new Browser(""); - $browser->AddHidden( 'user_link', "'base_url/user.php?user_no=' || user_no || '\">' || fullname || ''" ); + $browser->AddHidden( 'user_link', "'base_url/usr.php?user_no=' || user_no || '\">' || fullname || ''" ); $browser->AddColumn( 'fullname', translate('Linked From'), 'left', '##user_link##' ); $browser->AddColumn( 'rt_name', translate('Relationship') ); $browser->AddHidden( 'confers' ); diff --git a/inc/interactive-page.php b/inc/interactive-page.php index fba152df..effe113d 100644 --- a/inc/interactive-page.php +++ b/inc/interactive-page.php @@ -14,7 +14,7 @@ $relationship_menu = new MenuSet('submenu', 'submenu', 'submenu_active'); $user_menu = new MenuSet('submenu', 'submenu', 'submenu_active'); // $role_menu = new MenuSet('submenu', 'submenu', 'submenu_active'); -$user_menu->AddOption(translate("My Details"),"$c->base_url/user.php?user_no=$session->user_no",translate("View my own user record"), false, 700); +$user_menu->AddOption(translate("My Details"),"$c->base_url/usr.php?user_no=$session->user_no",translate("View my own user record"), false, 700); $active_menu_pattern = "#^$c->base_url/(index.*)?$#"; ?> \ No newline at end of file