Note incorrect docs in DefaultSettings.php

[lhc/web/wiklou.git] / maintenance / importUseModWiki.php

diff --git a/maintenance/importUseModWiki.php b/maintenance/importUseModWiki.php
index 778a2ef..05a4c78 100644 (file)
--- a/maintenance/importUseModWiki.php
+++ b/maintenance/importUseModWiki.php
@@ -22,12 +22,13 @@
  * 2005-03-14
  *
  * @todo document
- * @package MediaWiki
- * @subpackage Maintenance
+ * @file
+ * @ingroup Maintenance
  */
 
 if( php_sapi_name() != 'cli' ) {
-       die( "Please customize the settings and run me from the command line." );
+       echo "Please customize the settings and run me from the command line.";
+       die( -1 );
 }
 
 /** Set these correctly! */
@@ -45,7 +46,7 @@ $wgFieldSeparator = "\xb3"; # Some wikis may use different char
        $FS3 = $FS."3" ;
 
 # Unicode sanitization tools
-require_once( '../includes/normal/UtfNormal.php' );
+require_once( dirname( dirname( __FILE__ ) ) . '/includes/normal/UtfNormal.php' );
 
 $usercache = array();
 
@@ -89,6 +90,7 @@ function importPageDirectory( $dir, $prefix = "" )
        echo "\n<!-- Checking page directory " . xmlCommentSafe( $dir ) . " -->\n";
        $mydir = opendir( $dir );
        while( $entry = readdir( $mydir ) ) {
+               $m = array();
                if( preg_match( '/^(.+)\.db$/', $entry, $m ) ) {
                        echo importPage( $prefix . $m[1] );
                } else {
@@ -120,11 +122,12 @@ function useModFilename( $title ) {
 
 function fetchPage( $title )
 {
-       global $FS,$FS1,$FS2,$FS3, $wgRootDirectory;
+       global $FS1,$FS2,$FS3, $wgRootDirectory;
 
        $fname = $wgRootDirectory . "/page/" . useModFilename( $title ) . ".db";
        if( !file_exists( $fname ) ) {
-               die( "Couldn't open file '$fname' for page '$title'.\n" );
+               echo "Couldn't open file '$fname' for page '$title'.\n";
+               die( -1 );
        }
 
        $page = splitHash( $FS1, file_get_contents( $fname ) );
@@ -138,7 +141,7 @@ function fetchPage( $title )
 
 function fetchKeptPages( $title )
 {
-       global $FS,$FS1,$FS2,$FS3, $wgRootDirectory, $wgTimezoneCorrection;
+       global $FS1,$FS2,$FS3, $wgRootDirectory;
 
        $fname = $wgRootDirectory . "/keep/" . useModFilename( $title ) . ".kp";
        if( !file_exists( $fname ) ) return array();
@@ -233,13 +236,13 @@ END;
        # History
        $revisions = array_merge( $revisions, fetchKeptPages( $title ) );
        if(count( $revisions ) == 0 ) {
-               return $sql;
+               return NULL; // Was "$sql", which does not appear to be defined.
        }
 
        foreach( $revisions as $rev ) {
                $text      = xmlsafe( recodeText( $rev->text ) );
                $minor     = ($rev->minor ? '<minor/>' : '');
-               list( $userid, $username ) = checkUserCache( $rev->username, $rev->host );
+               list( /* $userid */ , $username ) = checkUserCache( $rev->username, $rev->host );
                $username  = xmlsafe( recodeText( $username ) );
                $timestamp = xmlsafe( timestamp2ISO8601( $rev->ts ) );
                $comment   = xmlsafe( recodeText( $rev->summary ) );
@@ -360,4 +363,4 @@ function nowikiPlaceholder( $matches ) {
        return placeholder();
 }
 
-?>
+