X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finc-functions.php;h=a001ed06a1afa49456b66c25419dfb726a3adae7;hp=22fd177bdf1b9bae6ee098626e1441581a10becc;hb=885637e9f61f315ba051500061ec193ebc937f7b;hpb=e53891f4375882eba23d10df70d92bff167677a9

diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index 22fd177bdf..a001ed06a1 100644
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * 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                                                   $ *
@@ -35,19 +35,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
+
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Check if our config file is writeable or not
-function IS_INC_WRITEABLE ($inc) {
+function isIncludeWriteable ($inc) {
 	// Generate FQFN
 	$FQFN = sprintf("%sinc/%s.php", constant('PATH'), $inc);
 
 	// Abort by simple test
-	if ((FILE_READABLE($FQFN)) && (!is_writeable($FQFN))) {
+	if ((isFileReadable($FQFN)) && (!is_writeable($FQFN))) {
 		return false;
 	} // END - if
 
@@ -56,23 +57,38 @@ function IS_INC_WRITEABLE ($inc) {
 }
 
 // Reads a directory with PHP files in and gets only files back
-function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir = true) {
+function getArrayFromDirectory ($baseDir, $prefix, $includeDirs = false, $addBaseDir = true, $excludePattern = '@(\.|\.\.)$@') {
 	//* 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)) {
+		// 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>';
+			continue;
+		} // END - if
+
 		// Construct include filename and FQFN
-		$INC = $baseDir . "/" . $baseFile;
+		$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)))) {
+		if (((isFileReadable($FQFN)) && (substr($baseFile, 0, strlen($prefix)) == $prefix) && (substr($baseFile, -4, 4) == '.php')) || (($includeDirs) && (isDirectory($FQFN)))) {
 			// Remove both for extension name
 			$extName = substr($baseFile, strlen($prefix), -4);