X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fupgrade1_5.php;h=a269c335154b76644923db39c7616a3e825457c5;hb=a76a37e8e79fc4571379d1336fcc1a588ea73ab8;hp=eb7d8f03c6599b06d4652d0d9cbb3d7b9b7b569f;hpb=0fcb90cb16e737c6e861247bb4c9da0879eb1fc1;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/upgrade1_5.php b/maintenance/upgrade1_5.php index eb7d8f03c6..a269c33515 100644 --- a/maintenance/upgrade1_5.php +++ b/maintenance/upgrade1_5.php @@ -12,723 +12,13 @@ // Run this, FOLLOWED BY update.php, for upgrading // from 1.4.5 release to 1.5. +$options = array( 'step', 'noimages' ); + require_once( 'commandLine.inc' ); -require_once( 'cleanupDupes.inc' ); -require_once( 'userDupes.inc' ); -require_once( 'updaters.inc' ); +require_once( 'FiveUpgrade.inc' ); $upgrade = new FiveUpgrade(); -$upgrade->upgrade(); - -class FiveUpgrade { - function FiveUpgrade() { - global $wgDatabase; - $this->conversionTables = $this->prepareWindows1252(); - $this->dbw =& $this->newConnection(); - $this->dbr =& $this->newConnection(); - $this->dbr->bufferResults( false ); - } - - function upgrade() { - $this->upgradePage(); - $this->upgradeLinks(); - $this->upgradeUser(); - $this->upgradeImage(); - #$this->upgradeOldImage(); - } - - - /** - * Open a second connection to the master server, with buffering off. - * This will let us stream large datasets in and write in chunks on the - * other end. - * @return Database - * @access private - */ - function &newConnection() { - global $wgDBadminuser, $wgDBadminpassword; - global $wgDBserver, $wgDBname; - $db =& new Database( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname ); - return $db; - } - - /** - * Prepare a conversion array for converting Windows Code Page 1252 to - * UTF-8. This should provide proper conversion of text that was miscoded - * as Windows-1252 by naughty user-agents, and doesn't rely on an outside - * iconv library. - * - * @return array - * @access private - */ - function prepareWindows1252() { - # Mappings from: - # http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1252.TXT - static $cp1252 = array( - 0x80 => 0x20AC, #EURO SIGN - 0x81 => UNICODE_REPLACEMENT, - 0x82 => 0x201A, #SINGLE LOW-9 QUOTATION MARK - 0x83 => 0x0192, #LATIN SMALL LETTER F WITH HOOK - 0x84 => 0x201E, #DOUBLE LOW-9 QUOTATION MARK - 0x85 => 0x2026, #HORIZONTAL ELLIPSIS - 0x86 => 0x2020, #DAGGER - 0x87 => 0x2021, #DOUBLE DAGGER - 0x88 => 0x02C6, #MODIFIER LETTER CIRCUMFLEX ACCENT - 0x89 => 0x2030, #PER MILLE SIGN - 0x8A => 0x0160, #LATIN CAPITAL LETTER S WITH CARON - 0x8B => 0x2039, #SINGLE LEFT-POINTING ANGLE QUOTATION MARK - 0x8C => 0x0152, #LATIN CAPITAL LIGATURE OE - 0x8D => UNICODE_REPLACEMENT, - 0x8E => 0x017D, #LATIN CAPITAL LETTER Z WITH CARON - 0x8F => UNICODE_REPLACEMENT, - 0x90 => UNICODE_REPLACEMENT, - 0x91 => 0x2018, #LEFT SINGLE QUOTATION MARK - 0x92 => 0x2019, #RIGHT SINGLE QUOTATION MARK - 0x93 => 0x201C, #LEFT DOUBLE QUOTATION MARK - 0x94 => 0x201D, #RIGHT DOUBLE QUOTATION MARK - 0x95 => 0x2022, #BULLET - 0x96 => 0x2013, #EN DASH - 0x97 => 0x2014, #EM DASH - 0x98 => 0x02DC, #SMALL TILDE - 0x99 => 0x2122, #TRADE MARK SIGN - 0x9A => 0x0161, #LATIN SMALL LETTER S WITH CARON - 0x9B => 0x203A, #SINGLE RIGHT-POINTING ANGLE QUOTATION MARK - 0x9C => 0x0153, #LATIN SMALL LIGATURE OE - 0x9D => UNICODE_REPLACEMENT, - 0x9E => 0x017E, #LATIN SMALL LETTER Z WITH CARON - 0x9F => 0x0178, #LATIN CAPITAL LETTER Y WITH DIAERESIS - ); - $pairs = array(); - for( $i = 0; $i < 0x100; $i++ ) { - $unicode = isset( $cp1252[$i] ) ? $cp1252[$i] : $i; - $pairs[chr( $i )] = codepointToUtf8( $unicode ); - } - return $pairs; - } - - /** - * Convert from 8-bit Windows-1252 to UTF-8 if necessary. - * @param string $text - * @return string - * @access private - */ - function conv( $text ) { - global $wgUseLatin1; - if( $wgUseLatin1 ) { - return strtr( $text, $this->conversionTables ); - } else { - return $text; - } - } - - /** - * Dump timestamp and message to output - * @param string $message - * @access private - */ - function log( $message ) { - echo wfTimestamp( TS_DB ) . ': ' . $message . "\n"; - flush(); - } - - /** - * Initialize the chunked-insert system. - * Rows will be inserted in chunks of the given number, rather - * than in a giant INSERT...SELECT query, to keep the serialized - * MySQL database replication from getting hung up. This way other - * things can be going on during conversion without waiting for - * slaves to catch up as badly. - * - * @param int $chunksize Number of rows to insert at once - * @param int $final Total expected number of rows / id of last row, - * used for progress reports. - * @param string $table to insert on - * @param string $fname function name to report in SQL - * @access private - */ - function setChunkScale( $chunksize, $final, $table, $fname ) { - $this->chunkSize = $chunksize; - $this->chunkFinal = $final; - $this->chunkCount = 0; - $this->chunkStartTime = wfTime(); - $this->chunkOptions = array(); - $this->chunkTable = $table; - $this->chunkFunction = $fname; - } - - /** - * Chunked inserts: perform an insert if we've reached the chunk limit. - * Prints a progress report with estimated completion time. - * @param array &$chunk -- This will be emptied if an insert is done. - * @param int $key A key identifier to use in progress estimation in - * place of the number of rows inserted. Use this if - * you provided a max key number instead of a count - * as the final chunk number in setChunkScale() - * @access private - */ - function addChunk( &$chunk, $key = null ) { - if( count( $chunk ) >= $this->chunkSize ) { - $this->insertChunk( $chunk ); - - $this->chunkCount += count( $chunk ); - $now = wfTime(); - $delta = $now - $this->chunkStartTime; - $rate = $this->chunkCount / $delta; - - if( is_null( $key ) ) { - $completed = $this->chunkCount; - } else { - $completed = $key; - } - $portion = $completed / $this->chunkFinal; - - $estimatedTotalTime = $delta / $portion; - $eta = $this->chunkStartTime + $estimatedTotalTime; - - printf( "%s: %6.2f%% done on %s; ETA %s [%d/%d] %.2f/sec\n", - wfTimestamp( TS_DB, intval( $now ) ), - $portion * 100.0, - $this->chunkTable, - wfTimestamp( TS_DB, intval( $eta ) ), - $completed, - $this->chunkFinal, - $rate ); - flush(); - - $chunk = array(); - } - } - - /** - * Chunked inserts: perform an insert unconditionally, at the end, and log. - * @param array &$chunk -- This will be emptied if an insert is done. - * @access private - */ - function lastChunk( &$chunk ) { - $n = count( $chunk ); - if( $n > 0 ) { - $this->insertChunk( $chunk ); - } - $this->log( "100.00% done on $this->chunkTable (last chunk $n rows)." ); - } - - /** - * Chunked inserts: perform an insert. - * @param array &$chunk -- This will be emptied if an insert is done. - * @access private - */ - function insertChunk( &$chunk ) { - $this->dbw->insert( $this->chunkTable, $chunk, $this->chunkFunction, $this->chunkOptions ); - } - - - function upgradePage() { - $fname = "FiveUpgrade::upgradePage"; - $chunksize = 100; - - - $this->log( "Checking cur table for unique title index and applying if necessary" ); - checkDupes( true ); - - $this->log( "...converting from cur/old to page/revision/text DB structure." ); - - extract( $this->dbw->tableNames( 'cur', 'old', 'page', 'revision', 'text' ) ); - - $this->log( "Creating page and revision tables..." ); - $this->dbw->query("CREATE TABLE $page ( - page_id int(8) unsigned NOT NULL auto_increment, - page_namespace int NOT NULL, - page_title varchar(255) binary NOT NULL, - page_restrictions tinyblob NOT NULL default '', - page_counter bigint(20) unsigned NOT NULL default '0', - page_is_redirect tinyint(1) unsigned NOT NULL default '0', - page_is_new tinyint(1) unsigned NOT NULL default '0', - page_random real unsigned NOT NULL, - page_touched char(14) binary NOT NULL default '', - page_latest int(8) unsigned NOT NULL, - page_len int(8) unsigned NOT NULL, - - PRIMARY KEY page_id (page_id), - UNIQUE INDEX name_title (page_namespace,page_title), - INDEX (page_random), - INDEX (page_len) - ) TYPE=InnoDB", $fname ); - $this->dbw->query("CREATE TABLE $revision ( - rev_id int(8) unsigned NOT NULL auto_increment, - rev_page int(8) unsigned NOT NULL, - rev_comment tinyblob NOT NULL default '', - rev_user int(5) unsigned NOT NULL default '0', - rev_user_text varchar(255) binary NOT NULL default '', - rev_timestamp char(14) binary NOT NULL default '', - rev_minor_edit tinyint(1) unsigned NOT NULL default '0', - rev_deleted tinyint(1) unsigned NOT NULL default '0', - - PRIMARY KEY rev_page_id (rev_page, rev_id), - UNIQUE INDEX rev_id (rev_id), - INDEX rev_timestamp (rev_timestamp), - INDEX page_timestamp (rev_page,rev_timestamp), - INDEX user_timestamp (rev_user,rev_timestamp), - INDEX usertext_timestamp (rev_user_text,rev_timestamp) - ) TYPE=InnoDB", $fname ); - - $maxold = $this->dbw->selectField( 'old', 'max(old_id)', '', $fname ); - $this->log( "Last old record is {$maxold}" ); - - global $wgLegacySchemaConversion; - if( $wgLegacySchemaConversion ) { - // Create HistoryBlobCurStub entries. - // Text will be pulled from the leftover 'cur' table at runtime. - echo "......Moving metadata from cur; using blob references to text in cur table.\n"; - $cur_text = "concat('O:18:\"historyblobcurstub\":1:{s:6:\"mCurId\";i:',cur_id,';}')"; - $cur_flags = "'object'"; - } else { - // Copy all cur text in immediately: this may take longer but avoids - // having to keep an extra table around. - echo "......Moving text from cur.\n"; - $cur_text = 'cur_text'; - $cur_flags = "''"; - } - - $maxcur = $this->dbw->selectField( 'cur', 'max(cur_id)', '', $fname ); - $this->log( "Last cur entry is $maxcur" ); - - /** - * Copy placeholder records for each page's current version into old - * Don't do any conversion here; text records are converted at runtime - * based on the flags (and may be originally binary!) while the meta - * fields will be converted in the old -> rev and cur -> page steps. - */ - $this->setChunkScale( $chunksize, $maxcur, 'old', $fname ); - $result = $this->dbr->query( - "SELECT cur_id, cur_namespace, cur_title, $cur_text AS text, cur_comment, - cur_user, cur_user_text, cur_timestamp, cur_minor_edit, $cur_flags AS flags - FROM $cur - ORDER BY cur_id", $fname ); - $add = array(); - while( $row = $this->dbr->fetchObject( $result ) ) { - $add[] = array( - 'old_namespace' => $row->cur_namespace, - 'old_title' => $row->cur_title, - 'old_text' => $row->text, - 'old_comment' => $row->cur_comment, - 'old_user' => $row->cur_user, - 'old_user_text' => $row->cur_user_text, - 'old_timestamp' => $row->cur_timestamp, - 'old_minor_edit' => $row->cur_minor_edit, - 'old_flags' => $row->flags ); - $this->addChunk( $add, $row->cur_id ); - } - $this->lastChunk( $add ); - $this->dbr->freeResult( $result ); - - /** - * Copy revision metadata from old into revision. - * We'll also do UTF-8 conversion of usernames and comments. - */ - #$newmaxold = $this->dbw->selectField( 'old', 'max(old_id)', '', $fname ); - #$this->setChunkScale( $chunksize, $newmaxold, 'revision', $fname ); - $countold = $this->dbw->selectField( 'old', 'count(old_id)', '', $fname ); - $this->setChunkScale( $chunksize, $countold, 'revision', $fname ); - - $this->log( "......Setting up revision table." ); - $result = $this->dbr->query( - "SELECT old_id, cur_id, old_comment, old_user, old_user_text, - old_timestamp, old_minor_edit - FROM $old,$cur WHERE old_namespace=cur_namespace AND old_title=cur_title", - $fname ); - - $add = array(); - while( $row = $this->dbr->fetchObject( $result ) ) { - $add[] = array( - 'rev_id' => $row->old_id, - 'rev_page' => $row->cur_id, - 'rev_comment' => $this->conv( $row->old_comment ), - 'rev_user' => $row->old_user, - 'rev_user_text' => $this->conv( $row->old_user_text ), - 'rev_timestamp' => $row->old_timestamp, - 'rev_minor_edit' => $row->old_minor_edit ); - $this->addChunk( $add ); - } - $this->lastChunk( $add ); - $this->dbr->freeResult( $result ); - - - /** - * Copy page metadata from cur into page. - * We'll also do UTF-8 conversion of titles. - */ - $this->log( "......Setting up page table." ); - $this->setChunkScale( $chunksize, $maxcur, 'page', $fname ); - $result = $this->dbr->query( " - SELECT cur_id, cur_namespace, cur_title, cur_restrictions, cur_counter, cur_is_redirect, cur_is_new, - cur_random, cur_touched, rev_id, LENGTH(cur_text) AS len - FROM $cur,$revision - WHERE cur_id=rev_page AND rev_timestamp=cur_timestamp AND rev_id > {$maxold} - ORDER BY cur_id", $fname ); - $add = array(); - while( $row = $this->dbr->fetchObject( $result ) ) { - $add[] = array( - 'page_id' => $row->cur_id, - 'page_namespace' => $row->cur_namespace, - 'page_title' => $this->conv( $row->cur_title ), - 'page_restrictions' => $row->cur_restrictions, - 'page_counter' => $row->cur_counter, - 'page_is_redirect' => $row->cur_is_redirect, - 'page_is_new' => $row->cur_is_new, - 'page_random' => $row->cur_random, - 'page_touched' => $this->dbw->timestamp(), - 'page_latest' => $row->rev_id, - 'page_len' => $row->len ); - $this->addChunk( $add, $row->cur_id ); - } - $this->lastChunk( $add ); - $this->dbr->freeResult( $result ); - - $this->log( "......Renaming old." ); - $this->dbw->query( "ALTER TABLE $old RENAME TO $text", $fname ); - - $this->log( "...done." ); - } - - function upgradeLinks() { - $fname = 'FiveUpgrade::upgradeLinks'; - $chunksize = 200; - extract( $this->dbw->tableNames( 'links', 'brokenlinks', 'pagelinks', 'page' ) ); - - $this->log( 'Creating pagelinks table...' ); - $this->dbw->query( " -CREATE TABLE $pagelinks ( - -- Key to the page_id of the page containing the link. - pl_from int(8) unsigned NOT NULL default '0', - - -- Key to page_namespace/page_title of the target page. - -- The target page may or may not exist, and due to renames - -- and deletions may refer to different page records as time - -- goes by. - pl_namespace int NOT NULL default '0', - pl_title varchar(255) binary NOT NULL default '', - - UNIQUE KEY pl_from(pl_from,pl_namespace,pl_title), - KEY (pl_namespace,pl_title) - -) TYPE=InnoDB" ); - - $this->log( 'Importing live links -> pagelinks' ); - $nlinks = $this->dbw->selectField( 'links', 'count(*)', '', $fname ); - if( $nlinks ) { - $this->setChunkScale( $chunksize, $nlinks, 'pagelinks', $fname ); - $result = $this->dbr->query( " - SELECT l_from,page_namespace,page_title - FROM $links, $page - WHERE l_to=page_id", $fname ); - $add = array(); - while( $row = $this->dbr->fetchObject( $result ) ) { - $add[] = array( - 'pl_from' => $row->l_from, - 'pl_namespace' => $row->page_namespace, - 'pl_title' => $row->page_title ); - $this->addChunk( $add ); - } - $this->lastChunk( $add ); - } else { - $this->log( 'no links!' ); - } - - $this->log( 'Importing brokenlinks -> pagelinks' ); - $nbrokenlinks = $this->dbw->selectField( 'brokenlinks', 'count(*)', '', $fname ); - if( $nbrokenlinks ) { - $this->setChunkScale( $chunksize, $nbrokenlinks, 'pagelinks', $fname ); - $this->chunkOptions = array( 'IGNORE' ); - $result = $this->dbr->query( - "SELECT bl_from, bl_to FROM $brokenlinks", - $fname ); - $add = array(); - while( $row = $this->dbr->fetchObject( $result ) ) { - $pagename = $this->conv( $row->bl_to ); - $title = Title::newFromText( $pagename ); - if( is_null( $title ) ) { - $this->log( "** invalid brokenlink: $row->bl_from -> '$pagename' (converted from '$row->bl_to')" ); - } else { - $add[] = array( - 'pl_from' => $row->bl_from, - 'pl_namespace' => $title->getNamespace(), - 'pl_title' => $title->getDBkey() ); - $this->addChunk( $add ); - } - } - $this->lastChunk( $add ); - } else { - $this->log( 'no brokenlinks!' ); - } - - $this->log( 'Done with links.' ); - } - - function upgradeUser() { - $fname = 'FiveUpgrade::upgradeUser'; - $chunksize = 100; - $preauth = 0; - - // Apply unique index, if necessary: - $duper = new UserDupes( $this->dbw ); - if( $duper->hasUniqueIndex() ) { - $this->log( "Already have unique user_name index." ); - } else { - $this->log( "Clearing user duplicates..." ); - if( !$duper->clearDupes() ) { - $this->log( "WARNING: Duplicate user accounts, may explode!" ); - } - } - - /** Convert encoding on options, etc */ - extract( $this->dbw->tableNames( 'user', 'user_temp', 'user_old' ) ); - - $this->log( 'Migrating user table to user_temp...' ); - $this->dbw->query( "CREATE TABLE $user_temp ( - user_id int(5) unsigned NOT NULL auto_increment, - user_name varchar(255) binary NOT NULL default '', - user_real_name varchar(255) binary NOT NULL default '', - user_password tinyblob NOT NULL default '', - user_newpassword tinyblob NOT NULL default '', - user_email tinytext NOT NULL default '', - user_options blob NOT NULL default '', - user_touched char(14) binary NOT NULL default '', - user_token char(32) binary NOT NULL default '', - user_email_authenticated CHAR(14) BINARY, - user_email_token CHAR(32) BINARY, - user_email_token_expires CHAR(14) BINARY, - - PRIMARY KEY user_id (user_id), - UNIQUE INDEX user_name (user_name), - INDEX (user_email_token) - -) TYPE=InnoDB", $fname ); - - // Fix encoding for Latin-1 upgrades, and add some fields. - $numusers = $this->dbw->selectField( 'user', 'count(*)', '', $fname ); - $this->setChunkScale( $chunksize, $numusers, 'user_temp', $fname ); - $result = $this->dbr->select( 'user', - array( - 'user_id', - 'user_name', - 'user_real_name', - 'user_password', - 'user_newpassword', - 'user_email', - 'user_options', - 'user_touched', - 'user_token' ), - '', - $fname ); - $add = array(); - while( $row = $this->dbr->fetchObject( $result ) ) { - $now = $this->dbw->timestamp(); - $add[] = array( - 'user_id' => $row->user_id, - 'user_name' => $this->conv( $row->user_name ), - 'user_real_name' => $this->conv( $row->user_real_name ), - 'user_password' => $row->user_password, - 'user_newpassword' => $row->user_newpassword, - 'user_email' => $this->conv( $row->user_email ), - 'user_options' => $this->conv( $row->user_options ), - 'user_touched' => $now, - 'user_token' => $row->user_token, - 'user_email_authenticated' => $preauth ? $now : null, - 'user_email_token' => null, - 'user_email_token_expires' => null ); - $this->addChunk( $add ); - } - $this->lastChunk( $add ); - $this->dbr->freeResult( $result ); - - $this->log( 'Renaming user to user_old and user_temp to user...' ); - $this->dbw->query( "ALTER TABLE $user RENAME TO $user_old" ); - $this->dbw->query( "ALTER TABLE $user_temp RENAME TO $user" ); - } - - function upgradeImage() { - $fname = 'FiveUpgrade::upgradeImage'; - $chunksize = 100; - - extract( $this->dbw->tableNames( 'image', 'image_temp', 'image_old' ) ); - $this->log( 'Creating temporary image_temp to merge into...' ); - $this->dbw->query( <<dbw->selectField( 'image', 'count(*)', '', $fname ); - $result = $this->dbr->select( 'image', - array( - 'img_name', - 'img_size', - 'img_description', - 'img_user', - 'img_user_text', - 'img_timestamp' ), - '', - $fname ); - $add = array(); - $this->setChunkScale( $chunksize, $numimages, 'image_temp', $fname ); - while( $row = $this->dbr->fetchObject( $result ) ) { - // Fill in the new image info fields - $info = $this->imageInfo( $row->img_name ); - - // Update and convert encoding - $add[] = array( - 'img_name' => $this->conv( $row->img_name ), - 'img_size' => $row->img_size, - 'img_width' => $info['width'], - 'img_height' => $info['height'], - 'img_metadata' => "", // loaded on-demand - 'img_bits' => $info['bits'], - 'img_media_type' => $info['media'], - 'img_major_mime' => $info['major'], - 'img_minor_mime' => $info['minor'], - 'img_description' => $this->conv( $row->img_description ), - 'img_user' => $row->img_user, - 'img_user_text' => $this->conv( $row->img_user_text ), - 'img_timestamp' => $row->img_timestamp ); - - // If doing UTF8 conversion the file must be renamed - $this->renameFile( $row->img_name, 'wfImageDir' ); - } - $this->lastChunk( $add ); - - $this->log( 'Renaming image to image_old and image_temp to image...' ); - $this->dbw->query( "ALTER TABLE $image RENAME TO $image_old" ); - $this->dbw->query( "ALTER TABLE $image_temp RENAME TO $image" ); - - $this->log( 'done with image table.' ); - } - - function imageInfo( $name ) { - $filename = wfImageDir( $name ) . '/' . $name; - $info = array( - 'width' => 0, - 'height' => 0, - 'bits' => 0, - 'media' => '', - 'major' => '', - 'minor' => '' ); - - $magic =& wfGetMimeMagic(); - $mime = $magic->guessMimeType( $filename, true ); - list( $info['major'], $info['minor'] ) = explode( '/', $mime ); - - $info['media'] = $magic->getMediaType( $filename, $mime ); - - # Height and width - $gis = false; - if( $mime == 'image/svg' ) { - $gis = wfGetSVGsize( $this->imagePath ); - } elseif( $magic->isPHPImageType( $mime ) ) { - $gis = getimagesize( $filename ); - } else { - $this->log( "Surprising mime type: $mime" ); - } - if( $gis ) { - $info['width' ] = $gis[0]; - $info['height'] = $gis[1]; - } - if( isset( $gis['bits'] ) ) { - $info['bits'] = $gis['bits']; - } - - return $info; - } - - - /** - * Truncate a table. - * @param string $table The table name to be truncated - */ - function clearTable( $table ) { - print "Clearing $table...\n"; - $tableName = $this->db->tableName( $table ); - $this->db->query( 'TRUNCATE $tableName' ); - } - - /** - * Rename a given image or archived image file to the converted filename, - * leaving a symlink for URL compatibility. - * - * @param string $oldname pre-conversion filename - * @param callable $subdirCallback a function to generate hashed directories - * @access private - */ - function renameFile( $oldname, $subdirCallback ) { - $newname = $this->conv( $oldname ); - if( $newname == $oldname ) { - // No need to rename; another field triggered this row. - return; - } - - $oldpath = call_user_func( $subdirCallback, $oldname ) . '/' . $oldname; - $newpath = call_user_func( $subdirCallback, $newname ) . '/' . $newname; - - $this->log( "$oldpath -> $newpath" ); - if( rename( $oldpath, $newpath ) ) { - $relpath = $this->relativize( $newpath, dirname( $oldpath ) ); - if( !symlink( $relpath, $oldpath ) ) { - $this->log( "... symlink failed!" ); - } - } else { - $this->log( "... rename failed!" ); - } - } - - /** - * Generate a relative path name to the given file. - * Assumes Unix-style paths, separators, and semantics. - * - * @param string $path Absolute destination path including target filename - * @param string $from Absolute source path, directory only - * @return string - * @access private - * @static - */ - function relativize( $path, $from ) { - $pieces = explode( '/', dirname( $path ) ); - $against = explode( '/', $from ); - - // Trim off common prefix - while( count( $pieces ) && count( $against ) - && $pieces[0] == $against[0] ) { - array_shift( $pieces ); - array_shift( $against ); - } - - // relative dots to bump us to the parent - while( count( $against ) ) { - array_unshift( $pieces, '..' ); - array_shift( $against ); - } - - array_push( $pieces, basename( $path ) ); - - return implode( '/', $pieces ); - } - - -} +$step = isset( $options['step'] ) ? $options['step'] : null; +$upgrade->upgrade( $step ); -?> \ No newline at end of file +?>