diff options
Diffstat (limited to 'mod/groups')
22 files changed, 36 insertions, 36 deletions
diff --git a/mod/groups/actions/delete.php b/mod/groups/actions/delete.php index 7d66b2a25..2983bc2ce 100644 --- a/mod/groups/actions/delete.php +++ b/mod/groups/actions/delete.php @@ -15,5 +15,5 @@ register_error(elgg_echo('group:notdeleted')); $url_name = get_loggedin_user()->username; - forward("{$vars['url']}pg/groups/member/{$url_name}"); + forward(elgg_get_site_url()."pg/groups/member/{$url_name}"); ?>
\ No newline at end of file diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php index 3fedbd0dc..72e66480b 100644 --- a/mod/groups/views/default/forms/forums/addtopic.php +++ b/mod/groups/views/default/forms/forums/addtopic.php @@ -35,7 +35,7 @@ ?> <!-- display the input form --> -<form id="group_addtopic" action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" method="post" class="margin_top"> +<form id="group_addtopic" action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" method="post" class="margin_top"> <?php echo elgg_view('input/securitytoken'); ?> <p> diff --git a/mod/groups/views/default/forms/forums/edittopic.php b/mod/groups/views/default/forms/forums/edittopic.php index 5470299db..1426385ed 100644 --- a/mod/groups/views/default/forms/forums/edittopic.php +++ b/mod/groups/views/default/forms/forums/edittopic.php @@ -26,7 +26,7 @@ ?> <!-- display the input form --> - <form id="group_edittopic" action="<?php echo $vars['url']; ?>action/groups/edittopic" method="post"> + <form id="group_edittopic" action="<?php echo elgg_get_site_url(); ?>action/groups/edittopic" method="post"> <?php echo elgg_view('input/securitytoken'); ?> <p> diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index 5bfc0d4fb..a78e0b982 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -13,7 +13,7 @@ } ?> -<form action="<?php echo $vars['url']; ?>action/groups/edit" id="edit_group" enctype="multipart/form-data" method="post" class="margin_top"> +<form action="<?php echo elgg_get_site_url(); ?>action/groups/edit" id="edit_group" enctype="multipart/form-data" method="post" class="margin_top"> <?php echo elgg_view('input/securitytoken'); ?> @@ -150,7 +150,7 @@ if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0) if ($vars['entity']) { ?> <div class="delete_group"> - <form action="<?php echo $vars['url'] . "action/groups/delete"; ?>"> + <form action="<?php echo elgg_get_site_url() . "action/groups/delete"; ?>"> <?php echo elgg_view('input/securitytoken'); $warning = elgg_echo("groups:deletewarning"); diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php index 0cbf82454..3298a7450 100644 --- a/mod/groups/views/default/forms/groups/invite.php +++ b/mod/groups/views/default/forms/groups/invite.php @@ -12,7 +12,7 @@ if ($friends) { ?> -<form action="<?php echo $vars['url']; ?>action/groups/invite" method="post" id="invite_to_group" class="margin_top"> +<form action="<?php echo elgg_get_site_url(); ?>action/groups/invite" method="post" id="invite_to_group" class="margin_top"> <?php echo elgg_view('input/securitytoken'); diff --git a/mod/groups/views/default/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php index 03e628846..9a3cc64cb 100644 --- a/mod/groups/views/default/forum/maintopic.php +++ b/mod/groups/views/default/forum/maintopic.php @@ -26,11 +26,11 @@ if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {
echo "<div class='entity_metadata'>";
echo "<span class='delete_button'>".elgg_view("output/confirmlink",array(
- 'href' => $vars['url'] . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),
+ 'href' => elgg_get_site_url() . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm')
))."</span>";
- echo "<span class='entity_edit'><a class='link' href=\"{$vars['url']}pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";
+ echo "<span class='entity_edit'><a class='link' href=\"".elgg_get_site_url()."pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";
echo "</div>";
}
diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php index 5c1f5a099..ea6431037 100644 --- a/mod/groups/views/default/forum/topics.php +++ b/mod/groups/views/default/forum/topics.php @@ -12,7 +12,7 @@ if(elgg_get_page_owner()->isMember(get_loggedin_user())) { ?> <div class="content_header_options"> - <a class="action_button" href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo $vars['group_guid']; ?>"><?php echo elgg_echo("groups:addtopic"); ?></a> + <a class="action_button" href="<?php echo elgg_get_site_url(); ?>mod/groups/addtopic.php?group_guid=<?php echo $vars['group_guid']; ?>"><?php echo elgg_echo("groups:addtopic"); ?></a> </div> <?php } diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php index 2eb532830..f12a3f306 100644 --- a/mod/groups/views/default/forum/viewposts.php +++ b/mod/groups/views/default/forum/viewposts.php @@ -17,7 +17,7 @@ echo elgg_view('navigation/breadcrumbs'); $count = $vars['entity']->countAnnotations('group_topic_post'); $offset = (int) get_input('offset',0); -$baseurl = $vars['url'] . "mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$vars['entity']->container_guid}"; +$baseurl = elgg_get_site_url() . "mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$vars['entity']->container_guid}"; echo elgg_view('navigation/pagination',array( 'limit' => 50, 'offset' => $offset, diff --git a/mod/groups/views/default/groups/find.php b/mod/groups/views/default/groups/find.php index 534469052..659d7c5ea 100644 --- a/mod/groups/views/default/groups/find.php +++ b/mod/groups/views/default/groups/find.php @@ -8,7 +8,7 @@ $tag_string = elgg_echo('groups:search:tags'); ?> <h3><?php echo elgg_echo('groups:searchtag'); ?></h3> -<form id="groupsearchform" action="<?php echo $vars['url']; ?>pg/groups/world/" method="get"> +<form id="groupsearchform" action="<?php echo elgg_get_site_url(); ?>pg/groups/world/" method="get"> <input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" /> <input type="submit" value="<?php echo elgg_echo('go'); ?>" /> </form>
\ No newline at end of file diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php index b84a224ab..ed4e41c0d 100644 --- a/mod/groups/views/default/groups/forum_latest.php +++ b/mod/groups/views/default/groups/forum_latest.php @@ -5,7 +5,7 @@ //check to make sure this group forum has been activated if($vars['entity']->forum_enable != 'no'){ ?> -<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/groups/forum/" . 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/forum/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span> <h3><?php echo elgg_echo('groups:latestdiscussion'); ?></h3> <?php @@ -18,13 +18,13 @@ if($vars['entity']->forum_enable != 'no'){ echo "<div class='entity_listing clearfloat'>"; echo "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "</div>"; - echo "<div class='entity_listing_info'><p class='entity_title'><a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>"; + echo "<div class='entity_listing_info'><p class='entity_title'><a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>"; echo "<p class='entity_subtext'>".elgg_echo('comments').": " . $count_annotations . "</p></div>"; echo "</div>"; } } else { if(elgg_get_page_owner()->isMember(get_loggedin_user())){ - $create_discussion = $vars['url'] . "mod/groups/addtopic.php?group_guid=" . elgg_get_page_owner_guid(); + $create_discussion = elgg_get_site_url() . "mod/groups/addtopic.php?group_guid=" . elgg_get_page_owner_guid(); echo "<p class='margin_top'><a href=\"{$create_discussion}\">".elgg_echo("groups:addtopic")."</a></p>"; }else{ echo "<p class='margin_top'>". elgg_echo("grouptopic:notcreated") . "</p>"; diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php index 63af0dc07..aedb3f8e5 100644 --- a/mod/groups/views/default/groups/group_sort_menu.php +++ b/mod/groups/views/default/groups/group_sort_menu.php @@ -11,7 +11,7 @@ $filter = $vars['filter']; //url - $url = $vars['url'] . "pg/groups/world/"; + $url = elgg_get_site_url() . "pg/groups/world/"; ?> <div class="elgg_horizontal_tabbed_nav margin_top"> diff --git a/mod/groups/views/default/groups/grouplisting.php b/mod/groups/views/default/groups/grouplisting.php index 3e30259eb..1466234ab 100644 --- a/mod/groups/views/default/groups/grouplisting.php +++ b/mod/groups/views/default/groups/grouplisting.php @@ -26,10 +26,10 @@ $info .= "<p class='entity_subtext groups'>" . $mem . " / <b>" . get_group_membe //for admins only - display the feature or unfeature option if(isadminloggedin()) { if($vars['entity']->featured_group == "yes"){ - $url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action_type=unfeature"); + $url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action_type=unfeature"); $wording = elgg_echo("groups:makeunfeatured"); }else{ - $url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action_type=feature"); + $url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action_type=feature"); $wording = elgg_echo("groups:makefeatured"); } // display 'make featured' option diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php index 19f09fb2e..9d8aae8fc 100644 --- a/mod/groups/views/default/groups/groupprofile.php +++ b/mod/groups/views/default/groups/groupprofile.php @@ -7,14 +7,14 @@ $user = get_loggedin_user(); -elgg_push_breadcrumb(elgg_echo('groups:all'), "{$vars['url']}pg/groups/world"); +elgg_push_breadcrumb(elgg_echo('groups:all'), elgg_get_site_url()."pg/groups/world"); // create user actions $actions = array(); if ($vars['entity']->canEdit()) { // breadcrumb trail - elgg_push_breadcrumb(elgg_echo('groups:yours'), "{$vars['url']}pg/groups/member/{$user->username}"); + elgg_push_breadcrumb(elgg_echo('groups:yours'), elgg_get_site_url()."pg/groups/member/{$user->username}"); // edit and invite $actions["mod/groups/edit.php?group_guid={$vars['entity']->getGUID()}"] = elgg_echo('groups:edit'); @@ -23,7 +23,7 @@ if ($vars['entity']->canEdit()) { if ($vars['entity']->isMember($user)) { // breadcrumb trail - elgg_push_breadcrumb(elgg_echo('groups:yours'), "{$vars['url']}pg/groups/member/{$user->username}"); + elgg_push_breadcrumb(elgg_echo('groups:yours'), elgg_get_site_url()."pg/groups/member/{$user->username}"); // leave $url = elgg_add_action_tokens_to_url("action/groups/leave?group_guid={$vars['entity']->getGUID()}"); @@ -50,7 +50,7 @@ $action_buttons = ''; if (!empty($actions)) { $action_buttons = '<div class="content_header_options">'; foreach ($actions as $url => $action) { - $action_buttons .= "<a class=\"action_button\" href=\"{$vars['url']}$url\">$action</a>"; + $action_buttons .= "<a class=\"action_button\" href=\"".elgg_get_site_url()."$url\">$action</a>"; } $action_buttons .= '</div>'; } diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index c90a29128..297dc31d4 100644 --- a/mod/groups/views/default/groups/invitationrequests.php +++ b/mod/groups/views/default/groups/invitationrequests.php @@ -15,13 +15,13 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) { 'override' => 'true' ))."</div>"; - $url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"); + $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"); ?> <div class="entity_listing_info"> <a href="<?php echo $url; ?>" class="submit_button"><?php echo elgg_echo('accept'); ?></a> <?php echo str_replace('<a', '<a class="action_button disabled" ', elgg_view('output/confirmlink',array( - 'href' => $vars['url'] . "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}", + 'href' => elgg_get_site_url() . "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}", 'confirm' => elgg_echo('groups:invite:remove:check'), 'text' => elgg_echo('delete'), ))); diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php index b08e521cf..6dde33bd4 100644 --- a/mod/groups/views/default/groups/membershiprequests.php +++ b/mod/groups/views/default/groups/membershiprequests.php @@ -16,13 +16,13 @@ )); echo "</div>"; - $url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}"); + $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}"); ?> <div class="entity_listing_info"> <a href="<?php echo $url; ?>" class="submit_button"><?php echo elgg_echo('accept'); ?></a> <?php echo str_replace('<a', '<a class="action_button disabled" ', elgg_view('output/confirmlink',array( - 'href' => $vars['url'] . 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid, + 'href' => elgg_get_site_url() . 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid, 'confirm' => elgg_echo('groups:joinrequest:remove:check'), 'text' => elgg_echo('delete'), ))); diff --git a/mod/groups/views/default/groups/side_menu.php b/mod/groups/views/default/groups/side_menu.php index 3048ea431..99eb13a11 100644 --- a/mod/groups/views/default/groups/side_menu.php +++ b/mod/groups/views/default/groups/side_menu.php @@ -1,8 +1,8 @@ <ul class="submenu page_navigation"> <?php if(isloggedin()){ - echo "<li><a href=\"{$vars['url']}pg/groups/member/{get_loggedin_user()->username}\">". elgg_echo('groups:yours') ."</a></li>"; - echo "<li><a href=\"{$vars['url']}pg/groups/invitations/{get_loggedin_user()->username}\">". elgg_echo('groups:invitations') ."</a></li>"; + echo "<li><a href=\"".elgg_get_site_url()."pg/groups/member/{get_loggedin_user()->username}\">". elgg_echo('groups:yours') ."</a></li>"; + echo "<li><a href=\"".elgg_get_site_url()."pg/groups/invitations/{get_loggedin_user()->username}\">". elgg_echo('groups:invitations') ."</a></li>"; } ?> </ul>
\ No newline at end of file diff --git a/mod/groups/views/default/icon/group/default/large.php b/mod/groups/views/default/icon/group/default/large.php index a9d69a691..e5e30ac3e 100644 --- a/mod/groups/views/default/icon/group/default/large.php +++ b/mod/groups/views/default/icon/group/default/large.php @@ -1,3 +1,3 @@ <?php - echo $vars['url'] . "mod/groups/graphics/defaultlarge.gif"; + echo elgg_get_site_url() . "mod/groups/graphics/defaultlarge.gif"; ?>
\ No newline at end of file diff --git a/mod/groups/views/default/icon/group/default/medium.php b/mod/groups/views/default/icon/group/default/medium.php index 47cf328b8..f7bd9376d 100644 --- a/mod/groups/views/default/icon/group/default/medium.php +++ b/mod/groups/views/default/icon/group/default/medium.php @@ -1,3 +1,3 @@ <?php - echo $vars['url'] . "mod/groups/graphics/defaultmedium.gif"; + echo elgg_get_site_url() . "mod/groups/graphics/defaultmedium.gif"; ?>
\ No newline at end of file diff --git a/mod/groups/views/default/icon/group/default/small.php b/mod/groups/views/default/icon/group/default/small.php index b052c1cc3..2a0ef7d93 100644 --- a/mod/groups/views/default/icon/group/default/small.php +++ b/mod/groups/views/default/icon/group/default/small.php @@ -1,3 +1,3 @@ <?php - echo $vars['url'] . "mod/groups/graphics/defaultsmall.gif"; + echo elgg_get_site_url() . "mod/groups/graphics/defaultsmall.gif"; ?>
\ No newline at end of file diff --git a/mod/groups/views/default/icon/group/default/tiny.php b/mod/groups/views/default/icon/group/default/tiny.php index 1023d06e2..2920da6b6 100644 --- a/mod/groups/views/default/icon/group/default/tiny.php +++ b/mod/groups/views/default/icon/group/default/tiny.php @@ -1,3 +1,3 @@ <?php - echo $vars['url'] . "mod/groups/graphics/defaulttiny.gif"; + echo elgg_get_site_url() . "mod/groups/graphics/defaulttiny.gif"; ?>
\ No newline at end of file diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 2fdf24723..9729c9d83 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -36,7 +36,7 @@ if (get_context() == "search") { //get the group avatar $icon = elgg_view("profile/icon",array('entity' => $u, 'size' => 'tiny')); //get the group and topic title - $info .= "<p class='entity_subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>"; + $info .= "<p class='entity_subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>"; if ($group instanceof ElggGroup) { $info .= "<p class='entity_title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>"; } @@ -47,20 +47,20 @@ if (get_context() == "search") { }else{ $info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created'), $forum_created, $counter) . "</p>"; } - $info .= "<p class='entity_title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>"; + $info .= "<p class='entity_title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>"; if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) { // display the delete link to those allowed to delete $info .= "<div class='entity_metadata'>"; $info .= '<span class="entity_edit">' . elgg_view("output/url", array( - 'href' => $vars['url'] . "mod/groups/edittopic.php?group={$vars['entity']->container_guid}&topic={$vars['entity']->guid}", + 'href' => elgg_get_site_url() . "mod/groups/edittopic.php?group={$vars['entity']->container_guid}&topic={$vars['entity']->guid}", 'text' => elgg_echo('edit'), )); $info .= '</span>'; // display the delete link to those allowed to delete $info .= '<span class="delete_button">' . elgg_view("output/confirmlink", array( - 'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid, + 'href' => elgg_get_site_url() . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), )); diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php index 09b2a3483..bb38e1cf3 100644 --- a/mod/groups/views/default/river/forum/topic/create.php +++ b/mod/groups/views/default/river/forum/topic/create.php @@ -6,7 +6,7 @@ $forumtopic = $object->guid; $group_guid = $object->container_guid; $group = get_entity($group_guid); - $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; //$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc"); //foreach($comment as $c){ $contents = $object->description; |