Refs #2463: Removed some more instances of $CONFIG->url. Added support for elgg_norm...

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

diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php
index 6e73e56a429f09d83b80309162ec6d3b90d49333..febd70be683fb6f3e828761c9f315159852027e9 100644 (file)
--- a/engine/classes/ElggSite.php
+++ b/engine/classes/ElggSite.php
@@ -352,7 +352,7 @@ class ElggSite extends ElggEntity {
                }
 
                // always allow index page
-               if ($url == $CONFIG->url) {
+               if ($url == elgg_get_site_url($this->guid)) {
                        return TRUE;
                }
 

diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index fef6004ccf3fab63b85337c7a23cf8874ba2164b..38fdef1eea5ac17a37dd8e15cacc232850d51f14 100644 (file)
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -113,7 +113,7 @@ function action($action, $forwarder = "") {
                register_error(sprintf(elgg_echo('actionundefined'), $action));
        }
 
-       forward($CONFIG->url . $forwarder);
+       forward($forwarder);
 }
 
 /**

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 282b69fce77a4c141c36eae44718ba4d7e0d954a..e45b231d461f3bfb3b0744c3fd9a4228edb34cf1 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1565,7 +1565,7 @@ function elgg_http_build_url(array $parts, $html_encode = TRUE) {
  * @link http://docs.elgg.org/Tutorials/Actions
  */
 function elgg_add_action_tokens_to_url($url, $html_encode = TRUE) {
-       $components = parse_url($url);
+       $components = parse_url(elgg_normalize_url($url));
 
        if (isset($components['query'])) {
                $query = elgg_parse_str($components['query']);
@@ -1680,11 +1680,11 @@ function elgg_http_url_is_identical($url1, $url2, $ignore_params = array('offset
 
        // if the server portion is missing but it starts with / then add the url in.
        if (elgg_substr($url1, 0, 1) == '/') {
-               $url1 = $CONFIG->url . ltrim($url1, '/');
+               $url1 = elgg_get_site_url() . ltrim($url1, '/');
        }
 
        if (elgg_substr($url1, 0, 1) == '/') {
-               $url2 = $CONFIG->url . ltrim($url2, '/');
+               $url2 = elgg_get_site_url() . ltrim($url2, '/');
        }
 
        // @todo - should probably do something with relative URLs

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 1c8db655bd925bf92ebe3de3bb354aaa96c02a41..34dc39de5333a203fb90bf58200524b1847aeaff 100644 (file)
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -2097,10 +2097,10 @@ function get_entity_icon_url(ElggEntity $entity, $size = 'medium') {
                        return $overrideurl;
                }
 
-               $url = $CONFIG->url . "_graphics/icons/default/$size.png";
+               $url = "_graphics/icons/default/$size.png";
        }
 
-       return $url;
+       return elgg_normalize_url($url);
 }
 
 /**
@@ -2137,9 +2137,10 @@ function get_entity_url($entity_guid) {
                }
 
                if ($url == "") {
-                       $url = $CONFIG->url . "pg/view/" . $entity_guid;
+                       $url = "pg/view/" . $entity_guid;
                }
-               return $url;
+               
+               return elgg_noramlize_url($url);
 
        }
 

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index beb154f30c90492b7dada7a4b0519e1cb192c13e..fcfc553fd59797bff4557f04c3b57e7c6ef56494 100644 (file)
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -196,7 +196,7 @@ function elgg_prepare_submenu($context = 'main', $sort = FALSE) {
                                                $item->href = $child->href;
                                        } else {
                                                // @todo There are no URLs anywhere in this tree.
-                                               $item->href = $CONFIG->url;
+                                               $item->href = elgg_get_site_url();
                                        }
                                }
                        }

diff --git a/engine/lib/views.php b/engine/lib/views.php
index d8564c5e382854c39faa905f73550832c0919fbe..82be10118e1c96de784c34a6dfa09361bfece7a5 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -279,7 +279,7 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
                $vars['config'] = $CONFIG;
        }
 
-       $vars['url'] = $CONFIG->url;
+       $vars['url'] = elgg_get_site_url();
 
        // Load page owner variables into $vars
        if (is_callable('page_owner')) {

diff --git a/engine/tests/ui/submenu.php b/engine/tests/ui/submenu.php
index 7453648905f3af0cb9deee964607ca1e3d7ea029..fcf4589e24f5afa6f4e3761634ba093c3eec767d 100644 (file)
--- a/engine/tests/ui/submenu.php
+++ b/engine/tests/ui/submenu.php
@@ -15,7 +15,7 @@
 
 require_once('../../start.php');
 
-$url = "{$CONFIG->url}engine/tests/ui/submenu.php";
+$url = "engine/tests/ui/submenu.php";
 
 $items = array(
        array(

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 1527572d6b3167f9df828d31fb5e767aa5fcd670..8f7e7eb8f9d3a2be26b282a1cacd0fa960541237 100644 (file)
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -659,15 +659,15 @@ class ElggInstaller {
                }
 
                if ($this->status['settings'] == FALSE) {
-                       forward(elgg_get_site_url()."install.php?step=settings");
+                       forward("install.php?step=settings");
                }
 
                if ($this->status['admin'] == FALSE) {
-                       forward(elgg_get_site_url()."install.php?step=admin");
+                       forward("install.php?step=admin");
                }
 
                // everything appears to be set up
-               forward(elgg_get_site_url()."install.php?step=complete");
+               forward("install.php?step=complete");
        }
 
        /**

diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 464ffb8c5917a77330db5677bde493b0d4a588b2..492c04eab2bdebcb268bb6d97bc6a1c8411a2d0b 100644 (file)
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -24,7 +24,7 @@ $owner = get_user($vars['annotation']->owner_guid);
                ?>
                        <span class="delete_button">
                                <?php echo elgg_view("output/confirmlink",array(
-                                               'href' => elgg_get_site_url() . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
+                                               'href' => "action/comments/delete?annotation_id=" . $vars['annotation']->id,
                                                'text' => elgg_echo('delete'),
                                                'confirm' => elgg_echo('deleteconfirm')
                                                ));

diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index ecd1099783d4ebcedfdeca6fc2a398fd030cb1fd..8b6be92200cacf8fdda64efbd521bfd76c740e44 100644 (file)
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -23,7 +23,7 @@ $owner = get_user($vars['annotation']->owner_guid);
                ?>
                        <div class="entity_metadata"><span class="delete_button">
                                <?php echo elgg_view("output/confirmlink",array(
-                                               'href' => elgg_get_site_url() . "action/likes/delete?annotation_id=" . $vars['annotation']->id,
+                                               'href' => "action/likes/delete?annotation_id=" . $vars['annotation']->id,
                                                'text' => elgg_echo('remove'),
                                                'confirm' => elgg_echo('deleteconfirm')
                                                ));

diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index 636d2ab5c965bce7a78ab2fa43d0e8e0c7566e63..9981dd291b8952a9c6ba5cb8d2262255f9dc3962 100644 (file)
--- a/views/default/friends/collection.php
+++ b/views/default/friends/collection.php
@@ -25,7 +25,7 @@ echo "<li><h2>";
 if ($coll->owner_guid == get_loggedin_userid()) {
        echo "<div class=\"friends_collections_controls\">";
        echo elgg_view('output/confirmlink', array(
-                       'href' => elgg_get_site_url() . 'action/friends/deletecollection?collection=' . $coll->id,
+                       'href' => 'action/friends/deletecollection?collection=' . $coll->id,
                        'class' => 'delete_collection'
                ));
        echo "</div>";

diff --git a/views/default/object/default.php b/views/default/object/default.php
index 6975804c383cc27608b74e3e9a09c1e41cc6a1c9..0f07996b259a0dffdc03dcb59e01d6cfb1e37a4f 100644 (file)
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -29,7 +29,7 @@ if ($vars['full']) {
        $controls = "";
        if ($vars['entity']->canEdit()) {
                $delete = elgg_view('output/confirm_link', array(
-                       'href' => elgg_get_site_url()."action/entities/delete?guid={$vars['entity']->guid}", 
+                       'href' => "action/entities/delete?guid={$vars['entity']->guid}", 
                        'text' => elgg_echo('delete')
                ));
                $controls .= " ($delete)";

diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index 3704e9a49d503734c3b61ea593fc00705309a00c..37cba442573f82bfd7bc2e1c3ba10dbc91958ed4 100644 (file)
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -38,17 +38,17 @@ $new_button = '';
 $default_tabs = array(
        'all' => array(
                'title' => elgg_echo('all'),
-               'url' => (isset($vars['all_link'])) ? $vars['all_link'] : elgg_get_site_url()."mod/$type/all.php",
+               'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "mod/$type/all.php",
                'selected' => ($filter_context == 'everyone'),
        ),
        'mine' => array(
                'title' => elgg_echo('mine'),
-               'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : elgg_get_site_url()."pg/$type/$username",
+               'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$type/$username",
                'selected' => ($filter_context == 'mine'),
        ),
        'friend' => array(
                'title' => elgg_echo('friends'),
-               'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : elgg_get_site_url()."pg/$type/$username/friends",
+               'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$type/$username/friends",
                'selected' => ($filter_context == 'friends'),
        ),
 );

diff --git a/views/default/page_elements/elgg_topbar_logout.php b/views/default/page_elements/elgg_topbar_logout.php
index ca3d16707ec372f68f4f2cb01a6f0ac08ef31638..38a37bc2298161c018499392c43a6a586c6132b2 100644 (file)
--- a/views/default/page_elements/elgg_topbar_logout.php
+++ b/views/default/page_elements/elgg_topbar_logout.php
@@ -7,7 +7,7 @@
 
 echo '<div class="log_out">';
 echo elgg_view('output/url', array(
-       'href' => elgg_get_site_url()."action/logout",
+       'href' => "action/logout",
        'text' => elgg_echo('logout'),
        'is_action' => TRUE
 ));