Several rewrites/fixes which I have done yesterday but not commited, mxchange_die...

[mailer.git] / inc / inc-functions.php

diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index 22fd177bdf1b9bae6ee098626e1441581a10becc..14d1ab2639bca141418771554e944c97e7da72e9 100644 (file)
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktionen fuer Include-Dateien        *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktionen fuer Include-Dateien        *
  * -------------------------------------------------------------------- *

- * $Revision:: 905                                                    $ *
+ * $Revision:: 999                                                    $ *

  * $Date:: 2009-03-10 17:24:54 +0100 (Tue, 10 Mar 2009)               $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author:: quix0r                                                   $ *
  * $Date:: 2009-03-10 17:24:54 +0100 (Tue, 10 Mar 2009)               $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author:: quix0r                                                   $ *


@@ -56,20 +56,35 @@ function IS_INC_WRITEABLE ($inc) {
 }
 
 // Reads a directory with PHP files in and gets only files back
 }
 
 // Reads a directory with PHP files in and gets only files back

-function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir = true) {
+function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir = true, $excludePattern = '@(\.|\.\.)$@') {

        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix} - Entered!");
        // Init includes
        $INCs = array();
 
        // Open directory
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix} - Entered!");
        // Init includes
        $INCs = array();
 
        // Open directory

-       $dirPointer = opendir(constant('PATH') . $baseDir) or mxchange_die("Cannot read ".basename($baseDir)." path!");
+       $dirPointer = opendir(constant('PATH') . $baseDir) or app_die(__FUNCTION__, __LINE__, "Cannot read ".basename($baseDir)." path!");

 
        // Read all entries
        while ($baseFile = readdir($dirPointer)) {
 
        // Read all entries
        while ($baseFile = readdir($dirPointer)) {

+               // Steps over this returned $baseFile-Name, when it matches the $excludePattern
+               if (preg_match($excludePattern, $baseFile, $match)) {
+                       // These Lines are only for debugging!!
+                   //$INC = $baseDir . "/" . $baseFile;
+                       //$FQFN = constant('PATH') . $INC;
+                       //echo '<pre>$baseDir:'.print_r($baseDir, true).'</pre>';
+                       //echo '<pre>$baseDir:'.print_r(constant('PATH') . $baseDir, true).'</pre>';
+                       //echo '<pre>constant(\'PATH\'):'.print_r(constant('PATH'), true).'</pre>';
+                       //echo '<pre>$FQFN:'.print_r($FQFN, true).'</pre>';
+                       break;
+               } // END - if
+

                // Construct include filename and FQFN
                $INC = $baseDir . "/" . $baseFile;
                $FQFN = constant('PATH') . $INC;
 
                // Construct include filename and FQFN
                $INC = $baseDir . "/" . $baseFile;
                $FQFN = constant('PATH') . $INC;
 

+               // repalecment of // to / is needed, whenn $baseDir is an emty String
+               $FQFN = str_replace('//', '/', $FQFN);
+

                // Is this a valid reset file?
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}");
                if (((FILE_READABLE($FQFN)) && (substr($baseFile, 0, strlen($prefix)) == $prefix) && (substr($baseFile, -4, 4) == ".php")) || (($includeDirs) && (isDirectory($FQFN)))) {
                // Is this a valid reset file?
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}");
                if (((FILE_READABLE($FQFN)) && (substr($baseFile, 0, strlen($prefix)) == $prefix) && (substr($baseFile, -4, 4) == ".php")) || (($includeDirs) && (isDirectory($FQFN)))) {