From 9255088a79a034c3cdf4eb46124504b9dd0c838e Mon Sep 17 00:00:00 2001 From: ewinslow Date: Sat, 30 Oct 2010 22:15:36 +0000 Subject: 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 --- engine/lib/export.php | 4 ++-- engine/lib/relationships.php | 2 +- install/ElggInstaller.php | 12 ++++++------ mod/blog/start.php | 2 +- mod/blog/views/default/blog/sidebar_menu.php | 2 +- mod/bookmarks/start.php | 6 +++--- mod/diagnostics/index.php | 2 +- mod/diagnostics/start.php | 2 +- mod/file/actions/save.php | 4 ++-- mod/file/actions/upload.php | 2 +- mod/file/start.php | 4 ++-- mod/file/views/default/file/icon/application/default.php | 2 +- mod/file/views/default/file/icon/application/excel.php | 2 +- mod/file/views/default/file/icon/application/msword.php | 2 +- mod/file/views/default/file/icon/application/pdf.php | 2 +- .../views/default/file/icon/application/powerpoint.php | 2 +- .../views/default/file/icon/application/vnd.ms-excel.php | 2 +- .../default/file/icon/application/vnd.ms-powerpoint.php | 2 +- .../file/icon/application/vnd.oasis.opendocument.text.php | 2 +- mod/file/views/default/file/icon/archive.php | 2 +- mod/file/views/default/file/icon/audio.php | 2 +- mod/file/views/default/file/icon/default.php | 2 +- mod/file/views/default/file/icon/document.php | 2 +- mod/file/views/default/file/icon/text/directory.php | 2 +- mod/file/views/default/file/icon/video.php | 2 +- mod/groups/actions/forums/addtopic.php | 2 +- mod/groups/actions/forums/deletetopic.php | 2 +- mod/groups/actions/forums/edittopic.php | 2 +- mod/groups/activity.php | 2 +- mod/groups/forum.php | 2 +- mod/groups/start.php | 14 +++++++------- mod/groups/views/default/forms/forums/addtopic.php | 4 ++-- mod/groups/views/default/forum/viewposts.php | 4 ++-- mod/invitefriends/actions/invite.php | 2 +- mod/invitefriends/start.php | 2 +- mod/members/index.php | 6 +++--- mod/messageboard/start.php | 2 +- mod/messages/index.php | 2 +- mod/messages/sent.php | 2 +- mod/messages/start.php | 12 ++++++------ mod/notifications/groups.php | 2 +- mod/notifications/start.php | 4 ++-- mod/pages/index.php | 2 +- mod/pages/start.php | 8 ++++---- mod/pages/view.php | 4 ++-- mod/pages/views/default/pages/breadcrumbs.php | 2 +- mod/pages/world.php | 2 +- mod/profile/actions/addcomment.php | 2 +- mod/profile/start.php | 8 ++++---- .../views/default/admin/appearance/defaultprofile.php | 2 +- .../views/default/reportedcontent/user_report.php | 2 +- mod/riverdashboard/start.php | 2 +- mod/search/index.php | 8 ++++---- mod/thewire/start.php | 2 +- views/default/page_elements/content_header.php | 4 ++-- views/default/usersettings/main_opt/plugins.php | 2 +- views/default/usersettings/main_opt/statistics.php | 2 +- views/default/usersettings/main_opt/user.php | 2 +- views/installation/input/button.php | 2 +- 59 files changed, 96 insertions(+), 96 deletions(-) diff --git a/engine/lib/export.php b/engine/lib/export.php index eaf2fd3dd..3a5c74a0f 100644 --- a/engine/lib/export.php +++ b/engine/lib/export.php @@ -42,7 +42,7 @@ function get_uuid_from_object($object) { function guid_to_uuid($guid) { global $CONFIG; - return $CONFIG->wwwroot . "export/opendd/$guid/"; + return elgg_get_site_url() . "export/opendd/$guid/"; } /** @@ -55,7 +55,7 @@ function guid_to_uuid($guid) { function is_uuid_this_domain($uuid) { global $CONFIG; - if (strpos($uuid, $CONFIG->wwwroot) === 0) { + if (strpos($uuid, elgg_get_site_url()) === 0) { return true; } diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php index 6c43b1757..987ba95b0 100644 --- a/engine/lib/relationships.php +++ b/engine/lib/relationships.php @@ -702,7 +702,7 @@ function get_relationship_url($id) { if ($url == "") { $nameid = $relationship->id; - $url = $CONFIG->wwwroot . "export/$view/$guid/relationship/$nameid/"; + $url = elgg_get_site_url() . "export/$view/$guid/relationship/$nameid/"; } return $url; diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php index 480a2ed1e..1527572d6 100644 --- a/install/ElggInstaller.php +++ b/install/ElggInstaller.php @@ -369,7 +369,7 @@ class ElggInstaller { ), 'wwwroot' => array( 'type' => 'text', - 'value' => $CONFIG->wwwroot, + 'value' => elgg_get_site_url(), 'required' => TRUE, ), 'path' => array( @@ -551,7 +551,7 @@ class ElggInstaller { protected function getNextStepUrl($currentStep) { global $CONFIG; $nextStep = $this->getNextStep($currentStep); - return "{$CONFIG->wwwroot}install.php?step=$nextStep"; + return elgg_get_site_url()."install.php?step=$nextStep"; } /** @@ -659,15 +659,15 @@ class ElggInstaller { } if ($this->status['settings'] == FALSE) { - forward("{$CONFIG->wwwroot}install.php?step=settings"); + forward(elgg_get_site_url()."install.php?step=settings"); } if ($this->status['admin'] == FALSE) { - forward("{$CONFIG->wwwroot}install.php?step=admin"); + forward(elgg_get_site_url()."install.php?step=admin"); } // everything appears to be set up - forward("{$CONFIG->wwwroot}install.php?step=complete"); + forward(elgg_get_site_url()."install.php?step=complete"); } /** @@ -1029,7 +1029,7 @@ class ElggInstaller { require_once(dirname(__FILE__) . "/ElggRewriteTester.php"); $tester = new ElggRewriteTester(); - $url = "{$CONFIG->wwwroot}rewrite.php"; + $url = elgg_get_site_url()."rewrite.php"; $report['rewrite'] = array($tester->run($url, $CONFIG->path)); } diff --git a/mod/blog/start.php b/mod/blog/start.php index 4c0fa66a5..a87a14ca2 100644 --- a/mod/blog/start.php +++ b/mod/blog/start.php @@ -23,7 +23,7 @@ function blog_init() { global $CONFIG; require_once dirname(__FILE__) . '/blog_lib.php'; - add_menu(elgg_echo('blog:blogs'), "{$CONFIG->wwwroot}pg/blog/", array()); + add_menu(elgg_echo('blog:blogs'), elgg_get_site_url()."pg/blog/", array()); // run the setup upon activations or to upgrade old installations. run_function_once('blog_runonce', '1269370108'); diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php index ab00433c8..f69e23e29 100644 --- a/mod/blog/views/default/blog/sidebar_menu.php +++ b/mod/blog/views/default/blog/sidebar_menu.php @@ -49,7 +49,7 @@ if ($page_owner) { $page_owner = elgg_get_page_owner(); } - $link = $CONFIG->wwwroot . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh; + $link = elgg_get_site_url() . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh; $month = sprintf(elgg_echo('date:month:' . substr($date,4,2)), substr($date, 0, 4)); echo "
  • $month
    • "; } diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php index 25b87b6c7..2c82ca674 100644 --- a/mod/bookmarks/start.php +++ b/mod/bookmarks/start.php @@ -11,7 +11,7 @@ function bookmarks_init() { global $CONFIG; //add a tools menu option - add_menu(elgg_echo('bookmarks'), $CONFIG->wwwroot . 'pg/bookmarks'); + add_menu(elgg_echo('bookmarks'), elgg_get_site_url() . 'pg/bookmarks'); // Register a page handler, so we can have nice URLs register_page_handler('bookmarks', 'bookmarks_page_handler'); @@ -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), $CONFIG->wwwroot . "pg/bookmarks/" . $page_owner->username . '/items'); + //add_submenu_item(sprintf(elgg_echo("bookmarks:group"),$page_owner->name), elgg_get_site_url() . "pg/bookmarks/" . $page_owner->username . '/items'); } } } @@ -276,7 +276,7 @@ function bookmarks_notify_message($hook, $entity_type, $returnvalue, $params) { $descr = $entity->description; $title = $entity->title; global $CONFIG; - $url = $CONFIG->wwwroot . "pg/view/" . $entity->guid; + $url = elgg_get_site_url() . "pg/view/" . $entity->guid; if ($method == 'sms') { $owner = $entity->getOwnerEntity(); return $owner->name . ' ' . elgg_echo("bookmarks:via") . ': ' . $url . ' (' . $title . ')'; diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php index abc5c2b31..e4620cb95 100644 --- a/mod/diagnostics/index.php +++ b/mod/diagnostics/index.php @@ -24,7 +24,7 @@ $test_body .= "

    " . elgg_echo('diagnostics:unittester:warning') . "

    "; if (isset($CONFIG->debug)) { // create a button to run tests - $js = "onclick=\"window.location='{$CONFIG->wwwroot}engine/tests/suite.php'\""; + $js = "onclick=\"window.location='".elgg_get_site_url()."engine/tests/suite.php'\""; $params = array('type' => 'button', 'value' => elgg_echo('diagnostics:test:executeall'), 'js' => $js); $test_body .= elgg_view('input/button', $params); } else { diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php index d2fc1b5a1..4711cd9d6 100644 --- 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'), $CONFIG->wwwroot . 'pg/diagnostics/'); + add_submenu_item(elgg_echo('diagnostics'), elgg_get_site_url() . 'pg/diagnostics/'); } } diff --git a/mod/file/actions/save.php b/mod/file/actions/save.php index 923bc043b..17a9b16fb 100644 --- a/mod/file/actions/save.php +++ b/mod/file/actions/save.php @@ -17,7 +17,7 @@ if (!$file = get_entity($guid)) { register_error(elgg_echo("file:uploadfailed")); - forward($CONFIG->wwwroot . "pg/file/" . get_loggedin_user()->username); + forward(elgg_get_site_url() . "pg/file/" . get_loggedin_user()->username); exit; } @@ -44,5 +44,5 @@ else register_error(elgg_echo("file:uploadfailed")); - forward($CONFIG->wwwroot . "pg/file/" . $container->username); + forward(elgg_get_site_url() . "pg/file/" . $container->username); ?> \ No newline at end of file diff --git a/mod/file/actions/upload.php b/mod/file/actions/upload.php index 367488d7c..82744730c 100644 --- a/mod/file/actions/upload.php +++ b/mod/file/actions/upload.php @@ -193,7 +193,7 @@ if (!$ajax) { $container_user = get_entity($container_guid); - forward($CONFIG->wwwroot . "pg/file/" . $container_user->username); + forward(elgg_get_site_url() . "pg/file/" . $container_user->username); } } else { diff --git a/mod/file/start.php b/mod/file/start.php index 60e863df5..228e4788b 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -28,7 +28,7 @@ global $CONFIG; // Set up menu (tools dropdown) - add_menu(elgg_echo('files'), $CONFIG->wwwroot . "pg/file/"); + add_menu(elgg_echo('files'), elgg_get_site_url() . "pg/file/"); // Extend CSS elgg_extend_view('css', 'file/css'); @@ -138,7 +138,7 @@ $descr = $entity->description; $title = $entity->title; global $CONFIG; - $url = $CONFIG->wwwroot . "pg/view/" . $entity->guid; + $url = elgg_get_site_url() . "pg/view/" . $entity->guid; if ($method == 'sms') { $owner = $entity->getOwnerEntity(); return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $url . ' (' . $title . ')'; diff --git a/mod/file/views/default/file/icon/application/default.php b/mod/file/views/default/file/icon/application/default.php index eea8cbafe..d9d60901b 100644 --- a/mod/file/views/default/file/icon/application/default.php +++ b/mod/file/views/default/file/icon/application/default.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/application{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/application/excel.php b/mod/file/views/default/file/icon/application/excel.php index ba2460fec..a4123ea6e 100644 --- a/mod/file/views/default/file/icon/application/excel.php +++ b/mod/file/views/default/file/icon/application/excel.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/application/msword.php b/mod/file/views/default/file/icon/application/msword.php index 20efb1069..074f7ed91 100644 --- a/mod/file/views/default/file/icon/application/msword.php +++ b/mod/file/views/default/file/icon/application/msword.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/word{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/application/pdf.php b/mod/file/views/default/file/icon/application/pdf.php index 6a5a7369c..1aeafdb7b 100644 --- a/mod/file/views/default/file/icon/application/pdf.php +++ b/mod/file/views/default/file/icon/application/pdf.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/pdf{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/application/powerpoint.php b/mod/file/views/default/file/icon/application/powerpoint.php index 1857d513f..47a15b639 100644 --- a/mod/file/views/default/file/icon/application/powerpoint.php +++ b/mod/file/views/default/file/icon/application/powerpoint.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/application/vnd.ms-excel.php b/mod/file/views/default/file/icon/application/vnd.ms-excel.php index ba2460fec..a4123ea6e 100644 --- a/mod/file/views/default/file/icon/application/vnd.ms-excel.php +++ b/mod/file/views/default/file/icon/application/vnd.ms-excel.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/excel{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php b/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php index 1857d513f..47a15b639 100644 --- a/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php +++ b/mod/file/views/default/file/icon/application/vnd.ms-powerpoint.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/ppt{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php b/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php index d0bde81df..309977160 100644 --- a/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php +++ b/mod/file/views/default/file/icon/application/vnd.oasis.opendocument.text.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/openoffice{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/archive.php b/mod/file/views/default/file/icon/archive.php index 4fffd9346..694574e8f 100644 --- a/mod/file/views/default/file/icon/archive.php +++ b/mod/file/views/default/file/icon/archive.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/archive{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/audio.php b/mod/file/views/default/file/icon/audio.php index 73c55be7b..ce6f6ab4f 100644 --- a/mod/file/views/default/file/icon/audio.php +++ b/mod/file/views/default/file/icon/audio.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/music{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/default.php b/mod/file/views/default/file/icon/default.php index 844ee312c..ed1b71547 100644 --- a/mod/file/views/default/file/icon/default.php +++ b/mod/file/views/default/file/icon/default.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "{$CONFIG->wwwroot}mod/file/graphics/icons/general{$ext}.gif"; + echo elgg_get_site_url()."mod/file/graphics/icons/general{$ext}.gif"; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/document.php b/mod/file/views/default/file/icon/document.php index 8823514b8..fed4660fb 100644 --- a/mod/file/views/default/file/icon/document.php +++ b/mod/file/views/default/file/icon/document.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/text{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/text/directory.php b/mod/file/views/default/file/icon/text/directory.php index a08e098c6..863e53d68 100644 --- a/mod/file/views/default/file/icon/text/directory.php +++ b/mod/file/views/default/file/icon/text/directory.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/vcard{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file diff --git a/mod/file/views/default/file/icon/video.php b/mod/file/views/default/file/icon/video.php index 94617abff..db3f001f7 100644 --- a/mod/file/views/default/file/icon/video.php +++ b/mod/file/views/default/file/icon/video.php @@ -5,6 +5,6 @@ } else { $ext = ''; } - echo "wwwroot}mod/file/graphics/icons/video{$ext}.gif\" border=\"0\" />"; + echo ""; ?> \ No newline at end of file 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'); diff --git a/mod/invitefriends/actions/invite.php b/mod/invitefriends/actions/invite.php index d942bd36c..fa95ec23d 100644 --- a/mod/invitefriends/actions/invite.php +++ b/mod/invitefriends/actions/invite.php @@ -45,7 +45,7 @@ foreach ($emails as $email) { continue; } - $link = $CONFIG->wwwroot . 'pg/register?friend_guid=' . $current_user->guid . '&invitecode=' . generate_invite_code($current_user->username); + $link = elgg_get_site_url() . 'pg/register?friend_guid=' . $current_user->guid . '&invitecode=' . generate_invite_code($current_user->username); $message = sprintf(elgg_echo('invitefriends:email'), $CONFIG->site->name, $current_user->name, diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php index 41b137d53..1841135f4 100644 --- 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'),$CONFIG->wwwroot."mod/invitefriends/",'invite'); + add_submenu_item(elgg_echo('friends:invite'),elgg_get_site_url()."mod/invitefriends/",'invite'); } } diff --git a/mod/members/index.php b/mod/members/index.php index 4bcdef0fd..e85817dec 100644 --- a/mod/members/index.php +++ b/mod/members/index.php @@ -23,9 +23,9 @@ $filter = get_input("filter", "newest"); $tag = get_input('tag'); // friends links -$area1 = "