GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Resolve remote subscribe and omb problems with quotes (Tickets #604 and #567)

Browse Source 
darcs-hash:20080904065504-f6e2c-f0c770f52624e7151a93f2ed2b8813657ca88c14.gz
This commit is contained in:
CiaranG 2008-09-04 02:55:04 -04:00
parent 4d1528734d
commit fff677e6c4
7 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actions/accesstoken.php
View File

@ -26,6 +26,7 @@ class AccesstokenAction extends Action {
parent::handle($args); parent::handle($args);
try { try {
common_debug('getting request from env variables', __FILE__); common_debug('getting request from env variables', __FILE__);
common_remove_magic_from_request();
$req = OAuthRequest::from_request(); $req = OAuthRequest::from_request();
common_debug('getting a server', __FILE__); common_debug('getting a server', __FILE__);
$server = omb_oauth_server(); $server = omb_oauth_server();

2
actions/finishremotesubscribe.php
View File

@ -41,6 +41,8 @@ class FinishremotesubscribeAction extends Action {
common_debug('stored request: '.print_r($omb,true), __FILE__); common_debug('stored request: '.print_r($omb,true), __FILE__);
commom_remove_magic_from_request();
$req = OAuthRequest::from_request(); $req = OAuthRequest::from_request();
$token = $req->get_parameter('oauth_token'); $token = $req->get_parameter('oauth_token');

1
actions/postnotice.php
View File

@ -25,6 +25,7 @@ class PostnoticeAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
try { try {
common_remove_magic_from_request();
$req = OAuthRequest::from_request(); $req = OAuthRequest::from_request();
# Note: server-to-server function! # Note: server-to-server function!
$server = omb_oauth_server(); $server = omb_oauth_server();

1
actions/requesttoken.php
View File

@ -30,6 +30,7 @@ class RequesttokenAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
try { try {
common_remove_magic_from_request();
$req = OAuthRequest::from_request(); $req = OAuthRequest::from_request();
$server = omb_oauth_server(); $server = omb_oauth_server();
$token = $server->fetch_request_token($req); $token = $server->fetch_request_token($req);

1
actions/updateprofile.php
View File

@ -26,6 +26,7 @@ class UpdateprofileAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
try { try {
common_remove_magic_from_request();
$req = OAuthRequest::from_request(); $req = OAuthRequest::from_request();
# Note: server-to-server function! # Note: server-to-server function!
$server = omb_oauth_server(); $server = omb_oauth_server();

1
actions/userauthorization.php
View File

@ -350,6 +350,7 @@ class UserauthorizationAction extends Action {
} }
function get_new_request() { function get_new_request() {
common_remove_magic_from_request();
$req = OAuthRequest::from_request(); $req = OAuthRequest::from_request();
return $req; return $req;
} }

9
lib/util.php
View File

@ -1424,6 +1424,15 @@ function common_copy_args($from) {
return $to; return $to;
} }
// Neutralise the evil effects of magic_quotes_gpc in the current request.
// This is used before handing a request off to OAuthRequest::from_request.
function common_remove_magic_from_request() {
if(get_magic_quotes_gpc()) {
$_POST=array_map('stripslashes',$_POST);
$_GET=array_map('stripslashes',$_GET);
}
}
function common_user_uri(&$user) { function common_user_uri(&$user) {
return common_local_url('userbyid', array('id' => $user->id)); return common_local_url('userbyid', array('id' => $user->id));
} }