From adae1958a95d7e801de91d673e927cac348236d9 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 10 Mar 2011 22:05:49 +0000
Subject: 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
---
 mod/twitterservice/start.php                                   |  4 ++--
 mod/twitterservice/twitterservice_lib.php                      | 10 +++++-----
 mod/twitterservice/views/default/twitterservice/login.php      |  2 +-
 .../views/default/usersettings/twitterservice/edit.php         |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'mod/twitterservice')

diff --git a/mod/twitterservice/start.php b/mod/twitterservice/start.php
index f62527593..33319a659 100644
--- a/mod/twitterservice/start.php
+++ b/mod/twitterservice/start.php
@@ -144,8 +144,8 @@ function twitterservice_fetch_tweets($user_guid, $options=array()) {
  * @param unknown_type $params
  */
 function twitterservice_public_pages($hook, $type, $return_value, $params) {
-	$return_value[] = 'pg/twitterservice/forward';
-	$return_value[] = 'pg/twitterservice/login';
+	$return_value[] = 'twitterservice/forward';
+	$return_value[] = 'twitterservice/login';
 
 	return $return_value;
 }
diff --git a/mod/twitterservice/twitterservice_lib.php b/mod/twitterservice/twitterservice_lib.php
index e58b13030..8e886f2d9 100644
--- a/mod/twitterservice/twitterservice_lib.php
+++ b/mod/twitterservice/twitterservice_lib.php
@@ -34,7 +34,7 @@ function twitterservice_forward() {
 		forward();
 	}
 
-	$callback = elgg_normalize_url("pg/twitterservice/login");
+	$callback = elgg_normalize_url("twitterservice/login");
 	$request_link = twitterservice_get_authorize_url($callback);
 
 	forward($request_link, 'twitterservice');
@@ -140,7 +140,7 @@ function twitterservice_login() {
 			$site_name = elgg_get_site_entity()->name;
 			system_message(elgg_echo('twitterservice:login:email', array($site_name)));
 
-			$forward = "pg/settings/user/{$user->username}";
+			$forward = "settings/user/{$user->username}";
 		}
 
 		// set twitter services tokens
@@ -218,7 +218,7 @@ function twitterservice_authorize() {
 	$token = twitterservice_get_access_token();
 	if (!isset($token['oauth_token']) || !isset($token['oauth_token_secret'])) {
 		register_error(elgg_echo('twitterservice:authorize:error'));
-		forward('pg/settings/plugins', 'twitterservice');
+		forward('settings/plugins', 'twitterservice');
 	}
 
 	// make sure no other users are registered to this twitter account.
@@ -251,7 +251,7 @@ function twitterservice_authorize() {
 	elgg_trigger_plugin_hook('authorize', 'twitterservice', array('token' => $token));
 
 	system_message(elgg_echo('twitterservice:authorize:success'));
-	forward('pg/settings/plugins', 'twitterservice');
+	forward('settings/plugins', 'twitterservice');
 }
 
 /**
@@ -264,7 +264,7 @@ function twitterservice_revoke() {
 	elgg_unset_plugin_user_setting('access_secret');
 
 	system_message(elgg_echo('twitterservice:revoke:success'));
-	forward('pg/settings/plugins', 'twitterservice');
+	forward('settings/plugins', 'twitterservice');
 }
 
 /**
diff --git a/mod/twitterservice/views/default/twitterservice/login.php b/mod/twitterservice/views/default/twitterservice/login.php
index 65adba1f7..d4bc04150 100644
--- a/mod/twitterservice/views/default/twitterservice/login.php
+++ b/mod/twitterservice/views/default/twitterservice/login.php
@@ -3,7 +3,7 @@
  * 
  */
 
-$url = elgg_get_site_url() . 'pg/twitterservice/forward';
+$url = elgg_get_site_url() . 'twitterservice/forward';
 $img_url = elgg_get_site_url() . 'mod/twitterservice/graphics/sign_in_with_twitter.gif';
 
 $login = <<<__HTML
diff --git a/mod/twitterservice/views/default/usersettings/twitterservice/edit.php b/mod/twitterservice/views/default/usersettings/twitterservice/edit.php
index 66f5c54f5..2a5ef8b05 100644
--- a/mod/twitterservice/views/default/usersettings/twitterservice/edit.php
+++ b/mod/twitterservice/views/default/usersettings/twitterservice/edit.php
@@ -16,7 +16,7 @@ if (!$access_key || !$access_secret) {
 	$request_link = twitterservice_get_authorize_url();
 	echo '<div>' . elgg_echo('twitterservice:usersettings:request', array($request_link, $site_name)) . '</div>';
 } else {
-	$url = elgg_get_site_url() . "pg/twitterservice/revoke";
+	$url = elgg_get_site_url() . "twitterservice/revoke";
 	echo '<div class="twitter_anywhere">' . elgg_echo('twitterservice:usersettings:authorized', array($site_name, $twitter_name)) . '</div>';
 	echo '<div>' . sprintf(elgg_echo('twitterservice:usersettings:revoke'), $url) . '</div>';
 }
-- 
cgit v1.2.3