Database config

+ Database type +

Select the database server software:

+ + +

If your database server isn't on your web server, enter the name - or IP address here. + or IP address here. MySQL only.

+ If using Oracle, set this to your connection identifier. +

@@ -1131,6 +1174,7 @@ if ( \$wgCommandLineMode ) { \$wgDBuser = \"{$slconf['DBuser']}\"; \$wgDBpassword = \"{$slconf['DBpassword']}\"; \$wgDBprefix = \"{$slconf['DBprefix']}\"; +\$wgDBtype = \"{$slconf['DBtype']}\"; # If you're on MySQL 3.x, this next line must be FALSE: \$wgDBmysql4 = {$conf->DBmysql4}; @@ -1294,6 +1338,14 @@ function locate_executable($loc, $names, $versioninfo = false) { return false; } +function get_db_version() { + global $wgDatabase, $conf; + if ($conf->DBtype == 'mysql') + return mysql_get_server_info( $wgDatabase->mConn ); + else if ($conf->DBtype == 'oracle') + return oci_server_version($wgDatabase->mConn); +} + # Test a memcached server function testMemcachedServer( $server ) { $hostport = explode(":", $server); diff --git a/includes/Article.php b/includes/Article.php index e0bd2016f2..7242d741ba 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -486,6 +486,8 @@ class Article { * Get the database which should be used for reads */ function &getDB() { + $ret = wfGetDB( DB_MASTER ); + return $ret; #if ( $this->mForUpdate ) { $ret =& wfGetDB( DB_MASTER ); #} else { @@ -608,7 +610,7 @@ class Article { function getTimestamp() { $this->loadLastEdit(); - return $this->mTimestamp; + return wfTimestamp(TS_MW, $this->mTimestamp); } function getUser() { @@ -864,7 +866,7 @@ class Article { $tbtext = ""; while ($o = $dbr->fetchObject($tbs)) { - $rmvtext = ""; + $rmvtxt = ""; if ($wgUser->isSysop()) { $delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid=" . $o->tb_id . "&token=" . $wgUser->editToken()); @@ -970,13 +972,14 @@ class Article { # An extra check against threads stepping on each other $conditions['page_latest'] = $lastRevision; } + $text = $revision->getText(); $dbw->update( 'page', array( /* SET */ 'page_latest' => $revision->getId(), 'page_touched' => $dbw->timestamp(), 'page_is_new' => ($lastRevision === 0) ? 1 : 0, - 'page_is_redirect' => Article::isRedirect( $text ), + 'page_is_redirect' => Article::isRedirect( $text ) ? 1 : 0, 'page_len' => strlen( $text ), ), $conditions, @@ -1005,7 +1008,7 @@ class Article { 'page_latest=rev_id' ), $fname ); if( $row ) { - if( $row->rev_timestamp >= $revision->getTimestamp() ) { + if( wfTimestamp(TS_MW, $row->rev_timestamp) >= $revision->getTimestamp() ) { wfProfileOut( $fname ); return false; } diff --git a/includes/BagOStuff.php b/includes/BagOStuff.php index 662e32c9b9..7e48fb04a7 100644 --- a/includes/BagOStuff.php +++ b/includes/BagOStuff.php @@ -2,17 +2,17 @@ # # Copyright (C) 2003-2004 Brion Vibber # http://www.mediawiki.org/ -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -21,7 +21,7 @@ * * @package MediaWiki */ - + /** * Simple generic object store * @@ -37,18 +37,18 @@ */ class BagOStuff { var $debugmode; - + function BagOStuff() { $this->set_debug( false ); } - + function set_debug($bool) { $this->debugmode = $bool; } - + /* *** THE GUTS OF THE OPERATION *** */ /* Override these with functional things in subclasses */ - + function get($key) { /* stub */ return false; @@ -58,12 +58,12 @@ class BagOStuff { /* stub */ return false; } - + function delete($key, $time=0) { /* stub */ return false; } - + function lock($key, $timeout = 0) { /* stub */ return true; @@ -73,7 +73,7 @@ class BagOStuff { /* stub */ return true; } - + /* *** Emulated functions *** */ /* Better performance can likely be got with custom written versions */ function get_multi($keys) { @@ -82,19 +82,19 @@ class BagOStuff { $out[$key] = $this->get($key); return $out; } - + function set_multi($hash, $exptime=0) { foreach($hash as $key => $value) $this->set($key, $value, $exptime); } - + function add($key, $value, $exptime=0) { if( $this->get($key) == false ) { $this->set($key, $value, $exptime); return true; } } - + function add_multi($hash, $exptime=0) { foreach($hash as $key => $value) $this->add($key, $value, $exptime); @@ -104,12 +104,12 @@ class BagOStuff { foreach($keys as $key) $this->delete($key, $time); } - + function replace($key, $value, $exptime=0) { if( $this->get($key) !== false ) $this->set($key, $value, $exptime); } - + function incr($key, $value=1) { if ( !$this->lock($key) ) { return false; @@ -125,7 +125,7 @@ class BagOStuff { $this->unlock($key); return $n; } - + function decr($key, $value=1) { if ( !$this->lock($key) ) { return false; @@ -142,7 +142,7 @@ class BagOStuff { $this->unlock($key); return $m; } - + function _debug($text) { if($this->debugmode) wfDebug("BagOStuff debug: $text\n"); @@ -162,11 +162,11 @@ class HashBagOStuff extends BagOStuff { persist between program runs. */ var $bag; - + function HashBagOStuff() { $this->bag = array(); } - + function _expire($key) { $et = $this->bag[$key][1]; if(($et == 0) || ($et > time())) @@ -174,7 +174,7 @@ class HashBagOStuff extends BagOStuff { $this->delete($key); return true; } - + function get($key) { if(!$this->bag[$key]) return false; @@ -182,13 +182,13 @@ class HashBagOStuff extends BagOStuff { return false; return $this->bag[$key][0]; } - + function set($key,$value,$exptime=0) { if(($exptime != 0) && ($exptime < 3600*24*30)) $exptime = time() + $exptime; $this->bag[$key] = array( $value, $exptime ); } - + function delete($key,$time=0) { if(!$this->bag[$key]) return false; @@ -219,11 +219,11 @@ class SqlBagOStuff extends BagOStuff { function SqlBagOStuff($tablename = 'objectcache') { $this->table = $tablename; } - + function get($key) { /* expire old entries if any */ $this->garbageCollect(); - + $res = $this->_query( "SELECT value,exptime FROM $0 WHERE keyname='$1'", $key); if(!$res) { @@ -238,7 +238,7 @@ class SqlBagOStuff extends BagOStuff { } return false; } - + function set($key,$value,$exptime=0) { $exptime = intval($exptime); if($exptime < 0) $exptime = 0; @@ -250,22 +250,24 @@ class SqlBagOStuff extends BagOStuff { $exp = $this->_fromunixtime($exptime); } $this->delete( $key ); - $this->_query( - "INSERT INTO $0 (keyname,value,exptime) VALUES('$1','$2','$exp')", - $key, $this->_serialize($value)); + $this->_doinsert($this->getTableName(), array( + 'keyname' => $key, + 'value' => $this->_blobencode($this->_serialize($value)), + 'exptime' => $exp + )); return true; /* ? */ } - + function delete($key,$time=0) { $this->_query( "DELETE FROM $0 WHERE keyname='$1'", $key ); return true; /* ? */ } - + function getTableName() { return $this->table; } - + function _query($sql) { $reps = func_get_args(); $reps[0] = $this->getTableName(); @@ -273,7 +275,7 @@ class SqlBagOStuff extends BagOStuff { for($i=0;$i_strencode($reps[$i]), + $i > 0 ? $this->_strencode($reps[$i]) : $reps[$i], $sql); } $res = $this->_doquery($sql); @@ -282,38 +284,43 @@ class SqlBagOStuff extends BagOStuff { } return $res; } - + function _strencode($str) { /* Protect strings in SQL */ return str_replace( "'", "''", $str ); } - + function _blobencode($str) { + return $str; + } + function _doinsert($table, $vals) { + die( 'abstract function SqlBagOStuff::_doinsert() must be defined' ); + } function _doquery($sql) { die( 'abstract function SqlBagOStuff::_doquery() must be defined' ); } - + function _fetchrow($res) { die( 'abstract function SqlBagOStuff::_fetchrow() must be defined' ); } - + function _freeresult($result) { /* stub */ return false; } - + function _dberror($result) { /* stub */ return 'unknown error'; } - + function _maxdatetime() { die( 'abstract function SqlBagOStuff::_maxdatetime() must be defined' ); } - + function _fromunixtime() { die( 'abstract function SqlBagOStuff::_fromunixtime() must be defined' ); } - + function garbageCollect() { /* Ignore 99% of requests */ if ( !mt_rand( 0, 100 ) ) { @@ -325,18 +332,18 @@ class SqlBagOStuff extends BagOStuff { } } } - + function expireall() { /* Remove any items that have expired */ $now = $this->_fromunixtime( time() ); - $this->_query( "DELETE FROM $0 WHERE exptime<'$now'" ); + $this->_query( "DELETE FROM $0 WHERE exptime < '$now'" ); } - + function deleteall() { /* Clear *all* items from cache table */ $this->_query( "DELETE FROM $0" ); } - + /** * Serialize an object and, if possible, compress the representation. * On typical message and page data, this can provide a 3X decrease @@ -353,7 +360,7 @@ class SqlBagOStuff extends BagOStuff { return $serial; } } - + /** * Unserialize and, if necessary, decompress an object. * @param string $serial @@ -366,7 +373,9 @@ class SqlBagOStuff extends BagOStuff { $serial = $decomp; } } - return unserialize( $serial ); + wfdebug("serial: [$serial]\n"); + $ret = unserialize( $serial ); + return $ret; } } @@ -379,7 +388,11 @@ class MediaWikiBagOStuff extends SqlBagOStuff { function _doquery($sql) { $dbw =& wfGetDB( DB_MASTER ); - return $dbw->query($sql, 'MediaWikiBagOStuff:_doquery'); + return $dbw->query($sql, 'MediaWikiBagOStuff::_doquery'); + } + function _doinsert($t, $v) { + $dbw =& wfGetDB( DB_MASTER ); + return $dbw->insert($t, $v, 'MediaWikiBagOStuff::_doinsert'); } function _fetchobject($result) { $dbw =& wfGetDB( DB_MASTER ); @@ -394,15 +407,21 @@ class MediaWikiBagOStuff extends SqlBagOStuff { return $dbw->lastError(); } function _maxdatetime() { - return '9999-12-31 12:59:59'; + $dbw =& wfGetDB(DB_MASTER); + return $dbw->timestamp('9999-12-31 12:59:59'); } function _fromunixtime($ts) { - return gmdate( 'Y-m-d H:i:s', $ts ); + $dbw =& wfGetDB(DB_MASTER); + return $dbw->timestamp($ts); } function _strencode($s) { $dbw =& wfGetDB( DB_MASTER ); return $dbw->strencode($s); } + function _blobencode($s) { + $dbw =& wfGetDB( DB_MASTER ); + return $dbw->encodeBlob($s); + } function getTableName() { if ( !$this->tableInitialised ) { $dbw =& wfGetDB( DB_MASTER ); @@ -418,16 +437,16 @@ class MediaWikiBagOStuff extends SqlBagOStuff { } /** - * This is a wrapper for Turck MMCache's shared memory functions. - * - * You can store objects with mmcache_put() and mmcache_get(), but Turck seems - * to use a weird custom serializer that randomly segfaults. So we wrap calls + * This is a wrapper for Turck MMCache's shared memory functions. + * + * You can store objects with mmcache_put() and mmcache_get(), but Turck seems + * to use a weird custom serializer that randomly segfaults. So we wrap calls * with serialize()/unserialize(). - * + * * The thing I noticed about the Turck serialized data was that unlike ordinary - * serialize(), it contained the names of methods, and judging by the amount of - * binary data, perhaps even the bytecode of the methods themselves. It may be - * that Turck's serializer is faster, so a possible future extension would be + * serialize(), it contained the names of methods, and judging by the amount of + * binary data, perhaps even the bytecode of the methods themselves. It may be + * that Turck's serializer is faster, so a possible future extension would be * to use it for arrays but not for objects. * * @package MediaWiki @@ -445,7 +464,7 @@ class TurckBagOStuff extends BagOStuff { mmcache_put( $key, serialize( $value ), $exptime ); return true; } - + function delete($key, $time=0) { mmcache_rm( $key ); return true; @@ -460,11 +479,11 @@ class TurckBagOStuff extends BagOStuff { mmcache_unlock( $key ); return true; } -} +} /** - * This is a wrapper for eAccelerator's shared memory functions. - * + * This is a wrapper for eAccelerator's shared memory functions. + * * This is basically identical to the Turck MMCache version, * mostly because eAccelerator is based on Turck MMCache. * @@ -483,7 +502,7 @@ class eAccelBagOStuff extends BagOStuff { eaccelerator_put( $key, serialize( $value ), $exptime ); return true; } - + function delete($key, $time=0) { eaccelerator_rm( $key ); return true; @@ -498,5 +517,5 @@ class eAccelBagOStuff extends BagOStuff { eaccelerator_unlock( $key ); return true; } -} +} ?> diff --git a/includes/Block.php b/includes/Block.php index 0763133249..c4110d0e40 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -12,9 +12,9 @@ define ( 'EB_FOR_UPDATE', 2 ); /** * The block class - * All the functions in this class assume the object is either explicitly + * All the functions in this class assume the object is either explicitly * loaded or filled. It is not load-on-demand. There are no accessors. - * + * * To use delete(), you only need to fill $mAddress * Globals used: $wgBlockCache, $wgAutoblockExpiry * @@ -25,9 +25,9 @@ class Block { /* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry; /* private */ var $mNetworkBits, $mIntegerAddr, $mForUpdate; - - function Block( $address = '', $user = '', $by = 0, $reason = '', - $timestamp = '' , $auto = 0, $expiry = '' ) + + function Block( $address = '', $user = '', $by = 0, $reason = '', + $timestamp = '' , $auto = 0, $expiry = '' ) { $this->mAddress = $address; $this->mUser = $user; @@ -40,19 +40,19 @@ class Block } else { $this->mExpiry = wfTimestamp( TS_MW, $expiry ); } - + $this->mForUpdate = false; $this->initialiseRange(); } - - /*static*/ function newFromDB( $address, $user = 0, $killExpired = true ) + + /*static*/ function newFromDB( $address, $user = 0, $killExpired = true ) { $ban = new Block(); $ban->load( $address, $user, $killExpired ); return $ban; } - - function clear() + + function clear() { $mAddress = $mReason = $mTimestamp = ''; $mUser = $mBy = 0; @@ -61,7 +61,7 @@ class Block /** * Get a ban from the DB, with either the given address or the given username */ - function load( $address = '', $user = 0, $killExpired = true ) + function load( $address = '', $user = 0, $killExpired = true ) { global $wgDBmysql4, $wgAntiLockFlags; $fname = 'Block::load'; @@ -96,7 +96,7 @@ class Block } else { # If there are options, a UNION can not be used, use one # SELECT instead. Will do a full table scan. - $sql = "SELECT * FROM $ipblocks WHERE (ipb_address='" . $db->strencode( $address ) . + $sql = "SELECT * FROM $ipblocks WHERE (ipb_address='" . $db->strencode( $address ) . "' OR ipb_user={$user}) $options"; } @@ -120,7 +120,7 @@ class Block } } } while ( $killed && $row ); - + # If there were any left after the killing finished, return true if ( !$row ) { $ret = false; @@ -135,8 +135,8 @@ class Block $db->freeResult( $res ); return $ret; } - - function initFromRow( $row ) + + function initFromRow( $row ) { $this->mAddress = $row->ipb_address; $this->mReason = $row->ipb_reason; @@ -150,7 +150,7 @@ class Block $row->ipb_expiry; $this->initialiseRange(); - } + } function initialiseRange() { @@ -167,11 +167,11 @@ class Block $this->mIntegerAddr = false; } } - + /** * Callback with a Block object for every block */ - /*static*/ function enumBlocks( $callback, $tag, $flags = 0 ) + /*static*/ function enumBlocks( $callback, $tag, $flags = 0 ) { global $wgAntiLockFlags; @@ -187,9 +187,9 @@ class Block } else { $db =& wfGetDB( DB_SLAVE ); $options = ''; - } + } $ipblocks = $db->tableName( 'ipblocks' ); - + $sql = "SELECT * FROM $ipblocks ORDER BY ipb_timestamp DESC $options"; $res = $db->query( $sql, 'Block::enumBans' ); @@ -206,7 +206,7 @@ class Block wfFreeResult( $res ); } - function delete() + function delete() { $fname = 'Block::delete'; if (wfReadOnly()) { @@ -223,12 +223,14 @@ class Block $this->clearCache(); } - function insert() + function insert() { wfDebug( "Block::insert; timestamp {$this->mTimestamp}\n" ); $dbw =& wfGetDB( DB_MASTER ); + $ipb_id = $dbw->nextSequenceValue('ipblocks_ipb_id_val'); $dbw->insert( 'ipblocks', array( + 'ipb_id' => $ipb_id, 'ipb_address' => $this->mAddress, 'ipb_user' => $this->mUser, 'ipb_by' => $this->mBy, @@ -238,13 +240,13 @@ class Block 'ipb_expiry' => $this->mExpiry ? $dbw->timestamp($this->mExpiry) : $this->mExpiry, - ), 'Block::insert' + ), 'Block::insert' ); $this->clearCache(); } - function deleteIfExpired() + function deleteIfExpired() { if ( $this->isExpired() ) { wfDebug( "Block::deleteIfExpired() -- deleting\n" ); @@ -256,8 +258,8 @@ class Block } } - function isExpired() - { + function isExpired() + { wfDebug( "Block::isExpired() checking current " . wfTimestampNow() . " vs $this->mExpiry\n" ); if ( !$this->mExpiry ) { return false; @@ -266,27 +268,27 @@ class Block } } - function isValid() + function isValid() { return $this->mAddress != ''; } - - function updateTimestamp() + + function updateTimestamp() { if ( $this->mAuto ) { $this->mTimestamp = wfTimestamp(); $this->mExpiry = Block::getAutoblockExpiry( $this->mTimestamp ); $dbw =& wfGetDB( DB_MASTER ); - $dbw->update( 'ipblocks', - array( /* SET */ + $dbw->update( 'ipblocks', + array( /* SET */ 'ipb_timestamp' => $dbw->timestamp($this->mTimestamp), 'ipb_expiry' => $dbw->timestamp($this->mExpiry), ), array( /* WHERE */ 'ipb_address' => $this->mAddress - ), 'Block::updateTimestamp' + ), 'Block::updateTimestamp' ); - + $this->clearCache(); } } @@ -298,12 +300,12 @@ class Block $wgBlockCache->loadFromDB(); } } - + function getIntegerAddr() { return $this->mIntegerAddr; } - + function getNetworkBits() { return $this->mNetworkBits; diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php index bb6314f376..e5c11e822c 100644 --- a/includes/CategoryPage.php +++ b/includes/CategoryPage.php @@ -5,7 +5,7 @@ * * @package MediaWiki */ - + if( !defined( 'MEDIAWIKI' ) ) die(); @@ -15,7 +15,7 @@ if( $wgCategoryMagicGallery ) require_once('ImageGallery.php'); /** - * @package MediaWiki + * @package MediaWiki */ class CategoryPage extends Article { @@ -27,7 +27,7 @@ class CategoryPage extends Article { } Article::view(); - + # If the article we've just shown is in the "Image" namespace, # follow it with the history list and link list for the image # it describes. @@ -40,7 +40,7 @@ class CategoryPage extends Article { function openShowCategory() { # For overloading } - + # generate a list of subcategories and pages for a category # depending on wfMsg("usenewcategorypage") it either calls the new # or the old code. The new code will not work properly for some @@ -85,7 +85,7 @@ class CategoryPage extends Article { $pageCondition = 'cl_sortkey < ' . $dbr->addQuotes( $until ); $flip = true; } else { - $pageCondition = '1'; + $pageCondition = '1 = 1'; $flip = false; } $limit = 200; @@ -100,7 +100,7 @@ class CategoryPage extends Article { $fname, array( 'ORDER BY' => $flip ? 'cl_sortkey DESC' : 'cl_sortkey', 'LIMIT' => $limit + 1 ) ); - + $sk =& $wgUser->getSkin(); $r = "
\n"; $count = 0; @@ -112,13 +112,13 @@ class CategoryPage extends Article { $nextPage = $x->cl_sortkey; break; } - + $title = Title::makeTitle( $x->page_namespace, $x->page_title ); - + if( $title->getNamespace() == NS_CATEGORY ) { // Subcategory; strip the 'Category' namespace from the link text. array_push( $children, $sk->makeKnownLinkObj( $title, $wgContLang->convertHtml( $title->getText() ) ) ); - + // If there's a link from Category:A to Category:B, the sortkey of the resulting // entry in the categorylinks table is Category:A, not A, which it SHOULD be. // Workaround: If sortkey == "Category:".$title, than use $title for sorting, @@ -151,13 +151,13 @@ class CategoryPage extends Article { $articles = array_reverse( $articles ); $articles_start_char = array_reverse( $articles_start_char ); } - + if( $until != '' ) { $r .= $this->pagingLinks( $this->mTitle, $nextPage, $until, $limit ); } elseif( $nextPage != '' || $from != '' ) { $r .= $this->pagingLinks( $this->mTitle, $from, $nextPage, $limit ); } - + # Don't show subcategories section if there are none. if( count( $children ) > 0 ) { # Showing subcategories @@ -214,7 +214,7 @@ class CategoryPage extends Article { } return ''; } - + /** * Format a list of articles chunked by letter in a three-column * list, ordered vertically. @@ -231,7 +231,7 @@ class CategoryPage extends Article { // get and display header $r = ''; - $prev_start_char = 'none'; + $prev_start_char = 'none'; // loop through the chunks for($startChunk = 0, $endChunk = $chunk, $chunkIndex = 0; @@ -275,7 +275,7 @@ class CategoryPage extends Article { $r .= '

'; return $r; } - + /** * Format a list of articles chunked by letter in a bullet list. * @param array $articles @@ -298,7 +298,7 @@ class CategoryPage extends Article { $r .= ''; return $r; } - + /** * @param Title $title * @param string $first @@ -312,7 +312,7 @@ class CategoryPage extends Article { global $wgUser, $wgLang; $sk =& $wgUser->getSkin(); $limitText = $wgLang->formatNum( $limit ); - + $prevLink = htmlspecialchars( wfMsg( 'prevn', $limitText ) ); if( $first != '' ) { $prevLink = $sk->makeLinkObj( $title, $prevLink, @@ -323,7 +323,7 @@ class CategoryPage extends Article { $nextLink = $sk->makeLinkObj( $title, $nextLink, wfArrayToCGI( $query + array( 'from' => $last ) ) ); } - + return "($prevLink) ($nextLink)"; } } diff --git a/includes/Database.php b/includes/Database.php index b66e7178dc..6e8a992c02 100644 --- a/includes/Database.php +++ b/includes/Database.php @@ -1,6 +1,6 @@ mData = $data; + } + + function isLOB() { + return false; + } + + function data() { + return $this->mData; + } +}; + /** * Database abstraction object * @package MediaWiki @@ -36,11 +52,11 @@ class Database { * @access private */ var $mLastQuery = ''; - + var $mServer, $mUser, $mPassword, $mConn, $mDBname; var $mOut, $mOpened = false; - - var $mFailFunction; + + var $mFailFunction; var $mTablePrefix; var $mFlags; var $mTrxLevel = 0; @@ -51,30 +67,30 @@ class Database { # Accessors #------------------------------------------------------------------------------ # These optionally set a variable and return the previous state - + /** * Fail function, takes a Database as a parameter * Set to false for default, 1 for ignore errors */ - function failFunction( $function = NULL ) { - return wfSetVar( $this->mFailFunction, $function ); + function failFunction( $function = NULL ) { + return wfSetVar( $this->mFailFunction, $function ); } - + /** * Output page, used for reporting errors * FALSE means discard output */ - function &setOutputPage( &$out ) { - $this->mOut =& $out; + function &setOutputPage( &$out ) { + $this->mOut =& $out; } - + /** * Boolean, controls output of large amounts of debug information */ - function debug( $debug = NULL ) { - return wfSetBit( $this->mFlags, DBO_DEBUG, $debug ); + function debug( $debug = NULL ) { + return wfSetBit( $this->mFlags, DBO_DEBUG, $debug ); } - + /** * Turns buffering of SQL result sets on (true) or off (false). * Default is "on" and it should not be changed without good reasons. @@ -83,7 +99,7 @@ class Database { if ( is_null( $buffer ) ) { return !(bool)( $this->mFlags & DBO_NOBUFFER ); } else { - return !wfSetBit( $this->mFlags, DBO_NOBUFFER, !$buffer ); + return !wfSetBit( $this->mFlags, DBO_NOBUFFER, !$buffer ); } } @@ -94,10 +110,10 @@ class Database { * code should use wfLastErrno() and wfLastError() to handle the * situation as appropriate. */ - function ignoreErrors( $ignoreErrors = NULL ) { - return wfSetBit( $this->mFlags, DBO_IGNORE, $ignoreErrors ); + function ignoreErrors( $ignoreErrors = NULL ) { + return wfSetBit( $this->mFlags, DBO_IGNORE, $ignoreErrors ); } - + /** * The current depth of nested transactions * @param integer $level @@ -106,7 +122,7 @@ class Database { return wfSetVar( $this->mTrxLevel, $level ); } - /** + /** * Number of errors logged, only useful when errors are ignored */ function errorCount( $count = NULL ) { @@ -130,15 +146,15 @@ class Database { * @param string $password database user password * @param string $dbname database name */ - + /** * @param failFunction * @param $flags * @param string $tablePrefix Database table prefixes. By default use the prefix gave in LocalSettings.php */ - function Database( $server = false, $user = false, $password = false, $dbName = false, + function Database( $server = false, $user = false, $password = false, $dbName = false, $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) { - + global $wgOut, $wgDBprefix, $wgCommandLineMode; # Can't get a reference if it hasn't been set yet if ( !isset( $wgOut ) ) { @@ -148,7 +164,7 @@ class Database { $this->mFailFunction = $failFunction; $this->mFlags = $flags; - + if ( $this->mFlags & DBO_DEFAULT ) { if ( $wgCommandLineMode ) { $this->mFlags &= ~DBO_TRX; @@ -163,7 +179,7 @@ class Database { $this->mFlags |= DBO_PERSISTENT; $this->mFlags &= ~DBO_TRX; }*/ - + /** Get the default table prefix*/ if ( $tablePrefix == 'get from global' ) { $this->mTablePrefix = $wgDBprefix; @@ -175,18 +191,18 @@ class Database { $this->open( $server, $user, $password, $dbName ); } } - + /** * @static * @param failFunction * @param $flags */ - function newFromParams( $server, $user, $password, $dbName, + function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0 ) { return new Database( $server, $user, $password, $dbName, $failFunction, $flags ); } - + /** * Usually aborts on failure * If the failFunction is set to a non-zero integer, returns success @@ -202,15 +218,15 @@ class Database { if ( !function_exists( 'mysql_connect' ) ) { die( "MySQL functions missing, have you compiled PHP with the --with-mysql option?\n" ); } - + $this->close(); $this->mServer = $server; $this->mUser = $user; $this->mPassword = $password; $this->mDBname = $dbName; - + $success = false; - + if ( $this->mFlags & DBO_PERSISTENT ) { @/**/$this->mConn = mysql_pconnect( $server, $user, $password ); } else { @@ -226,7 +242,7 @@ class Database { } } else { wfDebug( "DB connection error\n" ); - wfDebug( "Server: $server, User: $user, Password: " . + wfDebug( "Server: $server, User: $user, Password: " . substr( $password, 0, 3 ) . "..., error: " . mysql_error() . "\n" ); $success = false; } @@ -234,7 +250,7 @@ class Database { # Delay USE query $success = (bool)$this->mConn; } - + if ( !$success ) { $this->reportConnectionError(); $this->close(); @@ -243,7 +259,7 @@ class Database { return $success; } /**#@-*/ - + /** * Closes a database connection. * if it is open : commits any open transactions @@ -262,7 +278,7 @@ class Database { return true; } } - + /** * @access private * @param string $msg error message ? @@ -272,24 +288,24 @@ class Database { if ( $this->mFailFunction ) { if ( !is_int( $this->mFailFunction ) ) { $ff = $this->mFailFunction; - $ff( $this, mysql_error() ); + $ff( $this, $this->lastError() ); } } else { wfEmergencyAbort( $this, mysql_error() ); } } - + /** * Usually aborts on failure * If errors are explicitly ignored, returns success */ function query( $sql, $fname = '', $tempIgnore = false ) { global $wgProfiling, $wgCommandLineMode; - + if ( wfReadOnly() ) { - # This is a quick check for the most common kinds of write query used - # in MediaWiki, to provide extra safety in addition to UI-level checks. - # It is not intended to prevent every conceivable write query, or even + # This is a quick check for the most common kinds of write query used + # in MediaWiki, to provide extra safety in addition to UI-level checks. + # It is not intended to prevent every conceivable write query, or even # to handle such queries gracefully. if ( preg_match( '/^(update|insert|replace|delete)/i', $sql ) ) { wfDebug( "Write query from $fname blocked\n" ); @@ -304,9 +320,9 @@ class Database { wfProfileIn( 'Database::query' ); wfProfileIn( $profName ); } - + $this->mLastQuery = $sql; - + # Add a comment for easy SHOW PROCESSLIST interpretation if ( $fname ) { $commentedSql = "/* $fname */ $sql"; @@ -324,7 +340,7 @@ class Database { $sqlx = strtr( $sqlx, "\t\n", ' ' ); wfDebug( "SQL: $sqlx\n" ); } - + # Do the query and handle errors $ret = $this->doQuery( $commentedSql ); @@ -344,14 +360,14 @@ class Database { if ( false === $ret ) { $this->reportQueryError( $this->lastError(), $this->lastErrno(), $sql, $fname, $tempIgnore ); } - + if ( $wgProfiling ) { wfProfileOut( $profName ); wfProfileOut( 'Database::query' ); } return $ret; } - + /** * The DBMS-dependent part of query() * @param string $sql SQL query. @@ -361,7 +377,7 @@ class Database { $ret = mysql_query( $sql, $this->mConn ); } else { $ret = mysql_unbuffered_query( $sql, $this->mConn ); - } + } return $ret; } @@ -389,13 +405,13 @@ class Database { "Query: $sql\n" . "Function: $fname\n" . "Error: $errno $error\n"; - if ( !$wgCommandLineMode ) { + if ( !$wgCommandLineMode ) { $message = nl2br( $message ); } wfDebugDieBacktrace( $message ); } else { // this calls wfAbruptExit() - $this->mOut->databaseError( $fname, $sql, $error, $errno ); + $this->mOut->databaseError( $fname, $sql, $error, $errno ); } } $this->ignoreErrors( $ignore ); @@ -417,11 +433,11 @@ class Database { the bits later. */ return array( 'query' => $sql, 'func' => $func ); } - + function freePrepared( $prepared ) { /* No-op for MySQL */ } - + /** * Execute a prepared query with the various arguments * @param string $prepared the prepared sql @@ -436,7 +452,7 @@ class Database { $sql = $this->fillPrepared( $prepared['query'], $args ); return $this->query( $sql, $prepared['func'] ); } - + /** * Prepare & execute an SQL statement, quoting and inserting arguments * in the appropriate places. @@ -454,7 +470,7 @@ class Database { $this->freePrepared( $prepared ); return $retval; } - + /** * For faking prepared SQL statements on DBs that don't support * it directly. @@ -469,12 +485,12 @@ class Database { return preg_replace_callback( '/(\\\\[?!&]|[?!&])/', array( &$this, 'fillPreparedArg' ), $preparedQuery ); } - + /** * preg_callback func for fillPrepared() * The arguments should be in $this->preparedArgs and must not be touched * while we're doing this. - * + * * @param array $matches * @return string * @access private @@ -496,7 +512,7 @@ class Database { wfDebugDieBacktrace( 'Received invalid match. This should never happen!' ); } } - + /**#@+ * @param mixed $res A SQL result */ @@ -508,7 +524,7 @@ class Database { wfDebugDieBacktrace( "Unable to free MySQL result\n" ); } } - + /** * Fetch the next row from the given result object, in object form */ @@ -530,19 +546,19 @@ class Database { wfDebugDieBacktrace( 'Error in fetchRow(): ' . htmlspecialchars( mysql_error() ) ); } return $row; - } + } /** * Get the number of rows in a result object */ function numRows( $res ) { - @/**/$n = mysql_num_rows( $res ); + @/**/$n = mysql_num_rows( $res ); if( mysql_errno() ) { wfDebugDieBacktrace( 'Error in numRows(): ' . htmlspecialchars( mysql_error() ) ); } return $n; } - + /** * Get the number of fields in a result object * See documentation for mysql_num_fields() @@ -566,32 +582,32 @@ class Database { * $id = $dbw->insertId(); */ function insertId() { return mysql_insert_id( $this->mConn ); } - + /** * Change the position of the cursor in a result object * See mysql_data_seek() */ function dataSeek( $res, $row ) { return mysql_data_seek( $res, $row ); } - + /** * Get the last error number * See mysql_errno() */ - function lastErrno() { + function lastErrno() { if ( $this->mConn ) { - return mysql_errno( $this->mConn ); + return mysql_errno( $this->mConn ); } else { return mysql_errno(); } } - + /** * Get a description of the last error * See mysql_error() for more details */ - function lastError() { + function lastError() { if ( $this->mConn ) { - $error = mysql_error( $this->mConn ); + $error = mysql_error( $this->mConn ); } else { $error = mysql_error(); } @@ -599,7 +615,7 @@ class Database { $error .= ' (' . $this->mServer . ')'; } return $error; - } + } /** * Get the number of rows affected by the last write query * See mysql_affected_rows() for more details @@ -612,7 +628,7 @@ class Database { * Usually aborts on failure * If errors are explicitly ignored, returns success * - * This function exists for historical reasons, Database::update() has a more standard + * This function exists for historical reasons, Database::update() has a more standard * calling convention and feature set */ function set( $table, $var, $value, $cond, $fname = 'Database::set' ) @@ -622,7 +638,7 @@ class Database { $this->strencode( $value ) . "' WHERE ($cond)"; return (bool)$this->query( $sql, DB_MASTER, $fname ); } - + /** * Simple SELECT wrapper, returns a single field, input must be encoded * Usually aborts on failure @@ -646,7 +662,7 @@ class Database { return false; } } - + /** * Returns an optional USE INDEX clause to go after the table, and a * string to go at the end of the query @@ -665,15 +681,12 @@ class Database { } if ( isset( $options['ORDER BY'] ) ) { $tailOpts .= " ORDER BY {$options['ORDER BY']}"; - } - if ( isset( $options['LIMIT'] ) ) { - $tailOpts .= " LIMIT {$options['LIMIT']}"; } if ( is_numeric( array_search( 'FOR UPDATE', $options ) ) ) { $tailOpts .= ' FOR UPDATE'; } - + if ( is_numeric( array_search( 'LOCK IN SHARE MODE', $options ) ) ) { $tailOpts .= ' LOCK IN SHARE MODE'; } @@ -694,6 +707,9 @@ class Database { if( is_array( $vars ) ) { $vars = implode( ',', $vars ); } + if( !is_array( $options ) ) { + $options = array( $options ); + } if( is_array( $table ) ) { $from = ' FROM ' . implode( ',', array_map( array( &$this, 'tableName' ), $table ) ); } elseif ($table!='') { @@ -702,8 +718,8 @@ class Database { $from = ''; } - list( $useIndex, $tailOpts ) = $this->makeSelectOptions( (array)$options ); - + list( $useIndex, $tailOpts ) = $this->makeSelectOptions( array($options) ); + if( !empty( $conds ) ) { if ( is_array( $conds ) ) { $conds = $this->makeList( $conds, LIST_AND ); @@ -712,15 +728,18 @@ class Database { } else { $sql = "SELECT $vars $from $useIndex $tailOpts"; } + if (isset($options['LIMIT'])) { + $sql = $this->limitResult($sql, $options['LIMIT'], false); + } return $this->query( $sql, $fname ); } /** * Single row SELECT wrapper * Aborts or returns FALSE on error - * + * * $vars: the selected variables - * $conds: a condition map, terms are ANDed together. + * $conds: a condition map, terms are ANDed together. * Items with numeric keys are taken to be literal conditions * Takes an array of selected variables, and a condition map, which is ANDed * e.g: selectRow( "page", array( "page_id" ), array( "page_namespace" => @@ -732,15 +751,18 @@ class Database { function selectRow( $table, $vars, $conds, $fname = 'Database::selectRow', $options = array() ) { $options['LIMIT'] = 1; $res = $this->select( $table, $vars, $conds, $fname, $options ); - if ( $res === false || !$this->numRows( $res ) ) { + if ( $res === false ) + return false; + if ( !$this->numRows($res) ) { + $this->freeResult($res); return false; } $obj = $this->fetchObject( $res ); $this->freeResult( $res ); return $obj; - + } - + /** * Removes most variables from an SQL query and replaces them with X or N for numbers. * It's only slightly flawed. Don't use for anything important. @@ -748,26 +770,26 @@ class Database { * @param string $sql A SQL Query * @static */ - function generalizeSQL( $sql ) { + function generalizeSQL( $sql ) { # This does the same as the regexp below would do, but in such a way # as to avoid crashing php on some large strings. # $sql = preg_replace ( "/'([^\\\\']|\\\\.)*'|\"([^\\\\\"]|\\\\.)*\"/", "'X'", $sql); - + $sql = str_replace ( "\\\\", '', $sql); $sql = str_replace ( "\\'", '', $sql); $sql = str_replace ( "\\\"", '', $sql); $sql = preg_replace ("/'.*'/s", "'X'", $sql); $sql = preg_replace ('/".*"/s', "'X'", $sql); - + # All newlines, tabs, etc replaced by single space $sql = preg_replace ( "/\s+/", ' ', $sql); - - # All numbers => N + + # All numbers => N $sql = preg_replace ('/-?[0-9]+/s', 'N', $sql); - + return $sql; } - + /** * Determines whether a field exists in a table * Usually aborts on failure @@ -779,9 +801,9 @@ class Database { if ( !$res ) { return NULL; } - + $found = false; - + while ( $row = $this->fetchObject( $res ) ) { if ( $row->Field == $field ) { $found = true; @@ -790,7 +812,7 @@ class Database { } return $found; } - + /** * Determines whether an index exists * Usually aborts on failure @@ -804,8 +826,8 @@ class Database { return $info !== false; } } - - + + /** * Get information about an index into an object * Returns false if the index does not exist @@ -820,7 +842,7 @@ class Database { if ( !$res ) { return NULL; } - + while ( $row = $this->fetchObject( $res ) ) { if ( $row->Key_name == $index ) { return $row; @@ -828,7 +850,7 @@ class Database { } return false; } - + /** * Query whether a given table exists */ @@ -864,7 +886,7 @@ class Database { } return false; } - + /** * mysql_field_type() wrapper */ @@ -886,7 +908,7 @@ class Database { /** * INSERT wrapper, inserts an array into a table * - * $a may be a single associative array, or an array of these with numeric keys, for + * $a may be a single associative array, or an array of these with numeric keys, for * multi-row insert. * * Usually aborts on failure @@ -910,7 +932,7 @@ class Database { $keys = array_keys( $a ); } - $sql = 'INSERT ' . implode( ' ', $options ) . + $sql = 'INSERT ' . implode( ' ', $options ) . " INTO $table (" . implode( ',', $keys ) . ') VALUES '; if ( $multi ) { @@ -968,7 +990,7 @@ class Database { } $this->query( $sql, $fname ); } - + /** * Makes a wfStrencoded list from an array * $mode: LIST_COMMA - comma separated, no field names @@ -1006,7 +1028,7 @@ class Database { } return $list; } - + /** * Change the current database */ @@ -1036,13 +1058,13 @@ class Database { /** * Format a table name ready for use in constructing an SQL query - * - * This does two important things: it quotes table names which as necessary, + * + * This does two important things: it quotes table names which as necessary, * and it adds a table prefix if there is one. - * - * All functions of this object which require a table name call this function + * + * All functions of this object which require a table name call this function * themselves. Pass the canonical name to such functions. This is only needed - * when calling query() directly. + * when calling query() directly. * * @param string $name database table name */ @@ -1059,7 +1081,7 @@ class Database { # Standard quoting $name = "`$name`"; } - } + } return $name; } @@ -1069,7 +1091,7 @@ class Database { * * Example: * extract($dbr->tableNames('user','watchlist')); - * $sql = "SELECT wl_namespace,wl_title FROM $watchlist,$user + * $sql = "SELECT wl_namespace,wl_title FROM $watchlist,$user * WHERE wl_user=user_id AND wl_user=$nameWithQuotes"; */ function tableNames() { @@ -1080,7 +1102,7 @@ class Database { } return $retVal; } - + /** * Wrapper for addslashes() * @param string $s String to be slashed. @@ -1103,9 +1125,9 @@ class Database { # _are_ strings such as article titles and string->number->string # conversion is not 1:1. return "'" . $this->strencode( $s ) . "'"; - } + } } - + /** * Returns an appropriately quoted sequence value for inserting a new row. * MySQL has autoincrement fields, so this is just NULL. But the PostgreSQL @@ -1127,11 +1149,11 @@ class Database { * REPLACE query wrapper * PostgreSQL simulates this with a DELETE followed by INSERT * $row is the row to insert, an associative array - * $uniqueIndexes is an array of indexes. Each element may be either a + * $uniqueIndexes is an array of indexes. Each element may be either a * field name or an array of field names - * - * It may be more efficient to leave off unique indexes which are unlikely to collide. - * However if you do this, you run the risk of encountering errors which wouldn't have + * + * It may be more efficient to leave off unique indexes which are unlikely to collide. + * However if you do this, you run the risk of encountering errors which wouldn't have * occurred in MySQL * * @todo migrate comment to phodocumentor format @@ -1161,7 +1183,7 @@ class Database { * DELETE where the condition is a join * MySQL does this with a multi-table DELETE syntax, PostgreSQL does it with sub-selects * - * For safety, an empty $conds will not delete everything. If you want to delete all rows where the + * For safety, an empty $conds will not delete everything. If you want to delete all rows where the * join condition matches, set $conds='*' * * DO NOT put the join condition in $conds @@ -1183,7 +1205,7 @@ class Database { if ( $conds != '*' ) { $sql .= ' AND ' . $this->makeList( $conds, LIST_AND ); } - + return $this->query( $sql, $fname ); } @@ -1240,11 +1262,11 @@ class Database { $destTable = $this->tableName( $destTable ); if( is_array( $srcTable ) ) { $srcTable = implode( ',', array_map( array( &$this, 'tableName' ), $srcTable ) ); - } else { + } else { $srcTable = $this->tableName( $srcTable ); } $sql = "INSERT INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' . - ' SELECT ' . implode( ',', $varMap ) . + ' SELECT ' . implode( ',', $varMap ) . " FROM $srcTable"; if ( $conds != '*' ) { $sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND ); @@ -1256,8 +1278,11 @@ class Database { * Construct a LIMIT query with optional offset * This is used for query pages */ - function limitResult($limit,$offset) { - return ' LIMIT '.(is_numeric($offset)?"{$offset},":"")."{$limit} "; + function limitResult($sql, $limit, $offset) { + return "$sql LIMIT ".((is_numeric($offset) && $offset != 0)?"{$offset},":"")."{$limit} "; + } + function limitResultForUpdate($sql, $num) { + return $this->limitResult($sql, $num, 0); } /** @@ -1283,23 +1308,23 @@ class Database { /** * Perform a deadlock-prone transaction. * - * This function invokes a callback function to perform a set of write - * queries. If a deadlock occurs during the processing, the transaction + * This function invokes a callback function to perform a set of write + * queries. If a deadlock occurs during the processing, the transaction * will be rolled back and the callback function will be called again. * - * Usage: + * Usage: * $dbw->deadlockLoop( callback, ... ); * - * Extra arguments are passed through to the specified callback function. - * - * Returns whatever the callback function returned on its successful, - * iteration, or false on error, for example if the retry limit was + * Extra arguments are passed through to the specified callback function. + * + * Returns whatever the callback function returned on its successful, + * iteration, or false on error, for example if the retry limit was * reached. */ function deadlockLoop() { $myFname = 'Database::deadlockLoop'; - - $this->query( 'BEGIN', $myFname ); + + $this->begin(); $args = func_get_args(); $function = array_shift( $args ); $oldIgnore = $this->ignoreErrors( true ); @@ -1314,7 +1339,7 @@ class Database { $error = $this->lastError(); $errno = $this->lastErrno(); $sql = $this->lastQuery(); - + if ( $errno ) { if ( $this->wasDeadlock() ) { # Retry @@ -1345,11 +1370,11 @@ class Database { function masterPosWait( $file, $pos, $timeout ) { $fname = 'Database::masterPosWait'; wfProfileIn( $fname ); - - + + # Commit any open transactions $this->immediateCommit(); - + # Call doQuery() directly, to avoid opening a transaction if DBO_TRX is set $encFile = $this->strencode( $file ); $sql = "SELECT MASTER_POS_WAIT('$encFile', $pos, $timeout)"; @@ -1376,7 +1401,7 @@ class Database { return array( false, false ); } } - + /** * Get the position of the master from SHOW MASTER STATUS */ @@ -1428,7 +1453,7 @@ class Database { $this->query( 'BEGIN', $fname ); $this->mTrxLevel = 1; } - + /** * Commit transaction, if one is open */ @@ -1443,7 +1468,7 @@ class Database { function timestamp( $ts=0 ) { return wfTimestamp(TS_MW,$ts); } - + /** * Local database timestamp format or null */ @@ -1454,7 +1479,7 @@ class Database { return $this->timestamp( $ts ); } } - + /** * @todo document */ @@ -1472,14 +1497,14 @@ class Database { function aggregateValue ($valuedata,$valuename='value') { return $valuename; } - + /** * @return string wikitext of a link to the server software's web site */ function getSoftwareLink() { return "[http://www.mysql.com/ MySQL]"; } - + /** * @return string Version information from the database */ @@ -1498,14 +1523,14 @@ class Database { return true; } } - + /** * Get slave lag. * At the moment, this will only work if the DB user has the PROCESS privilege */ function getLag() { $res = $this->query( 'SHOW PROCESSLIST' ); - # Find slave SQL thread. Assumed to be the second one running, which is a bit + # Find slave SQL thread. Assumed to be the second one running, which is a bit # dubious, but unfortunately there's no easy rigorous way $slaveThreads = 0; while ( $row = $this->fetchObject( $res ) ) { @@ -1530,7 +1555,25 @@ class Database { } return $status; } -} + + /** + * Return the maximum number of items allowed in a list, or 0 for unlimited. + */ + function maxListLen() { + return 0; + } + + function encodeBlob($b) { + return $b; + } + + function notNullTimestamp() { + return "!= 0"; + } + function isNullTimestamp() { + return "= '0'"; + } +} /** * Database abstraction object for mySQL @@ -1551,7 +1594,7 @@ class DatabaseMysql extends Database { */ class ResultWrapper { var $db, $result; - + /** * @todo document */ @@ -1566,21 +1609,21 @@ class ResultWrapper { function numRows() { return $this->db->numRows( $this->result ); } - + /** * @todo document */ function fetchObject() { return $this->db->fetchObject( $this->result ); } - + /** * @todo document */ function &fetchRow() { return $this->db->fetchRow( $this->result ); } - + /** * @todo document */ @@ -1607,11 +1650,11 @@ class ResultWrapper { function wfEmergencyAbort( &$conn, $error ) { global $wgTitle, $wgUseFileCache, $title, $wgInputEncoding, $wgOutputEncoding; global $wgSitename, $wgServer; - + # I give up, Brion is right. Getting the message cache to work when there is no DB is tricky. # Hard coding strings instead. - $noconnect = 'Sorry! The wiki is experiencing some technical difficulties, and cannot contact the database server.
+ $noconnect = 'Sorry! The wiki is experiencing some technical difficulties, and cannot contact the database server: $1.
$1'; $mainpage = 'Main Page'; $searchdisabled = << } elseif (@/**/$_REQUEST['search']) { $search = $_REQUEST['search']; echo $searchdisabled; - echo str_replace( array( '$1', '$2' ), array( htmlspecialchars( $search ), + echo str_replace( array( '$1', '$2' ), array( htmlspecialchars( $search ), $wgInputEncoding ), $googlesearch ); wfErrorExit(); } else { @@ -1675,7 +1718,7 @@ border=\"0\" ALT=\"Google\"> if( $cache->isFileCached() ) { $msg = '

'.$msg."
\n" . $cachederror . "

\n"; - + $tag = '

'; $text = str_replace( $tag, @@ -1683,7 +1726,7 @@ border=\"0\" ALT=\"Google\"> $cache->fetchPageText() ); } } - + echo $text; wfErrorExit(); } diff --git a/includes/DatabaseFunctions.php b/includes/DatabaseFunctions.php index 37059696e4..0618950389 100644 --- a/includes/DatabaseFunctions.php +++ b/includes/DatabaseFunctions.php @@ -1,7 +1,7 @@ query( $sql, $fname ); - } else { + } else { return false; } } @@ -52,7 +52,7 @@ function &wfGetDB( $db = DB_LAST, $groups = array() ) { $ret =& $wgLoadBalancer->getConnection( $db, true, $groups ); return $ret; } - + /** * Turns on (false) or off (true) the automatic generation and sending * of a "we're sorry, but there has been a database error" page on @@ -82,13 +82,13 @@ function wfIgnoreSQLErrors( $newstate, $dbi = DB_LAST ) { * Free a database result * @return bool whether result is sucessful or not */ -function wfFreeResult( $res, $dbi = DB_LAST ) -{ +function wfFreeResult( $res, $dbi = DB_LAST ) +{ $db =& wfGetDB( $dbi ); if ( $db !== false ) { - $db->freeResult( $res ); + $db->freeResult( $res ); return true; - } else { + } else { return false; } } @@ -97,11 +97,11 @@ function wfFreeResult( $res, $dbi = DB_LAST ) * Get an object from a database result * @return object|false object we requested */ -function wfFetchObject( $res, $dbi = DB_LAST ) { +function wfFetchObject( $res, $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { - return $db->fetchObject( $res, $dbi = DB_LAST ); - } else { + return $db->fetchObject( $res, $dbi = DB_LAST ); + } else { return false; } } @@ -114,7 +114,7 @@ function wfFetchRow( $res, $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { return $db->fetchRow ( $res, $dbi = DB_LAST ); - } else { + } else { return false; } } @@ -123,11 +123,11 @@ function wfFetchRow( $res, $dbi = DB_LAST ) { * Get a number of rows from a database result * @return integer|false number of rows */ -function wfNumRows( $res, $dbi = DB_LAST ) { +function wfNumRows( $res, $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { - return $db->numRows( $res, $dbi = DB_LAST ); - } else { + return $db->numRows( $res, $dbi = DB_LAST ); + } else { return false; } } @@ -136,11 +136,11 @@ function wfNumRows( $res, $dbi = DB_LAST ) { * Get the number of fields from a database result * @return integer|false number of fields */ -function wfNumFields( $res, $dbi = DB_LAST ) { +function wfNumFields( $res, $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { - return $db->numFields( $res ); - } else { + return $db->numFields( $res ); + } else { return false; } } @@ -150,12 +150,12 @@ function wfNumFields( $res, $dbi = DB_LAST ) { * @param integer $n id of the field * @return string|false name of field */ -function wfFieldName( $res, $n, $dbi = DB_LAST ) -{ +function wfFieldName( $res, $n, $dbi = DB_LAST ) +{ $db =& wfGetDB( $dbi ); if ( $db !== false ) { - return $db->fieldName( $res, $n, $dbi = DB_LAST ); - } else { + return $db->fieldName( $res, $n, $dbi = DB_LAST ); + } else { return false; } } @@ -164,11 +164,11 @@ function wfFieldName( $res, $n, $dbi = DB_LAST ) /** * @todo document function */ -function wfInsertId( $dbi = DB_LAST ) { +function wfInsertId( $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { - return $db->insertId(); - } else { + return $db->insertId(); + } else { return false; } } @@ -176,11 +176,11 @@ function wfInsertId( $dbi = DB_LAST ) { /** * @todo document function */ -function wfDataSeek( $res, $row, $dbi = DB_LAST ) { +function wfDataSeek( $res, $row, $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { - return $db->dataSeek( $res, $row ); - } else { + return $db->dataSeek( $res, $row ); + } else { return false; } } @@ -188,11 +188,11 @@ function wfDataSeek( $res, $row, $dbi = DB_LAST ) { /** * @todo document function */ -function wfLastErrno( $dbi = DB_LAST ) { +function wfLastErrno( $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { - return $db->lastErrno(); - } else { + return $db->lastErrno(); + } else { return false; } } @@ -200,11 +200,11 @@ function wfLastErrno( $dbi = DB_LAST ) { /** * @todo document function */ -function wfLastError( $dbi = DB_LAST ) { +function wfLastError( $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { - return $db->lastError(); - } else { + return $db->lastError(); + } else { return false; } } @@ -212,11 +212,11 @@ function wfLastError( $dbi = DB_LAST ) { /** * @todo document function */ -function wfAffectedRows( $dbi = DB_LAST ) { +function wfAffectedRows( $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { - return $db->affectedRows(); - } else { + return $db->affectedRows(); + } else { return false; } } @@ -228,7 +228,7 @@ function wfLastDBquery( $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { return $db->lastQuery(); - } else { + } else { return false; } } @@ -241,7 +241,7 @@ function wfSetSQL( $table, $var, $value, $cond, $dbi = DB_MASTER ) $db =& wfGetDB( $dbi ); if ( $db !== false ) { return $db->set( $table, $var, $value, $cond ); - } else { + } else { return false; } } @@ -255,7 +255,7 @@ function wfGetSQL( $table, $var, $cond='', $dbi = DB_LAST ) $db =& wfGetDB( $dbi ); if ( $db !== false ) { return $db->selectField( $table, $var, $cond ); - } else { + } else { return false; } } @@ -267,7 +267,7 @@ function wfFieldExists( $table, $field, $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { return $db->fieldExists( $table, $field ); - } else { + } else { return false; } } @@ -279,7 +279,7 @@ function wfIndexExists( $table, $index, $dbi = DB_LAST ) { $db =& wfGetDB( $dbi ); if ( $db !== false ) { return $db->indexExists( $table, $index ); - } else { + } else { return false; } } @@ -291,7 +291,7 @@ function wfInsertArray( $table, $array, $fname = 'wfInsertArray', $dbi = DB_MAST $db =& wfGetDB( $dbi ); if ( $db !== false ) { return $db->insert( $table, $array, $fname ); - } else { + } else { return false; } } @@ -303,7 +303,7 @@ function wfGetArray( $table, $vars, $conds, $fname = 'wfGetArray', $dbi = DB_LAS $db =& wfGetDB( $dbi ); if ( $db !== false ) { return $db->getArray( $table, $vars, $conds, $fname ); - } else { + } else { return false; } } diff --git a/includes/DatabaseOracle.php b/includes/DatabaseOracle.php new file mode 100644 index 0000000000..5aa0aa5f97 --- /dev/null +++ b/includes/DatabaseOracle.php @@ -0,0 +1,706 @@ +mData; + } +}; + +/** + * + * @package MediaWiki + */ +class DatabaseOracle extends Database { + var $mInsertId = NULL; + var $mLastResult = NULL; + var $mFetchCache = array(); + var $mFetchID = array(); + var $mNcols = array(); + var $mFieldNames = array(), $mFieldTypes = array(); + var $mAffectedRows = array(); + var $mErr; + + function DatabaseOracle($server = false, $user = false, $password = false, $dbName = false, + $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) + { + Database::Database( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix ); + } + + /* static */ function newFromParams( $server = false, $user = false, $password = false, $dbName = false, + $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) + { + return new DatabaseOracle( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix ); + } + + /** + * Usually aborts on failure + * If the failFunction is set to a non-zero integer, returns success + */ + function open( $server, $user, $password, $dbName ) { + if ( !function_exists( 'oci_connect' ) ) { + die( "Oracle functions missing, have you compiled PHP with the --with-oci8 option?\n" ); + } + $this->close(); + $this->mServer = $server; + $this->mUser = $user; + $this->mPassword = $password; + $this->mDBname = $dbName; + + $success = false; + + $hstring=""; + $this->mConn = oci_new_connect($user, $password, $dbName, "AL32UTF8"); + if ( $this->mConn === false ) { + wfDebug( "DB connection error\n" ); + wfDebug( "Server: $server, Database: $dbName, User: $user, Password: " + . substr( $password, 0, 3 ) . "...\n" ); + wfDebug( $this->lastError()."\n" ); + } else { + $this->mOpened = true; + } + return $this->mConn; + } + + /** + * Closes a database connection, if it is open + * Returns success, true if already closed + */ + function close() { + $this->mOpened = false; + if ($this->mConn) { + return oci_close($this->mConn); + } else { + return true; + } + } + + function parseStatement($sql) { + $this->mErr = $this->mLastResult = false; + if (($stmt = oci_parse($this->mConn, $sql)) === false) { + $this->lastError(); + return $this->mLastResult = false; + } + $this->mAffectedRows[$stmt] = 0; + return $this->mLastResult = $stmt; + } + + function doQuery($sql) { + if (($stmt = $this->parseStatement($sql)) === false) + return false; + return $this->executeStatement($stmt); + } + + function executeStatement($stmt) { + if (!oci_execute($stmt, OCI_DEFAULT)) { + $this->lastError(); + oci_free_statement($stmt); + return false; + } + $this->mAffectedRows[$stmt] = oci_num_rows($stmt); + $this->mFetchCache[$stmt] = array(); + $this->mFetchID[$stmt] = 0; + $this->mNcols[$stmt] = oci_num_fields($stmt); + if ($this->mNcols[$stmt] == 0) + return $this->mLastResult; + for ($i = 1; $i <= $this->mNcols[$stmt]; $i++) { + $this->mFieldNames[$stmt][$i] = oci_field_name($stmt, $i); + $this->mFieldTypes[$stmt][$i] = oci_field_type($stmt, $i); + } + while (($o = oci_fetch_array($stmt)) !== false) { + foreach ($o as $key => $value) { + if (is_object($value)) { + $o[$key] = $value->load(); + } + } + $this->mFetchCache[$stmt][] = $o; + } + return $this->mLastResult; + } + + function queryIgnore( $sql, $fname = '' ) { + return $this->query( $sql, $fname, true ); + } + + function freeResult( $res ) { + if (!oci_free_statement($res)) { + wfDebugDieBacktrace( "Unable to free Oracle result\n" ); + } + unset($this->mFetchID[$res]); + unset($this->mFetchCache[$res]); + unset($this->mNcols[$res]); + unset($this->mFieldNames[$res]); + unset($this->mFieldTypes[$res]); + } + + function fetchAssoc($res) { + if ($this->mFetchID[$res] >= count($this->mFetchCache[$res])) + return false; + + for ($i = 1; $i <= $this->mNcols[$res]; $i++) { + $name = $this->mFieldNames[$res][$i]; + $type = $this->mFieldTypes[$res][$i]; + if (isset($this->mFetchCache[$res][$this->mFetchID[$res]][$name])) + $value = $this->mFetchCache[$res][$this->mFetchID[$res]][$name]; + else $value = NULL; + $key = strtolower($name); + wfdebug("'$key' => '$value'\n"); + $ret[$key] = $value; + } + $this->mFetchID[$res]++; + return $ret; + } + + function fetchRow($res) { + $r = $this->fetchAssoc($res); + if (!$r) + return false; + $i = 0; + $ret = array(); + foreach ($r as $key => $value) { + wfdebug("ret[$i]=[$value]\n"); + $ret[$i++] = $value; + } + return $ret; + } + + function fetchObject($res) { + $row = $this->fetchAssoc($res); + if (!$row) + return false; + $ret = new stdClass; + foreach ($row as $key => $value) + $ret->$key = $value; + return $ret; + } + + function numRows($res) { + return count($this->mFetchCache[$res]); + } + function numFields( $res ) { return pg_num_fields( $res ); } + function fieldName( $res, $n ) { return pg_field_name( $res, $n ); } + + /** + * This must be called after nextSequenceVal + */ + function insertId() { + return $this->mInsertId; + } + + function dataSeek($res, $row) { + $this->mFetchID[$res] = $row; + } + + function lastError() { + if ($this->mErr === false) { + if ($this->mLastResult !== false) $what = $this->mLastResult; + else if ($this->mConn !== false) $what = $this->mConn; + else $what = false; + $err = ($what !== false) ? oci_error($what) : oci_error(); + if ($err === false) + $this->mErr = 'no error'; + else + $this->mErr = $err['message']; + } + return str_replace("\n", '
', $this->mErr); + } + function lastErrno() { + return 0; + } + + function affectedRows() { + return $this->mAffectedRows[$this->mLastResult]; + } + + /** + * Returns information about an index + * If errors are explicitly ignored, returns NULL on failure + */ + function indexInfo ($table, $index, $fname = 'Database::indexInfo' ) { + $table = $this->tableName($table, true); + if ($index == 'PRIMARY') + $index = "${table}_pk"; + $sql = "SELECT uniqueness FROM all_indexes WHERE table_name='" . + $table . "' AND index_name='" . + $this->strencode(strtoupper($index)) . "'"; + $res = $this->query($sql, $fname); + if (!$res) + return NULL; + if (($row = $this->fetchObject($res)) == NULL) + return false; + $this->freeResult($res); + $row->Non_unique = !$row->uniqueness; + return $row; + } + + function indexUnique ($table, $index, $fname = 'indexUnique') { + if (!($i = $this->indexInfo($table, $index, $fname))) + return $i; + return $i->uniqueness == 'UNIQUE'; + } + + function fieldInfo( $table, $field ) { + $o = new stdClass; + $o->multiple_key = true; /* XXX */ + return $o; + } + + function getColumnInformation($table, $field) { + $table = $this->tableName($table, true); + $field = strtoupper($field); + + $res = $this->doQuery("SELECT * FROM all_tab_columns " . + "WHERE table_name='".$table."' " . + "AND column_name='".$field."'"); + if (!$res) + return false; + $o = $this->fetchObject($res); + $this->freeResult($res); + return $o; + } + + function fieldExists( $table, $field, $fname = 'Database::fieldExists' ) { + $column = $this->getColumnInformation($table, $field); + if (!$column) + return false; + return true; + } + + function startTimer( $timeout ) + { + global $IP; + wfDebugDieBacktrace( 'Database::startTimer() error : mysql_thread_id() not implemented for postgre' ); + /*$tid = mysql_thread_id( $this->mConn ); + exec( "php $IP/killthread.php $timeout $tid &>/dev/null &" );*/ + } + + function tableName($name, $forddl = false) { + # First run any transformations from the parent object + $name = parent::tableName( $name ); + + # Replace backticks into empty + # Note: "foo" and foo are not the same in Oracle! + $name = str_replace('`', '', $name); + + # Now quote Oracle reserved keywords + switch( $name ) { + case 'user': + case 'group': + case 'validate': + if ($forddl) + return $name; + else + return '"' . $name . '"'; + + default: + return strtoupper($name); + } + } + + function strencode( $s ) { + return str_replace("'", "''", $s); + } + + /** + * Return the next in a sequence, save the value for retrieval via insertId() + */ + function nextSequenceValue( $seqName ) { + $r = $this->doQuery("SELECT $seqName.nextval AS val FROM dual"); + $o = $this->fetchObject($r); + $this->freeResult($r); + return $this->mInsertId = (int)$o->val; + } + + /** + * USE INDEX clause + * PostgreSQL doesn't have them and returns "" + */ + function useIndexClause( $index ) { + return ''; + } + + # REPLACE query wrapper + # PostgreSQL simulates this with a DELETE followed by INSERT + # $row is the row to insert, an associative array + # $uniqueIndexes is an array of indexes. Each element may be either a + # field name or an array of field names + # + # It may be more efficient to leave off unique indexes which are unlikely to collide. + # However if you do this, you run the risk of encountering errors which wouldn't have + # occurred in MySQL + function replace( $table, $uniqueIndexes, $rows, $fname = 'Database::replace' ) { + $table = $this->tableName( $table ); + + if (count($rows)==0) { + return; + } + + # Single row case + if ( !is_array( reset( $rows ) ) ) { + $rows = array( $rows ); + } + + foreach( $rows as $row ) { + # Delete rows which collide + if ( $uniqueIndexes ) { + $sql = "DELETE FROM $table WHERE "; + $first = true; + foreach ( $uniqueIndexes as $index ) { + if ( $first ) { + $first = false; + $sql .= "("; + } else { + $sql .= ') OR ('; + } + if ( is_array( $index ) ) { + $first2 = true; + foreach ( $index as $col ) { + if ( $first2 ) { + $first2 = false; + } else { + $sql .= ' AND '; + } + $sql .= $col.'=' . $this->addQuotes( $row[$col] ); + } + } else { + $sql .= $index.'=' . $this->addQuotes( $row[$index] ); + } + } + $sql .= ')'; + $this->query( $sql, $fname ); + } + + # Now insert the row + $sql = "INSERT INTO $table (" . $this->makeList( array_keys( $row ), LIST_NAMES ) .') VALUES (' . + $this->makeList( $row, LIST_COMMA ) . ')'; + $this->query( $sql, $fname ); + } + } + + # DELETE where the condition is a join + function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = "Database::deleteJoin" ) { + if ( !$conds ) { + wfDebugDieBacktrace( 'Database::deleteJoin() called with empty $conds' ); + } + + $delTable = $this->tableName( $delTable ); + $joinTable = $this->tableName( $joinTable ); + $sql = "DELETE FROM $delTable WHERE $delVar IN (SELECT $joinVar FROM $joinTable "; + if ( $conds != '*' ) { + $sql .= 'WHERE ' . $this->makeList( $conds, LIST_AND ); + } + $sql .= ')'; + + $this->query( $sql, $fname ); + } + + # Returns the size of a text field, or -1 for "unlimited" + function textFieldSize( $table, $field ) { + $table = $this->tableName( $table ); + $sql = "SELECT t.typname as ftype,a.atttypmod as size + FROM pg_class c, pg_attribute a, pg_type t + WHERE relname='$table' AND a.attrelid=c.oid AND + a.atttypid=t.oid and a.attname='$field'"; + $res =$this->query($sql); + $row=$this->fetchObject($res); + if ($row->ftype=="varchar") { + $size=$row->size-4; + } else { + $size=$row->size; + } + $this->freeResult( $res ); + return $size; + } + + function lowPriorityOption() { + return ''; + } + + function limitResult($sql, $limit, $offset) { + $ret = "SELECT * FROM ($sql) WHERE ROWNUM < " . ((int)$limit + (int)($offset+1)); + if (is_numeric($offset)) + $ret .= " AND ROWNUM >= " . (int)$offset; + return $ret; + } + function limitResultForUpdate($sql, $limit) { + return $sql; + } + /** + * Returns an SQL expression for a simple conditional. + * Uses CASE on PostgreSQL. + * + * @param string $cond SQL expression which will result in a boolean value + * @param string $trueVal SQL expression to return if true + * @param string $falseVal SQL expression to return if false + * @return string SQL fragment + */ + function conditional( $cond, $trueVal, $falseVal ) { + return " (CASE WHEN $cond THEN $trueVal ELSE $falseVal END) "; + } + + # FIXME: actually detecting deadlocks might be nice + function wasDeadlock() { + return false; + } + + # Return DB-style timestamp used for MySQL schema + function timestamp($ts = 0) { + return $this->strencode(wfTimestamp(TS_ORACLE, $ts)); +# return "TO_TIMESTAMP('" . $this->strencode(wfTimestamp(TS_DB, $ts)) . "', 'RRRR-MM-DD HH24:MI:SS')"; + } + + function notNullTimestamp() { + return "IS NOT NULL"; + } + function isNullTimestamp() { + return "IS NULL"; + } + /** + * Return aggregated value function call + */ + function aggregateValue ($valuedata,$valuename='value') { + return $valuedata; + } + + + function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) { + $message = "A database error has occurred\n" . + "Query: $sql\n" . + "Function: $fname\n" . + "Error: $errno $error\n"; + wfDebugDieBacktrace($message); + } + + /** + * @return string wikitext of a link to the server software's web site + */ + function getSoftwareLink() { + return "[http://www.oracle.com/ Oracle]"; + } + + /** + * @return string Version information from the database + */ + function getServerVersion() { + return oci_server_version($this->mConn); + } + + function setSchema($schema=false) { + $schemas=$this->mSchemas; + if ($schema) { array_unshift($schemas,$schema); } + $searchpath=$this->makeList($schemas,LIST_NAMES); + $this->query("SET search_path = $searchpath"); + } + + function begin() { + } + + function immediateCommit( $fname = 'Database::immediateCommit' ) { + oci_commit($this->mConn); + $this->mTrxLevel = 0; + } + function rollback( $fname = 'Database::rollback' ) { + oci_rollback($this->mConn); + $this->mTrxLevel = 0; + } + function getLag() { + return false; + } + function getStatus() { + $result = array('Threads_running' => 0, 'Threads_connected' => 0); + return $result; + } + + /** + * Returns an optional USE INDEX clause to go after the table, and a + * string to go at the end of the query + * + * @access private + * + * @param array $options an associative array of options to be turned into + * an SQL query, valid keys are listed in the function. + * @return array + */ + function makeSelectOptions($options) { + $tailOpts = ''; + + if (isset( $options['ORDER BY'])) { + $tailOpts .= " ORDER BY {$options['ORDER BY']}"; + } + + return array('', $tailOpts); + } + + function maxListLen() { + return 1000; + } + + /** + * Query whether a given table exists + */ + function tableExists( $table ) { + $table = $this->tableName($table, true); + $res = $this->query( "SELECT COUNT(*) as NUM FROM user_tables WHERE table_name='" + . $table . "'" ); + if (!$res) + return false; + $row = $this->fetchObject($res); + $this->freeResult($res); + return $row->num >= 1; + } + + /** + * UPDATE wrapper, takes a condition array and a SET array + */ + function update( $table, $values, $conds, $fname = 'Database::update' ) { + $table = $this->tableName( $table ); + + $sql = "UPDATE $table SET "; + $first = true; + foreach ($values as $field => $v) { + if ($first) + $first = false; + else + $sql .= ", "; + $sql .= "$field = :n$field "; + } + if ( $conds != '*' ) { + $sql .= " WHERE " . $this->makeList( $conds, LIST_AND ); + } + $stmt = $this->parseStatement($sql); + if ($stmt === false) { + $this->reportQueryError( $this->lastError(), $this->lastErrno(), $stmt ); + return false; + } + if ($this->debug()) + wfDebug("SQL: $sql\n"); + $s = ''; + foreach ($values as $field => $v) { + oci_bind_by_name($stmt, ":n$field", $values[$field]); + if ($this->debug()) + $s .= " [$field] = [$v]\n"; + } + if ($this->debug()) + wfdebug(" PH: $s\n"); + $ret = $this->executeStatement($stmt); + return $ret; + } + + /** + * INSERT wrapper, inserts an array into a table + * + * $a may be a single associative array, or an array of these with numeric keys, for + * multi-row insert. + * + * Usually aborts on failure + * If errors are explicitly ignored, returns success + */ + function insert( $table, $a, $fname = 'Database::insert', $options = array() ) { + # No rows to insert, easy just return now + if ( !count( $a ) ) { + return true; + } + + $table = $this->tableName( $table ); + if (!is_array($options)) + $options = array($options); + + $oldIgnore = false; + if (in_array('IGNORE', $options)) + $oldIgnore = $this->ignoreErrors( true ); + + if ( isset( $a[0] ) && is_array( $a[0] ) ) { + $multi = true; + $keys = array_keys( $a[0] ); + } else { + $multi = false; + $keys = array_keys( $a ); + } + + $sql = "INSERT INTO $table (" . implode( ',', $keys ) . ') VALUES ('; + $return = ''; + $first = true; + foreach ($a as $key => $value) { + if ($first) + $first = false; + else + $sql .= ", "; + if (is_object($value) && $value->isLOB()) { + $sql .= "EMPTY_BLOB()"; + $return = "RETURNING $key INTO :bobj"; + } else + $sql .= ":$key"; + } + $sql .= ") $return"; + + if ($this->debug()) { + wfDebug("SQL: $sql\n"); + } + + if (($stmt = $this->parseStatement($sql)) === false) { + $this->reportQueryError($this->lastError(), $this->lastErrno(), $sql, $fname); + $this->ignoreErrors($oldIgnore); + return false; + } + + /* + * If we're inserting multiple rows, parse the statement once and + * execute it for each set of values. Otherwise, convert it into an + * array and pretend. + */ + if (!$multi) + $a = array($a); + + foreach ($a as $key => $row) { + $blob = false; + $bdata = false; + $s = ''; + foreach ($row as $k => $value) { + if (is_object($value) && $value->isLOB()) { + $blob = oci_new_descriptor($this->mConn, OCI_D_LOB); + $bdata = $value->data(); + oci_bind_by_name($stmt, ":bobj", &$blob, -1, OCI_B_BLOB); + } else + oci_bind_by_name($stmt, ":$k", $a[$key][$k], -1); + if ($this->debug()) + $s .= " [$k] = {$row[$k]}"; + } + if ($this->debug()) + wfDebug(" PH: $s\n"); + if (($s = $this->executeStatement($stmt)) === false) { + $this->reportQueryError($this->lastError(), $this->lastErrno(), $sql, $fname); + $this->ignoreErrors($oldIgnore); + return false; + } + + if ($blob) { + $blob->save($bdata); + } + } + $this->ignoreErrors($oldIgnore); + return $this->mLastResult = $s; + } + + function ping() { + return true; + } + + function encodeBlob($b) { + return new OracleBlob($b); + } +} + +?> diff --git a/includes/EditPage.php b/includes/EditPage.php index 1bf5650be9..b259aad44b 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -17,14 +17,14 @@ class EditPage { var $mArticle; var $mTitle; var $mMetaData = ''; - + # Form values var $save = false, $preview = false, $diff = false; var $minoredit = false, $watchthis = false; var $textbox1 = '', $textbox2 = '', $summary = ''; var $edittime = '', $section = ''; var $oldid = 0; - + /** * @todo document * @param $article @@ -97,7 +97,7 @@ class EditPage { { $sat[] = strtolower ( $x ) ; } - + } # Templates, but only some @@ -139,7 +139,7 @@ class EditPage { $wgOut->setArticleFlag(false); $this->importFormData( $wgRequest ); - + if( $this->live ) { $this->livePreview(); return; @@ -189,7 +189,7 @@ class EditPage { } } } - + /** * Return true if this page should be previewed when the edit form * is initially opened. @@ -215,7 +215,7 @@ class EditPage { $this->textbox2 = $this->safeUnicodeInput( $request, 'wpTextbox2' ); $this->mMetaData = rtrim( $request->getText( 'metadata' ) ); $this->summary = $request->getText( 'wpSummary' ); - + $this->edittime = $request->getVal( 'wpEdittime' ); if( is_null( $this->edittime ) ) { # If the form is incomplete, force to preview. @@ -238,7 +238,7 @@ class EditPage { if( !preg_match( '/^\d{14}$/', $this->edittime )) { $this->edittime = null; } - + $this->minoredit = $request->getCheck( 'wpMinoredit' ); $this->watchthis = $request->getCheck( 'wpWatchthis' ); } else { @@ -259,7 +259,7 @@ class EditPage { # Section edit can come from either the form or a link $this->section = $request->getVal( 'wpSection', $request->getVal( 'section' ) ); - + $this->live = $request->getCheck( 'live' ); } @@ -280,7 +280,7 @@ class EditPage { return $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) ); } } - + function submit() { $this->edit(); } @@ -314,7 +314,7 @@ class EditPage { if(isset($introtitle) && $introtitle->userCanRead()) { $rev=Revision::newFromTitle($introtitle); if($rev) { - $wgOut->addWikiText($rev->getText()); + $wgOut->addWikiText($rev->getText()); $addstandardintro=false; } } @@ -401,6 +401,7 @@ class EditPage { $this->mArticle->clear(); # Force reload of dates, etc. $this->mArticle->forUpdate( true ); # Lock the article +wfdebug("CONFLICT: edittime=".$this->edittime." article timestamp=".$this->mArticle->getTimestamp()."\n"); if( ( $this->section != 'new' ) && ($this->mArticle->getTimestamp() != $this->edittime ) ) { $isConflict = true; @@ -450,7 +451,7 @@ class EditPage { # XXX: might be better to integrate this into Article::getTextOfLastEditWithSectionReplacedOrAdded # for duplicate heading checking and maybe parsing $hasmatch = preg_match( "/^ *([=]{1,6})(.*?)(\\1) *\\n/i", $this->textbox1, $matches ); - # we can't deal with anchors, includes, html etc in the header for now, + # we can't deal with anchors, includes, html etc in the header for now, # headline would need to be parsed to improve this #if($hasmatch and strlen($matches[2]) > 0 and !preg_match( "/[\\['{<>]/", $matches[2])) { if($hasmatch and strlen($matches[2]) > 0) { @@ -466,16 +467,17 @@ class EditPage { $this->section = ''; if (wfRunHooks('ArticleSave', array(&$this->mArticle, &$wgUser, &$text, - &$this->summary, &$this->minoredit, - &$this->watchthis, &$sectionanchor))) + &$this->summary, &$this->minoredit, + &$this->watchthis, &$sectionanchor))) { # update the article here if($this->mArticle->updateArticle( $text, $this->summary, $this->minoredit, - $this->watchthis, '', $sectionanchor )) + $this->watchthis, '', $sectionanchor )) { - wfRunHooks('ArticleSaveComplete', array(&$this->mArticle, &$wgUser, $text, - $this->summary, $this->minoredit, - $this->watchthis, $sectionanchor)); + wfRunHooks('ArticleSaveComplete', + array(&$this->mArticle, &$wgUser, $text, + $this->summary, $this->minoredit, + $this->watchthis, $sectionanchor)); return; } else { $isConflict = true; @@ -613,9 +615,11 @@ class EditPage { $watchhtml = ''; if ( $wgUser->isLoggedIn() ) { - $watchhtml = "watchthis?" checked='checked'":""). - " accesskey='".wfMsg('accesskey-watch')."' id='wpWatchthis' />". - "{$watchthis}"; + $watchhtml = "watchthis?" checked='checked'":""). + " accesskey=\"".htmlspecialchars(wfMsg('accesskey-watch'))."\" id='wpWatchthis' />". + "{$watchthis}"; } $checkboxhtml = $minoredithtml . $watchhtml . '
'; @@ -627,7 +631,7 @@ class EditPage { $wgOut->addHTML( $previewOutput ); if($this->mTitle->getNamespace() == NS_CATEGORY) { $this->mArticle->closeShowCategory(); - } + } $wgOut->addHTML( "
\n" ); } } @@ -666,7 +670,7 @@ class EditPage { } $templates .= ''; } - + global $wgLivePreview, $wgStylePath; /** * Live Preview lets us fetch rendered preview page content and @@ -687,7 +691,7 @@ class EditPage { } else { $liveOnclick = ''; } - + global $wgUseMetadataEdit ; if ( $wgUseMetadataEdit ) { @@ -743,8 +747,8 @@ END $wgOut->addHTML( " \n" ); } - - + + if ( $isConflict ) { require_once( "DifferenceEngine.php" ); $wgOut->addWikiText( '==' . wfMsg( "yourdiff" ) . '==' ); @@ -809,18 +813,18 @@ END } if ( $this->mMetaData != "" ) $toparse .= "\n" . $this->mMetaData ; - + $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ) ."\n\n", - $wgTitle, $parserOptions ); - + $wgTitle, $parserOptions ); + $previewHTML = $parserOutput->mText; - + $wgOut->addCategoryLinks($parserOutput->getCategoryLinks()); $wgOut->addLanguageLinks($parserOutput->getLanguageLinks()); return $previewhead . $previewHTML; } } - + /** * @todo document */ @@ -834,7 +838,7 @@ END $id = $wgUser->blockedBy(); $reason = $wgUser->blockedFor(); $ip = $wgIP; - + if ( is_numeric( $id ) ) { $name = User::whoIs( $id ); } else { @@ -885,11 +889,11 @@ END function proxyCheck() { global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath; global $wgIP, $wgUseMemCached, $wgMemc, $wgDBname, $wgProxyMemcExpiry; - + if ( !$wgBlockOpenProxies ) { return; } - + # Get MemCached key $skip = false; if ( $wgUseMemCached ) { @@ -931,7 +935,7 @@ END wfProfileIn( $fname ); $db =& wfGetDB( DB_MASTER ); - + // This is the revision the editor started from $baseRevision = Revision::loadFromTimestamp( $db, $this->mArticle->mTitle, $this->edittime ); @@ -949,7 +953,7 @@ END return false; } $currentText = $currentRevision->getText(); - + if( wfMerge( $baseText, $editText, $currentText, $result ) ){ $editText = $result; wfProfileOut( $fname ); @@ -980,7 +984,7 @@ END */ function sectionAnchor( $text ) { $headline = Sanitizer::decodeCharReferences( $text ); - # strip out HTML + # strip out HTML $headline = preg_replace( '/<.*?' . '>/', '', $headline ); $headline = trim( $headline ); $sectionanchor = '#' . urlencode( str_replace( ' ', '_', $headline ) ); @@ -1120,7 +1124,7 @@ END $toolbar.="/*]]>*/\n"; return $toolbar; } - + /** * Output preview text only. This can be sucked into the edit page * via JavaScript, and saves the server time rendering the skin as @@ -1162,7 +1166,7 @@ END if ( $oldtext != wfMsg( 'noarticletext' ) || $newtext != '' ) { $difftext = DifferenceEngine::getDiff( $oldtext, $newtext, $oldtitle, $newtitle ); } - + return '

' . $difftext . '

'; } diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 0b85b00dd3..a0cee454e9 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -8,7 +8,7 @@ /** * Some globals and requires needed */ - + /** * Total number of articles * @global integer $wgNumberOfArticles @@ -67,14 +67,14 @@ if( !function_exists('is_a') ) { # UTF-8 substr function based on a PHP manual comment if ( !function_exists( 'mb_substr' ) ) { - function mb_substr( $str, $start ) { + function mb_substr( $str, $start ) { preg_match_all( '/./us', $str, $ar ); if( func_num_args() >= 3 ) { - $end = func_get_arg( 2 ); - return join( '', array_slice( $ar[0], $start, $end ) ); - } else { - return join( '', array_slice( $ar[0], $start ) ); + $end = func_get_arg( 2 ); + return join( '', array_slice( $ar[0], $start, $end ) ); + } else { + return join( '', array_slice( $ar[0], $start ) ); } } } @@ -235,7 +235,7 @@ function wfReadOnly() { if ( '' == $wgReadOnlyFile ) { return false; } - + // Set $wgReadOnly and unset $wgReadOnlyFile, for faster access next time if ( is_file( $wgReadOnlyFile ) ) { $wgReadOnly = true; @@ -250,7 +250,7 @@ function wfReadOnly() { /** * Get a message from anywhere, for the current user language * - * @param string + * @param string */ function wfMsg( $key ) { $args = func_get_args(); @@ -302,7 +302,7 @@ function wfMsgNoDBForContent( $key ) { function wfMsgReal( $key, $args, $useDB, $forContent=false ) { $fname = 'wfMsgReal'; wfProfileIn( $fname ); - + $message = wfMsgGetKey( $key, $useDB, $forContent ); $message = wfMsgReplaceArgs( $message, $args ); wfProfileOut( $fname ); @@ -321,7 +321,7 @@ function wfMsgGetKey( $key, $useDB, $forContent = false ) { global $wgParser, $wgMsgParserOptions; global $wgContLang, $wgLanguageCode; global $wgMessageCache, $wgLang; - + if( is_object( $wgMessageCache ) ) { $message = $wgMessageCache->get( $key, $useDB, $forContent ); } else { @@ -332,7 +332,7 @@ function wfMsgGetKey( $key, $useDB, $forContent = false ) { } wfSuppressWarnings(); - + if( is_object( $lang ) ) { $message = $lang->getMessage( $key ); } else { @@ -358,7 +358,7 @@ function wfMsgGetKey( $key, $useDB, $forContent = false ) { */ function wfMsgReplaceArgs( $message, $args ) { static $replacementKeys = array( '$1', '$2', '$3', '$4', '$5', '$6', '$7', '$8', '$9' ); - + # Fix windows line-endings # Some messages are split with explode("\n", $msg) $message = str_replace( "\r", '', $message ); @@ -449,7 +449,7 @@ function wfBacktrace() { if ( !function_exists( 'debug_backtrace' ) ) { return false; } - + if ( $wgCommandLineMode ) { $msg = ''; } else { @@ -519,7 +519,7 @@ function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) { $fmtLimit = $wgLang->formatNum( $limit ); $prev = wfMsg( 'prevn', $fmtLimit ); $next = wfMsg( 'nextn', $fmtLimit ); - + if( is_object( $link ) ) { $title =& $link; } else { @@ -528,7 +528,7 @@ function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) { return false; } } - + $sk = $wgUser->getSkin(); if ( 0 != $offset ) { $po = $offset - $limit; @@ -611,7 +611,7 @@ function wfCheckLimits( $deflimit = 50, $optionname = 'rclimit' ) { * @param string $text Text to be escaped */ function wfEscapeWikiText( $text ) { - $text = str_replace( + $text = str_replace( array( '[', '|', '\'', 'ISBN ' , '://' , "\n=", '{{' ), array( '[', '|', ''', 'ISBN ', '://' , "\n=", '{{' ), htmlspecialchars($text) ); @@ -655,7 +655,7 @@ function wfEscapeJsString( $string ) { '\'' => '\\\'', "\n" => "\\n", "\r" => "\\r", - + # To avoid closing the element or CDATA section "<" => "\\x3c", ">" => "\\x3e", @@ -741,7 +741,7 @@ function wfPurgeSquidServers ($urlArr) { /** * Windows-compatible version of escapeshellarg() - * Windows doesn't recognise single-quotes in the shell, but the escapeshellarg() + * Windows doesn't recognise single-quotes in the shell, but the escapeshellarg() * function puts single quotes in regardless of OS */ function wfEscapeShellArg( ) { @@ -754,7 +754,7 @@ function wfEscapeShellArg( ) { } else { $first = false; } - + if ( wfIsWindows() ) { $retVal .= '"' . str_replace( '"','\"', $arg ) . '"'; } else { @@ -843,8 +843,8 @@ function wfHttpError( $code, $label, $desc ) { header( 'Content-type: text/html' ); print "" . - htmlspecialchars( $label ) . - "

" . + htmlspecialchars( $label ) . + "

" . htmlspecialchars( $label ) . "

" . htmlspecialchars( $desc ) . @@ -958,7 +958,7 @@ function wfNegotiateType( $cprefs, $sprefs ) { * Array lookup * Returns an array where the values in the first array are replaced by the * values in the second array with the corresponding keys - * + * * @return array */ function wfArrayLookup( $a, $b ) { @@ -1005,7 +1005,7 @@ function wfRestoreWarnings() { # Autodetect, convert and provide timestamps of various types -/** +/** * Unix time - the number of seconds since 1970-01-01 00:00:00 UTC */ define('TS_UNIX', 0); @@ -1034,6 +1034,10 @@ define('TS_RFC2822', 3); */ define('TS_EXIF', 4); +/** + * Oracle format time. + */ +define('TS_ORACLE', 5); /** * @param mixed $outputtype A timestamp in one of the supported formats, the @@ -1042,8 +1046,9 @@ define('TS_EXIF', 4); * @return string Time in the format specified in $outputtype */ function wfTimestamp($outputtype=TS_UNIX,$ts=0) { - if ($ts==0) { - $uts=time(); +wfdebug("ts: $ts\n"); + if ($ts==0) { + $uts=time(); } elseif (preg_match("/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)$/",$ts,$da)) { # TS_DB $uts=gmmktime((int)$da[4],(int)$da[5],(int)$da[6], @@ -1059,13 +1064,17 @@ function wfTimestamp($outputtype=TS_UNIX,$ts=0) { } elseif (preg_match("/^(\d{1,13})$/",$ts,$datearray)) { # TS_UNIX $uts=$ts; + } elseif (preg_match('/^(\d{1,2})-(...)-(\d\d(\d\d)?) (\d\d)\.(\d\d)\.(\d\d)/', $ts, $da)) { + # TS_ORACLE + $uts = strtotime(preg_replace('/(\d\d)\.(\d\d)\.(\d\d)(\.(\d+))?/', "$1:$2:$3", + str_replace("+00:00", "UTC", $ts))); } else { # Bogus value; fall back to the epoch... wfDebug("wfTimestamp() fed bogus time value: $outputtype; $ts\n"); $uts = 0; } - + switch($outputtype) { case TS_UNIX: return $uts; @@ -1078,6 +1087,8 @@ function wfTimestamp($outputtype=TS_UNIX,$ts=0) { return gmdate( 'Y:m:d H:i:s', $uts ); case TS_RFC2822: return gmdate( 'D, d M Y H:i:s', $uts ) . ' GMT'; + case TS_ORACLE: + return gmdate( 'd-M-y h.i.s A', $uts) . ' +00:00'; default: wfDebugDieBacktrace( 'wfTimestamp() called with illegal output type.'); } @@ -1103,13 +1114,13 @@ function wfTimestampOrNull( $outputtype = TS_UNIX, $ts = null ) { * * @return bool True if it's windows, False otherwise. */ -function wfIsWindows() { - if (substr(php_uname(), 0, 7) == 'Windows') { - return true; - } else { - return false; - } -} +function wfIsWindows() { + if (substr(php_uname(), 0, 7) == 'Windows') { + return true; + } else { + return false; + } +} /** * Swap two variables @@ -1228,7 +1239,7 @@ function &HTMLnamespaceselector($selected = '', $allnamespaces = null) { /** Global singleton instance of MimeMagic. This is initialized on demand, * please always use the wfGetMimeMagic() function to get the instance. -* +* * @private */ $wgMimeMagic= NULL; @@ -1241,7 +1252,7 @@ $wgMimeMagic= NULL; */ function &wfGetMimeMagic() { global $wgMimeMagic; - + if (!is_null($wgMimeMagic)) { return $wgMimeMagic; } @@ -1250,9 +1261,9 @@ function &wfGetMimeMagic() { #include on demand require_once("MimeMagic.php"); } - + $wgMimeMagic= new MimeMagic(); - + return $wgMimeMagic; } diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 5808580952..f3ead557c1 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -312,7 +312,7 @@ class ImagePage extends Article { if ( $line ) { $list =& new ImageHistoryList( $sk ); $s = $list->beginImageHistoryList() . - $list->imageHistoryLine( true, $line->img_timestamp, + $list->imageHistoryLine( true, wfTimestamp(TS_MW, $line->img_timestamp), $this->mTitle->getDBkey(), $line->img_user, $line->img_user_text, $line->img_size, $line->img_description ); @@ -344,8 +344,8 @@ class ImagePage extends Article { $imagelinks = $dbr->tableName( 'imagelinks' ); $sql = "SELECT page_namespace,page_title FROM $imagelinks,$page WHERE il_to=" . - $dbr->addQuotes( $this->mTitle->getDBkey() ) . " AND il_from=page_id" - . " LIMIT 500"; # quickie emergency brake + $dbr->addQuotes( $this->mTitle->getDBkey() ) . " AND il_from=page_id"; + $sql = $dbr->limitResult($sql, 500, 0); $res = $dbr->query( $sql, "ImagePage::imageLinks" ); if ( 0 == $dbr->numRows( $res ) ) { diff --git a/includes/LinkCache.php b/includes/LinkCache.php index dae7533ccf..4eda8d20ca 100644 --- a/includes/LinkCache.php +++ b/includes/LinkCache.php @@ -18,7 +18,7 @@ define ('LINKCACHE_PAGE', 3); * @package MediaWiki * @subpackage Cache */ -class LinkCache { +class LinkCache { // Increment $mClassVer whenever old serialized versions of this class // becomes incompatible with the new version. /* private */ var $mClassVer = 3; @@ -33,7 +33,7 @@ class LinkCache { global $wgDBname; return $wgDBname.':lc:title:'.$title; } - + function LinkCache() { $this->mActive = true; $this->mPreFilled = false; @@ -51,10 +51,10 @@ class LinkCache { /** * General accessor to get/set whether SELECT FOR UPDATE should be used */ - function forUpdate( $update = NULL ) { + function forUpdate( $update = NULL ) { return wfSetVar( $this->mForUpdate, $update ); } - + function getGoodLinkID( $title ) { if ( array_key_exists( $title, $this->mGoodLinks ) ) { return $this->mGoodLinks[$title]; @@ -64,7 +64,7 @@ class LinkCache { } function isBadLink( $title ) { - return array_key_exists( $title, $this->mBadLinks ); + return array_key_exists( $title, $this->mBadLinks ); } function addGoodLinkObj( $id, $title ) { @@ -90,11 +90,11 @@ class LinkCache { function addImageLinkObj( $nt ) { if ( $this->mActive ) { $this->mImageLinks[$nt->getDBkey()] = 1; } } - + function addCategoryLink( $title, $sortkey ) { if ( $this->mActive ) { $this->mCategoryLinks[$title] = $sortkey; } } - + function addCategoryLinkObj( &$nt, $sortkey ) { $this->addCategoryLink( $nt->getDBkey(), $sortkey ); } @@ -103,7 +103,7 @@ class LinkCache { unset( $this->mBadLinks[$title] ); $this->clearLink( $title ); } - + function clearLink( $title ) { global $wgMemc, $wgLinkCacheMemcached; if( $wgLinkCacheMemcached ) @@ -126,11 +126,11 @@ class LinkCache { return 0; } } - + function addLinkObj( &$nt ) { global $wgMemc, $wgLinkCacheMemcached, $wgAntiLockFlags; $title = $nt->getPrefixedDBkey(); - if ( $this->isBadLink( $title ) ) { return 0; } + if ( $this->isBadLink( $title ) ) { return 0; } $id = $this->getGoodLinkID( $title ); if ( 0 != $id ) { return $id; } @@ -140,11 +140,11 @@ class LinkCache { $ns = $nt->getNamespace(); $t = $nt->getDBkey(); - if ( '' == $title ) { + if ( '' == $title ) { wfProfileOut( $fname ); - return 0; + return 0; } - + $id = NULL; if( $wgLinkCacheMemcached ) $id = $wgMemc->get( $key = $this->getKey( $title ) ); @@ -159,14 +159,17 @@ class LinkCache { $options = array(); } - $id = $db->selectField( 'page', 'page_id', array( 'page_namespace' => $ns, 'page_title' => $t ), $fname, $options ); + $id = $db->selectField( 'page', 'page_id', + array( 'page_namespace' => $ns, 'page_title' => $t ), + $fname, $options ); +wfdebug("link cache: id=$id\n"); if ( !$id ) { $id = 0; } if( $wgLinkCacheMemcached ) $wgMemc->add( $key, $id, 3600*24 ); } - + if( 0 == $id ) { $this->addBadLinkObj( $nt ); } else { @@ -188,13 +191,13 @@ class LinkCache { $this->suspend(); $id = $fromtitle->getArticleID(); $this->resume(); - + if( $id == 0 ) { wfDebug( "$fname - got id 0 for title '" . $fromtitle->getPrefixedDBkey() . "'\n" ); wfProfileOut( $fname ); return; } - + if ( $this->mForUpdate ) { $db =& wfGetDB( DB_MASTER ); if ( !( $wgAntiLockFlags & ALF_NO_LINK_LOCK ) ) { @@ -254,7 +257,7 @@ class LinkCache { function getImageDeletions() { return array_diff_assoc( $this->mOldImageLinks, $this->mImageLinks ); } - + function getPageAdditions() { $set = array_diff( array_keys( $this->mPageLinks ), array_keys( $this->mOldPageLinks ) ); $out = array(); @@ -263,7 +266,7 @@ class LinkCache { } return $out; } - + function getPageDeletions() { $set = array_diff( array_keys( $this->mOldPageLinks ), array_keys( $this->mPageLinks ) ); $out = array(); @@ -308,14 +311,14 @@ class LinkCache { $add = $this->getPageAdditions(); break; default: # LINKCACHE_IMAGE - return false; + return false; } - + return true; } /** - * Clears cache + * Clears cache */ function clear() { $this->mPageLinks = array(); @@ -347,7 +350,7 @@ class LinkCache { * @subpackage Cache */ class LinkBatch { - /** + /** * 2-d array, first index namespace, second index dbkey, value arbitrary */ var $data = array(); @@ -357,7 +360,7 @@ class LinkBatch { $this->addObj( $item ); } } - + function addObj( $title ) { $this->add( $title->getNamespace(), $title->getDBkey() ); } @@ -389,7 +392,7 @@ class LinkBatch { $page = $dbr->tableName( 'page' ); $sql = "SELECT page_id, page_namespace, page_title FROM $page WHERE " . $this->constructSet( 'page', $dbr ); - + // Do query $res = $dbr->query( $sql, $fname ); @@ -414,7 +417,7 @@ class LinkBatch { wfProfileOut( $fname ); } - + /** * Construct a WHERE clause which will match all the given titles. * Give the appropriate table's field name prefix ('page', 'pl', etc). diff --git a/includes/LoadBalancer.php b/includes/LoadBalancer.php index ee402d68e5..54fc617d9b 100644 --- a/includes/LoadBalancer.php +++ b/includes/LoadBalancer.php @@ -74,9 +74,9 @@ class LoadBalancer { $this->mGroupLoads[$group][$i] = $ratio; } } - } + } } - + /** * Given an array of non-normalised probabilities, this function will select * an element and return the appropriate key @@ -101,7 +101,7 @@ class LoadBalancer { } $max = mt_getrandmax(); $rand = mt_rand(0, $max) / $max * $sum; - + $sum = 0; foreach ( $weights as $i => $w ) { $sum += $w; @@ -130,7 +130,7 @@ class LoadBalancer { if ( $sum == 0 ) { # No appropriate DB servers except maybe the master and some slaves with zero load # Do NOT use the master - # Instead, this function will return false, triggering read-only mode, + # Instead, this function will return false, triggering read-only mode, # and a lagged slave will be used instead. unset ( $loads[0] ); } @@ -147,7 +147,7 @@ class LoadBalancer { /** * Get the index of the reader connection, which may be a slave - * This takes into account load ratios and lag times. It should + * This takes into account load ratios and lag times. It should * always return a consistent index during a given invocation * * Side effect: opens connections to databases @@ -185,15 +185,15 @@ class LoadBalancer { if ( $i !== false ) { wfDebug( "Using reader #$i: {$this->mServers[$i]['host']}...\n" ); $this->openConnection( $i ); - + if ( !$this->isOpen( $i ) ) { wfDebug( "Failed\n" ); unset( $loads[$i] ); $sleepTime = 0; } else { $status = $this->mConnections[$i]->getStatus(); - if ( isset( $this->mServers[$i]['max threads'] ) && - $status['Threads_running'] > $this->mServers[$i]['max threads'] ) + if ( isset( $this->mServers[$i]['max threads'] ) && + $status['Threads_running'] > $this->mServers[$i]['max threads'] ) { # Slave is lagged, wait for a while $sleepTime = 5000 * $status['Threads_connected']; @@ -232,7 +232,7 @@ class LoadBalancer { wfProfileOut( $fname ); return $i; } - + /** * Get a random server to use in a query group */ @@ -245,7 +245,7 @@ class LoadBalancer { wfDebug( "Query group $group => $i\n" ); return $i; } - + /** * Set the master wait position * If a DB_SLAVE connection has been opened already, waits @@ -269,7 +269,7 @@ class LoadBalancer { $this->mServers[$i]['slave pos'] = $this->mConnections[$i]->getSlavePos(); $this->mLaggedSlaveMode = true; } - } + } } wfProfileOut( $fname ); } @@ -279,7 +279,7 @@ class LoadBalancer { */ function doWait( $index ) { global $wgMemc; - + $retVal = false; # Debugging hacks @@ -314,7 +314,7 @@ class LoadBalancer { } } return $retVal; - } + } /** * Get a connection by index @@ -323,7 +323,7 @@ class LoadBalancer { { $fname = 'LoadBalancer::getConnection'; wfProfileIn( $fname ); - + # Query groups $groupIndex = false; foreach ( $groups as $group ) { @@ -333,9 +333,9 @@ class LoadBalancer { break; } } - + # Operation-based index - if ( $i == DB_SLAVE ) { + if ( $i == DB_SLAVE ) { $i = $this->getReaderIndex(); } elseif ( $i == DB_MASTER ) { $i = $this->getWriterIndex(); @@ -350,7 +350,7 @@ class LoadBalancer { } # Now we have an explicit index into the servers array $this->openConnection( $i, $fail ); - + wfProfileOut( $fname ); return $this->mConnections[$i]; } @@ -369,6 +369,7 @@ class LoadBalancer { if ( !$this->isOpen( $i ) ) { $this->mConnections[$i] = $this->reallyOpenConnection( $this->mServers[$i] ); } + if ( !$this->isOpen( $i ) ) { wfDebug( "Failed to connect to database $i at {$this->mServers[$i]['host']}\n" ); if ( $fail ) { @@ -390,15 +391,15 @@ class LoadBalancer { if( !is_integer( $index ) ) { return false; } - if ( array_key_exists( $index, $this->mConnections ) && is_object( $this->mConnections[$index] ) && - $this->mConnections[$index]->isOpen() ) + if ( array_key_exists( $index, $this->mConnections ) && is_object( $this->mConnections[$index] ) && + $this->mConnections[$index]->isOpen() ) { return true; } else { return false; } } - + /** * Really opens a connection * @private @@ -407,7 +408,7 @@ class LoadBalancer { if( !is_array( $server ) ) { wfDebugDieBacktrace( 'You must update your load-balancing configuration. See DefaultSettings.php entry for $wgDBservers.' ); } - + extract( $server ); # Get class for this database type $class = 'Database' . ucfirst( $type ); @@ -418,13 +419,13 @@ class LoadBalancer { # Create object return new $class( $host, $user, $password, $dbname, 1, $flags ); } - + function reportConnectionError( &$conn ) { $fname = 'LoadBalancer::reportConnectionError'; wfProfileIn( $fname ); # Prevent infinite recursion - + static $reporting = false; if ( !$reporting ) { $reporting = true; @@ -441,7 +442,7 @@ class LoadBalancer { } wfProfileOut( $fname ); } - + function getWriterIndex() { return 0; @@ -470,7 +471,7 @@ class LoadBalancer { function saveMasterPos() { global $wgSessionStarted; if ( $wgSessionStarted && count( $this->mServers ) > 1 ) { - # If this entire request was served from a slave without opening a connection to the + # If this entire request was served from a slave without opening a connection to the # master (however unlikely that may be), then we can fetch the position from the slave. if ( empty( $this->mConnections[0] ) ) { $conn =& $this->getConnection( DB_SLAVE ); @@ -556,7 +557,7 @@ class LoadBalancer { } return array( $host, $maxLag ); } - + /** * Get lag time for each DB * Results are cached for a short time in memcached diff --git a/includes/LogPage.php b/includes/LogPage.php index 4447dd76a0..1fc51168f0 100644 --- a/includes/LogPage.php +++ b/includes/LogPage.php @@ -2,17 +2,17 @@ # # Copyright (C) 2002, 2004 Brion Vibber # http://www.mediawiki.org/ -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -67,7 +67,7 @@ class LogPage { 'log_params' => $this->params ), $fname ); - + # And update recentchanges if ( $this->updateRecentChanges ) { $titleObj = Title::makeTitle( NS_SPECIAL, 'Log/' . $this->type ); @@ -78,7 +78,7 @@ class LogPage { else $rcComment .= ': ' . $this->comment; } - + RecentChange::notifyLog( $now, $titleObj, $wgUser, $rcComment ); } return true; @@ -92,7 +92,7 @@ class LogPage { wfRunHooks( 'LogPageValidTypes', array( &$types) ); return $types; } - + /** * @static */ @@ -108,14 +108,14 @@ class LogPage { ); return $actions[$type]; } - + /** * @static */ function isLogType( $type ) { return in_array( $type, LogPage::validTypes() ); } - + /** * @static */ @@ -133,7 +133,7 @@ class LogPage { return str_replace( '_', ' ', wfMsg( $typeText[$type] ) ); } - + /** * @static */ @@ -151,7 +151,7 @@ class LogPage { return wfMsg( $headerText[$type] ); } - + /** * @static */ @@ -175,7 +175,7 @@ class LogPage { $key = "$type/$action"; if( isset( $actions[$key] ) ) { if( is_null( $title ) ) { - $rv=wfMsgForContent( $actions[$key] ); + $rv=wfMsg( $actions[$key] ); } else { if( $skin ) { if ( $type == 'move' ) { @@ -190,10 +190,10 @@ class LogPage { $titleLink = $title->getPrefixedText(); } if( count( $params ) == 0 ) { - $rv = wfMsgForContent( $actions[$key], $titleLink ); + $rv = wfMsg( $actions[$key], $titleLink ); } else { array_unshift( $params, $titleLink ); - $rv = wfMsgReal( $actions[$key], $params, true, true ); + $rv = wfMsgReal( $actions[$key], $params, true, false ); } } } else { @@ -218,18 +218,18 @@ class LogPage { if ( !is_array( $params ) ) { $params = array( $params ); } - + $this->action = $action; $this->target =& $target; $this->comment = $comment; $this->params = LogPage::makeParamBlob( $params ); - + $this->actionText = LogPage::actionText( $this->type, $action, $target, NULL, $params ); return $this->saveContent(); } - /** + /** * Create a blob from a parameter array * @static */ diff --git a/includes/Namespace.php b/includes/Namespace.php index d1d06aca06..8466137427 100644 --- a/includes/Namespace.php +++ b/includes/Namespace.php @@ -3,13 +3,13 @@ * Provide things related to namespaces * @package MediaWiki */ - + /** * This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined */ if( defined( 'MEDIAWIKI' ) ) { - + /** * Definitions of the NS_ constants are in Defines.php * @private @@ -56,8 +56,8 @@ class Namespace { * @return bool */ function isMovable( $index ) { - if ( $index < NS_MAIN || $index == NS_IMAGE || $index == NS_CATEGORY ) { - return false; + if ( $index < NS_MAIN || $index == NS_IMAGE || $index == NS_CATEGORY ) { + return false; } return true; } @@ -71,10 +71,10 @@ class Namespace { return ( $index == NS_TALK || $index == NS_USER_TALK || $index == NS_PROJECT_TALK || $index == NS_IMAGE_TALK || $index == NS_MEDIAWIKI_TALK || $index == NS_TEMPLATE_TALK || - $index == NS_HELP_TALK || $index == NS_CATEGORY_TALK + $index == NS_HELP_TALK || $index == NS_CATEGORY_TALK || ( (isset($wgExtraNamespaces) && $index % 2) ) ); - + } /** diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php index dbf6221c96..f01171e0a4 100644 --- a/includes/ObjectCache.php +++ b/includes/ObjectCache.php @@ -53,9 +53,9 @@ function &wfGetCache( $inputType ) { } if ( $type == CACHE_MEMCACHED ) { - if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ){ + if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ){ require_once( 'memcached-client.php' ); - + if (!class_exists("MemcachedClientforWiki")) { class MemCachedClientforWiki extends memcached { function _debugprint( $text ) { @@ -64,7 +64,7 @@ function &wfGetCache( $inputType ) { } } - $wgCaches[CACHE_DB] = new MemCachedClientforWiki( + $wgCaches[CACHE_DB] = new MemCachedClientforWiki( array('persistant' => false, 'compress_threshold' => 1500 ) ); $cache =& $wgCaches[CACHE_DB]; $cache->set_servers( $wgMemCachedServers ); @@ -94,7 +94,7 @@ function &wfGetCache( $inputType ) { } $cache =& $wgCaches[CACHE_DB]; } - + if ( $cache === false ) { if ( !array_key_exists( CACHE_NONE, $wgCaches ) ) { $wgCaches[CACHE_NONE] = new FakeMemCachedClient; diff --git a/includes/PageHistory.php b/includes/PageHistory.php index 1bf67a5d46..5079a3b9d9 100644 --- a/includes/PageHistory.php +++ b/includes/PageHistory.php @@ -64,6 +64,8 @@ class PageHistory { $fname = 'PageHistory::history'; wfProfileIn( $fname ); + $dbr = wfGetDB(DB_SLAVE); + /* * Setup page variables. */ @@ -93,7 +95,9 @@ class PageHistory { /* Offset must be an integral. */ if (!strlen($offset) || !preg_match("/^[0-9]+$/", $offset)) $offset = 0; - +# $offset = $dbr->timestamp($offset); + $dboffset = $dbr->timestamp($offset); +wfdebug("offset=[$offset] dboffset=[$dboffset]\n"); /* * "go=last" means to jump to the last history page. */ @@ -102,7 +106,8 @@ class PageHistory { case "first": if (($lastid = $this->getLastOffsetForPaging($id, $limit)) === NULL) break; - $gourl = $wgTitle->getLocalURL("action=history&limit={$limit}&offset={$lastid}"); + $gourl = $wgTitle->getLocalURL("action=history&limit={$limit}&offset=". + wfTimestamp(TS_MW, $lastid)); break; default: $gourl = NULL; @@ -122,7 +127,7 @@ class PageHistory { * previous revisions when generating the URL. */ $direction = $this->getDirection(); - $revisions = $this->fetchRevisions($limit, $offset, $direction); + $revisions = $this->fetchRevisions($limit, $dboffset, $direction); $navbar = $this->makeNavbar($revisions, $offset, $limit, $direction); /* @@ -261,7 +266,7 @@ class PageHistory { /** @todo document */ function revLink( $row ) { global $wgUser, $wgLang; - $date = $wgLang->timeanddate( $row->rev_timestamp, true ); + $date = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->rev_timestamp), true ); if( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) { return $date; } else { @@ -382,7 +387,8 @@ class PageHistory { $db =& wfGetDB(DB_SLAVE); $revision = $db->tableName( 'revision' ); $sql = "SELECT rev_timestamp FROM $revision WHERE rev_page = $id " . - "ORDER BY rev_timestamp ASC LIMIT $step"; + "ORDER BY rev_timestamp ASC"; + $sql = $db->limitResult($sql, $step, 0); $res = $db->query( $sql, "PageHistory::getLastOffsetForPaging" ); $n = $db->numRows( $res ); @@ -429,8 +435,6 @@ class PageHistory { if ($offset) $offsets .= " AND rev_timestamp $oper '$offset' "; - if ($limit) - $limits .= " LIMIT $limitplus "; $page_id = $this->mTitle->getArticleID(); $sql = "SELECT rev_id,rev_user," . @@ -438,8 +442,9 @@ class PageHistory { "FROM $revision $use_index " . "WHERE rev_page=$page_id " . $offsets . - "ORDER BY rev_timestamp $dirs " . - $limits; + "ORDER BY rev_timestamp $dirs "; + if ($limit) + $sql = $db->limitResult($sql, $limitplus, 0); $res = $db->query($sql, "PageHistory::fetchRevisions"); $result = array(); @@ -480,8 +485,8 @@ class PageHistory { $revisions = array_slice($revisions, 0, $limit); $pageid = $this->mTitle->getArticleID(); - $latestTimestamp = $this->getLatestOffset( $pageid ); - $earliestTimestamp = $this->getEarliestOffset( $pageid ); + $latestTimestamp = wfTimestamp(TS_MW, $this->getLatestOffset( $pageid )); + $earliestTimestamp = wfTimestamp(TS_MW, $this->getEarliestOffset( $pageid )); /* * When we're displaying previous revisions, we need to reverse @@ -498,8 +503,8 @@ class PageHistory { $lowts = $hights = 0; if( count( $revisions ) ) { - $latestShown = $revisions[0]->rev_timestamp; - $earliestShown = $revisions[count($revisions) - 1]->rev_timestamp; + $latestShown = wfTimestamp(TS_MW, $revisions[0]->rev_timestamp); + $earliestShown = wfTimestamp(TS_MW, $revisions[count($revisions) - 1]->rev_timestamp); } $firsturl = $wgTitle->escapeLocalURL("action=history&limit={$limit}&go=first"); @@ -507,13 +512,14 @@ class PageHistory { $firsttext = wfMsgHtml('histfirst'); $lasttext = wfMsgHtml('histlast'); - $prevurl = $wgTitle->escapeLocalURL("action=history&dir=prev&offset={$latestShown}&limit={$limit}"); - $nexturl = $wgTitle->escapeLocalURL("action=history&offset={$earliestShown}&limit={$limit}"); + $prevurl = $wgTitle->escapeLocalURL("action=history&dir=prev&offset=$latestShown&limit={$limit}"); + $nexturl = $wgTitle->escapeLocalURL("action=history&offset=$earliestShown&limit={$limit}"); $urls = array(); foreach (array(20, 50, 100, 250, 500) as $num) { $urls[] = "escapeLocalURL( - "action=history&offset={$offset}&limit={$num}")."\">".$wgLang->formatNum($num).""; + "action=history&offset=" . wfTimestamp(TS_MW, $offset) . + "&limit={$num}")."\">".$wgLang->formatNum($num).""; } $bits = implode($urls, ' | '); diff --git a/includes/QueryPage.php b/includes/QueryPage.php index 8c6e110364..3d94b6c577 100644 --- a/includes/QueryPage.php +++ b/includes/QueryPage.php @@ -20,7 +20,7 @@ $wgQueryPages = array( array( 'DeadendPagesPage', 'Deadendpages' ), array( 'DisambiguationsPage', 'Disambiguations' ), array( 'DoubleRedirectsPage', 'DoubleRedirects' ), - array( 'ListUsersPage', 'Listusers' ), + array( 'ListUsersPage', 'Listusers' ), array( 'LonelyPagesPage', 'Lonelypages' ), array( 'LongPagesPage', 'Longpages' ), array( 'NewPagesPage', 'Newpages' ), @@ -118,7 +118,7 @@ class QueryPage { function getPageHeader( ) { return ''; } - + /** * If using extra form wheely-dealies, return a set of parameters here * as an associative array. They will be encoded and added to the paging @@ -128,7 +128,7 @@ class QueryPage { function linkParameters() { return array(); } - + /** * Some special pages (for example SpecialListusers) might not return the * current object formatted, but return the previous one instead. @@ -151,7 +151,7 @@ class QueryPage { } $querycache = $dbr->tableName( 'querycache' ); - + if ( $ignoreErrors ) { $ignoreW = $dbw->ignoreErrors( true ); $ignoreR = $dbr->ignoreErrors( true ); @@ -236,21 +236,21 @@ class QueryPage { $wgOut->addWikiText( wfMsg( 'perfcached' ) ); } } - - $res = $dbr->query( $sql . $this->getOrder() . - $dbr->limitResult( $limit,$offset ), $fname ); + + $sql = $dbr->limitResult($sql . $this->getOrder(), $limit, $offset); + $res = $dbr->query( $sql ); $num = $dbr->numRows($res); - + $sk = $wgUser->getSkin( ); if($shownavigation) { $wgOut->addHTML( $this->getPageHeader() ); $top = wfShowingResults( $offset, $num); $wgOut->addHTML( "

{$top}\n" ); - + # often disable 'next' link when we reach the end if($num < $limit) { $atend = true; } else { $atend = false; } - + $sl = wfViewPrevNext( $offset, $limit , $wgContLang->specialPage( $sname ), wfArrayToCGI( $this->linkParameters() ), $atend ); @@ -279,7 +279,7 @@ class QueryPage { $s .= "{$format}

Database config

" . + htmlspecialchars( $label ) . + "

" . htmlspecialchars( $label ) . "

" . htmlspecialchars( wfMsg( "history" ) ) . "