From 47475737ced41c30946a2d9113d0d359c157474b Mon Sep 17 00:00:00 2001 From: ben Date: Thu, 19 Feb 2009 15:13:13 +0000 Subject: Repointed actions/ to action/ in all views and removed actions/* from the action handler. git-svn-id: https://code.elgg.org/elgg/trunk@2815 36083f99-b078-4883-b0ff-0f9b5a30f544 --- htaccess_dist | 2 +- mod/apiadmin/views/default/apiadmin/forms/add_key.php | 2 +- mod/apiadmin/views/default/object/api_key.php | 2 +- mod/diagnostics/views/default/diagnostics/forms/download.php | 2 +- mod/groups/actions/join.php | 2 +- mod/profile/defaultprofile.php | 2 +- mod/profile/views/default/profile/editdefaultprofile.php | 2 +- mod/profile/views/default/profile/menu/adminlinks.php | 12 ++++++------ views/default/account/forms/forgotten_password.php | 2 +- views/default/object/default.php | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htaccess_dist b/htaccess_dist index 9e80f7ec8..c4a7c1a36 100644 --- a/htaccess_dist +++ b/htaccess_dist @@ -111,7 +111,7 @@ RewriteEngine on #RewriteBase / RewriteRule ^action\/([A-Za-z\_\-\/]+)$ engine/handlers/action_handler.php?action=$1 -RewriteRule ^actions\/([A-Za-z\_\-\/]+)$ engine/handlers/action_handler.php?action=$1 +# -- TO BE DELETED -- RewriteRule ^actions\/([A-Za-z\_\-\/]+)$ engine/handlers/action_handler.php?action=$1 RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)$ services/export/handler.php?view=$1&guid=$2 RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)\/$ services/export/handler.php?view=$1&guid=$2 diff --git a/mod/apiadmin/views/default/apiadmin/forms/add_key.php b/mod/apiadmin/views/default/apiadmin/forms/add_key.php index 005b1e27b..efa871e70 100644 --- a/mod/apiadmin/views/default/apiadmin/forms/add_key.php +++ b/mod/apiadmin/views/default/apiadmin/forms/add_key.php @@ -9,5 +9,5 @@ END; - echo elgg_view('input/form', array('action' => "{$vars['url']}actions/apiadmin/generate", "body" => $form_body)); + echo elgg_view('input/form', array('action' => "{$vars['url']}action/apiadmin/generate", "body" => $form_body)); ?> \ No newline at end of file diff --git a/mod/apiadmin/views/default/object/api_key.php b/mod/apiadmin/views/default/object/api_key.php index 77ea9007f..64ca3d087 100644 --- a/mod/apiadmin/views/default/object/api_key.php +++ b/mod/apiadmin/views/default/object/api_key.php @@ -19,7 +19,7 @@ $token = generate_action_token($ts); - $info = "

{$entity->title} url}actions/apiadmin/revokekey?keyid={$entity->guid}&__elgg_token=$token&__elgg_ts=$ts\">$revoke_label

"; + $info = "

{$entity->title} url}action/apiadmin/revokekey?keyid={$entity->guid}&__elgg_token=$token&__elgg_ts=$ts\">$revoke_label

"; $info .= "

$public_label: {$entity->public}
"; if (isadminloggedin()) { // Only show secret portion to admins diff --git a/mod/diagnostics/views/default/diagnostics/forms/download.php b/mod/diagnostics/views/default/diagnostics/forms/download.php index d521db8be..950134fac 100644 --- a/mod/diagnostics/views/default/diagnostics/forms/download.php +++ b/mod/diagnostics/views/default/diagnostics/forms/download.php @@ -10,5 +10,5 @@ */ $form_body = elgg_view('input/submit', array('value' => elgg_echo('diagnostics:download'))); - echo elgg_view('input/form', array('body' => $form_body, 'action' => $CONFIG->url . "actions/diagnostics/download")); + echo elgg_view('input/form', array('body' => $form_body, 'action' => $CONFIG->url . "action/diagnostics/download")); ?> \ No newline at end of file diff --git a/mod/groups/actions/join.php b/mod/groups/actions/join.php index 1815625a6..6d55d3636 100644 --- a/mod/groups/actions/join.php +++ b/mod/groups/actions/join.php @@ -46,7 +46,7 @@ { // Closed group, request membership system_message(elgg_echo('groups:privategroup')); - forward($CONFIG->url . "actions/groups/joinrequest?user_guid=$user_guid&group_guid=$group_guid"); + forward($CONFIG->url . "action/groups/joinrequest?user_guid=$user_guid&group_guid=$group_guid"); exit; } } diff --git a/mod/profile/defaultprofile.php b/mod/profile/defaultprofile.php index 7b7000ae7..75848d402 100644 --- a/mod/profile/defaultprofile.php +++ b/mod/profile/defaultprofile.php @@ -44,7 +44,7 @@ $listing .= "

" . elgg_view('input/form', array( 'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'))), - 'action' => $CONFIG->wwwroot . 'actions/profile/editdefault/reset' + 'action' => $CONFIG->wwwroot . 'action/profile/editdefault/reset' ) ) . "
"; diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php index 64f8f1074..b65746e01 100644 --- a/mod/profile/views/default/profile/editdefaultprofile.php +++ b/mod/profile/views/default/profile/editdefaultprofile.php @@ -29,6 +29,6 @@ $submit_control

END; echo "
"; - echo elgg_view('input/form', array('body' => $formbody, 'action' => $vars['url'] . 'actions/profile/editdefault')); + echo elgg_view('input/form', array('body' => $formbody, 'action' => $vars['url'] . 'action/profile/editdefault')); echo "
"; ?> \ No newline at end of file diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php index b0fe99094..16f601892 100644 --- a/mod/profile/views/default/profile/menu/adminlinks.php +++ b/mod/profile/views/default/profile/menu/adminlinks.php @@ -21,19 +21,19 @@ isBanned()) { - echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => "{$vars['url']}actions/admin/user/ban?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => "{$vars['url']}action/admin/user/ban?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); } else { - echo elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => "{$vars['url']}actions/admin/user/unban?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => "{$vars['url']}action/admin/user/unban?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); } - echo elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => "{$vars['url']}actions/admin/user/delete?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => "{$vars['url']}action/admin/user/delete?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); - echo elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => "{$vars['url']}actions/admin/user/resetpassword?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => "{$vars['url']}action/admin/user/resetpassword?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); if (!$vars['entity']->admin) { - echo elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => "{$vars['url']}actions/admin/user/makeadmin?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => "{$vars['url']}action/admin/user/makeadmin?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); } else { - echo elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => "{$vars['url']}actions/admin/user/removeadmin?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + echo elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => "{$vars['url']}action/admin/user/removeadmin?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); } } } diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php index 767812759..f794216ab 100644 --- a/views/default/account/forms/forgotten_password.php +++ b/views/default/account/forms/forgotten_password.php @@ -15,5 +15,5 @@ $form_body .= "

" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "

"; ?>
- "{$vars['url']}actions/user/requestnewpassword", 'body' => $form_body)); ?> + "{$vars['url']}action/user/requestnewpassword", 'body' => $form_body)); ?>
\ No newline at end of file diff --git a/views/default/object/default.php b/views/default/object/default.php index 1a97592a7..7f4611190 100644 --- a/views/default/object/default.php +++ b/views/default/object/default.php @@ -29,7 +29,7 @@ $controls = ""; if ($vars['entity']->canEdit()) { - $controls .= " (guid}\">" . elgg_echo('delete') . ")"; + $controls .= " (guid}\">" . elgg_echo('delete') . ")"; } $info = "

getUrl() . "\">" . $title . " $controls

"; -- cgit v1.2.3