Refs #2598: Converted virtually all uses of $CONFIG->wwwroot to elgg_get_site_url()

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

8 files changed, 16 insertions, 16 deletions

diff --git a/mod/groups/actions/forums/addtopic.php b/mod/groups/actions/forums/addtopic.php
index 5f9c8e709..0b8a0f590 100644
--- a/mod/groups/actions/forums/addtopic.php
+++ b/mod/groups/actions/forums/addtopic.php
@@ -67,7 +67,7 @@
 			
 	// Forward to the group forum page
 	        global $CONFIG;
-	        $url = $CONFIG->wwwroot . "pg/groups/forum/{$group_guid}/";
+	        $url = elgg_get_site_url() . "pg/groups/forum/{$group_guid}/";
 			forward($url);
 				
 		}
diff --git a/mod/groups/actions/forums/deletetopic.php b/mod/groups/actions/forums/deletetopic.php
index 57e4b314f..c67228a2f 100644
--- a/mod/groups/actions/forums/deletetopic.php
+++ b/mod/groups/actions/forums/deletetopic.php
@@ -30,7 +30,7 @@
 					register_error(elgg_echo("groupstopic:notdeleted"));
 				}
 		// Forward to the group forum page
-	        $url = $CONFIG->wwwroot . "pg/groups/forum/{$group_guid}/";
+	        $url = elgg_get_site_url() . "pg/groups/forum/{$group_guid}/";
 			forward($url);
 		
 		}
diff --git a/mod/groups/actions/forums/edittopic.php b/mod/groups/actions/forums/edittopic.php
index 59c46af73..247c06c8c 100644
--- a/mod/groups/actions/forums/edittopic.php
+++ b/mod/groups/actions/forums/edittopic.php
@@ -61,6 +61,6 @@ if ($topic){
 }
 // Forward to the discussion
 global $CONFIG;
-$url = $CONFIG->wwwroot . "mod/groups/topicposts.php?topic={$topic_guid}&group_guid={$group_guid}/";
+$url = elgg_get_site_url() . "mod/groups/topicposts.php?topic={$topic_guid}&group_guid={$group_guid}/";
 forward($url);
 
diff --git a/mod/groups/activity.php b/mod/groups/activity.php
index 38d94fa4e..d0e24be97 100644
--- a/mod/groups/activity.php
+++ b/mod/groups/activity.php
@@ -16,7 +16,7 @@ global $CONFIG;
 

 // set up breadcrumbs

 $group = get_entity($group_guid);

-elgg_push_breadcrumb(elgg_echo('groups'), $CONFIG->wwwroot."pg/groups/world/");

+elgg_push_breadcrumb(elgg_echo('groups'), elgg_get_site_url()."pg/groups/world/");

 elgg_push_breadcrumb($group->name, $group->getURL());

 elgg_push_breadcrumb(elgg_echo('groups:activity'));

 

diff --git a/mod/groups/forum.php b/mod/groups/forum.php
index a6b88f9fb..d3e4a471c 100644
--- a/mod/groups/forum.php
+++ b/mod/groups/forum.php
@@ -28,7 +28,7 @@ $topics = elgg_list_entities($options);
 
 // set up breadcrumbs
 $group = get_entity($group_guid);
-elgg_push_breadcrumb(elgg_echo('groups'), $CONFIG->wwwroot."pg/groups/world/");
+elgg_push_breadcrumb(elgg_echo('groups'), elgg_get_site_url()."pg/groups/world/");
 elgg_push_breadcrumb($group->name, $group->getURL());
 elgg_push_breadcrumb(elgg_echo('item:object:groupforumtopic'));
 
diff --git a/mod/groups/start.php b/mod/groups/start.php
index b81ae81ce..d6db817b8 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -14,7 +14,7 @@
 		global $CONFIG;
 
 		// Set up the menu
-		add_menu(elgg_echo('groups'), $CONFIG->wwwroot . "pg/groups/world/");
+		add_menu(elgg_echo('groups'), elgg_get_site_url() . "pg/groups/world/");
 
 		// Register a page handler, so we can have nice URLs
 		register_page_handler('groups','groups_page_handler');
@@ -205,16 +205,16 @@
 		if (get_context() == 'groups') {
 			if ($page_owner instanceof ElggGroup) {
 				if (isloggedin() && $page_owner->canEdit() && !$page_owner->isPublicMembership()) {
-					$url = "{$CONFIG->wwwroot}mod/groups/membershipreq.php?group_guid={$page_owner->getGUID()}";
+					$url = elgg_get_site_url()."mod/groups/membershipreq.php?group_guid={$page_owner->getGUID()}";
 					add_submenu_item(elgg_echo('groups:membershiprequests'), $url, 'groupsactions1');
 				}
 			} else {
-				add_submenu_item(elgg_echo('groups:all'), "{$CONFIG->wwwroot}pg/groups/world/", 'groupslinks1');
+				add_submenu_item(elgg_echo('groups:all'), elgg_get_site_url()."pg/groups/world/", 'groupslinks1');
 
 				if ($user = get_loggedin_user()) {
-					add_submenu_item(elgg_echo('groups:owned'), "{$CONFIG->wwwroot}pg/groups/owned/$user->username", 'groupslinks1');
-					add_submenu_item(elgg_echo('groups:yours'), "{$CONFIG->wwwroot}pg/groups/member/$user->username", 'groupslinks1');
-					add_submenu_item(elgg_echo('groups:invitations'), "{$CONFIG->wwwroot}pg/groups/invitations/$user->username", 'groupslinks1');
+					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');
 				}
 			}
 		}
@@ -534,7 +534,7 @@
 	function group_topicpost_url($annotation) {
 		if ($parent = get_entity($annotation->entity_guid)) {
 			global $CONFIG;
-			return $CONFIG->wwwroot . 'mod/groups/topicposts.php?topic='.$parent->guid.'&group_guid='.$parent->container_guid.'#' . $annotation->id;
+			return elgg_get_site_url() . 'mod/groups/topicposts.php?topic='.$parent->guid.'&group_guid='.$parent->container_guid.'#' . $annotation->id;
 		}
 	}
 
diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php
index 7272cbbc0..3fedbd0dc 100644
--- a/mod/groups/views/default/forms/forums/addtopic.php
+++ b/mod/groups/views/default/forms/forums/addtopic.php
@@ -23,9 +23,9 @@
 	$group = get_entity($group_guid);
 	$access_id = $group->group_acl;
 	$options = group_access_options($group);
-	elgg_push_breadcrumb(elgg_echo('groups'), $CONFIG->wwwroot."pg/groups/world/");
+	elgg_push_breadcrumb(elgg_echo('groups'), elgg_get_site_url()."pg/groups/world/");
 	elgg_push_breadcrumb($group->name, $group->getURL());
-	elgg_push_breadcrumb(elgg_echo('item:object:groupforumtopic'), $CONFIG->wwwroot."pg/groups/forum/{$group_guid}/");
+	elgg_push_breadcrumb(elgg_echo('item:object:groupforumtopic'), elgg_get_site_url()."pg/groups/forum/{$group_guid}/");
 	elgg_push_breadcrumb(elgg_echo("groups:addtopic"));
 
 	echo elgg_view('navigation/breadcrumbs');
diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php
index 407869314..2eb532830 100644
--- a/mod/groups/views/default/forum/viewposts.php
+++ b/mod/groups/views/default/forum/viewposts.php
@@ -6,9 +6,9 @@
 // set up breadcrumbs
 $group_guid = get_input('group_guid');
 $group = get_entity($group_guid);
-elgg_push_breadcrumb(elgg_echo('groups'), $CONFIG->wwwroot."pg/groups/world/");
+elgg_push_breadcrumb(elgg_echo('groups'), elgg_get_site_url()."pg/groups/world/");
 elgg_push_breadcrumb($group->name, $group->getURL());
-elgg_push_breadcrumb(elgg_echo('item:object:groupforumtopic'), $CONFIG->wwwroot."pg/groups/forum/{$vars['entity']->container_guid}");
+elgg_push_breadcrumb(elgg_echo('item:object:groupforumtopic'), elgg_get_site_url()."pg/groups/forum/{$vars['entity']->container_guid}");
 elgg_push_breadcrumb($vars['entity']->title);
 
 echo elgg_view('navigation/breadcrumbs');