Rewritten handling of menu weightning and updating/deleting menu entries except admin...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 522082ba0178848cb087649327d42b972d56c39b..4cd8715360a4e2215763538d547bc3198d3abe2b 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -149,7 +149,9 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
        } // END - if
 
        // Fix HTML parameter (default is no!)
-       if (empty($isHtml)) $isHtml = 'N';
+       if (empty($isHtml)) {
+               $isHtml = 'N';
+       } // END - if
 
        // Debug mode enabled?
        if (isDebugModeEnabled()) {
@@ -698,7 +700,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') {
        }
 
        // At least 10 numbers shall be secure enought!
-       $len = getConfig('code_length');
+       $len = getCodeLength();
        if ($len == '0') $len = $length;
        if ($len == '0') $len = 10;
 
@@ -2140,19 +2142,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?
@@ -2239,6 +2235,8 @@ function initCacheInstance () {
 
        // Initialize cache system only when it's needed
        $GLOBALS['cache_instance'] = new CacheSystem();
+
+       // Did it work?
        if ($GLOBALS['cache_instance']->getStatus() != 'done') {
                // Failed to initialize cache sustem
                addFatalMessage(__FUNCTION__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_CANNOT_INITIALIZE--}');