X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finc-functions.php;h=ed3dba2a7cf42d9f57ebc3b658d60889be1a7c5f;hb=9a0bf5916f744dffd4123f7b629e3de7dbb4c33b;hp=e5965bb874812f163e0bea20355d013908e03de2;hpb=2f0357c7ac9da6c17d361b8e7cb0b1ad09eb85f6;p=mailer.git

diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index e5965bb874..ed3dba2a7c 100644
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktionen fuer Include-Dateien        *
  * -------------------------------------------------------------------- *
- * $Revision:: 999                                                    $ *
- * $Date:: 2009-03-10 17:24:54 +0100 (Tue, 10 Mar 2009)               $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: quix0r                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -35,6 +35,7 @@
  * 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';
@@ -42,12 +43,12 @@ if (!defined('__SECURITY')) {
 }
 
 // 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
 
@@ -55,73 +56,6 @@ function IS_INC_WRITEABLE ($inc) {
 	return is_writeable(dirname($FQFN));
 }
 
-// Reads a directory with PHP files in and gets only files back
-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
-	$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;
-		$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)))) {
-			// Remove both for extension name
-			$extName = substr($baseFile, strlen($prefix), -4);
-
-			// Try to find it
-			$extId = GET_EXT_ID($extName);
-
-			// Is the extension valid and active?
-			if (($extId > 0) && (EXT_IS_ACTIVE($extName))) {
-				// Then add this file
-				//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " Extension entry ".$baseFile." added.");
-				$INCs[] = $INC;
-			} elseif ($extId == 0) {
-				// Add non-extension files as well
-				//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " Regular entry ".$baseFile." added.");
-				if ($addBaseDir) {
-					$INCs[] = $INC;
-				} else {
-					$INCs[] = $baseFile;
-				}
-			}
-		} // END - if
-	} // END - while
-
-	// Close directory
-	closedir($dirPointer);
-
-	// Sort array
-	asort($INCs);
-
-	// Return array with include files
-	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " - Left!");
-	return $INCs;
-}
-
 // Init INC_POOL
 function INIT_INC_POOL () {
 	$GLOBALS['inc_pool'] = array();