Typo fixed

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index e42a7e755efdb4125fe7e87622e982a0c85af0c9..d58f4fd6231ca129fc5b3c8f5f99b2ce6c2bcc92 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -211,9 +211,9 @@ function sendRawEmail ($toEmail, $subject, $message, $headers) {
 
                $mail->AddAddress($toEmail, '');
                $mail->AddReplyTo(getWebmaster(), getMainTitle());
-               $mail->AddCustomHeader('Errors-To:' . getWebmaster());
-               $mail->AddCustomHeader('X-Loop:' . getWebmaster());
-               $mail->AddCustomHeader('Bounces-To:' . getWebmaster());
+               $mail->AddCustomHeader('Errors-To: ' . getWebmaster());
+               $mail->AddCustomHeader('X-Loop: ' . getWebmaster());
+               $mail->AddCustomHeader('Bounces-To: ' . getWebmaster());
                $mail->Send();
 
                // Has an error occured?
@@ -635,44 +635,44 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums
 //
 function generateRandomCode ($length, $code, $userid, $extraData = '') {
        // Build server string
-       $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRealIpAddress() . getEncryptSeperator() . detectRemoteAddr();
+       $server = $_SERVER['PHP_SELF'] . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . getenv('SERVER_SOFTWARE') . getEncryptSeparator() . detectRealIpAddress() . getEncryptSeparator() . detectRemoteAddr();
 
        // Build key string
-       $keys = getSiteKey() . getEncryptSeperator() . getDateKey();
+       $keys = getSiteKey() . getEncryptSeparator() . getDateKey();
        if (isConfigEntrySet('secret_key')) {
-               $keys .= getEncryptSeperator() . getSecretKey();
+               $keys .= getEncryptSeparator() . getSecretKey();
        } // END - if
        if (isConfigEntrySet('file_hash')) {
-               $keys .= getEncryptSeperator() . getFileHash();
+               $keys .= getEncryptSeparator() . getFileHash();
        } // END - if
-       $keys .= getEncryptSeperator() . getDateFromRepository();
+       $keys .= getEncryptSeparator() . getDateFromRepository();
        if (isConfigEntrySet('master_salt')) {
-               $keys .= getEncryptSeperator() . getMasterSalt();
+               $keys .= getEncryptSeparator() . getMasterSalt();
        } // END - if
 
        // Build string from misc data
-       $data  = $code . getEncryptSeperator() . $userid . getEncryptSeperator() . $extraData;
+       $data  = $code . getEncryptSeparator() . $userid . getEncryptSeparator() . $extraData;
 
        // Add more additional data
        if (isSessionVariableSet('u_hash')) {
-               $data .= getEncryptSeperator() . getSession('u_hash');
+               $data .= getEncryptSeparator() . getSession('u_hash');
        } // END - if
 
        // Add referal id, language, theme and userid
-       $data .= getEncryptSeperator() . determineReferalId();
-       $data .= getEncryptSeperator() . getLanguage();
-       $data .= getEncryptSeperator() . getCurrentTheme();
-       $data .= getEncryptSeperator() . getMemberId();
+       $data .= getEncryptSeparator() . determineReferalId();
+       $data .= getEncryptSeparator() . getLanguage();
+       $data .= getEncryptSeparator() . getCurrentTheme();
+       $data .= getEncryptSeparator() . getMemberId();
 
        // Calculate number for generating the code
        $a = $code + getConfig('_ADD') - 1;
 
        if (isConfigEntrySet('master_salt')) {
                // Generate hash with master salt from modula of number with the prime number and other data
-               $saltedHash = generateHash(($a % getPrime()) . getEncryptSeperator() . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . $a, getMasterSalt());
+               $saltedHash = generateHash(($a % getPrime()) . getEncryptSeparator() . $server . getEncryptSeparator() . $keys . getEncryptSeparator() . $data . getEncryptSeparator() . getDateKey() . getEncryptSeparator() . $a, getMasterSalt());
        } else {
                // Generate hash with "hash of site key" from modula of number with the prime number and other data
-               $saltedHash = generateHash(($a % getPrime()) . getEncryptSeperator() . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . $a, substr(sha1(getSiteKey()), 0, getSaltLength()));
+               $saltedHash = generateHash(($a % getPrime()) . getEncryptSeparator() . $server . getEncryptSeparator() . $keys . getEncryptSeparator() . $data . getEncryptSeparator() . getDateKey() . getEncryptSeparator() . $a, substr(sha1(getSiteKey()), 0, getSaltLength()));
        }
 
        // Create number from hash
@@ -887,19 +887,19 @@ function generateHash ($plainText, $salt = '', $hash = true) {
        // When the salt is empty build a new one, else use the first x configured characters as the salt
        if (empty($salt)) {
                // Build server string for more entropy
-               $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRealIpAddress() . getEncryptSeperator() . detectRemoteAddr();
+               $server = $_SERVER['PHP_SELF'] . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . getenv('SERVER_SOFTWARE') . getEncryptSeparator() . detectRealIpAddress() . getEncryptSeparator() . detectRemoteAddr();
 
                // Build key string
-               $keys   = getSiteKey() . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . getSecretKey() . getEncryptSeperator() . getFileHash() . getEncryptSeperator() . getDateFromRepository() . getEncryptSeperator() . getMasterSalt();
+               $keys   = getSiteKey() . getEncryptSeparator() . getDateKey() . getEncryptSeparator() . getSecretKey() . getEncryptSeparator() . getFileHash() . getEncryptSeparator() . getDateFromRepository() . getEncryptSeparator() . getMasterSalt();
 
                // Additional data
-               $data = $plainText . getEncryptSeperator() . uniqid(mt_rand(), true) . getEncryptSeperator() . time();
+               $data = $plainText . getEncryptSeparator() . uniqid(mt_rand(), true) . getEncryptSeparator() . time();
 
                // Calculate number for generating the code
                $a = time() + getConfig('_ADD') - 1;
 
                // Generate SHA1 sum from modula of number and the prime number
-               $sha1 = sha1(($a % getPrime()) . $server . getEncryptSeperator() . $keys . getEncryptSeperator() . $data . getEncryptSeperator() . getDateKey() . getEncryptSeperator() . $a);
+               $sha1 = sha1(($a % getPrime()) . $server . getEncryptSeparator() . $keys . getEncryptSeparator() . $data . getEncryptSeparator() . getDateKey() . getEncryptSeparator() . $a);
                //* DEBUG: */ debugOutput('SHA1=' . $sha1.' ('.strlen($sha1).')<br />');
                $sha1 = scrambleString($sha1);
                //* DEBUG: */ debugOutput('Scrambled=' . $sha1.' ('.strlen($sha1).')<br />');
@@ -2070,19 +2070,19 @@ function encodeUrl ($url, $outputMode = '0') {
        // Do we have a valid session?
        if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
                // Invalid session
-               // Determine right seperator
-               $seperator = '&amp;';
+               // Determine right separator
+               $separator = '&amp;';
                if (!isInString('?', $url)) {
                        // No question mark
-                       $seperator = '?';
+                       $separator = '?';
                } elseif ((!isHtmlOutputMode()) || ($outputMode != '0')) {
                        // Non-HTML mode (or forced non-HTML mode
-                       $seperator = '&';
+                       $separator = '&';
                }
 
                // Add it to URL
                if (session_id() != '') {
-                       $url .= $seperator . session_name() . '=' . session_id();
+                       $url .= $separator . session_name() . '=' . session_id();
                } // END - if
        } // END - if
 
@@ -2185,13 +2185,16 @@ function makeZeroToNull ($number) {
        return $number;
 }
 
-// Converts NULL into number zero
+// Converts a NULL to zero
 function makeNullToZero ($number) {
-       // Is this a NULL?
-       if ((is_null($number)) || (empty($number))) {
-               // Simply set it
+       // Is it a valid username?
+       if ((!is_null($number)) && (!empty($number)) && ($number > 0)) {
+               // Always secure it
+               $number = bigintval($number);
+       } else {
+               // Is not valid or zero
                $number = '0';
-       } // END - if
+       }
 
        // Return it
        return $number;