Some cleanups, more usage of ObjectFactory:

[core.git] / inc / classes / middleware / compressor / class_CompressorChannel.php

diff --git a/inc/classes/middleware/compressor/class_CompressorChannel.php b/inc/classes/middleware/compressor/class_CompressorChannel.php
index 71ea35776349cf29beb369d2715bb7b953a8a9ab..0aa8205bae87b861829914996c346062639a8e69 100644 (file)
--- a/inc/classes/middleware/compressor/class_CompressorChannel.php
+++ b/inc/classes/middleware/compressor/class_CompressorChannel.php
@@ -25,7 +25,7 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
        /**
         * Real compressor instance
         */
-       private $compressor = null;
+       private $compressor = NULL;
 
        /**
         * Protected constructor
@@ -38,40 +38,43 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
        }
 
        /**
-        * Create a new compressor channel based a given base directory where
-        * we shall look for compressor classes
+        * Create a new compressor channel.
         *
-        * @param       $baseDir        Directory which holds our compressor classes
-        * @return      $cInstance      A prepared instance of this class
+        * @return      $compressorInstance             A prepared instance of this class
         */
-       public static final function createCompressorChannel ($baseDir) {
+       public static final function createCompressorChannel () {
                // Get new instance
-               $cInstance = new CompressorChannel();
+               $compressorInstance = new CompressorChannel();
 
                // Is the compressor handler set?
                if (
-                          (is_null($cInstance->getCompressor()))
-                       || (!is_object($cInstance->getCompressor()))
-                       || (!method_exists($cInstance->getCompressor(), 'compressStream'))
-                       || (!method_exists($cInstance->getCompressor(), 'decompressStream'))
+                          (is_null($compressorInstance->getCompressor()))
+                       || (!is_object($compressorInstance->getCompressor()))
+                       || (!method_exists($compressorInstance->getCompressor(), 'compressStream'))
+                       || (!method_exists($compressorInstance->getCompressor(), 'decompressStream'))
                ) {
+                       // Init base directory
+                       $baseDir =
+                               $compressorInstance->getConfigInstance()->getConfigEntry('base_path') .
+                               $compressorInstance->getConfigInstance()->getConfigEntry('compressor_base_path');
+
                        // Get a directory pointer
                        $dirPointer = FrameworkDirectoryPointer::createFrameworkDirectoryPointer($baseDir);
 
                        // Read all directories but no sub directories
-                       while ($dir = $dirPointer->readDirectoryExcept(array('..', '.', '.htaccess', '.svn'))) {
+                       while ($directoryEntry = $dirPointer->readDirectoryExcept(array('..', '.', '.htaccess', '.svn'))) {
                                // Is this a class file?
-                               if ((substr($dir, 0, 6) == 'class_') && (substr($dir, -4, 4) == '.php')) {
+                               if ((substr($directoryEntry, 0, 6) == 'class_') && (substr($directoryEntry, -4, 4) == '.php')) {
                                        // Get the compressor's name. That's why you must name
                                        // your files like your classes and also that's why you
                                        // must keep on class in one file.
-                                       $className = substr($dir, 6, -4);
+                                       $className = substr($directoryEntry, 6, -4);
 
                                        // Get an instance from our object factory
                                        $tempInstance = ObjectFactory::createObjectByName($className);
 
                                        // Set the compressor
-                                       $cInstance->setCompressor($tempInstance);
+                                       $compressorInstance->setCompressor($tempInstance);
 
                                        // No more searches required because we have found a valid compressor stream
                                        break;
@@ -84,17 +87,17 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
 
                // Check again if there is a compressor
                if (
-                          (is_null($cInstance->getCompressor()))
-                       || (!is_object($cInstance->getCompressor()))
-                       || (!method_exists($cInstance->getCompressor(), 'compressStream'))
-                       || (!method_exists($cInstance->getCompressor(), 'decompressStream'))
+                          (is_null($compressorInstance->getCompressor()))
+                       || (!is_object($compressorInstance->getCompressor()))
+                       || (!method_exists($compressorInstance->getCompressor(), 'compressStream'))
+                       || (!method_exists($compressorInstance->getCompressor(), 'decompressStream'))
                ) {
                        // Set the null compressor handler. This should not be configureable!
-                       $cInstance->setCompressor(ObjectFactory::createObjectByName('NullCompressor'));
+                       $compressorInstance->setCompressor(ObjectFactory::createObjectByName('NullCompressor'));
                } // END - if
 
                // Return the compressor instance
-               return $cInstance;
+               return $compressorInstance;
        }
 
        /**
@@ -112,7 +115,7 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
         * @param               $compressorInstance     The compressor instance we shall use
         * @return      void
         */
-       public final function setCompressor (Compressor $compressorInstance = null) {
+       public final function setCompressor (Compressor $compressorInstance = NULL) {
                $this->compressor = $compressorInstance;
        }