http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99357
Revision: 99357
Author: kwisatz
Date: 2011-10-09 16:09:54 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
added message to special page when already logged in
Modified Paths:
--------------
trunk/extensions/TwitterLogin/SpecialTwitterLogin.php
trunk/extensions/TwitterLogin/TwitterLogin.i18n.php
Modified: trunk/extensions/TwitterLogin/SpecialTwitterLogin.php
===================================================================
--- trunk/extensions/TwitterLogin/SpecialTwitterLogin.php 2011-10-09
16:04:47 UTC (rev 99356)
+++ trunk/extensions/TwitterLogin/SpecialTwitterLogin.php 2011-10-09
16:09:54 UTC (rev 99357)
@@ -53,18 +53,19 @@
private function _default(){
global $wgOut, $wgUser, $wgScriptPath, $wgExtensionAssetsPath;
+
$wgOut->setPagetitle("Twitter Login");
- /*
- if( $wgUser->isLoggedIn() )
- $wgOut->addWikiText( wfMsg( 'tietoaccount',
$wgUser->getName() ) );
- else
- */
- $wgOut->addWikiText( wfMsg( 'signuptwitter') );
+ if ( !$wgUser->isLoggedIn() ) {
+ $wgOut->addWikiText( wfMsg( 'signuptwitter') );
- $wgOut->addHTML( '<a href="' . $wgScriptPath .
'/index.php/Special:TwitterLogin/redirect">'
+ $wgOut->addHTML( '<a href="' . $wgScriptPath .
'/index.php/Special:TwitterLogin/redirect">'
.'<img src="' . $wgExtensionAssetsPath .
'/TwitterLogin/' .
'images/sign-in-with-twitter-d.png"/></a>' );
+ } else {
+ //$wgOut->addWikiText( wfMsg( 'tietoaccount',
$wgUser->getName() ) );
+ $wgOut->addWikiText( wfMsg( 'alreadyloggedin' ) );
+ }
return true;
}
@@ -246,7 +247,7 @@
}
}
- private function _doTwitterOAuth($at, $ats){
+ private function _doTwitterOAuth( $at, $ats ){
/* Get user access tokens out of the session. */
return new TwitterOAuth(
$this->_consumerKey,
Modified: trunk/extensions/TwitterLogin/TwitterLogin.i18n.php
===================================================================
--- trunk/extensions/TwitterLogin/TwitterLogin.i18n.php 2011-10-09 16:04:47 UTC
(rev 99356)
+++ trunk/extensions/TwitterLogin/TwitterLogin.i18n.php 2011-10-09 16:09:54 UTC
(rev 99357)
@@ -26,6 +26,7 @@
'signuptwitter' => 'You can register to this wiki using your twitter
account',
'tietoaccount' => 'You are currently logged into this wiki as
$1.<br/>You may sign in with Twitter to tie your twitter account to your
existing mediawiki account.',
'twitterlogin-desc' => 'Register and log in to a mediawiki using your
twitter account',
+ 'alreadyloggedin' => 'You\'re already logged in.',
'couldnotconnect' => 'Could not connect to Twitter. Refresh the page or
try again later.'
);
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
