| Index: trunk/extensions/OnlineStatusBar/20px-Nuvola_apps_krec.svg.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Index: trunk/extensions/OnlineStatusBar/20px-Ledorange.svg.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Index: trunk/extensions/OnlineStatusBar/20px-Ledgreen.svg.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Index: trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php |
| — | — | @@ -79,7 +79,7 @@ |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public static function IsValid( $id ) { |
| 83 | | - global $wgOnlineStatusBarDefaultIpUsers; |
| | 83 | + global $wgOnlineStatusBarDefaultIpUsers, $wgOnlineStatusBarDefaultEnabled; |
| 84 | 84 | // checks if anon |
| 85 | 85 | if ( User::isIP( $id ) ) { |
| 86 | 86 | return $wgOnlineStatusBarDefaultIpUsers; |
| — | — | @@ -90,7 +90,11 @@ |
| 91 | 91 | return false; |
| 92 | 92 | } |
| 93 | 93 | // do we track them |
| 94 | | - if ( $user->getOption( "OnlineStatusBar_active" ) == true ) { |
| | 94 | + $value = $user->getOption( "OnlineStatusBar_active" ); |
| | 95 | + if ( $value == null ) { |
| | 96 | + return $wgOnlineStatusBarDefaultEnabled; |
| | 97 | + } |
| | 98 | + if ( $value == true ) { |
| 95 | 99 | return true; |
| 96 | 100 | } |
| 97 | 101 | return false; |
| Index: trunk/extensions/OnlineStatusBar/OnlineStatusBar.i18n.php |
| — | — | @@ -17,6 +17,6 @@ |
| 18 | 18 | 'onlinestatusbar-line' => "$1 is now $2 $3", |
| 19 | 19 | 'onlinestatusbar-used' => 'Do you want to let others see if you are online?', |
| 20 | 20 | 'onlinestatusbar-status' => 'What is the default status you wish to use:', |
| 21 | | - 'prefs-gadgets' => 'Gadgets', |
| | 21 | + 'prefs-onlinestatusbar' => 'Online status bar', |
| 22 | 22 | 'prefs-onlinestatus' => 'Online Status', |
| 23 | 23 | ); |
| Index: trunk/extensions/OnlineStatusBar/statusred.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Property changes on: trunk/extensions/OnlineStatusBar/statusred.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 24 | 24 | + image/png |
| Index: trunk/extensions/OnlineStatusBar/statusorange.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Property changes on: trunk/extensions/OnlineStatusBar/statusorange.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 25 | 25 | + image/png |
| Index: trunk/extensions/OnlineStatusBar/OnlineStatusBar.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | $wgOnlineStatusBarDefaultOnline = "online"; |
| 60 | 60 | // default for offline |
| 61 | 61 | $wgOnlineStatusBarDefaultOffline = "offline"; |
| 62 | | -// if new users have this feature enabled by default (experimental) |
| | 62 | +// if users have this feature enabled by default |
| 63 | 63 | $wgOnlineStatusBarDefaultEnabled = false; |
| 64 | 64 | // how long to wait until user is considered as offline |
| 65 | 65 | $wgOnlineStatusBar_LogoutTime = 3600; |
| — | — | @@ -111,8 +111,8 @@ |
| 112 | 112 | $wgHooks['GetPreferences'][] = 'wfOnlineStatusBar_PreferencesHook'; |
| 113 | 113 | function wfOnlineStatusBar_PreferencesHook( $user, &$preferences ) { |
| 114 | 114 | global $wgOnlineStatusBarModes; |
| 115 | | - $preferences['OnlineStatusBar_active'] = array( 'type' => 'toggle', 'label-message' => 'onlinestatusbar-used', 'section' => 'gadgets/onlinestatus' ); |
| 116 | | - $preferences['OnlineStatusBar_status'] = array( 'type' => 'radio', 'label-message' => 'onlinestatusbar-status', 'section' => 'gadgets/onlinestatus', |
| | 115 | + $preferences['OnlineStatusBar_active'] = array( 'type' => 'toggle', 'label-message' => 'onlinestatusbar-used', 'section' => 'onlinestatusbar/onlinestatus' ); |
| | 116 | + $preferences['OnlineStatusBar_status'] = array( 'type' => 'radio', 'label-message' => 'onlinestatusbar-status', 'section' => 'onlinestatusbar/onlinestatus', |
| 117 | 117 | 'options' => array( |
| 118 | 118 | $wgOnlineStatusBarModes['online'] => 'online', |
| 119 | 119 | $wgOnlineStatusBarModes['busy'] => 'busy', |
| Index: trunk/extensions/OnlineStatusBar/statusgreen.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Property changes on: trunk/extensions/OnlineStatusBar/statusgreen.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 120 | 120 | + image/png |