X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=c37b570c973521bd1b26183a87f88e4754da0972;hp=a14ad083909ab1b1ff0ecffa1f698fdce9626594;hb=6560179e7c8dc565485503f374d4e31f333ffd0e;hpb=ed3a88c0334600c7d7246480008c79716aa3f80b
diff --git a/inc/functions.php b/inc/functions.php
index a14ad08390..c37b570c97 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * 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 *
@@ -61,10 +61,10 @@ function addFatalMessage ($F, $L, $message, $extra = '') {
}
// Add message to $GLOBALS['fatal_messages']
- $GLOBALS['fatal_messages'][] = $message;
+ array_push($GLOBALS['fatal_messages'], $message);
// Log fatal messages away
- logDebugMessage($F, $L, 'Fatal error message: ' . $message);
+ logDebugMessage($F, $L, 'Fatal error message: ' . compileCode($message));
}
// Getter for total fatal message count
@@ -72,7 +72,7 @@ function getTotalFatalErrors () {
// Init count
$count = '0';
- // Do we have at least the first entry?
+ // Is there at least the first entry?
if (!empty($GLOBALS['fatal_messages'][0])) {
// Get total count
$count = count($GLOBALS['fatal_messages']);
@@ -82,157 +82,6 @@ function getTotalFatalErrors () {
return $count;
}
-// Send mail out to an email address
-function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'toEmail=' . $toEmail . ',subject=' . $subject . ',isHtml=' . $isHtml);
- // Empty parameters should be avoided, so we need to find them
- if (empty($isHtml)) {
- // isHtml is empty
- debug_report_bug(__FUNCTION__, __LINE__, 'isHtml is empty.');
- } // END - if
-
- // Set from header
- if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) {
- // Does the user exist?
- if ((isExtensionActive('user')) && (fetchUserData($toEmail))) {
- // Get the email
- $toEmail = getUserData('email');
- } else {
- // Set webmaster
- $toEmail = getWebmaster();
- }
- } elseif ($toEmail == '0') {
- // Is the webmaster!
- $toEmail = getWebmaster();
- }
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'TO=' . $toEmail);
-
- // Check for PHPMailer or debug-mode
- if ((!checkPhpMailerUsage()) || (isDebugModeEnabled())) {
- // Prefix is '' for text mails
- $prefix = '';
-
- // Is HTML?
- if ($isHtml == 'Y') {
- // Set prefix
- $prefix = 'html_';
- } // END - if
-
- // Not in PHPMailer-Mode
- if (empty($mailHeader)) {
- // Load email header template
- $mailHeader = loadEmailTemplate($prefix . 'header');
- } else {
- // Append header
- $mailHeader .= loadEmailTemplate($prefix . 'header');
- }
- } // END - if
-
- // Debug mode enabled?
- if (isDebugModeEnabled()) {
- // In debug mode we want to display the mail instead of sending it away so we can debug this part
- outputHtml('
-Headers : ' . htmlentities(utf8_decode(trim($mailHeader))) . '
-To : ' . htmlentities(utf8_decode($toEmail)) . '
-Subject : ' . htmlentities(utf8_decode($subject)) . '
-Message : ' . htmlentities(utf8_decode($message)) . '
-
');
-
- // This is always fine
- return true;
- } elseif (!empty($toEmail)) {
- // Send Mail away
- return sendRawEmail($toEmail, $subject, $message, $mailHeader);
- } elseif ($isHtml != 'Y') {
- // Problem detected while sending a mail, forward it to admin
- return sendRawEmail(getWebmaster(), '[PROBLEM:]' . $subject, $message, $mailHeader);
- }
-
- // Why did we end up here? This should not happen
- debug_report_bug(__FUNCTION__, __LINE__, 'Ending up: template=' . $template);
-}
-
-// Check to use wether legacy mail() command or PHPMailer class
-// @TODO Rewrite this to an extension 'smtp'
-// @private
-function checkPhpMailerUsage() {
- return ((getConfig('SMTP_HOSTNAME') != '') && (getConfig('SMTP_USER') != ''));
-}
-
-// Send out a raw email with PHPMailer class or legacy mail() command
-function sendRawEmail ($toEmail, $subject, $message, $headers) {
- // Just compile all to put out all configs, etc.
- $eval = '$toEmail = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($toEmail), false)) . '"); ';
- $eval .= '$subject = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($subject), false)) . '"); ';
- $eval .= '$headers = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($headers), false)) . '"); ';
-
- // Do not decode entities in the message because we also send HTML mails through this function
- $eval .= '$message = "' . escapeQuotes(doFinalCompilation(compileRawCode($message), false)) . '";';
-
- // Run the final eval() command
- eval($eval);
-
- // Shall we use PHPMailer class or legacy mode?
- if (checkPhpMailerUsage()) {
- // Use PHPMailer class with SMTP enabled
- loadIncludeOnce('inc/phpmailer/class.phpmailer.php');
- loadIncludeOnce('inc/phpmailer/class.smtp.php');
-
- // get new instance
- $mail = new PHPMailer();
-
- // Set charset to UTF-8
- $mail->CharSet = 'UTF-8';
-
- // Path for PHPMailer
- $mail->PluginDir = sprintf("%sinc/phpmailer/", getPath());
-
- $mail->IsSMTP();
- $mail->SMTPAuth = true;
- $mail->Host = getConfig('SMTP_HOSTNAME');
- $mail->Port = 25;
- $mail->Username = getConfig('SMTP_USER');
- $mail->Password = getConfig('SMTP_PASSWORD');
- if (empty($headers)) {
- $mail->From = getWebmaster();
- } else {
- $mail->From = $headers;
- }
- $mail->FromName = getMainTitle();
- $mail->Subject = $subject;
- if ((isExtensionActive('html_mail')) && (secureString($message) != $message)) {
- $mail->Body = $message;
- $mail->AltBody = 'Your mail program required HTML support to read this mail!';
- $mail->WordWrap = 70;
- $mail->IsHTML(true);
- } else {
- $mail->Body = decodeEntities($message);
- }
-
- $mail->AddAddress($toEmail, '');
- $mail->AddReplyTo(getWebmaster(), getMainTitle());
- $mail->AddCustomHeader('Errors-To:' . getWebmaster());
- $mail->AddCustomHeader('X-Loop:' . getWebmaster());
- $mail->AddCustomHeader('Bounces-To:' . getWebmaster());
- $mail->Send();
-
- // Has an error occured?
- if (!empty($mail->ErrorInfo)) {
- // Log message
- logDebugMessage(__FUNCTION__, __LINE__, 'Error while sending mail: ' . $mail->ErrorInfo);
-
- // Raise an error
- return false;
- } else {
- // All fine!
- return true;
- }
- } else {
- // Use legacy mail() command
- return mail($toEmail, $subject, decodeEntities($message), $headers);
- }
-}
-
// Generate a password in a specified length or use default password length
function generatePassword ($length = '0', $exclude = array()) {
// Auto-fix invalid length of zero
@@ -265,6 +114,12 @@ function generatePassword ($length = '0', $exclude = array()) {
// Generates a human-readable timestamp from the Uni* stamp
function generateDateTime ($time, $mode = '0') {
+ // Is there cache?
+ if (isset($GLOBALS[__FUNCTION__][$time][$mode])) {
+ // Return it instead
+ return $GLOBALS[__FUNCTION__][$time][$mode];
+ } // END - if
+
// If the stamp is zero it mostly didn't "happen"
if (($time == '0') || (is_null($time))) {
// Never happend
@@ -272,42 +127,36 @@ function generateDateTime ($time, $mode = '0') {
} // END - if
// Filter out numbers
- $time = bigintval($time);
-
- // Is it cached?
- if (isset($GLOBALS[__FUNCTION__][$time][$mode])) {
- // Then use it
- return $GLOBALS[__FUNCTION__][$time][$mode];
- } // END - if
+ $timeSecured = bigintval($time);
// Detect language
switch (getLanguage()) {
case 'de': // German date / time format
switch ($mode) {
- case '0': $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
- case '1': $ret = strtolower(date('d.m.Y - H:i', $time)); break;
- case '2': $ret = date('d.m.Y|H:i', $time); break;
- case '3': $ret = date('d.m.Y', $time); break;
- case '4': $ret = date('d.m.Y|H:i:s', $time); break;
- case '5': $ret = date('d-m-Y (l-F-T)', $time); break;
- case '6': $ret = date('Ymd', $time); break;
- case '7': $ret = date('Y-m-d H:i:s', $time); break; // Compatible with MySQL TIMESTAMP
+ case '0': $ret = date("d.m.Y \u\m H:i \U\h\\r", $timeSecured); break;
+ case '1': $ret = strtolower(date('d.m.Y - H:i', $timeSecured)); break;
+ case '2': $ret = date('d.m.Y|H:i', $timeSecured); break;
+ case '3': $ret = date('d.m.Y', $timeSecured); break;
+ case '4': $ret = date('d.m.Y|H:i:s', $timeSecured); break;
+ case '5': $ret = date('d-m-Y (l-F-T)', $timeSecured); break;
+ case '6': $ret = date('Ymd', $timeSecured); break;
+ case '7': $ret = date('Y-m-d H:i:s', $timeSecured); break; // Compatible with MySQL TIMESTAMP
default:
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
break;
- }
+ } // END - switch
break;
default: // Default is the US date / time format!
switch ($mode) {
- case '0': $ret = date('r', $time); break;
- case '1': $ret = strtolower(date('Y-m-d - g:i A', $time)); break;
- case '2': $ret = date('y-m-d|H:i', $time); break;
- case '3': $ret = date('y-m-d', $time); break;
- case '4': $ret = date('d.m.Y|H:i:s', $time); break;
- case '5': $ret = date('d-m-Y (l-F-T)', $time); break;
- case '6': $ret = date('Ymd', $time); break;
- case '7': $ret = date('Y-m-d H:i:s', $time); break; // Compatible with MySQL TIMESTAMP
+ case '0': $ret = date('r', $timeSecured); break;
+ case '1': $ret = strtolower(date('Y-m-d - g:i A', $timeSecured)); break;
+ case '2': $ret = date('y-m-d|H:i', $timeSecured); break;
+ case '3': $ret = date('y-m-d', $timeSecured); break;
+ case '4': $ret = date('d.m.Y|H:i:s', $timeSecured); break;
+ case '5': $ret = date('d-m-Y (l-F-T)', $timeSecured); break;
+ case '6': $ret = date('Ymd', $timeSecured); break;
+ case '7': $ret = date('Y-m-d H:i:s', $timeSecured); break; // Compatible with MySQL TIMESTAMP
default:
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
break;
@@ -332,7 +181,7 @@ function translateYesNo ($yn) {
case 'N': $GLOBALS[__FUNCTION__][$yn] = '{--NO--}'; break;
default:
// Log unknown value
- logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected: Y/N", $yn));
break;
} // END - switch
} // END - if
@@ -342,6 +191,7 @@ function translateYesNo ($yn) {
}
// Translates the american decimal dot into a german comma
+// OPPOMENT: convertCommaToDot()
function translateComma ($dotted, $cut = true, $max = '0') {
// First, cast all to double, due to PHP changes
$dotted = (double) $dotted;
@@ -398,12 +248,13 @@ function translateGender ($gender) {
case 'M': // Male
case 'F': // Female
case 'C': // Company
- $ret = sprintf("{--GENDER_%s--}", $gender);
+ // Use generic function
+ $ret = translateGeneric('GENDER', $gender);
break;
default:
// Please report bugs on unknown genders
- debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
+ reportBug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
break;
} // END - switch
@@ -421,17 +272,17 @@ function translateUserStatus ($status) {
case 'UNCONFIRMED':
case 'CONFIRMED':
case 'LOCKED':
- $ret = sprintf("{--ACCOUNT_STATUS_%s--}", $status);
+ // Use generic function for all "normal" cases"
+ $ret = translateGeneric('ACCOUNT_STATUS', $status);
break;
- case '':
- case null:
+ case '': // Account deleted
+ case NULL: // Account deleted
$ret = '{--ACCOUNT_STATUS_DELETED--}';
break;
- default:
- // Please report all unknown status
- debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s(%s) detected.", $status, gettype($status)));
+ default: // Please report all unknown status
+ reportBug(__FUNCTION__, __LINE__, sprintf("Unknown status %s(%s) detected.", $status, gettype($status)));
break;
} // END - switch
@@ -446,23 +297,31 @@ function translateMenuVisibleLocked ($content, $prefix = '') {
// Translate 'visible' and keep an eye on the prefix
switch ($content['visible']) {
- // Should be visible
- case 'Y': $content['visible_css'] = $prefix . 'menu_visible' ; break;
- case 'N': $content['visible_css'] = $prefix . 'menu_invisible'; break;
- default:
- // Please report this
- debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported visible value detected. content=' . print_r($content, true) . '
');
+ case 'Y': // Should be visible
+ $content['visible_css'] = $prefix . 'menu_visible';
+ break;
+
+ case 'N': // Is invisible
+ $content['visible_css'] = $prefix . 'menu_invisible';
+ break;
+
+ default: // Please report this
+ reportBug(__FUNCTION__, __LINE__, 'Unsupported visible value detected. content=' . print_r($content, true) . '
');
break;
} // END - switch
// Translate 'locked' and keep an eye on the prefix
switch ($content['locked']) {
- // Should be locked
- case 'Y': $content['locked_css'] = $prefix . 'menu_locked' ; break;
- case 'N': $content['locked_css'] = $prefix . 'menu_unlocked'; break;
- default:
- // Please report this
- debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported locked value detected. content=' . print_r($content, true) . '
');
+ case 'Y': // Should be locked, only admins can call this
+ $content['locked_css'] = $prefix . 'menu_locked';
+ break;
+
+ case 'N': // Is unlocked and visible to members/guests/sponsors
+ $content['locked_css'] = $prefix . 'menu_unlocked';
+ break;
+
+ default: // Please report this
+ reportBug(__FUNCTION__, __LINE__, 'Unsupported locked value detected. content=' . print_r($content, true) . '
');
break;
} // END - switch
@@ -471,11 +330,17 @@ function translateMenuVisibleLocked ($content, $prefix = '') {
}
// Generates an URL for the dereferer
-function generateDerefererUrl ($url) {
+function generateDereferrerUrl ($url) {
// Don't de-refer our own links!
if (substr($url, 0, strlen(getUrl())) != getUrl()) {
- // De-refer this link
- $url = '{%url=modules.php?module=loader&url=' . encodeString(compileUriCode($url)) . '%}';
+ // Encode URL
+ $encodedUrl = encodeString(compileUriCode($url));
+
+ // Log plain URL
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'url=' . $url);
+
+ // De-refer this URL
+ $url = '{%url=modules.php?module=loader&url=' . $encodedUrl . '&hash=' . encodeHashForCookie(generateHash($url)) . '%}';
} // END - if
// Return link
@@ -498,7 +363,7 @@ function countSelection ($array) {
// Integrity check
if (!is_array($array)) {
// Not an array!
- debug_report_bug(__FUNCTION__, __LINE__, 'No array provided.');
+ reportBug(__FUNCTION__, __LINE__, 'No array provided.');
} // END - if
// Init count
@@ -507,7 +372,10 @@ function countSelection ($array) {
// Count all entries
foreach ($array as $key => $selected) {
// Is it checked?
- if (!empty($selected)) $ret++;
+ if (!empty($selected)) {
+ // Yes, then count it
+ $ret++;
+ } // END - if
} // END - foreach
// Return counted selections
@@ -534,6 +402,12 @@ function makeTime ($hours, $minutes, $seconds, $stamp) {
// Redirects to an URL and if neccessarry extends it with own base URL
function redirectToUrl ($url, $allowSpider = true) {
+ // Is the output mode -2?
+ if (isAjaxOutputMode()) {
+ // This is always (!) an AJAX request and shall not be redirected
+ return;
+ } // END - if
+
// Remove {%url=
if (substr($url, 0, 6) == '{%url=') {
$url = substr($url, 6, -2);
@@ -545,25 +419,19 @@ function redirectToUrl ($url, $allowSpider = true) {
// Default 'rel' value is external, nofollow is evil from Google and hurts the Internet
$rel = ' rel="external"';
- // Do we have internal or external URL?
+ // Is there internal or external URL?
if (substr($url, 0, strlen(getUrl())) == getUrl()) {
// Own (=internal) URL
$rel = '';
} // END - if
// Three different ways to debug...
- //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'URL=' . $url);
+ //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'URL=' . $url);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $url);
//* DEBUG: */ die($url);
// We should not sent a redirect if headers are already sent
if (!headers_sent()) {
- // Clear output buffer
- clearOutputBuffer();
-
- // Clear own output buffer
- $GLOBALS['output'] = '';
-
// Load URL when headers are not sent
sendRawRedirect(doFinalCompilation(str_replace('&', '&', $url), false));
} else {
@@ -574,7 +442,7 @@ function redirectToUrl ($url, $allowSpider = true) {
}
// Shut the mailer down here
- shutdown();
+ doShutdown();
}
/************************************************************************
@@ -584,7 +452,7 @@ function redirectToUrl ($url, $allowSpider = true) {
* *
* $array - Das 3-dimensionale Array, das paralell sortiert werden soll *
* $a_sort - Array, das die Sortiereihenfolge der ersten Elementeben *
- * $primary_key - Prim.rschl.ssel aus $a_sort, nach dem sortiert wird *
+ * $primary_key - Primaerschl.ssel aus $a_sort, nach dem sortiert wird *
* $order - Sortiereihenfolge: -1 = a-Z, 0 = keine, 1 = Z-a *
* $nums - true = Als Zahlen sortieren, false = Als Zeichen sortieren *
* *
@@ -594,26 +462,26 @@ function redirectToUrl ($url, $allowSpider = true) {
* *
************************************************************************/
function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = false) {
- $dummy = $array;
+ $temporaryArray = $array;
while ($primary_key < count($a_sort)) {
- foreach ($dummy[$a_sort[$primary_key]] as $key => $value) {
- foreach ($dummy[$a_sort[$primary_key]] as $key2 => $value2) {
+ foreach ($temporaryArray[$a_sort[$primary_key]] as $key => $value) {
+ foreach ($temporaryArray[$a_sort[$primary_key]] as $key2 => $value2) {
$match = false;
if ($nums === false) {
// Sort byte-by-byte (also numbers will be interpreted as chars! E.g.: "9" > "10")
- if (($key != $key2) && (strcmp(strtolower($dummy[$a_sort[$primary_key]][$key]), strtolower($dummy[$a_sort[$primary_key]][$key2])) == $order)) $match = true;
+ if (($key != $key2) && (strcmp(strtolower($temporaryArray[$a_sort[$primary_key]][$key]), strtolower($temporaryArray[$a_sort[$primary_key]][$key2])) == $order)) $match = true;
} elseif ($key != $key2) {
// Sort numbers (E.g.: 9 < 10)
- if (($dummy[$a_sort[$primary_key]][$key] < $dummy[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = true;
- if (($dummy[$a_sort[$primary_key]][$key] > $dummy[$a_sort[$primary_key]][$key2]) && ($order == 1)) $match = true;
+ if (($temporaryArray[$a_sort[$primary_key]][$key] < $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == -1)) $match = true;
+ if (($temporaryArray[$a_sort[$primary_key]][$key] > $temporaryArray[$a_sort[$primary_key]][$key2]) && ($order == 1)) $match = true;
}
if ($match) {
// We have found two different values, so let's sort whole array
- foreach ($dummy as $sort_key => $sort_val) {
- $t = $dummy[$sort_key][$key];
- $dummy[$sort_key][$key] = $dummy[$sort_key][$key2];
- $dummy[$sort_key][$key2] = $t;
+ foreach ($temporaryArray as $sort_key => $sort_val) {
+ $t = $temporaryArray[$sort_key][$key];
+ $temporaryArray[$sort_key][$key] = $temporaryArray[$sort_key][$key2];
+ $temporaryArray[$sort_key][$key2] = $t;
unset($t);
} // END - foreach
} // END - if
@@ -625,7 +493,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums
} // END - while
// Write back sorted array
- $array = $dummy;
+ $array = $temporaryArray;
}
@@ -635,48 +503,48 @@ 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() . getDateFromPatchTime();
+ $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
- $rcode = hexdec(substr($saltedHash, 8, 9)) / abs(getRandNo() - $a + sqrt(getConfig('_ADD'))) / pi();
+ $rcode = hexdec(substr($saltedHash, getSaltLength(), 9)) / abs(getRandNo() - $a + sqrt(getConfig('_ADD'))) / pi();
// At least 10 numbers shall be secure enought!
if (isExtensionActive('other')) {
@@ -685,12 +553,14 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') {
$len = $length;
} // END - if
- if ($len == '0') {
+ // Smaller 1 is not okay
+ if ($len < 1) {
+ // Fix it to 10
$len = 10;
} // END - if
- // Cut off requested counts of number
- $return = substr(str_replace('.', '', $rcode), 0, $len);
+ // Cut off requested counts of number, but skip first digit (which is mostly a zero)
+ $return = substr($rcode, (strpos($rcode, '.') + 1), $len);
// Done building code
return $return;
@@ -698,6 +568,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);
@@ -710,10 +581,11 @@ function bigintval ($num, $castValue = true, $abortOnMismatch = true) {
// Has the whole value changed?
if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true) && (!is_null($num))) {
// Log the values
- debug_report_bug(__FUNCTION__, __LINE__, 'Problem with number found. ret[' . gettype($ret) . ']=' . $ret . ', num[' . gettype($num) . ']='. $num);
+ reportBug(__FUNCTION__, __LINE__, 'Problem with number found. ret[' . gettype($ret) . ']=' . $ret . ', num[' . gettype($num) . ']='. $num);
} // END - if
// Return result
+ //* DEBUG: */ debugOutput('[' . __FUNCTION__ . ':' . __LINE__ . '] ' . 'num=' . $num . ',castValue=' . intval($castValue) . ',abortOnMismatch=' . intval($abortOnMismatch) . ',ret=' . $ret . ' - EXIT!');
return $ret;
}
@@ -722,7 +594,7 @@ function createEpocheTimeFromSelections ($prefix, $postData) {
// Initial return value
$ret = '0';
- // Do we have a leap year?
+ // Is there a leap year?
$SWITCH = '0';
$TEST = getYear() / 4;
$M1 = getMonth();
@@ -765,80 +637,50 @@ function createFancyTime ($stamp) {
foreach ($data as $k => $v) {
if ($v > 0) {
// Value is greater than 0 "eval" data to return string
- $ret .= ', ' . $v . ' {--_' . strtoupper($k) . '--}';
+ $ret .= ', ' . $v . ' {%pipe,translateTimeUnit=' . $k . '%}';
break;
} // END - if
} // END - foreach
- // Do we have something there?
+ // Is something there?
if (strlen($ret) > 0) {
// Remove leading commata and space
$ret = substr($ret, 2);
} else {
// Zero seconds
- $ret = '0 {--_SECONDS--}';
+ $ret = '0 {--TIME_UNIT_SECOND--}';
}
// Return fancy time string
return $ret;
}
-// Extract host from script name
-function extractHostnameFromUrl (&$script) {
- // Use default SERVER_URL by default... ;) So?
- $url = getServerUrl();
+// Taken from www.php.net isInStringIgnoreCase() user comments
+function isEmailValid ($email) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'email=' . $email . ' - ENTERED!');
- // 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
+ // Is there cache?
+ if (!isset($GLOBALS[__FUNCTION__][$email])) {
+ // Check first part of email address
+ $first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*';
- // Extract host name
- $host = str_replace('http://', '', $url);
- if (isInString('/', $host)) {
- $host = substr($host, 0, strpos($host, '/'));
- } // END - if
+ // Check domain
+ $domain = '[a-z0-9-]+(\.[a-z0-9-]{2,5})+';
- // 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));
- }
+ // Generate pattern
+ $regex = '@^' . $first . '\@' . $domain . '$@iU';
- //* DEBUG: */ debugOutput('SCRIPT=' . $script);
- if (substr($script, 0, 1) == '/') {
- $script = substr($script, 1);
+ // Determine it
+ $GLOBALS[__FUNCTION__][$email] = (($email != getMessage('DEFAULT_WEBMASTER')) && (preg_match($regex, $email)));
} // END - if
- // Return host name
- return $host;
-}
-
-// Taken from www.php.net isInStringIgnoreCase() user comments
-function isEmailValid ($email) {
- // Check first part of email address
- $first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*';
-
- // Check domain
- $domain = '[a-z0-9-]+(\.[a-z0-9-]{2,5})+';
-
- // Generate pattern
- $regex = '@^' . $first . '\@' . $domain . '$@iU';
-
// Return check result
- return preg_match($regex, $email);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'email=' . $email . ',isValid=' . intval($GLOBALS[__FUNCTION__][$email]) . ' - EXIT!');
+ return $GLOBALS[__FUNCTION__][$email];;
}
// Function taken from user comments on www.php.net / function isInStringIgnoreCase()
-function isUrlValid ($url, $compile=true) {
+function isUrlValid ($url, $compile = true) {
// Trim URL a little
$url = trim(urldecode($url));
//* DEBUG: */ debugOutput($url);
@@ -855,8 +697,10 @@ function isUrlValid ($url, $compile=true) {
return FILTER_VALIDATE_URL($url, false);
} // END - if
- // If not installed, perform a simple test. Just make it sure there is always a http:// or
- // https:// in front of the URLs
+ /*
+ * If not installed, perform a simple test. Just make it sure there is always a
+ * http:// or https:// in front of the URLs.
+ */
return isUrlValidSimple($url);
}
@@ -878,28 +722,28 @@ function generateHash ($plainText, $salt = '', $hash = true) {
}
} // END - if
- // Do we miss an arry element here?
+ // Is an arry element missing here?
if (!isConfigEntrySet('file_hash')) {
// Stop here
- debug_report_bug(__FUNCTION__, __LINE__, 'Missing file_hash in ' . __FUNCTION__ . '.');
+ reportBug(__FUNCTION__, __LINE__, 'Missing file_hash in ' . __FUNCTION__ . '.');
} // END - if
// 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() . getDateFromPatchTime() . 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).')
');
@@ -918,7 +762,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
// Sanity check on salt
if (strlen($salt) != getSaltLength()) {
// Not the same!
- debug_report_bug(__FUNCTION__, __LINE__, 'salt length mismatch! (' . strlen($salt) . '/' . getSaltLength() . ')');
+ reportBug(__FUNCTION__, __LINE__, 'salt length mismatch! (' . strlen($salt) . '/' . getSaltLength() . ')');
} // END - if
}
@@ -970,13 +814,17 @@ function scrambleString ($str) {
// De-scramble a string scrambled by scrambleString()
function descrambleString ($str) {
// Scramble only 40 chars long strings
- if (strlen($str) != 40) return $str;
+ if (strlen($str) != 40) {
+ return $str;
+ } // END - if
// Load numbers from config
$scrambleNums = explode(':', getPassScramble());
// Validate numbers
- if (count($scrambleNums) != 40) return $str;
+ if (count($scrambleNums) != 40) {
+ return $str;
+ } // END - if
// Begin descrambling
$orig = str_repeat(' ', 40);
@@ -1085,11 +933,20 @@ function getCurrentTheme () {
// The default theme is 'default'... ;-)
$ret = 'default';
- // Do we have ext-theme installed and active?
+ // Is there ext-theme installed and active or is 'theme' in URL or POST data?
if (isExtensionActive('theme')) {
// Call inner method
$ret = getActualTheme();
- } // END - if
+ } elseif ((isPostRequestElementSet('theme')) && (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme'))))) {
+ // Use value from POST data
+ $ret = postRequestElement('theme');
+ } elseif ((isGetRequestElementSet('theme')) && (isIncludeReadable(sprintf("theme/%s/theme.php", getRequestElement('theme'))))) {
+ // Use value from GET data
+ $ret = getRequestElement('theme');
+ } elseif ((isMailerThemeSet()) && (isIncludeReadable(sprintf("theme/%s/theme.php", getMailerTheme())))) {
+ // Use value from GET data
+ $ret = getMailerTheme();
+ }
// Return theme value
return $ret;
@@ -1168,39 +1025,50 @@ function generateSeed () {
// Converts a message code to a human-readable message
function getMessageFromErrorCode ($code) {
- $message = '';
+ // Default is an unknown error code
+ $message = '{%message,UNKNOWN_ERROR_CODE=' . $code . '%}';
+
+ // Which code is provided?
switch ($code) {
- case '': break;
- case getCode('LOGOUT_DONE') : $message = '{--LOGOUT_DONE--}'; 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;
- case getCode('STATS_404') : $message = '{--MAIL_STATS_404--}'; break;
- case getCode('ALREADY_CONFIRMED') : $message = '{--MAIL_ALREADY_CONFIRMED--}'; break;
- case getCode('WRONG_PASS') : $message = '{--LOGIN_WRONG_PASS--}'; break;
- case getCode('WRONG_ID') : $message = '{--LOGIN_WRONG_ID--}'; break;
- case getCode('ACCOUNT_LOCKED') : $message = '{--LOGIN_STATUS_LOCKED--}'; break;
- case getCode('ACCOUNT_UNCONFIRMED'): $message = '{--LOGIN_STATUS_UNCONFIRMED--}'; break;
- 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('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('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;
- case getCode('MORE_RECEIVERS1') : $message = '{--MEMBER_ENTER_MORE_RECEIVERS--}'; break;
- case getCode('MORE_RECEIVERS2') : $message = '{--MEMBER_NO_MORE_RECEIVERS_FOUND--}'; break;
- case getCode('MORE_RECEIVERS3') : $message = '{--MEMBER_ENTER_MORE_MIN_RECEIVERS--}'; break;
- case getCode('INVALID_URL') : $message = '{--MEMBER_ENTER_INVALID_URL--}'; break;
- case getCode('NO_MAIL_TYPE') : $message = '{--MEMBER_NO_MAIL_TYPE_SELECTED--}'; break;
- case getCode('UNKNOWN_ERROR') : $message = '{--LOGIN_UNKNOWN_ERROR--}'; break;
- case getCode('UNKNOWN_STATUS') : $message = '{--LOGIN_UNKNOWN_STATUS--}'; break;
- case getCode('PROFILE_UPDATED') : $message = '{--MEMBER_PROFILE_UPDATED--}'; break;
+ case '':
+ // No error code is bad coding practice
+ reportBug(__FUNCTION__, __LINE__, 'Empty error code supplied. Please fix your code.');
+ break;
+
+ // All error messages
+ case getCode('LOGOUT_DONE') : $message = '{--LOGOUT_DONE--}'; 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;
+ case getCode('STATS_404') : $message = '{--MAIL_STATS_404--}'; break;
+ case getCode('ALREADY_CONFIRMED') : $message = '{--MAIL_ALREADY_CONFIRMED--}'; 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=' . 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(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;
+ case getCode('MORE_RECEIVERS1') : $message = '{--MEMBER_ENTER_MORE_RECEIVERS--}'; break;
+ case getCode('MORE_RECEIVERS2') : $message = '{--MEMBER_NO_MORE_RECEIVERS_FOUND--}'; break;
+ case getCode('MORE_RECEIVERS3') : $message = '{--MEMBER_ENTER_MORE_MIN_RECEIVERS--}'; break;
+ case getCode('INVALID_URL') : $message = '{--MEMBER_ENTER_INVALID_URL--}'; break;
+ case getCode('NO_MAIL_TYPE') : $message = '{--MEMBER_NO_MAIL_TYPE_SELECTED--}'; break;
+ case getCode('PROFILE_UPDATED') : $message = '{--MEMBER_PROFILE_UPDATED--}'; break;
+ case getCode('UNKNOWN_REDIRECT') : $message = '{--UNKNOWN_REDIRECT_VALUE--}'; break;
+ case getCode('WRONG_PASS') : $message = '{--LOGIN_WRONG_PASS--}'; break;
+ case getCode('WRONG_ID') : $message = '{--LOGIN_WRONG_ID--}'; break;
+ case getCode('ACCOUNT_LOCKED') : $message = '{--LOGIN_STATUS_LOCKED--}'; break;
+ case getCode('ACCOUNT_UNCONFIRMED') : $message = '{--LOGIN_STATUS_UNCONFIRMED--}'; break;
+ case getCode('COOKIES_DISABLED') : $message = '{--LOGIN_COOKIES_DISABLED--}'; break;
+ case getCode('UNKNOWN_ERROR') : $message = '{--LOGIN_UNKNOWN_ERROR--}'; break;
+ case getCode('UNKNOWN_STATUS') : $message = '{--LOGIN_UNKNOWN_STATUS--}'; break;
+ case getCode('LOGIN_EMPTY_ID') : $message = '{--LOGIN_ID_IS_EMPTY--}'; break;
+ case getCode('LOGIN_EMPTY_PASSWORD'): $message = '{--LOGIN_PASSWORD_IS_EMPTY--}'; break;
case getCode('ERROR_MAILID'):
if (isExtensionActive('mailid', true)) {
@@ -1211,8 +1079,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 +1089,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);
@@ -1246,11 +1114,8 @@ function getMessageFromErrorCode ($code) {
break;
default:
- // Missing/invalid code
- $message = '{%message,UNKNOWN_MAILID_CODE=' . $code . '%}';
-
- // Log it
- logDebugMessage(__FUNCTION__, __LINE__, $message);
+ // Log missing/invalid error codes
+ logDebugMessage(__FUNCTION__, __LINE__, getMessage('UNKNOWN_MAILID_CODE', $code));
break;
} // END - switch
@@ -1260,8 +1125,9 @@ function getMessageFromErrorCode ($code) {
// Function taken from user comments on www.php.net / function isInStringIgnoreCase()
function isUrlValidSimple ($url) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'url=' . $url . ' - ENTERED!');
// Prepare URL
- $url = secureString(str_replace("\\", '', compileRawCode(urldecode($url))));
+ $url = secureString(str_replace(chr(92), '', compileRawCode(urldecode($url))));
// Allows http and https
$http = "(http|https)+(:\/\/)";
@@ -1323,6 +1189,7 @@ function isUrlValidSimple ($url) {
} // END - foreach
// Return true/false
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'url=' . $url . ',reg=' . intval($reg) . ' - EXIT!');
return $reg;
}
@@ -1341,12 +1208,12 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
$tmp = $FQFN . '.tmp';
// Open the source file
- $fp = fopen($FQFN, 'r') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot read. file=' . basename($FQFN));
+ $fp = fopen($FQFN, 'r') or reportBug(__FUNCTION__, __LINE__, 'Cannot read. file=' . basename($FQFN));
// Is the resource valid?
if (is_resource($fp)) {
// Open temporary file
- $fp_tmp = fopen($tmp, 'w') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write. tmp=' . basename($tmp) . ',file=' . $FQFN);
+ $fp_tmp = fopen($tmp, 'w') or reportBug(__FUNCTION__, __LINE__, 'Cannot write. tmp=' . basename($tmp) . ',file=' . $FQFN);
// Is the resource again valid?
if (is_resource($fp_tmp)) {
@@ -1358,7 +1225,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
@@ -1366,7 +1233,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
if ($next > -1) {
if ($next === $seek) {
$next = -1;
- $line = $prefix . $inserted . $suffix . "\n";
+ $line = $prefix . $inserted . $suffix . chr(10);
} else {
$next++;
}
@@ -1398,33 +1265,19 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
}
} else {
// File not found, not readable or writeable
- debug_report_bug(__FUNCTION__, __LINE__, 'File not readable/writeable. file=' . basename($FQFN));
+ reportBug(__FUNCTION__, __LINE__, 'File not readable/writeable. file=' . basename($FQFN));
}
// An error was detected!
return false;
}
-// Send notification to admin
-function sendAdminNotification ($subject, $templateName, $content = array(), $userid = NULL) {
- 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-dated way
- /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'admins=N,subject=' . $subject . ',templateName=' . $templateName);
- $message = loadEmailTemplate($templateName, $content, $userid);
- sendAdminEmails($subject, $message);
- }
-}
-
// Debug message logger
function logDebugMessage ($funcFile, $line, $message, $force=true) {
// Is debug mode enabled?
if ((isDebugModeEnabled()) || ($force === true)) {
// Remove CRLF
- $message = str_replace("\r", '', str_replace("\n", '', $message));
+ $message = str_replace(array(chr(13), chr(10)), array('', ''), $message);
// Log this message away
appendLineToFile(getPath() . getCachePath() . 'debug.log', generateDateTime(time(), '4') . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message);
@@ -1436,11 +1289,11 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
// Default is the value itself
$ret = $value;
- // Do we have a special filter function?
+ // Is there a special filter function?
if (!empty($filterFunction)) {
// Does the filter function exist?
if (function_exists($filterFunction)) {
- // Do we have extra parameters here?
+ // Is there extra parameters here?
if (!empty($extraValue)) {
// Put both parameters in one new array by default
$args = array($value, $extraValue);
@@ -1453,9 +1306,21 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
// Call the multi-parameter call-back
$ret = call_user_func_array($filterFunction, $args);
+
+ // Is $ret 'true'?
+ if ($ret === true) {
+ // Test passed, so write direct value
+ $ret = $args;
+ } // END - if
} else {
// One parameter call
$ret = call_user_func($filterFunction, $value);
+
+ // Is $ret 'true'?
+ if ($ret === true) {
+ // Test passed, so write direct value
+ $ret = $value;
+ } // END - if
}
} // END - if
} // END - if
@@ -1465,7 +1330,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
}
// Converts timestamp selections into a timestamp
-function convertSelectionsToEpocheTime (array &$postData, array &$DATA, &$id, &$skip) {
+function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id, &$skip) {
// Init test variable
$skip = false;
$test2 = '';
@@ -1477,10 +1342,10 @@ function convertSelectionsToEpocheTime (array &$postData, array &$DATA, &$id, &$
if (in_array($test, array('_ye', '_mo', '_we', '_da', '_ho', '_mi', '_se'))) {
// Found a multi-selection for timings?
$test = substr($id, 0, -3);
- if ((isset($postData[$test.'_ye'])) && (isset($postData[$test.'_mo'])) && (isset($postData[$test.'_we'])) && (isset($postData[$test.'_da'])) && (isset($postData[$test.'_ho'])) && (isset($postData[$test.'_mi'])) && (isset($postData[$test.'_se'])) && ($test != $test2)) {
+ if ((isset($postData[$test . '_ye'])) && (isset($postData[$test . '_mo'])) && (isset($postData[$test . '_we'])) && (isset($postData[$test . '_da'])) && (isset($postData[$test . '_ho'])) && (isset($postData[$test . '_mi'])) && (isset($postData[$test . '_se'])) && ($test != $test2)) {
// Generate timestamp
$postData[$test] = createEpocheTimeFromSelections($test, $postData);
- $DATA[] = sprintf("`%s`='%s'", $test, $postData[$test]);
+ array_push($content, sprintf("`%s`='%s'", $test, $postData[$test]));
$GLOBALS['skip_config'][$test] = true;
// Remove data from array
@@ -1497,6 +1362,7 @@ function convertSelectionsToEpocheTime (array &$postData, array &$DATA, &$id, &$
}
// Reverts the german decimal comma into Computer decimal dot
+// OPPOMENT: translateComma()
function convertCommaToDot ($str) {
// Default float is not a float... ;-)
$float = false;
@@ -1508,14 +1374,14 @@ function convertCommaToDot ($str) {
$str = str_replace('.', '', $str);
// Replace german commata with decimal dot and cast it
- $float = (float)str_replace(',', '.', $str);
+ $float = (float) str_replace(',', '.', $str);
break;
default: // US and so on
- // Remove thousand dots first and cast
- $float = (float)str_replace(',', '', $str);
+ // Remove thousand commatas first and cast
+ $float = (float) str_replace(',', '', $str);
break;
- }
+ } // END - switch
// Return float
return $float;
@@ -1553,10 +1419,10 @@ 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()) {
+ if ((isExtensionInstalled('cache')) && (isCacheInstanceValid())) {
// Rebuild cache
if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
// Destroy it
@@ -1583,6 +1449,9 @@ function rebuildCache ($cache, $inc = '', $force = false) {
// Determines the real remote address
function determineRealRemoteAddress ($remoteAddr = false) {
+ // Default is 127.0.0.1
+ $address = '127.0.0.1';
+
// Is a proxy in use?
if ((isset($_SERVER['HTTP_X_FORWARDED_FOR'])) && (!$remoteAddr)) {
// Proxy was used
@@ -1590,7 +1459,7 @@ function determineRealRemoteAddress ($remoteAddr = false) {
} elseif ((isset($_SERVER['HTTP_CLIENT_IP'])) && (!$remoteAddr)) {
// Yet, another proxy
$address = $_SERVER['HTTP_CLIENT_IP'];
- } else {
+ } elseif (isset($_SERVER['REMOTE_ADDR'])) {
// The regular address when no proxy was used
$address = $_SERVER['REMOTE_ADDR'];
}
@@ -1609,8 +1478,8 @@ function determineRealRemoteAddress ($remoteAddr = false) {
// This is a high-level function!
function addNewBonusMail ($data, $mode = '', $output = true) {
// Use mode from data if not set and availble ;-)
- if ((empty($mode)) && (isset($data['mode']))) {
- $mode = $data['mode'];
+ if ((empty($mode)) && (isset($data['mail_mode']))) {
+ $mode = $data['mail_mode'];
} // END - if
// Generate receiver list
@@ -1644,97 +1513,6 @@ function addNewBonusMail ($data, $mode = '', $output = true) {
}
}
-// Determines referal id and sets it
-function determineReferalId () {
- // 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()) {
- // 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')) {
- // The variable user comes from click.php
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestParameter('user') . ')');
- setReferalId(bigintval(getRequestParameter('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()) {
- // Select a random user which has confirmed enougth mails
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Checking random referal id');
- setReferalId(determineRandomReferalId());
- } 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());
- } else {
- // No default id when sql_patches is not installed or none set
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using NULL as refid');
- setReferalId(NULL);
- }
-
- // Set cookie when default refid > 0
- if (!isSessionVariableSet('refid') || (!isValidUserId(getReferalId())) || ((!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()))) {
- // Nickname in URL, so load the id
- $found = fetchUserData(getReferalId(), 'nickname');
-
- // If we found it, use the userid as referal 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'));
- } // END - if
- } elseif (isValidUserId(getReferalId())) {
- // Direct userid entered
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using direct userid (' . getReferalId() . ')');
- $found = fetchUserData(getReferalId());
- }
-
- // Is the record valid?
- if ((($found === false) || (!isUserDataValid())) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2'))) {
- // No, then reset referal id
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')');
- setReferalId(getDefRefid());
- } // END - if
-
- // Set cookie
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #1');
- setSession('refid', getReferalId());
- } elseif (!isReferalIdValid()) {
- // Not valid!
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not valid referal id (' . getReferalId() . '), setting NULL in session');
- setSession('refid', NULL);
- } elseif ((!isSessionVariableSet('refid')) && (isValidUserId(getReferalId()))) {
- // Set it from GLOBALS array in session
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #2');
- setSession('refid', getReferalId());
- }
-
- // Return determined refid
- return getReferalId();
-}
-
// Enables the reset mode and runs it
function doReset () {
// Enable the reset mode
@@ -1753,10 +1531,10 @@ function doHourly () {
runFilterChain('hourly');
}
-// Our shutdown-function
-function shutdown () {
+// Shuts down the mailer (e.g. closing database link, flushing output/filters, etc.)
+function doShutdown () {
// Call the filter chain 'shutdown'
- runFilterChain('shutdown', null);
+ runFilterChain('shutdown', NULL);
// Check if not in installation phase and the link is up
if ((!isInstallationPhase()) && (SQL_IS_LINK_UP())) {
@@ -1764,7 +1542,7 @@ function shutdown () {
SQL_CLOSE(__FUNCTION__, __LINE__);
} elseif (!isInstallationPhase()) {
// No database link
- debug_report_bug(__FUNCTION__, __LINE__, 'Database link is already down, while shutdown is running.');
+ reportBug(__FUNCTION__, __LINE__, 'Database link is already down, while shutdown is running.');
}
// Stop executing here
@@ -1780,7 +1558,7 @@ function initMemberId () {
function setMemberId ($memberid) {
// We should not set member id to zero
if ($memberid == '0') {
- debug_report_bug(__FUNCTION__, __LINE__, 'Userid should not be set zero.');
+ reportBug(__FUNCTION__, __LINE__, 'Userid should not be set zero.');
} // END - if
// Set it secured
@@ -1817,7 +1595,7 @@ function getExtraTitle () {
// Is the extra title set?
if (!isExtraTitleSet()) {
// No, then abort here
- debug_report_bug(__FUNCTION__, __LINE__, 'extra_title is not set!');
+ reportBug(__FUNCTION__, __LINE__, 'extra_title is not set!');
} // END - if
// Return it
@@ -1829,22 +1607,32 @@ function isExtraTitleSet () {
return ((isset($GLOBALS['extra_title'])) && (!empty($GLOBALS['extra_title'])));
}
-// Reads a directory recursively by default and searches for files not matching
-// an exclusion pattern. You can now keep the exclusion pattern empty for reading
-// a whole directory.
+/**
+ * Reads a directory recursively by default and searches for files not matching
+ * an exclusion pattern. You can now keep the exclusion pattern empty for reading
+ * a whole directory.
+ *
+ * @param $baseDir Relative base directory to PATH to scan from
+ * @param $prefix Prefix for all positive matches (which files should be found)
+ * @param $fileIncludeDirs whether to include directories in the final output array
+ * @param $addBaseDir whether to add $baseDir to all array entries
+ * @param $excludeArray Excluded files and directories, these must be full files names, e.g. 'what-' will exclude all files named 'what-' but won't exclude 'what-foo.php'
+ * @param $extension File extension for all positive matches
+ * @param $excludePattern Regular expression to exclude more files (preg_match())
+ * @param $recursive whether to scan recursively
+ * @param $suffix Suffix for positive matches ($extension will be appended, too)
+ * @return $foundMatches All found positive matches for above criteria
+ */
function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $addBaseDir = true, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = true, $suffix = '') {
- // Add default entries we should exclude
- $excludeArray[] = '.';
- $excludeArray[] = '..';
- $excludeArray[] = '.svn';
- $excludeArray[] = '.htaccess';
+ // Add default entries we should always exclude
+ array_unshift($excludeArray, '.', '..', '.svn', '.htaccess');
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'baseDir=' . $baseDir . ',prefix=' . $prefix . ' - Entered!');
- // Init includes
- $files = array();
+ // Init found includes
+ $foundMatches = array();
// Open directory
- $dirPointer = opendir(getPath() . $baseDir) or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot read directory ' . basename($baseDir) . '.');
+ $dirPointer = opendir(getPath() . $baseDir) or reportBug(__FUNCTION__, __LINE__, 'Cannot read directory ' . basename($baseDir) . '.');
// Read all entries
while ($baseFile = readdir($dirPointer)) {
@@ -1864,10 +1652,8 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
// Check if the base filenname matches an exclusion pattern and if the pattern is not empty
if ((!empty($excludePattern)) && (preg_match($excludePattern, $baseFile, $match))) {
- // These Lines are only for debugging!!
- //* DEBUG: */ debugOutput('baseDir:' . $baseDir);
- //* DEBUG: */ debugOutput('baseFile:' . $baseFile);
- //* DEBUG: */ debugOutput('FQFN:' . $FQFN);
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'baseDir=' . $baseDir . ',baseFile=' . $baseFile . ',FQFN=' . $FQFN);
// Exclude this one
continue;
@@ -1876,7 +1662,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
// Skip also files with non-matching prefix genericly
if (($recursive === true) && (isDirectory($FQFN))) {
// Is a redirectory so read it as well
- $files = merge_array($files, getArrayFromDirectory($baseDir . $baseFile . '/', $prefix, $fileIncludeDirs, $addBaseDir, $excludeArray, $extension, $excludePattern, $recursive));
+ $foundMatches = merge_array($foundMatches, getArrayFromDirectory($baseDir . $baseFile . '/', $prefix, $fileIncludeDirs, $addBaseDir, $excludeArray, $extension, $excludePattern, $recursive));
// And skip further processing
continue;
@@ -1891,6 +1677,13 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
} elseif (!isFileReadable($FQFN)) {
// Not readable so skip it
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'File ' . $FQFN . ' is not readable!');
+ } elseif (filesize($FQFN) < 50) {
+ // Might be deprecated
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'File ' . $FQFN . ' is to small (' . filesize($FQFN) . ')!');
+ continue;
+ } elseif (($extension == '.php') && (filesize($FQFN) < 50)) {
+ // This PHP script is deprecated
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'File ' . $FQFN . ' is a deprecated PHP script!');
continue;
}
@@ -1908,18 +1701,18 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
// Add file with or without base path
if ($addBaseDir === true) {
// With base path
- $files[] = $fileName;
+ array_push($foundMatches, $fileName);
} else {
// No base path
- $files[] = $baseFile;
+ array_push($foundMatches, $baseFile);
}
} else {
// We found .php file but should not search for them, why?
- debug_report_bug(__FUNCTION__, __LINE__, 'We should find files with extension=' . $extension . ', but we found a PHP script. (baseFile=' . $baseFile . ')');
+ reportBug(__FUNCTION__, __LINE__, 'We should find files with extension=' . $extension . ', but we found a PHP script. (baseFile=' . $baseFile . ')');
}
} elseif ($fileExtension == $extension) {
// Other, generic file found
- $files[] = $fileName;
+ array_push($foundMatches, $fileName);
}
} // END - while
@@ -1927,14 +1720,14 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
closedir($dirPointer);
// Sort array
- sort($files);
+ sort($foundMatches);
// Return array with include files
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
- return $files;
+ return $foundMatches;
}
-// Checks wether $prefix is found in $fileName
+// Checks whether $prefix is found in $fileName
function isFilePrefixFound ($fileName, $prefix) {
// @TODO Find a way to cache this
return (substr($fileName, 0, strlen($prefix)) == $prefix);
@@ -1944,10 +1737,14 @@ function isFilePrefixFound ($fileName, $prefix) {
function mapModuleToTable ($moduleName) {
// Map only these, still lame code...
switch ($moduleName) {
- // 'index' is the guest's menu
- case 'index': $moduleName = 'guest'; break;
- // ... and 'login' the member's menu
- case 'login': $moduleName = 'member'; break;
+ case 'index': // 'index' is the guest's menu
+ $moduleName = 'guest';
+ break;
+
+ case 'login': // ... and 'login' the member's menu
+ $moduleName = 'member';
+ break;
+
// Anything else will not be mapped, silently.
} // END - switch
@@ -1957,7 +1754,7 @@ function mapModuleToTable ($moduleName) {
// Add SQL debug data to array for later output
function addSqlToDebug ($result, $sqlString, $timing, $F, $L) {
- // Do we have cache?
+ // Is there cache?
if (!isset($GLOBALS['debug_sql_available'])) {
// Check it and cache it in $GLOBALS
$GLOBALS['debug_sql_available'] = ((isConfigurationLoaded()) && (isDisplayDebugSqlEnabled()));
@@ -1988,7 +1785,7 @@ function addSqlToDebug ($result, $sqlString, $timing, $F, $L) {
);
// Add it
- $GLOBALS['debug_sqls'][] = $record;
+ array_push($GLOBALS['debug_sqls'], $record);
}
// Initializes the cache instance
@@ -1996,7 +1793,7 @@ function initCacheInstance () {
// Check for double-initialization
if (isset($GLOBALS['cache_instance'])) {
// This should not happen and must be fixed
- debug_report_bug(__FUNCTION__, __LINE__, 'Double initialization of cache system detected. cache_instance[]=' . gettype($GLOBALS['cache_instance']));
+ reportBug(__FUNCTION__, __LINE__, 'Double initialization of cache system detected. cache_instance[]=' . gettype($GLOBALS['cache_instance']));
} // END - if
// Load include for CacheSystem class
@@ -2008,7 +1805,7 @@ function initCacheInstance () {
// Did it work?
if ($GLOBALS['cache_instance']->getStatusCode() != 'done') {
// Failed to initialize cache sustem
- debug_report_bug(__FUNCTION__, __LINE__, 'Cache system returned with unexpected error. getStatusCode()=' . $GLOBALS['cache_instance']->getStatusCode());
+ reportBug(__FUNCTION__, __LINE__, 'Cache system returned with unexpected error. getStatusCode()=' . $GLOBALS['cache_instance']->getStatusCode());
} // END - if
}
@@ -2050,9 +1847,9 @@ function getModuleFromFileName ($file, $accessLevel) {
break;
default: // Unsupported file name / access level
- debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported file name=' . basename($file) . '/access level=' . $accessLevel);
+ reportBug(__FUNCTION__, __LINE__, 'Unsupported file name=' . basename($file) . '/access level=' . $accessLevel);
break;
- }
+ } // END - switch
// Return result
return $modCheck;
@@ -2060,28 +1857,24 @@ 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())) {
+ // Is there already have a PHPSESSID inside or view.php is called? Then abort here
+ if ((isInStringIgnoreCase(session_name(), $url)) || (isRawOutputMode())) {
// Raw output mode detected or session_name() found in URL
return $url;
} // END - if
- // Do we have a valid session?
+ // Is there 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 = '?';
- } elseif ((!isHtmlOutputMode()) || ($outputMode != '0')) {
- // Non-HTML mode (or forced non-HTML mode
- $seperator = '&';
- }
+ $separator = '?';
+ } // END - if
// Add it to URL
if (session_id() != '') {
- $url .= $seperator . session_name() . '=' . session_id();
+ $url .= $separator . session_name() . '=' . session_id();
} // END - if
} // END - if
@@ -2091,14 +1884,23 @@ function encodeUrl ($url, $outputMode = '0') {
$url = '{?URL?}/' . $url;
} // END - if
- // Return the URL
+ // Is there to decode entities?
+ if ((!isHtmlOutputMode()) || ($outputMode != '0')) {
+ // Decode them for e.g. JavaScript parts
+ $url = decodeEntities($url);
+ } // END - if
+
+ // Debug log
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'url=' . $url . ',outputMode=' . $outputMode);
+
+ // Return the encoded URL
return $url;
}
// 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)) {
@@ -2107,7 +1909,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
@@ -2151,15 +1953,19 @@ function searchDirsRecursive ($dir, &$last_changed, $lookFor = 'Date') {
function handleFieldWithBraces ($field) {
// Are there braces [] at the end?
if (substr($field, -2, 2) == '[]') {
- // Try to find one and replace it. I do it this way to allow easy
- // extending of this code.
+ /*
+ * Try to find one and replace it. I do it this way to allow easy
+ * extending of this code.
+ */
foreach (array('admin_list_builder_id_value') as $key) {
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key);
// Is the cache entry set?
if (isset($GLOBALS[$key])) {
// Insert it
$field = str_replace('[]', '[' . $GLOBALS[$key] . ']', $field);
// And abort
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key, 'field=' . $field);
break;
} // END - if
} // END - foreach
@@ -2170,9 +1976,9 @@ function handleFieldWithBraces ($field) {
}
// Converts a zero or NULL to word 'NULL'
-function makeZeroToNull ($number) {
+function convertZeroToNull ($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 {
@@ -2184,13 +1990,16 @@ function makeZeroToNull ($number) {
return $number;
}
-// Converts NULL into number zero
-function makeNullToZero ($number) {
- // Is this a NULL?
- if ((is_null($number)) || (empty($number))) {
- // Simply set it
+// Converts a NULL to zero
+function convertNullToZero ($number) {
+ // 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;
@@ -2199,7 +2008,7 @@ function makeNullToZero ($number) {
// Capitalizes a string with underscores, e.g.: some_foo_string will become SomeFooString
// Note: This function is cached
function capitalizeUnderscoreString ($str) {
- // Do we have cache?
+ // Is there cache?
if (!isset($GLOBALS[__FUNCTION__][$str])) {
// Init target string
$capitalized = '';
@@ -2251,14 +2060,14 @@ function generateAdminMailLinks ($mailType, $mailId) {
// Is the mail type supported?
if (!empty($table)) {
// Query for the mail
- $result = SQL_QUERY_ESC("SELECT `id`, `%s` AS `mail_status` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `id`=%s LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `id`,`%s` AS `mail_status` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `id`=%s LIMIT 1",
array(
$statusColumn,
$table,
bigintval($mailId)
), __FILE__, __LINE__);
- // Do we have one entry there?
+ // Is there one entry there?
if (SQL_NUMROWS($result) == 1) {
// Load the entry
$content = SQL_FETCHARRAY($result);
@@ -2305,7 +2114,7 @@ function isHexadecimal ($hex) {
}
/**
- * Replace "\r" with "[r]" and "\n" with "[n]" and add a final new-line to make
+ * Replace chr(13) with "[r]" and chr(10) with "[n]" and add a final new-line to make
* them visible to the developer. Use this function to debug e.g. buggy HTTP
* response handler functions.
*
@@ -2313,8 +2122,7 @@ function isHexadecimal ($hex) {
* @return $str Overworked string
*/
function replaceReturnNewLine ($str) {
- return str_replace("\r", '[r]', str_replace("\n", '[n]
-', $str));
+ return str_replace(array(chr(13), chr(10)), array('[r]', '[n]'), $str);
}
// Converts a given string by splitting it up with given delimiter similar to
@@ -2326,7 +2134,7 @@ function stringToArray ($delimiter, $string) {
// "Walk" through all entries
foreach (explode($delimiter, $string) as $split) {
// Append the delimiter and add it to the array
- $strArray[] = $split . $delimiter;
+ array_push($strArray, $split . $delimiter);
} // END - foreach
// Return array
@@ -2355,11 +2163,11 @@ function getArrayKeysFromSubStrArray ($heystack, $needles, $offset = 0) {
// Now check all entries
foreach ($needles as $key => $needle) {
- // Do we have found a partial string?
+ // Is there found a partial string?
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'heystack='.$heystack.',key='.$key.',needle='.$needle.',offset='.$offset);
if (strpos($heystack, $needle, $offset) !== false) {
// Add the found key
- $keys[] = $key;
+ array_push($keys, $key);
} // END - if
} // END - foreach
@@ -2396,21 +2204,6 @@ function determinePointsColumnFromSubjectLocked ($subject, $locked) {
return $pointsColumn;
}
-// Setter for referal id (no bigintval, or nicknames will fail!)
-function setReferalId ($refid) {
- $GLOBALS['refid'] = $refid;
-}
-
-// Checks if 'refid' is valid
-function isReferalIdValid () {
- return ((isset($GLOBALS['refid'])) && (getReferalId() !== NULL) && (getReferalId() > 0));
-}
-
-// Getter for referal id
-function getReferalId () {
- return $GLOBALS['refid'];
-}
-
// Converts a boolean variable into 'Y' for true and 'N' for false
function convertBooleanToYesNo ($boolean) {
// Default is 'N'
@@ -2424,55 +2217,28 @@ function convertBooleanToYesNo ($boolean) {
return $converted;
}
-// Translates task type to a human-readable version
-function translateTaskType ($taskType) {
- // Construct message id
- $messageId = 'ADMIN_TASK_TYPE_' . strtoupper($taskType) . '';
-
- // Is the message id there?
- if (isMessageIdValid($messageId)) {
- // Then construct message
- $message = '{--' . $messageId . '--}';
- } else {
- // Else it is an unknown task type
- $message = '{%message,ADMIN_TASK_TYPE_UNKNOWN=' . $taskType . '%}';
- } // END - if
-
- // Return message
- return $message;
-}
-
-// Translates points subject to human-readable
-function translatePointsSubject ($subject) {
- // Construct message id
- $messageId = 'POINTS_SUBJECT_' . strtoupper($subject) . '';
-
- // Is the message id there?
- if (isMessageIdValid($messageId)) {
- // Then construct message
- $message = '{--' . $messageId . '--}';
- } else {
- // Else it is an unknown task type
- $message = '{%message,POINTS_SUBJECT_UNKNOWN=' . $subject . '%}';
- } // END - if
-
- // Return message
- return $message;
-}
-
// "Translates" 'true' to true and 'false' to false
function convertStringToBoolean ($str) {
- // Trim it lower-case for validation
- $str = trim(strtolower($str));
+ // Debug message (to measure how often this function is called)
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str);
+
+ // Is there cache?
+ if (!isset($GLOBALS[__FUNCTION__][$str])) {
+ // Trim it lower-case for validation
+ $strTrimmed = trim(strtolower($str));
+
+ // Is it valid?
+ if (!in_array($strTrimmed, array('true', 'false'))) {
+ // Not valid!
+ reportBug(__FUNCTION__, __LINE__, 'str=' . $str . '(' . $strTrimmed . ') is not true/false');
+ } // END - if
- // Is it valid?
- if (!in_array($str, array('true', 'false'))) {
- // Not valid!
- debug_report_bug(__FUNCTION__, __LINE__, 'str=' . $str . ' is not true/false');
+ // Determine it
+ $GLOBALS[__FUNCTION__][$str] = (($strTrimmed == 'true') ? true : false);
} // END - if
- // Return it
- return (($str == 'true') ? true : false);
+ // Return cache
+ return $GLOBALS[__FUNCTION__][$str];
}
/**
@@ -2486,19 +2252,238 @@ function makeParseableVariable ($varString) {
// The first character must be a dollar sign
if (substr($varString, 0, 1) != '$') {
// Please report this
- debug_report_bug(__FUNCTION__, __LINE__, 'varString=' . $varString . ' - No dollar sign detected, will not parse it.');
+ reportBug(__FUNCTION__, __LINE__, 'varString=' . $varString . ' - No dollar sign detected, will not parse it.');
} // END - if
- // Do we have cache?
+ // Is there cache?
if (!isset($GLOBALS[__FUNCTION__][$varString])) {
// Snap them in, if [,] are there
- $GLOBALS[__FUNCTION__][$varString] = str_replace('[', "['", str_replace(']', "']", $varString));
+ $GLOBALS[__FUNCTION__][$varString] = str_replace(array('[', ']'), array("['", "']"), $varString);
} // END - if
// Return cache
return $GLOBALS[__FUNCTION__][$varString];
}
+// "Getter" for random TAN
+function getRandomTan () {
+ // Generate one
+ return mt_rand(0, 99999);
+}
+
+// Removes any : from subject
+function removeDoubleDotFromSubject ($subject) {
+ // Remove it
+ $subjectArray = explode(':', $subject);
+ $subject = $subjectArray[0];
+ unset($subjectArray);
+
+ // Return it
+ return $subject;
+}
+
+// Adds a given entry to the database
+function memberAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
+ // Is it a member?
+ if (!isMember()) {
+ // Then abort here
+ return false;
+ } // END - if
+
+ // Set POST data generic userid
+ setPostRequestElement('userid', getMemberId());
+
+ // Call inner function
+ doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
+
+ // Entry has been added?
+ if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === true)) {
+ // Display success message
+ displayMessage('{--MEMBER_ENTRY_ADDED--}');
+ } else {
+ // Display failed message
+ displayMessage('{--MEMBER_ENTRY_NOT_ADDED--}');
+ }
+}
+
+// Edit rows by given id numbers
+function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+ // $tableName must be an array
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // No tableName specified
+ reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($userIdColumn)) {
+ // $userIdColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($editNow)) {
+ // $editNow is no array
+ reportBug(__FUNCTION__, __LINE__, 'editNow[]=' . gettype($editNow) . '!=array: userIdColumn=' . $userIdColumn);
+ } // END - if
+
+ // Shall we change here or list for editing?
+ if ($editNow[0] === true) {
+ // Add generic userid field
+ setPostRequestElement('userid', getMemberId());
+
+ // Call generic change method
+ $affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
+
+ // Was this fine?
+ if ($affected == countPostSelection($idColumn[0])) {
+ // All deleted
+ displayMessage('{--MEMBER_ALL_ENTRIES_EDITED--}');
+ } else {
+ // Some are still there :(
+ displayMessage(sprintf(getMessage('MEMBER_SOME_ENTRIES_NOT_EDITED'), $affected, countPostSelection($idColumn[0])));
+ }
+ } else {
+ // List for editing
+ memberListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ }
+}
+
+// Delete rows by given id numbers
+function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+ // Do this only for members
+ assert(isMember());
+
+ // $tableName must be an array
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // No tableName specified
+ reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($userIdColumn)) {
+ // $userIdColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($deleteNow)) {
+ // $deleteNow is no array
+ reportBug(__FUNCTION__, __LINE__, 'deleteNow[]=' . gettype($deleteNow) . '!=array: userIdColumn=' . $userIdColumn);
+ } // END - if
+
+ // Shall we delete here or list for deletion?
+ if ($deleteNow[0] === true) {
+ // Add generic userid field
+ setPostRequestElement('userid', getMemberId());
+
+ // Call generic function
+ $affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
+
+ // Was this fine?
+ if ($affected == countPostSelection($idColumn[0])) {
+ // All deleted
+ displayMessage('{--MEMBER_ALL_ENTRIES_REMOVED--}');
+ } else {
+ // Some are still there :(
+ displayMessage(sprintf(getMessage('MEMBER_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), countPostSelection($idColumn[0])));
+ }
+ } else {
+ // List for deletion confirmation
+ memberListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ }
+}
+
+// Build a special template list
+function memberListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+ // Do this only for logged in member
+ assert(isMember());
+
+ // Call inner (general) function
+ doGenericListBuilder('member', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId);
+}
+
+// Checks whether given address is IPv4
+function isIp4AddressValid ($address) {
+ // Is there cache?
+ if (!isset($GLOBALS[__FUNCTION__][$address])) {
+ // Determine it ...
+ $GLOBALS[__FUNCTION__][$address] = preg_match('/((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9]))/', $address);
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__][$address];
+}
+
+// ----------------------------------------------------------------------------
+// "Translatation" functions for points_data table
+// ----------------------------------------------------------------------------
+
+// Translates generically some data into a target string
+function translateGeneric ($messagePrefix, $data) {
+ // Is the method null or empty?
+ if (is_null($data)) {
+ // Is NULL
+ $data = 'NULL';
+ } elseif (empty($data)) {
+ // Is empty (string)
+ $data = 'EMPTY';
+ } // END - if
+
+ // Default column name is unknown
+ $return = '{%message,' . $messagePrefix . '_UNKNOWN=' . strtoupper($data) . '%}';
+
+ // Construct message id
+ $messageId = $messagePrefix . '_' . strtoupper($data);
+
+ // Is it there?
+ if (isMessageIdValid($messageId)) {
+ // Then use it as message string
+ $return = '{--' . $messageId . '--}';
+ } // END - if
+
+ // Return the column name
+ return $return;
+}
+
+// Translates points subject to human-readable
+function translatePointsSubject ($subject) {
+ // Remove any :x
+ $subject = removeDoubleDotFromSubject($subject);
+
+ // Return it
+ return translateGeneric('POINTS_SUBJECT', $subject);
+}
+
+// "Translates" the given points account type
+function translatePointsAccountType ($accountType) {
+ // Return it
+ return translateGeneric('POINTS_ACCOUNT_TYPE', $accountType);
+}
+
+// "Translates" the given points "locked mode"
+function translatePointsLockedMode ($lockedMode) {
+ // Return it
+ return translateGeneric('POINTS_LOCKED_MODE', $lockedMode);
+}
+
+// "Translates" the given points payment method
+function translatePointsPaymentMethod ($paymentMethod) {
+ // Return it
+ return translateGeneric('POINTS_PAYMENT_METHOD', $paymentMethod);
+}
+
+// "Translates" the given points account provider
+function translatePointsAccountProvider ($accountProvider) {
+ // Return it
+ return translateGeneric('POINTS_ACCOUNT_PROVIDER', $accountProvider);
+}
+
+// "Translates" the given points notify recipient
+function translatePointsNotifyRecipient ($notifyRecipient) {
+ // Return it
+ return translateGeneric('POINTS_NOTIFY_RECIPIENT', $notifyRecipient);
+}
+
+// Translates task type to a human-readable version
+function translateTaskType ($taskType) {
+ // Return it
+ return translateGeneric('ADMIN_TASK_TYPE', $taskType);
+}
+
//-----------------------------------------------------------------------------
// Automatically re-created functions, all taken from user comments on www.php.net
//-----------------------------------------------------------------------------