Refs #2463: Removed many more graituitous calls to elgg_get_site_url(), $CONFIG-...

git-svn-id: http://code.elgg.org/elgg/trunk@7198 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 0f5a4f4001eda46cec264afb3e13966dada7adbe..0db58f680eb1b4bd47092bbcc25b4cb4a887f9ce 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -61,7 +61,7 @@ function elgg_admin_add_plugin_settings_sidemenu() {
                if (elgg_view_exists("settings/{$plugin_id}/edit")) {
                        $item = array(
                                'text' => $info['manifest']['name'],
-                               'href' => "{$CONFIG->url}pg/admin/plugin_settings/$plugin_id",
+                               'href' => "pg/admin/plugin_settings/$plugin_id",
                                'parent_id' => 'admin:plugin_settings'
                        );
 
@@ -88,9 +88,9 @@ function elgg_add_admin_submenu_item($section_id, $section_title, $parent_id = N
 
        // in the admin section parents never have links
        if ($parent_id) {
-               $href = "{$CONFIG->url}pg/admin/$parent_id/$section_id";
+               $href = "pg/admin/$parent_id/$section_id";
        } elseif ($section_id == 'overview') {
-               $href = "{$CONFIG->url}pg/admin/$section_id";
+               $href = "pg/admin/$section_id";
 
        } else {
                $href = NULL;

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 6c6e51d4d4b61832d92ec70dca424329f9f1dbd0..7632a4834820778e698b90a93fc85271faa5490d 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -972,7 +972,7 @@ function elgg_user_resetpassword_page_handler($page) {
 
        $form .= elgg_view('input/form', array(
                'body' => $form_body,
-               'action' => $CONFIG->site->url . 'action/user/passwordreset'
+               'action' => 'action/user/passwordreset'
        ));
 
        $title = elgg_echo('resetpassword');

diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 8baa529382f7af257c930ecb8ec646e3f7e9fa7e..d8bae23508d44af204f51f4649fa1a4d4c85563b 100644 (file)
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -59,7 +59,7 @@ function bookmarks_pagesetup() {
        if (isloggedin()) {
                if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
                        if ($page_owner->bookmarks_enable != "no") {
-                               //add_submenu_item(sprintf(elgg_echo("bookmarks:group"),$page_owner->name), elgg_get_site_url() . "pg/bookmarks/" . $page_owner->username . '/items');
+                               //add_submenu_item(sprintf(elgg_echo("bookmarks:group"),$page_owner->name), "pg/bookmarks/" . $page_owner->username . '/items');
                        }
                }
        }

diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
index 4711cd9d622768eafb53490af2c10439d63f9e64..45403e3b56de337c067dca3f1ed107386389c296 100644 (file)
--- a/mod/diagnostics/start.php
+++ b/mod/diagnostics/start.php
@@ -28,7 +28,7 @@ function diagnostics_pagesetup()
 {
        if (get_context() == 'admin' && isadminloggedin()) {
                global $CONFIG;
-               add_submenu_item(elgg_echo('diagnostics'), elgg_get_site_url() . 'pg/diagnostics/');
+               add_submenu_item(elgg_echo('diagnostics'), 'pg/diagnostics/');
        }
 }
 

diff --git a/mod/diagnostics/views/default/diagnostics/runalltests.php b/mod/diagnostics/views/default/diagnostics/runalltests.php
index 8baf3eee0ccbc24e7073ab629308e39c9ea5efcd..05dd05d4dd9b1ce600c419b47f72752ebb5ff66e 100644 (file)
--- a/mod/diagnostics/views/default/diagnostics/runalltests.php
+++ b/mod/diagnostics/views/default/diagnostics/runalltests.php
@@ -7,5 +7,5 @@
 
        $form_body .= elgg_view('input/submit', array('internalname' => 'execute', 'value' => elgg_echo('diagnostics:test:executeall')));
 
-       echo elgg_view('input/form', array('action' => elgg_get_site_url() . "pg/diagnostics/tests/all", 'body' => $form_body));        
+       echo elgg_view('input/form', array('action' => "pg/diagnostics/tests/all", 'body' => $form_body));      
 ?>
\ No newline at end of file

diff --git a/mod/file/views/default/file/embed_upload.php b/mod/file/views/default/file/embed_upload.php
index 50f77cbb8af17e8d181dc6d82a8e7b8dd57531e5..8a54a4fa9182d4ae3b18c2b31c94da9d02962cb7 100644 (file)
--- a/mod/file/views/default/file/embed_upload.php
+++ b/mod/file/views/default/file/embed_upload.php
@@ -21,7 +21,7 @@ $form_body .= '<p>' . elgg_view('input/submit', array('value' => elgg_echo('uplo
 echo elgg_view('input/form', array(
        'body' => $form_body,
        'internalid' => 'file_embed_upload',
-       'action' => elgg_get_site_url() . 'action/file/upload',
+       'action' => 'action/file/upload',
 ));
 
 ?>

diff --git a/mod/groups/start.php b/mod/groups/start.php
index 9782744aeae5d13d1c967c338824851c8a5c8c1b..1d00782c43561688e94cc72b96d702f9a35b1789 100644 (file)
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -209,12 +209,12 @@
                                        add_submenu_item(elgg_echo('groups:membershiprequests'), $url, 'groupsactions1');
                                }
                        } else {
-                               add_submenu_item(elgg_echo('groups:all'), elgg_get_site_url()."pg/groups/world/", 'groupslinks1');
+                               add_submenu_item(elgg_echo('groups:all'), "pg/groups/world/", 'groupslinks1');
 
                                if ($user = get_loggedin_user()) {
-                                       add_submenu_item(elgg_echo('groups:owned'), elgg_get_site_url()."pg/groups/owned/$user->username", 'groupslinks1');
-                                       add_submenu_item(elgg_echo('groups:yours'), elgg_get_site_url()."pg/groups/member/$user->username", 'groupslinks1');
-                                       add_submenu_item(elgg_echo('groups:invitations'), elgg_get_site_url()."pg/groups/invitations/$user->username", 'groupslinks1');
+                                       add_submenu_item(elgg_echo('groups:owned'), "pg/groups/owned/$user->username", 'groupslinks1');
+                                       add_submenu_item(elgg_echo('groups:yours'), "pg/groups/member/$user->username", 'groupslinks1');
+                                       add_submenu_item(elgg_echo('groups:invitations'), "pg/groups/invitations/$user->username", 'groupslinks1');
                                }
                        }
                }

diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php
index 1841135f4a10110a2be6483a6cd413ce388871a8..4b039bac397bccfbe5806be0e47079302916db51 100644 (file)
--- a/mod/invitefriends/start.php
+++ b/mod/invitefriends/start.php
@@ -13,7 +13,7 @@ function invitefriends_pagesetup() {
        if (get_context() == "friends" ||
                get_context() == "friendsof" ||
                get_context() == "collections") {
-                       add_submenu_item(elgg_echo('friends:invite'),elgg_get_site_url()."mod/invitefriends/",'invite');
+                       add_submenu_item(elgg_echo('friends:invite'), "mod/invitefriends/",'invite');
        }
 }
 

diff --git a/mod/invitefriends/views/default/invitefriends/form.php b/mod/invitefriends/views/default/invitefriends/form.php
index de8d77388587fd6c3567df24164eb303daf14f3d..7ab9314f7e82243b32e448f04ef65769550de4b6 100644 (file)
--- a/mod/invitefriends/views/default/invitefriends/form.php
+++ b/mod/invitefriends/views/default/invitefriends/form.php
@@ -6,7 +6,7 @@
  */
 
 echo elgg_view('input/form', array(
-                                                               'action' => elgg_get_site_url() . 'action/invitefriends/invite',
+                                                               'action' => 'action/invitefriends/invite',
                                                                'body' => elgg_view('invitefriends/formitems'),
                                                                'method' => 'post'
                                                                )

diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php
index eb2dd95ba42ac4c90ae85611633f748af1a1fd33..c87b6770377e89e5024891cf7036b9aec43e3a1f 100644 (file)
--- a/mod/logbrowser/views/default/logbrowser/form.php
+++ b/mod/logbrowser/views/default/logbrowser/form.php
@@ -46,7 +46,7 @@
                $wrappedform = elgg_view('input/form', array(
                        'body' => $form,
                        'method' => 'get',
-                       'action' => elgg_get_site_url()."pg/admin/logbrowser",
+                       'action' => "pg/admin/logbrowser",
                ));
 ?>
 

diff --git a/mod/messages/start.php b/mod/messages/start.php
index 3c2fc22a79fece18a61c28cc2c3b4b054ba02f57..fcf3afde929046941f539a6b8ad72f1db97df80c 100644 (file)
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -23,8 +23,8 @@ function messages_init() {
                
        //add submenu options
                if (get_context() == "messages") {
-                       add_submenu_item(elgg_echo('messages:inbox'), elgg_get_site_url() . "pg/messages/" . get_loggedin_user()->username);
-                       add_submenu_item(elgg_echo('messages:sentmessages'), elgg_get_site_url() . "mod/messages/sent.php");
+                       add_submenu_item(elgg_echo('messages:inbox'), "pg/messages/" . get_loggedin_user()->username);
+                       add_submenu_item(elgg_echo('messages:sentmessages'), "mod/messages/sent.php");
                }
                
        // Extend system CSS with our own styles, which are defined in the shouts/css view

diff --git a/mod/messages/views/default/messages/forms/view.php b/mod/messages/views/default/messages/forms/view.php
index c957e9610b97f81b0a30ca410967c61e369cd80a..f8fce93a9c4fd980ae2a8c9bc043cfc06922f370 100644 (file)
--- a/mod/messages/views/default/messages/forms/view.php
+++ b/mod/messages/views/default/messages/forms/view.php
@@ -19,4 +19,4 @@ if($vars['page_view'] == "inbox"){
 $body .= '<input class="cancel_button" type="button" onclick="javascript:$(\'input[type=checkbox]\').click();" value="'.elgg_echo('messages:toggle').'" />';
 $body .= '</div>';
 
-echo elgg_view('input/form',array('body' => $body, 'action' => elgg_get_site_url() . 'action/messages/delete', 'method' => 'post', 'internalid' => 'messages_list_form'));
\ No newline at end of file
+echo elgg_view('input/form',array('body' => $body, 'action' => 'action/messages/delete', 'method' => 'post', 'internalid' => 'messages_list_form'));
\ No newline at end of file

diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index 28f3b9f94a910e88c5354caf03b44a0df50c2ea8..c4329f128f4f6f76629d50f739969751a3aee0e7 100644 (file)
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -26,7 +26,7 @@ $form_body = elgg_view('notifications/subscriptions/groupsform',array('groups' =
 $body = elgg_view('input/form',array(
                'body' => $form_body,
                'method' => 'post',
-               'action' => elgg_get_site_url() . 'action/notificationsettings/groupsave'
+               'action' => 'action/notificationsettings/groupsave'
 ));
 
 // Insert it into the correct canvas layout

diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index 307cfa9367d49ec1a5edffd6dbf889eba9baccb8..4d3d2b7ee8a572fa6431960e845b8f3217bec66a 100644 (file)
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -62,9 +62,9 @@ function notifications_page_handler($page) {
 function notifications_plugin_pagesetup() {
        global $CONFIG;
        if (get_context() == 'settings') {
-               add_submenu_item(elgg_echo('notifications:subscriptions:changesettings'), elgg_get_site_url() . "pg/notifications/personal");
+               add_submenu_item(elgg_echo('notifications:subscriptions:changesettings'), "pg/notifications/personal");
                if (is_plugin_enabled('groups')) {
-                       add_submenu_item(elgg_echo('notifications:subscriptions:changesettings:groups'), elgg_get_site_url() . "pg/notifications/group");
+                       add_submenu_item(elgg_echo('notifications:subscriptions:changesettings:groups'), "pg/notifications/group");
                }
        }
 }

diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 9f127348826783d50a53cf5e468d72ee8470f3ac..6c18f6fcade510e856308bdc8efc6a1b0f79db2e 100644 (file)
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -23,7 +23,7 @@ echo elgg_view('input/form',array(
                                        elgg_view('notifications/subscriptions/collections') .
                                        elgg_view('notifications/subscriptions/forminternals'),
                'method' => 'post',
-               'action' => elgg_get_site_url() . 'action/notificationsettings/save',
+               'action' => 'action/notificationsettings/save',
        ));
 
 ?>

diff --git a/mod/pages/index.php b/mod/pages/index.php
index 67bb870922b16408bdc9e81191585bfe69c90a31..7e48c06d8869ea902e543de9c8642c7c68a2f933 100644 (file)
--- a/mod/pages/index.php
+++ b/mod/pages/index.php
@@ -12,12 +12,12 @@ global $CONFIG;
 // Add menus
 $owner = elgg_get_page_owner();
 if (!($owner instanceof ElggGroup)) {
-               add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
-               add_submenu_item(elgg_echo('pages:all'),elgg_get_site_url()."mod/pages/world.php", 'pageslinksgeneral');
+               add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+               add_submenu_item(elgg_echo('pages:all'), "mod/pages/world.php", 'pageslinksgeneral');
 }
        if (($owner instanceof ElggEntity) && (can_write_to_container(0,$owner->guid))){
-               add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/?container_guid=" . elgg_get_page_owner_guid(), 'pagesactions');
-               add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/" . $owner->username, 'pagesactions');
+               add_submenu_item(elgg_echo('pages:new'), "pg/pages/new/?container_guid=" . elgg_get_page_owner_guid(), 'pagesactions');
+               add_submenu_item(elgg_echo('pages:welcome'), "pg/pages/welcome/" . $owner->username, 'pagesactions');
        }
 
 // access check for closed groups

diff --git a/mod/pages/start.php b/mod/pages/start.php
index ff31bb1d5cd006efe3523bab342934f0b585bdaf..fb09b2280aea07097fe775e1c01d739b7d71a6a9 100644 (file)
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -87,7 +87,7 @@ function pages_submenus() {
        // Group submenu option
                if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
                        if($page_owner->pages_enable != "no"){
-                               add_submenu_item(sprintf(elgg_echo("pages:group"),$page_owner->name), elgg_get_site_url() . "pg/pages/owned/" . $page_owner->username);
+                               add_submenu_item(sprintf(elgg_echo("pages:group"),$page_owner->name), "pg/pages/owned/" . $page_owner->username);
                        }
                }
 }

diff --git a/mod/pages/view.php b/mod/pages/view.php
index 9c601947199fcf8c05bfce36a5bf4582b138180d..bbbed6d22182ca98aca1e08668902d2c77ee8fe4 100644 (file)
--- a/mod/pages/view.php
+++ b/mod/pages/view.php
@@ -31,8 +31,8 @@ global $CONFIG;
 // add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 
 if ($pages->canEdit()) {
-       add_submenu_item(elgg_echo('pages:newchild'),elgg_get_site_url()."pg/pages/new/?parent_guid={$pages->getGUID()}&container_guid=" . elgg_get_page_owner_guid(), 'pagesactions');
-       $delete_url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/pages/delete?page={$pages->getGUID()}");
+       add_submenu_item(elgg_echo('pages:newchild'), "pg/pages/new/?parent_guid={$pages->getGUID()}&container_guid=" . elgg_get_page_owner_guid(), 'pagesactions');
+       $delete_url = elgg_add_action_tokens_to_url($CONFIG->url . "action/pages/delete?page={$pages->getGUID()}");
        add_submenu_item(elgg_echo('pages:delete'), $delete_url, 'pagesactions', true);
 }
 

diff --git a/mod/pages/world.php b/mod/pages/world.php
index 1dc1fbe9d384e51d804021c8ad2f671a8a2765cc..f423bf8d5d8d095bd4a926146bd5f32c66c91058 100644 (file)
--- a/mod/pages/world.php
+++ b/mod/pages/world.php
@@ -17,14 +17,14 @@ if ($page_owner === false || is_null($page_owner)) {
 }
 
 if (($page_owner instanceof ElggEntity) && ($page_owner->canWriteToContainer())){
-       add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/", 'pagesactions');
+       add_submenu_item(elgg_echo('pages:new'), "pg/pages/new/", 'pagesactions');
 }
 
 if(isloggedin()) {
-       add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+       add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 }
 
-add_submenu_item(elgg_echo('pages:all'),elgg_get_site_url()."mod/pages/world.php", 'pageslinksgeneral');
+add_submenu_item(elgg_echo('pages:all'), "mod/pages/world.php", 'pageslinksgeneral');
 
 $limit = get_input("limit", 10);
 $offset = get_input("offset", 0);

diff --git a/mod/profile/start.php b/mod/profile/start.php
index c47ecb594948e600dd764f9ff6eb7e31358e299e..caaf0405543fd09c3e10cc481216bfb7708051f2 100644 (file)
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -176,8 +176,8 @@ function profile_pagesetup()
        if (get_context() == "profile") {
                $page_owner = elgg_get_page_owner();
                if ($page_owner && $page_owner->canEdit()) {
-                       add_submenu_item(elgg_echo('profile:editdetails'), elgg_get_site_url() . "pg/profile/{$page_owner->username}/edit/details");
-                       add_submenu_item(elgg_echo('profile:editicon'), elgg_get_site_url() . "pg/profile/{$page_owner->username}/edit/icon");
+                       add_submenu_item(elgg_echo('profile:editdetails'), "pg/profile/{$page_owner->username}/edit/details");
+                       add_submenu_item(elgg_echo('profile:editicon'), "pg/profile/{$page_owner->username}/edit/icon");
                }
        }
 }

diff --git a/mod/profile/views/default/admin/appearance/defaultprofile.php b/mod/profile/views/default/admin/appearance/defaultprofile.php
index 16164397edfefd4d3b34eadddf9fc290ec2ec6f4..b935797fba7f3b16475969bffbe3151c38f3fdd6 100644 (file)
--- a/mod/profile/views/default/admin/appearance/defaultprofile.php
+++ b/mod/profile/views/default/admin/appearance/defaultprofile.php
@@ -31,7 +31,7 @@ $listing = elgg_view('profile/editdefaultprofileitems',array('items' => $items,
 $resetlisting = elgg_view('input/form',
                                                array (
                                                        'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'), 'class' => 'action_button disabled')),
-                                                       'action' => elgg_get_site_url() . 'action/profile/editdefault/reset'
+                                                       'action' => 'action/profile/editdefault/reset'
                                                )
                                        );
                                        

diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php
index ece99c290236ddf6d9b8f116462dda34f94aae5d..4993e1c7fdfb8db4a95707c3adf4bdef31a8637b 100644 (file)
--- a/mod/profile/views/default/profile/editdefaultprofile.php
+++ b/mod/profile/views/default/profile/editdefaultprofile.php
@@ -26,4 +26,4 @@ $formbody = <<< END
 END;
 
 echo "<p class='margin_top'>" . elgg_echo('profile:explainchangefields') . "</p>";
-echo elgg_view('input/form', array('body' => $formbody, 'action' => elgg_get_site_url() . 'action/profile/editdefault'));
+echo elgg_view('input/form', array('body' => $formbody, 'action' => 'action/profile/editdefault'));

diff --git a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
index fdc5dd5351dceff57e731aff5cf5a34c4b287317..03bd91d10749044ae1bb6465986b6d957687bf5a 100644 (file)
--- a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
+++ b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
@@ -14,5 +14,5 @@ if (isset($vars['entity']) && isloggedin()) {
        $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));
        $form_body .= elgg_view('input/submit', array('value' => elgg_echo("Comment")));
        $form_body .= "</div>";
-       echo elgg_view('input/form', array('body' => $form_body, 'action' => elgg_get_site_url()."action/comments/add"));
+       echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/comments/add"));
 }
\ No newline at end of file

diff --git a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
index 2d3c7aa57e2b82312352aa8a46049b020e0b4d41..443ad0fc65452fac2c1705053224e0f3ff029233 100644 (file)
--- a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
+++ b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
@@ -49,7 +49,7 @@ if ($site_message) {
        
 EOT;
                //display the form
-               echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/$action", 'body' => $form_body));
+               echo elgg_view('input/form', array('action' => "action/$action", 'body' => $form_body));
 
        }//end of admin if statement
 
@@ -71,7 +71,7 @@ EOT;
                        </div>
 EOT;
                //display the form
-               echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/$action", 'body' => $form_body));
+               echo elgg_view('input/form', array('action' => "action/$action", 'body' => $form_body));
 
        }//end of admin check
 }//end of main if

diff --git a/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php b/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
index 999eab44f07877d1187d27be63c71b62b40b25e8..756928d7ce16a9dcb0b0d279f51187880c85b46b 100644 (file)
--- a/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
+++ b/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
@@ -43,6 +43,6 @@ $form_body .= elgg_echo('uservalidationbyemail:admin:with_checked') . elgg_view(
 $form_body .= '<br />' . elgg_view('input/button', array('value' => elgg_echo('submit')));
 
 echo elgg_view('input/form', array(
-       'action' => elgg_get_site_url() . 'action/uservalidationbyemail/bulk_action',
+       'action' => 'action/uservalidationbyemail/bulk_action',
        'body' => $form_body
 ));
\ No newline at end of file

diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
index 0d88cf8f75ebeebce9bbd932f6289e1f946454a1..2fe2bc9d9f1530777998b825cb1ea05cb8fe7252 100644 (file)
--- a/views/default/account/forms/forgotten_password.php
+++ b/views/default/account/forms/forgotten_password.php
@@ -13,7 +13,7 @@ $form_body .= elgg_view('input/captcha');
 $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>";
 
 echo elgg_view('input/form', array(
-       'action' => elgg_get_site_url()."action/user/requestnewpassword",
+       'action' => "action/user/requestnewpassword",
        'body' => $form_body,
        'class' => "margin_top"
 ));

diff --git a/views/default/account/forms/login_walled_garden.php b/views/default/account/forms/login_walled_garden.php
index 8b5d593bbbc6dbf863e3e7b43acb52759832662a..4bfc3afda6ce4643318e43a62d9de48072b13105 100644 (file)
--- a/views/default/account/forms/login_walled_garden.php
+++ b/views/default/account/forms/login_walled_garden.php
@@ -60,7 +60,7 @@ __HTML;
                <h2><?php echo elgg_echo('user:password:lost'); ?></h2>
                <?php
                        echo elgg_view('input/form', array(
-                               'action' => elgg_get_site_url()."action/user/requestnewpassword",
+                               'action' => "action/user/requestnewpassword",
                                'body' => $lostpassword_form_body
                        ));
                ?>

diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index 9b777ba6463e893aee63512160189800f26521d1..828a99b4b4e0b1f48463686482dde53983b2f29b 100644 (file)
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -38,7 +38,7 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'v
 $form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register'));
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
 
-echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/register", 'body' => $form_body, 'class' => "margin_top"));
+echo elgg_view('input/form', array('action' => "action/register", 'body' => $form_body, 'class' => "margin_top"));
 ?>
 
 <script type="text/javascript">

diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php
index bad1b11df3f24ee286f1d7fa7669cce1d5808706..4729048e6cd8657a3e74563396477e2eeb4b7531 100644 (file)
--- a/views/default/account/forms/useradd.php
+++ b/views/default/account/forms/useradd.php
@@ -27,5 +27,5 @@ $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value
 
 <div class="admin_settings add_user">
        <h3><?php echo elgg_echo('adduser'); ?></h3>
-       <?php echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/useradd", 'body' => $form_body)) ?>
+       <?php echo elgg_view('input/form', array('action' => "action/useradd", 'body' => $form_body)) ?>
 </div>
\ No newline at end of file

diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index e6a40c754eae04742578298dcb4bb06a44e7744c..c2335db7b785658560ecc9f07f9a313582f6718c 100644 (file)
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
@@ -82,6 +82,6 @@ $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
 
 echo elgg_view('input/form', array(
        'body' => $form_body,
-       'action' => elgg_get_site_url()."action/admin/menu_items"
+       'action' => "action/admin/menu_items"
 ));
 echo "</div>";
\ No newline at end of file

diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php
index 13e962634a110d1630bda67231a269165e912cf0..e96f77635982ff0c95f874e7170101b9b6d041bd 100644 (file)
--- a/views/default/admin/components/plugin_settings.php
+++ b/views/default/admin/components/plugin_settings.php
@@ -16,4 +16,4 @@ $form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'cla
 
 echo elgg_view_title($plugin_info['name']);
 
-echo elgg_view('input/form', array('body' => $form_body, 'internalid' => 'plugin_settings', 'action' => elgg_get_site_url()."action/plugins/settings/save"));
\ No newline at end of file
+echo elgg_view('input/form', array('body' => $form_body, 'internalid' => 'plugin_settings', 'action' => "action/plugins/settings/save"));
\ No newline at end of file

diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php
index 3baa00cafb8998990878c41e5067449126503158..846dde9d46ee3880525daffd50a3f82923a6e156 100644 (file)
--- a/views/default/admin/plugins/simple.php
+++ b/views/default/admin/plugins/simple.php
@@ -88,7 +88,7 @@ $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
 $form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'action_button disabled'));
 
 echo elgg_view('input/form', array(
-       'action' => elgg_get_site_url()."action/admin/plugins/simple_update_states",
+       'action' => "action/admin/plugins/simple_update_states",
        'body' => $form_body,
        'class' => 'admin_plugins_simpleview'
 ));
\ No newline at end of file

diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php
index 4e2e23a6fc5ae1ff54018613a7aba42e7b71ba8e..dd0b374e0e261258982c5533c1c754cc822ddf4c 100644 (file)
--- a/views/default/comments/forms/edit.php
+++ b/views/default/comments/forms/edit.php
@@ -13,7 +13,7 @@
                 $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));
                 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post"))) . "</div>";
                 
-                echo elgg_view('input/form', array('body' => $form_body, 'action' => elgg_get_site_url()."action/comments/add"));
+                echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/comments/add"));
 
     }
     

diff --git a/views/default/friends/forms/edit.php b/views/default/friends/forms/edit.php
index 09a16c9ae73d4d24218d8e2a369ec3e54c200ca9..632268fb89f7783901f856269920f8932019dac8 100644 (file)
--- a/views/default/friends/forms/edit.php
+++ b/views/default/friends/forms/edit.php
@@ -50,4 +50,4 @@ if (isset($vars['collection'])) {
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
 $form_body .= "</p></div>";
 
-echo elgg_view('input/form', array('body' => $form_body, 'action' => elgg_get_site_url()."action/$action"));
\ No newline at end of file
+echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/$action"));
\ No newline at end of file

diff --git a/views/default/object/plugin.php b/views/default/object/plugin.php
index bef709d7de2fce7b8870e1b66b8774fcec1ef045..aef9a9bbd52d98f2117e780379610590b075eeac 100644 (file)
--- a/views/default/object/plugin.php
+++ b/views/default/object/plugin.php
@@ -15,5 +15,5 @@ $form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'plugin'
 
 ?>
 <div>
-       <?php echo elgg_view('input/form', array('body' => $form_body, 'action' => elgg_get_site_url()."action/plugins/{$prefix}settings/save")); ?>
+       <?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/plugins/{$prefix}settings/save")); ?>
 </div>
\ No newline at end of file

diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
index 02ccbc795c70acd39cfa6effc10a527e4dff9b71..05cef83d29e21d93311d5eada529de23c772238f 100644 (file)
--- a/views/default/usersettings/form.php
+++ b/views/default/usersettings/form.php
@@ -7,4 +7,4 @@
 $form_body = elgg_view("usersettings/user");
 $form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'submit_button usersettings_save'));
 
-echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/usersettings/save", 'body' => $form_body));
\ No newline at end of file
+echo elgg_view('input/form', array('action' => "action/usersettings/save", 'body' => $form_body));
\ No newline at end of file

diff --git a/views/default/widgets/editwrapper.php b/views/default/widgets/editwrapper.php
index 5be2df9d45bf6951fed7b908c21dc91e18c8837e..9f52ba7f6e534239b7c8ebe44a873d36b21bf758 100644 (file)
--- a/views/default/widgets/editwrapper.php
+++ b/views/default/widgets/editwrapper.php
@@ -12,7 +12,7 @@ $form_body = $vars['body'];
 $form_body .= "<p><label>" . elgg_echo('access') . ": " . elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $vars['entity']->access_id)) . "</label></p>";
 $form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $guid)) . elgg_view('input/hidden', array('internalname' => 'noforward', 'value' => 'true')) . elgg_view('input/submit', array('internalname' => "submit$guid", 'value' => elgg_echo('save'))) . "</p>";
 
-echo elgg_view('input/form', array('internalid' => "widgetform$guid", 'body' => $form_body, 'action' => elgg_get_site_url()."action/widgets/save"))
+echo elgg_view('input/form', array('internalid' => "widgetform$guid", 'body' => $form_body, 'action' => "action/widgets/save"))
 ?>
 <script type="text/javascript">
 $(document).ready(function() {