date:20100401

[MediaWiki-CVS] SVN: [64515] trunk/extensions/FlaggedRevs

2010-04-01 Thread aaron

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64515

Revision: 64515
Author:   aaron
Date: 2010-04-02 02:50:17 + (Fri, 02 Apr 2010)

Log Message:
---
Modified revreview-update-edited message as needed

Modified Paths:
--
trunk/extensions/FlaggedRevs/client/flaggedrevs.css
trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php

Modified: trunk/extensions/FlaggedRevs/client/flaggedrevs.css
===
--- trunk/extensions/FlaggedRevs/client/flaggedrevs.css 2010-04-02 02:19:35 UTC 
(rev 64514)
+++ trunk/extensions/FlaggedRevs/client/flaggedrevs.css 2010-04-02 02:50:17 UTC 
(rev 64515)
@@ -51,6 +51,11 @@
color: #8b;
 }
 
+span.flaggedrevs_important {
+   font-size: 115%;
+   font-weight: bold;
+}
+
 div.flaggedrevs_notes {
border: 1px solid #aaa;
background-color: #f9f9f9;

Modified: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
===
--- trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php  2010-04-02 
02:19:35 UTC (rev 64514)
+++ trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php  2010-04-02 
02:50:17 UTC (rev 64515)
@@ -173,9 +173,9 @@
 
 Please hit the "back" button in your browser and try again.',
'revreview-update' => 'Please 
[[{{MediaWiki:Validationpage}}|review]] any pending changes \'\'(shown 
below)\'\' made to the published version.',
-   'revreview-update-edited'  => 'When you edited this page, some 
\'\'other\'\' edits were already pending review.
-   
-To publish your changes, please [[{{MediaWiki:Validationpage}}|review]] 
\'\'all\'\' the pending changes \'\'(shown below)\'\'.',
+   'revreview-update-edited'  => 'Your changes have not yet been 
[[{{MediaWiki:Validationpage}}|published]].
+
+There are previous edits pending review. To publish your changes, please 
review all the changes shown below.',
'revreview-update-includes'=> '\'\'\'Some templates/files were 
updated:\'\'\'',
'revreview-update-use' => '\'\'\'NOTE:\'\'\' The published 
version of each of these templates/files is used in the published version of 
this page.',
'revreview-visibility' => '\'\'\'This page has an updated 
[[{{MediaWiki:Validationpage}}|published version]]; page stability settings can 
be [{{fullurl:{{#Special:Stabilization}}|page={{FULLPAGENAMEE 
configured].\'\'\'',



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64514] branches/new-installer/phase3/includes/installer/ OracleInstaller.php

2010-04-01 Thread demon

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64514

Revision: 64514
Author:   demon
Date: 2010-04-02 02:19:35 + (Fri, 02 Apr 2010)

Log Message:
---
Followup r64513, forgot to press save

Modified Paths:
--
branches/new-installer/phase3/includes/installer/OracleInstaller.php

Modified: branches/new-installer/phase3/includes/installer/OracleInstaller.php
===
--- branches/new-installer/phase3/includes/installer/OracleInstaller.php
2010-04-02 02:15:02 UTC (rev 64513)
+++ branches/new-installer/phase3/includes/installer/OracleInstaller.php
2010-04-02 02:19:35 UTC (rev 64514)
@@ -2,7 +2,7 @@
 
 class OracleInstaller extends InstallerDBType {
 
-   var $globalNames = array(
+   protected $globalNames = array(
'wgDBport',
'wgDBname',
'wgDBuser',
@@ -10,7 +10,7 @@
'wgDBprefix',
);
 
-   var $internalDefaults = array(
+   protected $internalDefaults = array(
'_InstallUser' => 'sys',
'_InstallPassword' => '',
);



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64513] branches/new-installer/phase3/includes/installer

2010-04-01 Thread demon

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64513

Revision: 64513
Author:   demon
Date: 2010-04-02 02:15:02 + (Fri, 02 Apr 2010)

Log Message:
---
Get rid of some code duplication with getGlobalNames() and getInternalDefaults()

Modified Paths:
--
branches/new-installer/phase3/includes/installer/InstallerDBType.php
branches/new-installer/phase3/includes/installer/MysqlInstaller.php
branches/new-installer/phase3/includes/installer/OracleInstaller.php
branches/new-installer/phase3/includes/installer/PostgresInstaller.php
branches/new-installer/phase3/includes/installer/SqliteInstaller.php

Modified: branches/new-installer/phase3/includes/installer/InstallerDBType.php
===
--- branches/new-installer/phase3/includes/installer/InstallerDBType.php
2010-04-02 01:37:50 UTC (rev 64512)
+++ branches/new-installer/phase3/includes/installer/InstallerDBType.php
2010-04-02 02:15:02 UTC (rev 64513)
@@ -10,6 +10,12 @@
/* Database connection */
var $db;
 
+   /** Internal variables for installation */
+   protected $internalDefaults = array();
+
+   /** Array of MW configuration globals this class uses */
+   protected $globalNames = array();
+
/**
 * Return the internal name, e.g. 'mysql', or 'sqlite'
 */
@@ -23,7 +29,9 @@
/**
 * Get an array of MW configuration globals that will be configured by 
this class.
 */
-   abstract function getGlobalNames();
+   public function getGlobalNames() {
+   return $this->globalNames;
+   }
 
/**
 * Get HTML for a web form that configures this database. Configuration
@@ -133,8 +141,8 @@
/**
 * Get a name=>value map of internal variables used during installation
 */
-   function getInternalDefaults() { 
-   return array();
+   public function getInternalDefaults() {
+   return $this->internalDefaults;
}
 
/**

Modified: branches/new-installer/phase3/includes/installer/MysqlInstaller.php
===
--- branches/new-installer/phase3/includes/installer/MysqlInstaller.php 
2010-04-02 01:37:50 UTC (rev 64512)
+++ branches/new-installer/phase3/includes/installer/MysqlInstaller.php 
2010-04-02 02:15:02 UTC (rev 64513)
@@ -1,7 +1,7 @@
  'InnoDB',
'_MysqlCharset' => 'binary',
);
@@ -36,18 +36,10 @@
return $this->checkExtension( 'mysql' );
}
 
-   function getGlobalNames() {
-   return $this->globalNames;
-   }
-
function getGlobalDefaults() {
return array();
}
 
-   function getInternalDefaults() {
-   return $this->internalDefaults;
-   }
-
function getConnectForm() {
return
$this->getTextBox( 'wgDBserver', 'config-db-host' ) .

Modified: branches/new-installer/phase3/includes/installer/OracleInstaller.php
===
--- branches/new-installer/phase3/includes/installer/OracleInstaller.php
2010-04-02 01:37:50 UTC (rev 64512)
+++ branches/new-installer/phase3/includes/installer/OracleInstaller.php
2010-04-02 02:15:02 UTC (rev 64513)
@@ -23,14 +23,6 @@
return $this->checkExtension( 'oci8' );
}
 
-   function getGlobalNames() {
-   return $this->globalNames;
-   }
-
-   function getInternalDefaults() {
-   return $this->internalDefaults;
-   }
-
function getConnectForm() {
return
Xml::openElement( 'fieldset' ) .

Modified: branches/new-installer/phase3/includes/installer/PostgresInstaller.php
===
--- branches/new-installer/phase3/includes/installer/PostgresInstaller.php  
2010-04-02 01:37:50 UTC (rev 64512)
+++ branches/new-installer/phase3/includes/installer/PostgresInstaller.php  
2010-04-02 02:15:02 UTC (rev 64513)
@@ -2,7 +2,7 @@
 
 class PostgresInstaller extends InstallerDBType {
 
-   var $globalNames = array(
+   protected $globalNames = array(
'wgDBserver',
'wgDBport',
'wgDBname',
@@ -12,7 +12,7 @@
'wgDBts2schema',
);
 
-   var $internalDefaults = array(
+   protected $internalDefaults = array(
'_InstallUser' => 'postgres',
'_InstallPassword' => '',
);
@@ -29,14 +29,6 @@
return $this->checkExtension( 'pgsql' );
}
 
-   function getGlobalNames() {
-   return $this->globalNames;
-   }
-
-   function getInternalDefaults() {
-   return $this->internalDefaults;
-   }
-
function getConnectForm() {

[MediaWiki-CVS] SVN: [64512] trunk/extensions/Maps

2010-04-01 Thread jeroendedauw

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64512

Revision: 64512
Author:   jeroendedauw
Date: 2010-04-02 01:37:50 + (Fri, 02 Apr 2010)

Log Message:
---
Fixed some issuew with geocoding and coordinate parsing

Modified Paths:
--
trunk/extensions/Maps/Geocoders/Maps_Geocoder.php
trunk/extensions/Maps/Maps_CoordinateParser.php
trunk/extensions/Maps/Maps_Settings.php
trunk/extensions/Maps/ParserFunctions/Geocode/Maps_GeocodeFunctions.php
trunk/extensions/Maps/ParserFunctions/Maps_ParserFunctions.php

Modified: trunk/extensions/Maps/Geocoders/Maps_Geocoder.php
===
--- trunk/extensions/Maps/Geocoders/Maps_Geocoder.php   2010-04-02 01:07:27 UTC 
(rev 64511)
+++ trunk/extensions/Maps/Geocoders/Maps_Geocoder.php   2010-04-02 01:37:50 UTC 
(rev 64512)
@@ -44,7 +44,7 @@
 * @return array or false
 */
public static function attemptToGeocode( $coordsOrAddress, $geoservice, 
$service, $checkForCoords = true ) {
-   if ( $checkForCoords ) {
+   if ( $checkForCoords ) {
if ( MapsCoordinateParser::areCoordinates( 
$coordsOrAddress ) ) {
return MapsCoordinateParser::parseCoordinates( 
$coordsOrAddress );
} else {

Modified: trunk/extensions/Maps/Maps_CoordinateParser.php
===
--- trunk/extensions/Maps/Maps_CoordinateParser.php 2010-04-02 01:07:27 UTC 
(rev 64511)
+++ trunk/extensions/Maps/Maps_CoordinateParser.php 2010-04-02 01:37:50 UTC 
(rev 64512)
@@ -111,6 +111,7 @@
 * @return boolean
 */ 
public static function areCoordinates( $coordsOrAddress ) {
+   // TODO: normalize notation before checking
return self::getCoordinatesType( $coordsOrAddress ) !== false;
}

@@ -153,19 +154,20 @@
 * @return string
 */
private static function formatCoordinate( $coordinate, $targetFormat ) {
+   $coordinate = (float)$coordinate;
switch ( $targetFormat ) {
case Maps_COORDS_FLOAT:
return $coordinate;
case Maps_COORDS_DMS:
-   $coordStr = round( $coordinate ) . Maps_GEO_DEG 
. ' ';
-   $minutes = ( $coordinate % 1 ) / 60;
-   $coordStr .= round( $minutes ) . Maps_GEO_MIN . 
' ';
-   $coordStr .= ( $minutes % 1 ) / 60 . 
Maps_GEO_SEC;
-   return $coordStr;
+   var_dump($coordinate);
+   $degrees = floor( $coordinate );
+   $minutes = ( $coordinate - $degrees ) * 60;
+   $seconds = ( $minutes - floor( $minutes ) ) * 
60;
+   return $degrees . Maps_GEO_DEG . ' ' . floor( 
$minutes ) . Maps_GEO_MIN . ' ' . round( $seconds ) . Maps_GEO_SEC;
case Maps_COORDS_DD:
return $coordinate . Maps_GEO_DEG;
case Maps_COORDS_DM:
-   return round( $coordinate ) . Maps_GEO_DEG . ' 
' . ( $coordinate % 1 ) / 60 . Maps_GEO_MIN;
+   return round( $coordinate ) . Maps_GEO_DEG . ' 
' . ( $coordinate - floor( $coordinate ) )* 60 . Maps_GEO_MIN;
default:
throw new Exception( __METHOD__ . " does not 
support formatting of coordinates to the $targetFormat notation." );
}

Modified: trunk/extensions/Maps/Maps_Settings.php
===
--- trunk/extensions/Maps/Maps_Settings.php 2010-04-02 01:07:27 UTC (rev 
64511)
+++ trunk/extensions/Maps/Maps_Settings.php 2010-04-02 01:37:50 UTC (rev 
64512)
@@ -118,7 +118,7 @@
 
 # Enum. The default output format of coordinates.
 # Possible values: Maps_COORDS_FLOAT, Maps_COORDS_DMS, Maps_COORDS_DM, 
Maps_COORDS_DD
-$egMapsCoordinateNotation = Maps_COORDS_DMS;
+$egMapsCoordinateNotation = Maps_COORDS_DM;
 
 # Boolean. Indicates if coordinates should be outputted in directional 
notation by default.
 $egMapsCoordinateDirectional = false;

Modified: 
trunk/extensions/Maps/ParserFunctions/Geocode/Maps_GeocodeFunctions.php
===
--- trunk/extensions/Maps/ParserFunctions/Geocode/Maps_GeocodeFunctions.php 
2010-04-02 01:07:27 UTC (rev 64511)
+++ trunk/extensions/Maps/ParserFunctions/Geocode/Maps_GeocodeFunctions.php 
2010-04-02 01:37:50 UTC (rev 64512)
@@ -88,11 +88,11 @@
if ( count( $parts ) == 1 ) {
if ( count( $defaultParams ) > 0 )

[MediaWiki-CVS] SVN: [64511] trunk/extensions/FirefoggChunkedUpload

2010-04-01 Thread mah

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64511

Revision: 64511
Author:   mah
Date: 2010-04-02 01:07:27 + (Fri, 02 Apr 2010)

Log Message:
---
apply r64510 to trunk

Modified Paths:
--
trunk/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php
trunk/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php

Modified: trunk/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php
===
--- trunk/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php 
2010-04-02 01:00:34 UTC (rev 64510)
+++ trunk/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php 
2010-04-02 01:07:27 UTC (rev 64511)
@@ -57,14 +57,16 @@
$this->getVerificationError( $check );
}
 
+   $session = $this->mUpload->setupChunkSession( $comment, 
$pageText, $watch );
return array('uploadUrl' =>
wfExpandUrl( wfScript( 'api' ) ) . "?" .
wfArrayToCGI( array(
'action' => 'firefoggupload',
'token' => $user->editToken(),
'format' => 'json',
-   'filename' => $this->mDesiredDestName,
-   'chunksession' => 
$this->mUpload->setupChunkSession( $comment, $pageText, $watch ) ) ) );
+   'chunksession' => $session,
+   'filename' => $this->getDesiredName(),
+   ) ) ) );
}
 
public function performUploadChunk() {
@@ -122,8 +124,7 @@
if( $params['done'] ) {
$required[] = 'chunksession';
}
-   if( $params['chunksession'] !== null ) {
-   } else {
+   if( $params['chunksession'] === null ) {
$required[] = 'filename';
$required[] = 'comment';
$required[] = 'watch';

Modified: 
trunk/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php
===
--- trunk/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php 
2010-04-02 01:00:34 UTC (rev 64510)
+++ trunk/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php 
2010-04-02 01:07:27 UTC (rev 64511)
@@ -21,6 +21,7 @@
 
public function initializeFromRequest(&$request) {}
public function getChunkMode() {return $this->chunkMode;}
+   public function getDesiredName() {return $this->mDesiredDestName;}
 
/**
 * Set session information for chunked uploads and allocate a unique 
key.



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64510] branches/REL1_16/extensions/FirefoggChunkedUpload

2010-04-01 Thread mah

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64510

Revision: 64510
Author:   mah
Date: 2010-04-02 01:00:34 + (Fri, 02 Apr 2010)

Log Message:
---
Fix some bugs, mostly with code ordering

Modified Paths:
--

branches/REL1_16/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php

branches/REL1_16/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php

Modified: 
branches/REL1_16/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php
===
--- 
branches/REL1_16/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php  
2010-04-01 23:27:49 UTC (rev 64509)
+++ 
branches/REL1_16/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php  
2010-04-02 01:00:34 UTC (rev 64510)
@@ -57,14 +57,16 @@
$this->getVerificationError( $check );
}
 
+   $session = $this->mUpload->setupChunkSession( $comment, 
$pageText, $watch );
return array('uploadUrl' =>
wfExpandUrl( wfScript( 'api' ) ) . "?" .
wfArrayToCGI( array(
'action' => 'firefoggupload',
'token' => $user->editToken(),
'format' => 'json',
-   'filename' => $this->mDesiredDestName,
-   'chunksession' => 
$this->mUpload->setupChunkSession( $comment, $pageText, $watch ) ) ) );
+   'chunksession' => $session,
+   'filename' => $this->mUpload->getDesiredName(),
+   ) ) );
}
 
public function performUploadChunk() {
@@ -172,8 +174,7 @@
if( $params['done'] ) {
$required[] = 'chunksession';
}
-   if( $params['chunksession'] !== null ) {
-   } else {
+   if( $params['chunksession'] === null ) {
$required[] = 'filename';
$required[] = 'comment';
$required[] = 'watch';

Modified: 
branches/REL1_16/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php
===
--- 
branches/REL1_16/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php
  2010-04-01 23:27:49 UTC (rev 64509)
+++ 
branches/REL1_16/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php
  2010-04-02 01:00:34 UTC (rev 64510)
@@ -21,6 +21,7 @@
 
public function initializeFromRequest(&$request) {}
public function getChunkMode() {return $this->chunkMode;}
+   public function getDesiredName() {return $this->mDesiredDestName;}
 
/**
 * Set session information for chunked uploads and allocate a unique 
key.



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64509] trunk/phase3

2010-04-01 Thread demon

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64509

Revision: 64509
Author:   demon
Date: 2010-04-01 23:27:49 + (Thu, 01 Apr 2010)

Log Message:
---
(bug 22935) image/x-ms-bmp mime type added for BMP files

Modified Paths:
--
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/MimeMagic.php
trunk/phase3/includes/mime.info
trunk/phase3/includes/mime.types

Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES  2010-04-01 22:38:29 UTC (rev 64508)
+++ trunk/phase3/RELEASE-NOTES  2010-04-01 23:27:49 UTC (rev 64509)
@@ -69,7 +69,8 @@
   anonymous users instead of null.
 * (bug 22627) Remove PHP notice when deleting a page only hidden users edited.
 * (bug 21520) Anonymous previews now also gives a warning about not being 
-logged in (anonpreviewwarning).
+  logged in (anonpreviewwarning).
+* (bug 22935) image/x-ms-bmp mime type added for BMP files
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent

Modified: trunk/phase3/includes/MimeMagic.php
===
--- trunk/phase3/includes/MimeMagic.php 2010-04-01 22:38:29 UTC (rev 64508)
+++ trunk/phase3/includes/MimeMagic.php 2010-04-01 23:27:49 UTC (rev 64509)
@@ -80,7 +80,7 @@
 audio/x-wav [AUDIO]
 audio/mp3 audio/mpeg [AUDIO]
 application/ogg audio/ogg video/ogg [MULTIMEDIA]
-image/x-bmp image/bmp [BITMAP]
+image/x-bmp image/x-ms-bmp image/bmp [BITMAP]
 image/gif [BITMAP]
 image/jpeg [BITMAP]
 image/png [BITMAP]

Modified: trunk/phase3/includes/mime.info
===
--- trunk/phase3/includes/mime.info 2010-04-01 22:38:29 UTC (rev 64508)
+++ trunk/phase3/includes/mime.info 2010-04-01 23:27:49 UTC (rev 64509)
@@ -16,7 +16,7 @@
 image/x-rgb[BITMAP]
 image/x-portable-pixmap[BITMAP]
 image/x-portable-graymap image/x-portable-greymap  [BITMAP]
-image/x-bmp image/bmp application/x-bmp application/bmp[BITMAP]
+image/x-bmp image/x-ms-bmp image/bmp application/x-bmp application/bmp [BITMAP]
 image/x-photoshop image/psd image/x-psd image/photoshop[BITMAP]
 image/vnd.djvu image/x.djvu image/x-djvu [BITMAP]
 

Modified: trunk/phase3/includes/mime.types
===
--- trunk/phase3/includes/mime.types2010-04-01 22:38:29 UTC (rev 64508)
+++ trunk/phase3/includes/mime.types2010-04-01 23:27:49 UTC (rev 64509)
@@ -85,6 +85,7 @@
 image/vnd.wap.wbmp wbmp
 image/x-cmu-raster ras
 image/x-icon ico
+image/x-ms-bmp
 image/x-portable-anymap pnm
 image/x-portable-bitmap pbm
 image/x-portable-graymap pgm



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64508] trunk/phase3/includes/api/ApiGo.php

2010-04-01 Thread reedy

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64508

Revision: 64508
Author:   reedy
Date: 2010-04-01 22:38:29 + (Thu, 01 Apr 2010)

Log Message:
---
svn:keywords Id for r64436

Modified Paths:
--
trunk/phase3/includes/api/ApiGo.php

Property Changed:

trunk/phase3/includes/api/ApiGo.php

Modified: trunk/phase3/includes/api/ApiGo.php
===
--- trunk/phase3/includes/api/ApiGo.php 2010-04-01 22:30:55 UTC (rev 64507)
+++ trunk/phase3/includes/api/ApiGo.php 2010-04-01 22:38:29 UTC (rev 64508)
@@ -96,6 +96,6 @@
}
 
public function getVersion() {
-   return __CLASS__ . ': $Id: $';
+   return __CLASS__ . ': $Id$';
}
 }


Property changes on: trunk/phase3/includes/api/ApiGo.php
___
Added: svn:keywords
   + Id



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64507] trunk/extensions/NaturalLanguageList/NaturalLanguageList.php

2010-04-01 Thread svip

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64507

Revision: 64507
Author:   svip
Date: 2010-04-01 22:30:55 + (Thu, 01 Apr 2010)

Log Message:
---
Follow up to r64482

Modified Paths:
--
trunk/extensions/NaturalLanguageList/NaturalLanguageList.php

Modified: trunk/extensions/NaturalLanguageList/NaturalLanguageList.php
===
--- trunk/extensions/NaturalLanguageList/NaturalLanguageList.php
2010-04-01 22:30:34 UTC (rev 64506)
+++ trunk/extensions/NaturalLanguageList/NaturalLanguageList.php
2010-04-01 22:30:55 UTC (rev 64507)
@@ -115,12 +115,12 @@
public $mArgs;  
private $mSeparator = null;
private $mOptions = array(
-   'fieldsperitem' => -1,  # size of pairs
-   'duplicates' => true,   # allow same elements to appear
-   'blanks' => false,  # allow blank elements 
to appear
-   'itemoutput' => null,   # the format for each element
-   'outputseparator' => null,  # the separator between output 
elements
-   'lastseparator' => null,# the separator between the 
last two elements
+   'fieldsperitem' => -1, # size of pairs
+   'duplicates' => true,  # allow same elements to appear
+   'blanks' => false, # allow blank elements to appear
+   'itemoutput' => null,  # the format for each element
+   'outputseparator' => null, # the separator between output 
elements
+   'lastseparator' => null,   # the separator between the last two 
elements
);
private $mReaditems = array();
public $mParams = array();
@@ -169,7 +169,7 @@
/**
 * Create $this->mParams from $this->mReaditems using $this->mOptions.
 *
-* @param $separator [default:null] Input separator (e.g. ',')
+* @param $separator String [default:null] Input separator (e.g. ',')
 */
private function readArgs( $separator=null ) {
$items = array(); # array of args to include
@@ -202,7 +202,7 @@
 * Create $this->mOptions and $this->mReaditems from $this->mArgs using 
$this->mFrame.
 *
 * @param $ignorefirst boolean Ignore first element in case of 
{{#rawlist:}}
-* @param $separator [default:null] Input separator
+* @param $separator String [default:null] Input separator
 */
private function readOptions ( $ignorefirst, $separator=null ) {
$args = $this->mArgs;
@@ -277,9 +277,9 @@
 * If it is, then it handles the option (and applies it).
 * If it isn't, then it just returns the string it found. 
 *
-* @param $arg Argument
-* @param $separator Input separator
-* @return Return string if element, else return false
+* @param $arg String Argument
+* @param $separator String [default:null] Input separator
+* @return String if element, else return false
 */
private function handleInputItem( $arg, $separator=null ) {
if ( $arg instanceof PPNode_DOM ) {
@@ -334,7 +334,7 @@
/**
 * Using magic to store all known names for each option
 *
-* @param $input string
+* @param $input String
 * @return The option found; otherwise false
 */
private static function parseOptionName( $value ) {
@@ -360,9 +360,9 @@
/**
 * Insert a new element into an array.
 *
-* @param $array The array in question
-* @param $value The element to be inserted
-* @param $separator [default:null] Input separator
+* @param $array Array The array in question
+* @param $value Mixed The element to be inserted
+* @param $separator String [default:null] Input separator
 */
private static function parseArrayItem( &$array, $value, 
$separator=null ) {
# if no separator, just assume the value can be appended,
@@ -382,7 +382,7 @@
 * Parse numeral
 *
 * @param $value Integer
-* @param $default [default:1] Integer
+* @param $default Integer [default:1]
 * @return The integer if integer and above 0, otherwise $default
 */
private static function parseNumeral( $value, $default = 1 ) {
@@ -396,7 +396,7 @@
 * Parse string
 *
 * @param $value String
-* @param $default [default:null] String
+* @param $default String [default:null]
 * @return The string, if none found, return $default
 */
private static function parseString( $value, $default = null ) {



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cv

[MediaWiki-CVS] SVN: [64506] trunk/WikiWord/WikiWord

2010-04-01 Thread daniel

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64506

Revision: 64506
Author:   daniel
Date: 2010-04-01 22:30:34 + (Thu, 01 Apr 2010)

Log Message:
---
tweaks

Modified Paths:
--

trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/model/WikiWordConcept.java

trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/builder/ConceptImporter.java

trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/extract/StreamProcessorApp.java

trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/processor/AbstractPageProcessor.java

trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/store/builder/DatabaseProximityStoreBuilder.java

Added Paths:
---

trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/processor/ChunkedProgressRateTracker.java

Removed Paths:
-

trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/processor/ImportProgressTracker.java

Modified: 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/model/WikiWordConcept.java
===
--- 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/model/WikiWordConcept.java
 2010-04-01 21:56:11 UTC (rev 64505)
+++ 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/model/WikiWordConcept.java
 2010-04-01 22:30:34 UTC (rev 64506)
@@ -124,7 +124,7 @@
}
 
public void setType(ConceptType type) {
-   if (this.type!=null) throw new IllegalStateException("property 
already initialized");
+   if (this.type!=null && !this.type.equals(ConceptType.UNKNOWN)) 
throw new IllegalStateException("property already initialized");
this.type = type;
}
 

Modified: 
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/builder/ConceptImporter.java
===
--- 
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/builder/ConceptImporter.java
2010-04-01 21:56:11 UTC (rev 64505)
+++ 
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/builder/ConceptImporter.java
2010-04-01 22:30:34 UTC (rev 64506)
@@ -16,7 +16,7 @@
 import de.brightbyte.wikiword.TweakSet;
 import de.brightbyte.wikiword.analyzer.WikiPage;
 import de.brightbyte.wikiword.analyzer.WikiTextAnalyzer;
-import de.brightbyte.wikiword.processor.ImportProgressTracker;
+import de.brightbyte.wikiword.processor.ChunkedProgressRateTracker;
 import de.brightbyte.wikiword.schema.AliasScope;
 import de.brightbyte.wikiword.store.builder.IncrementalStoreBuilder;
 import de.brightbyte.wikiword.store.builder.LocalConceptStoreBuilder;
@@ -29,9 +29,9 @@
private boolean storeFlatText = true;
private boolean storeRawText = true;

-   protected ImportProgressTracker conceptTracker;
-   protected ImportProgressTracker linkTracker;
-   protected ImportProgressTracker propertyTracker;
+   protected ChunkedProgressRateTracker conceptTracker;
+   protected ChunkedProgressRateTracker linkTracker;
+   protected ChunkedProgressRateTracker propertyTracker;

protected LocalConceptStoreBuilder store;
protected PropertyStoreBuilder propertyStore;
@@ -178,9 +178,9 @@
@Override
public void reset() {
super.reset();
-   conceptTracker = new ImportProgressTracker("concepts");
-   linkTracker = new ImportProgressTracker("links");
-   propertyTracker = new ImportProgressTracker("properties");
+   conceptTracker = new ChunkedProgressRateTracker("concepts");
+   linkTracker = new ChunkedProgressRateTracker("links");
+   propertyTracker = new ChunkedProgressRateTracker("properties");
}

@Override

Modified: 
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/extract/StreamProcessorApp.java
===
--- 
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/extract/StreamProcessorApp.java
 2010-04-01 21:56:11 UTC (rev 64505)
+++ 
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/extract/StreamProcessorApp.java
 2010-04-01 22:30:34 UTC (rev 64506)
@@ -26,6 +26,9 @@
protected DataCursor cursor;
protected DataSink sink;

+   protected boolean usingStdin;
+   protected boolean usingStdout;
+   
protected InputFileHelper inputHelper;  

public StreamProcessorApp(boolean allowGlobal, boolean allowLocal) {
@@ -55,8 +58,14 @@
protected Writer getOutputWriter() throws FileNotFoundException, 
UnsupportedEncodingException {
if (outputWriter==null) {
File f = getOutputFile();
-   if (f==null) outputWriter = Consol

[MediaWiki-CVS] SVN: [64505] branches/wmf-deployment/extensions/UsabilityInitiative/js/ plugins/jquery.wikiEditor.html

2010-04-01 Thread catrope

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64505

Revision: 64505
Author:   catrope
Date: 2010-04-01 21:56:11 + (Thu, 01 Apr 2010)

Log Message:
---
wmf-deployment: Temporarily revert r64223 per Nimish's request

Modified Paths:
--

branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html

Modified: 
branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html
===
--- 
branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html
2010-04-01 21:22:25 UTC (rev 64504)
+++ 
branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html
2010-04-01 21:56:11 UTC (rev 64505)
@@ -58,10 +58,10 @@
margin-right: 2px;
overflow: hidden;
background: url( 
'../../images/wikiEditor/templateEditor/name-base.png' ) 0 0 repeat-x #e8e8e8;
-   color: #0645ad;
-   font-family: sans-serif;
-   /* color: #00; */
-   /* font-family: monospace; */
+   /* color: #0645ad; */
+   /* font-family: sans-serif; */
+   color: #00;
+   font-family: monospace;
text-decoration: none;
padding-left: 0.33em;
line-height: 16px;
@@ -88,7 +88,7 @@
background-position: 50%; /*FF3*/
}
.wikiEditor-template-name:hover {
-   text-decoration: underline;
+   /* text-decoration: underline; */
}
.wikiEditor-template-expanded .wikiEditor-template-expand {
background-image: 
url(../../images/wikiEditor/templateEditor/collapse.png);



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64504] branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard

2010-04-01 Thread neilk

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64504

Revision: 64504
Author:   neilk
Date: 2010-04-01 21:22:25 + (Thu, 01 Apr 2010)

Log Message:
---
layout of front page roughly correct now

Modified Paths:
--

branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js

Modified: 
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css
===
--- 
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css   
2010-04-01 21:21:58 UTC (rev 64503)
+++ 
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css   
2010-04-01 21:22:25 UTC (rev 64504)
@@ -130,7 +130,7 @@
border-bottom: 1px solid #e0e0e0;
 }
 
-.mwe-upwiz-file-indicator {
+.mwe-upwiz-file-indicator, .mwe-upwiz-count {
float: left;
width: 92px;
margin-left: 8px;
@@ -143,10 +143,13 @@
margin-left: 4px;
 }
 
-#mwe-upwiz-add-file-container.mwe-upwiz-add-files-n, .mwe-upwiz-visible-file {
+#mwe-upwiz-add-file-container.mwe-upwiz-add-files-n, .mwe-upwiz-visible-file, 
.mwe-upwiz-progress-bar-etr {
width: 300px;
height: 18px;
padding-left: 5px;
+}
+
+#mwe-upwiz-add-file-container.mwe-upwiz-add-files-n, .mwe-upwiz-visible-file {
float: left;
 }
 
@@ -179,11 +182,11 @@
 
 
 #mwe-upwiz-files {
+   margin-left: 50px;
margin-top: 20px;
 }
 
 .mwe-upwiz-file {
-   margin-left: 50px;
width: 410px;
 }
 
@@ -240,11 +243,15 @@
color: #009900;
 }
 
-.mwe-upwiz-progress-bar {
-   margin-left: 50px;
+.mwe-upwiz-progress-bar-etr {
+   float: left;
 }
 
+.mwe-upwiz-etr {
+   text-align: center;
+}
 
+
 .mwe-upwiz-upload-warning {
background: #e0;
 }

Modified: 
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js
===
--- branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js 
2010-04-01 21:21:58 UTC (rev 64503)
+++ branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js 
2010-04-01 21:22:25 UTC (rev 64504)
@@ -10,6 +10,7 @@
"mwe-upwiz-transported": "OK",
"mwe-upwiz-click-here": "Click here to select a file",
"mwe-upwiz-uploading": "uploading...",
+   "mwe-upwiz-editing": "editing...",
"mwe-upwiz-remove-upload": "Remove this file from the list of files to 
upload",
"mwe-upwiz-remove-description": "Remove this description",
"mwe-upwiz-upload": "Upload",
@@ -73,8 +74,10 @@
 
 
 
-mw.ProgressBar = function( selector ) {
+mw.ProgressBar = function( selector, text ) {
var _this = this;
+   // XXX need to figure out a way to put something inside text.
+
_this.progressBarDiv = $j('')
.addClass("mwe-upwiz-progress-bar")
.progressbar( { value: 0 } );
@@ -88,6 +91,7 @@
$j( selector ).html( 
$j('').addClass( 'mwe-upwiz-progress' )
.append( $j( '' )
+   .addClass( 'mwe-upwiz-progress-bar-etr' )
.append( _this.progressBarDiv )
.append( _this.timeRemainingDiv ) )
.append( $j( _this.countDiv ) )
@@ -128,9 +132,6 @@
var _this = this;
 
_this.progressBarDiv.progressbar( 'value', parseInt( fraction * 
100 ) );
-   if (fraction > 0.5) {
-   debugger;
-   }
 
var remainingTime;
if (_this.beginTime == null) {
@@ -1768,9 +1769,9 @@
   +'' + gM("mwe-upwiz-upload") + ''
   +  ''
   +   ''
+  +   ''
   +   ''
   + ''   
-  + ''
   + ''
   +   ''
   +   ''
@@ -1972,6 +1973,7 @@
progressProperty, 
weightProperty, 
progressBarSelector,
+   progressBarText,
starter, 
endCallback ) {

@@ -1983,7 +1985,7 @@
} );
var totalCount = wizard.uploads.length;
 
-   var progressBar = new mw.ProgressBar( progressBarSelector );
+   var progressBar = new mw.ProgressBar( progressBarSelector, 
progressBarText );
progressBar.setTotal( totalCount );
 
transitioner = function() {
@@ -2046,6 +2048,7 @@
'transportProgress',

[MediaWiki-CVS] SVN: [64503] trunk/extensions/Maps

2010-04-01 Thread jeroendedauw

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64503

Revision: 64503
Author:   jeroendedauw
Date: 2010-04-01 21:21:58 + (Thu, 01 Apr 2010)

Log Message:
---
Rewrote #geocode parser function to support named parameters, and coordinate 
notation specification.

Modified Paths:
--
trunk/extensions/Maps/Maps.i18n.php
trunk/extensions/Maps/Maps_Settings.php
trunk/extensions/Maps/ParserFunctions/Geocode/Maps_GeocodeFunctions.php
trunk/extensions/Maps/ParserFunctions/Maps_ParserFunctions.php

Modified: trunk/extensions/Maps/Maps.i18n.php
===
--- trunk/extensions/Maps/Maps.i18n.php 2010-04-01 21:16:53 UTC (rev 64502)
+++ trunk/extensions/Maps/Maps.i18n.php 2010-04-01 21:21:58 UTC (rev 64503)
@@ -40,6 +40,9 @@
 $1',
'maps_map_cannot_be_displayed' => 'The map cannot be displayed.',
 
+   // Geocoding
+   'maps-geocoder-not-available' => 'The geocoding feature is of Maps is 
not available, your location can not be geocoded.',
+
// Mapping services
'maps_googlemaps2' => 'Google Maps v2',
'maps_googlemaps3' => 'Google Maps v3',

Modified: trunk/extensions/Maps/Maps_Settings.php
===
--- trunk/extensions/Maps/Maps_Settings.php 2010-04-01 21:16:53 UTC (rev 
64502)
+++ trunk/extensions/Maps/Maps_Settings.php 2010-04-01 21:21:58 UTC (rev 
64503)
@@ -118,11 +118,12 @@
 
 # Enum. The default output format of coordinates.
 # Possible values: Maps_COORDS_FLOAT, Maps_COORDS_DMS, Maps_COORDS_DM, 
Maps_COORDS_DD
-$egMapsCoordinateNotation = Maps_COORDS_FLOAT;
+$egMapsCoordinateNotation = Maps_COORDS_DMS;
 
 # Boolean. Indicates if coordinates should be outputted in directional 
notation by default.
 $egMapsCoordinateDirectional = false;
 
+$egMapsAllowCoordsGeocoding = true;
 
 
 

Modified: 
trunk/extensions/Maps/ParserFunctions/Geocode/Maps_GeocodeFunctions.php
===
--- trunk/extensions/Maps/ParserFunctions/Geocode/Maps_GeocodeFunctions.php 
2010-04-01 21:16:53 UTC (rev 64502)
+++ trunk/extensions/Maps/ParserFunctions/Geocode/Maps_GeocodeFunctions.php 
2010-04-01 21:21:58 UTC (rev 64503)
@@ -1,7 +1,7 @@
 |=|=}}
  * {{#geocodelat:|=|=}}
@@ -67,9 +67,95 @@
 * 
 * @return string
 */
-   public static function renderGeocoder( Parser $parser, 
$coordsOrAddress, $service = '', $mappingService = '' ) {
-   if ( self::geocoderIsAvailable() ) $geovalues = 
MapsGeocoder::attemptToGeocodeToString( $coordsOrAddress, $service, 
$mappingService );
-   return $geovalues ? $geovalues : '';
+   public static function renderGeocoder( Parser $parser ) {
+   global $egMapsAvailableServices, $egMapsAvailableGeoServices, 
$egMapsAvailableCoordNotations;
+   global $egMapsDefaultServices, $egMapsDefaultGeoService, 
$egMapsCoordinateNotation;
+   global $egMapsAllowCoordsGeocoding, 
$egMapsCoordinateDirectional;
+   
+   $args = func_get_args();
+   
+   // We already know the $parser.
+   array_shift( $args ); 
+   
+   // For backward compatibility with pre 0.6.
+   $defaultParams = array( 'location', 'service', 'mappingservice' 
);
+   $parameters = array();
+   
+   // Determine all parameter names and value, and take care of 
default (nameless)
+   // parameters, by turning them into named ones.
+   foreach( $args as $arg ) {
+   $parts = explode( '=', $arg );
+   if ( count( $parts ) == 1 ) {
+   if ( count( $defaultParams ) > 0 ) {
+   $defaultParam = array_shift( 
$defaultParams ); 
+   $parameters[$defaultParam] = $parts[0]; 
+   }
+   } else {
+   $name = array_shift( $parts );
+   $parameters[$name] = implode( $parts );
+   }
+   }
+   
+   $parameterInfo = array(
+   'location' => array(
+   'required' => true 
+   ),
+   'mappingservice' => array(
+   'criteria' => array(
+   'in_array' => $egMapsAvailableServices
+   ),  
+   'default' => $egMapsDefaultServices['pf']
+   ),
+   'service' => array(
+   'criteria' => array(
+   'in_array' => array_keys( 
$egMapsAvailableGeoServices )
+

[MediaWiki-CVS] SVN: [64502] trunk/phase3/includes/Status.php

2010-04-01 Thread ialex

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64502

Revision: 64502
Author:   ialex
Date: 2010-04-01 21:16:53 + (Thu, 01 Apr 2010)

Log Message:
---
Fixed some doxygen warnings and documented a bit

Modified Paths:
--
trunk/phase3/includes/Status.php

Modified: trunk/phase3/includes/Status.php
===
--- trunk/phase3/includes/Status.php2010-04-01 20:37:08 UTC (rev 64501)
+++ trunk/phase3/includes/Status.php2010-04-01 21:16:53 UTC (rev 64502)
@@ -24,6 +24,8 @@
 
/**
 * Factory function for fatal errors
+*
+* @param $message String: message name
 */
static function newFatal( $message /*, parameters...*/ ) {
$params = func_get_args();
@@ -33,25 +35,52 @@
return $result;
}
 
+   /**
+* Factory function for good results
+*
+* @param $value Mixed
+*/
static function newGood( $value = null ) {
$result = new self;
$result->value = $value;
return $result;
}
 
+   /**
+* Change operation result
+*
+* @param $ok Boolean: whether to operation completed
+* @param $value Mixed
+*/
function setResult( $ok, $value = null ) {
$this->ok = $ok;
$this->value = $value;
}
 
+   /**
+* Returns whether the operation completed and didn't have any error or
+* warnings
+*
+* @return Boolean
+*/
function isGood() {
return $this->ok && !$this->errors;
}
 
+   /**
+* Returns whether the operation completed
+*
+* @return Boolean
+*/
function isOK() {
return $this->ok;
}
 
+   /**
+* Add a new warning
+*
+* @param $message String: message name
+*/
function warning( $message /*, parameters... */ ) {
$params = array_slice( func_get_args(), 1 );
$this->errors[] = array(
@@ -63,6 +92,8 @@
/**
 * Add an error, do not set fatal flag
 * This can be used for non-fatal errors
+*
+* @param $message String: message name
 */
function error( $message /*, parameters... */ ) {
$params = array_slice( func_get_args(), 1 );
@@ -73,7 +104,10 @@
}
 
/**
-* Add an error and set OK to false, indicating that the operation as a 
whole was fatal
+* Add an error and set OK to false, indicating that the operation
+* as a whole was fatal
+*
+* @param $message String: message name
 */
function fatal( $message /*, parameters... */ ) {
$params = array_slice( func_get_args(), 1 );
@@ -128,9 +162,11 @@
 
/**
 * Get the error list as a wikitext formatted list
-* @param string $shortContext A short enclosing context message name, 
to be used
-* when there is a single error
-* @param string $longContext A long enclosing context message name, 
for a list
+*
+* @param $shortContext String: a short enclosing context message name, 
to
+*be used when there is a single error
+* @param $longContext String: a long enclosing context message name, 
for a list
+* @return String
 */
function getWikiText( $shortContext = false, $longContext = false ) {
if ( count( $this->errors ) == 0 ) {
@@ -167,6 +203,9 @@
 
/**
 * Merge another status object into this one
+*
+* @param $other Other Status object
+* @param $overwriteValue Boolean: whether to override the "value" 
member
 */
function merge( $other, $overwriteValue = false ) {
$this->errors = array_merge( $this->errors, $other->errors );
@@ -178,6 +217,11 @@
$this->failCount += $other->failCount;
}
 
+   /**
+* Get the list of errors (but not warnings)
+*
+* @return Array
+*/
function getErrorsArray() {
$result = array();
foreach ( $this->errors as $error ) {
@@ -192,6 +236,9 @@
 
/**
 * Returns true if the specified message is present as a warning or 
error
+*
+* @param $msg String: message name
+* @return Boolean
 */
function hasMessage( $msg ) {
foreach ( $this->errors as $error ) {



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64501] branches/js2-work/phase3/skins/common/wikibits.js

2010-04-01 Thread dale

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64501

Revision: 64501
Author:   dale
Date: 2010-04-01 20:37:08 + (Thu, 01 Apr 2010)

Log Message:
---
added already defined check to mw = {} in wikibits.js

Modified Paths:
--
branches/js2-work/phase3/skins/common/wikibits.js

Modified: branches/js2-work/phase3/skins/common/wikibits.js
===
--- branches/js2-work/phase3/skins/common/wikibits.js   2010-04-01 20:34:53 UTC 
(rev 64500)
+++ branches/js2-work/phase3/skins/common/wikibits.js   2010-04-01 20:37:08 UTC 
(rev 64501)
@@ -25,6 +25,8 @@
var opera7_bugs = is_opera_seven && !is_opera_95;
var opera95_bugs = /opera\/(9\.5)/.test( clientPC );
 }
+// Start at 4 to minimize the chance of breaking on IE10 :)
+var ie6_bugs = /msie [4-6]/.test( clientPC );
 
 // Global external objects used by this script.
 /*extern ta, stylepath, skin */
@@ -36,144 +38,145 @@
var onloadFuncts = [];
 }
 
-// code that is dependent on js2 functions should use mw.ready
-function addOnloadHook(hookFunct) {
+function addOnloadHook( hookFunct ) {
// Allows add-on scripts to add onload functions
-   if(!doneOnloadHook) {
+   if( !doneOnloadHook ) {
onloadFuncts[onloadFuncts.length] = hookFunct;
} else {
hookFunct();  // bug in MSIE script loading
}
 }
 
-
-function hookEvent(hookName, hookFunct) {
-   addHandler(window, hookName, hookFunct);
+function hookEvent( hookName, hookFunct ) {
+   addHandler( window, hookName, hookFunct );
 }
 
-function importScript(page) {
+function importScript( page ) {
// TODO: might want to introduce a utility function to match 
wfUrlencode() in PHP
var uri = wgScript + '?title=' +
encodeURIComponent(page.replace(/ 
/g,'_')).replace(/%2F/ig,'/').replace(/%3A/ig,':') +
'&action=raw&ctype=text/javascript';
-   return importScriptURI(uri);
+   return importScriptURI( uri );
 }
 
 var loadedScripts = {}; // included-scripts tracker
-function importScriptURI(url) {
-   if (loadedScripts[url]) {
+function importScriptURI( url ) {
+   if ( loadedScripts[url] ) {
return null;
}
loadedScripts[url] = true;
-   var s = document.createElement('script');
-   s.setAttribute('src',url);
-   s.setAttribute('type','text/javascript');
-   document.getElementsByTagName('head')[0].appendChild(s);
+   var s = document.createElement( 'script' );
+   s.setAttribute( 'src', url );
+   s.setAttribute( 'type', 'text/javascript' );
+   document.getElementsByTagName('head')[0].appendChild( s );
return s;
 }
 
-function importStylesheet(page) {
-   return importStylesheetURI(wgScript + 
'?action=raw&ctype=text/css&title=' + encodeURIComponent(page.replace(/ 
/g,'_')));
+function importStylesheet( page ) {
+   return importStylesheetURI( wgScript + 
'?action=raw&ctype=text/css&title=' + encodeURIComponent( page.replace(/ 
/g,'_') ) );
 }
 
-function importStylesheetURI(url,media) {
-   var l = document.createElement('link');
+function importStylesheetURI( url, media ) {
+   var l = document.createElement( 'link' );
l.type = 'text/css';
l.rel = 'stylesheet';
l.href = url;
-   if(media) l.media = media
-   document.getElementsByTagName('head')[0].appendChild(l);
+   if( media ) {
+   l.media = media;
+   }
+   document.getElementsByTagName('head')[0].appendChild( l );
return l;
 }
 
-function appendCSS(text) {
-   var s = document.createElement('style');
+function appendCSS( text ) {
+   var s = document.createElement( 'style' );
s.type = 'text/css';
s.rel = 'stylesheet';
-   if (s.styleSheet) s.styleSheet.cssText = text //IE
-   else s.appendChild(document.createTextNode(text + '')) //Safari 
sometimes borks on null
-   document.getElementsByTagName('head')[0].appendChild(s);
+   if ( s.styleSheet ) {
+   s.styleSheet.cssText = text; // IE
+   } else {
+   s.appendChild( document.createTextNode( text + '' ) ); // 
Safari sometimes borks on null
+   }
+   document.getElementsByTagName('head')[0].appendChild( s );
return s;
 }
 
-// special stylesheet links
-if (typeof stylepath != 'undefined' && typeof skin != 'undefined') {
-   // FIXME: This tries to load the stylesheets even for skins where they
-   // don't exist, i.e., everything but Monobook.
-   if (opera6_bugs) {
-   importStylesheetURI(stylepath+'/'+skin+'/Opera6Fixes.css');
-   } else if (opera7_bugs) {
-   importStylesheetURI(stylepath+'/'+skin+'/Opera7Fixes.css');
-   } else if (opera95_bugs) {
-   importStylesheetURI(stylepath+'/'+skin+'/Opera9Fixes.css');
-   } else if (ff2_bugs) {
-   importStylesheetURI(stylepath+

[MediaWiki-CVS] SVN: [64500] trunk/extensions/PackageForce

2010-04-01 Thread ashley

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64500

Revision: 64500
Author:   ashley
Date: 2010-04-01 20:34:53 + (Thu, 01 Apr 2010)

Log Message:
---
PackageForce:
*spacing tweaks
*removed unused globals
*added braces where appropriate
*trimmed whitespace
*docs

Modified Paths:
--
trunk/extensions/PackageForce/PackageForce.i18n.php
trunk/extensions/PackageForce/PackageForce.php
trunk/extensions/PackageForce/PackageForce.sql

Modified: trunk/extensions/PackageForce/PackageForce.i18n.php
===
--- trunk/extensions/PackageForce/PackageForce.i18n.php 2010-04-01 20:34:44 UTC 
(rev 64499)
+++ trunk/extensions/PackageForce/PackageForce.i18n.php 2010-04-01 20:34:53 UTC 
(rev 64500)
@@ -1,25 +1,34 @@
  'PackageForce',
+   'packageforce' => 'PackageForce',
'packageforceadmin' => 'PackageForceAdmin',
-   'pf-desc'   => 'Creating a special page to download 
packages of useful templates/etc..',
-   'pf-only-admins-allowed'=> 'This page is only for users with 
the \'packageforce-admin\'-right.',
-   
+   'pf-desc' => 'Creating a special page to download packages of useful 
templates/etc.',
+   'pf-only-admins-allowed' => 'This page is only for users with the 
\'packageforce-admin\'-right.',
+
/* admin links */
'pf-admin-menu-default' => 'Default',
'pf-admin-menu-unsortedtemplates' => 'Templates not yet sorted',
-   'pf-admin-link-view-documentation'  => 'View documentations tied to 
page.',
-   'pf-admin-link-editlink-page'   =>  'Edit page',
-   'pf-admin-link-approve' =>  'Approve page',
-   
+   'pf-admin-link-view-documentation' => 'View documentations tied to 
page.',
+   'pf-admin-link-editlink-page' => 'Edit page',
+   'pf-admin-link-approve' => 'Approve page',
+
/* table headers */
-   'pf-header-documentation'   => 'Documentation',
-   'pf-header-in_packages' => 'Packages',
-   'pf-header-edit'=> 'Edit link',
-   'pf-header-type'=> 'Type of page',
-   'pf-header-page_title'  => 'Title',
-   'pf-header-approve' => 'Approve',
+   'pf-header-documentation' => 'Documentation',
+   'pf-header-in_packages' => 'Packages',
+   'pf-header-edit' => 'Edit link',
+   'pf-header-type' => 'Type of page',
+   'pf-header-page_title' => 'Title',
+   'pf-header-approve' => 'Approve',
 );

Modified: trunk/extensions/PackageForce/PackageForce.php
===
--- trunk/extensions/PackageForce/PackageForce.php  2010-04-01 20:34:44 UTC 
(rev 64499)
+++ trunk/extensions/PackageForce/PackageForce.php  2010-04-01 20:34:53 UTC 
(rev 64500)
@@ -1,33 +1,44 @@
 
+ * @copyright Copyright © 2010 Svip
+ * @link http://www.mediawiki.org/wiki/Extension:PackageForce Documentation
+ */
 
-# Alert the user that this is not a valid entry point to MediaWiki if 
+# Alert the user that this is not a valid entry point to MediaWiki if
 # they try to access the special pages file directly.
-if (!defined('MEDIAWIKI')) {
-echo << __FILE__,
-   'name'=> 'Package Force',
-   'author'  => array( 'Svip' ),
-   'url' => 'http://www.mediawiki.org/wiki/Extension:PackageForce',
-   'description' => 'Creating a special page to download packages of 
useful templates/etc..',
+   'path' => __FILE__,
+   'name' => 'Package Force',
+   'version' => '0.1',
+   'author' => 'Svip',
+   'url' => 'http://www.mediawiki.org/wiki/Extension:PackageForce',
+   'description' => 'Creating a special page to download packages of 
useful templates/etc.',
'descriptionmsg' => 'pf-desc',
-   'version' => '0.1'
 );
 
-$dir = dirname(__FILE__);
+$dir = dirname( __FILE__ );
 $wgExtensionMessagesFiles['PackageForce'] = "$dir/PackageForce.i18n.php";
 #$wgExtensionMessagesFiles['PackageForceMagic'] = 
"$dir/PackageForce.i18n.magic.php";
 
 $wgExtensionAliasesFiles['PackageForce'] = "$dir/PackageForce.alias.php";
-$wgSpecialPages['PackageForce'] = 'PackageForceSpecial'; 
+$wgSpecialPages['PackageForce'] = 'PackageForceSpecial';
 $wgSpecialPages['PackageForceAdmin'] = 'PackageForceAdminSpecial';
 
 # New rights
@@ -35,66 +46,75 @@
 $wgGroupPermissions['sysop']['packageforce-edit'] = true;
 
 # Create our own namespace
-define ( 'NS_PACKAGEFORCE', 1300 );
-define ( 'NS_PACKAGEFORCE_TALK', 1301 );
+define( 'NS_PACKAGEFORCE', 1300 );
+define( 'NS_PACKAGEFORCE_TALK', 1301 );
 
 # Only English for now.
 $wgExtraNamespaces[NS_PACKAGEFORCE] = 'PackageForce';
 $wgExtraNamespaces[NS_PACKAGEFORCE_TALK] = 'PackageForce_talk';
 
-$wgNamespaceProtection[NS_PACKAGEFORCE] = 
-   $wgNamespaceProtection[NS_PACKAGEFORCE_TALK] = array ( 
'packageforce-edit' );
+$wgNamespaceProtection

[MediaWiki-CVS] SVN: [64497] branches/js2-work/phase3/js

2010-04-01 Thread neilk

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64497

Revision: 64497
Author:   neilk
Date: 2010-04-01 19:48:57 + (Thu, 01 Apr 2010)

Log Message:
---
css for the front page -- aligned indicators, etc.

Modified Paths:
--

branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js
branches/js2-work/phase3/js/specialUploadWizardPage.js

Modified: 
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css
===
--- 
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css   
2010-04-01 19:43:16 UTC (rev 64496)
+++ 
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css   
2010-04-01 19:48:57 UTC (rev 64497)
@@ -82,9 +82,8 @@
padding: 1em;
 }
 
-
 .mwe-upwiz-add-files-0 {
-   margin-top: 40px;
+   margin-top: 20px;
text-align: center;
font-size: 16px;
 }
@@ -122,16 +121,36 @@
z-index: 2; 
 }
 
+.mwe-upwiz-file.filled, #mwe-upwiz-upload-ctrls {
+   padding: 4px;
+}
+
 .mwe-upwiz-file.filled {
-   padding: 4px;
height: 24px;
+   border-bottom: 1px solid #e0e0e0;
 }
 
-.mwe-upwiz-visible-file {
+.mwe-upwiz-file-indicator {
+   float: left;
+   width: 92px;
+   margin-left: 8px;
+   text-align: center;
+}
+
+.mwe-upwiz-add-files-n {
+   float: left;
+   margin-top: 5px;
+   margin-left: 4px;
+}
+
+#mwe-upwiz-add-file-container.mwe-upwiz-add-files-n, .mwe-upwiz-visible-file {
width: 300px;
height: 18px;
padding-left: 5px;
float: left;
+}
+
+.mwe-upwiz-visible-file {
white-space: nowrap;
overflow: hidden;
 
@@ -160,14 +179,27 @@
 
 
 #mwe-upwiz-files {
-   /* margin-left: 100px; */
+   margin-top: 20px;
 }
 
+.mwe-upwiz-file {
+   margin-left: 50px;
+   width: 410px;
+}
 
+#mwe-upwiz-upload-ctrls {
+   margin-top: 15px;
+   
+}
+
+#mwe-upwiz-add-file-container {
+   /* empty; this changes a lot */ 
+}
+
 .mwe-upwiz-remove {
-   margin-left: 5px;
padding: 5px;
cursor: pointer;
+   text-align: center;
 }
 
 a.mwe-upwiz-remove:link, 
@@ -208,6 +240,11 @@
color: #009900;
 }
 
+.mwe-upwiz-progress-bar {
+   margin-left: 50px;
+}
+
+
 .mwe-upwiz-upload-warning {
background: #e0;
 }
@@ -239,8 +276,11 @@
 }
 
 
+/* XXX this has to be 'centered' beneath the 'x's -- this is about right for 
english but we need a more 
+   robust layout strategy for i18n */
 .proceed {
text-align: right;  
+   width: 410px;
 }
 
 .shim {

Modified: 
branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js
===
--- branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js 
2010-04-01 19:43:16 UTC (rev 64496)
+++ branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js 
2010-04-01 19:48:57 UTC (rev 64497)
@@ -128,6 +128,9 @@
var _this = this;
 
_this.progressBarDiv.progressbar( 'value', parseInt( fraction * 
100 ) );
+   if (fraction > 0.5) {
+   debugger;
+   }
 
var remainingTime;
if (_this.beginTime == null) {
@@ -534,13 +537,13 @@
)
.append( _this.filenameCtrl ).get( 0 );
 
-   _this.progressMessage = $j('').get(0);
+   _this.progressMessage = $j('').get(0);
 
 
-   _this.errorDiv = $j('').get(0);
+   _this.errorDiv = $j('').get(0);
 
-   _this.removeCtrl = $j( 'x' )
+   _this.removeCtrl = $j( 'x' )
.click( function() { _this.upload.remove() } )
.hide()
.get( 0 );
@@ -553,7 +556,7 @@
 
// XXX evil hardcoded
// we don't really need filesdiv if we do it this way?
-   $j( _this.div ).insertBefore( '#mwe-upwiz-add-file-container' ); // 
append( _this.div );
+   $j( _this.div ).insertBefore( '#mwe-upwiz-upload-ctrls' ); // append( 
_this.div );
 
// _this.progressBar = ( no progress bar for individual uploads yet )
// add a details thing to details
@@ -611,7 +614,7 @@
showTransported: function() {
var _this = this;
$j( _this.progressMessage ).removeClass( 
'mwe-upwiz-status-progress' )
-  .addClass( 
'mwe-upwiz-status-transported' )
+  .addClass( 
'mwe-upwiz-status-completed' )
   .html( gM( 'mwe-upwiz-transported' ) 
);
},
 
@@ -1757,10 +1760,16 @@
   + '' + 
gM('mwe-upwiz-intro') + ''
   + ''

[MediaWiki-CVS] SVN: [64496] trunk/phase3/RELEASE-NOTES

2010-04-01 Thread simetrical

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64496

Revision: 64496
Author:   simetrical
Date: 2010-04-01 19:43:16 + (Thu, 01 Apr 2010)

Log Message:
---
Better better RELEASE-NOTES for r64228

I misunderstood what the changes did; see Code Review for r64494.

Modified Paths:
--
trunk/phase3/RELEASE-NOTES

Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES  2010-04-01 18:23:51 UTC (rev 64495)
+++ trunk/phase3/RELEASE-NOTES  2010-04-01 19:43:16 UTC (rev 64496)
@@ -35,8 +35,8 @@
 * Future-proof redirection to fragments in Gecko, so things work a little nicer
   if they fix .
 * Support git:// and mms:// protocols by default for external links
-* (bug 15810) Blocked admins can no longer block/unblock anyone without the
-  'unblockself' permission (which they have by default).
+* (bug 15810) Blocked admins can no longer unblock themselves without the
+  'unblockself' permission (which they have by default)
 
 === Bug fixes in 1.17 ===
 * (bug 17560) Half-broken deletion moved image files to deletion archive 
without
@@ -60,6 +60,7 @@
 * (bug 22903) Revdelete log entries now show in the user preferred language.
 * (bug 22905) Correctly handle  followed by ISBN
 * (bug 22940) Namespace aliases pointing to main namespace don't work
+* (bug 15810) Blocked admins can no longer block/unblock other users
 * (bug 22876) Avoid possible PHP Notice if $wgDefaultUserOptions is not
   correctly set
 * (bug 14952) Page titles are renormalized after html entities are removed so 
that



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64495] branches/js2-work/phase3

2010-04-01 Thread neilk

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64495

Revision: 64495
Author:   neilk
Date: 2010-04-01 18:23:51 + (Thu, 01 Apr 2010)

Log Message:
---
fixing typos left over from some name changes

Modified Paths:
--
branches/js2-work/phase3/includes/OutputPage.php
branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php

Modified: branches/js2-work/phase3/includes/OutputPage.php
===
--- branches/js2-work/phase3/includes/OutputPage.php2010-04-01 18:22:39 UTC 
(rev 64494)
+++ branches/js2-work/phase3/includes/OutputPage.php2010-04-01 18:23:51 UTC 
(rev 64495)
@@ -218,7 +218,7 @@
global $wgDebugJavaScript, $wgJSAutoloadClasses, $IP,
$wgEnableScriptLoader, $wgStyleVersion, 
$wgScriptPath, $wgStylePath;
 
-   $path = jsScriptLoader::getJsPathFromClass( $jsClass );
+   $path = jsScriptLoader::getPathFromClass( $jsClass );
 
if( $path !== false ){
if( $wgEnableScriptLoader ) {
@@ -312,7 +312,7 @@
}else{
// Check for file modified time:
if( $wgScriptModifiedFileCheck ) {
-   $jsPath =  
jsScriptLoader::getJsPathFromClass( $class );
+   $jsPath =  
jsScriptLoader::getPathFromClass( $class );
if( $jsPath ) {
$cur_ftime = filemtime 
( $IP ."/". $jsPath );
if( $cur_ftime > $ftime 
)

Modified: branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php
===
--- branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php  2010-04-01 
18:22:39 UTC (rev 64494)
+++ branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php  2010-04-01 
18:23:51 UTC (rev 64495)
@@ -518,7 +518,7 @@
$reqClass = preg_replace( 
"/[^A-Za-z0-9_\-\.]/", '', $reqClass );
 
$filePath = self::getPathFromClass( 
$reqClass );
-   if( !$jsFilePath ){
+   if( !$filePath ){
$this->errorMsg .= 'Requested 
class: ' . htmlspecialchars( $reqClass ) . ' not found' . "\n";
}else{
$this->jsFileList[ $reqClass ] 
= $filePath;



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64494] trunk/phase3/RELEASE-NOTES

2010-04-01 Thread simetrical

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64494

Revision: 64494
Author:   simetrical
Date: 2010-04-01 18:22:39 + (Thu, 01 Apr 2010)

Log Message:
---
Better RELEASE-NOTES for r64228

It was deliberate that blocked users could unblock themselves, so not a
bug.  Also improve wording in light of r64231, so it's clear that admins
still have this ability by default.

(Apparently forgot to commit this until now.)

Modified Paths:
--
trunk/phase3/RELEASE-NOTES

Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES  2010-04-01 15:37:02 UTC (rev 64493)
+++ trunk/phase3/RELEASE-NOTES  2010-04-01 18:22:39 UTC (rev 64494)
@@ -35,6 +35,8 @@
 * Future-proof redirection to fragments in Gecko, so things work a little nicer
   if they fix .
 * Support git:// and mms:// protocols by default for external links
+* (bug 15810) Blocked admins can no longer block/unblock anyone without the
+  'unblockself' permission (which they have by default).
 
 === Bug fixes in 1.17 ===
 * (bug 17560) Half-broken deletion moved image files to deletion archive 
without
@@ -58,8 +60,6 @@
 * (bug 22903) Revdelete log entries now show in the user preferred language.
 * (bug 22905) Correctly handle  followed by ISBN
 * (bug 22940) Namespace aliases pointing to main namespace don't work
-* (bug 15810) blocked admins can no longer block/unblock other users, nor
-  themselves unless they are given the 'unblockself' permission.
 * (bug 22876) Avoid possible PHP Notice if $wgDefaultUserOptions is not
   correctly set
 * (bug 14952) Page titles are renormalized after html entities are removed so 
that



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64493] branches/js2-work/phase3/js/mwEmbed

2010-04-01 Thread dale

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64493

Revision: 64493
Author:   dale
Date: 2010-04-01 15:37:02 + (Thu, 01 Apr 2010)

Log Message:
---
* added core style sheets to mwEmbed core class loader
* removed some unused css in common.css

Modified Paths:
--
branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php
branches/js2-work/phase3/js/mwEmbed/mwEmbed.js
branches/js2-work/phase3/js/mwEmbed/skins/common/common.css

Modified: branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php
===
--- branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php  2010-04-01 
15:21:01 UTC (rev 64492)
+++ branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php  2010-04-01 
15:37:02 UTC (rev 64493)
@@ -107,15 +107,16 @@
 
// Build the output
// Swap in the appropriate language per js_file
-   foreach ( $this->jsFileList as $classKey => $file_name ) {
+   foreach ( $this->jsFileList as $classKey => $filePath ) {
 
// Get the script content
-   $jstxt = $this->getScriptText( $classKey, $file_name );
+   $jstxt = $this->getScriptText( $classKey, $filePath );
if( $jstxt ){
$this->jsout .= $this->doProcessJs( $jstxt );
}
 
-   // If the core mwEmbed class entry point include all 
the loader js
+   // If the core mwEmbed class entry point add some
+   // other "core" files:
if( $classKey == 'mwEmbed' ){
 
// Output the loaders:
@@ -125,11 +126,11 @@
$this->jsout .= jsClassLoader::getLanguageJs( 
$this->langCode );
 
// Output the "common" css file
-   $filePath = self::getJsPathFromClass( 
'mw.style.common' );
-   if( $filePath ) {
-   $this->jsout .= $this->getScriptText( 
'mw.style.common', $filePath );
-   }
+   $this->jsout .= $this->getScriptText( 
'mw.style.common' );
 
+   // Output the jQuery ui theme css
+   $this->jsout .= $this->getScriptText( 
'mw.style.redmond' );
+
// Output special IE comment tag to support 
special mwEmbed tags.
$NotMinifiedTopJs.='/*...@cc_on\'video source 
itext 
playlist\'.replace(/\w+/g,function(n){document.createElement(n)})@*/'."\n";
}
@@ -256,19 +257,20 @@
 * Get the javascript text content from a given classKey
 *
 * @param {String} $classKey Class Key to grab text for
-* @param {String} [$file_name] Optional file path to get js text
+* @param {String} [$filePath] Optional file path to get js text
 * @return unknown
 */
-   function getScriptText( $classKey, $file_name = '' ){
+   function getScriptText( $classKey ){
$jsout = '';
+   $filePath = self::getPathFromClass( $classKey );
// Special case: title classes
if ( substr( $classKey, 0, 3 ) == 'WT:' ) {
global $wgUser;
// Get just the title part
-   $title_block = substr( $classKey, 3 );
-   if ( $title_block[0] == '-' && strpos( $title_block, 
'|' ) !== false ) {
+   $titleBlock = substr( $classKey, 3 );
+   if ( $titleBlock[0] == '-' && strpos( $titleBlock, '|' 
) !== false ) {
// Special case of "-" title with skin
-   $parts = explode( '|', $title_block );
+   $parts = explode( '|', $titleBlock );
$title = array_shift( $parts );
foreach ( $parts as $tparam ) {
list( $key, $val ) = explode( '=', 
$tparam );
@@ -288,20 +290,20 @@
return $sk->generateUserJs( $skin ) . 
"\n";
}
} else {
-   $ext = substr($title_block, 
strrpos($title_block, '.') + 1);
+   $ext = substr($titleBlock, strrpos($titleBlock, 
'.') + 1);
// Make sure the wiki title ends with .js or 
.css
if ( self::validFileExtension( $ext ) ) {
$this->errorMsg .= 'WikiTitle includes 
should end with .js or .css';
return false;
}

[MediaWiki-CVS] SVN: [64492] USERINFO/svemir

2010-04-01 Thread svemir

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64492

Revision: 64492
Author:   svemir
Date: 2010-04-01 15:21:01 + (Thu, 01 Apr 2010)

Log Message:
---
Adding my USERINFO file.

Added Paths:
---
USERINFO/svemir

Added: USERINFO/svemir
===
--- USERINFO/svemir (rev 0)
+++ USERINFO/svemir 2010-04-01 15:21:01 UTC (rev 64492)
@@ -0,0 +1,3 @@
+name: Svemir Brkic
+email: sve...@deveblog.com
+url: http://www.mediawiki.org/wiki/User:Svemir_Brkic


Property changes on: USERINFO/svemir
___
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: [64491] trunk/extensions/Collection/Collection.body.php

2010-04-01 Thread jojo

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64491

Revision: 64491
Author:   jojo
Date: 2010-04-01 14:15:37 + (Thu, 01 Apr 2010)

Log Message:
---
fix for MediaWiki < 1.16

Modified Paths:
--
trunk/extensions/Collection/Collection.body.php

Modified: trunk/extensions/Collection/Collection.body.php
===
--- trunk/extensions/Collection/Collection.body.php 2010-04-01 13:15:22 UTC 
(rev 64490)
+++ trunk/extensions/Collection/Collection.body.php 2010-04-01 14:15:37 UTC 
(rev 64491)
@@ -1280,7 +1280,7 @@
global $wgCollectionVersion;
 
if ( $method == 'GET') {
-   $url = wfAppendQuery( $url, $postFields );
+   $url = wfAppendQuery( $url, wfArrayToCGI( $postFields ) 
);
}
$c = curl_init( $url );
curl_setopt($c, CURLOPT_PROXY, $wgHTTPProxy);



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64490] trunk/extensions

2010-04-01 Thread svip

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64490

Revision: 64490
Author:   svip
Date: 2010-04-01 13:15:22 + (Thu, 01 Apr 2010)

Log Message:
---
PackageForce init commit.  I'll get on writing a page about its usage in a 
jiffy\!

Added Paths:
---
trunk/extensions/PackageForce/
trunk/extensions/PackageForce/PackageForce.alias.php
trunk/extensions/PackageForce/PackageForce.i18n.php
trunk/extensions/PackageForce/PackageForce.php
trunk/extensions/PackageForce/PackageForce.sql

Added: trunk/extensions/PackageForce/PackageForce.alias.php
===
--- trunk/extensions/PackageForce/PackageForce.alias.php
(rev 0)
+++ trunk/extensions/PackageForce/PackageForce.alias.php2010-04-01 
13:15:22 UTC (rev 64490)
@@ -0,0 +1,8 @@
+ array( 'PackageForce' ),
+'PackageForceAdmin' => array( 'PackageForceAdmin' ),
+);


Property changes on: trunk/extensions/PackageForce/PackageForce.alias.php
___
Added: svn:eol-style
   + native

Added: trunk/extensions/PackageForce/PackageForce.i18n.php
===
--- trunk/extensions/PackageForce/PackageForce.i18n.php 
(rev 0)
+++ trunk/extensions/PackageForce/PackageForce.i18n.php 2010-04-01 13:15:22 UTC 
(rev 64490)
@@ -0,0 +1,25 @@
+ 'PackageForce',
+   'packageforceadmin' => 'PackageForceAdmin',
+   'pf-desc'   => 'Creating a special page to download 
packages of useful templates/etc..',
+   'pf-only-admins-allowed'=> 'This page is only for users with 
the \'packageforce-admin\'-right.',
+   
+   /* admin links */
+   'pf-admin-menu-default' => 'Default',
+   'pf-admin-menu-unsortedtemplates' => 'Templates not yet sorted',
+   'pf-admin-link-view-documentation'  => 'View documentations tied to 
page.',
+   'pf-admin-link-editlink-page'   =>  'Edit page',
+   'pf-admin-link-approve' =>  'Approve page',
+   
+   /* table headers */
+   'pf-header-documentation'   => 'Documentation',
+   'pf-header-in_packages' => 'Packages',
+   'pf-header-edit'=> 'Edit link',
+   'pf-header-type'=> 'Type of page',
+   'pf-header-page_title'  => 'Title',
+   'pf-header-approve' => 'Approve',
+);


Property changes on: trunk/extensions/PackageForce/PackageForce.i18n.php
___
Added: svn:eol-style
   + native

Added: trunk/extensions/PackageForce/PackageForce.php
===
--- trunk/extensions/PackageForce/PackageForce.php  
(rev 0)
+++ trunk/extensions/PackageForce/PackageForce.php  2010-04-01 13:15:22 UTC 
(rev 64490)
@@ -0,0 +1,336 @@
+ __FILE__,
+   'name'=> 'Package Force',
+   'author'  => array( 'Svip' ),
+   'url' => 'http://www.mediawiki.org/wiki/Extension:PackageForce',
+   'description' => 'Creating a special page to download packages of 
useful templates/etc..',
+   'descriptionmsg' => 'pf-desc',
+   'version' => '0.1'
+);
+
+$dir = dirname(__FILE__);
+$wgExtensionMessagesFiles['PackageForce'] = "$dir/PackageForce.i18n.php";
+#$wgExtensionMessagesFiles['PackageForceMagic'] = 
"$dir/PackageForce.i18n.magic.php";
+
+$wgExtensionAliasesFiles['PackageForce'] = "$dir/PackageForce.alias.php";
+$wgSpecialPages['PackageForce'] = 'PackageForceSpecial'; 
+$wgSpecialPages['PackageForceAdmin'] = 'PackageForceAdminSpecial';
+
+# New rights
+$wgGroupPermissions['sysop']['packageforce-admin'] = true;
+$wgGroupPermissions['sysop']['packageforce-edit'] = true;
+
+# Create our own namespace
+define ( 'NS_PACKAGEFORCE', 1300 );
+define ( 'NS_PACKAGEFORCE_TALK', 1301 );
+
+# Only English for now.
+$wgExtraNamespaces[NS_PACKAGEFORCE] = 'PackageForce';
+$wgExtraNamespaces[NS_PACKAGEFORCE_TALK] = 'PackageForce_talk';
+
+$wgNamespaceProtection[NS_PACKAGEFORCE] = 
+   $wgNamespaceProtection[NS_PACKAGEFORCE_TALK] = array ( 
'packageforce-edit' );
+
+class PackageForceAdminSpecial extends SpecialPage {
+   var $package = null;
+   var $view = 'page';
+
+   function __construct() {
+   parent::__construct( 'PackageForceAdmin' );
+   wfLoadExtensionMessages('PackageForceAdmin');
+   }
+ 
+   function execute( $par ) {
+   global $wgRequest, $wgOut, $wgUser;
+ 
+   $this->setHeaders();
+   
+   # Only for admins!
+   if ( !$wgUser->isAllowed ( 'packageforce-admin' ) ) {
+   $wgOut->addWikiMsg ( 'pf-error-only-admins-allowed' );
+   return;
+   }
+   
+

[MediaWiki-CVS] SVN: [64489] trunk/extensions/Poll/archives

2010-04-01 Thread jan

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64489

Revision: 64489
Author:   jan
Date: 2010-04-01 12:49:24 + (Thu, 01 Apr 2010)

Log Message:
---
Rename Poll-install-manuel.sql to Poll-install-manual.sql

Added Paths:
---
trunk/extensions/Poll/archives/Poll-install-manual.sql

Removed Paths:
-
trunk/extensions/Poll/archives/Poll-install-manuel.sql

Copied: trunk/extensions/Poll/archives/Poll-install-manual.sql (from rev 64488, 
trunk/extensions/Poll/archives/Poll-install-manuel.sql)
===
--- trunk/extensions/Poll/archives/Poll-install-manual.sql  
(rev 0)
+++ trunk/extensions/Poll/archives/Poll-install-manual.sql  2010-04-01 
12:49:24 UTC (rev 64489)
@@ -0,0 +1,55 @@
+-- (c) Jan Luca, 2009, CC by-sa 3.0 or later
+-- Table structure for manual installing
+-- Replace /*$wgDBprefix*/ with the proper prefix
+-- Replace /*$wgDBTableOptions*/ with the correct options
+
+CREATE TABLE /*$wgDBprefix*/poll (
+`id` INT( 10 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`question` VARCHAR( 255 ) NOT NULL ,
+`alternative_1` VARCHAR( 255 ) NOT NULL ,
+`alternative_2` VARCHAR( 255 ) NOT NULL ,
+`alternative_3` VARCHAR( 255 ) NOT NULL ,
+`alternative_4` VARCHAR( 255 ) NOT NULL ,
+`alternative_5` VARCHAR( 255 ) NOT NULL ,
+`alternative_6` VARCHAR( 255 ) NOT NULL
+) /*$wgDBTableOptions*/;
+
+CREATE TABLE /*$wgDBprefix*/poll_answer (
+`pid` INT( 10 ) NOT NULL ,
+`uid` INT( 10 ) NOT NULL ,
+`vote` VARCHAR( 255 ) NOT NULL
+) /*$wgDBTableOptions*/;
+
+CREATE TABLE /*$wgDBprefix*/poll_start_log (
+`time` INT( 30 ) NOT NULL
+) /*$wgDBTableOptions*/;
+
+
+-- New fields for poll
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `creater` VARCHAR( 255 ) NOT NULL;
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `dis` VARCHAR( 255 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `multi` INT( 1 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `ip` INT( 1 ) NOT NULL ;
+
+
+-- New fields for poll_answer
+
+ALTER TABLE /*$wgDBprefix*/poll_answer 
+ADD `user` VARCHAR( 255 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll_answer 
+ADD `isset_vote_other` INT( 1 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll_answer 
+ADD `vote_other` VARCHAR( 255 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll_answer 
+ADD `ip` VARCHAR( 255 ) NOT NULL ;
\ No newline at end of file

Deleted: trunk/extensions/Poll/archives/Poll-install-manuel.sql
===
--- trunk/extensions/Poll/archives/Poll-install-manuel.sql  2010-04-01 
12:48:15 UTC (rev 64488)
+++ trunk/extensions/Poll/archives/Poll-install-manuel.sql  2010-04-01 
12:49:24 UTC (rev 64489)
@@ -1,55 +0,0 @@
--- (c) Jan Luca, 2009, CC by-sa 3.0 or later
--- Table structure for manual installing
--- Replace /*$wgDBprefix*/ with the proper prefix
--- Replace /*$wgDBTableOptions*/ with the correct options
-
-CREATE TABLE /*$wgDBprefix*/poll (
-`id` INT( 10 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`question` VARCHAR( 255 ) NOT NULL ,
-`alternative_1` VARCHAR( 255 ) NOT NULL ,
-`alternative_2` VARCHAR( 255 ) NOT NULL ,
-`alternative_3` VARCHAR( 255 ) NOT NULL ,
-`alternative_4` VARCHAR( 255 ) NOT NULL ,
-`alternative_5` VARCHAR( 255 ) NOT NULL ,
-`alternative_6` VARCHAR( 255 ) NOT NULL
-) /*$wgDBTableOptions*/;
-
-CREATE TABLE /*$wgDBprefix*/poll_answer (
-`pid` INT( 10 ) NOT NULL ,
-`uid` INT( 10 ) NOT NULL ,
-`vote` VARCHAR( 255 ) NOT NULL
-) /*$wgDBTableOptions*/;
-
-CREATE TABLE /*$wgDBprefix*/poll_start_log (
-`time` INT( 30 ) NOT NULL
-) /*$wgDBTableOptions*/;
-
-
--- New fields for poll
-
-ALTER TABLE /*$wgDBprefix*/poll 
-ADD `creater` VARCHAR( 255 ) NOT NULL;
-
-ALTER TABLE /*$wgDBprefix*/poll 
-ADD `dis` VARCHAR( 255 ) NOT NULL ;
-
-ALTER TABLE /*$wgDBprefix*/poll 
-ADD `multi` INT( 1 ) NOT NULL ;
-
-ALTER TABLE /*$wgDBprefix*/poll 
-ADD `ip` INT( 1 ) NOT NULL ;
-
-
--- New fields for poll_answer
-
-ALTER TABLE /*$wgDBprefix*/poll_answer 
-ADD `user` VARCHAR( 255 ) NOT NULL ;
-
-ALTER TABLE /*$wgDBprefix*/poll_answer 
-ADD `isset_vote_other` INT( 1 ) NOT NULL ;
-
-ALTER TABLE /*$wgDBprefix*/poll_answer 
-ADD `vote_other` VARCHAR( 255 ) NOT NULL ;
-
-ALTER TABLE /*$wgDBprefix*/poll_answer 
-ADD `ip` VARCHAR( 255 ) NOT NULL ;
\ No newline at end of file



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64488] trunk/extensions/Poll/archives

2010-04-01 Thread jan

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64488

Revision: 64488
Author:   jan
Date: 2010-04-01 12:48:15 + (Thu, 01 Apr 2010)

Log Message:
---
Files for DB and manual install

Added Paths:
---
trunk/extensions/Poll/archives/Poll-install-manuel.sql
trunk/extensions/Poll/archives/Poll-start-log.sql
trunk/extensions/Poll/archives/patch-end.sql
trunk/extensions/Poll/archives/patch-runtime.sql
trunk/extensions/Poll/archives/patch-starttime.sql

Added: trunk/extensions/Poll/archives/Poll-install-manuel.sql
===
--- trunk/extensions/Poll/archives/Poll-install-manuel.sql  
(rev 0)
+++ trunk/extensions/Poll/archives/Poll-install-manuel.sql  2010-04-01 
12:48:15 UTC (rev 64488)
@@ -0,0 +1,55 @@
+-- (c) Jan Luca, 2009, CC by-sa 3.0 or later
+-- Table structure for manual installing
+-- Replace /*$wgDBprefix*/ with the proper prefix
+-- Replace /*$wgDBTableOptions*/ with the correct options
+
+CREATE TABLE /*$wgDBprefix*/poll (
+`id` INT( 10 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`question` VARCHAR( 255 ) NOT NULL ,
+`alternative_1` VARCHAR( 255 ) NOT NULL ,
+`alternative_2` VARCHAR( 255 ) NOT NULL ,
+`alternative_3` VARCHAR( 255 ) NOT NULL ,
+`alternative_4` VARCHAR( 255 ) NOT NULL ,
+`alternative_5` VARCHAR( 255 ) NOT NULL ,
+`alternative_6` VARCHAR( 255 ) NOT NULL
+) /*$wgDBTableOptions*/;
+
+CREATE TABLE /*$wgDBprefix*/poll_answer (
+`pid` INT( 10 ) NOT NULL ,
+`uid` INT( 10 ) NOT NULL ,
+`vote` VARCHAR( 255 ) NOT NULL
+) /*$wgDBTableOptions*/;
+
+CREATE TABLE /*$wgDBprefix*/poll_start_log (
+`time` INT( 30 ) NOT NULL
+) /*$wgDBTableOptions*/;
+
+
+-- New fields for poll
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `creater` VARCHAR( 255 ) NOT NULL;
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `dis` VARCHAR( 255 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `multi` INT( 1 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `ip` INT( 1 ) NOT NULL ;
+
+
+-- New fields for poll_answer
+
+ALTER TABLE /*$wgDBprefix*/poll_answer 
+ADD `user` VARCHAR( 255 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll_answer 
+ADD `isset_vote_other` INT( 1 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll_answer 
+ADD `vote_other` VARCHAR( 255 ) NOT NULL ;
+
+ALTER TABLE /*$wgDBprefix*/poll_answer 
+ADD `ip` VARCHAR( 255 ) NOT NULL ;
\ No newline at end of file


Property changes on: trunk/extensions/Poll/archives/Poll-install-manuel.sql
___
Added: svn:eol-style
   + native

Added: trunk/extensions/Poll/archives/Poll-start-log.sql
===
--- trunk/extensions/Poll/archives/Poll-start-log.sql   
(rev 0)
+++ trunk/extensions/Poll/archives/Poll-start-log.sql   2010-04-01 12:48:15 UTC 
(rev 64488)
@@ -0,0 +1,8 @@
+-- (c) Jan Luca, 2009, CC by-sa 3.0 or later
+-- Table structure for table `Poll`
+-- Replace /*$wgDBprefix*/ with the proper prefix
+-- Replace /*$wgDBTableOptions*/ with the correct options
+
+CREATE TABLE /*$wgDBprefix*/poll_start_log (
+`time` INT( 30 ) NOT NULL
+) /*$wgDBTableOptions*/;
\ No newline at end of file


Property changes on: trunk/extensions/Poll/archives/Poll-start-log.sql
___
Added: svn:eol-style
   + native

Added: trunk/extensions/Poll/archives/patch-end.sql
===
--- trunk/extensions/Poll/archives/patch-end.sql
(rev 0)
+++ trunk/extensions/Poll/archives/patch-end.sql2010-04-01 12:48:15 UTC 
(rev 64488)
@@ -0,0 +1,6 @@
+-- (c) Jan Luca, 2009, CC by-sa 3.0 or later
+-- Table structure for table `Poll`
+-- Replace /*$wgDBprefix*/ with the proper prefix
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `end` INT( 1 ) NOT NULL ;
\ No newline at end of file


Property changes on: trunk/extensions/Poll/archives/patch-end.sql
___
Added: svn:eol-style
   + native

Added: trunk/extensions/Poll/archives/patch-runtime.sql
===
--- trunk/extensions/Poll/archives/patch-runtime.sql
(rev 0)
+++ trunk/extensions/Poll/archives/patch-runtime.sql2010-04-01 12:48:15 UTC 
(rev 64488)
@@ -0,0 +1,6 @@
+-- (c) Jan Luca, 2009, CC by-sa 3.0 or later
+-- Table structure for table `Poll`
+-- Replace /*$wgDBprefix*/ with the proper prefix
+
+ALTER TABLE /*$wgDBprefix*/poll 
+ADD `runtime` INT( 10 ) NOT NULL ;
\ No newline at end of file


Property changes on: trunk/extensions/Poll/archives/patch-runtime.sql
___
Added: svn:eol-style
   + native

Added: trunk/extensions/Poll/archives/patch-starttime.sql
===
--

[MediaWiki-CVS] SVN: [64487] trunk/phase3/includes/AutoLoader.php

2010-04-01 Thread happy-melon

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64487

Revision: 64487
Author:   happy-melon
Date: 2010-04-01 12:44:42 + (Thu, 01 Apr 2010)

Log Message:
---
Follow-up to r64478 - pull out debugging code

Modified Paths:
--
trunk/phase3/includes/AutoLoader.php

Modified: trunk/phase3/includes/AutoLoader.php
===
--- trunk/phase3/includes/AutoLoader.php2010-04-01 12:20:41 UTC (rev 
64486)
+++ trunk/phase3/includes/AutoLoader.php2010-04-01 12:44:42 UTC (rev 
64487)
@@ -684,7 +684,7 @@
AutoLoader::loadAllExtensions();
 }
 
-if ( function_exists( 'spl_autoload_register' ) && false ) {
+if ( function_exists( 'spl_autoload_register' ) ) {
spl_autoload_register( array( 'AutoLoader', 'autoload' ) );
 } else {
function __autoload( $class ) {



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64486] trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/ wikiword/wikis/WikiConfiguration_enwiki.java

2010-04-01 Thread daniel

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64486

Revision: 64486
Author:   daniel
Date: 2010-04-01 12:20:41 + (Thu, 01 Apr 2010)

Log Message:
---
improved enwiki concept type detection

Modified Paths:
--

trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/WikiConfiguration_enwiki.java

Modified: 
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/WikiConfiguration_enwiki.java
===
--- 
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/WikiConfiguration_enwiki.java
 2010-04-01 12:20:13 UTC (rev 64485)
+++ 
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/wikis/WikiConfiguration_enwiki.java
 2010-04-01 12:20:41 UTC (rev 64486)
@@ -144,10 +144,10 @@
stripClutterManglers.add( new 
RegularExpressionMangler("rank\\s*=\\s*\\[\\[List[ _]of[ 
_][-\\w\\d\\s]+?\\|\\s*Ranked\\s+\\{\\{[-\\w\\d\\s]+?counties\\s*\\|\\s*\\w+=[-\\w\\d\\s]+\\}\\}\\]\\]",
 "", 0));
 
conceptTypeSensors.add( new 
HasCategoryLikeSensor(ConceptType.PLACE, 
-   
"^(Geography_of|Places|Villages|Towns|Cities|Captials?|Counties|Countries|Municipalities|Settlements|States|Provinces|Territories|Federal_states|Islands|Regions|Domains|Communes|Districts|Locations)"
 +
-  
"(_|$)|_(places|villages|towns|cities|capitals|counties|countries|municipalities|settlements|states|provinces|territories|federal_states|islands|regions|domains|communes|districts|locations)$",
 0));
+   
"^(NUTS|Geography_of|Places|Villages|Towns|Cities|Captials?|Constituencies|Counties|Countries|Municipalities|Settlements|States|Provinces|Territories|Federal_states|Islands|Regions|Domains|Communes|Districts|Locations)"
 +
+  
"(_|$)|_(places|villages|towns|cities|capitals|constituencies(_.*)?|counties|countries|municipalities|settlements|states|provinces|territories|federal_states|islands|regions|domains|communes|districts|locations)$",
 0));

-   conceptTypeSensors.add( new 
HasTemplateLikeSensor(ConceptType.PLACE, 
"^(Geobox|Infobox_([Ss]ettlement|[Cc]ountry|[Ss]tate|[Ll]ocation))$", 0));
+   conceptTypeSensors.add( new 
HasTemplateLikeSensor(ConceptType.PLACE, 
"^(Geobox|Infobox_(.*_)?([Ss]ettlement|[Cc]ountry|[Ss]tate|[Ll]ocation|[Cc]ounty)|.*_constituency_infobox)$",
 0));

conceptTypeSensors.add( new 
HasCategoryLikeSensor(ConceptType.PERSON, 
"^(Male|Female|People)_|_(people|men|women|births|deaths)$", 0));
conceptTypeSensors.add( new 
HasTemplateLikeSensor(ConceptType.PERSON, 
"^(Persondata|Lifetime|BD|BIRTH-DEATH-SORT|Infobox.*_(person|[aA]rtist|creator|writer|musician|biography|clergy|scientist))$",
 0));



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64485] trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/ disambig

2010-04-01 Thread daniel

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64485

Revision: 64485
Author:   daniel
Date: 2010-04-01 12:20:13 + (Thu, 01 Apr 2010)

Log Message:
---
disambiguator tweaks: meaning overrides, etc

Modified Paths:
--

trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/AbstractDisambiguator.java

trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/PopularityDisambiguator.java

trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/SlidingCoherenceDisambiguator.java

Modified: 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/AbstractDisambiguator.java
===
--- 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/AbstractDisambiguator.java
2010-04-01 12:05:46 UTC (rev 64484)
+++ 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/AbstractDisambiguator.java
2010-04-01 12:20:13 UTC (rev 64485)
@@ -1,6 +1,8 @@
 package de.brightbyte.wikiword.disambig;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -11,18 +13,46 @@
 
 public abstract class AbstractDisambiguator implements Disambiguator {
 
-   protected MeaningCache.Manager meaningCacheManager;
+   private MeaningCache.Manager meaningCacheManager;

-   protected Output trace;
+   private Output trace;
+
+   private Map meaningOverrides;

public AbstractDisambiguator(MeaningFetcher 
meaningFetcher) {
if (meaningFetcher==null) throw new NullPointerException();
this.meaningCacheManager = new 
MeaningCache.Manager(meaningFetcher, 10);
}
 
+   public void setMeaningOverrides(Map overrideMap) {
+   this.meaningOverrides = overrideMap;
+   }   
+
+   protected Map> getMeanings(List 
terms) throws PersistenceException {
+   List todo = terms;
+   
+   if (meaningOverrides!=null) {
+   todo = new ArrayList();
+   for (X t: terms) {
+   if (!meaningOverrides.containsKey(t)) 
todo.add(t);
+   }
+   }
+   
+   MeaningCache mcache = meaningCacheManager.newCache();
+   Map> meanings = mcache.getMeanings(todo);
+   
+   if (meaningOverrides!=null && todo.size()!=terms.size()) {
+   for (X t: terms) {
+   C c = meaningOverrides.get(t);
+   if (c!=null) meanings.put(t, 
Collections.singletonList(c));
+   }
+   }
+
+   return meanings;
+   }
+   
public Result disambiguate(List terms, 
Collection context) throws PersistenceException {
-   MeaningCache mcache = meaningCacheManager.newCache();
-   Map> meanings = mcache.getMeanings(terms);
+   Map> meanings = getMeanings(terms);
return disambiguate(terms, meanings, context);
}


Modified: 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/PopularityDisambiguator.java
===
--- 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/PopularityDisambiguator.java
  2010-04-01 12:05:46 UTC (rev 64484)
+++ 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/PopularityDisambiguator.java
  2010-04-01 12:20:13 UTC (rev 64485)
@@ -45,7 +45,7 @@
List m = meanings.get(t);
if (m==null || m.size()==0) continue;

-   if (m.size()>0) Collections.sort(m, 
popularityComparator);
+   if (m.size()>1) Collections.sort(m, 
popularityComparator);

LocalConcept c = m.get(0);
disambig.put(t, c);

Modified: 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/SlidingCoherenceDisambiguator.java
===
--- 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/SlidingCoherenceDisambiguator.java
2010-04-01 12:05:46 UTC (rev 64484)
+++ 
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/disambig/SlidingCoherenceDisambiguator.java
2010-04-01 12:20:13 UTC (rev 64485)
@@ -22,6 +22,7 @@
 public class SlidingCoherenceDisambiguator extends CoherenceDisambiguator {
 
protected int window ; 
+   protected boolean runningStart = false;

public SlidingCoherenceDisambiguator(MeaningFetcher 
meaningFetcher, FeatureFetcher featureFetcher, boolean 
featuresAreNormalized) {
this(meaningFetcher, featureFetch

[MediaWiki-CVS] SVN: [64484] trunk/phase3/includes/Article.php

2010-04-01 Thread ialex

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64484

Revision: 64484
Author:   ialex
Date: 2010-04-01 12:05:46 + (Thu, 01 Apr 2010)

Log Message:
---
Removed unused variable

Modified Paths:
--
trunk/phase3/includes/Article.php

Modified: trunk/phase3/includes/Article.php
===
--- trunk/phase3/includes/Article.php   2010-04-01 11:55:10 UTC (rev 64483)
+++ trunk/phase3/includes/Article.php   2010-04-01 12:05:46 UTC (rev 64484)
@@ -805,8 +805,6 @@
}
}
 
-   $sk = $wgUser->getSkin();
-
# getOldID may want us to redirect somewhere else
if ( $this->mRedirectUrl ) {
$wgOut->redirect( $this->mRedirectUrl );



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64483] trunk/extensions/SecurePoll/includes

2010-04-01 Thread happy-melon

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64483

Revision: 64483
Author:   happy-melon
Date: 2010-04-01 11:55:10 + (Thu, 01 Apr 2010)

Log Message:
---
Follow-ups to r58887.  There might be some stuff from my configuration 
interface work jumbled in; but hopefully that's kept separate.

Modified Paths:
--
trunk/extensions/SecurePoll/includes/ballots/Ballot.php
trunk/extensions/SecurePoll/includes/entities/Election.php
trunk/extensions/SecurePoll/includes/entities/Entity.php
trunk/extensions/SecurePoll/includes/entities/Question.php
trunk/extensions/SecurePoll/includes/main/Context.php
trunk/extensions/SecurePoll/includes/main/Store.php
trunk/extensions/SecurePoll/includes/talliers/PluralityTallier.php

Modified: trunk/extensions/SecurePoll/includes/ballots/Ballot.php
===
--- trunk/extensions/SecurePoll/includes/ballots/Ballot.php 2010-04-01 
11:37:05 UTC (rev 64482)
+++ trunk/extensions/SecurePoll/includes/ballots/Ballot.php 2010-04-01 
11:55:10 UTC (rev 64483)
@@ -176,6 +176,53 @@
function formatStatus( $status ) {
return $status->sp_getHTML( $this->usedErrorIds );
}
+   
+   /**
+* Get the way the voter cast their vote previously, if we're allowed
+* to show that information.
+* @return false on failure or if cast ballots are hidden, or the output
+* of unpackRecord().
+*/
+   function getCurrentVote(){
+   
+   if( !$this->election->getOption( 'show-change' ) ){
+   return false;
+   }
+   
+   $auth = $this->election->getAuth();
+
+   # Get voter from session
+   $voter = $auth->getVoterFromSession( $this->election );
+   # If there's no session, try creating one.
+   # This will fail if the user is not authorised to vote in the 
election
+   if ( !$voter ) {
+   $status = $auth->newAutoSession( $this->election );
+   if ( $status->isOK() ) {
+   $voter = $status->value;
+   } else {
+   return false;
+   }
+   }
+   
+   $store = $this->context->getStore();
+   $status = $store->callbackValidVotes(
+   $this->election->info['id'],
+   array( $this, 'getCurrentVoteCallback' ),
+   $voter->getId()
+   );
+   if( !$status->isOK() ){
+   return false;
+   }
+   
+   return isset( $this->currentVote )
+   ? $this->unpackRecord( $this->currentVote )
+   : false;
+   }
+   
+   function getCurrentVoteCallback( $store, $record ){
+   $this->currentVote = $record;
+   return Status::newGood();
+   }
 }
 
 class SecurePoll_BallotStatus extends Status {

Modified: trunk/extensions/SecurePoll/includes/entities/Election.php
===
--- trunk/extensions/SecurePoll/includes/entities/Election.php  2010-04-01 
11:37:05 UTC (rev 64482)
+++ trunk/extensions/SecurePoll/includes/entities/Election.php  2010-04-01 
11:55:10 UTC (rev 64483)
@@ -53,17 +53,20 @@
  */
 class SecurePoll_Election extends SecurePoll_Entity {
var $questions, $auth, $ballot;
-   var $title, $ballotType, $tallyType, $primaryLang, $startDate, 
$endDate, $authType;
+   var $id, $title, $ballotType, $tallyType, $primaryLang;
+   var $startDate, $endDate, $authType;
 
/**
 * Constructor. 
 *
-* Do not use this constructor directly, instead use 
SecurePoll_Context::getElection(). 
+* Do not use this constructor directly, instead use 
+* SecurePoll_Context::getElection(). 
 *
 * @param $id integer
 */
function __construct( $context, $info ) {
parent::__construct( $context, 'election', $info );
+   $this->id = $info['id'];
$this->title = $info['title'];
$this->ballotType = $info['ballot'];
$this->tallyType = $info['tally'];
@@ -85,6 +88,13 @@
'unqualified-error',
);
}
+   
+   /**
+* Get the election's parent election... hmm...
+*/
+   function getElection() {
+   return $this->id;
+   }
 
/**
 * Get a list of child entity objects. See SecurePoll_Entity.

Modified: trunk/extensions/SecurePoll/includes/entities/Entity.php
===
--- trunk/extensions/SecurePoll/includes/entities/Entity.php2010-

[MediaWiki-CVS] SVN: [64482] trunk/extensions/NaturalLanguageList/NaturalLanguageList.php

2010-04-01 Thread svip

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64482

Revision: 64482
Author:   svip
Date: 2010-04-01 11:37:05 + (Thu, 01 Apr 2010)

Log Message:
---
Tidying up code, added comments to each function, etc.

Modified Paths:
--
trunk/extensions/NaturalLanguageList/NaturalLanguageList.php

Modified: trunk/extensions/NaturalLanguageList/NaturalLanguageList.php
===
--- trunk/extensions/NaturalLanguageList/NaturalLanguageList.php
2010-04-01 11:36:47 UTC (rev 64481)
+++ trunk/extensions/NaturalLanguageList/NaturalLanguageList.php
2010-04-01 11:37:05 UTC (rev 64482)
@@ -55,7 +55,7 @@
 $wgParserTestFiles[] = dirname( __FILE__ ) . "/nllParserTests.txt";
 
 class NaturalLanguageList {
-
+   
public static function onParserFirstCallInit( $parser ) {
$parser->setFunctionHook( 
'list', 
@@ -69,7 +69,15 @@
);
return true;
}
-
+   
+   /**
+* Render {{#list:}}
+*
+* @param $parser Parser
+* @param $frame PPFrame_DOM
+* @param $args Array
+* @return wikicode parsed
+*/
public static function render( $parser, $frame, $args ) {
if ( count( $args ) == 0 ) {
return '';
@@ -80,33 +88,39 @@
 
return $obj->outputList();
}
-
+   
+   /**
+* Render {{#rawlist:}}
+*
+* @param $parser Parser
+* @param $frame PPFrame_DOM
+* @param $args Array
+* @return wikicode parsed
+*/
public static function renderRaw ( $parser, $frame, $args ) {
if ( count( $args ) == 0 ) {
return '';
}
-
-   $obj = new self( $parser, $frame, $args );
-   
+   $obj = new self( $parser, $frame, $args );  
+   # get separator between data
$separator = $obj->mArgs[0];
-   
-   $obj->readOptions( true, $separator );  
-   
+   $obj->readOptions( true, $separator );
$obj->readArgs( $separator );
 
return $obj->outputList();
}
+   
private $mParser;
private $mFrame;
public $mArgs;  
private $mSeparator = null;
private $mOptions = array(
-   'fieldsperitem' => -1,
-   'duplicates' => true,
-   'blanks' => false,
-   'itemoutput' => null,
-   'outputseparator' => null,
-   'lastseparator' => null,
+   'fieldsperitem' => -1,  # size of pairs
+   'duplicates' => true,   # allow same elements to appear
+   'blanks' => false,  # allow blank elements 
to appear
+   'itemoutput' => null,   # the format for each element
+   'outputseparator' => null,  # the separator between output 
elements
+   'lastseparator' => null,# the separator between the 
last two elements
);
private $mReaditems = array();
public $mParams = array();
@@ -129,31 +143,41 @@
 */
private function outputList() {
 
-   // Convert each item from an array into a string according to 
the format.
+   # Convert each item from an array into a string according to 
the format.
$items = array_map( array( $this, 'formatOutputItem' ), 
$this->mParams );
 
-   // If there's only one item, there are no separators
+   # If there's only one item, there are no separators
if ( count( $items ) === 1 )
return $items[0];
 
-   // Otherwise remove the last from the list so that we can 
implode() the remainder
+   # Otherwise remove the last from the list so that we can 
implode() the remainder
$last = array_pop( $items );
 
return implode( $this->mOptions['outputseparator'], $items ) . 
$this->mOptions['lastseparator'] . $last;
}
 
-   // Format the input pairs that make up each output item using the given 
format
+   /**
+* Format the input pairs that make up each output item using the given 
format
+*
+* @param $pair array or string
+* @return string formatted output
+*/
private function formatOutputItem( $pair ) {
return wfMsgReplaceArgs( $this->mOptions['itemoutput'], $pair );
}
 
/**
 * Create $this->mParams from $this->mReaditems using $this->mOptions.
+*
+* @param $separator [default:null] Input separator (e.g. ',')
 */
private function readArgs( $separator=null ) {
$items = array(); # array of args to include
 
-

[MediaWiki-CVS] SVN: [64481] USERINFO/svip

2010-04-01 Thread svip

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64481

Revision: 64481
Author:   svip
Date: 2010-04-01 11:36:47 + (Thu, 01 Apr 2010)

Log Message:
---
Tidying up my USERINFO file.

Modified Paths:
--
USERINFO/svip

Modified: USERINFO/svip
===
--- USERINFO/svip   2010-04-01 11:25:56 UTC (rev 64480)
+++ USERINFO/svip   2010-04-01 11:36:47 UTC (rev 64481)
@@ -1,3 +1,3 @@
-name: David Udsen
+name: Svip
 email: s...@diku.dk
 url: http://mediawiki.org/wiki/User:Svippong



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64480] trunk/phase3/includes/api/ApiBase.php

2010-04-01 Thread mah

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64480

Revision: 64480
Author:   mah
Date: 2010-04-01 11:25:56 + (Thu, 01 Apr 2010)

Log Message:
---
followup r64465 ?\226?\128?\148 make happy-melon happy

Modified Paths:
--
trunk/phase3/includes/api/ApiBase.php

Modified: trunk/phase3/includes/api/ApiBase.php
===
--- trunk/phase3/includes/api/ApiBase.php   2010-04-01 11:14:16 UTC (rev 
64479)
+++ trunk/phase3/includes/api/ApiBase.php   2010-04-01 11:25:56 UTC (rev 
64480)
@@ -475,7 +475,7 @@
$params = $this->getFinalParams();
$results = array();
 
-   if($params) { // getFinalParams() can return false
+   if( $params ) { // getFinalParams() can return false
foreach ( $params as $paramName => $paramSettings ) {
$results[$paramName] = 
$this->getParameterFromSettings( $paramName, $paramSettings, $parseLimit );
}



___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [64479] trunk/extensions/Poll

2010-04-01 Thread jan

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64479

Revision: 64479
Author:   jan
Date: 2010-04-01 11:14:16 + (Thu, 01 Apr 2010)

Log Message:
---
Add the poll-score right for viewing the score of the Polls

Modified Paths:
--
trunk/extensions/Poll/Poll.i18n.php
trunk/extensions/Poll/Poll.php
trunk/extensions/Poll/Poll_body.php

Modified: trunk/extensions/Poll/Poll.i18n.php
===
--- trunk/extensions/Poll/Poll.i18n.php 2010-04-01 10:50:43 UTC (rev 64478)
+++ trunk/extensions/Poll/Poll.i18n.php 2010-04-01 11:14:16 UTC (rev 64479)
@@ -19,15 +19,17 @@
'poll-title-score' => 'Score',
'poll-create-right-error' => 'You are not allowed to create a new 
poll(needed right: poll-create)',
'poll-vote-right-error' => 'You are not allowed to vote(needed right: 
poll-vote)',
+   'poll-score-right-error' => 'You are not allowed to view the 
score(needed right: poll-score)',
'poll-alternative' => 'Alternative',
'poll-question' => 'Question',
'poll-submit' => 'Submit',
'right-poll-create' => 'Create Poll',
'right-poll-vote' => 'Vote by a Poll',
'right-poll-admin' => 'Manage the Polls',
+   'right-poll-score' => 'View the score of the Polls',
'poll-create-fields-error' => 'The fields Question, Alternative 1 and 
Alternative 2 must be set',
'poll-dis' => 'Description',
-   'poll-list-current' => '== Current Polls ==',
+   'poll-list-current' => 'Current Polls',
'poll-create-pass' => 'Poll created!',
'poll-vote-pass' => 'Voted!',
'poll-vote-already-error' => 'You has already voted!',
@@ -60,7 +62,15 @@
'poll-vote-other' => 'Other answers:',
'poll-ip-error' => 'Unregistered person can not vote at this poll!',
'poll-create-allow-ip' => 'Allow unregistered users to vote',
-   'poll-vote-error-ip-change' => 'Unregistered users can not change his 
vote!',
+   'poll-vote-error-ip-change' => 'Someone has already voted with your IP 
and unregistered users can not change his vote!',
+   'poll-runtime' => 'Runtime:',
+   'poll-runtime-1-day' => '1 Day',
+   'poll-runtime-2-days' => '2 Days',
+   'poll-runtime-1-week' => '1 Week',
+   'poll-runtime-2-weeks' => '2 Weeks',
+   'poll-runtime-3-weeks' => '3 Weeks',
+   'poll-runtime-4-weeks' => '4 Weeks',
+   'poll-list-old' => 'Old Polls',
 );
 
 /** German (Deutsch)
@@ -74,15 +84,17 @@
'poll-title-score' => 'Auswertung',
'poll-create-right-error' => 'Leider darfst du keine neue Umfrage 
erstellen(benötige Gruppenberechttigung: poll-create)',
'poll-vote-right-error' => 'Leider darfst du nicht abstimmen(benötige 
Gruppenberechttigung: poll-vote)',
+   'poll-score-right-error' => 'Leider darfst du nicht die Auswertung 
betrachten(benötige Gruppenberechttigung: poll-score)',
'poll-alternative' => 'Antwortmöglichkeit',
'poll-question' => 'Frage',
'poll-submit' => 'Absenden',
'right-poll-create' => 'Umfrage erstellen',
'right-poll-vote' => 'Bei einer Umfrage abstimmen',
'right-poll-admin' => 'Umfragen verwalten',
+   'right-poll-score' => 'Auswertung der Umfragen betrachten',
'poll-create-fields-error' => 'Die Felder Frage, Antwortmöglichkeit 1 
sowie Antwortmöglichkeit 2 müssen ausgefüllt sein',
'poll-dis' => 'Beschreibung',
-   'poll-list-current' => '== Aktuelle Umfragen ==',
+   'poll-list-current' => 'Aktuelle Umfragen',
'poll-create-pass' => 'Umfrage erfolgreich erstellt!',
'poll-vote-pass' => 'Erfolgreich abgestimmt!',
'poll-vote-already-error' => 'Du hast bereits abgestimmt!',
@@ -115,5 +127,13 @@
'poll-vote-other' => 'Andere Antworten:',
'poll-ip-error' => 'Nicht registrierte Benutzer können bei dieser 
Umfrage nicht abstimmen!',
'poll-create-allow-ip' => 'Erlaube nicht registrierten Benutzer 
abzustimmen',
-   'poll-vote-error-ip-change' => 'Leider können nicht registrierten 
Benutzer ihr Stimme nicht nachträglich ändern!',
+   'poll-vote-error-ip-change' => 'Ihre Stimme wurde nicht gezählt, da mit 
Ihrer IP-Adresse wurde bereits eine Stimme abgegeben wurde und nicht 
registierte Benutzer ihre Stimme nicht nachträglich ändern dürfen.',
+   'poll-runtime' => 'Laufzeit:',
+   'poll-runtime-1-day' => '1 Tag',
+   'poll-runtime-2-days' => '2 Tage',
+   'poll-runtime-1-week' => '1 Woche',
+   'poll-runtime-2-weeks' => '2 Wochen',
+   'poll-runtime-3-weeks' => '3 Wochen',
+   'poll-runtime-4-weeks' => '4 Wochen',
+   'poll-list-old' => 'Alte Umfragen',
 );

Modified: trunk/extensions/Poll/Poll.php
===
--- trunk/extensions/Poll/Poll.php  2010-04-01 10:50:43 UTC (rev 64478)
+++ trunk/extensions/Poll/Poll.php  2010-04-01 11:14:16 UTC (rev

[MediaWiki-CVS] SVN: [64477] trunk/extensions/FirefoggChunkedUpload

2010-04-01 Thread ialex

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64477

Revision: 64477
Author:   ialex
Date: 2010-04-01 10:06:31 + (Thu, 01 Apr 2010)

Log Message:
---
svn:eol-style native

Property Changed:

trunk/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php
trunk/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php
trunk/extensions/FirefoggChunkedUpload/tests/UploadFromChunksTest.php
trunk/extensions/FirefoggChunkedUpload/tests/bootstrap.php
trunk/extensions/FirefoggChunkedUpload/tests/phpunit.xml


Property changes on: 
trunk/extensions/FirefoggChunkedUpload/ApiFirefoggChunkedUpload.php
___
Added: svn:eol-style
   + native


Property changes on: 
trunk/extensions/FirefoggChunkedUpload/FirefoggChunkedUploadHandler.php
___
Added: svn:eol-style
   + native


Property changes on: 
trunk/extensions/FirefoggChunkedUpload/tests/UploadFromChunksTest.php
___
Added: svn:eol-style
   + native


Property changes on: trunk/extensions/FirefoggChunkedUpload/tests/bootstrap.php
___
Added: svn:eol-style
   + native


Property changes on: trunk/extensions/FirefoggChunkedUpload/tests/phpunit.xml
___
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: [64476] USERINFO/svip

2010-04-01 Thread svip

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64476

Revision: 64476
Author:   svip
Date: 2010-04-01 10:04:15 + (Thu, 01 Apr 2010)

Log Message:
---
Adding my USERINFO file.

Added Paths:
---
USERINFO/svip

Added: USERINFO/svip
===
--- USERINFO/svip   (rev 0)
+++ USERINFO/svip   2010-04-01 10:04:15 UTC (rev 64476)
@@ -0,0 +1,3 @@
+name: David Udsen
+email: s...@diku.dk
+url: http://mediawiki.org/wiki/User:Svippong


Property changes on: USERINFO/svip
___
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: [64475] trunk/extensions/Maps

2010-04-01 Thread jeroendedauw

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64475

Revision: 64475
Author:   jeroendedauw
Date: 2010-04-01 09:42:57 + (Thu, 01 Apr 2010)

Log Message:
---
Added setting and functions for coordinate parser function

Modified Paths:
--
trunk/extensions/Maps/Maps.php
trunk/extensions/Maps/Maps_Settings.php

Added Paths:
---
trunk/extensions/Maps/ParserFunctions/Coordinates/
trunk/extensions/Maps/ParserFunctions/Coordinates/Maps_Coordinates.php

Modified: trunk/extensions/Maps/Maps.php
===
--- trunk/extensions/Maps/Maps.php  2010-04-01 05:15:43 UTC (rev 64474)
+++ trunk/extensions/Maps/Maps.php  2010-04-01 09:42:57 UTC (rev 64475)
@@ -33,7 +33,7 @@
echo 'Warning: You need to have http://www.mediawiki.org/wiki/Extension:Validator";>Validator 
installed in order to use http://www.mediawiki.org/wiki/Extension:Maps";>Maps.';
 }
 else {
-   define( 'Maps_VERSION', '0.6 a8' );
+   define( 'Maps_VERSION', '0.6 a9' );

// The different coordinate notations.
define( 'Maps_COORDS_FLOAT', 'float' );

Modified: trunk/extensions/Maps/Maps_Settings.php
===
--- trunk/extensions/Maps/Maps_Settings.php 2010-04-01 05:15:43 UTC (rev 
64474)
+++ trunk/extensions/Maps/Maps_Settings.php 2010-04-01 09:42:57 UTC (rev 
64475)
@@ -37,7 +37,11 @@
 
 # Array of String. Array containing all the geocoding services that will be 
made available to the user.
 # Currently Maps provides the following services: geonames, google, yahoo
-$egMapsAvailableGeoServices = array('geonames', 'google', 'yahoo');
+$egMapsAvailableGeoServices = array(
+   'geonames',
+   'google',
+   'yahoo'
+);
 
 # String. The default geocoding service, which will be used when no service is 
provided by the user.
 # This service needs to be enabled, if not, the first one from the available 
services will be taken.
@@ -47,9 +51,10 @@
 
 # Include the parser functions that should be loaded into Maps.
 # Commenting or removing a parser functions will cause Maps to completely 
ignore it, and so improve performance.
-include_once $egMapsDir . 'ParserFunctions/DisplayMap/Maps_DisplayMap.php';
// display_map  
-include_once $egMapsDir . 
'ParserFunctions/DisplayPoint/Maps_DisplayPoint.php';// display_point(s)
-include_once $egMapsDir . 'ParserFunctions/Geocode/Maps_GeocodeFunctions.php'; 
// geocode, geocodelon, geocodelat
+include_once $egMapsDir . 'ParserFunctions/DisplayMap/Maps_DisplayMap.php';
// #display_map 
+include_once $egMapsDir . 
'ParserFunctions/DisplayPoint/Maps_DisplayPoint.php';// 
#display_point(s)
+include_once $egMapsDir . 'ParserFunctions/Geocode/Maps_GeocodeFunctions.php'; 
// #geocode, #geocodelat, #geocodelon
+include_once $egMapsDir . 'ParserFunctions/Coordinates/Maps_Coordinates.php';  
// #coordinates
 
 
 
@@ -57,9 +62,6 @@
 # Mapping services configuration
 # Note: You can not use aliases in the settings. Use the main service names.
 
-# Initialization of the mapping services array. 
-$egMapsServices = array();
-
 # Include the mapping services that should be loaded into Maps. 
 # Commenting or removing a mapping service will cause Maps to completely 
ignore it, and so improve performance.
 include_once $egMapsDir . 'GoogleMaps/Maps_GoogleMaps.php';// Google Maps
@@ -70,7 +72,12 @@
 
 # Array of String. Array containing all the mapping services that will be made 
available to the user.
 # Currently Maps provides the following services: googlemaps, yahoomaps, 
openlayers
-$egMapsAvailableServices = array( 'googlemaps2', 'googlemaps3', 'yahoomaps', 
'openlayers' );
+$egMapsAvailableServices = array(
+   'googlemaps2',
+   'googlemaps3',
+   'yahoomaps',
+   'openlayers'
+);
 
 # String. The default mapping service, which will be used when no default 
service is present in the
 # $egMapsDefaultServices array for a certain feature. A service that supports 
all features is recommended.
@@ -91,10 +98,6 @@
 
 
 
-
-
-
-
 # General configuration
 
 # Boolean. Indicates if minified js files should be used where available.
@@ -106,6 +109,13 @@
 
 # Coordinate configuration
 
+$egMapsAvailableCoordNotations = array(
+   Maps_COORDS_FLOAT,
+   Maps_COORDS_DMS,
+   Maps_COORDS_DM,
+   Maps_COORDS_DD
+);
+
 # Enum. The default output format of coordinates.
 # Possible values: Maps_COORDS_FLOAT, Maps_COORDS_DMS, Maps_COORDS_DM, 
Maps_COORDS_DD
 $egMapsCoordinateNotation = Maps_COORDS_FLOAT;
@@ -117,6 +127,8 @@
 
 
 
+
+
 # General map configuration
 
 # Integer or string. The default width and height of a map. These values will 
only be used when the user does not provide them.
@@ -163,7 +175,12 @@
 $egMapsGoogleMapsZoom = 14;
 
 # Array of String. The Google Maps v2 default map types. This value will only 
be used when the user does not

38 matches

Mail list logo