https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115432
Revision: 115432
Author: siebrand
Date: 2012-05-25 10:44:21 +0000 (Fri, 25 May 2012)
Log Message:
-----------
stylize.php and indentation tweaks.
bumped version number.
Modified Paths:
--------------
trunk/extensions/OnlineStatus/OnlineStatus.body.php
trunk/extensions/OnlineStatus/OnlineStatus.i18n.magic.php
trunk/extensions/OnlineStatus/OnlineStatus.js
trunk/extensions/OnlineStatus/OnlineStatus.php
Modified: trunk/extensions/OnlineStatus/OnlineStatus.body.php
===================================================================
--- trunk/extensions/OnlineStatus/OnlineStatus.body.php 2012-05-25 07:01:18 UTC
(rev 115431)
+++ trunk/extensions/OnlineStatus/OnlineStatus.body.php 2012-05-25 10:44:21 UTC
(rev 115432)
@@ -8,13 +8,13 @@
* User: of User_talk: namespace.
* @return array ( string status, string username ) or null
*/
- static function GetUserStatus( $title, $checkShowPref = false ){
- if( is_object( $title ) ){
- if( !$title instanceof Title ) {
+ static function GetUserStatus( $title, $checkShowPref = false ) {
+ if ( is_object( $title ) ) {
+ if ( !$title instanceof Title ) {
return null;
}
- if( !in_array( $title->getNamespace(), array( NS_USER,
NS_USER_TALK ) ) ) {
+ if ( !in_array( $title->getNamespace(), array( NS_USER,
NS_USER_TALK ) ) ) {
return null;
}
@@ -26,36 +26,36 @@
$user = User::newFromName( $username );
- if( !$user instanceof User || $user->getId() == 0 ) {
+ if ( !$user instanceof User || $user->getId() == 0 ) {
return null;
}
- if( $checkShowPref && !$user->getOption( 'showonline' ) ) {
+ if ( $checkShowPref && !$user->getOption( 'showonline' ) ) {
return null;
}
- return array( $user->getOption( 'online' ), $username);
+ return array( $user->getOption( 'online' ), $username );
}
/**
* Used for AJAX requests
*/
- static function Ajax( $action, $stat = false ){
+ static function Ajax( $action, $stat = false ) {
global $wgUser;
- if( $wgUser->isAnon() ) {
+ if ( $wgUser->isAnon() ) {
return wfMsgHtml( 'onlinestatus-js-anon' );
}
- switch( $action ){
+ switch( $action ) {
case 'get':
$def = $wgUser->getOption( 'online' );
$msg = wfMsgForContentNoTrans( 'onlinestatus-levels' );
$lines = explode( "\n", $msg );
$radios = array();
- foreach( $lines as $line ){
- if( substr( $line, 0, 1 ) != '*' ) {
+ foreach ( $lines as $line ) {
+ if ( substr( $line, 0, 1 ) != '*' ) {
continue;
}
@@ -69,13 +69,13 @@
return json_encode( $radios );
case 'set':
- if( $stat ){
+ if ( $stat ) {
$dbw = wfGetDB( DB_MASTER );
$dbw->begin();
$actual = $wgUser->getOption( 'online' );
$wgUser->setOption( 'online', $stat );
- if( $actual != $stat ){
+ if ( $actual != $stat ) {
$wgUser->getUserPage()->invalidateCache();
$wgUser->getTalkPage()->invalidateCache();
}
@@ -83,7 +83,7 @@
$wgUser->invalidateCache();
$dbw->commit();
- return wfMsgHtml( 'onlinestatus-js-changed',
wfMsgHtml( 'onlinestatus-toggle-'.$stat ) );
+ return wfMsgHtml( 'onlinestatus-js-changed',
wfMsgHtml( 'onlinestatus-toggle-' . $stat ) );
} else {
return wfMsgHtml( 'onlinestatus-js-error',
$stat );
}
@@ -93,10 +93,10 @@
/**
* Hook for ParserFirstCallInit
*/
- static function ParserFirstCallInit( $parser ){
+ static function ParserFirstCallInit( $parser ) {
global $wgAllowAnyUserOnlineStatusFunction;
- if( $wgAllowAnyUserOnlineStatusFunction )
+ if ( $wgAllowAnyUserOnlineStatusFunction )
$parser->setFunctionHook( 'anyuseronlinestatus', array(
__CLASS__, 'ParserHookCallback' ) );
return true;
}
@@ -104,13 +104,14 @@
/**
* Callback for {{#anyuserstatus:}}
*/
- static function ParserHookCallback( &$parser, $user, $raw = false ){
+ static function ParserHookCallback( &$parser, $user, $raw = false ) {
$status = self::GetUserStatus( $user );
- if( $status === null )
+ if ( $status === null ) {
return array( 'found' => false );
+ }
- if( empty( $raw ) ){
+ if ( empty( $raw ) ) {
return wfMsgNoTrans( 'onlinestatus-toggle-' .
$status[0] );
} else {
return $status[0];
@@ -130,20 +131,20 @@
/**
* Hook function for ParserGetVariableValueSwitch
*/
- static function ParserGetVariable( &$parser, &$varCache, &$index, &$ret
){
- if( $index == 'onlinestatus_word' ){
+ static function ParserGetVariable( &$parser, &$varCache, &$index, &$ret
) {
+ if ( $index == 'onlinestatus_word' ) {
$status = self::GetUserStatus( $parser->getTitle() );
- if( $status === null ) {
+ if ( $status === null ) {
return true;
}
$ret = wfMsgNoTrans( 'onlinestatus-toggle-' .
$status[0] );
$varCache['onlinestatus'] = $ret;
- } elseif( $index == 'onlinestatus_word_raw' ){
+ } elseif ( $index == 'onlinestatus_word_raw' ) {
$status = self::GetUserStatus( $parser->getTitle() );
- if( $status === null ) {
+ if ( $status === null ) {
return true;
}
@@ -162,9 +163,11 @@
$lines = explode( "\n", $msg );
$radios = array();
- foreach( $lines as $line ){
- if( substr( $line, 0, 1 ) != '*' )
+ foreach ( $lines as $line ) {
+ if ( substr( $line, 0, 1 ) != '*' ) {
continue;
+ }
+
$lev = trim( $line, '* ' );
$radios[wfMsg( 'onlinestatus-toggle-' . $lev )] = $lev;
}
@@ -207,8 +210,8 @@
/**
* Hook for UserLoginComplete
*/
- static function UserLoginComplete( $user ){
- if( $user->getOption( 'onlineonlogin' ) ){
+ static function UserLoginComplete( $user ) {
+ if ( $user->getOption( 'onlineonlogin' ) ) {
$user->setOption( 'online', 'online' );
$user->saveSettings();
}
@@ -219,18 +222,18 @@
/**
* Hook for UserLoginComplete
*/
- static function UserLogoutComplete( &$newUser, &$injected_html,
$oldName = null ){
- if( $oldName === null ) {
+ static function UserLogoutComplete( &$newUser, &$injected_html,
$oldName = null ) {
+ if ( $oldName === null ) {
return true;
}
$oldUser = User::newFromName( $oldName );
- if( !$oldUser instanceof User ) {
+ if ( !$oldUser instanceof User ) {
return true;
}
- if( $oldUser->getOption( 'offlineonlogout' ) ){
+ if ( $oldUser->getOption( 'offlineonlogout' ) ) {
$oldUser->setOption( 'online', 'offline' );
$oldUser->saveSettings();
}
@@ -241,20 +244,20 @@
/**
* Hook function for BeforePageDisplay
*/
- static function BeforePageDisplay( &$out ){
+ static function BeforePageDisplay( &$out ) {
global $wgRequest, $wgUser, $wgUseAjax;
- if( $wgUser->isLoggedIn() && $wgUseAjax ){
+ if ( $wgUser->isLoggedIn() && $wgUseAjax ) {
$out->addModules( 'ext.onlineStatus' );
}
- if( !in_array( $wgRequest->getVal( 'action', 'view' ), array(
'view', 'purge' ) ) ) {
+ if ( !in_array( $wgRequest->getVal( 'action', 'view' ), array(
'view', 'purge' ) ) ) {
return true;
}
$status = self::GetUserStatus( $out->getTitle(), true );
- if( $status === null ) {
+ if ( $status === null ) {
return true;
}
@@ -268,17 +271,17 @@
/**
* Hook for PersonalUrls
*/
- static function PersonalUrls( &$urls, &$title ){
+ static function PersonalUrls( &$urls, &$title ) {
global $wgUser, $wgUseAjax;
# Require ajax
- if( !$wgUser->isLoggedIn() || !$wgUseAjax || $title->isSpecial(
'Preferences' ) )
+ if ( !$wgUser->isLoggedIn() || !$wgUseAjax ||
$title->isSpecial( 'Preferences' ) )
return true;
$arr = array();
- foreach( $urls as $key => $val ){
- if( $key == 'logout' ){
+ foreach ( $urls as $key => $val ) {
+ if ( $key == 'logout' ) {
$arr['status'] = array(
'text' => wfMsgHtml( 'onlinestatus-tab'
),
'href' => 'javascript:;',
Modified: trunk/extensions/OnlineStatus/OnlineStatus.i18n.magic.php
===================================================================
--- trunk/extensions/OnlineStatus/OnlineStatus.i18n.magic.php 2012-05-25
07:01:18 UTC (rev 115431)
+++ trunk/extensions/OnlineStatus/OnlineStatus.i18n.magic.php 2012-05-25
10:44:21 UTC (rev 115432)
@@ -1,6 +1,6 @@
<?php
/**
- *
+ * Internationalization file for magic words.
*/
$magicWords = array();
Modified: trunk/extensions/OnlineStatus/OnlineStatus.js
===================================================================
--- trunk/extensions/OnlineStatus/OnlineStatus.js 2012-05-25 07:01:18 UTC
(rev 115431)
+++ trunk/extensions/OnlineStatus/OnlineStatus.js 2012-05-25 10:44:21 UTC
(rev 115432)
@@ -80,4 +80,4 @@
} );
}
-hookEvent( 'load', OnlineStatus );
\ No newline at end of file
+hookEvent( 'load', OnlineStatus );
Modified: trunk/extensions/OnlineStatus/OnlineStatus.php
===================================================================
--- trunk/extensions/OnlineStatus/OnlineStatus.php 2012-05-25 07:01:18 UTC
(rev 115431)
+++ trunk/extensions/OnlineStatus/OnlineStatus.php 2012-05-25 10:44:21 UTC
(rev 115432)
@@ -18,7 +18,7 @@
'name' => 'OnlineStatus',
'author' => 'Alexandre Emsenhuber',
'url' =>
'https://www.mediawiki.org/wiki/Extension:OnlineStatus',
- 'version' => '2009-08-22',
+ 'version' => '2012-05-25',
'descriptionmsg' => 'onlinestatus-desc',
);
@@ -37,12 +37,14 @@
$wgDefaultUserOptions['onlineonlogin'] = 1;
$wgDefaultUserOptions['offlineonlogout'] = 1;
+$dir = dirname( __FILE__ ) . '/';
+
// Classes
-$wgAutoloadClasses['OnlineStatus'] = dirname( __FILE__ ) .
'/OnlineStatus.body.php';
+$wgAutoloadClasses['OnlineStatus'] = $dir . 'OnlineStatus.body.php';
// Add messages files
-$wgExtensionMessagesFiles['OnlineStatus'] = dirname( __FILE__ ) .
'/OnlineStatus.i18n.php';
-$wgExtensionMessagesFiles['OnlineStatusMagic'] = dirname( __FILE__ ) .
'/OnlineStatus.i18n.magic.php';
+$wgExtensionMessagesFiles['OnlineStatus'] = $dir . 'OnlineStatus.i18n.php';
+$wgExtensionMessagesFiles['OnlineStatusMagic'] = $dir .
'OnlineStatus.i18n.magic.php';
// Hooks for the Parser
$wgHooks['ParserFirstCallInit'][] = 'OnlineStatus::ParserFirstCallInit';
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
