X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f:/wp-includes/pomo/mo.php

diff --git a/wp-includes/pomo/mo.php b/wp-includes/pomo/mo.php
index 9b2ac1d0..407c5a83 100644
--- a/wp-includes/pomo/mo.php
+++ b/wp-includes/pomo/mo.php
@@ -2,7 +2,7 @@
 /**
  * Class for working with MO files
  *
- * @version $Id: mo.php 293 2009-11-12 15:43:50Z nbachiyski $
+ * @version $Id: mo.php 718 2012-10-31 00:32:02Z nbachiyski $
  * @package pomo
  * @subpackage mo
  */
@@ -26,11 +26,37 @@ class MO extends Gettext_Translations {
 			return false;
 		return $this->import_from_reader($reader);
 	}
-	
+
 	function export_to_file($filename) {
 		$fh = fopen($filename, 'wb');
 		if ( !$fh ) return false;
-		$entries = array_filter($this->entries, create_function('$e', 'return !empty($e->translations);'));
+		$res = $this->export_to_file_handle( $fh );
+		fclose($fh);
+		return $res;
+	}
+
+	function export() {
+		$tmp_fh = fopen("php://temp", 'r+');
+		if ( !$tmp_fh ) return false;
+		$this->export_to_file_handle( $tmp_fh );
+		rewind( $tmp_fh );
+		return stream_get_contents( $tmp_fh );
+	}
+
+	function is_entry_good_for_export( $entry ) {
+		if ( empty( $entry->translations ) ) {
+			return false;
+		}
+
+		if ( !array_filter( $entry->translations ) ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	function export_to_file_handle($fh) {
+		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
 		ksort($entries);
 		$magic = 0x950412de;
 		$revision = 0;
@@ -43,36 +69,38 @@ class MO extends Gettext_Translations {
 		fwrite($fh, pack('V*', $magic, $revision, $total, $originals_lenghts_addr,
 			$translations_lenghts_addr, $size_of_hash, $hash_addr));
 		fseek($fh, $originals_lenghts_addr);
-		
+
 		// headers' msgid is an empty string
 		fwrite($fh, pack('VV', 0, $current_addr));
 		$current_addr++;
 		$originals_table = chr(0);
 
+		$reader = new POMO_Reader();
+
 		foreach($entries as $entry) {
 			$originals_table .= $this->export_original($entry) . chr(0);
-			$length = strlen($this->export_original($entry));
+			$length = $reader->strlen($this->export_original($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1; // account for the NULL byte after
 		}
-		
+
 		$exported_headers = $this->export_headers();
-		fwrite($fh, pack('VV', strlen($exported_headers), $current_addr));
+		fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));
 		$current_addr += strlen($exported_headers) + 1;
 		$translations_table = $exported_headers . chr(0);
-		
+
 		foreach($entries as $entry) {
 			$translations_table .= $this->export_translations($entry) . chr(0);
-			$length = strlen($this->export_translations($entry));
+			$length = $reader->strlen($this->export_translations($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1;
 		}
-		
+
 		fwrite($fh, $originals_table);
 		fwrite($fh, $translations_table);
-		fclose($fh);
+		return true;
 	}
-	
+
 	function export_original($entry) {
 		//TODO: warnings for control characters
 		$exported = $entry->singular;
@@ -80,12 +108,12 @@ class MO extends Gettext_Translations {
 		if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
 		return $exported;
 	}
-	
+
 	function export_translations($entry) {
 		//TODO: warnings for control characters
 		return implode(chr(0), $entry->translations);
 	}
-	
+
 	function export_headers() {
 		$exported = '';
 		foreach($this->headers as $header => $value) {
@@ -129,46 +157,49 @@ class MO extends Gettext_Translations {
 		if (!is_array($header))
 			return false;
 
-		extract( $header );
-
 		// support revision 0 of MO format specs, only
-		if ($revision != 0)
+		if ( $header['revision'] != 0 ) {
 			return false;
+		}
 
 		// seek to data blocks
-		$reader->seekto($originals_lenghts_addr);
+		$reader->seekto( $header['originals_lenghts_addr'] );
 
 		// read originals' indices
-		$originals_lengths_length = $translations_lenghts_addr - $originals_lenghts_addr;
-		if ( $originals_lengths_length != $total * 8 )
+		$originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
+		if ( $originals_lengths_length != $header['total'] * 8 ) {
 			return false;
+		}
 
 		$originals = $reader->read($originals_lengths_length);
-		if ( $reader->strlen( $originals ) != $originals_lengths_length )
+		if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
 			return false;
+		}
 
 		// read translations' indices
-		$translations_lenghts_length = $hash_addr - $translations_lenghts_addr;
-		if ( $translations_lenghts_length != $total * 8 )
+		$translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
+		if ( $translations_lenghts_length != $header['total'] * 8 ) {
 			return false;
+		}
 
 		$translations = $reader->read($translations_lenghts_length);
-		if ( $reader->strlen( $translations ) != $translations_lenghts_length )
+		if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
 			return false;
+		}
 
 		// transform raw data into set of indices
 		$originals    = $reader->str_split( $originals, 8 );
 		$translations = $reader->str_split( $translations, 8 );
 
 		// skip hash table
-		$strings_addr = $hash_addr + $hash_length * 4;
+		$strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
 
 		$reader->seekto($strings_addr);
 
 		$strings = $reader->read_all();
 		$reader->close();
 
-		for ( $i = 0; $i < $total; $i++ ) {
+		for ( $i = 0; $i < $header['total']; $i++ ) {
 			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
 			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
 			if ( !$o || !$t ) return false;
@@ -193,7 +224,7 @@ class MO extends Gettext_Translations {
 	/**
 	 * Build a Translation_Entry from original string and translation strings,
 	 * found in a MO file
-	 * 
+	 *
 	 * @static
 	 * @param string $original original string to translate from MO file. Might contain
 	 * 	0x04 as context separator or 0x00 as singular/plural separator
@@ -201,7 +232,7 @@ class MO extends Gettext_Translations {
 	 * 	0x00 as a plural translations separator
 	 */
 	function &make_entry($original, $translation) {
-		$entry = & new Translation_Entry();
+		$entry = new Translation_Entry();
 		// look for context
 		$parts = explode(chr(4), $original);
 		if (isset($parts[1])) {