* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009, 2010 by Mailer Developer Team *
function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') {
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'toEmail=' . $toEmail . ',subject=' . $subject . ',isHtml=' . $isHtml);
- // Compile subject line (for POINTS constant etc.)
- eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");');
-
// Set from header
if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) {
// Value detected, is the message extension installed?
// 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('header');
+ $mailHeader = loadEmailTemplate($prefix . 'header');
} else {
// Append header
- $mailHeader .= loadEmailTemplate('header');
+ $mailHeader .= loadEmailTemplate($prefix . 'header');
}
} // END - if
if (isDebugModeEnabled()) {
// In debug mode we want to display the mail instead of sending it away so we can debug this part
outputHtml('<pre>
-Headers : ' . encodeEntities(utf8_decode(trim($mailHeader))) . '
-To : ' . encodeEntities(utf8_decode($toEmail)) . '
-Subject : ' . encodeEntities(utf8_decode($subject)) . '
-Message : ' . encodeEntities(utf8_decode($message)) . '
+Headers : ' . htmlentities(utf8_decode(trim($mailHeader))) . '
+To : ' . htmlentities(utf8_decode($toEmail)) . '
+Subject : ' . htmlentities(utf8_decode($subject)) . '
+Message : ' . htmlentities(utf8_decode($message)) . '
</pre>');
// This is always fine
return true;
- } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
- // Send mail as HTML away
- return sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
} elseif (!empty($toEmail)) {
// Send Mail away
return sendRawEmail($toEmail, $subject, $message, $mailHeader);
}
// Send out a raw email with PHPMailer class or legacy mail() command
-function sendRawEmail ($toEmail, $subject, $message, $from) {
- // Just compile all again, to put out all configs, etc.
- eval('$toEmail = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($toEmail)), false) . '");');
- eval('$subject = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($subject)), false) . '");');
- eval('$message = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($message)), false) . '");');
- eval('$from = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($from)) , false) . '");');
+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()) {
$mail->Port = 25;
$mail->Username = getConfig('SMTP_USER');
$mail->Password = getConfig('SMTP_PASSWORD');
- if (empty($from)) {
+ if (empty($headers)) {
$mail->From = getConfig('WEBMASTER');
} else {
- $mail->From = $from;
+ $mail->From = $headers;
}
$mail->FromName = getMainTitle();
$mail->Subject = $subject;
} else {
$mail->Body = decodeEntities($message);
}
+
$mail->AddAddress($toEmail, '');
$mail->AddReplyTo(getConfig('WEBMASTER'), getMainTitle());
$mail->AddCustomHeader('Errors-To:' . getConfig('WEBMASTER'));
$mail->AddCustomHeader('X-Loop:' . getConfig('WEBMASTER'));
+ $mail->AddCustomHeader('Bounces-To:' . getConfig('WEBMASTER'));
$mail->Send();
// Has an error occured?
}
} else {
// Use legacy mail() command
- return mail($toEmail, $subject, decodeEntities($message), $from);
+ return mail($toEmail, $subject, decodeEntities($message), $headers);
}
}
// "Translates" 'visible' and 'locked' to a CSS class
function translateMenuVisibleLocked ($content, $prefix = '') {
+ // Default is 'menu_unknown'
+ $content['visible_css'] = $prefix . 'menu_unknown';
+
// Translate 'visible' and keep an eye on the prefix
switch ($content['visible']) {
// Should be visible
} // END - if
// Three different ways to debug...
- //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
+ //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'URL=' . $URL);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL);
//* DEBUG: */ die($URL);
// Clear own output buffer
$GLOBALS['output'] = '';
- // Set header
- setHttpStatus('302 Found');
-
// Load URL when headers are not sent
sendRawRedirect(doFinalCompilation(str_replace('&', '&', $URL), false));
} else {
// Build key string
$keys = getConfig('SITE_KEY') . getEncryptSeperator() . getConfig('DATE_KEY');
- if (isConfigEntrySet('secret_key')) $keys .= getEncryptSeperator().getSecretKey();
- if (isConfigEntrySet('file_hash')) $keys .= getEncryptSeperator().getFileHash();
+ if (isConfigEntrySet('secret_key')) {
+ $keys .= getEncryptSeperator().getSecretKey();
+ } // END - if
+ if (isConfigEntrySet('file_hash')) {
+ $keys .= getEncryptSeperator().getFileHash();
+ } // END - if
$keys .= getEncryptSeperator() . getDateFromPatchTime();
- if (isConfigEntrySet('master_salt')) $keys .= getEncryptSeperator().getMasterSalt();
+ if (isConfigEntrySet('master_salt')) {
+ $keys .= getEncryptSeperator().getMasterSalt();
+ } // END - if
// Build string from misc data
$data = $code . getEncryptSeperator() . $userid . getEncryptSeperator() . $DATA;
// Add more additional data
- if (isSessionVariableSet('u_hash')) $data .= getEncryptSeperator() . getSession('u_hash');
+ if (isSessionVariableSet('u_hash')) {
+ $data .= getEncryptSeperator() . getSession('u_hash');
+ } // END - if
// Add referal id, language, theme and userid
$data .= getEncryptSeperator() . determineReferalId();
$ret = preg_replace('/[^0123456789]/', '', $num);
// Shall we cast?
- if ($castValue === true) $ret = (double)$ret;
+ if ($castValue === true) {
+ // Cast to biggest numeric type
+ $ret = (double) $ret;
+ } // END - if
// Has the whole value changed?
- if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true)) {
+ if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true) && (!is_null($num))) {
// Log the values
debug_report_bug(__FUNCTION__, __LINE__, 'Problem with number found. ret=' . $ret . ', num='. $num);
} // END - if
foreach($data as $k => $v) {
if ($v > 0) {
// Value is greater than 0 "eval" data to return string
- eval('$ret .= ", ".$v." {--_' . strtoupper($k) . '--}";');
+ $ret .= ', ' . $v . ' {--_' . strtoupper($k) . '--}';
break;
} // END - if
} // END - foreach
// Add data
$body = http_build_query($data, '', '&');
- // Do we have a question-mark in the script?
- if (strpos($script, '?') === false) {
- // No, so first char must be question mark
- $body = '?' . $body;
- } else {
- // Ok, add &
- $body = '&' . $body;
- }
+ // There should be data, else we don't need to extend $script with $body
+ if (empty($body)) {
+ // Do we have a question-mark in the script?
+ if (strpos($script, '?') === false) {
+ // No, so first char must be question mark
+ $body = '?' . $body;
+ } else {
+ // Ok, add &
+ $body = '&' . $body;
+ }
- // Add script data
- $script .= $body;
+ // Add script data
+ $script .= $body;
- // Remove trailed & to make it more conform
- if (substr($script, -1, 1) == '&') $script = substr($script, 0, -1);
+ // Remove trailed & to make it more conform
+ if (substr($script, -1, 1) == '&') $script = substr($script, 0, -1);
+ } // END - if
// Generate GET request header
$request = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
// First we need to setup randomized numbers from 0 to 31
for ($idx = 0; $idx < $len; $idx++) {
// Generate number
- $rand = mt_rand(0, ($len -1));
+ $rand = mt_rand(0, ($len - 1));
// Check for it by creating more numbers
while (array_key_exists($rand, $scrambleNumbers)) {
- $rand = mt_rand(0, ($len -1));
+ $rand = mt_rand(0, ($len - 1));
} // END - while
// Add number
if (!isset($trace['file'])) $trace['file'] = __FUNCTION__;
if (!isset($trace['line'])) $trace['line'] = __LINE__;
if (!isset($trace['args'])) $trace['args'] = array();
- $backtrace .= '<li class="debug_list"><span class="backtrace_file">' . basename($trace['file']) . '</span>:' . $trace['line'].", <span class=\"backtrace_function\">" . $trace['function'] . '(' . count($trace['args']) . ')</span></li>';
+ $backtrace .= '<li class="debug_list"><span class="backtrace_file">' . basename($trace['file']) . '</span>:' . $trace['line'] . ', <span class="backtrace_function">' . $trace['function'] . '(' . count($trace['args']) . ')</span></li>';
} // END - foreach
// Close it
switch ($code) {
case '': break;
case getCode('LOGOUT_DONE') : $message = '{--LOGOUT_DONE--}'; break;
- case getCode('LOGOUT_FAILED') : $message = '<span class="guest_failed">{--LOGOUT_FAILED--}</span>'; break;
+ case getCode('LOGOUT_FAILED') : $message = '<span class="notice">{--LOGOUT_FAILED--}</span>'; 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('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 getCode('ERROR_MAILID'):
if (isExtensionActive('mailid', true)) {
$message = '{--ERROR_CONFIRMING_MAIL--}';
} else {
- $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid');
+ $message = generateExtensionInactiveNotInstalledMessage('mailid');
}
break;
}
break;
- case getCode('URL_TLOCK'):
+ 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__);
// Load timestamp from last order
- list($timestamp) = SQL_FETCHROW($result);
+ $content = SQL_FETCHARRAY($result);
// Free memory
SQL_FREERESULT($result);
// Translate it for templates
- $timestamp = generateDateTime($timestamp, 1);
+ $content['timestamp'] = generateDateTime($content['timestamp'], 1);
// Calculate hours...
- $STD = round(getConfig('url_tlock') / 60 / 60);
+ $content['hours'] = round(getConfig('url_tlock') / 60 / 60);
// Minutes...
- $MIN = round((getConfig('url_tlock') - $STD * 60 * 60) / 60);
+ $content['minutes'] = round((getConfig('url_tlock') - $content['hours'] * 60 * 60) / 60);
// And seconds
- $SEC = getConfig('url_tlock') - $STD * 60 * 60 - $MIN * 60;
+ $content['seconds'] = round(getConfig('url_tlock') - $content['hours'] * 60 * 60 - $content['minutes'] * 60);
// Finally contruct the message
- // @TODO Rewrite this old lost code to a template
- $message = '{--MEMBER_URL_TIME_LOCK--}<br />{--CONFIG_URL_TLOCK--} ' . $STD . '
- {--_HOURS--}, ' . $MIN . ' {--_MINUTES--} {--_AND--} ' . $SEC . ' {--_SECONDS--}<br />
- {--MEMBER_LAST_TLOCK--}: ' . $timestamp;
+ $message = loadTemplate('tlock_message', true, $content);
break;
default:
// Check if refid is set
if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) {
// This is fine...
- } elseif ((isGetRequestParameterSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
- // The variable user comes from the click-counter script click.php and we only accept this here
- $GLOBALS['refid'] = bigintval(getRequestParameter('user'));
} elseif (isPostRequestParameterSet('refid')) {
- // Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
+ // Get referal id from POST element refid
$GLOBALS['refid'] = secureString(postRequestParameter('refid'));
} elseif (isGetRequestParameterSet('refid')) {
- // Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
+ // Get referal id from GET parameter refid
$GLOBALS['refid'] = secureString(getRequestParameter('refid'));
} elseif (isGetRequestParameterSet('ref')) {
// Set refid=ref (the referal link uses such variable)
$GLOBALS['refid'] = secureString(getRequestParameter('ref'));
+ } elseif ((isGetRequestParameterSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
+ // The variable user comes from click.php
+ $GLOBALS['refid'] = bigintval(getRequestParameter('user'));
} elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) {
// Set session refid als global
$GLOBALS['refid'] = bigintval(getSession('refid'));
- } elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (isRandomReferalIdEnabled())) {
+ } elseif (isRandomReferalIdEnabled()) {
// Select a random user which has confirmed enougth mails
$GLOBALS['refid'] = determineRandomReferalId();
- } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getConfig('def_refid')))) {
+ } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid()))) {
// Set default refid as refid in URL
- $GLOBALS['refid'] = getConfig('def_refid');
+ $GLOBALS['refid'] = getDefRefid();
} else {
// No default id when sql_patches is not installed or none set
- $GLOBALS['refid'] = '0';
+ $GLOBALS['refid'] = null;
}
// Set cookie when default refid > 0
- if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((!isValidUserId(getSession('refid'))) && (isConfigEntrySet('def_refid')) && (isValidUserId(getConfig('def_refid'))))) {
+ if (!isSessionVariableSet('refid') || (isValidUserId($GLOBALS['refid'])) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) {
// Default is not found
$found = false;
if ((isExtensionActive('nickname')) && (isNicknameUsed($GLOBALS['refid']))) {
// Nickname in URL, so load the id
$found = fetchUserData($GLOBALS['refid'], 'nickname');
- } elseif ($GLOBALS['refid'] > 0) {
+ } elseif (isValidUserId($GLOBALS['refid'])) {
// Direct userid entered
$found = fetchUserData($GLOBALS['refid']);
}
// Is the record valid?
- if ((($found === false) || (!isUserDataValid())) && (isConfigEntrySet('def_refid'))) {
+ if ((($found === false) || (!isUserDataValid())) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2'))) {
// No, then reset referal id
- $GLOBALS['refid'] = getConfig('def_refid');
+ $GLOBALS['refid'] = getDefRefid();
} // END - if
// Set cookie
- setSession('refid', $GLOBALS['refid']);
+ setSession('refid', bigintval($GLOBALS['refid']));
} // END - if
// Return determined refid
// Setter for member id
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.');
+ if ($memberid == '0') {
+ debug_report_bug(__FUNCTION__, __LINE__, 'Userid should not be set zero.');
+ } // END - if
// Set it secured
$GLOBALS['member_id'] = bigintval($memberid);
// Add SQL debug data to array for later output
function addSqlToDebug ($result, $sqlString, $timing, $F, $L) {
- // Already executed?
- if (isset($GLOBALS['debug_sqls'][$F][$L][$sqlString])) {
- // Then abort here, we don't need to profile a query twice
- return;
- } // END - if
-
- // Remeber this as profiled (or not, but we don't care here)
- $GLOBALS['debug_sqls'][$F][$L][$sqlString] = true;
-
// Do we have cache?
if (!isset($GLOBALS['debug_sql_available'])) {
// Check it and cache it in $GLOBALS
return;
} // END - if
+ // Already executed?
+ if (isset($GLOBALS['debug_sqls'][$F][$L][$sqlString])) {
+ // Then abort here, we don't need to profile a query twice
+ return;
+ } // END - if
+
+ // Remeber this as profiled (or not, but we don't care here)
+ $GLOBALS['debug_sqls'][$F][$L][$sqlString] = true;
+
// Generate record
$record = array(
'num_rows' => SQL_NUMROWS($result),
// Simple check for spider
function isSpider () {
- // Get the UA
- $userAgent = strtolower(detectUserAgent(true));
+ // Get the UA and trim it down
+ $userAgent = trim(strtolower(detectUserAgent(true)));
// It should not be empty, if so it is better a spider/bot
if (empty($userAgent)) return true;
return $userid;
}
+// 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?
+ if (!isset($GLOBALS[__FUNCTION__][$str])) {
+ // Init target string
+ $capitalized = '';
+
+ // Explode it with the underscore, but rewrite dashes to underscore before
+ $strArray = explode('_', str_replace('-', '_', $str));
+
+ // "Walk" through all elements and make them lower-case but first upper-case
+ foreach ($strArray as $part) {
+ // Capitalize the string part
+ $capitalized .= ucfirst(strtolower($part));
+ } // END - foreach
+
+ // Store the converted string in cache array
+ $GLOBALS[__FUNCTION__][$str] = $capitalized;
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__][$str];
+}
+
//-----------------------------------------------------------------------------
// Automatically re-created functions, all taken from user comments on www.php.net
//-----------------------------------------------------------------------------
// Taken from documentation on www.php.net, credits to Marco K. (Germany) and some light mods by R.Haeder
function http_build_query($data, $prefix = '', $sep = '', $key = '') {
$ret = array();
- foreach ((array)$data as $k => $v) {
+ foreach ((array) $data as $k => $v) {
if (is_int($k) && $prefix != null) {
$k = urlencode($prefix . $k);
} // END - if
projects / mailer.git / blobdiff