Refs #2598: Converted the rest of the $vars['url'] references to elgg_get_site_url()

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

diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 4d69e735debf0d36feb5e4d74d41e70a6108c62e..db41eee40a8a62bc336b61d18751037a27b2e09c 100644 (file)
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -56,7 +56,7 @@ if (@file_exists($faviconurl)) {
 //delete
 if($vars['entity']->canEdit()){
        $delete .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array(
-                               'href' => $vars['url'] . "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->guid,
+                               'href' => elgg_get_site_url() . "action/bookmarks/delete?bookmark_guid=" . $vars['entity']->guid,
                                'text' => elgg_echo("delete"),
                                'confirm' => elgg_echo("bookmarks:delete:confirm"),
                                )) . "</span>";
@@ -70,14 +70,14 @@ $info .= elgg_view_likes($vars['entity']); // include likes
 
 //include edit and delete options
 if($vars['entity']->canEdit()){
-       $info .= "<span class='entity_edit'><a href=\"{$vars['url']}pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
+       $info .= "<span class='entity_edit'><a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
        $info .= $delete;
 }
 
        $info .= "</div>";
 
 $info .= "<p class='entity_title'><a href=\"{$address}\" target=\"_blank\">{$title}</a></p>";
-$info .= "<p class='entity_subtext'>Bookmarked by <a href=\"{$vars['url']}pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>";
+$info .= "<p class='entity_subtext'>Bookmarked by <a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>";
 
 $tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags));
 if (!empty($tags)) {

diff --git a/mod/ecml/views/default/ecml/input_ext.php b/mod/ecml/views/default/ecml/input_ext.php
index 6ea688e99c73a6b9c035f7acdee51fc21366b6fc..f9ab942e0e64c0730991da7562dad21034295444 100644 (file)
--- a/mod/ecml/views/default/ecml/input_ext.php
+++ b/mod/ecml/views/default/ecml/input_ext.php
@@ -5,6 +5,6 @@
  * @package ECML
  */
 
-$docs_href = "{$vars['url']}pg/ecml";
+$docs_href = elgg_get_site_url()."pg/ecml";
 ?>
-<a href="<?php echo $docs_href; ?>" class="longtext_control" title="<?php echo elgg_echo('ecml:help'); ?>" target="_new"><img src="<?php echo $vars['url']; ?>mod/ecml/graphics/ecml.png" width="50" height="15" alt="ECML" /></a>
\ No newline at end of file
+<a href="<?php echo $docs_href; ?>" class="longtext_control" title="<?php echo elgg_echo('ecml:help'); ?>" target="_new"><img src="<?php echo elgg_get_site_url(); ?>mod/ecml/graphics/ecml.png" width="50" height="15" alt="ECML" /></a>
\ No newline at end of file

diff --git a/mod/groups/views/default/groups/activity_latest.php b/mod/groups/views/default/groups/activity_latest.php
index ea16964c3012d917a4731f2015eaae87dd5b3ba6..3ac385553fa0558247d7a7ca86263c1377392ea9 100644 (file)
--- a/mod/groups/views/default/groups/activity_latest.php
+++ b/mod/groups/views/default/groups/activity_latest.php
@@ -5,7 +5,7 @@
  * @package Groups
  */
 ?>
-<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/groups/activity/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span>
+<span class="group_widget_link"><a href="<?php echo elgg_get_site_url() . "pg/groups/activity/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span>
 <h3><?php echo elgg_echo("activity"); ?></h3>
 <?php
        $owner = elgg_get_page_owner();

diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
index f8b86d84274150b3c2a2d2f86454390d4d101ea7..ce3638f15e4ea3982d0d4be562aeffe029eab3ca 100644 (file)
--- a/mod/groups/views/default/river/forum/create.php
+++ b/mod/groups/views/default/river/forum/create.php
@@ -14,7 +14,7 @@
                $comment = get_annotation($vars['item']->annotation_id)->value; 
        }
        $comment = strip_tags($comment);//this is so we don't get large images etc in the activity river
-       $url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
+       $url = elgg_get_site_url() . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
        $url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
        $string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " ";
        $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";

diff --git a/mod/profile/views/default/profile/admin_menu.php b/mod/profile/views/default/profile/admin_menu.php
index e901442c2c91c1b409d0357f8667e41a958648c8..076cdd49c9cd1ca833e96c10a0fc09153a4aec63 100755 (executable)
--- a/mod/profile/views/default/profile/admin_menu.php
+++ b/mod/profile/views/default/profile/admin_menu.php
@@ -7,7 +7,7 @@ global $CONFIG;
 if (isadminloggedin()){
        if (get_loggedin_userid()!=elgg_get_page_owner_guid()){
                $user = get_user(elgg_get_page_owner_guid());
-               $url = $vars['url'];
+               $url = elgg_get_site_url();
                $ts = time();
                $token = generate_action_token($ts);
 

diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php
index 020240261d2e51c1c873fe681dbb977c6b5f887a..c7fd99857fc1f4e9fd7ee37cb89115b5463bb6de 100644 (file)
--- a/mod/profile/views/default/profile/menu/adminlinks.php
+++ b/mod/profile/views/default/profile/menu/adminlinks.php
@@ -10,7 +10,7 @@
 if (isadminloggedin()){
        if (get_loggedin_userid()!=$vars['entity']->guid){
 ?>
-               <a href="<?php echo $vars['url']; ?>pg/settings/user/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a>
+               <a href="<?php echo elgg_get_site_url(); ?>pg/settings/user/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a>
 <?php 
                        if (!$vars['entity']->isBanned()) {
                                echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => elgg_get_site_url()."action/admin/user/ban?guid={$vars['entity']->guid}"));

diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php
index 2bf32d198a1e4da86f72ca61589942f8c09bee29..00e63e95d8b6b7967b6a515747db0b6177d76551 100644 (file)
--- a/views/default/admin/site/advanced.php
+++ b/views/default/admin/site/advanced.php
@@ -6,7 +6,7 @@
  * @subpackage Core
  */
 
-$action = $vars['url'] . "action/admin/site/update_advanced";
+$action = elgg_get_site_url() . "action/admin/site/update_advanced";
 
 $form_body = "";
 

diff --git a/views/default/admin/site/basic.php b/views/default/admin/site/basic.php
index d8d1618d1efcb037de7fb38d3932b3d01c0ddcc9..f6b2d03e01ce45e53f55a9928ab2d66db439f145 100644 (file)
--- a/views/default/admin/site/basic.php
+++ b/views/default/admin/site/basic.php
@@ -6,7 +6,7 @@
  * @subpackage Core
  */
 
-$action = $vars['url'] . "action/admin/site/update_basic";
+$action = elgg_get_site_url() . "action/admin/site/update_basic";
 
 $form_body = "";