aboutsummaryrefslogtreecommitdiff
path: root/mod/twitterservice
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-03 03:33:52 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-03 03:33:52 +0000
commit949a233076ec18f86e60f90a7a8837cb422664af (patch)
tree0286c9cb2c3301a164505e39dccf02a4e0a98497 /mod/twitterservice
parentd4e4268d11612408e4989a5c57f69fcb2febe8aa (diff)
downloadelgg-949a233076ec18f86e60f90a7a8837cb422664af.tar.gz
elgg-949a233076ec18f86e60f90a7a8837cb422664af.tar.bz2
Refs #2428 almost done removing CONFIG access - mostly plugin start.php left
git-svn-id: http://code.elgg.org/elgg/trunk@7999 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/twitterservice')
-rw-r--r--mod/twitterservice/start.php10
-rw-r--r--mod/twitterservice/twitterservice_lib.php6
-rw-r--r--mod/twitterservice/views/default/usersettings/twitterservice/edit.php2
3 files changed, 9 insertions, 9 deletions
diff --git a/mod/twitterservice/start.php b/mod/twitterservice/start.php
index 83e98d618..2b6e7895f 100644
--- a/mod/twitterservice/start.php
+++ b/mod/twitterservice/start.php
@@ -8,9 +8,10 @@
* @copyright Curverider Ltd 2008-2010
*/
-register_elgg_event_handler('init','system','twitterservice_init');
+register_elgg_event_handler('init', 'system', 'twitterservice_init');
+
function twitterservice_init() {
- global $CONFIG;
+
$notice_id = 'twitter_services_disable';
if (!is_plugin_enabled('oauth_lib')) {
@@ -26,8 +27,9 @@ function twitterservice_init() {
elgg_delete_admin_notice($notice_id);
// require libraries
- require_once "{$CONFIG->pluginspath}twitterservice/vendors/twitteroauth/twitterOAuth.php";
- require_once "{$CONFIG->pluginspath}twitterservice/twitterservice_lib.php";
+ $base = elgg_get_plugin_path() . 'twitterservice';
+ require_once "$base/vendors/twitteroauth/twitterOAuth.php";
+ require_once "$base/twitterservice_lib.php";
// extend site views
elgg_extend_view('metatags', 'twitterservice/metatags');
diff --git a/mod/twitterservice/twitterservice_lib.php b/mod/twitterservice/twitterservice_lib.php
index 5f8768949..0251a9208 100644
--- a/mod/twitterservice/twitterservice_lib.php
+++ b/mod/twitterservice/twitterservice_lib.php
@@ -26,21 +26,19 @@ function twitterservice_allow_sign_on_with_twitter() {
}
function twitterservice_forward() {
- global $CONFIG;
// sanity check
if (!twitterservice_allow_sign_on_with_twitter()) {
forward();
}
- $callback = "{$CONFIG->site->url}pg/twitterservice/login";
+ $callback = elgg_normalize_url("pg/twitterservice/login");
$request_link = twitterservice_get_authorize_url($callback);
forward($request_link);
}
function twitterservice_login() {
- global $CONFIG;
// sanity check
if (!twitterservice_allow_sign_on_with_twitter()) {
@@ -79,7 +77,7 @@ function twitterservice_login() {
// create new user
if (!$user) {
// check new registration allowed
- if (!$CONFIG->allow_registration) {
+ if (!elgg_get_config('allow_registration')) {
register_error(elgg_echo('registerdisabled'));
forward();
}
diff --git a/mod/twitterservice/views/default/usersettings/twitterservice/edit.php b/mod/twitterservice/views/default/usersettings/twitterservice/edit.php
index 95a2a2fd6..eb5a50969 100644
--- a/mod/twitterservice/views/default/usersettings/twitterservice/edit.php
+++ b/mod/twitterservice/views/default/usersettings/twitterservice/edit.php
@@ -15,7 +15,7 @@ if (!$access_key || !$access_secret) {
$request_link = twitterservice_get_authorize_url();
echo '<p>' . sprintf(elgg_echo('twitterservice:usersettings:request'), $request_link) . '</p>';
} else {
- $url = "{$CONFIG->site->url}pg/twitterservice/revoke";
+ $url = elgg_get_site_url() . "pg/twitterservice/revoke";
echo '<p class="twitter_anywhere">' . sprintf(elgg_echo('twitterservice:usersettings:authorized'), $twitter_name) . '</p>';
echo '<p>' . sprintf(elgg_echo('twitterservice:usersettings:revoke'), $url) . '</p>';
}