X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=60e7da54cba9d06801063315da892061956032f3;hb=b4c80165024acf8963971a72e5c3ca970b3e646d;hp=8394f5f98c3e62932c4a10c59e4a06283368c0ad;hpb=7fb9bf8320c56b536a5cb7658f45823f013848f4;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 8394f5f98c..60e7da54cb 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -6,9 +6,9 @@
  * -------------------------------------------------------------------- *
  * File              : functions.php                                    *
  * -------------------------------------------------------------------- *
- * Short description : Many non-MySQL functions (also file access)      *
+ * Short description : Many non-database functions (also file access)   *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) *
+ * Kurzbeschreibung  : Viele Nicht-Datenbank-Funktionen                 *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -261,7 +261,7 @@ function sendRawEmail ($toEmail, $subject, $message, $headers) {
 // Generate a password in a specified length or use default password length
 function generatePassword ($length = '0') {
 	// Auto-fix invalid length of zero
-	if ($length == '0') $length = getConfig('pass_len');
+	if ($length == '0') $length = getPassLen();
 
 	// Initialize array with all allowed chars
 	$ABC = explode(',', 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,0,1,2,3,4,5,6,7,8,9,-,+,_,/,.');
@@ -775,7 +775,7 @@ function createFancyTime ($stamp) {
 	// Get data array with years/months/weeks/days/...
 	$data = createTimeSelections($stamp, '', '', '', true);
 	$ret = '';
-	foreach($data as $k => $v) {
+	foreach ($data as $k => $v) {
 		if ($v > 0) {
 			// Value is greater than 0 "eval" data to return string
 			$ret .= ', ' . $v . ' {--_' . strtoupper($k) . '--}';
@@ -1685,13 +1685,16 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 	// An error was detected!
 	return false;
 }
+
 // Send notification to admin
-function sendAdminNotification ($subject, $templateName, $content=array(), $userid = '0') {
+function sendAdminNotification ($subject, $templateName, $content = array(), $userid = '0') {
 	if ((isExtensionInstalledAndNewer('admins', '0.4.1')) && (function_exists('sendAdminsEmails'))) {
 		// Send new way
+		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'admins=Y,subject=' . $subject . ',templateName=' . $templateName);
 		sendAdminsEmails($subject, $templateName, $content, $userid);
 	} else {
-		// Send out out-dated way
+		// Send out-dated way
+		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'admins=N,subject=' . $subject . ',templateName=' . $templateName);
 		$message = loadEmailTemplate($templateName, $content, $userid);
 		sendAdminEmails($subject, $message);
 	}
@@ -1705,9 +1708,7 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) {
 		$message = str_replace("\r", '', str_replace("\n", '', $message));
 
 		// Log this message away
-		$fp = fopen(getCachePath() . 'debug.log', 'a') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write logfile debug.log!');
-		fwrite($fp, generateDateTime(time(), '4') . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n");
-		fclose($fp);
+		appendLineToFile(getPath() . getCachePath() . 'debug.log', generateDateTime(time(), '4') . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message);
 	} // END - if
 }
 
@@ -1846,7 +1847,7 @@ function rebuildCache ($cache, $inc = '', $force = false) {
 		// Include file given?
 		if (!empty($inc)) {
 			// Construct FQFN
-			$inc = sprintf("inc/loader/load_cache-%s.php", $inc);
+			$inc = sprintf("inc/loader/load-%s.php", $inc);
 
 			// Is the include there?
 			if (isIncludeReadable($inc)) {
@@ -2142,19 +2143,13 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 				// Remove both for extension name
 				$extName = substr($baseFile, strlen($prefix), -4);
 
-				// Is the extension valid and active?
-				if (isExtensionNameValid($extName)) {
-					// Then add this file
-					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension entry ' . $baseFile . ' added.');
+				// Add file with or without base path
+				if ($addBaseDir === true) {
+					// With base path
 					$files[] = $fileName;
 				} else {
-					// Add non-extension files as well
-					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Regular entry ' . $baseFile . ' added.');
-					if ($addBaseDir === true) {
-						$files[] = $fileName;
-					} else {
-						$files[] = $baseFile;
-					}
+					// No base path
+					$files[] = $baseFile;
 				}
 			} else {
 				// We found .php file but should not search for them, why?
@@ -2243,7 +2238,7 @@ function initCacheInstance () {
 	$GLOBALS['cache_instance'] = new CacheSystem();
 
 	// Did it work?
-	if ($GLOBALS['cache_instance']->getStatus() != 'done') {
+	if ($GLOBALS['cache_instance']->getStatusCode() != 'done') {
 		// Failed to initialize cache sustem
 		addFatalMessage(__FUNCTION__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_CANNOT_INITIALIZE--}');
 	} // END - if