[MediaWiki-CVS] SVN: [100500] trunk/extensions/Gadgets/Gadgets_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100500 Revision: 100500 Author: liangent Date: 2011-10-22 05:59:55 + (Sat, 22 Oct 2011) Log Message: --- Followup r100497: Indention tweak Modified Paths: -- trunk/extensions/Gadgets/Gadgets_body.php Modified: trunk/extensions/Gadgets/Gadgets_body.php === --- trunk/extensions/Gadgets/Gadgets_body.php 2011-10-22 05:06:54 UTC (rev 100499) +++ trunk/extensions/Gadgets/Gadgets_body.php 2011-10-22 05:59:55 UTC (rev 100500) @@ -165,7 +165,7 @@ } } $out-addHeadItem( 'ext.gadget', $out-makeResourceLoaderLink( $styles, - ResourceLoaderModule::TYPE_STYLES + ResourceLoaderModule::TYPE_STYLES ) ); $lb-execute( __METHOD__ ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100501] trunk/extensions
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100501 Revision: 100501 Author: petrb Date: 2011-10-22 16:47:57 + (Sat, 22 Oct 2011) Log Message: --- Work in progress, extension which adds a status if user is online, there is still a lot to do, also it's my first extension so it's little bit ugly :) Added Paths: --- trunk/extensions/OnlineStatusBar/ trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php trunk/extensions/OnlineStatusBar/OnlineStatusBar.i18n.php trunk/extensions/OnlineStatusBar/OnlineStatusBar.php trunk/extensions/OnlineStatusBar/OnlineStatusBar.sql Added: trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php === --- trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php (rev 0) +++ trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php 2011-10-22 16:47:57 UTC (rev 100501) @@ -0,0 +1,88 @@ +? +if ( !defined( 'MEDIAWIKI' ) ) { + echo This is a part of mediawiki and can't be started separately; +die(); +} + +/** + * Main file of Online status bar extension. + * + * @file + * @ingroup Extensions + * @author Petr Bena benap...@gmail.com + * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + * @link http://www.mediawiki.org/wiki/Extension:OnlineStatusBar Documentation + */ + +class OnlineStatusBar { + public static $Timeout = 8000; + + private static function GetNow() + { + return gmdate('Ymdhis', time()); + } + + public static function Get_Html( $text, $mode) + { + global $wgOnlineStatusBarModes, $wgOnlineStatusBarColor; + $color= $wgOnlineStatusBarColor[$mode]; + return 'div style=border: 0px solid black; background: transparent; float: right; position: relative; top:-3px; padding: 5pxpb' . $text . ': span style=color: ' . $color . '; font:bold;img alt=Ledorange.svg src=//upload.wikimedia.org/wikipedia/commons/thumb/5/5c/Ledorange.svg/20px-Ledorange.svg.png width=20 height=20 /' . $wgOnlineStatusBarModes[$mode] . '/span/b/p/div'; + } + + + static function UpdateDb($user, $db) + { +global $wgUser, $wgDBname, $wgOnlineStatusBarTable; +if ( OnlineStatusBar::GetStatus($wgUser-getID()) != $OnlineStatusBar-DefaultOnline ) +{ +$db = wfGetDB( DB_MASTER ); +$db-SelectDB( $wgDBname ); +$now = OnlineStatusBar::GetNow(); +$row = array( +'userid' = $wgUser-getID(), +'username' = $wgUser-getName(), +'timestamp' = $now, +); +$db-insert( $wgOnlineStatusBarTable, $row, __METHOD__, 'DELAYED' ); +} + + return false; + } + + public static function DeleteOld() + { + global $wgOnlineStatusBarTable, $wgDBname; +$db = wfGetDB ( DB_MASTER ); +$time = OnlineStatusBar::GetNow() - $Timeout; +$db-SelectDB( $wgDBname ); +$db-delete( $wgOnlineStatusBarTable, array( 'timestamp ' . $time . '' ) ,__METHOD__ ); + return 0; + } + + static function GetStatus( $userID ) { + global $wgOnlineStatusBarTable, $wgOnlineStatusBarModes, $wgOnlineStatusBarDefaultOffline, $wgOnlineStatusBarDefaultOnline, $wgDBname; + $db = wfGetDB ( DB_MASTER ); + OnlineStatusBar::DeleteOld(); + $db-SelectDB( $wgDBname ); + $result = $db-select( $wgOnlineStatusBarTable, array ('userid', 'username', 'timestamp'), array('username' = $userID), __METHOD__, array('limit 1', 'order by timestamp desc')); + $values = new ResultWrapper ($db, $result); + + if ($values-numRows() 0) + { + return $wgOnlineStatusBarDefaultOnline; + } + + return $wgOnlineStatusBarDefaultOffline; + } + + static function DeleteStatus( $user ) + { + global $wgOnlineStatusBarTable, $wgDBname; + $db = wfGetDB ( DB_MASTER ); + $db-SelectDB( $wgDBname ); + $db-delete( $wgOnlineStatusBarTable, array ('username' = $user), __METHOD__ ); // delete user + return true; + } +} + +? Property changes on: trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php ___ Added: svn:eol-style + native Added: trunk/extensions/OnlineStatusBar/OnlineStatusBar.i18n.php === ---
[MediaWiki-CVS] SVN: [100502] trunk/extensions/ArticleFeedback/modules/ext.articleFeedback
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100502 Revision: 100502 Author: robin Date: 2011-10-22 17:01:04 + (Sat, 22 Oct 2011) Log Message: --- (bug 31410) ArticleFeedback widget displays at top of page in cologneblue [and nostalgia] skin There was already an exception for the standard skin which has a similar layout where the catlinks are at the top of the page Modified Paths: -- trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js Modified: trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js === --- trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js 2011-10-22 16:47:57 UTC (rev 100501) +++ trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js 2011-10-22 17:01:04 UTC (rev 100502) @@ -327,7 +327,7 @@ // Put on bottom of article before #catlinks (if it exists) // Except in Classic, which has #catlinks above the article but inside content-div. -if ( $( '#catlinks' ).length mw.config.get( 'skin' ) != 'standard' ) { +if ( $( '#catlinks' ).length !mw.config.get( 'skin' ) in ['standard', 'cologneblue', 'nostalgia'] ) { $aftDiv.insertBefore( '#catlinks' ); } else { // CologneBlue, Nostalgia, ... Modified: trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js === --- trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js 2011-10-22 16:47:57 UTC (rev 100501) +++ trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js 2011-10-22 17:01:04 UTC (rev 100502) @@ -25,8 +25,6 @@ mw.util.getParamValue( 'redirect' ) != 'no' // Not viewing the printable version mw.util.getParamValue( 'printable' ) != 'yes' - // Not using CologneBlue skin (see bug 31410) -mw.config.get( 'skin' ) != 'cologneblue' ) { // Assign a tracking bucket using options from wgArticleFeedbackTracking mw.user.bucket( ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100503] trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ ext.articleFeedback.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100503 Revision: 100503 Author: robin Date: 2011-10-22 17:17:17 + (Sat, 22 Oct 2011) Log Message: --- follow-up r100502: this works (I don't know much Javascript/jQuery :p) Modified Paths: -- trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js Modified: trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js === --- trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js 2011-10-22 17:01:04 UTC (rev 100502) +++ trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js 2011-10-22 17:17:17 UTC (rev 100503) @@ -326,8 +326,9 @@ var $aftDiv = $( 'div id=mw-articlefeedback/div' ).articleFeedback( config ); // Put on bottom of article before #catlinks (if it exists) -// Except in Classic, which has #catlinks above the article but inside content-div. -if ( $( '#catlinks' ).length !mw.config.get( 'skin' ) in ['standard', 'cologneblue', 'nostalgia'] ) { +// Except in legacy skins, which have #catlinks above the article but inside content-div. +var legacyskins = [ 'standard', 'cologneblue', 'nostalgia' ]; +if ( $( '#catlinks' ).length $.inArray( mw.config.get( 'skin' ), legacyskins ) 0 ) { $aftDiv.insertBefore( '#catlinks' ); } else { // CologneBlue, Nostalgia, ... ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100504] trunk/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs .config.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100504 Revision: 100504 Author: hartman Date: 2011-10-22 17:21:03 + (Sat, 22 Oct 2011) Log Message: --- Fix bug 31604. Table should now load the tablesorter if needed, and make sure that the table is sortable. Modified Paths: -- trunk/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js Modified: trunk/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js === --- trunk/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js 2011-10-22 17:17:17 UTC (rev 100503) +++ trunk/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js 2011-10-22 17:21:03 UTC (rev 100504) @@ -779,8 +779,11 @@ .addClass( 'sortable' ) .insertAfter( $( '#wikieditor-toolbar-table-preview' ) ) .hide(); - if ( typeof jQuery.fn.tablesorter == 'function' ) - $( '#wikieditor-toolbar-table-preview2' ).tablesorter(); + + mw.loader.using( 'jquery.tablesorter', function() { + $( '#wikieditor-toolbar-table-preview2' ).tablesorter(); + }); + $( '#wikieditor-toolbar-table-sortable' ).click( function() { // Swap the currently shown one clone with the other one $( '#wikieditor-toolbar-table-preview' ) ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100505] trunk/phase3/languages/messages/MessagesEn.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100505 Revision: 100505 Author: rotem Date: 2011-10-22 17:35:20 + (Sat, 22 Oct 2011) Log Message: --- Typo. Modified Paths: -- trunk/phase3/languages/messages/MessagesEn.php Modified: trunk/phase3/languages/messages/MessagesEn.php === --- trunk/phase3/languages/messages/MessagesEn.php 2011-10-22 17:21:03 UTC (rev 100504) +++ trunk/phase3/languages/messages/MessagesEn.php 2011-10-22 17:35:20 UTC (rev 100505) @@ -3139,7 +3139,7 @@ 'proxyblocker'= 'Proxy blocker', 'proxyblocker-disabled' = 'This function is disabled.', 'proxyblockreason'= 'Your IP address has been blocked because it is an open proxy. -Please contact your Internet service provider or technical support of your oranization and inform them of this serious security problem.', +Please contact your Internet service provider or technical support of your organization and inform them of this serious security problem.', 'proxyblocksuccess' = 'Done.', 'sorbs' = 'DNSBL', # only translate this message to other languages if you have to change it 'sorbsreason' = 'Your IP address is listed as an open proxy in the DNSBL used by {{SITENAME}}.', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100506] trunk/extensions/CheckUser
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100506 Revision: 100506 Author: johnduhart Date: 2011-10-22 17:44:14 + (Sat, 22 Oct 2011) Log Message: --- Moved CheckUser log stuff into a separate special page Modified Paths: -- trunk/extensions/CheckUser/CheckUser.alias.php trunk/extensions/CheckUser/CheckUser.i18n.php trunk/extensions/CheckUser/CheckUser.php trunk/extensions/CheckUser/CheckUser_body.php Added Paths: --- trunk/extensions/CheckUser/CheckUserLogPager.php trunk/extensions/CheckUser/SpecialCheckUserLog.php Modified: trunk/extensions/CheckUser/CheckUser.alias.php === --- trunk/extensions/CheckUser/CheckUser.alias.php 2011-10-22 17:35:20 UTC (rev 100505) +++ trunk/extensions/CheckUser/CheckUser.alias.php 2011-10-22 17:44:14 UTC (rev 100506) @@ -11,6 +11,7 @@ /** English (English) */ $specialPageAliases['en'] = array( 'CheckUser' = array( 'CheckUser' ), + 'CheckUserLog' = array( 'CheckUserLog' ), ); /** Arabic (العربية) */ Modified: trunk/extensions/CheckUser/CheckUser.i18n.php === --- trunk/extensions/CheckUser/CheckUser.i18n.php 2011-10-22 17:35:20 UTC (rev 100505) +++ trunk/extensions/CheckUser/CheckUser.i18n.php 2011-10-22 17:44:14 UTC (rev 100506) @@ -20,6 +20,7 @@ 'checkuser-desc' = 'Grants users with the appropriate permission the ability to check user\'s IP addresses and other information', 'checkuser-logcase' = 'The log search is case sensitive.', 'checkuser' = 'Check user', + 'checkuserlog' = 'Check user log', 'checkuser-contribs' = 'check user IP addresses', 'group-checkuser'= 'Check users', 'group-checkuser-member' = '{{GENDER:$1|check user}}', @@ -29,7 +30,6 @@ 'checkuser-reason' = 'Reason:', 'checkuser-reason-api' = 'API: $1', 'checkuser-showlog' = 'Show log', - 'checkuser-log' = 'CheckUser log', 'checkuser-query'= 'Query recent changes', 'checkuser-target' = 'IP address or username:', 'checkuser-users'= 'Get users', @@ -124,6 +124,7 @@ 'checkuser' = 'Check user extension. The name of the special page where checkusers can check the IP addresses of users. The message is used in the list of special pages, and at the top of [[Special:Checkuser]]. {{Identical|Check user}}', + 'checkuserlog' = 'The name of the special page where checkusers can look at a log of past checkuser actions. The message is used in the list of special pages, and at the top of [[Special:CheckUserLog]].', 'group-checkuser' = '{{doc-group|checkuser}} check is a noun, not a verb here Modified: trunk/extensions/CheckUser/CheckUser.php === --- trunk/extensions/CheckUser/CheckUser.php2011-10-22 17:35:20 UTC (rev 100505) +++ trunk/extensions/CheckUser/CheckUser.php2011-10-22 17:44:14 UTC (rev 100506) @@ -81,9 +81,13 @@ // Set up the new special page $wgSpecialPages['CheckUser'] = 'CheckUser'; $wgSpecialPageGroups['CheckUser'] = 'users'; +$wgSpecialPages['CheckUserLog'] = 'SpecialCheckUserLog'; +$wgSpecialPageGroups['CheckUserLog'] = 'changes'; $wgAutoloadClasses['CheckUser'] = $dir . '/CheckUser_body.php'; $wgAutoloadClasses['CheckUserHooks'] = $dir . '/CheckUser.hooks.php'; +$wgAutoloadClasses['CheckUserLogPager'] = $dir . '/CheckUserLogPager.php'; +$wgAutoloadClasses['SpecialCheckUserLog'] = $dir . '/SpecialCheckUserLog.php'; // API modules $wgAutoloadClasses['ApiQueryCheckUser'] = $dir/api/ApiQueryCheckUser.php; Added: trunk/extensions/CheckUser/CheckUserLogPager.php === --- trunk/extensions/CheckUser/CheckUserLogPager.php (rev 0) +++ trunk/extensions/CheckUser/CheckUserLogPager.php2011-10-22 17:44:14 UTC (rev 100506) @@ -0,0 +1,89 @@ +?php + +class CheckUserLogPager extends ReverseChronologicalPager { + var $searchConds, $specialPage, $y, $m; + + function __construct( $specialPage, $searchConds, $y, $m ) { + parent::__construct(); + /* + $this-messages = array_map( 'wfMsg', + array( 'comma-separator', 'checkuser-log-userips', 'checkuser-log-ipedits', 'checkuser-log-ipusers', + 'checkuser-log-ipedits-xff', 'checkuser-log-ipusers-xff' ) );*/ + + $this-getDateCond( $y, $m ); + $this-searchConds = $searchConds ? $searchConds : array(); + $this-specialPage = $specialPage; + } + + function formatRow( $row ) { + global $wgLang; + + $skin
[MediaWiki-CVS] SVN: [100507] trunk/extensions/OnlineStatusBar
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100507 Revision: 100507 Author: petrb Date: 2011-10-22 17:50:45 + (Sat, 22 Oct 2011) Log Message: --- fixed timeout value Modified Paths: -- trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php trunk/extensions/OnlineStatusBar/OnlineStatusBar.php Modified: trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php === --- trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php 2011-10-22 17:44:14 UTC (rev 100506) +++ trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php 2011-10-22 17:50:45 UTC (rev 100507) @@ -15,8 +15,6 @@ */ class OnlineStatusBar { - public static $Timeout = 8000; - private static function GetNow() { return gmdate('Ymdhis', time()); @@ -29,8 +27,7 @@ return 'div style=border: 0px solid black; background: transparent; float: right; position: relative; top:-3px; padding: 5pxpb' . $text . ': span style=color: ' . $color . '; font:bold;img alt=Ledorange.svg src=//upload.wikimedia.org/wikipedia/commons/thumb/5/5c/Ledorange.svg/20px-Ledorange.svg.png width=20 height=20 /' . $wgOnlineStatusBarModes[$mode] . '/span/b/p/div'; } - - static function UpdateDb($user, $db) + static function UpdateDb() { global $wgUser, $wgDBname, $wgOnlineStatusBarTable; if ( OnlineStatusBar::GetStatus($wgUser-getID()) != $OnlineStatusBar-DefaultOnline ) @@ -48,12 +45,29 @@ return false; } + + static function UpdateStatus() + { + global $wgUser, $wgDBname, $wgOnlineStatusBarDefaultOffline, $wgOnlineStatusBarTable; + $now = OnlineStatusBar::GetNow(); + if (OnlineStatusBar::GetStatus() != $wgOnlineStatusBarDefaultOffline) + { + OnlineStatusBar::UpdateDb(); + return true; + } + $db = wfGetDB ( DB_MASTER ); +$db-SelectDB( $wgDBname ); +$db-update($wgOnlineStatusBarTable, array ('timestamp' = $now), array ('username' = $wgUser-getName()), __METHOD__ ); + +return false; + } + public static function DeleteOld() { - global $wgOnlineStatusBarTable, $wgDBname; + global $wgOnlineStatusBarTable, $wgOnlineStatusBar_LogoutTime, $wgDBname; $db = wfGetDB ( DB_MASTER ); -$time = OnlineStatusBar::GetNow() - $Timeout; +$time = OnlineStatusBar::GetNow() - $wgOnlineStatusBar_LogoutTime; $db-SelectDB( $wgDBname ); $db-delete( $wgOnlineStatusBarTable, array( 'timestamp ' . $time . '' ) ,__METHOD__ ); return 0; Modified: trunk/extensions/OnlineStatusBar/OnlineStatusBar.php === --- trunk/extensions/OnlineStatusBar/OnlineStatusBar.php2011-10-22 17:44:14 UTC (rev 100506) +++ trunk/extensions/OnlineStatusBar/OnlineStatusBar.php2011-10-22 17:50:45 UTC (rev 100507) @@ -82,6 +82,7 @@ function wfOnlineStatusBar_RenderBar($article, $outputDone, $pcache) { global $wgOnlineStatusBar_Template, $messages, $wgOnlineStatusBarModes, $wgOut; + OnlineStatusBar::UpdateStatus(); $ns=$article-getTitle()-getNamespace(); if(($ns == 3) || ($ns == 2)) { ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100508] trunk/extensions/OnlineStatusBar
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100508 Revision: 100508 Author: petrb Date: 2011-10-22 18:52:16 + (Sat, 22 Oct 2011) Log Message: --- colored icon Modified Paths: -- trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php trunk/extensions/OnlineStatusBar/OnlineStatusBar.php Modified: trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php === --- trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php 2011-10-22 17:50:45 UTC (rev 100507) +++ trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php 2011-10-22 18:52:16 UTC (rev 100508) @@ -22,9 +22,9 @@ public static function Get_Html( $text, $mode) { - global $wgOnlineStatusBarModes, $wgOnlineStatusBarColor; + global $wgOnlineStatusBarModes, $wgOnlineStatusBarIcon, $wgOnlineStatusBarColor; $color= $wgOnlineStatusBarColor[$mode]; - return 'div style=border: 0px solid black; background: transparent; float: right; position: relative; top:-3px; padding: 5pxpb' . $text . ': span style=color: ' . $color . '; font:bold;img alt=Ledorange.svg src=//upload.wikimedia.org/wikipedia/commons/thumb/5/5c/Ledorange.svg/20px-Ledorange.svg.png width=20 height=20 /' . $wgOnlineStatusBarModes[$mode] . '/span/b/p/div'; + return 'div style=border: 0px solid black; background: transparent; float: right; position: relative; top:-3px; padding: 5pxpb' . $text . ': span style=color: ' . $color . '; font:bold;img alt=Ledorange.svg src=' . $wgOnlineStatusBarIcon[$mode] . ' width=20 height=20 /' . $wgOnlineStatusBarModes[$mode] . '/span/b/p/div'; } static function UpdateDb() Modified: trunk/extensions/OnlineStatusBar/OnlineStatusBar.php === --- trunk/extensions/OnlineStatusBar/OnlineStatusBar.php2011-10-22 17:50:45 UTC (rev 100507) +++ trunk/extensions/OnlineStatusBar/OnlineStatusBar.php2011-10-22 18:52:16 UTC (rev 100508) @@ -37,6 +37,14 @@ 'offline' = Offline, ); +$wgOnlineStatusBarIcon = array ( + 'online' = //upload.wikimedia.org/wikipedia/commons/thumb/c/cc/Ledgreen.svg/20px-Ledgreen.svg.png, + 'busy' = //upload.wikimedia.org/wikipedia/commons/thumb/5/5c/Ledorange.svg/20px-Ledorange.svg.png, + 'away' = //upload.wikimedia.org/wikipedia/commons/thumb/5/5c/Ledorange.svg/20px-Ledorange.svg.png, + 'hidden' = //upload.wikimedia.org/wikipedia/commons/thumb/6/60/Nuvola_apps_krec.svg/20px-Nuvola_apps_krec.svg.png, + 'offline' = //upload.wikimedia.org/wikipedia/commons/thumb/6/60/Nuvola_apps_krec.svg/20px-Nuvola_apps_krec.svg.png, +); + $wgOnlineStatusBarColor = array ( 'online' = green, 'busy' = orange, ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100509] trunk/extensions/Gadgets
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100509 Revision: 100509 Author: liangent Date: 2011-10-22 19:09:25 + (Sat, 22 Oct 2011) Log Message: --- (bug 31414) Skin specific gadgets Modified Paths: -- trunk/extensions/Gadgets/ApiQueryGadgets.php trunk/extensions/Gadgets/Gadgets.i18n.php trunk/extensions/Gadgets/Gadgets_body.php trunk/extensions/Gadgets/SpecialGadgets.php Modified: trunk/extensions/Gadgets/ApiQueryGadgets.php === --- trunk/extensions/Gadgets/ApiQueryGadgets.php2011-10-22 18:52:16 UTC (rev 100508) +++ trunk/extensions/Gadgets/ApiQueryGadgets.php2011-10-22 19:09:25 UTC (rev 100509) @@ -119,6 +119,7 @@ return array( 'settings' = array( 'rights' = $g-getRequiredRights(), + 'skins' = $g-getRequiredSkins(), 'default' = $g-isOnByDefault(), 'hidden' = false, // Only exists in RL2 branch 'shared' = false, // Only exists in RL2 branch @@ -136,6 +137,7 @@ private function setIndexedTagNameForMetadata( $metadata ) { static $tagNames = array( 'rights' = 'right', + 'skins' = 'skin', 'scripts' = 'script', 'styles' = 'style', 'dependencies' = 'dependency', Modified: trunk/extensions/Gadgets/Gadgets.i18n.php === --- trunk/extensions/Gadgets/Gadgets.i18n.php 2011-10-22 18:52:16 UTC (rev 100508) +++ trunk/extensions/Gadgets/Gadgets.i18n.php 2011-10-22 19:09:25 UTC (rev 100509) @@ -36,6 +36,7 @@ 'gadgets-required-rights' = 'Requires the following {{PLURAL:$2|right|rights}}: $1', + 'gadgets-required-skins' = 'Available on the {{PLURAL:$2|$1 skin|following skins: $1}}.', 'gadgets-default' = 'Enabled for everyone by default.', 'gadgets-export'= 'Export', 'gadgets-export-title' = 'Gadget export', @@ -72,6 +73,9 @@ 'gadgets-required-rights' = 'Parameters: * $1 - a list in wikitext. * $2 - the number of items in list $1 for PLURAL use.', + 'gadgets-required-skins' = 'Parameters: +* $1 - a comma list. +* $2 - the number of items in list $1 for PLURAL use.', 'gadgets-export' = 'Used on [[Special:Gadgets]]. This is a verb, not noun. {{Identical|Export}}', 'gadgets-export-download' = 'Use the verb for this message. Submit button. Modified: trunk/extensions/Gadgets/Gadgets_body.php === --- trunk/extensions/Gadgets/Gadgets_body.php 2011-10-22 18:52:16 UTC (rev 100508) +++ trunk/extensions/Gadgets/Gadgets_body.php 2011-10-22 19:09:25 UTC (rev 100509) @@ -239,6 +239,7 @@ $definition, $resourceLoaded = false, $requiredRights = array(), + $requiredSkins = array(), $onByDefault = false, $category; @@ -280,6 +281,9 @@ case 'rights': $gadget-requiredRights = $params; break; + case 'skins': + $gadget-requiredSkins = array_intersect( array_keys( Skin::getSkinNames() ), $params ); + break; case 'default': $gadget-onByDefault = true; break; @@ -359,7 +363,8 @@ * @return Boolean */ public function isAllowed( $user ) { - return count( array_intersect( $this-requiredRights, $user-getRights() ) ) == count( $this-requiredRights ); + return count( array_intersect( $this-requiredRights, $user-getRights() ) ) == count( $this-requiredRights ) +( !count( $this-requiredSkins ) || in_array( $user-getOption( 'skin' ), $this-requiredSkins ) ); } /** @@ -466,6 +471,14 @@ } /** +* Returns array of skins where this gadget works +* @return Array +*/ + public function getRequiredSkins() { + return $this-requiredSkins; + } + + /** * Loads and returns a list of all gadgets * @return Mixed: Array of gadgets or false */ Modified: trunk/extensions/Gadgets/SpecialGadgets.php === --- trunk/extensions/Gadgets/SpecialGadgets.php 2011-10-22 18:52:16 UTC (rev 100508) +++ trunk/extensions/Gadgets/SpecialGadgets.php 2011-10-22 19:09:25 UTC
[MediaWiki-CVS] SVN: [100510] trunk/phase3/includes/ChangesList.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100510 Revision: 100510 Author: hartman Date: 2011-10-22 19:50:43 + (Sat, 22 Oct 2011) Log Message: --- Follow up to r79085. Fixes bug 31408. There was a typo, causing the minoredit tag not to show up in the enhanced recentchanges. Modified Paths: -- trunk/phase3/includes/ChangesList.php Modified: trunk/phase3/includes/ChangesList.php === --- trunk/phase3/includes/ChangesList.php 2011-10-22 19:09:25 UTC (rev 100509) +++ trunk/phase3/includes/ChangesList.php 2011-10-22 19:50:43 UTC (rev 100510) @@ -1103,7 +1103,7 @@ } else { $r .= $this-recentChangesFlags( array( 'newpage' = $type == RC_NEW, - 'mino' = $rcObj-mAttribs['rc_minor'], + 'minor' = $rcObj-mAttribs['rc_minor'], 'unpatrolled' = $rcObj-unpatrolled, 'bot' = $rcObj-mAttribs['rc_bot'], ) ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100511] trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100511 Revision: 100511 Author: petrb Date: 2011-10-22 19:56:25 + (Sat, 22 Oct 2011) Log Message: --- comparison fix Modified Paths: -- trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php Modified: trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php === --- trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php 2011-10-22 19:50:43 UTC (rev 100510) +++ trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php 2011-10-22 19:56:25 UTC (rev 100511) @@ -50,7 +50,7 @@ { global $wgUser, $wgDBname, $wgOnlineStatusBarDefaultOffline, $wgOnlineStatusBarTable; $now = OnlineStatusBar::GetNow(); - if (OnlineStatusBar::GetStatus() != $wgOnlineStatusBarDefaultOffline) + if (OnlineStatusBar::GetStatus() == $wgOnlineStatusBarDefaultOffline) { OnlineStatusBar::UpdateDb(); return true; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100512] trunk/phase3/includes/HTMLForm.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100512 Revision: 100512 Author: johnduhart Date: 2011-10-22 20:03:40 + (Sat, 22 Oct 2011) Log Message: --- Adding functions to HTMLForm for setting the submitText and WrapperLegend to messages instead of having to use wfMsg every single time Modified Paths: -- trunk/phase3/includes/HTMLForm.php Modified: trunk/phase3/includes/HTMLForm.php === --- trunk/phase3/includes/HTMLForm.php 2011-10-22 19:56:25 UTC (rev 100511) +++ trunk/phase3/includes/HTMLForm.php 2011-10-22 20:03:40 UTC (rev 100512) @@ -581,6 +581,14 @@ } /** +* Set the text for the submit button to a message +* @param $msg String message key +*/ + public function setSubmitTextMsg( $msg ) { + return $this-setSubmitText( wfMsg( $msg ) ); + } + + /** * Get the text for the submit button, either customised or a default. * @return unknown_type */ @@ -619,6 +627,15 @@ public function setWrapperLegend( $legend ) { $this-mWrapperLegend = $legend; } /** +* Prompt the whole form to be wrapped in a fieldset, with +* this message as its legend element. +* @param $msg String message key +*/ + public function setWrapperLegendMsg( $msg ) { + return $this-setWrapperLegend( wfMsg( $msg ) ); + } + + /** * Set the prefix for various default messages * TODO: currently only used for the fieldset legend on forms * with multiple sections; should be used elsewhre? @@ -1357,6 +1374,8 @@ return $p; } + print_r( $value ); + $validOptions = HTMLFormField::flattenOptions( $this-mParams['options'] ); if ( in_array( $value, $validOptions ) ) @@ -1382,10 +1401,54 @@ $select-setAttribute( 'disabled', 'disabled' ); } + if ( !empty( $this-mParams['multiple'] ) ) { + $select-setAttribute( 'name', $this-mName . '[]' ); + $select-setAttribute( 'multiple', 'multiple' ); + + if ( !empty( $this-mParams['size'] ) ) { + $select-setAttribute( 'size', $this-mParams['size'] ); + } + } + $select-addOptions( $this-mParams['options'] ); return $select-getHTML(); } + + /** +* @param $request WebRequest +* @return String +*/ + function loadDataFromRequest( $request ) { + if ( $this-mParent-getMethod() == 'post' ) { + if( $request-wasPosted() ){ + # Checkboxes are just not added to the request arrays if they're not checked, + # so it's perfectly possible for there not to be an entry at all + return $request-getArray( $this-mName, array() ); + } else { + # That's ok, the user has not yet submitted the form, so show the defaults + return $this-getDefault(); + } + } else { + # This is the impossible case: if we look at $_GET and see no data for our + # field, is it because the user has not yet submitted the form, or that they + # have submitted it with all the options unchecked? We will have to assume the + # latter, which basically means that you can't specify 'positive' defaults + # for GET forms. + # @todo FIXME... + return $request-getArray( $this-mName, array() ); + } + } + + public static function keysAreValues( $array ) { + $resultArray = array(); + + foreach ( $array as $name = $value ) { + $resultArray[$value] = $value; + } + + return $resultArray; + } } /** @@ -1861,7 +1924,7 @@ $this-mParent-addHiddenField( $this-mName, - $this-mDefault, + $value, $params ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100513] trunk/phase3/includes/HTMLForm.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100513 Revision: 100513 Author: johnduhart Date: 2011-10-22 20:10:41 + (Sat, 22 Oct 2011) Log Message: --- Removing extra stuff that was committed in r100512 Modified Paths: -- trunk/phase3/includes/HTMLForm.php Modified: trunk/phase3/includes/HTMLForm.php === --- trunk/phase3/includes/HTMLForm.php 2011-10-22 20:03:40 UTC (rev 100512) +++ trunk/phase3/includes/HTMLForm.php 2011-10-22 20:10:41 UTC (rev 100513) @@ -1374,8 +1374,6 @@ return $p; } - print_r( $value ); - $validOptions = HTMLFormField::flattenOptions( $this-mParams['options'] ); if ( in_array( $value, $validOptions ) ) @@ -1401,54 +1399,10 @@ $select-setAttribute( 'disabled', 'disabled' ); } - if ( !empty( $this-mParams['multiple'] ) ) { - $select-setAttribute( 'name', $this-mName . '[]' ); - $select-setAttribute( 'multiple', 'multiple' ); - - if ( !empty( $this-mParams['size'] ) ) { - $select-setAttribute( 'size', $this-mParams['size'] ); - } - } - $select-addOptions( $this-mParams['options'] ); return $select-getHTML(); } - - /** -* @param $request WebRequest -* @return String -*/ - function loadDataFromRequest( $request ) { - if ( $this-mParent-getMethod() == 'post' ) { - if( $request-wasPosted() ){ - # Checkboxes are just not added to the request arrays if they're not checked, - # so it's perfectly possible for there not to be an entry at all - return $request-getArray( $this-mName, array() ); - } else { - # That's ok, the user has not yet submitted the form, so show the defaults - return $this-getDefault(); - } - } else { - # This is the impossible case: if we look at $_GET and see no data for our - # field, is it because the user has not yet submitted the form, or that they - # have submitted it with all the options unchecked? We will have to assume the - # latter, which basically means that you can't specify 'positive' defaults - # for GET forms. - # @todo FIXME... - return $request-getArray( $this-mName, array() ); - } - } - - public static function keysAreValues( $array ) { - $resultArray = array(); - - foreach ( $array as $name = $value ) { - $resultArray[$value] = $value; - } - - return $resultArray; - } } /** @@ -1924,7 +1878,7 @@ $this-mParent-addHiddenField( $this-mName, - $value, + $this-mDefault, $params ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100515] trunk/phase3/RELEASE-NOTES-1.19
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100515 Revision: 100515 Author: robin Date: 2011-10-22 20:48:59 + (Sat, 22 Oct 2011) Log Message: --- Allowing moving - allow moving; use past tense Modified Paths: -- trunk/phase3/RELEASE-NOTES-1.19 Modified: trunk/phase3/RELEASE-NOTES-1.19 === --- trunk/phase3/RELEASE-NOTES-1.19 2011-10-22 20:29:38 UTC (rev 100514) +++ trunk/phase3/RELEASE-NOTES-1.19 2011-10-22 20:48:59 UTC (rev 100515) @@ -100,18 +100,18 @@ * (bug 30684) Fix bad escaping in mw.message for inexistent messages (i.e. key) * (bug 23057) Importers no longer can 'edit' or 'create' a fully-protected page by importing a new revision into it -* Allowing moving the associated talk pages of subpages even if the base page +* Allow moving the associated talk pages of subpages even if the base page has no subpage. * (bug 30907) Special:Unusedcategories should sort ascendingly. * Per page edit-notices now work in namespaces without subpages enabled. * (bug 30245) Use the correct way to construct a log page title -* (bug 31081) $wgEnotifUseJobQ causes many unnecessary jobs to be queued +* (bug 31081) $wgEnotifUseJobQ caused many unnecessary jobs to be queued * (bug 30202) File names are now restricted on upload to 240 bytes, because of restrictions on some of the database fields. * Timezones are now recognised in user preferences when offset is different due to DST * (bug 31692) summary parameter now also work when undoing revisions -* (bug 18823) move succeeded text displays bluelinks even when redirect was +* (bug 18823) move succeeded text displayed bluelinks even when redirect was suppressed === API changes in 1.19 === ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100516] trunk/extensions/CentralAuth/specials/SpecialGlobalUsers.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100516 Revision: 100516 Author: hartman Date: 2011-10-22 20:55:23 + (Sat, 22 Oct 2011) Log Message: --- Fix links on SpecialGlobalUsers, which were pointing to ListUsers instead of GlobalUsers. Followup to r97658. Fixes bug 31638 Modified Paths: -- trunk/extensions/CentralAuth/specials/SpecialGlobalUsers.php Modified: trunk/extensions/CentralAuth/specials/SpecialGlobalUsers.php === --- trunk/extensions/CentralAuth/specials/SpecialGlobalUsers.php 2011-10-22 20:48:59 UTC (rev 100515) +++ trunk/extensions/CentralAuth/specials/SpecialGlobalUsers.php 2011-10-22 20:55:23 UTC (rev 100516) @@ -9,7 +9,7 @@ global $wgOut, $wgRequest, $wgContLang; $this-setHeaders(); - $pg = new GlobalUsersPager(); + $pg = new GlobalUsersPager( $this-getContext(), $par ); if ( $par ) { $pg-setGroup( $par ); @@ -33,8 +33,8 @@ class GlobalUsersPager extends UsersPager { protected $requestedGroup = false, $requestedUser; - function __construct() { - parent::__construct(); + function __construct( IContextSource $context = null, $par = null ) { + parent::__construct( $context, $par ); $this-mDb = CentralAuthUser::getCentralSlaveDB(); } ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100517] trunk/extensions/OnlineStatusBar
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100517 Revision: 100517 Author: petrb Date: 2011-10-22 21:19:10 + (Sat, 22 Oct 2011) Log Message: --- included pictures although the path is now taken with workaround as I couldn't find better way Modified Paths: -- trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php trunk/extensions/OnlineStatusBar/OnlineStatusBar.i18n.php trunk/extensions/OnlineStatusBar/OnlineStatusBar.php Added Paths: --- trunk/extensions/OnlineStatusBar/20px-Ledgreen.svg.png trunk/extensions/OnlineStatusBar/20px-Ledorange.svg.png trunk/extensions/OnlineStatusBar/20px-Nuvola_apps_krec.svg.png Added: trunk/extensions/OnlineStatusBar/20px-Ledgreen.svg.png === (Binary files differ) Property changes on: trunk/extensions/OnlineStatusBar/20px-Ledgreen.svg.png ___ Added: svn:mime-type + image/png Added: trunk/extensions/OnlineStatusBar/20px-Ledorange.svg.png === (Binary files differ) Property changes on: trunk/extensions/OnlineStatusBar/20px-Ledorange.svg.png ___ Added: svn:mime-type + image/png Added: trunk/extensions/OnlineStatusBar/20px-Nuvola_apps_krec.svg.png === (Binary files differ) Property changes on: trunk/extensions/OnlineStatusBar/20px-Nuvola_apps_krec.svg.png ___ Added: svn:mime-type + image/png Modified: trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php === --- trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php 2011-10-22 20:55:23 UTC (rev 100516) +++ trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php 2011-10-22 21:19:10 UTC (rev 100517) @@ -73,6 +73,14 @@ return 0; } + static function GetFileUrl($name) + { + // fix me + global $wgScriptPath; + $url = $wgScriptPath . /extensions . $name; + return $url; + } + static function GetStatus( $userID ) { global $wgOnlineStatusBarTable, $wgOnlineStatusBarModes, $wgOnlineStatusBarDefaultOffline, $wgOnlineStatusBarDefaultOnline, $wgDBname; $db = wfGetDB ( DB_MASTER ); Modified: trunk/extensions/OnlineStatusBar/OnlineStatusBar.i18n.php === --- trunk/extensions/OnlineStatusBar/OnlineStatusBar.i18n.php 2011-10-22 20:55:23 UTC (rev 100516) +++ trunk/extensions/OnlineStatusBar/OnlineStatusBar.i18n.php 2011-10-22 21:19:10 UTC (rev 100517) @@ -13,6 +13,6 @@ */ $messages['en'] = array( 'onlinestatusbar-desc' = Status bar which shows whether a user is online, based on preferences, on their user page, -'onlinestatusbar-line' = is now , +'onlinestatusbar-line' = is now, ); ? Modified: trunk/extensions/OnlineStatusBar/OnlineStatusBar.php === --- trunk/extensions/OnlineStatusBar/OnlineStatusBar.php2011-10-22 20:55:23 UTC (rev 100516) +++ trunk/extensions/OnlineStatusBar/OnlineStatusBar.php2011-10-22 21:19:10 UTC (rev 100517) @@ -36,15 +36,13 @@ 'hidden' = Offline, 'offline' = Offline, ); - $wgOnlineStatusBarIcon = array ( - 'online' = //upload.wikimedia.org/wikipedia/commons/thumb/c/cc/Ledgreen.svg/20px-Ledgreen.svg.png, - 'busy' = //upload.wikimedia.org/wikipedia/commons/thumb/5/5c/Ledorange.svg/20px-Ledorange.svg.png, - 'away' = //upload.wikimedia.org/wikipedia/commons/thumb/5/5c/Ledorange.svg/20px-Ledorange.svg.png, - 'hidden' = //upload.wikimedia.org/wikipedia/commons/thumb/6/60/Nuvola_apps_krec.svg/20px-Nuvola_apps_krec.svg.png, - 'offline' = //upload.wikimedia.org/wikipedia/commons/thumb/6/60/Nuvola_apps_krec.svg/20px-Nuvola_apps_krec.svg.png, + 'online' = OnlineStatusBar::GetFileUrl( /OnlineStatusBar/20px-Ledgreen.svg.png ), + 'busy' = OnlineStatusBar::GetFileUrl( /OnlineStatusBar/20px-Ledorange.svg.png ), + 'away' = OnlineStatusBar::GetFileUrl( /OnlineStatusBar/20px-Ledorange.svg.png ), + 'hidden' = OnlineStatusBar::GetFileUrl( /OnlineStatusBar/20px-Nuvola_apps_krec.svg.png), + 'offline' = OnlineStatusBar::GetFileUrl( /OnlineStatusBar/20px-Nuvola_apps_krec.svg.png), ); - $wgOnlineStatusBarColor = array ( 'online' = green, 'busy' = orange, ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100518] trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100518 Revision: 100518 Author: aaron Date: 2011-10-22 22:05:55 + (Sat, 22 Oct 2011) Log Message: --- Comment fixes Modified Paths: -- trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki Modified: trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki === --- trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2011-10-22 21:19:10 UTC (rev 100517) +++ trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2011-10-22 22:05:55 UTC (rev 100518) @@ -3,7 +3,7 @@ error_reporting( E_ALL ); /** * Automatically SVN checkout a MediaWiki version and do some basic wmf setup. - * LocalSettings.php will be created (which loads CommonSettings.php) and verious + * LocalSettings.php will be created (which loads CommonSettings.php) and various * symlinks will also be created. * * The first argument is the SVN directory (relative to mediawiki/branches/wmf). @@ -11,8 +11,7 @@ * The second argument is the target path (relative to /home/wikipedia/common/) * to store local copy of the SVN checkout. This is typically of the format php-X.XX. * - * The script will not run if files already existing in the target directory. - * Also, assume the user running this script must have an SVN account + * This script assumes that the user running this script has an SVN account * with the SSH agent/key available. * * @return void ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100519] trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100519 Revision: 100519 Author: aaron Date: 2011-10-22 22:17:02 + (Sat, 22 Oct 2011) Log Message: --- Simplified code a bit by using $destIP more Modified Paths: -- trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki Modified: trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki === --- trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2011-10-22 22:05:55 UTC (rev 100518) +++ trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2011-10-22 22:17:02 UTC (rev 100519) @@ -26,7 +26,7 @@ $svnVersion = $argv[1]; // e.g. X.XXwmfX $dstVersion = $argv[2]; // e.g. php-X.XX if ( preg_match( '/^php-((?:\d+\.\d+|trunk)(?:-\w+)?)$/', $dstVersion, $m ) ) { - $dstVersionNum = $m[1]; + $dstVersionNum = $m[1]; // everything after 'php-' $argsValid = true; } } @@ -118,7 +118,7 @@ createSymlink( $path, $link, Created live-1.5/resources-$dstVersionNum symlink. ); # Create libs symlinks... - $libDir = $commonHomeDir/php-$dstVersionNum/lib; + $libDir = $destIP/lib; if ( !file_exists( $libDir ) ) { mkdir( $libDir, 0775 ); } @@ -132,7 +132,7 @@ } # Create l10n cache dir - $l10nDir = $commonHomeDir/php-$dstVersionNum/cache/l10n; + $l10nDir = $destIP/cache/l10n; if ( !file_exists( $l10nDir ) ) { if ( mkdir( $l10nDir, 0775 ) ) { print Created php-$dstVersionNum/cache/l10n directory.\n; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100520] trunk/extensions/RecordAdmin/RecordAdmin_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100520 Revision: 100520 Author: platonides Date: 2011-10-22 22:19:53 + (Sat, 22 Oct 2011) Log Message: --- Escape html Modified Paths: -- trunk/extensions/RecordAdmin/RecordAdmin_body.php Modified: trunk/extensions/RecordAdmin/RecordAdmin_body.php === --- trunk/extensions/RecordAdmin/RecordAdmin_body.php 2011-10-22 22:17:02 UTC (rev 100519) +++ trunk/extensions/RecordAdmin/RecordAdmin_body.php 2011-10-22 22:19:53 UTC (rev 100520) @@ -87,7 +87,7 @@ # Add a tab for each type with a form filled in with the parameters from its template call $jsFormsList = array(); $tabset = div class=\tabset\; - $tabset .= fieldsetlegend . wfMsg( 'recordadmin-properties' ) . /legend; + $tabset .= fieldsetlegend . wfMsgHtml( 'recordadmin-properties' ) . /legend; $tabset .= wfMsg( 'recordadmin-edit-info', $wgRequest-appendQuery( 'nora=1' ) ) . /fieldset; foreach( $records as $type = $record ) { $jsFormsList[] = '$type'; @@ -95,7 +95,7 @@ $this-examineForm(); $values = $this-valuesFromText( $record ); $this-populateForm( $values ); - $tabset .= fieldsetlegend$type . strtolower( wfMsg( 'recordadmin-properties' ) ) . /legend\n; + $tabset .= fieldsetlegend$type . strtolower( wfMsgHtml( 'recordadmin-properties' ) ) . /legend\n; $tabset .= form id=\ . strtolower($type) . -form\ class=\{$this-formClass}\{$this-formAtts}$this-form/form\n; $tabset .= /fieldset; } @@ -303,7 +303,7 @@ */ function renderRecords( $records, $cols = false, $sortable = true, $template = false, $name = 'wpSelect', $export = true, $groupby = false ) { global $wgOut, $wgParser, $wgTitle, $wgRequest; - if( count( $records ) 1 ) return wfMsg( 'recordadmin-nomatch' ); + if( count( $records ) 1 ) return wfMsgHtml( 'recordadmin-nomatch' ); if( $groupby ) $groupby = self::split( $groupby, ',' ); $type = $this-type; @@ -324,11 +324,11 @@ # Table header (col0-3 class atts are for backward compatibility, only use named from now on) $table = table$id class='recordadmin$sortable $type-record'\ntr; $th = array( - 'select' = th class='col-select'. wfMsg( 'recordadmin-select' ) . $br/th, - 'title'= th class='col0 col-title'. wfMsg( 'recordadmin-title', $type ) . $br/th, - 'actions' = th class='col1 col-actions' . wfMsg( 'recordadmin-actions' ) . $br/th, - 'created' = th class='col2 col-created' . wfMsg( 'recordadmin-created' ) . $br/th, - 'modified' = th class='col3 col-modified' . wfMsg( 'recordadmin-modified' ) . $br/th + 'select' = th class='col-select'. wfMsgHtml( 'recordadmin-select' ) . $br/th, + 'title'= th class='col0 col-title'. wfMsgHtml( 'recordadmin-title', $type ) . $br/th, + 'actions' = th class='col1 col-actions' . wfMsgHtml( 'recordadmin-actions' ) . $br/th, + 'created' = th class='col2 col-created' . wfMsgHtml( 'recordadmin-created' ) . $br/th, + 'modified' = th class='col3 col-modified' . wfMsgHtml( 'recordadmin-modified' ) . $br/th ); foreach( array_keys( $this-types ) as $col ) { $class = 'col' . preg_replace( |\W|, -, $col ); @@ -353,13 +353,13 @@ $tmp = array(); foreach( $records as $k1 = $v1 ) { if( empty( $k1 ) ) { - $k1 = wfMsg( 'recordadmin-notset', $groupby[0] ); + $k1 = wfMsgHtml( 'recordadmin-notset', $groupby[0] ); } $tmp[] = $tdh2$k1/h2/td\n; foreach( $v1 as $k2 = $v2 ) { if( isset( $groupby[1] ) ) { if( empty( $k2 ) ) { - $k2 = wfMsg( 'recordadmin-notset', $groupby[1] ); + $k2 = wfMsgHtml( 'recordadmin-notset', $groupby[1] ); }
[MediaWiki-CVS] SVN: [100521] trunk/extensions/RecordAdmin
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100521 Revision: 100521 Author: platonides Date: 2011-10-22 22:34:46 + (Sat, 22 Oct 2011) Log Message: --- Convert recordadmin-edit-info into a wikitext message. Modified Paths: -- trunk/extensions/RecordAdmin/RecordAdmin.i18n.php trunk/extensions/RecordAdmin/RecordAdmin_body.php Modified: trunk/extensions/RecordAdmin/RecordAdmin.i18n.php === --- trunk/extensions/RecordAdmin/RecordAdmin.i18n.php 2011-10-22 22:19:53 UTC (rev 100520) +++ trunk/extensions/RecordAdmin/RecordAdmin.i18n.php 2011-10-22 22:34:46 UTC (rev 100521) @@ -54,7 +54,7 @@ 'recordadmin-export-csv' = 'CSV', 'recordadmin-export-pdf' = 'PDF', 'recordadmin-notset' = 'No $1', - 'recordadmin-edit-info' = 'This page contains templates which have their own forms that you can fill in from this tab-set.br /Alternatively a href=$1use the normal MediaWiki edit functionality without template forms/a.', + 'recordadmin-edit-info' = 'This page contains templates which have their own forms that you can fill in from this tab-set.br /Alternatively [$1 use the normal MediaWiki edit functionality without template forms].', 'recordadmin-properties' = 'Properties', ); @@ -128,7 +128,7 @@ 'recordadmin-export-csv' = 'CSV', 'recordadmin-export-pdf' = 'PDF', 'recordadmin-notset' = 'Geen $1', - 'recordadmin-edit-info' = 'Hierdie bladsy lys sjablone wat hul eie vorms wat ingevul kan word bevat.br / U kan ook die a href=$1normale MediaWiki fasiliteite sonder sjabloonvorms gebruik/a.', + 'recordadmin-edit-info' = 'Hierdie bladsy lys sjablone wat hul eie vorms wat ingevul kan word bevat.br / U kan ook die [$1 normale MediaWiki fasiliteite sonder sjabloonvorms gebruik].', 'recordadmin-properties' = 'Eienskappe', ); @@ -312,7 +312,7 @@ 'recordadmin-export-csv' = 'CSV', 'recordadmin-export-pdf' = 'PDF', 'recordadmin-notset' = 'Няма $1', - 'recordadmin-edit-info' = 'Гэтая старонка ўтрымлівае шаблёны, якія маюць уласныя формы, якія Вы можаце запоўніць з гэтага набору закладак.br /Націсьніце, a href=$1калі Вы жадаеце выкарыстоўваць звычайнае рэдагаваньне MediaWiki без шаблённых формаў/a.', + 'recordadmin-edit-info' = 'Гэтая старонка ўтрымлівае шаблёны, якія маюць уласныя формы, якія Вы можаце запоўніць з гэтага набору закладак.br /Націсьніце, [$1 калі Вы жадаеце выкарыстоўваць звычайнае рэдагаваньне MediaWiki без шаблённых формаў].', 'recordadmin-properties' = 'Уласьцівасьці', ); @@ -406,7 +406,7 @@ 'recordadmin-export-csv' = 'CSV', 'recordadmin-export-pdf' = 'PDF', 'recordadmin-notset' = '$1 ebet', - 'recordadmin-edit-info' = 'Er bajenn-mañ ez eus patromoù dezho o furmskridoù o-unan a c\'hallit leuniañ adalek an strobad ivinelloù-mañ.br /Gallout a rit iveza href=$1ober gant arc\'hwelioù kemmañ boas MediaWiki hep furmskridoù ar patromoù/a.', + 'recordadmin-edit-info' = 'Er bajenn-mañ ez eus patromoù dezho o furmskridoù o-unan a c\'hallit leuniañ adalek an strobad ivinelloù-mañ.br /Gallout a rit ivez[$1 ober gant arc\'hwelioù kemmañ boas MediaWiki hep furmskridoù ar patromoù].', 'recordadmin-properties' = 'Perzhioù', ); @@ -452,7 +452,7 @@ 'recordadmin-export-csv' = 'CSV', 'recordadmin-export-pdf' = 'PDF', 'recordadmin-notset' = 'Bez $1', - 'recordadmin-edit-info' = 'Ova stranica sadrži šablone sa vlastitim obrascima koje možete popuniti iz ovog seta jezičaka.br /Alternativno a href=$1koristite normalni MediaWiki uređivač koji radi bez šablonskih obrazaca/a.', + 'recordadmin-edit-info' = 'Ova stranica sadrži šablone sa vlastitim obrascima koje možete popuniti iz ovog seta jezičaka.br /Alternativno [$1 koristite normalni MediaWiki uređivač koji radi bez šablonskih obrazaca].', 'recordadmin-properties' = 'Svojstva', ); @@ -545,7 +545,7 @@ 'recordadmin-export-csv' = 'CSV', 'recordadmin-export-pdf' = 'PDF', 'recordadmin-notset' = 'Keine „$1“', - 'recordadmin-edit-info' = 'Diese Seite enthält Vorlagen, die über eigene Bearbeitungsformulare verfügen.br /a href=$1Hier/a klicken, um den regulären Bearbeitungsmodus von MediaWiki zu verwenden.', + 'recordadmin-edit-info' = 'Diese Seite enthält Vorlagen, die über eigene Bearbeitungsformulare verfügen.br /[$1 Hier] klicken, um den regulären Bearbeitungsmodus von MediaWiki zu verwenden.', 'recordadmin-properties' = 'Attribute', ); @@ -600,7 +600,7 @@ 'recordadmin-export-csv' = 'CSV', 'recordadmin-export-pdf' = 'PDF', 'recordadmin-notset' = 'Žeden $1', - 'recordadmin-edit-info' = 'Toś ten bok wopśimujo pśedłogi, kótarež maju swójske formulary, kótarež móžoš z toś teje sajźby rejtarkow wupołniś.br /Klikni a href=$1sem/a, aby normalnu
[MediaWiki-CVS] SVN: [100522] trunk/tools/mwmultiversion/multiversion
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100522 Revision: 100522 Author: aaron Date: 2011-10-22 22:41:36 + (Sat, 22 Oct 2011) Log Message: --- Added a script to remove symlinks for an obsolete MW version Modified Paths: -- trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki Added Paths: --- trunk/tools/mwmultiversion/multiversion/deleteMediaWiki Modified: trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki === --- trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2011-10-22 22:34:46 UTC (rev 100521) +++ trunk/tools/mwmultiversion/multiversion/checkoutMediaWiki 2011-10-22 22:41:36 UTC (rev 100522) @@ -35,13 +35,15 @@ die( Usage: checkoutMediaWiki X.XXwmfX php-X.XX\n ); } - echo Creating new MediaWiki install at $commonHomeDir/$dstVersion...\n\n; + # MW install path + $destIP = $commonHomeDir/$dstVersion; + echo Creating new MediaWiki install at $destIP...\n\n; + # The url to SVN to checkout from $source = svn+ssh://svn.wikimedia.org/svnroot/mediawiki/branches/wmf/$svnVersion; # Create the destination path to SVN checkout to... - $destIP = $commonHomeDir/$dstVersion; if ( file_exists( $destIP ) ) { print Skipping checkout, the directory $destIP already exists.\n; } else { Added: trunk/tools/mwmultiversion/multiversion/deleteMediaWiki === --- trunk/tools/mwmultiversion/multiversion/deleteMediaWiki (rev 0) +++ trunk/tools/mwmultiversion/multiversion/deleteMediaWiki 2011-10-22 22:41:36 UTC (rev 100522) @@ -0,0 +1,67 @@ +#!/usr/bin/env php +?php +error_reporting( E_ALL ); +/** + * Delete various symlinks created by checkoutMediaWiki. + * + * The first argument is target path (relative to /home/wikipedia/common/) + * storing the local copy of the SVN checkout. This is typically of the format php-X.XX. + * + * @return void + */ +function deleteMediaWiki() { + global $argv; + $commonHomeDir = '/home/wikipedia/common'; + + $argsValid = false; + if ( count( $argv ) = 2 ) { + $dstVersion = $argv[1]; // e.g. php-X.XX + if ( preg_match( '/^php-((?:\d+\.\d+|trunk)(?:-\w+)?)$/', $dstVersion, $m ) ) { + $dstVersionNum = $m[1]; // everything after 'php-' + $argsValid = true; + } + } + + if ( !$argsValid ) { + die( Usage: deleteMediaWiki php-X.XX\n ); + } + + # MW install path + $destIP = $commonHomeDir/$dstVersion; + + echo Deleting symlink files for MediaWiki install at $destIP...\n\n; + + # Check the destination path of the SVN checkout... + if ( !file_exists( $destIP ) ) { + die( No MediaWiki install at $destIP.\n ); + } + + # Destroy symlinks created by checkoutMediaWiki outside of $destIP + $symlinks = array( + $commonHomeDir/docroot/bits/skins-$dstVersionNum, + $commonHomeDir/docroot/bits/w/extensions-$dstVersionNum, + $commonHomeDir/docroot/secure/skins-$dstVersionNum, + $commonHomeDir/live-1.5/extensions-$dstVersionNum, + $commonHomeDir/live-1.5/skins-$dstVersionNum, + $commonHomeDir/live-1.5/resources-$dstVersionNum + ); + foreach ( $symlinks as $path ) { + deleteSymlink( $path ); + } + + print \nReferences to MediaWiki $dstVersionNum deleted.\n; +} + +function deleteSymlink( $path ) { + if ( !file_exists( $path ) ) { + print Symlink file already removed: $path\n; + } elseif ( filetype( $path ) !== 'link' ) { // sanity + print Expected symlink file is not actually a symlink: $path\n; + } else { + if ( unlink( $path ) ) { + print Symlink file removed: $path\n; + } + } +} + +deleteMediaWiki(); Property changes on: trunk/tools/mwmultiversion/multiversion/deleteMediaWiki ___ Added: svn:executable + * Added: svn:eol-style + native ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100523] trunk/phase3/includes/HTMLForm.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100523 Revision: 100523 Author: johnduhart Date: 2011-10-23 01:10:23 + (Sun, 23 Oct 2011) Log Message: --- Follow up r100512, adding @since tags and using wfMessage Modified Paths: -- trunk/phase3/includes/HTMLForm.php Modified: trunk/phase3/includes/HTMLForm.php === --- trunk/phase3/includes/HTMLForm.php 2011-10-22 22:41:36 UTC (rev 100522) +++ trunk/phase3/includes/HTMLForm.php 2011-10-23 01:10:23 UTC (rev 100523) @@ -582,10 +582,11 @@ /** * Set the text for the submit button to a message +* @since 1.19 * @param $msg String message key */ public function setSubmitTextMsg( $msg ) { - return $this-setSubmitText( wfMsg( $msg ) ); + return $this-setSubmitText( wfMessage( $msg )-escaped() ); } /** @@ -629,10 +630,11 @@ /** * Prompt the whole form to be wrapped in a fieldset, with * this message as its legend element. +* @since 1.19 * @param $msg String message key */ public function setWrapperLegendMsg( $msg ) { - return $this-setWrapperLegend( wfMsg( $msg ) ); + return $this-setWrapperLegend( wfMessage( $msg )-escaped() ); } /** ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100524] trunk/extensions/Contest/resources/contest.special.welcome. css
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100524 Revision: 100524 Author: bharris Date: 2011-10-23 02:12:44 + (Sun, 23 Oct 2011) Log Message: --- Fix hover state of arrow from being orange to blue. Modified Paths: -- trunk/extensions/Contest/resources/contest.special.welcome.css Modified: trunk/extensions/Contest/resources/contest.special.welcome.css === --- trunk/extensions/Contest/resources/contest.special.welcome.css 2011-10-23 01:10:23 UTC (rev 100523) +++ trunk/extensions/Contest/resources/contest.special.welcome.css 2011-10-23 02:12:44 UTC (rev 100524) @@ -82,7 +82,6 @@ background-position: right center; background-repeat: no-repeat; } -.mw-codechallenge-box-outside:hover .mw-codechallenge-box-text, .mw-codechallenge-box-outside:focus .mw-codechallenge-box-text, .mw-codechallenge-box-selected .mw-codechallenge-box-text { /* @embed */ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [100525] branches/wmf/1.18wmf1/extensions/Contest/resources/contest. special.welcome.css
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100525 Revision: 100525 Author: demon Date: 2011-10-23 02:25:58 + (Sun, 23 Oct 2011) Log Message: --- MFT r100524 Modified Paths: -- branches/wmf/1.18wmf1/extensions/Contest/resources/contest.special.welcome.css Property Changed: branches/wmf/1.18wmf1/extensions/Contest/resources/contest.special.welcome.css Modified: branches/wmf/1.18wmf1/extensions/Contest/resources/contest.special.welcome.css === --- branches/wmf/1.18wmf1/extensions/Contest/resources/contest.special.welcome.css 2011-10-23 02:12:44 UTC (rev 100524) +++ branches/wmf/1.18wmf1/extensions/Contest/resources/contest.special.welcome.css 2011-10-23 02:25:58 UTC (rev 100525) @@ -82,7 +82,6 @@ background-position: right center; background-repeat: no-repeat; } -.mw-codechallenge-box-outside:hover .mw-codechallenge-box-text, .mw-codechallenge-box-outside:focus .mw-codechallenge-box-text, .mw-codechallenge-box-selected .mw-codechallenge-box-text { /* @embed */ Property changes on: branches/wmf/1.18wmf1/extensions/Contest/resources/contest.special.welcome.css ___ Added: svn:mergeinfo + /branches/REL1_15/phase3/extensions/Contest/resources/contest.special.welcome.css:51646 /branches/REL1_17/phase3/extensions/Contest/resources/contest.special.welcome.css:81445,81448 /branches/new-installer/phase3/extensions/Contest/resources/contest.special.welcome.css:43664-66004 /branches/sqlite/extensions/Contest/resources/contest.special.welcome.css:58211-58321 /trunk/extensions/Contest/resources/contest.special.welcome.css:99592,99653,100324,100399,100402,100405,100419,100427,100432-100433,100435-100439,100524 /trunk/phase3/extensions/Contest/resources/contest.special.welcome.css:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,9,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656 ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs