X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=1b6b5dc88c5487b808e723d6612bde81e66b9693;hp=a452aab3571b95665f8c62be10e3d3dc062dd30d;hb=e3934352dffa6eb9da59a137ae1a9414e5b4d80b;hpb=6989412ec2be23ffb4febbba8924db25ce1ac113
diff --git a/inc/functions.php b/inc/functions.php
index a452aab357..1b6b5dc88c 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -17,7 +17,7 @@
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -92,7 +92,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
} // END - if
// Set from header
- if ((!isInStringIgnoreCase('@', str_replace('{AT}', '@', $toEmail))) && ($toEmail > 0)) {
+ if ((!isInString('@', $toEmail)) && ($toEmail > 0)) {
// Does the user exist?
if ((isExtensionActive('user')) && (fetchUserData($toEmail))) {
// Get the email
@@ -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();
+ // Add referral id, language, theme and userid
+ $data .= getEncryptSeparator() . determineReferralId();
+ $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
@@ -698,6 +698,7 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') {
// Does only allow numbers
function bigintval ($num, $castValue = true, $abortOnMismatch = true) {
+ //* DEBUG: */ debugOutput('[' . __FUNCTION__ . ':' . __LINE__ . '] ' . 'num=' . $num . ',castValue=' . intval($castValue) . ',abortOnMismatch=' . intval($abortOnMismatch) . ' - ENTERED!');
// Filter all numbers out
$ret = preg_replace('/[^0123456789]/', '', $num);
@@ -714,6 +715,7 @@ function bigintval ($num, $castValue = true, $abortOnMismatch = true) {
} // END - if
// Return result
+ //* DEBUG: */ debugOutput('[' . __FUNCTION__ . ':' . __LINE__ . '] ' . 'num=' . $num . ',castValue=' . intval($castValue) . ',abortOnMismatch=' . intval($abortOnMismatch) . ',ret=' . $ret . ' - EXIT!');
return $ret;
}
@@ -783,45 +785,6 @@ function createFancyTime ($stamp) {
return $ret;
}
-// Extract host from script name
-function extractHostnameFromUrl (&$script) {
- // Use default SERVER_URL by default... ;) So?
- $url = getServerUrl();
-
- // Is this URL valid?
- if (substr($script, 0, 7) == 'http://') {
- // Use the hostname from script URL as new hostname
- $url = substr($script, 7);
- $extract = explode('/', $url);
- $url = $extract[0];
- // Done extracting the URL :)
- } // END - if
-
- // Extract host name
- $host = str_replace('http://', '', $url);
- if (isInString('/', $host)) {
- $host = substr($host, 0, strpos($host, '/'));
- } // END - if
-
- // Generate relative URL
- //* DEBUG: */ debugOutput('SCRIPT=' . $script);
- if (substr(strtolower($script), 0, 7) == 'http://') {
- // But only if http:// is in front!
- $script = substr($script, (strlen($url) + 7));
- } elseif (substr(strtolower($script), 0, 8) == 'https://') {
- // Does this work?!
- $script = substr($script, (strlen($url) + 8));
- }
-
- //* DEBUG: */ debugOutput('SCRIPT=' . $script);
- if (substr($script, 0, 1) == '/') {
- $script = substr($script, 1);
- } // END - if
-
- // Return host name
- return $host;
-}
-
// Taken from www.php.net isInStringIgnoreCase() user comments
function isEmailValid ($email) {
// Check first part of email address
@@ -887,19 +850,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).')
');
$sha1 = scrambleString($sha1);
//* DEBUG: */ debugOutput('Scrambled=' . $sha1.' ('.strlen($sha1).')
');
@@ -1172,7 +1135,7 @@ function getMessageFromErrorCode ($code) {
switch ($code) {
case '': break;
case getCode('LOGOUT_DONE') : $message = '{--LOGOUT_DONE--}'; break;
- case getCode('LOGOUT_FAILED') : $message = '{--LOGOUT_FAILED--}'; break;
+ case getCode('LOGOUT_FAILED') : $message = '{--LOGOUT_FAILED--}'; break;
case getCode('DATA_INVALID') : $message = '{--MAIL_DATA_INVALID--}'; break;
case getCode('POSSIBLE_INVALID') : $message = '{--MAIL_POSSIBLE_INVALID--}'; break;
case getCode('USER_404') : $message = '{--USER_404--}'; break;
@@ -1185,11 +1148,11 @@ function getMessageFromErrorCode ($code) {
case getCode('COOKIES_DISABLED') : $message = '{--LOGIN_COOKIES_DISABLED--}'; break;
case getCode('BEG_SAME_AS_OWN') : $message = '{--BEG_SAME_USERID_AS_OWN--}'; break;
case getCode('LOGIN_FAILED') : $message = '{--GUEST_LOGIN_FAILED_GENERAL--}'; break;
- case getCode('MODULE_MEMBER_ONLY') : $message = '{%message,MODULE_MEMBER_ONLY=' . getRequestParameter('mod') . '%}'; break;
+ case getCode('MODULE_MEMBER_ONLY') : $message = '{%message,MODULE_MEMBER_ONLY=' . getRequestElement('mod') . '%}'; break;
case getCode('OVERLENGTH') : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break;
case getCode('URL_FOUND') : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break;
case getCode('SUBJECT_URL') : $message = '{--MEMBER_SUBJECT_CONTAINS_URL--}'; break;
- case getCode('BLIST_URL') : $message = '{--MEMBER_URL_BLACK_LISTED--}
{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestParameter('blist'), 0); break;
+ case getCode('BLIST_URL') : $message = '{--MEMBER_URL_BLACK_LISTED--}
{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestElement('blist'), 0); break;
case getCode('NO_RECS_LEFT') : $message = '{--MEMBER_SELECTED_MORE_RECS--}'; break;
case getCode('INVALID_TAGS') : $message = '{--MEMBER_HTML_INVALID_TAGS--}'; break;
case getCode('MORE_POINTS') : $message = '{--MEMBER_MORE_POINTS_NEEDED--}'; break;
@@ -1211,8 +1174,8 @@ function getMessageFromErrorCode ($code) {
break;
case getCode('EXTENSION_PROBLEM'):
- if (isGetRequestParameterSet('ext')) {
- $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=' . getRequestParameter('ext') . '%}';
+ if (isGetRequestElementSet('ext')) {
+ $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=' . getRequestElement('ext') . '%}';
} else {
$message = '{--EXTENSION_PROBLEM_UNSET_EXT--}';
}
@@ -1221,7 +1184,7 @@ function getMessageFromErrorCode ($code) {
case getCode('URL_TIME_LOCK'):
// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
$result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
- array(bigintval(getRequestParameter('id'))), __FUNCTION__, __LINE__);
+ array(bigintval(getRequestElement('id'))), __FUNCTION__, __LINE__);
// Load timestamp from last order
$content = SQL_FETCHARRAY($result);
@@ -1358,7 +1321,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
// Read from source file
$line = fgets ($fp, 1024);
- if (strpos($line, $search) > -1) {
+ if (isInString($search, $line)) {
$next = '0';
$found = true;
} // END - if
@@ -1553,7 +1516,7 @@ function handleLoginFailures ($accessLevel) {
// Rebuild cache
function rebuildCache ($cache, $inc = '', $force = false) {
// Debug message
- /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force)));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force)));
// Shall I remove the cache file?
if (isCacheInstanceValid()) {
@@ -1644,96 +1607,96 @@ function addNewBonusMail ($data, $mode = '', $output = true) {
}
}
-// Determines referal id and sets it
-function determineReferalId () {
+// Determines referral id and sets it
+function determineReferralId () {
// Skip this in non-html-mode and outside ref.php
if ((!isHtmlOutputMode()) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) {
return false;
} // END - if
// Check if refid is set
- if (isReferalIdValid()) {
+ if (isReferralIdValid()) {
// This is fine...
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GLOBALS (' . getReferalId() . ')');
- } elseif (isPostRequestParameterSet('refid')) {
- // Get referal id from POST element refid
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from POST data (' . postRequestParameter('refid') . ')');
- setReferalId(secureString(postRequestParameter('refid')));
- } elseif (isGetRequestParameterSet('refid')) {
- // Get referal id from GET parameter refid
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GET data (' . getRequestParameter('refid') . ')');
- setReferalId(secureString(getRequestParameter('refid')));
- } elseif (isGetRequestParameterSet('ref')) {
- // Set refid=ref (the referal link uses such variable)
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestParameter('refid') . ')');
- setReferalId(secureString(getRequestParameter('ref')));
- } elseif ((isGetRequestParameterSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GLOBALS (' . getReferralId() . ')');
+ } elseif (isPostRequestElementSet('refid')) {
+ // Get referral id from POST element refid
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from POST data (' . postRequestElement('refid') . ')');
+ setReferralId(secureString(postRequestElement('refid')));
+ } elseif (isGetRequestElementSet('refid')) {
+ // Get referral id from GET parameter refid
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GET data (' . getRequestElement('refid') . ')');
+ setReferralId(secureString(getRequestElement('refid')));
+ } elseif (isGetRequestElementSet('ref')) {
+ // Set refid=ref (the referral link uses such variable)
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestElement('refid') . ')');
+ setReferralId(secureString(getRequestElement('ref')));
+ } elseif ((isGetRequestElementSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
// The variable user comes from click.php
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestParameter('user') . ')');
- setReferalId(bigintval(getRequestParameter('user')));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestElement('user') . ')');
+ setReferralId(bigintval(getRequestElement('user')));
} elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) {
// Set session refid as global
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from SESSION data (' . getSession('refid') . ')');
- setReferalId(bigintval(getSession('refid')));
- } elseif (isRandomReferalIdEnabled()) {
+ setReferralId(bigintval(getSession('refid')));
+ } elseif (isRandomReferralIdEnabled()) {
// Select a random user which has confirmed enougth mails
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Checking random referal id');
- setReferalId(determineRandomReferalId());
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Checking random referral id');
+ setReferralId(determineRandomReferralId());
} elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid()))) {
// Set default refid as refid in URL
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')');
- setReferalId(getDefRefid());
+ setReferralId(getDefRefid());
} else {
// No default id when sql_patches is not installed or none set
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using NULL as refid');
- setReferalId(NULL);
+ setReferralId(NULL);
}
// Set cookie when default refid > 0
- if ((!isSessionVariableSet('refid')) || (!isValidUserId(getReferalId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) {
+ if ((!isSessionVariableSet('refid')) || (!isValidUserId(getReferralId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) {
// Default is not found
$found = false;
// Do we have nickname or userid set?
- if ((isExtensionActive('nickname')) && (isNicknameUsed(getReferalId()))) {
+ if ((isExtensionActive('nickname')) && (isNicknameUsed(getReferralId()))) {
// Nickname in URL, so load the id
- $found = fetchUserData(getReferalId(), 'nickname');
+ $found = fetchUserData(getReferralId(), 'nickname');
- // If we found it, use the userid as referal id
+ // If we found it, use the userid as referral id
if ($found === true) {
// Set the userid as 'refid'
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from user account by nickname (' . getUserData('userid') . ')');
- setReferalId(getUserData('userid'));
+ setReferralId(getUserData('userid'));
} // END - if
- } elseif (isValidUserId(getReferalId())) {
+ } elseif (isValidUserId(getReferralId())) {
// Direct userid entered
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using direct userid (' . getReferalId() . ')');
- $found = fetchUserData(getReferalId());
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using direct userid (' . getReferralId() . ')');
+ $found = fetchUserData(getReferralId());
}
// Is the record valid?
if ((($found === false) || (!isUserDataValid())) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2'))) {
- // No, then reset referal id
+ // No, then reset referral id
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')');
- setReferalId(getDefRefid());
+ setReferralId(getDefRefid());
} // END - if
// Set cookie
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #1');
- setSession('refid', getReferalId());
- } elseif ((!isReferalIdValid()) || (!fetchUserData(getReferalId()))) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferralId() . ') #1');
+ setSession('refid', getReferralId());
+ } elseif ((!isReferralIdValid()) || (!fetchUserData(getReferralId()))) {
// Not valid!
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not valid referal id (' . getReferalId() . '), setting NULL in session');
- setReferalId(NULL);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not valid referral id (' . getReferralId() . '), setting NULL in session');
+ setReferralId(NULL);
setSession('refid', NULL);
} else {
// Set it from GLOBALS array in session
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #2');
- setSession('refid', getReferalId());
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferralId() . ') #2');
+ setSession('refid', getReferralId());
}
// Return determined refid
- return getReferalId();
+ return getReferralId();
}
// Enables the reset mode and runs it
@@ -2062,7 +2025,7 @@ function getModuleFromFileName ($file, $accessLevel) {
// Encodes an URL for adding session id, etc.
function encodeUrl ($url, $outputMode = '0') {
// Do we have already have a PHPSESSID inside or view.php is called? Then abort here
- if ((strpos($url, session_name()) !== false) || (isRawOutputMode())) {
+ if ((isInStringIgnoreCase(session_name(), $url)) || (isRawOutputMode())) {
// Raw output mode detected or session_name() found in URL
return $url;
} // END - if
@@ -2070,19 +2033,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 = '&';
- if (strpos($url, '?') === false) {
+ // Determine right separator
+ $separator = '&';
+ 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
@@ -2099,7 +2062,7 @@ function encodeUrl ($url, $outputMode = '0') {
// Simple check for spider
function isSpider () {
// Get the UA and trim it down
- $userAgent = trim(strtolower(detectUserAgent(true)));
+ $userAgent = trim(detectUserAgent(true));
// It should not be empty, if so it is better a spider/bot
if (empty($userAgent)) {
@@ -2108,7 +2071,7 @@ function isSpider () {
} // END - if
// Is it a spider?
- return ((strpos($userAgent, 'spider') !== false) || (strpos($userAgent, 'slurp') !== false) || (strpos($userAgent, 'bot') !== false) || (strpos($userAgent, 'archiver') !== false));
+ return ((isInStringIgnoreCase('spider', $userAgent)) || (isInStringIgnoreCase('slurp', $userAgent)) || (isInStringIgnoreCase('bot', $userAgent)) || (isInStringIgnoreCase('archiver', $userAgent)));
}
// Function to search for the last modified file
@@ -2173,7 +2136,7 @@ function handleFieldWithBraces ($field) {
// Converts a zero or NULL to word 'NULL'
function makeZeroToNull ($number) {
// Is it a valid username?
- if ((!is_null($number)) && ($number > 0)) {
+ if ((!is_null($number)) && (!empty($number)) && ($number > 0)) {
// Always secure it
$number = bigintval($number);
} else {
@@ -2185,13 +2148,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;
@@ -2397,18 +2363,18 @@ function determinePointsColumnFromSubjectLocked ($subject, $locked) {
return $pointsColumn;
}
-// Setter for referal id (no bigintval, or nicknames will fail!)
-function setReferalId ($refid) {
+// Setter for referral id (no bigintval, or nicknames will fail!)
+function setReferralId ($refid) {
$GLOBALS['refid'] = $refid;
}
// Checks if 'refid' is valid
-function isReferalIdValid () {
- return ((isset($GLOBALS['refid'])) && (getReferalId() !== NULL) && (getReferalId() > 0));
+function isReferralIdValid () {
+ return ((isset($GLOBALS['refid'])) && (getReferralId() !== NULL) && (getReferralId() > 0));
}
-// Getter for referal id
-function getReferalId () {
+// Getter for referral id
+function getReferralId () {
return $GLOBALS['refid'];
}