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

trac750 Removed psychotic FB redirect hack. Found a better way with document.setLocation()

Browse Source
This commit is contained in:
Zach Copley 2009-01-18 21:08:56 +00:00
parent 8fdf888edb
commit aea172bee0
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actions/facebooksettings.php
View File

@ -68,18 +68,18 @@ class FacebooksettingsAction extends FacebookAction
$this->showHeader('Settings', $msg, $success); $this->showHeader('Settings', $msg, $success);
common_element('form', array('id' => 'redirect_form',
'style' => 'display: none;'));
common_element_start('p'); common_element_start('p');
// Figure what the URL of our app is.
$app_props = $facebook->api_client->Admin_getAppProperties(array('canvas_name'));
$app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/settings.php';
common_element_start('fb:prompt-permission', array('perms' => 'status_update', common_element_start('fb:prompt-permission', array('perms' => 'status_update',
'next_fbjs' => 'redirectSettings()')); 'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
common_element('h2', null, _('Allow Identi.ca to update my Facebook status')); common_element('h2', null, _('Allow Identi.ca to update my Facebook status'));
common_element_end('fb:prompt-permission'); common_element_end('fb:prompt-permission');
common_element_end('p'); common_element_end('p');
if ($facebook->api_client->users_hasAppPermission('status_update')) { if ($facebook->api_client->users_hasAppPermission('status_update')) {
common_element_start('form', array('method' => 'post', common_element_start('form', array('method' => 'post',

7
js/facebookapp.js
View File

@ -16,10 +16,3 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
// Psycho Facebook redirect hack, used because 'document.location'
// simply does not work in FBJS
function redirectSettings() {
form = document.getElementById('redirect_form');
form.setAction('settings.php');
form.submit();
}