Extension ext-repair extended, outdated calls DEBUG_LOG() fixed:

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 77065f95dc90447e82733d57730b0d116ef105ad..3377256d43afc0d8fc52306dd88656375b61d103 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3309,7 +3309,7 @@ function generateExtensionInactiveNotInstalledMessage ($ext_name) {
 // Reads a directory recursively by default and searches for files not matching
 // an exclusion pattern. You can now keep the exclusion pattern empty for reading
 // a whole directory.
 // Reads a directory recursively by default and searches for files not matching
 // an exclusion pattern. You can now keep the exclusion pattern empty for reading
 // a whole directory.

-function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $addBaseDir = true, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = true) {
+function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $addBaseDir = true, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = true, $suffix = '') {

        // Add default entries we should exclude
        $excludeArray[] = '.';
        $excludeArray[] = '..';
        // Add default entries we should exclude
        $excludeArray[] = '.';
        $excludeArray[] = '..';


@@ -3361,6 +3361,10 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
                        // Skip this file
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid prefix in file " . $baseFile . ", prefix=" . $prefix);
                        continue;
                        // Skip this file
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid prefix in file " . $baseFile . ", prefix=" . $prefix);
                        continue;

+               } elseif ((!empty($suffix)) && (substr($baseFile, -(strlen($suffix . $extension)), (strlen($suffix . $extension))) != $suffix . $extension)) {
+                       // Skip wrong suffix as well
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid suffix in file " . $baseFile . ", suffix=" . $suffix);
+                       continue;

                } elseif (!isFileReadable($FQFN)) {
                        // Not readable so skip it
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "File " . $FQFN . " is not readable!");
                } elseif (!isFileReadable($FQFN)) {
                        // Not readable so skip it
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "File " . $FQFN . " is not readable!");


@@ -3403,7 +3407,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
        closedir($dirPointer);
 
        // Sort array
        closedir($dirPointer);
 
        // Sort array

-       asort($files);
+       sort($files);

 
        // Return array with include files
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
 
        // Return array with include files
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');