Rewritten static 'create' method in all compressors, some code-cleanup

[core.git] / inc / classes / main / compressor / class_GzipCompressor.php

diff --git a/inc/classes/main/compressor/class_GzipCompressor.php b/inc/classes/main/compressor/class_GzipCompressor.php
index 87894bd82ce87fa7c0be9911721f9e07c8144c01..f69f4260ea9a74756ed880ccbbb9a437c555defb 100644 (file)
--- a/inc/classes/main/compressor/class_GzipCompressor.php
+++ b/inc/classes/main/compressor/class_GzipCompressor.php
@@ -35,20 +35,20 @@ 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
         *

-        * @return      $cInstance      An instance of this class
+        * @return      $compressorInstance             An instance of this class

         */
        public static final function createGzipCompressor () {
         */
        public static final function createGzipCompressor () {

+               // Routines not found by default
+               $compressorInstance = null;
+

                // Get new instance
                if ((function_exists('gzcompress')) && (function_exists('gzuncompress'))) {
                        // Compressor can maybe be used
                // Get new instance
                if ((function_exists('gzcompress')) && (function_exists('gzuncompress'))) {
                        // Compressor can maybe be used

-                       $cInstance = new GzipCompressor();
-               } else {
-                       // Routines not found!
-                       $cInstance = null;
-               }
+                       $compressorInstance = new GzipCompressor();
+               } // END - if

 
                // Return the compressor instance
 
                // Return the compressor instance

-               return $cInstance;
+               return $compressorInstance;

        }
 
        /**
        }
 
        /**


@@ -62,7 +62,7 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor {
                if (is_object($streamData)) {
                        // Throw an exception
                        throw new InvalidObjectException($streamData, self::EXCEPTION_UNEXPECTED_OBJECT);
                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 the compressed stream
                return gzcompress($streamData, 1);


@@ -79,7 +79,7 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor {
                if (is_object($streamData)) {
                        // Throw an exception
                        throw new InvalidObjectException($streamData, self::EXCEPTION_UNEXPECTED_OBJECT);
                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 the decompressed stream
                return gzuncompress($streamData);