Fixes #2228: Major cleanup of urls -- remove leading pg/ and trailing / from most urls in core and plugins

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

8 files changed, 12 insertions, 12 deletions

diff --git a/mod/groups/views/default/discussion/group_module.php b/mod/groups/views/default/discussion/group_module.php
index b606579cb..cbefe8e7c 100644
--- a/mod/groups/views/default/discussion/group_module.php
+++ b/mod/groups/views/default/discussion/group_module.php
@@ -13,7 +13,7 @@ $group = $vars['entity'];
 
 
 $all_link = elgg_view('output/url', array(
-	'href' => "pg/discussion/owner/$group->guid",
+	'href' => "discussion/owner/$group->guid",
 	'text' => elgg_echo('link:view:all'),
 ));
 
@@ -38,7 +38,7 @@ if (!$content) {
 }
 
 $new_link = elgg_view('output/url', array(
-	'href' => "pg/discussion/add/" . $group->getGUID(),
+	'href' => "discussion/add/" . $group->getGUID(),
 	'text' => elgg_echo('groups:addtopic'),
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
index 2ba0e5f0e..863515a85 100644
--- a/mod/groups/views/default/groups/group_sort_menu.php
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -9,7 +9,7 @@ $group_count = (int)elgg_get_entities(array('types' => 'group', 'count' => true)
 
 $selected = elgg_extract('selected', $vars);
 	
-$url = elgg_get_site_url() . "pg/groups/all/";
+$url = elgg_get_site_url() . "groups/all";
 
 ?>
 <div class="elgg-tabs mtm">
diff --git a/mod/groups/views/default/groups/profile/activity_module.php b/mod/groups/views/default/groups/profile/activity_module.php
index 9955b598f..4ea97cad6 100644
--- a/mod/groups/views/default/groups/profile/activity_module.php
+++ b/mod/groups/views/default/groups/profile/activity_module.php
@@ -17,7 +17,7 @@ if (!$group) {
 }
 
 $all_link = elgg_view('output/url', array(
-	'href' => "pg/groups/activity/$group->guid",
+	'href' => "groups/activity/$group->guid",
 	'text' => elgg_echo('link:view:all'),
 ));
 
diff --git a/mod/groups/views/default/groups/profile/buttons.php b/mod/groups/views/default/groups/profile/buttons.php
index 836dd2982..55e99f59c 100644
--- a/mod/groups/views/default/groups/profile/buttons.php
+++ b/mod/groups/views/default/groups/profile/buttons.php
@@ -17,9 +17,9 @@ $actions = array();
 // group owners
 if ($vars['entity']->canEdit()) {
 	// edit and invite
-	$url = elgg_get_site_url() . "pg/groups/edit/{$vars['entity']->getGUID()}";
+	$url = elgg_get_site_url() . "groups/edit/{$vars['entity']->getGUID()}";
 	$actions[$url] = elgg_echo('groups:edit');
-	$url = elgg_get_site_url() . "pg/groups/invite/{$vars['entity']->getGUID()}";
+	$url = elgg_get_site_url() . "groups/invite/{$vars['entity']->getGUID()}";
 	$actions[$url] = elgg_echo('groups:invite');
 }
 
diff --git a/mod/groups/views/default/groups/side_menu.php b/mod/groups/views/default/groups/side_menu.php
index df2314689..88a56830b 100644
--- a/mod/groups/views/default/groups/side_menu.php
+++ b/mod/groups/views/default/groups/side_menu.php
@@ -6,8 +6,8 @@
 <ul class="submenu page_navigation">
 <?php
 	if(elgg_is_logged_in()){
-		echo "<li><a href=\"".elgg_get_site_url()."pg/groups/member/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:yours') ."</a></li>";
-		echo "<li><a href=\"".elgg_get_site_url()."pg/groups/invitations/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:invitations') ."</a></li>";
+		echo "<li><a href=\"".elgg_get_site_url()."groups/member/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:yours') ."</a></li>";
+		echo "<li><a href=\"".elgg_get_site_url()."groups/invitations/{elgg_get_logged_in_user_entity()->username}\">". elgg_echo('groups:invitations') ."</a></li>";
 	}
 ?>
 </ul>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/sidebar/find.php b/mod/groups/views/default/groups/sidebar/find.php
index 0d31ee711..181f437e3 100644
--- a/mod/groups/views/default/groups/sidebar/find.php
+++ b/mod/groups/views/default/groups/sidebar/find.php
@@ -4,7 +4,7 @@
  *
  * @package ElggGroups
  */
-$url = elgg_get_site_url() . 'pg/groups/world';
+$url = elgg_get_site_url() . 'groups/world';
 $body = elgg_view_form('groups/search', array('action' => $url, 'method' => 'get'));
 
 echo elgg_view_module('aside', elgg_echo('groups:searchtag'), $body);
diff --git a/mod/groups/views/default/groups/sidebar/members.php b/mod/groups/views/default/groups/sidebar/members.php
index 4fbb54456..c18366c1b 100644
--- a/mod/groups/views/default/groups/sidebar/members.php
+++ b/mod/groups/views/default/groups/sidebar/members.php
@@ -8,7 +8,7 @@
  */
 
 $all_link = elgg_view('output/url', array(
-	'href' => 'pg/groups/members/' . $vars['entity']->guid,
+	'href' => 'groups/members/' . $vars['entity']->guid,
 	'text' => elgg_echo('groups:members:more'),
 ));
 
@@ -20,4 +20,4 @@ foreach ($members as $mem) {
 $body .= '</ul>';
 $body .= "<div class='center mts'>$all_link</div>";
 
-echo elgg_view_module('aside', elgg_echo('groups:members'), $body);
\ No newline at end of file
+echo elgg_view_module('aside', elgg_echo('groups:members'), $body);
diff --git a/mod/groups/views/default/widgets/a_users_groups/content.php b/mod/groups/views/default/widgets/a_users_groups/content.php
index c15e4507e..81d355442 100644
--- a/mod/groups/views/default/widgets/a_users_groups/content.php
+++ b/mod/groups/views/default/widgets/a_users_groups/content.php
@@ -21,7 +21,7 @@ $content = elgg_list_entities_from_relationship($options);
 echo $content;
 
 if ($content) {
-	$url = "pg/group/member/" . elgg_get_page_owner_entity()->username;
+	$url = "group/member/" . elgg_get_page_owner_entity()->username;
 	$more_link = elgg_view('output/url', array(
 		'href' => $url,
 		'text' => elgg_echo('groups:more'),