X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2F7zip.inc;h=9c1093becb5a082f9a92610eae3bab87cbee1eb4;hb=74d04edec385aa86ee01943b9a27475d79f74e78;hp=049bbf1bc0f23b67173ae6c47f01f9dd7d3310de;hpb=066984cbe3ccac2d54bcb2097f345836cd1a8141;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/7zip.inc b/maintenance/7zip.inc
index 049bbf1bc0..9c1093becb 100644
--- a/maintenance/7zip.inc
+++ b/maintenance/7zip.inc
@@ -2,6 +2,24 @@
 /**
  * 7z stream wrapper
  *
+ * Copyright © 2005 Brion Vibber <brion@pobox.com>
+ * https://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
+ * (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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup Maintenance
  */
@@ -14,13 +32,14 @@
  * @ingroup Maintenance
  */
 class SevenZipStream {
-	var $stream;
-	
+	protected $stream;
+
 	private function stripPath( $path ) {
 		$prefix = 'mediawiki.compress.7z://';
+
 		return substr( $path, strlen( $prefix ) );
 	}
-	
+
 	function stream_open( $path, $mode, $options, &$opened_path ) {
 		if ( $mode[0] == 'r' ) {
 			$options = 'e -bd -so';
@@ -35,42 +54,43 @@ class SevenZipStream {
 			// Suppress the stupid messages on stderr
 			$command .= ' 2>/dev/null';
 		}
-		$this->stream = popen( $command, $mode );
+		$this->stream = popen( $command, $mode[0] ); // popen() doesn't like two-letter modes
 		return ( $this->stream !== false );
 	}
-	
+
 	function url_stat( $path, $flags ) {
 		return stat( $this->stripPath( $path ) );
 	}
-	
+
 	// This is all so lame; there should be a default class we can extend
 
 	function stream_close() {
 		return fclose( $this->stream );
 	}
-	
+
 	function stream_flush() {
 		return fflush( $this->stream );
 	}
-	
+
 	function stream_read( $count ) {
 		return fread( $this->stream, $count );
 	}
-	
+
 	function stream_write( $data ) {
 		return fwrite( $this->stream, $data );
 	}
-	
+
 	function stream_tell() {
 		return ftell( $this->stream );
 	}
-	
+
 	function stream_eof() {
 		return feof( $this->stream );
 	}
-	
+
 	function stream_seek( $offset, $whence ) {
 		return fseek( $this->stream, $offset, $whence );
 	}
 }
-stream_wrapper_register( 'mediawiki.compress.7z', 'SevenZipStream' );
\ No newline at end of file
+
+stream_wrapper_register( 'mediawiki.compress.7z', SevenZipStream::class );