Moved iterator instancing + removed duplicate getPointer().

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/inc/classes/main/file_directories/binary/class_BaseBinaryFile.php b/inc/classes/main/file_directories/binary/class_BaseBinaryFile.php
index 230b4cbb1165ad3d0f806e176dbcde9fe84b95f6..77b18e8eed421c7e575ce73dc1581bb76df5869e 100644 (file)
--- a/inc/classes/main/file_directories/binary/class_BaseBinaryFile.php
+++ b/inc/classes/main/file_directories/binary/class_BaseBinaryFile.php
@@ -311,16 +311,6 @@ class BaseBinaryFile extends BaseFile {
                return $isFound;
        }
 
                return $isFound;
        }
 

-       /**
-        * Getter for the file pointer
-        *
-        * @return      $filePointer    The file pointer which shall be a valid file resource
-        * @throws      UnsupportedOperationException   If this method is called
-        */
-       public final function getPointer () {
-               throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
-       }
-

        /**
         * Initializes the back-buffer by setting it to an empty string.
         *
        /**
         * Initializes the back-buffer by setting it to an empty string.
         *

diff --git a/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php b/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php
index da220403458c081e6531ca4f7cc5a0b937c3efd5..7fe69cb80feabeb3a2ae6c606107f9c278976bc2 100644 (file)
--- a/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php
+++ b/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php
@@ -99,12 +99,12 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
                        }
                }
 
                        }
                }
 

-               // Get an iterator for the directory
-               $directoryInstance = new DirectoryIterator($pathName);
-

                // Create new instance
                $pointerInstance = new FrameworkDirectoryPointer();
 
                // Create new instance
                $pointerInstance = new FrameworkDirectoryPointer();
 

+               // Get an iterator for the directory
+               $directoryInstance = new DirectoryIterator($pathName);
+

                // Set directory pointer and path name
                $pointerInstance->setDirectoryInstance($directoryInstance);
                $pointerInstance->setPathName($pathName);
                // Set directory pointer and path name
                $pointerInstance->setDirectoryInstance($directoryInstance);
                $pointerInstance->setPathName($pathName);

diff --git a/inc/classes/main/file_directories/text/input/.htaccess b/inc/classes/main/file_directories/text/input/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/inc/classes/main/file_directories/text/input/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/inc/classes/main/file_directories/text/output/.htaccess b/inc/classes/main/file_directories/text/output/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/inc/classes/main/file_directories/text/output/.htaccess
@@ -0,0 +1 @@
+Deny from all