X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FimportSiteScripts.php;h=e60e776328badaa64b6eb07a75cbcd33d1d1f29d;hb=7f3483e51495a9fc8b2dbfc95b02afbb9b9f5bc9;hp=7705ec9cabd41c2c721d80a9da9acdbdcc76679d;hpb=c0cdf0e91186728c8e283bbcc977d6831f4b93d1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importSiteScripts.php b/maintenance/importSiteScripts.php
index 7705ec9cab..e60e776328 100644
--- a/maintenance/importSiteScripts.php
+++ b/maintenance/importSiteScripts.php
@@ -32,7 +32,7 @@ require_once __DIR__ . '/Maintenance.php';
 class ImportSiteScripts extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = 'Import site scripts from a site';
+		$this->addDescription( 'Import site scripts from a site' );
 		$this->addArg( 'api', 'API base url' );
 		$this->addArg( 'index', 'index.php base url' );
 		$this->addOption( 'username', 'User name of the script importer' );
@@ -41,7 +41,12 @@ class ImportSiteScripts extends Maintenance {
 	public function execute() {
 		global $wgUser;
 
-		$user = User::newFromName( $this->getOption( 'username', 'ScriptImporter' ) );
+		$username = $this->getOption( 'username', false );
+		if ( $username === false ) {
+			$user = User::newSystemUser( 'ScriptImporter', [ 'steal' => true ] );
+		} else {
+			$user = User::newFromName( $username );
+		}
 		$wgUser = $user;
 
 		$baseUrl = $this->getArg( 1 );
@@ -56,10 +61,10 @@ class ImportSiteScripts extends Maintenance {
 			}
 
 			$this->output( "Importing $page\n" );
-			$url = wfAppendQuery( $baseUrl, array(
+			$url = wfAppendQuery( $baseUrl, [
 				'action' => 'raw',
-				'title' => "MediaWiki:{$page}" ) );
-			$text = Http::get( $url );
+				'title' => "MediaWiki:{$page}" ] );
+			$text = Http::get( $url, [], __METHOD__ );
 
 			$wikiPage = WikiPage::factory( $title );
 			$content = ContentHandler::makeContent( $text, $wikiPage->getTitle() );
@@ -68,39 +73,46 @@ class ImportSiteScripts extends Maintenance {
 	}
 
 	protected function fetchScriptList() {
-		$data = array(
+		$data = [
 			'action' => 'query',
-			'format' => 'php', //'json',
+			'format' => 'json',
 			'list' => 'allpages',
 			'apnamespace' => '8',
 			'aplimit' => '500',
-		);
+			'continue' => '',
+		];
 		$baseUrl = $this->getArg( 0 );
-		$pages = array();
+		$pages = [];
 
-		do {
+		while ( true ) {
 			$url = wfAppendQuery( $baseUrl, $data );
-			$strResult = Http::get( $url );
-			//$result = FormatJson::decode( $strResult ); // Still broken
-			$result = unserialize( $strResult );
+			$strResult = Http::get( $url, [], __METHOD__ );
+			$result = FormatJson::decode( $strResult, true );
 
-			if ( !empty( $result['query']['allpages'] ) ) {
-				foreach ( $result['query']['allpages'] as $page ) {
-					if ( substr( $page['title'], -3 ) === '.js' ) {
-						strtok( $page['title'], ':' );
-						$pages[] = strtok( '' );
-					}
+			$page = null;
+			foreach ( $result['query']['allpages'] as $page ) {
+				if ( substr( $page['title'], -3 ) === '.js' ) {
+					strtok( $page['title'], ':' );
+					$pages[] = strtok( '' );
 				}
 			}
-			if ( !empty( $result['query-continue'] ) ) {
-				$data['apfrom'] = $result['query-continue']['allpages']['apfrom'];
-				$this->output( "Fetching new batch from {$data['apfrom']}\n" );
+
+			if ( $page !== null ) {
+				$this->output( "Fetched list up to {$page['title']}\n" );
 			}
-		} while ( isset( $result['query-continue'] ) );
+
+			if ( isset( $result['continue'] ) ) { // >= 1.21
+				$data = array_replace( $data, $result['continue'] );
+			} elseif ( isset( $result['query-continue']['allpages'] ) ) { // <= 1.20
+				$data = array_replace( $data, $result['query-continue']['allpages'] );
+			} else {
+				break;
+			}
+		}
 
 		return $pages;
 	}
 }
 
-$maintClass = 'ImportSiteScripts';
+$maintClass = ImportSiteScripts::class;
 require_once RUN_MAINTENANCE_IF_MAIN;