(bug 18122) Fix fatal require() errors and typo in the README.

[lhc/web/wiklou.git] / maintenance / importLogs.inc

diff --git a/maintenance/importLogs.inc b/maintenance/importLogs.inc
index 948c686..a008e6c 100644 (file)
--- a/maintenance/importLogs.inc
+++ b/maintenance/importLogs.inc
@@ -1,41 +1,52 @@
 <?php
 # Copyright (C) 2004 Brion Vibber <brion@pobox.com>
 # 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.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
-# Attempt to import existing log pages into the log tables.
-
-# Not yet complete.
+/**
+ * Attempt to import existing log pages into the log tables.
+ *
+ * Not yet complete.
+ *
+ * @file
+ * @todo document
+ * @ingroup Maintenance
+ */
 
+/** */
 require_once( 'GlobalFunctions.php' );
 require_once( 'Database.php' );
 require_once( 'Article.php' );
 require_once( 'LogPage.php' );
 
-# Log importer
+/**
+ * Log importer
+ * @todo document
+ * @ingroup Maintenance
+ */
 class LogImporter {
        var $dummy = false;
-       
+
        function LogImporter( $type ) {
                $this->type = $type;
-               $this->db =& wfGetDB( DB_MASTER );
+               $this->db = wfGetDB( DB_MASTER );
                $this->actions = $this->setupActions();
        }
-       
+
        function setupActions() {
                $actions = array();
                foreach( LogPage::validActions( $this->type ) as $action ) {
@@ -44,11 +55,11 @@ class LogImporter {
                }
                return $actions;
        }
-       
+
        function makeLineRegexp( $type, $action ) {
                $linkRegexp = '(?:\[\[)?([^|\]]+?)(?:\|[^\]]+?)?(?:\]\])?';
                $linkRegexp2 = '\[\[([^|\]]+?)(?:\|[^\]]+?)?\]\]';
-               
+
                $text = LogPage::actionText( $type, $action );
                $text = preg_quote( $text, '/' );
                $text = str_replace( '\$1', $linkRegexp, $text );
@@ -57,7 +68,7 @@ class LogImporter {
                $text = "/$text/";
                return $text;
        }
-       
+
        function importText( $text ) {
                if( $this->dummy ) {
                        print $text;
@@ -65,17 +76,19 @@ class LogImporter {
                }
                $lines = explode( '<li>', $text );
                foreach( $lines as $line ) {
+                       $matches = array();
                        if( preg_match( '!^(.*)</li>!', $line, $matches ) ) {
                                $this->importLine( $matches[1] );
                        }
                }
        }
-       
+
        function fixDate( $date ) {
                # Yuck! Parsing multilingual date formats??!!!!???!!??!
                # 01:55, 23 Aug 2004 - won't take in strtotimr
                # "Aug 23 2004 01:55" - seems ok
                # TODO: multilingual attempt to extract from the data in Language
+               $matches = array();
                if( preg_match( '/^(\d+:\d+(?::\d+)?), (.*)$/', $date, $matches ) ) {
                        $date = $matches[2] . ' ' . $matches[1];
                }
@@ -84,9 +97,10 @@ class LogImporter {
                $timestamp = wfTimestamp( TS_MW, $n );
                return $timestamp;
        }
-       
+
        function importLine( $line ) {
                foreach( $this->actions as $action => $regexp ) {
+                       $matches = array();
                        if( preg_match( $regexp, $line, $matches ) ) {
                                if( $this->dummy ) {
                                        #var_dump( $matches );
@@ -99,12 +113,12 @@ class LogImporter {
                                } else {
                                        $comment = '';
                                }
-                               
+
                                $insert = array(
                                        'log_type' => $this->type,
                                        'log_action' => preg_replace( '!^.*/!', '', $action ),
                                        'log_timestamp' => $date,
-                                       'log_user' => IntVal( User::idFromName( $user->getText() ) ),
+                                       'log_user' => intval( User::idFromName( $user->getText() ) ),
                                        'log_namespace' => $target->getNamespace(),
                                        'log_title' => $target->getDBkey(),
                                        'log_comment' => wfUnescapeWikiText( $comment ),
@@ -113,7 +127,7 @@ class LogImporter {
                                        var_dump( $insert );
                                } else {
                                        # FIXME: avoid duplicates!
-                                       $this->db->insertArray( 'logging', $insert );
+                                       $this->db->insert( 'logging', $insert );
                                }
                                break;
                        }
@@ -122,11 +136,9 @@ class LogImporter {
 }
 
 function wfUnescapeWikiText( $text ) {
-       $text = str_replace( 
+       $text = str_replace(
                array( '&#91;', '&#124;', '&#39;', 'ISBN&#32;', '&#58;//' , "\n&#61;", '&#123;&#123;' ),
                array( '[',             '|',      "'",     'ISBN '        , '://'         , "\n=", '{{' ),
                $text );
        return $text;
 }
-
-?>
\ No newline at end of file