Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

quick update to use user preferences on mediawiki 1.16+ #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions Facebook/Facebook.i18n.php
Expand Up @@ -170,6 +170,14 @@
We\'ve kept all of your history, edit points and achievements intact, so don\'t worry!

You can use the same username and password as you did before you connected.',
'pref-facebook-update-on-login-fullname' => 'Update full name on login',
'pref-facebook-update-on-login-gender' => 'Update gender on login',
'pref-facebook-update-on-login-nickname' => 'Update nickname on login',
'pref-facebook-update-on-login-email' => 'Update E-Mail Adress on login',
'pref-facebook-update-on-login-language' => 'Update language on login',
'pref-facebook-update-on-login-timecorrection' => 'Update timezone on login',
'prefs-facebook' => 'Facebook Connect',
'prefs-general' => 'General',
);

/**
Expand Down Expand Up @@ -461,6 +469,14 @@
'facebook-link-to-profile' => 'Facebook-Profil',
'facebook-prefsheader' => "Einstellungen zu den Aktionen, die über den eigenen Facebook-Newsfeed ausgegeben werden sollen: <a id='facebookPushEventBar_show' href='#'>Einstellungen anzeigen</a> <a id='facebookPushEventBar_hide' href='#' style='display:none'>Einstellungen ausblenden</a>",
'facebook-prefs-can-be-updated' => 'Sie können jederzeit aktualisiert werden, indem man sie unter der Registerkarte „$1“ auf der Seite Einstellungen ändert.',
'pref-facebook-update-on-login-fullname' => 'Abgleich des Bürgerlichen Namens beim Login',
'pref-facebook-update-on-login-gender' => 'Abgleich Geschlechtes des beim Login',
'pref-facebook-update-on-login-nickname' => 'Abgleich des Nickname beim Login',
'pref-facebook-update-on-login-email' => 'Abgleich der E-Mail Adresse beim Login',
'pref-facebook-update-on-login-language' => 'Abgleich der Spracheinstellungen beim Login',
'pref-facebook-update-on-login-timecorrection' => 'Abgleich der Zeitzone beim Login',
'prefs-facebook' => 'Facebook Connect',
'prefs-general' => 'Allgemein',
);

/** German (formal address) (Deutsch (Sie-Form))
Expand Down
2 changes: 1 addition & 1 deletion Facebook/Facebook.php
Expand Up @@ -105,7 +105,7 @@
$wgGroupPermissions['fb-user'] = array('facebook-user' => true);

// These hooks need to be hooked up prior to init() because runhooks may be called for them before init is run.
$wgFbHooksToAddImmediately = array( 'SpecialPage_initList', 'LanguageGetMagic' );
$wgFbHooksToAddImmediately = array( 'SpecialPage_initList', 'LanguageGetMagic', 'GetPreferences' );
foreach( $wgFbHooksToAddImmediately as $hookName ) {
$wgHooks[$hookName][] = "FacebookHooks::$hookName";
}
56 changes: 55 additions & 1 deletion Facebook/FacebookHooks.php 100644 → 100755
Expand Up @@ -474,7 +474,7 @@ private static function showLogin() {
}

/**
* Modify the user's persinal toolbar (in the upper right).
* Modify the user's personal toolbar (in the upper right).
*/
public static function PersonalUrls( &$personal_urls, &$title ) {
global $wgUser, $wgFbUseRealName, $wgFbDisableLogin;
Expand Down Expand Up @@ -908,4 +908,58 @@ static function initPreferencesExtensionForm( $user, &$preferences ) {
return true;
} // initPreferencesExtensionForm hook
/**/

public static function GetPreferences( $user, &$preferences ) {
$id = FacebookDB::getFacebookIDs($user, DB_MASTER);
if ( count($id) > 0 ) {
$preferences['facebook-update-on-login-fullname'] = array(
'type' => 'toggle',
'label-message' => 'pref-facebook-update-on-login-fullname',
'section' => 'facebook/general',
);

$preferences['facebook-update-on-login-gender'] = array(
'type' => 'toggle',
'label-message' => 'pref-facebook-update-on-login-gender',
'section' => 'facebook/general',
);

$preferences['facebook-update-on-login-nickname'] = array(
'type' => 'toggle',
'label-message' => 'pref-facebook-update-on-login-nickname',
'section' => 'facebook/general',
);

$preferences['facebook-update-on-login-email'] = array(
'type' => 'toggle',
'label-message' => 'pref-facebook-update-on-login-email',
'section' => 'facebook/general',
);

$preferences['facebook-update-on-login-language'] = array(
'type' => 'toggle',
'label-message' => 'pref-facebook-update-on-login-language',
'section' => 'facebook/general',
);

$preferences['facebook-update-on-login-timecorrection'] = array(
'type' => 'toggle',
'label-message' => 'pref-facebook-update-on-login-timecorrection',
'section' => 'facebook/general',
);
} else {
$connectlink = $user->getSkin()->link( SpecialPage::getTitleFor( 'Connect' ),
wfMsgHtml( 'facebook-connect' ), array(),
array( 'returnto' => SpecialPage::getTitleFor( 'Preferences' ) ) );

$preferences['facebook-connect'] = array(
'type' => 'info',
'raw' => true,
'default' => $connectlink,
'section' => 'facebook/general',
);
}

return true;
}
}
291 changes: 0 additions & 291 deletions Facebook/PreferencesExtension.php

This file was deleted.