X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fcompressor%2Fclass_GzipCompressor.php;h=afd0285b8a517012f7c3fd875c57b6672ec50785;hb=f6d7ac281cc0638e95994a82fd408dacaa5cc459;hp=85df0d987c926b44d85b881380d92a55c8369e2a;hpb=84e2207412d3c6ea9f940a83b2cdd4503509808a;p=core.git diff --git a/inc/classes/main/compressor/class_GzipCompressor.php b/inc/classes/main/compressor/class_GzipCompressor.php index 85df0d98..afd0285b 100644 --- a/inc/classes/main/compressor/class_GzipCompressor.php +++ b/inc/classes/main/compressor/class_GzipCompressor.php @@ -4,7 +4,7 @@ * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -33,56 +33,56 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor { } /** - * Create a new compressor channel based a given compression handler + * Create a new compressor channel based a given compression handler or NULL if the required PHP functions are not found. * - * @return $cInstance An instance of this class + * @return $compressorInstance An instance of this class or NULL if the required PHP functions are not found. */ - public final static function createGzipCompressor () { + public static final function createGzipCompressor () { + // Routines not found by default + $compressorInstance = NULL; + // Get new instance - if ((function_exists('gzcompress')) && (function_exists('gzuncompress'))) { + if ((function_exists('gzencode')) && (function_exists('gzdecode'))) { // Compressor can maybe be used - $cInstance = new GzipCompressor(); - } else { - // Routines not found! - $cInstance = null; - } + $compressorInstance = new GzipCompressor(); + } // END - if // Return the compressor instance - return $cInstance; + return $compressorInstance; } /** * GZIP compression stream * * @param $streamData Mixed non-object stream data - * @return $streamData The compressed stream data + * @return $streamData The compressed stream data * @throws InvalidObjectException If the stream is an object */ public function compressStream ($streamData) { if (is_object($streamData)) { // Throw an exception throw new InvalidObjectException($streamData, self::EXCEPTION_UNEXPECTED_OBJECT); - } + } // END - if // Return the compressed stream - return gzcompress($streamData, 1); + return gzencode($streamData, 1); } /** * GZIP decompression stream * * @param $streamData Mixed non-object stream data - * @return $streamData The decompressed stream data + * @return $streamData The decompressed stream data * @throws InvalidObjectException If the stream is an object */ public function decompressStream ($streamData) { if (is_object($streamData)) { // Throw an exception throw new InvalidObjectException($streamData, self::EXCEPTION_UNEXPECTED_OBJECT); - } + } // END - if // Return the decompressed stream - return gzuncompress($streamData); + return gzdecode($streamData); } /**