Some more cleanups/improvements:

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 4faea4e7f50a1a1b847f6f6b20ed0302746a1680..944d0281ee1c328c72142c28e21758554711eb7c 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1198,7 +1198,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
 }
 
 // Scramble a string
-function scrambleString($str) {
+function scrambleString ($str) {
        // Init
        $scrambled = '';
 
@@ -1233,7 +1233,7 @@ function scrambleString($str) {
 }
 
 // De-scramble a string scrambled by scrambleString()
-function descrambleString($str) {
+function descrambleString ($str) {
        // Scramble only 40 chars long strings
        if (strlen($str) != 40) return $str;
 
@@ -1361,7 +1361,7 @@ function getCurrentTheme () {
 }
 
 // Generates an error code from given account status
-function generateErrorCodeFromUserStatus ($status='') {
+function generateErrorCodeFromUserStatus ($status = '') {
        // If no status is provided, use the default, cached
        if ((empty($status)) && (isMember())) {
                // Get user status
@@ -1507,9 +1507,9 @@ function getMessageFromErrorCode ($code) {
 
                        // Finally contruct the message
                        // @TODO Rewrite this old lost code to a template
-                       $message = "{--MEMBER_URL_TIME_LOCK--}<br />{--CONFIG_URL_TLOCK--} ".$STD."
-                       {--_HOURS--}, ".$MIN." {--_MINUTES--} {--_AND--} ".$SEC." {--_SECONDS--}<br />
-                       {--MEMBER_LAST_TLOCK--}: ".$timestamp;
+                       $message = '{--MEMBER_URL_TIME_LOCK--}<br />{--CONFIG_URL_TLOCK--} ' . $STD . '
+                       {--_HOURS--}, ' . $MIN . ' {--_MINUTES--} {--_AND--} ' . $SEC . ' {--_SECONDS--}<br />
+                       {--MEMBER_LAST_TLOCK--}: ' . $timestamp;
                        break;
 
                default:
@@ -1575,9 +1575,9 @@ function isUrlValidSimple ($url) {
                // Debug regex?
                if (isDebugRegularExpressionEnabled()) {
                        // @TODO Are these convertions still required?
-                       $pat = str_replace('.', "&#92;&#46;", $pat);
-                       $pat = str_replace('@', "&#92;&#64;", $pat);
-                       //* DEBUG: */ debugOutput($key."=&nbsp;" . $pat);
+                       $pat = str_replace('.', '&#92;&#46;', $pat);
+                       $pat = str_replace('@', '&#92;&#64;', $pat);
+                       //* DEBUG: */ debugOutput($key . '=&nbsp;' . $pat);
                } // END - if
 
                // Check if expression matches
@@ -1792,7 +1792,7 @@ function handleLoginFailures ($accessLevel) {
                // Ignore zero values
                if (getSession('mailer_' . $accessLevel . '_failures') > 0) {
                        // Non-guest has login failures found, get both data and prepare it for template
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "accessLevel={$accessLevel}<br />");
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'accessLevel=' . $accessLevel . '<br />');
                        $content = array(
                                'login_failures' => 'mailer_' . $accessLevel . '_failures',
                                'last_failure'   => generateDateTime(getSession('mailer_' . $accessLevel . '_last_failure'), 2)
@@ -2058,7 +2058,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
        $excludeArray[] = '.svn';
        $excludeArray[] = '.htaccess';
 
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix} - Entered!");
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'baseDir=' . $baseDir . ',prefix=' . $prefix . ' - Entered!');
        // Init includes
        $files = array();
 
@@ -2101,20 +2101,20 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
                        continue;
                } elseif (substr($baseFile, 0, strlen($prefix)) != $prefix) {
                        // Skip this file
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid prefix in file " . $baseFile . ", prefix=" . $prefix);
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Invalid prefix in file ' . $baseFile . ', prefix=' . $prefix);
                        continue;
                } elseif ((!empty($suffix)) && (substr($baseFile, -(strlen($suffix . $extension)), (strlen($suffix . $extension))) != $suffix . $extension)) {
                        // Skip wrong suffix as well
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid suffix in file " . $baseFile . ", suffix=" . $suffix);
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Invalid suffix in file ' . $baseFile . ', suffix=' . $suffix);
                        continue;
                } elseif (!isFileReadable($FQFN)) {
                        // Not readable so skip it
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "File " . $FQFN . " is not readable!");
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'File ' . $FQFN . ' is not readable!');
                        continue;
                }
 
                // Is the file a PHP script or other?
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}");
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'baseDir=' . $baseDir . ',prefix=' . $prefix . ',baseFile=' . $baseFile);
                if ((substr($baseFile, -4, 4) == '.php') || (($fileIncludeDirs === true) && (isDirectory($FQFN)))) {
                        // Is this a valid include file?
                        if ($extension == '.php') {