[MediaWiki-CVS] SVN: [71193] trunk/extensions/XMLRC/bridge/udp2xmpp.py
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71193 Revision: 71193 Author: daniel Date: 2010-08-17 09:27:50 + (Tue, 17 Aug 2010) Log Message: --- effective error recovery Modified Paths: -- trunk/extensions/XMLRC/bridge/udp2xmpp.py Modified: trunk/extensions/XMLRC/bridge/udp2xmpp.py === --- trunk/extensions/XMLRC/bridge/udp2xmpp.py 2010-08-17 05:43:00 UTC (rev 71192) +++ trunk/extensions/XMLRC/bridge/udp2xmpp.py 2010-08-17 09:27:50 UTC (rev 71193) @@ -84,17 +84,22 @@ self.loglevel = LOG_VERBOSE self.wiki_info = wiki_info; +def append_exec_info(self, message, error_type = None, error_value = None, trbk = None): + if trbk and not error_type: + message = message + \n + .join( traceback.format_tb( trbk ) ) + elif error_type: + message = message + * + .join( traceback.format_exception( error_type, error_value, trbk ) ) + + return message + def warn(self, message, error_type = None, error_value = None, trbk = None): if self.loglevel = LOG_QUIET: - if trbk and not error_type: - message = message + \n + .join( traceback.format_tb( trbk ) ) - elif error_type: - message = message + * + .join( traceback.format_exception( error_type, error_value, trbk ) ) - + message = self.append_exec_info( message, error_type, error_value, trbk ) sys.stderr.write( WARNING: %s\n % ( message.encode( self.console_encoding ) ) ) -def info(self, message): +def info(self, message, error_type = None, error_value = None, trbk = None): if self.loglevel = LOG_VERBOSE: + message = self.append_exec_info( message, error_type, error_value, trbk ) sys.stderr.write( INFO: %s\n % ( message.encode( self.console_encoding ) ) ) def debug(self, message): @@ -292,51 +297,55 @@ self.debug( relying RC message: %s % m ) return t.send_message( m, rc ) +def check_connections( self, connection_sockets, broken, context, exec_info = (), test = True ): + remove = set() + c = 0 + + for sock, conn in connection_sockets.items(): + if ( not test and not conn.is_connected() ) or ( test and not conn.test_connection() ): + if test: + self.warn( is_connected for connection %s returned false (%s) % (repr(conn), context), *exec_info ); + else: + self.warn( test_connection for connection %s failed (%s) % (repr(conn), context), *exec_info ); + + broken.add(conn) + remove.add(sock) + c += 1 + + for sock in remove: + del connection_sockets[ sock ] + + return c + def select_connections( self, connection_sockets, broken, timeout = 1 ): - waiting = [] + waiting = set() + self.check_connections( connection_sockets, broken, prior to socket-select, test = False ) + try: (in_socks , out_socks, err_socks) = select.select(connection_sockets.keys(),[],connection_sockets.keys(),1) for sock in err_socks: - con = connection_sockets[ sock ] - self.warn(exception in socket %s, connection %s % (repr(sock), repr(con))); + conn = connection_sockets[ sock ] + self.warn(exception in socket %s, connection %s % (repr(sock), repr(conn))); - broken.append( con ) + broken.add( conn ) del connection_sockets[ sock ] for sock in in_socks: - con = connection_sockets[ sock ] - waiting.append( con ) + conn = connection_sockets[ sock ] + waiting.add( conn ) except socket.error, e: - error_type, error_value, trbk = sys.exc_info() - found = False + found = self.check_connections( connection_sockets, broken, after exception, test = True, exec_info = sys.exc_info() ) - for sock, conn in connection_sockets.items(): - if not conn.test_connection(): - self.warn(test_connection for connection %s failed after exception % repr(con), error_type, error_value, trbk); - found = True - - broken.append(conn) - del connection_sockets[ sock ] - - if not found: + if found == 0: self.warn(exception ocurred, but all connections seem valid!, error_type, error_value, trbk); except IOError, e: - error_type, error_value, trbk = sys.exc_info() - found = False + found = self.check_connections( connection_sockets, broken, after exception, test = True, exec_info = sys.exc_info() ) - for sock, conn in connection_sockets.items(): - if not
[MediaWiki-CVS] SVN: [71194] trunk/extensions/Translate/SpecialTranslationStats.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71194
Revision: 71194
Author: siebrand
Date: 2010-08-17 09:40:01 + (Tue, 17 Aug 2010)
Log Message:
---
Can graph meta groups, so show them in the list.
Modified Paths:
--
trunk/extensions/Translate/SpecialTranslationStats.php
Modified: trunk/extensions/Translate/SpecialTranslationStats.php
===
--- trunk/extensions/Translate/SpecialTranslationStats.php 2010-08-17
09:27:50 UTC (rev 71193)
+++ trunk/extensions/Translate/SpecialTranslationStats.php 2010-08-17
09:40:01 UTC (rev 71194)
@@ -222,10 +222,6 @@
unset( $groups[$key] );
continue;
}
-
- if ( $group-isMeta() ) {
- unset( $groups[$key] );
- }
}
ksort( $groups );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71195] trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71195 Revision: 71195 Author: werdna Date: 2010-08-17 10:23:20 + (Tue, 17 Aug 2010) Log Message: --- Add namespaces in pt Modified Paths: -- trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php Modified: trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php === --- trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php 2010-08-17 09:40:01 UTC (rev 71194) +++ trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php 2010-08-17 10:23:20 UTC (rev 71195) @@ -15,3 +15,10 @@ NS_LQT_SUMMARY = 'Yhteenveto', NS_LQT_SUMMARY_TALK = 'Keskustelu_yhteenvedosta', ); + +$namespaceNames['pt'] = array( + NS_LQT_THREAD = 'Tópico', + NS_LQT_THREAD_TALK = 'Tópico_discussão', + NS_LQT_SUMMARY = 'Resumo', + NS_LQT_SUMMARY_TALK = 'Resumo_discussão', +); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71197] trunk/extensions/LiquidThreads/pages/TalkpageView.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71197
Revision: 71197
Author: werdna
Date: 2010-08-17 12:06:28 + (Tue, 17 Aug 2010)
Log Message:
---
Re-add a LqtView::addJSandCSS call removed in r70100 -- JS and CSS is needed
sometimes even when no threads are displayed
Modified Paths:
--
trunk/extensions/LiquidThreads/pages/TalkpageView.php
Modified: trunk/extensions/LiquidThreads/pages/TalkpageView.php
===
--- trunk/extensions/LiquidThreads/pages/TalkpageView.php 2010-08-17
10:31:15 UTC (rev 71196)
+++ trunk/extensions/LiquidThreads/pages/TalkpageView.php 2010-08-17
12:06:28 UTC (rev 71197)
@@ -221,6 +221,7 @@
function show() {
wfLoadExtensionMessages( 'LiquidThreads' );
+ LqtView::addJSandCSS();
$this-output-setPageTitle( $this-title-getPrefixedText() );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71198] trunk/extensions/StalkerLog/StalkerLog.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71198
Revision: 71198
Author: demon
Date: 2010-08-17 12:51:54 + (Tue, 17 Aug 2010)
Log Message:
---
Wow I'm a hypocrite. After constantly telling people that back-compat hacks
suck and have no place in trunk, I find one in my own extension. Wtf was I
thinking?
Modified Paths:
--
trunk/extensions/StalkerLog/StalkerLog.php
Modified: trunk/extensions/StalkerLog/StalkerLog.php
===
--- trunk/extensions/StalkerLog/StalkerLog.php 2010-08-17 12:06:28 UTC (rev
71197)
+++ trunk/extensions/StalkerLog/StalkerLog.php 2010-08-17 12:51:54 UTC (rev
71198)
@@ -34,12 +34,6 @@
$wgLogRestrictions['stalkerlog'] = 'stalkerlog-view-log';
$wgLogActions['stalkerlog/login'] = 'stalkerlog-log-login';
-# 1.13+ setup only
-if ( version_compare( $wgVersion, '1.13', '=' ) ) {
- $wgHooks['UserLogoutComplete'][] = 'wfStalkerLogout';
- $wgLogActions['stalkerlog/logout'] = 'stalkerlog-log-logout';
-}
-
# Login hook function
function wfStalkerLogin( $user ) {
wfLoadExtensionMessages('stalkerlog');
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71199] trunk/extensions/StalkerLog/StalkerLog.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71199
Revision: 71199
Author: demon
Date: 2010-08-17 12:52:59 + (Tue, 17 Aug 2010)
Log Message:
---
Followup r71198: when you're being snarky, it helps to not break the code too.
Modified Paths:
--
trunk/extensions/StalkerLog/StalkerLog.php
Modified: trunk/extensions/StalkerLog/StalkerLog.php
===
--- trunk/extensions/StalkerLog/StalkerLog.php 2010-08-17 12:51:54 UTC (rev
71198)
+++ trunk/extensions/StalkerLog/StalkerLog.php 2010-08-17 12:52:59 UTC (rev
71199)
@@ -26,6 +26,7 @@
$wgAdditionalRights[] = 'stalkerlog-view-log';
$wgGroupPermissions['*']['stalkerlog-view-log'] = true;
$wgHooks['UserLoginComplete'][] = 'wfStalkerLogin';
+$wgHooks['UserLogoutComplete'][] = 'wfStalkerLogout';
# Log setup
$wgLogTypes[] = 'stalkerlog';
@@ -33,6 +34,7 @@
$wgLogNames['stalkerlog'] = 'stalkerlog-log-type';
$wgLogRestrictions['stalkerlog'] = 'stalkerlog-view-log';
$wgLogActions['stalkerlog/login'] = 'stalkerlog-log-login';
+$wgLogActions['stalkerlog/logout'] = 'stalkerlog-log-logout';
# Login hook function
function wfStalkerLogin( $user ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71200] trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71200
Revision: 71200
Author: werdna
Date: 2010-08-17 12:54:47 + (Tue, 17 Aug 2010)
Log Message:
---
Fix weird sorting for LQT namespaces on wikis without them installed
Modified Paths:
--
trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php
Modified: trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php
===
--- trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php 2010-08-17
12:52:59 UTC (rev 71199)
+++ trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php 2010-08-17
12:54:47 UTC (rev 71200)
@@ -2,6 +2,14 @@
$namespaceNames = array();
+// For wikis without LiquidThreads installed.
+if ( ! defined('NS_LQT_THREAD') ) {
+ define( 'NS_LQT_THREAD', 90 );
+ define( 'NS_LQT_THREAD_TALK', 91 );
+ define( 'NS_LQT_SUMMARY', 92 );
+ define( 'NS_LQT_SUMMARY_TALK', 93 );
+}
+
$namespaceNames['en'] = array(
NS_LQT_THREAD = 'Thread',
NS_LQT_THREAD_TALK = 'Thread_talk',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71201] branches/wmf/1.16wmf4/extensions/LiquidThreads
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71201
Revision: 71201
Author: werdna
Date: 2010-08-17 13:02:27 + (Tue, 17 Aug 2010)
Log Message:
---
Fix issue with namespace sorting
Modified Paths:
--
branches/wmf/1.16wmf4/extensions/LiquidThreads/i18n/Lqt.namespaces.php
branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/i18n/Lqt.namespaces.php
Property Changed:
branches/wmf/1.16wmf4/extensions/LiquidThreads/i18n/
branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/i18n/
Property changes on: branches/wmf/1.16wmf4/extensions/LiquidThreads/i18n
___
Added: svn:mergeinfo
+ /branches/wmf-deployment/extensions/LiquidThreads_alpha/i18n:60970
/trunk/extensions/LiquidThreads/i18n:57390,63727-70099,70101-70105,70107-70377,71200
Modified: branches/wmf/1.16wmf4/extensions/LiquidThreads/i18n/Lqt.namespaces.php
===
--- branches/wmf/1.16wmf4/extensions/LiquidThreads/i18n/Lqt.namespaces.php
2010-08-17 12:54:47 UTC (rev 71200)
+++ branches/wmf/1.16wmf4/extensions/LiquidThreads/i18n/Lqt.namespaces.php
2010-08-17 13:02:27 UTC (rev 71201)
@@ -2,6 +2,14 @@
$namespaceNames = array();
+// For wikis without LiquidThreads installed.
+if ( ! defined('NS_LQT_THREAD') ) {
+ define( 'NS_LQT_THREAD', 90 );
+ define( 'NS_LQT_THREAD_TALK', 91 );
+ define( 'NS_LQT_SUMMARY', 92 );
+ define( 'NS_LQT_SUMMARY_TALK', 93 );
+}
+
$namespaceNames['en'] = array(
NS_LQT_THREAD = 'Thread',
NS_LQT_THREAD_TALK = 'Thread_talk',
Property changes on: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/i18n
___
Added: svn:mergeinfo
+ /branches/wmf-deployment/extensions/LiquidThreads_alpha/i18n:60970
/trunk/extensions/LiquidThreads/i18n:57390,63727-70099,70101-70105,70107-70377,71200
Modified:
branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/i18n/Lqt.namespaces.php
===
---
branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/i18n/Lqt.namespaces.php
2010-08-17 12:54:47 UTC (rev 71200)
+++
branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/i18n/Lqt.namespaces.php
2010-08-17 13:02:27 UTC (rev 71201)
@@ -2,6 +2,14 @@
$namespaceNames = array();
+// For wikis without LiquidThreads installed.
+if ( ! defined('NS_LQT_THREAD') ) {
+ define( 'NS_LQT_THREAD', 90 );
+ define( 'NS_LQT_THREAD_TALK', 91 );
+ define( 'NS_LQT_SUMMARY', 92 );
+ define( 'NS_LQT_SUMMARY_TALK', 93 );
+}
+
$namespaceNames['en'] = array(
NS_LQT_THREAD = 'Thread',
NS_LQT_THREAD_TALK = 'Thread_talk',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71202] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71202
Revision: 71202
Author: demon
Date: 2010-08-17 13:36:59 + (Tue, 17 Aug 2010)
Log Message:
---
Moved first of the updaters functions to the appropriate classes (addTable is
shared, doNamespaceSize was mySQL-only) to give an idea of what the grand
scheme is. Still using nasty wfOut()s, need to use Status objects or
*something* else here other than just throwing up output
Modified Paths:
--
trunk/phase3/includes/installer/DatabaseUpdater.php
trunk/phase3/includes/installer/MysqlUpdater.php
trunk/phase3/includes/installer/SqliteUpdater.php
trunk/phase3/maintenance/updaters.inc
Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-17 13:02:27 UTC
(rev 71201)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-17 13:36:59 UTC
(rev 71202)
@@ -52,6 +52,9 @@
$this-getOldGlobalUpdates() );
foreach ( $this-updates as $params ) {
$func = array_shift( $params );
+ if( method_exists( $this, $func ) ) {
+ $func = array( $this, $func );
+ }
call_user_func_array( $func, $params );
flush();
}
@@ -107,7 +110,7 @@
foreach ( $wgExtNewTables as $tableRecord ) {
$updates[] = array(
- 'add_table', $tableRecord[0], $tableRecord[1],
true
+ 'addTable', $tableRecord[0], $tableRecord[1],
true
);
}
@@ -146,6 +149,26 @@
* @return Array
*/
protected abstract function getCoreUpdateList();
+
+ /**
+* Add a new table to the database
+* @param $name String Name of the new table
+* @param $patch String Path to the patch file
+* @param $fullpath Boolean Whether to treat $fullPath as a relative or
not
+*/
+ protected function addTable( $name, $patch, $fullpath = false ) {
+ if ( $this-db-tableExists( $name ) ) {
+ wfOut( ...$name table already exists.\n );
+ } else {
+ wfOut( Creating $name table... );
+ if ( $fullpath ) {
+ $this-db-sourceFile( $patch );
+ } else {
+ $this-db-sourceFile( archive( $patch ) );
+ }
+ wfOut( ok\n );
+ }
+ }
}
class OracleUpdater extends DatabaseUpdater {
Modified: trunk/phase3/includes/installer/MysqlUpdater.php
===
--- trunk/phase3/includes/installer/MysqlUpdater.php2010-08-17 13:02:27 UTC
(rev 71201)
+++ trunk/phase3/includes/installer/MysqlUpdater.php2010-08-17 13:36:59 UTC
(rev 71202)
@@ -15,14 +15,14 @@
array( 'add_field', 'ipblocks', 'ipb_expiry',
'patch-ipb_expiry.sql' ),
array( 'do_interwiki_update' ),
array( 'do_index_update' ),
- array( 'add_table', 'hitcounter',
'patch-hitcounter.sql' ),
+ array( 'addTable', 'hitcounter',
'patch-hitcounter.sql' ),
array( 'add_field', 'recentchanges', 'rc_type',
'patch-rc_type.sql' ),
// 1.3
array( 'add_field', 'user', 'user_real_name',
'patch-user-realname.sql' ),
- array( 'add_table', 'querycache',
'patch-querycache.sql' ),
- array( 'add_table', 'objectcache',
'patch-objectcache.sql' ),
- array( 'add_table', 'categorylinks',
'patch-categorylinks.sql' ),
+ array( 'addTable', 'querycache',
'patch-querycache.sql' ),
+ array( 'addTable', 'objectcache',
'patch-objectcache.sql' ),
+ array( 'addTable', 'categorylinks',
'patch-categorylinks.sql' ),
array( 'do_old_links_update' ),
array( 'fix_ancient_imagelinks' ),
array( 'add_field', 'recentchanges', 'rc_ip',
'patch-rc_ip.sql' ),
@@ -31,7 +31,7 @@
array( 'do_image_name_unique_update' ),
array( 'add_field', 'recentchanges', 'rc_id',
'patch-rc_id.sql' ),
array( 'add_field', 'recentchanges', 'rc_patrolled',
'patch-rc-patrol.sql' ),
-
[MediaWiki-CVS] SVN: [71203] trunk/phase3/maintenance/updaters.inc
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71203
Revision: 71203
Author: maxsem
Date: 2010-08-17 14:17:13 + (Tue, 17 Aug 2010)
Log Message:
---
Use the same connection for updates everywhere. Hopefully, this ugly code will
not survive for long anyway
Modified Paths:
--
trunk/phase3/maintenance/updaters.inc
Modified: trunk/phase3/maintenance/updaters.inc
===
--- trunk/phase3/maintenance/updaters.inc 2010-08-17 13:36:59 UTC (rev
71202)
+++ trunk/phase3/maintenance/updaters.inc 2010-08-17 14:17:13 UTC (rev
71203)
@@ -33,8 +33,8 @@
# Obviously, only use this for updates that occur after the updatelog table was
# created!
function update_row_exists( $key ) {
- $dbr = wfGetDB( DB_SLAVE );
- $row = $dbr-selectRow(
+ global $wgDatabase;
+ $row = $wgDatabase-selectRow(
'updatelog',
'1',
array( 'ul_key' = $key ),
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71204] trunk/extensions/PagedTiffHandler
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71204
Revision: 71204
Author: daniel
Date: 2010-08-17 15:15:28 + (Tue, 17 Aug 2010)
Log Message:
---
support for libtiff/tiffinfo; involves some additional config options and a bit
of refactoring
Modified Paths:
--
trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
trunk/extensions/PagedTiffHandler/PagedTiffHandler.php
trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php
trunk/extensions/PagedTiffHandler/tests/PagedTiffHandlerTest.php
Added Paths:
---
trunk/extensions/PagedTiffHandler/tests/testImages/truncated.tiff
Modified: trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
===
--- trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
2010-08-17 14:17:13 UTC (rev 71203)
+++ trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
2010-08-17 15:15:28 UTC (rev 71204)
@@ -70,6 +70,10 @@
return false;
}
+ public function resetMetaData() {
+ $this-_meta = null;
+ }
+
/**
* Reads metadata of the tiff file via shell command and returns an
associative array.
* layout:
@@ -81,13 +85,34 @@
*/
public function retrieveMetaData() {
global $wgImageMagickIdentifyCommand, $wgTiffExivCommand,
$wgTiffUseExiv;
+ global $wgTiffUseTiffinfo, $wgTiffTiffinfoCommand;
if ( $this-_meta === null ) {
- if ( $wgImageMagickIdentifyCommand ) {
+ wfProfileIn( 'PagedTiffImage::retrieveMetaData' );
- wfProfileIn( 'PagedTiffImage::retrieveMetaData'
);
-
- // ImageMagick is used to get the basic
metadata of individual pages
+ //fetch base info: number of pages, size and alpha for
each page.
+ //run hooks first, then optionally tiffinfo or, per
default, ImageMagic's identify command
+ if ( !wfRunHooks( 'PagedTiffHandlerTiffData', array(
$this-mFilename, $this-_meta ) ) ) {
+ wfDebug( __METHOD__ . : hook
PagedTiffHandlerTiffData overrides TIFF data extraction\n );
+ } else if ( $wgTiffUseTiffinfo ) {
+ // read TIFF directories using libtiff's
tiffinfo, see
+ // http://www.libtiff.org/man/tiffinfo.1.html
+ $cmd = wfEscapeShellArg( $wgTiffTiffinfoCommand
) .
+ ' ' . wfEscapeShellArg(
$this-mFilename ) . ' 21';
+
+ wfProfileIn( 'tiffinfo' );
+ wfDebug( __METHOD__ . : $cmd\n );
+ $dump = wfShellExec( $cmd, $retval );
+ wfProfileOut( 'tiffinfo' );
+
+ if ( $retval ) {
+ $data['errors'][] = tiffinfo command
failed: $cmd;
+ wfDebug( __METHOD__ . : tiffinfo
command failed: $cmd\n );
+ return $data; // fail. we *need* that
info
+ }
+
+ $this-_meta = $this-parseTiffinfoOutput(
$dump );
+ } else {
$cmd = wfEscapeShellArg(
$wgImageMagickIdentifyCommand ) .
' -format
[BEGIN]page=%p\nalpha=%A\nalpha2=%r\nheight=%h\nwidth=%w\ndepth=%z[END] ' .
wfEscapeShellArg( $this-mFilename ) .
' 21';
@@ -96,65 +121,179 @@
wfDebug( __METHOD__ . : $cmd\n );
$dump = wfShellExec( $cmd, $retval );
wfProfileOut( 'identify' );
+
if ( $retval ) {
$data['errors'][] = identify command
failed: $cmd;
wfDebug( __METHOD__ . : identify
command failed: $cmd\n );
return $data; // fail. we *need* that
info
}
- $this-_meta = $this-convertDumpToArray( $dump
);
- $this-_meta['exif'] = array();
- if ( $wgTiffUseExiv ) {
- // read EXIF, XMP, IPTC as name-tag =
interpreted data
- // -ignore unknown fields
- // see exiv2-doc @link
http://www.exiv2.org/sample.html
- // NOTE: the linux version of exiv2 has
a bug: it can only
-
[MediaWiki-CVS] SVN: [71205] trunk/extensions/XMLRC
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71205 Revision: 71205 Author: daniel Date: 2010-08-17 15:19:12 + (Tue, 17 Aug 2010) Log Message: --- more resillience Modified Paths: -- trunk/extensions/XMLRC/bridge/udp2xmpp.py trunk/extensions/XMLRC/client/rcclient.py Modified: trunk/extensions/XMLRC/bridge/udp2xmpp.py === --- trunk/extensions/XMLRC/bridge/udp2xmpp.py 2010-08-17 15:15:28 UTC (rev 71204) +++ trunk/extensions/XMLRC/bridge/udp2xmpp.py 2010-08-17 15:19:12 UTC (rev 71205) @@ -304,9 +304,9 @@ for sock, conn in connection_sockets.items(): if ( not test and not conn.is_connected() ) or ( test and not conn.test_connection() ): if test: - self.warn( is_connected for connection %s returned false (%s) % (repr(conn), context), *exec_info ); + self.warn( test_connection for connection %s returned false (%s) % (repr(conn), context), *exec_info ); else: - self.warn( test_connection for connection %s failed (%s) % (repr(conn), context), *exec_info ); + self.warn( is_connected for connection %s failed (%s) % (repr(conn), context), *exec_info ); broken.add(conn) remove.add(sock) Modified: trunk/extensions/XMLRC/client/rcclient.py === --- trunk/extensions/XMLRC/client/rcclient.py 2010-08-17 15:15:28 UTC (rev 71204) +++ trunk/extensions/XMLRC/client/rcclient.py 2010-08-17 15:19:12 UTC (rev 71205) @@ -168,7 +168,8 @@ self.warn(connection lost, reconnecting...) if self.xmpp.reconnectAndReauth(): - self.warn(re-connect successful.) + sockets = ( self.xmpp.Connection._sock, ) + self.info(re-connect successful.) self.on_connect() except Exception, e: ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71206] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71206
Revision: 71206
Author: maxsem
Date: 2010-08-17 17:48:22 + (Tue, 17 Aug 2010)
Log Message:
---
Converted two more updater functions to OOP: add_field() and add_index()
Modified Paths:
--
trunk/phase3/includes/installer/DatabaseUpdater.php
trunk/phase3/includes/installer/MysqlUpdater.php
trunk/phase3/includes/installer/SqliteUpdater.php
trunk/phase3/maintenance/updaters.inc
Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-17 15:19:12 UTC
(rev 71205)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-17 17:48:22 UTC
(rev 71206)
@@ -117,7 +117,7 @@
foreach ( $wgExtNewFields as $fieldRecord ) {
if ( $fieldRecord[0] != 'user' || $doUser ) {
$updates[] = array(
- 'add_field', $fieldRecord[0],
$fieldRecord[1],
+ 'addField', $fieldRecord[0],
$fieldRecord[1],
$fieldRecord[2], true
);
}
@@ -125,7 +125,7 @@
foreach ( $wgExtNewIndexes as $fieldRecord ) {
$updates[] = array(
- 'add_index', $fieldRecord[0], $fieldRecord[1],
+ 'addIndex', $fieldRecord[0], $fieldRecord[1],
$fieldRecord[2], true
);
}
@@ -151,24 +151,69 @@
protected abstract function getCoreUpdateList();
/**
+* Applies a SQL patch
+* @param $path String Path to the patch file
+* @param $isFullPath Boolean Whether to treat $path as a relative or
not
+*/
+ protected function applyPatch( $path, $isFullPath = false ) {
+ if ( $isFullPath ) {
+ $this-db-sourceFile( $path );
+ } else {
+ $this-db-sourceFile( archive( $path ) );
+ }
+ }
+
+ /**
* Add a new table to the database
* @param $name String Name of the new table
* @param $patch String Path to the patch file
-* @param $fullpath Boolean Whether to treat $fullPath as a relative or
not
+* @param $fullpath Boolean Whether to treat $patch path as a relative
or not
*/
protected function addTable( $name, $patch, $fullpath = false ) {
if ( $this-db-tableExists( $name ) ) {
wfOut( ...$name table already exists.\n );
} else {
wfOut( Creating $name table... );
- if ( $fullpath ) {
- $this-db-sourceFile( $patch );
- } else {
- $this-db-sourceFile( archive( $patch ) );
- }
+ $this-applyPatch( $patch, $fullpath );
wfOut( ok\n );
}
}
+
+ /**
+* Add a new field to an existing table
+* @param $table String Name of the table to modify
+* @param $field String Name of the new field
+* @param $patch String Path to the patch file
+* @param $fullpath Boolean Whether to treat $patch path as a relative
or not
+*/
+ protected function addField( $table, $field, $patch, $fullpath = false
) {
+ if ( !$this-db-tableExists( $table ) ) {
+ wfOut( ...$table table does not exist, skipping new
field patch\n );
+ } elseif ( $this-db-fieldExists( $table, $field ) ) {
+ wfOut( ...have $field field in $table table.\n );
+ } else {
+ wfOut( Adding $field field to table $table... );
+ $this-applyPatch( $patch, $fullpath );
+ wfOut( ok\n );
+ }
+ }
+
+ /**
+* Add a new index to an existing table
+* @param $table String Name of the table to modify
+* @param $index String Name of the new index
+* @param $patch String Path to the patch file
+* @param $fullpath Boolean Whether to treat $patch path as a relative
or not
+*/
+ function addIndex( $table, $index, $patch, $fullpath = false ) {
+ if ( $this-db-indexExists( $table, $index ) ) {
+ wfOut( ...$index key already set on $table table.\n );
+ } else {
+ wfOut( Adding $index key to table $table... );
+ $this-applyPatch( $patch, $fullpath );
+ wfOut( ok\n );
+ }
+ }
}
class OracleUpdater extends
[MediaWiki-CVS] SVN: [71207] trunk/extensions/CodeReview
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71207 Revision: 71207 Author: reedy Date: 2010-08-17 18:44:07 + (Tue, 17 Aug 2010) Log Message: --- *(bug 24811) Link to the revision being followed up in a followup email Modified Paths: -- trunk/extensions/CodeReview/CodeReview.i18n.php trunk/extensions/CodeReview/backend/CodeRevision.php Modified: trunk/extensions/CodeReview/CodeReview.i18n.php === --- trunk/extensions/CodeReview/CodeReview.i18n.php 2010-08-17 17:48:22 UTC (rev 71206) +++ trunk/extensions/CodeReview/CodeReview.i18n.php 2010-08-17 18:44:07 UTC (rev 71207) @@ -126,6 +126,8 @@ 'codereview-email-subj2' = '[$1] [$2]: Follow-up changes', 'codereview-email-body2' = 'User $1 made follow-up changes to $2. +Full URL for followed up revision: $5 + Full URL: $3 Commit summary: Modified: trunk/extensions/CodeReview/backend/CodeRevision.php === --- trunk/extensions/CodeReview/backend/CodeRevision.php2010-08-17 17:48:22 UTC (rev 71206) +++ trunk/extensions/CodeReview/backend/CodeRevision.php2010-08-17 18:44:07 UTC (rev 71207) @@ -341,6 +341,9 @@ $revision = CodeRevision::newFromRow( $row ); $users = $revision-getCommentingUsers(); + $rowTitle = SpecialPage::getTitleFor( 'Code', $this-mRepo-getName() . '/' . $row-mId ); + $rowUrl = $rowTitle-getFullUrl(); + $revisionAuthor = $revision-getWikiUser(); //Add the followup revision author if they have not already been added as a commentor (they won't want dupe emails!) @@ -360,7 +363,7 @@ $lang = array( 'language' = $user-getOption( 'language' ) ); $user-sendMail( wfMsgExt( 'codereview-email-subj2', $lang, $this-mRepo-getName(), $this-getIdString( $row-cr_id ) ), - wfMsgExt( 'codereview-email-body2', $lang, $committer, $this-getIdStringUnique( $row-cr_id ), $url, $this-mMessage ) + wfMsgExt( 'codereview-email-body2', $lang, $committer, $this-getIdStringUnique( $row-cr_id ), $url, $this-mMessage, $rowUrl ) ); } } ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71208] trunk/extensions/CodeReview/backend/CodeRevision.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71208
Revision: 71208
Author: reedy
Date: 2010-08-17 18:47:31 + (Tue, 17 Aug 2010)
Log Message:
---
Add getFullUrl function as minor followup to r71207
Modified Paths:
--
trunk/extensions/CodeReview/backend/CodeRevision.php
Modified: trunk/extensions/CodeReview/backend/CodeRevision.php
===
--- trunk/extensions/CodeReview/backend/CodeRevision.php2010-08-17
18:44:07 UTC (rev 71207)
+++ trunk/extensions/CodeReview/backend/CodeRevision.php2010-08-17
18:47:31 UTC (rev 71208)
@@ -334,15 +334,13 @@
);
// Get repo and build comment title (for url)
- $title = SpecialPage::getTitleFor( 'Code',
$this-mRepo-getName() . '/' . $this-mId );
- $url = $title-getFullUrl();
+ $url = $this-getFullUrl();
foreach ( $res as $row ) {
$revision = CodeRevision::newFromRow( $row );
$users = $revision-getCommentingUsers();
- $rowTitle = SpecialPage::getTitleFor( 'Code',
$this-mRepo-getName() . '/' . $row-mId );
- $rowUrl = $rowTitle-getFullUrl();
+ $rowUrl = $revision-getFullUrl();
$revisionAuthor = $revision-getWikiUser();
@@ -788,6 +786,11 @@
return false;
}
}
+
+ public function getFullUrl() {
+ $title = SpecialPage::getTitleFor( 'Code',
$this-mRepo-getName() . '/' . $this-mId );
+ return $title-getFullUrl();
+ }
protected function sendCommentToUDP( $commentId, $text, $url = null ) {
global $wgCodeReviewUDPAddress, $wgCodeReviewUDPPort,
$wgCodeReviewUDPPrefix, $wgLang, $wgUser;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71209] trunk/extensions/CodeReview/backend/CodeRevision.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71209
Revision: 71209
Author: reedy
Date: 2010-08-17 18:51:42 + (Tue, 17 Aug 2010)
Log Message:
---
Add optional parameter to getFullUrl from r71208, to allow for #c1234
Use getFullUrl in more places
Modified Paths:
--
trunk/extensions/CodeReview/backend/CodeRevision.php
Modified: trunk/extensions/CodeReview/backend/CodeRevision.php
===
--- trunk/extensions/CodeReview/backend/CodeRevision.php2010-08-17
18:47:31 UTC (rev 71208)
+++ trunk/extensions/CodeReview/backend/CodeRevision.php2010-08-17
18:51:42 UTC (rev 71209)
@@ -423,9 +423,7 @@
$users[0] = $watcher; // We don't have any
anons, so using 0 is safe
}
// Get repo and build comment title (for url)
- $title = SpecialPage::getTitleFor( 'Code',
$this-mRepo-getName() . '/' . $this-mId );
- $title-setFragment( #c{$commentId} );
- $url = $title-getFullUrl();
+ $url = $this-getFullUrl( $commentId );
foreach ( $users as $userId = $user ) {
// No sense in notifying this commenter
@@ -787,8 +785,13 @@
}
}
- public function getFullUrl() {
+ public function getFullUrl( $commentId = '' ) {
$title = SpecialPage::getTitleFor( 'Code',
$this-mRepo-getName() . '/' . $this-mId );
+
+ if ( $commentId !== '' ) {
+ $title-setFragment( #c{$commentId} );
+ }
+
return $title-getFullUrl();
}
@@ -797,9 +800,7 @@
if( $wgCodeReviewUDPAddress ) {
if( is_null( $url ) ) {
- $title = SpecialPage::getTitleFor( 'Code',
$this-mRepo-getName() . '/' . $this-mId );
- $title-setFragment( #c{$commentId} );
- $url = $title-getFullUrl();
+ $url = $this-getFullUrl( $commentId );
}
$line = wfMsg( 'code-rev-message' ) . \00314( .
$this-mRepo-getName() .
@@ -814,8 +815,7 @@
global $wgCodeReviewUDPAddress, $wgCodeReviewUDPPort,
$wgCodeReviewUDPPrefix, $wgUser;
if( $wgCodeReviewUDPAddress ) {
- $title = SpecialPage::getTitleFor( 'Code',
$this-mRepo-getName() . '/' . $this-getId() );
- $url = $title-getFullUrl();
+ $url = $this-getFullUrl();
$line = wfMsg( 'code-rev-status' ) . \00314( .
$this-mRepo-getName() .
)\00303 .
RecentChange::cleanupForIRC( $wgUser-getName() ) . \003 .
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71210] trunk/extensions/CodeReview/CodeReview.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71210 Revision: 71210 Author: reedy Date: 2010-08-17 19:27:25 + (Tue, 17 Aug 2010) Log Message: --- Change quotes so no escaping needed Modified Paths: -- trunk/extensions/CodeReview/CodeReview.i18n.php Modified: trunk/extensions/CodeReview/CodeReview.i18n.php === --- trunk/extensions/CodeReview/CodeReview.i18n.php 2010-08-17 18:51:42 UTC (rev 71209) +++ trunk/extensions/CodeReview/CodeReview.i18n.php 2010-08-17 19:27:25 UTC (rev 71210) @@ -14,8 +14,8 @@ 'code-rev-title' = '$1 - Code Review', 'code-comments' = 'Comments', 'code-references' = 'Follow-up revisions', - 'code-change-status' = 'changed the \'\'\'status\'\'\' of $1', - 'code-change-tags' = 'changed the \'\'\'tags\'\'\' for $1', + 'code-change-status' = changed the '''status''' of $1, + 'code-change-tags' = changed the '''tags''' for $1, 'code-change-removed' = 'removed:', 'code-change-added' = 'added:', 'code-old-status' = 'Old status', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71211] trunk/extensions/UsabilityInitiative/js/usability.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71211
Revision: 71211
Author: tparscal
Date: 2010-08-17 20:57:08 + (Tue, 17 Aug 2010)
Log Message:
---
Added remapping of $ to $j as a temporary measure between switching over.
Modified Paths:
--
trunk/extensions/UsabilityInitiative/js/usability.js
Modified: trunk/extensions/UsabilityInitiative/js/usability.js
===
--- trunk/extensions/UsabilityInitiative/js/usability.js2010-08-17
19:27:25 UTC (rev 71210)
+++ trunk/extensions/UsabilityInitiative/js/usability.js2010-08-17
20:57:08 UTC (rev 71211)
@@ -2,6 +2,9 @@
* Common version-independent functions
*/
+if ( typeof $j == 'undefined' ) {
+ $j = $;
+}
if ( typeof mw == 'undefined' ) {
mw = {};
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71212] branches/resourceloader/phase3/includes/OutputPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71212
Revision: 71212
Author: tparscal
Date: 2010-08-17 21:19:44 + (Tue, 17 Aug 2010)
Log Message:
---
Added handling for debug mode
Modified Paths:
--
branches/resourceloader/phase3/includes/OutputPage.php
Modified: branches/resourceloader/phase3/includes/OutputPage.php
===
--- branches/resourceloader/phase3/includes/OutputPage.php 2010-08-17
20:57:08 UTC (rev 71211)
+++ branches/resourceloader/phase3/includes/OutputPage.php 2010-08-17
21:19:44 UTC (rev 71212)
@@ -,7 +,7 @@
global $wgUser, $wgLang, $wgRequest, $wgScriptPath;
// TODO: Should this be a static function of ResourceLoader
instead?
$query = array(
- 'modules' = implode( '|', array_unique( $modules ) ),
+ 'modules' = implode( '|', array_unique( (array)
$modules ) ),
'user' = $wgUser-isLoggedIn(),
'lang' = $wgLang-getCode(),
'debug' = (
@@ -2246,8 +2246,15 @@
global $wgUser, $wgRequest, $wgJsMimeType;
global $wgStylePath, $wgStyleVersion;
+ $scripts = '';
// Include base modules and wikibits legacy code
- $scripts = self::makeResourceLoaderLinkedScript( $sk,
$this-getResources() );
+ if ( $wgRequest-getVal( 'debug' ) === 'true' ||
$wgRequest-getBool( 'debug' ) ) {
+ foreach ( $this-getResources() as $resource ) {
+ $scripts .=
self::makeResourceLoaderLinkedScript( $sk, $resource );
+ }
+ } else {
+ $scripts .= self::makeResourceLoaderLinkedScript( $sk,
$this-getResources() );
+ }
// Configure page
$scripts .= Skin::makeGlobalVariablesScript( $sk-getSkinName()
) . \n;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71213] branches/resourceloader/phase3/includes/EditPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71213
Revision: 71213
Author: tparscal
Date: 2010-08-17 21:20:13 + (Tue, 17 Aug 2010)
Log Message:
---
Swtiched to using resource loader modules rather than direct scripts
Modified Paths:
--
branches/resourceloader/phase3/includes/EditPage.php
Modified: branches/resourceloader/phase3/includes/EditPage.php
===
--- branches/resourceloader/phase3/includes/EditPage.php2010-08-17
21:19:44 UTC (rev 71212)
+++ branches/resourceloader/phase3/includes/EditPage.php2010-08-17
21:20:13 UTC (rev 71213)
@@ -318,11 +318,11 @@
$this-preview = true;
}
- $wgOut-addScriptFile( 'edit.js' );
+ $wgOut-addResources( 'mediawiki.legacy.edit' );
if ( $wgUser-getOption( 'uselivepreview', false ) ) {
$wgOut-includeJQuery();
- $wgOut-addScriptFile( 'preview.js' );
+ $wgOut-addResources( 'mediawiki.legacy.preview' );
}
// Bug #19334: textarea jumps when editing articles in IE8
$wgOut-addStyle( 'common/IE80Fixes.css', 'screen', 'IE 8' );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71214] branches/resourceloader/phase3/includes/EditPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71214
Revision: 71214
Author: tparscal
Date: 2010-08-17 21:32:25 + (Tue, 17 Aug 2010)
Log Message:
---
Made inline scripts use mediaWiki.loader
Modified Paths:
--
branches/resourceloader/phase3/includes/EditPage.php
Modified: branches/resourceloader/phase3/includes/EditPage.php
===
--- branches/resourceloader/phase3/includes/EditPage.php2010-08-17
21:20:13 UTC (rev 71213)
+++ branches/resourceloader/phase3/includes/EditPage.php2010-08-17
21:32:25 UTC (rev 71214)
@@ -2260,7 +2260,9 @@
$script .= addButton($paramList);\n;
}
- $wgOut-addScript( Html::inlineScript( \n$script\n ) );
+ $wgOut-addScript( Html::inlineScript(
+ \nmediaWiki.loader.using( 'mediawiki.legacy.edit',
function() { $script } );\n
+ ) );
$toolbar .= \n/div;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71215] trunk/phase3/includes/Linker.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71215
Revision: 71215
Author: simetrical
Date: 2010-08-17 21:55:21 + (Tue, 17 Aug 2010)
Log Message:
---
Avoid spurious paragraph with new heading id's
Bug 24835. The use of a made the parser put p around the tag, so
use div instead. (Something was also adding a name= attribute, but
I'm not sure what. That should be killed.)
Modified Paths:
--
trunk/phase3/includes/Linker.php
Modified: trunk/phase3/includes/Linker.php
===
--- trunk/phase3/includes/Linker.php2010-08-17 21:32:25 UTC (rev 71214)
+++ trunk/phase3/includes/Linker.php2010-08-17 21:55:21 UTC (rev 71215)
@@ -1439,7 +1439,7 @@
. span class=\mw-headline\
id=\$anchor\$text/span
. /h$level;
if ( $legacyAnchor !== false ) {
- $ret = a id=\$legacyAnchor\/a$ret;
+ $ret = div id=\$legacyAnchor\/div$ret;
}
return $ret;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71216] branches/resourceloader/phase3/includes/OutputPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71216
Revision: 71216
Author: tparscal
Date: 2010-08-17 22:00:39 + (Tue, 17 Aug 2010)
Log Message:
---
Added handling for debug mode
Modified Paths:
--
branches/resourceloader/phase3/includes/OutputPage.php
Modified: branches/resourceloader/phase3/includes/OutputPage.php
===
--- branches/resourceloader/phase3/includes/OutputPage.php 2010-08-17
21:55:21 UTC (rev 71215)
+++ branches/resourceloader/phase3/includes/OutputPage.php 2010-08-17
22:00:39 UTC (rev 71216)
@@ -2249,9 +2249,17 @@
$scripts = '';
// Include base modules and wikibits legacy code
if ( $wgRequest-getVal( 'debug' ) === 'true' ||
$wgRequest-getBool( 'debug' ) ) {
- foreach ( $this-getResources() as $resource ) {
- $scripts .=
self::makeResourceLoaderLinkedScript( $sk, $resource );
+ $skipped = array();
+ foreach ( $this-getResources() as $name ) {
+ $module = ResourceLoader::getModule( $name );
+ if ( $module-isRaw() ) {
+ $scripts .=
self::makeResourceLoaderLinkedScript( $sk, $name );
+ $skipped[] = $name;
+ }
}
+ foreach ( $skipped as $name ) {
+ $scripts .=
self::makeResourceLoaderLinkedScript( $sk, $name );
+ }
} else {
$scripts .= self::makeResourceLoaderLinkedScript( $sk,
$this-getResources() );
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71217] trunk/extensions/DonationInterface/payflowpro_gateway/extras/ minfraud/minfraud.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71217
Revision: 71217
Author: awjrichards
Date: 2010-08-17 23:03:59 + (Tue, 17 Aug 2010)
Log Message:
---
Added 'referrer' to logging for initial minfraud queries and am running log
strings through addslashes() for better parsability
Modified Paths:
--
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/minfraud.php
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/minfraud.php
===
---
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/minfraud.php
2010-08-17 22:00:39 UTC (rev 71216)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/minfraud.php
2010-08-17 23:03:59 UTC (rev 71217)
@@ -84,11 +84,12 @@
// log the message if the user has specified a log file
if ( $this-log_fh ) {
- $log_message = '' . $data[ 'comment' ] . '';
- $log_message .= \t . '' . $data[ 'amount' ] . ' ' .
$data[ 'currency' ] . '';
- $log_message .= \t . '' . serialize( $minfraud_hash
) . '';
- $log_message .= \t . '' . serialize(
$this-minfraud_response ) . '';
- $log_message .= \t . '' . serialize(
$pfp_gateway_object-action ) . '';
+ $log_message = '' . addslashes( $data[ 'comment' ] ) .
'';
+ $log_message .= \t . '' . addslashes( $data[
'amount' ] . ' ' . $data[ 'currency' ] ) . '';
+ $log_message .= \t . '' . addslashes( serialize(
$minfraud_hash )) . '';
+ $log_message .= \t . '' . addslashes( serialize(
$this-minfraud_response )) . '';
+ $log_message .= \t . '' . addslashes(
$pfp_gateway_object-action ) . '';
+ $log_message .= \t . '' . addslashes( $data[
'referrer' ] ) . '';
$this-log( $data[ 'contribution_tracking_id' ],
'minFraud query', $log_message );
}
return TRUE;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71218] trunk/extensions/DonationInterface/payflowpro_gateway/extras/ minfraud/minfraud.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71218
Revision: 71218
Author: awjrichards
Date: 2010-08-17 23:11:08 + (Tue, 17 Aug 2010)
Log Message:
---
Switched 'serialize()' to 'json_encode()' for log messages in minfraud for
easier portabiliyt/parsability
Modified Paths:
--
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/minfraud.php
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/minfraud.php
===
---
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/minfraud.php
2010-08-17 23:03:59 UTC (rev 71217)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/minfraud.php
2010-08-17 23:11:08 UTC (rev 71218)
@@ -86,8 +86,8 @@
if ( $this-log_fh ) {
$log_message = '' . addslashes( $data[ 'comment' ] ) .
'';
$log_message .= \t . '' . addslashes( $data[
'amount' ] . ' ' . $data[ 'currency' ] ) . '';
- $log_message .= \t . '' . addslashes( serialize(
$minfraud_hash )) . '';
- $log_message .= \t . '' . addslashes( serialize(
$this-minfraud_response )) . '';
+ $log_message .= \t . '' . addslashes( json_encode(
$minfraud_hash )) . '';
+ $log_message .= \t . '' . addslashes( json_encode(
$this-minfraud_response )) . '';
$log_message .= \t . '' . addslashes(
$pfp_gateway_object-action ) . '';
$log_message .= \t . '' . addslashes( $data[
'referrer' ] ) . '';
$this-log( $data[ 'contribution_tracking_id' ],
'minFraud query', $log_message );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71219] branches/MwEmbedStandAlone
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71219
Revision: 71219
Author: dale
Date: 2010-08-17 23:33:27 + (Tue, 17 Aug 2010)
Log Message:
---
* improved undo redo handling for non-change edits
* improved click selection editTool updates
* improved audio track display and edit
Modified Paths:
--
branches/MwEmbedStandAlone/libraries/jquery/jquery-1.4.2.js
branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js
branches/MwEmbedStandAlone/modules/Sequencer/css/mw.style.Sequencer.css
branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTimeline.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTools.js
branches/MwEmbedStandAlone/modules/SmilPlayer/SmilPlayer.i8n.php
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
Modified: branches/MwEmbedStandAlone/libraries/jquery/jquery-1.4.2.js
===
--- branches/MwEmbedStandAlone/libraries/jquery/jquery-1.4.2.js 2010-08-17
23:11:08 UTC (rev 71218)
+++ branches/MwEmbedStandAlone/libraries/jquery/jquery-1.4.2.js 2010-08-17
23:33:27 UTC (rev 71219)
@@ -1820,7 +1820,7 @@
// Only trigger if we've ever bound an event
for it
if ( jQuery.event.global[ type ] ) {
- jQuery.each( jQuery.cache, function() {
+ jQuery.each( jQuery.cache, function() {
if ( this.events
this.events[type] ) {
jQuery.event.trigger(
event, data, this.handle.elem );
}
Modified: branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
===
--- branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
2010-08-17 23:11:08 UTC (rev 71218)
+++ branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
2010-08-17 23:33:27 UTC (rev 71219)
@@ -14,6 +14,7 @@
'mwe-sequencer-loading-asset' = 'Loading asset ...',
'mwe-sequencer-no_selected_resource' = 'h3No resource selected/h3
Select a clip to enable editing.',
+ 'mwe-sequencer-error_edit_multiple' = 'h3Multiple resources
selected/h3 Select a single clip to edit it.',
'mwe-sequencer-no-sequence-start-new' = 'Empty sequence, [$1 browser
for assets] to create a new sequence',
'mwe-sequencer-video-track' = 'Video track',
'mwe-sequencer-audio-track' = 'Audio track',
@@ -86,8 +87,7 @@
'mwe-sequencer-pixle2sec' = 'pixels to seconds',
'mwe-sequencer-rmclip' = 'Remove clip',
'mwe-sequencer-clip_in' = 'clip in',
- 'mwe-sequencer-clip_out' = 'clip out',
- 'mwe-sequencer-error_edit_multiple' = 'h3Multiple resources
selected/h3 Select a single clip to edit it.',
+ 'mwe-sequencer-clip_out' = 'clip out',
'mwe-sequencer-editor_options' = 'Editor options',
'mwe-sequencer-editor_mode' = 'Editor mode',
'mwe-sequencer-simple_editor_desc' = 'simple editor (iMovie style)',
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js
===
---
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js
2010-08-17 23:11:08 UTC (rev 71218)
+++
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js
2010-08-17 23:33:27 UTC (rev 71219)
@@ -47,7 +47,14 @@
* Apply a smil xml transform state ( to support undo / redo )
*/
registerEdit: function(){
- mw.log( 'ActionsEdit::registerEdit: stacksize' +
this.editStack.length + ' editIndex: ' + this.editIndex );
+ //mw.log( 'ActionsEdit::registerEdit: stacksize' +
this.editStack.length + ' editIndex: ' + this.editIndex );
+ // Make sure the edit is distinct from the latest in the stack:
+ var currentXML = this.sequencer.getSmil().getXMLString();
+ if( currentXML == this.editStack[ this.editStack-1 ] ){
+ mw.log(ActionsEdit::registerEdit on identical smil xml
state ( no edit stack modification ) )
+ return ;
+ }
+
// Throw away any edit history after the current editIndex:
if( this.editStack.length this.editIndex
this.editStack.length ) {
this.editStack = this.editStack.splice(0,
[MediaWiki-CVS] SVN: [71220] trunk/extensions/CentralNotice
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71220 Revision: 71220 Author: kaldari Date: 2010-08-17 23:38:18 + (Tue, 17 Aug 2010) Log Message: --- fixing SQL error introduced in r70969, making index from r70907 UNIQUE Modified Paths: -- trunk/extensions/CentralNotice/CentralNotice.sql trunk/extensions/CentralNotice/patches/patch-notice_languages.sql Modified: trunk/extensions/CentralNotice/CentralNotice.sql === --- trunk/extensions/CentralNotice/CentralNotice.sql2010-08-17 23:33:27 UTC (rev 71219) +++ trunk/extensions/CentralNotice/CentralNotice.sql2010-08-17 23:38:18 UTC (rev 71220) @@ -27,5 +27,4 @@ `not_id` int unsigned NOT NULL, `not_language` varchar(32) NOT NULL ) /*$wgDBTableOptions*/; - -CREATE UNIQUE KEY `not_id_not_language` ON /*_*/cn_notice_languages(`not_id`,`not_language`) +CREATE UNIQUE INDEX /*i*/cn_not_id_not_language ON /*$wgDBprefix*/cn_notice_languages (not_id, not_language); \ No newline at end of file Modified: trunk/extensions/CentralNotice/patches/patch-notice_languages.sql === --- trunk/extensions/CentralNotice/patches/patch-notice_languages.sql 2010-08-17 23:33:27 UTC (rev 71219) +++ trunk/extensions/CentralNotice/patches/patch-notice_languages.sql 2010-08-17 23:38:18 UTC (rev 71220) @@ -5,4 +5,4 @@ `not_id` int unsigned NOT NULL, `not_language` varchar(32) NOT NULL ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/cn_not_id_not_language ON /*$wgDBprefix*/cn_notice_languages (not_id, not_language); +CREATE UNIQUE INDEX /*i*/cn_not_id_not_language ON /*$wgDBprefix*/cn_notice_languages (not_id, not_language); \ 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: [71221] trunk/extensions/DonationInterface/payflowpro_gateway/ payflowpro_gateway.body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71221
Revision: 71221
Author: awjrichards
Date: 2010-08-18 00:03:09 + (Wed, 18 Aug 2010)
Log Message:
---
Changed payflow response parsing to explode entire response string into an
array (rather than old whack string parsing), partly as per
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69650#c8461
Modified Paths:
--
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
===
---
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2010-08-17 23:38:18 UTC (rev 71220)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2010-08-18 00:03:09 UTC (rev 71221)
@@ -698,19 +698,19 @@
// prepare NVP response for sorting and outputting
$responseArray = array();
-
- while( strlen( $result ) ) {
- // name
- $namepos = strpos( $result, '=' );
- $nameval = substr( $result, 0, $namepos );
- // value
- $valuepos = strpos( $result, '' ) ? strpos( $result,
'' ) : strlen( $result );
- $valueval = substr( $result, $namepos + 1, $valuepos -
$namepos - 1 );
- // decoding the respose
- $responseArray[$nameval] = $valueval;
- $result = substr( $result, $valuepos + 1, strlen(
$result ) );
+
+ /**
+* The result response string looks like:
+* RESULT=7PNREF=E79P2C651DC2RESPMSG=Field format
errorHOSTCODE=10747DUPLICATE=1
+* We want to turn this into an array of key value pairs, so
explode on '' and then
+* split up the resulting strings into $key = $value
+*/
+ $result_arr = explode( , $result );
+ foreach ( $result_arr as $result_pair ) {
+ list( $key, $value ) = split( =, $result_pair );
+ $responseArray[ $key ] = $value;
}
-
+
// errors fall into three categories, try again please,
sorry it didn't work out, and approved
// get the result code for response array
$resultCode = $responseArray['RESULT'];
@@ -724,7 +724,6 @@
$errorCode = $this-fnPayflowGetResponseMsg( $resultCode,
$responseMsg );
// if approved, display results and send transaction to the
queue
-
if( $errorCode == '1' ) {
$this-fnPayflowDisplayApprovedResults( $data,
$responseArray, $responseMsg );
// give user a second chance to enter incorrect data
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71222] trunk/extensions/CentralNotice
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71222 Revision: 71222 Author: kaldari Date: 2010-08-18 00:08:06 + (Wed, 18 Aug 2010) Log Message: --- forgot to update main SQL file for r71004, cleaning up SQL formatting Modified Paths: -- trunk/extensions/CentralNotice/CentralNotice.sql trunk/extensions/CentralNotice/patches/patch-notice_languages.sql Modified: trunk/extensions/CentralNotice/CentralNotice.sql === --- trunk/extensions/CentralNotice/CentralNotice.sql2010-08-18 00:03:09 UTC (rev 71221) +++ trunk/extensions/CentralNotice/CentralNotice.sql2010-08-18 00:08:06 UTC (rev 71222) @@ -1,30 +1,32 @@ CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_notices ( - `not_id` int NOT NULL PRIMARY KEY auto_increment, - `not_name` varchar(255) NOT NULL, - `not_start` char(14) NOT NULL, - `not_end` char(14) NOT NULL, - `not_enabled` bool NOT NULL default '0', - `not_preferred` bool NOT NULL default '0', - `not_locked` bool NOT NULL default '0', - `not_language` varchar(32) NOT NULL, - `not_project` varchar(255) NOT NULL + `not_id` int NOT NULL PRIMARY KEY auto_increment, + `not_name` varchar(255) NOT NULL, + `not_start` char(14) NOT NULL, + `not_end` char(14) NOT NULL, + `not_enabled` bool NOT NULL default '0', + `not_preferred` bool NOT NULL default '0', + `not_locked` bool NOT NULL default '0', + `not_language` varchar(32) NOT NULL, + `not_project` varchar(255) NOT NULL ) /*$wgDBTableOptions*/; CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_assignments ( - `asn_id` int NOT NULL PRIMARY KEY auto_increment, - `not_id` int NOT NULL, - `tmp_id` int NOT NULL, - `tmp_weight` int NOT NULL + `asn_id` int NOT NULL PRIMARY KEY auto_increment, + `not_id` int NOT NULL, + `tmp_id` int NOT NULL, + `tmp_weight` int NOT NULL ) /*$wgDBTableOptions*/; CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_templates ( - `tmp_id` int NOT NULL PRIMARY KEY auto_increment, - `tmp_name` varchar(255) default NULL + `tmp_id` int NOT NULL PRIMARY KEY auto_increment, + `tmp_name` varchar(255) default NULL + `tmp_display_anon` BOOLEAN NOT NULL DEFAULT 1, + `tmp_display_account` BOOLEAN NOT NULL DEFAULT 1; ) /*$wgDBTableOptions*/; CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_notice_languages ( - `id` int unsigned NOT NULL PRIMARY KEY auto_increment, - `not_id` int unsigned NOT NULL, - `not_language` varchar(32) NOT NULL + `id` int unsigned NOT NULL PRIMARY KEY auto_increment, + `not_id` int unsigned NOT NULL, + `not_language` varchar(32) NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/cn_not_id_not_language ON /*$wgDBprefix*/cn_notice_languages (not_id, not_language); \ No newline at end of file +CREATE UNIQUE INDEX /*i*/cn_not_id_not_language ON /*$wgDBprefix*/cn_notice_languages (not_id, not_language); Modified: trunk/extensions/CentralNotice/patches/patch-notice_languages.sql === --- trunk/extensions/CentralNotice/patches/patch-notice_languages.sql 2010-08-18 00:03:09 UTC (rev 71221) +++ trunk/extensions/CentralNotice/patches/patch-notice_languages.sql 2010-08-18 00:08:06 UTC (rev 71222) @@ -1,8 +1,8 @@ -- Update to allow for any number of languages per notice. CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_notice_languages ( - `id` int unsigned NOT NULL PRIMARY KEY auto_increment, - `not_id` int unsigned NOT NULL, - `not_language` varchar(32) NOT NULL + `id` int unsigned NOT NULL PRIMARY KEY auto_increment, + `not_id` int unsigned NOT NULL, + `not_language` varchar(32) NOT NULL ) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/cn_not_id_not_language ON /*$wgDBprefix*/cn_notice_languages (not_id, not_language); \ No newline at end of file +CREATE UNIQUE INDEX /*i*/cn_not_id_not_language ON /*$wgDBprefix*/cn_notice_languages (not_id, not_language); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71223] trunk/extensions/CentralNotice/CentralNotice.sql
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71223 Revision: 71223 Author: kaldari Date: 2010-08-18 00:18:27 + (Wed, 18 Aug 2010) Log Message: --- missing comma fix for r71222 Modified Paths: -- trunk/extensions/CentralNotice/CentralNotice.sql Modified: trunk/extensions/CentralNotice/CentralNotice.sql === --- trunk/extensions/CentralNotice/CentralNotice.sql2010-08-18 00:08:06 UTC (rev 71222) +++ trunk/extensions/CentralNotice/CentralNotice.sql2010-08-18 00:18:27 UTC (rev 71223) @@ -19,9 +19,9 @@ CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_templates ( `tmp_id` int NOT NULL PRIMARY KEY auto_increment, - `tmp_name` varchar(255) default NULL + `tmp_name` varchar(255) default NULL, `tmp_display_anon` BOOLEAN NOT NULL DEFAULT 1, - `tmp_display_account` BOOLEAN NOT NULL DEFAULT 1; + `tmp_display_account` BOOLEAN NOT NULL DEFAULT 1 ) /*$wgDBTableOptions*/; CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_notice_languages ( ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71224] trunk/extensions/DonationInterface/payflowpro_gateway
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71224
Revision: 71224
Author: awjrichards
Date: 2010-08-18 00:21:05 + (Wed, 18 Aug 2010)
Log Message:
---
Updated 'conversion log' to log any response from PayflowPro, not just
conversions; Updated payflowpro_gateway.body.php to accomodate this
Modified Paths:
--
trunk/extensions/DonationInterface/payflowpro_gateway/extras/conversion_log/conversion_log.php
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/extras/conversion_log/conversion_log.php
===
---
trunk/extensions/DonationInterface/payflowpro_gateway/extras/conversion_log/conversion_log.php
2010-08-18 00:18:27 UTC (rev 71223)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/extras/conversion_log/conversion_log.php
2010-08-18 00:21:05 UTC (rev 71224)
@@ -1,7 +1,9 @@
?php
/**
- * Extra to log payflow conversion during post processing hook
+ * Extra to log payflow response during post processing hook
*
+ * @fixme Class/file names should likely change to reflect change in purpose...
+ *
* To install:
* require_once(
$IP/extensions/DonationInterface/payflowpro_gateway/extras/conversion_log/conversion_log.php
)
* In LocalSettings.php:
@@ -11,16 +13,16 @@
class PayflowProGateway_Extras_ConversionLog extends PayflowProGateway_Extras {
/**
-* Logs the transaction info for a conversion for payflow
+* Logs the response from a payflow transaction
*/
public function post_process( $pfp_gateway_object, $data ) {
- //make sure the transaction property has been set (signifying
conversion)
- if ( !$pfp_gateway_object-payflow_transaction ) return FALSE;
+ //make sure the payflow response property has been set
(signifying a transaction has been made)
+ if ( !$pfp_gateway_object-payflow_response ) return FALSE;
$this-log(
$data[ 'contribution_tracking_id' ],
- 'Conversion',
- '' . $pfp_gateway_object-payflow_transaction[ 'PNREF'
] . ''
+ Payflow response: . addslashes(
$pfp_gateway_object-payflow_response[ 'RESPMSG' ] ),
+ '' . addslashes( json_encode(
$pfp_gateway_object-payflow_response )) . ''
);
return TRUE;
}
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
===
---
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2010-08-18 00:18:27 UTC (rev 71223)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2010-08-18 00:21:05 UTC (rev 71224)
@@ -17,10 +17,10 @@
public $action = 'process';
/**
-* Holds the information from a Payflow transaction
+* Holds the PayflowPro response from a transaction
* @var array
*/
- public $payflow_transaction = NULL;
+ public $payflow_response = array();
/**
* Constructor - set up the new special page
@@ -710,7 +710,10 @@
list( $key, $value ) = split( =, $result_pair );
$responseArray[ $key ] = $value;
}
-
+
+ // store the response array as an object property for easy
retrival/manipulation elsewhere
+ $this-payflow_response = $responseArray;
+
// errors fall into three categories, try again please,
sorry it didn't work out, and approved
// get the result code for response array
$resultCode = $responseArray['RESULT'];
@@ -829,9 +832,6 @@
// hook to call stomp functions
wfRunHooks( 'gwStomp', array( $transaction ) );
- // set the object property for the transaction
- $this-payflow_transaction = $transaction;
-
if ( $wgExternalThankYouPage ) {
$wgOut-redirect( $wgExternalThankYouPage . / .
$data['language'] );
} else {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71225] trunk/extensions/DonationInterface/payflowpro_gateway/extras/ recaptcha/recaptcha.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71225
Revision: 71225
Author: awjrichards
Date: 2010-08-18 00:25:06 + (Wed, 18 Aug 2010)
Log Message:
---
Updated recaptcha extra to log when a captcha is triggered
Modified Paths:
--
trunk/extensions/DonationInterface/payflowpro_gateway/extras/recaptcha/recaptcha.php
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/extras/recaptcha/recaptcha.php
===
---
trunk/extensions/DonationInterface/payflowpro_gateway/extras/recaptcha/recaptcha.php
2010-08-18 00:21:05 UTC (rev 71224)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/extras/recaptcha/recaptcha.php
2010-08-18 00:25:06 UTC (rev 71225)
@@ -38,6 +38,8 @@
* Display the submission form with the captcha injected into it
*/
public function display_captcha( $pfp_gateway_object, $data,
$error=array() ) {
+ $this-log( $data[ 'contribution_tracking_id' ], 'Captcha
triggered' );
+
global $wgOut, $wgPayflowCaptcha;
$form = $pfp_gateway_object-fnPayflowGenerateFormBody( $data,
$error );
$form .= Xml::openElement( 'div', array( 'id' =
'mw-donate-captcha' ));
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71226] branches/resourceloader/phase3/resources/mediawiki/mediawiki. js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71226
Revision: 71226
Author: tparscal
Date: 2010-08-18 00:28:30 + (Wed, 18 Aug 2010)
Log Message:
---
Enhanced logging of module exceptions
Modified Paths:
--
branches/resourceloader/phase3/resources/mediawiki/mediawiki.js
Modified: branches/resourceloader/phase3/resources/mediawiki/mediawiki.js
===
--- branches/resourceloader/phase3/resources/mediawiki/mediawiki.js
2010-08-18 00:25:06 UTC (rev 71225)
+++ branches/resourceloader/phase3/resources/mediawiki/mediawiki.js
2010-08-18 00:28:30 UTC (rev 71226)
@@ -325,6 +325,7 @@
}
} catch ( e ) {
mediaWiki.log( 'Exception thrown by ' + module
+ ': ' + e.message );
+ mediaWiki.log( e );
registry[module].state = 'error';
// Run error callbacks of jobs affected by this
condition
for ( var j = 0; j jobs.length; j++ ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71227] branches/resourceloader/phase3/includes/OutputPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71227
Revision: 71227
Author: tparscal
Date: 2010-08-18 00:34:54 + (Wed, 18 Aug 2010)
Log Message:
---
Fixed handling for debug mode
Modified Paths:
--
branches/resourceloader/phase3/includes/OutputPage.php
Modified: branches/resourceloader/phase3/includes/OutputPage.php
===
--- branches/resourceloader/phase3/includes/OutputPage.php 2010-08-18
00:28:30 UTC (rev 71226)
+++ branches/resourceloader/phase3/includes/OutputPage.php 2010-08-18
00:34:54 UTC (rev 71227)
@@ -2254,6 +2254,7 @@
$module = ResourceLoader::getModule( $name );
if ( $module-isRaw() ) {
$scripts .=
self::makeResourceLoaderLinkedScript( $sk, $name );
+ } else {
$skipped[] = $name;
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71228] branches/resourceloader/phase3/resources/mediawiki/legacy/ mediawiki.legacy.edit.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71228
Revision: 71228
Author: tparscal
Date: 2010-08-18 00:41:00 + (Wed, 18 Aug 2010)
Log Message:
---
Fixed syntax errors
Modified Paths:
--
branches/resourceloader/phase3/resources/mediawiki/legacy/mediawiki.legacy.edit.js
Modified:
branches/resourceloader/phase3/resources/mediawiki/legacy/mediawiki.legacy.edit.js
===
---
branches/resourceloader/phase3/resources/mediawiki/legacy/mediawiki.legacy.edit.js
2010-08-18 00:34:54 UTC (rev 71227)
+++
branches/resourceloader/phase3/resources/mediawiki/legacy/mediawiki.legacy.edit.js
2010-08-18 00:41:00 UTC (rev 71228)
@@ -183,8 +183,8 @@
var $scrollTop = $( '#wpScrolltop' );
var $editForm = $( '#editform' );
if ( $editForm.length $textbox.length $scrollTop.length )
{
- if ( scrollTop.val() ) {
- $textbox.scrollTop = $scrollTop.val();
+ if ( $scrollTop.val() ) {
+ $textbox.scrollTop( $scrollTop.val() );
}
$editForm.submit( function() {
$scrollTop.val( $textbox.scrollTop );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71229] trunk/extensions/CentralNotice/centralnotice.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71229
Revision: 71229
Author: kaldari
Date: 2010-08-18 01:04:33 + (Wed, 18 Aug 2010)
Log Message:
---
fixing Top 10 Language selection
Modified Paths:
--
trunk/extensions/CentralNotice/centralnotice.js
Modified: trunk/extensions/CentralNotice/centralnotice.js
===
--- trunk/extensions/CentralNotice/centralnotice.js 2010-08-18 00:41:00 UTC
(rev 71228)
+++ trunk/extensions/CentralNotice/centralnotice.js 2010-08-18 01:04:33 UTC
(rev 71229)
@@ -8,6 +8,7 @@
function top10Languages() {
var selectBox = document.getElementById('project_languages[]');
var top10 = new
Array('en','de','fr','it','pt','ja','es','pl','ru','nl');
+ selectLanguages(false);
for (var i = 0; i selectBox.options.length; i++) {
var lang = selectBox.options[i].value;
if (top10.toString().indexOf(lang)!==-1) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71230] trunk/extensions/ArticleAsessmentPilot/
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71230 Revision: 71230 Author: nimishg Date: 2010-08-18 01:31:57 + (Wed, 18 Aug 2010) Log Message: --- 'Pilot' version of Article Asessment, based on ReaderFeedback extension, for the Public Policy Project Added Paths: --- trunk/extensions/ArticleAsessmentPilot/ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71232] trunk/extensions/SemanticMediaWiki/SMW_Settings.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71232 Revision: 71232 Author: yaron Date: 2010-08-18 02:34:52 + (Wed, 18 Aug 2010) Log Message: --- Added $smwgAutocompleteInSpecialAsk Modified Paths: -- trunk/extensions/SemanticMediaWiki/SMW_Settings.php Modified: trunk/extensions/SemanticMediaWiki/SMW_Settings.php === --- trunk/extensions/SemanticMediaWiki/SMW_Settings.php 2010-08-18 02:34:23 UTC (rev 71231) +++ trunk/extensions/SemanticMediaWiki/SMW_Settings.php 2010-08-18 02:34:52 UTC (rev 71232) @@ -439,4 +439,11 @@ # or updating of all wiki data using the interface on Special:SMWAdmin. ## $smwgAdminRefreshStore = true; -## \ No newline at end of file +## + +### +# Sets whether or not the 'printouts' textarea should have autocompletion +# on property names. +## +$smwgAutocompleteInSpecialAsk = true; +## ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71233] trunk/extensions/SemanticMediaWiki/README
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71233 Revision: 71233 Author: yaron Date: 2010-08-18 02:36:10 + (Wed, 18 Aug 2010) Log Message: --- Added Sanyam Goyal to contributors list Modified Paths: -- trunk/extensions/SemanticMediaWiki/README Modified: trunk/extensions/SemanticMediaWiki/README === --- trunk/extensions/SemanticMediaWiki/README 2010-08-18 02:34:52 UTC (rev 71232) +++ trunk/extensions/SemanticMediaWiki/README 2010-08-18 02:36:10 UTC (rev 71233) @@ -46,7 +46,7 @@ Fernando Correia, Yaron Koren, Nick Grandy, Jörg Heizmann, Daniel Herzig, Nikolas Iwan, Tobias Matzner, Thomas Bleher, Felix Kratzer, Frank Dengler, Nathan R. Yergler, Daniel Friesen, Fabian Howahl, Jie Bao, Marcel Gsteiger, - Roi Avinoam, Richard Cyganiak + Roi Avinoam, Richard Cyganiak, Sanyam Goyal. * The logo and related artwork for Semantic MediaWiki (see semanticweb.org) were designed and realised by Rozana Vrandecic. @@ -73,4 +73,4 @@ * Many people have contributed to the project by providing helpful comments and suggestions. Among them are the members of the Semantic Wiki Interest Group (swi...@aifb.uni-karlsruhe.de; see semanticweb.org), the people at the project - mailing lists, and a number of anonymous reviewers. Thanks a lot! \ No newline at end of file + mailing lists, and a number of anonymous reviewers. Thanks a lot! ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71234] trunk/extensions/SemanticMediaWiki/RELEASE-NOTES
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71234 Revision: 71234 Author: yaron Date: 2010-08-18 02:37:38 + (Wed, 18 Aug 2010) Log Message: --- Started 'SMW 1.5.2' section Modified Paths: -- trunk/extensions/SemanticMediaWiki/RELEASE-NOTES Modified: trunk/extensions/SemanticMediaWiki/RELEASE-NOTES === --- trunk/extensions/SemanticMediaWiki/RELEASE-NOTES2010-08-18 02:36:10 UTC (rev 71233) +++ trunk/extensions/SemanticMediaWiki/RELEASE-NOTES2010-08-18 02:37:38 UTC (rev 71234) @@ -1,5 +1,9 @@ For a documentation of all features, see http://semantic-mediawiki.org +== SMW 1.5.2 == +* 'Printouts' textarea in Special:Ask now has autocompletion on property + names. + == SMW 1.5.1 == * Added query comparator !~ that works like the negation of ~, i.e. that ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71235] trunk/extensions/SemanticMediaWiki/specials/AskSpecial/ SMW_SpecialAsk.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71235
Revision: 71235
Author: yaron
Date: 2010-08-18 02:49:34 + (Wed, 18 Aug 2010)
Log Message:
---
Fixed small errors
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php
===
--- trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php
2010-08-18 02:37:38 UTC (rev 71234)
+++ trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php
2010-08-18 02:49:34 UTC (rev 71235)
@@ -155,7 +155,7 @@
}
static protected function addAutocompletionJavascriptAndCSS() {
- global $wgOut, $smwgScriptPath, $smwgJQueryIncluded;
+ global $wgOut, $smwgScriptPath, $smwgJQueryIncluded,
$smwgJQUIAutoIncluded;
// Add CSS and JavaScript for jQuery and jQuery UI
$wgOut-addLink(
@@ -163,7 +163,7 @@
'rel' = 'stylesheet',
'type' = 'text/css',
'media' = screen,
- 'href' = $smwgScriptPath .
'/skins/jqueryui/base/jquery.ui.all.css'
+ 'href' = $smwgScriptPath .
'/skins/jquery-ui/base/jquery.ui.all.css'
)
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71237] trunk/extensions/SemanticMediaWiki/includes/storage/ SMW_SQLStore2.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71237
Revision: 71237
Author: yaron
Date: 2010-08-18 02:52:32 + (Wed, 18 Aug 2010)
Log Message:
---
Fixed PHP error
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php
Modified: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php
===
--- trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php
2010-08-18 02:50:52 UTC (rev 71236)
+++ trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php
2010-08-18 02:52:32 UTC (rev 71237)
@@ -1005,8 +1005,10 @@
$query = '(' . implode( ') UNION (', $queries ) . ') ORDER BY
smw_sortkey';
// The following line is possible in MW 1.6 and above only:
// $query = $db-unionQueries($queries, false) . ' ORDER BY
smw_sortkey'; // should probably use $db-makeSelectOptions()
- if ( $requestoptions-limit 0 ) {
- $query = $db-limitResult( $query,
$requestoptions-limit, ( $requestoptions-offset 0 ) ?
$requestoptions-offset:0 );
+ if ( $requestoptions !== null ) {
+ if ( $requestoptions-limit 0 ) {
+ $query = $db-limitResult( $query,
$requestoptions-limit, ( $requestoptions-offset 0 ) ?
$requestoptions-offset:0 );
+ }
}
$res = $db-query( $query, 'SMW::getPropertySubjects' );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71238] branches/MwEmbedStandAlone
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71238
Revision: 71238
Author: dale
Date: 2010-08-18 05:58:07 + (Wed, 18 Aug 2010)
Log Message:
---
* improved sequencer remote stubs
* support for data url sequence source loading
* added stubs for Sequencer Server abstraction for interacting with server back
end ( only mediawiki so far )
Modified Paths:
--
branches/MwEmbedStandAlone/components/mw.Api.js
branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
branches/MwEmbedStandAlone/modules/Sequencer/loader.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.RemoteSequencer.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.Sequencer.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerPlayer.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTimeline.js
branches/MwEmbedStandAlone/modules/SmilPlayer/loader.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilBody.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilHooks.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
branches/MwEmbedStandAlone/mwEmbed.js
Added Paths:
---
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
Modified: branches/MwEmbedStandAlone/components/mw.Api.js
===
--- branches/MwEmbedStandAlone/components/mw.Api.js 2010-08-18 02:52:32 UTC
(rev 71237)
+++ branches/MwEmbedStandAlone/components/mw.Api.js 2010-08-18 05:58:07 UTC
(rev 71238)
@@ -8,7 +8,7 @@
/**
*
- * Helper function to get revision text for a given title
+ * Helper function to get latest revision text for a given title
*
* Assumes follow redirects
*
Modified: branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
===
--- branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
2010-08-18 02:52:32 UTC (rev 71237)
+++ branches/MwEmbedStandAlone/modules/Sequencer/Sequencer.i18n.php
2010-08-18 05:58:07 UTC (rev 71238)
@@ -14,8 +14,9 @@
'mwe-sequencer-loading-asset' = 'Loading asset ...',
'mwe-sequencer-no_selected_resource' = 'h3No resource selected/h3
Select a clip to enable editing.',
+ 'mwe-sequencer-untitled-sequence' = 'Untitled sequence',
'mwe-sequencer-error_edit_multiple' = 'h3Multiple resources
selected/h3 Select a single clip to edit it.',
- 'mwe-sequencer-no-sequence-start-new' = 'Empty sequence, [$1 browser
for assets] to create a new sequence',
+ 'mwe-sequencer-no-sequence-start-new' = 'Empty sequence, [$1 add
assets] to create a new sequence',
'mwe-sequencer-video-track' = 'Video track',
'mwe-sequencer-audio-track' = 'Audio track',
'mwe-sequencer-sequencer_credit_line' = 'Developed by [$1 Kaltura,
Inc] in partnership with the [$1 Wikimedia Foundation]',
Modified: branches/MwEmbedStandAlone/modules/Sequencer/loader.js
===
--- branches/MwEmbedStandAlone/modules/Sequencer/loader.js 2010-08-18
02:52:32 UTC (rev 71237)
+++ branches/MwEmbedStandAlone/modules/Sequencer/loader.js 2010-08-18
05:58:07 UTC (rev 71238)
@@ -71,6 +71,7 @@
'mw.style.Sequencer'
],
[
+
'$j.fn.layout',
// UI components used in the sequencer
interface:
'$j.ui.accordion',
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.RemoteSequencer.js
===
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.RemoteSequencer.js
2010-08-18 02:52:32 UTC (rev 71237)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.RemoteSequencer.js
2010-08-18 05:58:07 UTC (rev 71238)
@@ -25,12 +25,12 @@
},
drawUI: function() {
- // Check page type
+ // Check page action
if( this.action == 'view' ) {
this.showViewUI();
}
},
- /*
+ /**
* Check page for sequence
* if not present give link to create one.
*/
@@ -38,7 +38,11 @@
var _this = this;
if( wgArticleId == 0 ) {
// Update create button
- $j('#ca-edit span').text(
gM('mwe-sequencer-create-sequence' ));
+ $j('#ca-edit span a')
+ .text( gM('mwe-sequencer-create-sequence' ))
+ .click(function(){
+ _this.showEditor();
+
