X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=342ab2e3fcf36b64cbc907c6fd2cb2dd189f5def;hp=49ecee6906b7c82217b5860fd49e96f0b1144cc5;hb=eebb737fcb823c159d66732d37c336bc932c3246;hpb=7b0f17cd637e388049d2167811e4332cec1e979b
diff --git a/inc/functions.php b/inc/functions.php
index 49ecee6906..342ab2e3fc 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
require($INC);
}
-// Output HTML code directly or "render" it. You addionally switch the new-line character off
+// Output HTML code directly or 'render' it. You addionally switch the new-line character off
function OUTPUT_HTML ($HTML, $newLine = true) {
// Some global variables
global $OUTPUT;
@@ -49,41 +49,40 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
// Do we have HTML-Code here?
if (!empty($HTML)) {
// Yes, so we handle it as you have configured
- switch (constant('OUTPUT_MODE'))
+ switch (getConfig('OUTPUT_MODE'))
{
- case "render":
- // That's why you don't need any \n at the end of your HTML code... :-)
- if (constant('_OB_CACHING') == "on") {
- // Output into PHP's internal buffer
- outputRawCode($HTML);
-
+ case 'render':
// That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine) echo "\n";
- } else {
- // Render mode for old or lame servers...
- $OUTPUT .= $HTML;
+ if (constant('_OB_CACHING') == 'on') {
+ // Output into PHP's internal buffer
+ outputRawCode($HTML);
- // That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine) $OUTPUT .= "\n";
- }
- break;
+ // That's why you don't need any \n at the end of your HTML code... :-)
+ if ($newLine) echo "\n";
+ } else {
+ // Render mode for old or lame servers...
+ $OUTPUT .= $HTML;
- case 'direct':
- // If we are switching from render to direct output rendered code
- if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != "on")) { outputRawCode($OUTPUT); $OUTPUT = ''; }
+ // That's why you don't need any \n at the end of your HTML code... :-)
+ if ($newLine) $OUTPUT .= "\n";
+ }
+ break;
- // The same as above... ^
- outputRawCode($HTML);
- if ($newLine) echo "\n";
- break;
+ case 'direct':
+ // If we are switching from render to direct output rendered code
+ if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != 'on')) { outputRawCode($OUTPUT); $OUTPUT = ''; }
- default:
- // Huh, something goes wrong or maybe you have edited config.php ???
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE')));
- app_die(__FUNCTION__, __LINE__, "{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
- break;
+ // The same as above... ^
+ outputRawCode($HTML);
+ if ($newLine) echo "\n";
+ break;
+
+ default:
+ // Huh, something goes wrong or maybe you have edited config.php ???
+ app_die(__FUNCTION__, __LINE__, "{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
+ break;
}
- } elseif ((constant('_OB_CACHING') == "on") && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
+ } elseif ((constant('_OB_CACHING') == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
// Headers already sent?
if (headers_sent()) {
// Log this error
@@ -102,25 +101,28 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
} // END - if
// Send HTTP header
- header("HTTP/1.1 200");
+ sendHeader('HTTP/1.1 200');
// Used later
$now = gmdate('D, d M Y H:i:s') . ' GMT';
// General headers for no caching
- header("Expired: " . $now); // RFC2616 - Section 14.21
- header("Last-Modified: " . $now);
- header("Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0"); // HTTP/1.1
- header("Pragma: no-cache"); // HTTP/1.0
- header("Connection: Close");
+ sendHeader('Expired: ' . $now); // RFC2616 - Section 14.21
+ sendHeader('Last-Modified: ' . $now);
+ sendHeader('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
+ sendHeader('Pragma: no-cache'); // HTTP/1.0
+ sendHeader('Connection: Close');
// Extension 'rewrite' installed?
- if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
+ if ((EXT_IS_ACTIVE('rewrite')) && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
$OUTPUT = rewriteLinksInCode($OUTPUT);
} // END - if
// Compile and run finished rendered HTML code
while (strpos($OUTPUT, '{!') > 0) {
+ // Replace _MYSQL_PREFIX
+ $OUTPUT = str_replace("{!_MYSQL_PREFIX!}", getConfig('_MYSQL_PREFIX'), $OUTPUT);
+
// Prepare the content and eval() it...
$newContent = '';
$eval = "\$newContent = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";";
@@ -129,16 +131,16 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
// Was that eval okay?
if (empty($newContent)) {
// Something went wrong!
- app_die(__FUNCTION__, __LINE__, "Evaluation error:".htmlentities($eval)." ");
+ app_die(__FUNCTION__, __LINE__, 'Evaluation error:' . htmlentities($eval) . ' ');
} // END - if
$OUTPUT = $newContent;
} // END - while
// Output code here, DO NOT REMOVE! ;-)
outputRawCode($OUTPUT);
- } elseif ((constant('OUTPUT_MODE') == "render") && (!empty($OUTPUT))) {
+ } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($OUTPUT))) {
// Rewrite links when rewrite extension is active
- if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
+ if ((EXT_IS_ACTIVE('rewrite')) && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
$OUTPUT = rewriteLinksInCode($OUTPUT);
} // END - if
@@ -158,8 +160,8 @@ function outputRawCode ($HTML) {
// Output stripped HTML code to avoid broken JavaScript code, etc.
echo stripslashes(stripslashes($HTML));
- // Flush the output if only constant('_OB_CACHING') is not "on"
- if (constant('_OB_CACHING') != "on") {
+ // Flush the output if only constant('_OB_CACHING') is not 'on'
+ if (constant('_OB_CACHING') != 'on') {
// Flush it
flush();
} // END - if
@@ -209,6 +211,9 @@ function getTotalFatalErrors () {
// Load a template file and return it's content (only it's name; do not use ' or ")
function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
+ // @TODO Remove this sanity-check if all is fine
+ if (!is_bool($return)) debug_report_bug('return is not bool (' . gettype($return) . ')');
+
// Add more variables which you want to use in your template files
global $DATA, $username;
@@ -231,7 +236,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
// @DEPRECATED Try to rewrite the if() condition
- if ($template == "member_support_form") {
+ if ($template == 'member_support_form') {
// Support request of a member
$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
array(getUserId()), __FUNCTION__, __LINE__);
@@ -259,52 +264,55 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
} // END - if
// Generate date/time string
- $date_time = generateDateTime(time(), "1");
+ $date_time = generateDateTime(time(), '1');
// Base directory
$basePath = sprintf("%stemplates/%s/html/", constant('PATH'), getLanguage());
$mode = '';
// Check for admin/guest/member templates
- if (strpos($template, "admin_") > -1) {
+ if (strpos($template, 'admin_') > -1) {
// Admin template found
- $mode = "admin/";
- } elseif (strpos($template, "guest_") > -1) {
+ $mode = 'admin/';
+ } elseif (strpos($template, 'guest_') > -1) {
// Guest template found
- $mode = "guest/";
- } elseif (strpos($template, "member_") > -1) {
+ $mode = 'guest/';
+ } elseif (strpos($template, 'member_') > -1) {
// Member template found
- $mode = "member/";
- } elseif (strpos($template, "install_") > -1) {
+ $mode = 'member/';
+ } elseif (strpos($template, 'install_') > -1) {
// Installation template found
- $mode = "install/";
- } elseif (strpos($template, "ext_") > -1) {
+ $mode = 'install/';
+ } elseif (strpos($template, 'ext_') > -1) {
// Extension template found
- $mode = "ext/";
- } elseif (strpos($template, "la_") > -1) {
- // "Logical-area" template found
- $mode = "la/";
+ $mode = 'ext/';
+ } elseif (strpos($template, 'la_') > -1) {
+ // 'Logical-area' template found
+ $mode = 'la/';
+ } elseif (strpos($template, 'js_') > -1) {
+ // JavaScript template found
+ $mode = 'js/';
} else {
// Test for extension
- $test = substr($template, 0, strpos($template, "_"));
+ $test = substr($template, 0, strpos($template, '_'));
if (EXT_IS_ACTIVE($test)) {
// Set extra path to extension's name
- $mode = $test.'/';
- }
+ $mode = $test . '/';
+ } // END - if
}
////////////////////////
// Generate file name //
////////////////////////
- $FQFN = $basePath.$mode.$template.".tpl";
+ $FQFN = $basePath . $mode . $template . '.tpl';
- if ((!empty($GLOBALS['what'])) && ((strpos($template, "_header") > 0) || (strpos($template, "_footer") > 0)) && (($mode == "guest/") || ($mode == "member/") || ($mode == "admin/"))) {
+ if ((isWhatSet()) && ((strpos($template, '_header') > 0) || (strpos($template, '_footer') > 0)) && (($mode == 'guest/') || ($mode == 'member/') || ($mode == 'admin/'))) {
// Select what depended header/footer template file for admin/guest/member area
$file2 = sprintf("%s%s%s_%s.tpl",
$basePath,
$mode,
$template,
- SQL_ESCAPE($GLOBALS['what'])
+ getWhat()
);
// Probe for it...
@@ -312,12 +320,12 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
// Remove variable from memory
unset($file2);
- }
+ } // END - if
// Does the special template exists?
if (!isFileReadable($FQFN)) {
// Reset to default template
- $FQFN = $basePath.$template.".tpl";
+ $FQFN = $basePath . $template . '.tpl';
} // END - if
// Now does the final template exists?
@@ -340,15 +348,15 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
}
// Add surrounding HTML comments to help finding bugs faster
- $ret = "\n".$ret."\n";
+ $ret = "\n" . $ret . "\n";
} elseif ((IS_ADMIN()) || ((isInstalling()) && (!isInstalled()))) {
// Only admins shall see this warning or when installation mode is active
- $ret = "".TEMPLATE_404." {--TEMPLATE_404--} ".print_r($content, true)."
-".TEMPLATE_DATA."
+{--TEMPLATE_DATA--}
".print_r($DATA, true)."
".__LINE__." ):TO={$toEmail},SUBJECT={$subject}".__LINE__." ):TO={$toEmail}
+ OUTPUT_HTML("
".htmlentities(trim($mailHeader))."
-To : ".$toEmail."
-Subject : ".$subject."
-Message : ".$message."
+To : " . $toEmail."
+Subject : " . $subject."
+Message : " . $message."
\n");
} elseif (($HTML == 'Y') && (EXT_IS_ACTIVE('html_mail'))) {
// Send mail as HTML away
- SEND_HTML_EMAIL($toEmail, $subject, $message, $mailHeader);
+ sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
} elseif (!empty($toEmail)) {
// Send Mail away
- SEND_RAW_EMAIL($toEmail, $subject, $message, $mailHeader);
+ sendRawEmail($toEmail, $subject, $message, $mailHeader);
} elseif ($HTML == 'N') {
// Problem found!
- SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$subject, $message, $mailHeader);
+ sendRawEmail(constant('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
}
}
// Check if legacy or PHPMailer command
// @TODO Rewrite this to an extension 'smtp'
// @private
-function CHECK_PHPMAILER_USAGE() {
- return ((defined('SMTP_HOSTNAME')) && (defined('SMTP_USER')) && (defined('SMTP_PASSWORD')) && (constant('SMTP_HOSTNAME') != '') && (constant('SMTP_USER') != ''));
+function checkPhpMailerUsage() {
+ return ((getConfig('SMTP_HOSTNAME') != '') && (getConfig('SMTP_USER') != ''));
}
-/*
- * Send out a raw email with PHPMailer class or legacy mail() command
- */
-function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
+// Send out a raw email with PHPMailer class or legacy mail() command
+function sendRawEmail ($toEmail, $subject, $message, $from) {
// Shall we use PHPMailer class or legacy mode?
- if (CHECK_PHPMAILER_USAGE()) {
+ if (checkPhpMailerUsage()) {
// Use PHPMailer class with SMTP enabled
- loadIncludeOnce("inc/phpmailer/class.phpmailer.php");
- loadIncludeOnce("inc/phpmailer/class.smtp.php");
+ loadIncludeOnce('inc/phpmailer/class.phpmailer.php');
+ loadIncludeOnce('inc/phpmailer/class.smtp.php');
// get new instance
$mail = new PHPMailer();
@@ -483,10 +489,10 @@ function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
$mail->IsSMTP();
$mail->SMTPAuth = true;
- $mail->Host = constant('SMTP_HOSTNAME');
+ $mail->Host = getConfig('SMTP_HOSTNAME');
$mail->Port = 25;
- $mail->Username = constant('SMTP_USER');
- $mail->Password = constant('SMTP_PASSWORD');
+ $mail->Username = getConfig('SMTP_USER');
+ $mail->Password = getConfig('SMTP_PASSWORD');
if (empty($from)) {
$mail->From = constant('WEBMASTER');
} else {
@@ -494,36 +500,36 @@ function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
}
$mail->FromName = constant('MAIN_TITLE');
$mail->Subject = $subject;
- if ((EXT_IS_ACTIVE('html_mail')) && (strip_tags($msg) != $msg)) {
- $mail->Body = $msg;
- $mail->AltBody = "Your mail program required HTML support to read this mail!";
+ if ((EXT_IS_ACTIVE('html_mail')) && (strip_tags($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($msg);
+ $mail->Body = decodeEntities($message);
}
$mail->AddAddress($toEmail, '');
$mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE'));
- $mail->AddCustomHeader("Errors-To:".constant('WEBMASTER'));
- $mail->AddCustomHeader("X-Loop:".constant('WEBMASTER'));
+ $mail->AddCustomHeader('Errors-To:' . constant('WEBMASTER'));
+ $mail->AddCustomHeader('X-Loop:' . constant('WEBMASTER'));
$mail->Send();
} else {
// Use legacy mail() command
- @mail($toEmail, $subject, decodeEntities($msg), $from);
+ mail($toEmail, $subject, decodeEntities($message), $from);
}
}
// Generate a password in a specified length or use default password length
-function generatePassword ($LEN = 0) {
+function generatePassword ($length = 0) {
// Auto-fix invalid length of zero
- if ($LEN == 0) $LEN = getConfig('pass_len');
+ if ($length == 0) $length = getConfig('pass_len');
// Initialize array with all allowed chars
- $ABC = explode(',', 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,0,1,2,3,4,5,6,7,8,9,-,+,_,/');
+ $ABC = explode(',', 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,0,1,2,3,4,5,6,7,8,9,-,+,_,/,.');
// Start creating password
$PASS = '';
- for ($i = 0; $i < $LEN; $i++) {
+ for ($i = 0; $i < $length; $i++) {
$PASS .= $ABC[mt_rand(0, count($ABC) -1)];
} // END - for
@@ -551,28 +557,28 @@ function generateDateTime ($time, $mode = '0') {
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;
- default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
- break;
- }
- break;
-
- default: // Default is the US date / time format!
- switch ($mode) {
- case '0': $ret = date("r", $time); break;
- case '1': $ret = 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;
- default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
- break;
- }
+ 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;
+ default:
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
+ break;
+ }
+ break;
+
+ default: // Default is the US date / time format!
+ switch ($mode) {
+ case '0': $ret = date("r", $time); break;
+ case '1': $ret = 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;
+ default:
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
+ break;
+ }
}
return $ret;
}
@@ -580,7 +586,7 @@ function generateDateTime ($time, $mode = '0') {
// Translates Y/N to yes/no
function translateYesNo ($yn) {
// Default
- $translated = "??? (".$yn.")";
+ $translated = "??? (" . $yn.')';
switch ($yn) {
case 'Y': $translated = getMessage('YES'); break;
case 'N': $translated = getMessage('NO'); break;
@@ -638,13 +644,13 @@ function translateComma ($dotted, $cut = true, $max = 0) {
// Translate it now
switch (getLanguage()) {
- case 'de':
- $dotted = number_format($dotted, $maxComma, ',', '.');
- break;
+ case 'de':
+ $dotted = number_format($dotted, $maxComma, ',', '.');
+ break;
- default:
- $dotted = number_format($dotted, $maxComma, '.', ',');
- break;
+ default:
+ $dotted = number_format($dotted, $maxComma, '.', ',');
+ break;
}
// Return translated value
@@ -675,21 +681,21 @@ function translateGender ($gender) {
function translateUserStatus ($status) {
switch ($status)
{
- case 'UNCONFIRMED':
- case 'CONFIRMED':
- case 'LOCKED':
- $ret = getMessage(sprintf("ACCOUNT_%s", $status));
- break;
-
- case '':
- case null:
- $ret = getMessage('ACCOUNT_DELETED');
- break;
-
- default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
- $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
- break;
+ case 'UNCONFIRMED':
+ case 'CONFIRMED':
+ case 'LOCKED':
+ $ret = getMessage(sprintf("ACCOUNT_%s", $status));
+ break;
+
+ case '':
+ case null:
+ $ret = getMessage('ACCOUNT_DELETED');
+ break;
+
+ default:
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
+ $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
+ break;
}
// Return it
@@ -712,7 +718,7 @@ function DEREFERER ($URL) {
function FRAMETESTER ($URL) {
// Prepare frametester URL
$frametesterUrl = sprintf("{!URL!}/modules.php?module=frametester&url=%s",
- encodeString(compileUriCode($URL))
+ encodeString(compileUriCode($URL))
);
return $frametesterUrl;
}
@@ -728,64 +734,17 @@ function countSelection ($array) {
return $ret;
}
-// Wrapper for $_POST['sel']
-function countPostSelection () {
- return countSelection(REQUEST_POST('sel'));
-}
-
// Generate XHTML code for the CAPTCHA
function generateCaptchaCode ($code, $type, $DATA, $uid) {
return '".__LINE__." ):NICKNAME!".__LINE__." ):NO-NICK!".print_r($content, true)."
{--TEMPLATE_DATA--}
@@ -922,7 +881,7 @@ function LOAD_EMAIL_TEMPLATE ($template, $content = array(), $UID = '0') {
// Is there some content?
if (empty($newContent)) {
// Compiling failed
- $newContent = "Compiler error for template {$template}!\nUncompiled content:\n".$tmpl_file;
+ $newContent = "Compiler error for template {$template}!\nUncompiled content:\n" . $tmpl_file;
// Add last error if the required function exists
if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
} // END - if
@@ -935,7 +894,7 @@ function LOAD_EMAIL_TEMPLATE ($template, $content = array(), $UID = '0') {
return COMPILE_CODE($newContent);
}
-// Generates a timestamp (wrapper for mktime())
+// Generates a timestamp (some wrapper for mktime())
function makeTime ($H, $M, $S, $stamp) {
// Extract day, month and year from given timestamp
$day = date('d', $stamp);
@@ -947,7 +906,7 @@ function makeTime ($H, $M, $S, $stamp) {
}
// Redirects to an URL and if neccessarry extends it with own base URL
-function redirectToUrl ($URL, $addUrlData=true) {
+function redirectToUrl ($URL) {
// Compile out URI codes
$URL = compileUriCode($URL);
@@ -979,20 +938,17 @@ function redirectToUrl ($URL, $addUrlData=true) {
clearOutputBuffer();
} // END - if
- // Add some data to URL if cookies are not accepted
- if ((!isBooleanConstantAndTrue('__COOKIES')) && ($addUrlData === true)) $URL = addUrlData($URL);
-
- // Secure the URL against bad things such als HTML insertions and so on...
- $URL = htmlentities(strip_tags($URL), ENT_QUOTES);
-
// Simple probe for bots/spiders from search engines
if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) {
+ // Secure the URL against bad things such als HTML insertions and so on...
+ $URL = htmlentities(strip_tags($URL), ENT_QUOTES);
+
// Output new location link as anchor
OUTPUT_HTML('' . $URL . ' ');
} elseif (!headers_sent()) {
// Load URL when headers are not sent
//* DEBUG: */ debug_report_bug("URL={$URL}");
- header ('Location: '.str_replace('&', '&', $URL));
+ sendHeader('Location: '.str_replace('&', '&', $URL));
} else {
// Output error message
loadInclude('inc/header.php');
@@ -1005,7 +961,7 @@ function redirectToUrl ($URL, $addUrlData=true) {
}
// Wrapper for redirectToUrl but URL comes from a configuration entry
-function LOAD_CONFIGURED_URL ($configEntry) {
+function redirectToConfiguredUrl ($configEntry) {
// Get the URL
$URL = getConfig($configEntry);
@@ -1083,17 +1039,17 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
if ($fuzzyFound) continue;
// Take all string elements
- if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_".$matches[4][$key]]))) {
+ if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_" . $matches[4][$key]]))) {
// Replace it in the code
//* DEBUG: */ print __FUNCTION__."(".__LINE__." ):key={$key},match={$match}".__LINE__." ):match={$match}\n";
+ if ($id > 0) $prefix .= "[" . $id."]";
+ $OUT .= " \n";
} else {
// Begin with regular selection box here
if (!empty($prefix)) $prefix .= "_";
$type2 = $type;
- if ($id > 0) $type2 .= "[".$id."]";
- $OUT .= " \n";
+ if ($id > 0) $type2 .= "[" . $id."]";
+ $OUT .= " \n";
}
switch ($type) {
- case "day": // Day
- for ($idx = 1; $idx < 32; $idx++) {
- $OUT .= "\n";
- } // END - for
- break;
+ case "day": // Day
+ for ($idx = 1; $idx < 32; $idx++) {
+ $OUT .= " \n";
+ } // END - for
+ break;
- case "month": // Month
- foreach ($GLOBALS['month_descr'] as $month => $descr) {
- $OUT .= " \n";
- } // END - for
- break;
+ case "month": // Month
+ foreach ($GLOBALS['month_descr'] as $month => $descr) {
+ $OUT .= " \n";
+ } // END - for
+ break;
- case "year": // Year
- // Get current year
- $year = date('Y', time());
+ case "year": // Year
+ // Get current year
+ $year = date('Y', time());
- // Use configured min age or fixed?
- if (GET_EXT_VERSION('other') >= '0.2.1') {
- // Configured
- $startYear = $year - getConfig('min_age');
- } else {
- // Fixed 16 years
- $startYear = $year - 16;
- }
+ // Use configured min age or fixed?
+ if (GET_EXT_VERSION('other') >= '0.2.1') {
+ // Configured
+ $startYear = $year - getConfig('min_age');
+ } else {
+ // Fixed 16 years
+ $startYear = $year - 16;
+ }
+
+ // Calculate earliest year (100 years old people can still enter Internet???)
+ $minYear = $year - 100;
+
+ // Check if the default value is larger than minimum and bigger than actual year
+ if (($default > $minYear) && ($default >= $year)) {
+ for ($idx = $year; $idx < ($year + 11); $idx++) {
+ $OUT .= " \n";
+ } // END - for
+ } elseif ($default == -1) {
+ // Current year minus 1
+ for ($idx = $startYear; $idx <= ($year + 1); $idx++)
+ {
+ $OUT .= " " . $idx." \n";
+ }
+ } else {
+ // Get current year and subtract the configured minimum age
+ $OUT .= "<" . $minYear." \n";
+ // Calculate earliest year depending on extension version
+ if (GET_EXT_VERSION('other') >= '0.2.1') {
+ // Use configured minimum age
+ $year = date('Y', time()) - getConfig('min_age');
+ } else {
+ // Use fixed 16 years age
+ $year = date('Y', time()) - 16;
+ }
- // Calculate earliest year (100 years old people can still enter Internet???)
- $minYear = $year - 100;
+ // Construct year selection list
+ for ($idx = $minYear; $idx <= $year; $idx++) {
+ $OUT .= "\n";
+ } // END - for
+ }
+ break;
- // Check if the default value is larger than minimum and bigger than actual year
- if (($default > $minYear) && ($default >= $year)) {
- for ($idx = $year; $idx < ($year + 11); $idx++) {
- $OUT .= " \n";
+ $OUT .= ">" . $idx." \n";
} // END - for
- } elseif ($default == -1) {
- // Current year minus 1
- for ($idx = $startYear; $idx <= ($year + 1); $idx++)
- {
- $OUT .= "".$idx." \n";
- }
- } else {
- // Get current year and subtract the configured minimum age
- $OUT .= "<".$minYear." \n";
- // Calculate earliest year depending on extension version
- if (GET_EXT_VERSION('other') >= '0.2.1') {
- // Use configured minimum age
- $year = date('Y', time()) - getConfig('min_age');
- } else {
- // Use fixed 16 years age
- $year = date('Y', time()) - 16;
- }
+ break;
- // Construct year selection list
- for ($idx = $minYear; $idx <= $year; $idx++) {
- $OUT .= "\n";
+ $OUT .= ">" . $idx." \n";
} // END - for
- }
- break;
-
- case "sec":
- case "min":
- for ($idx = 0; $idx < 60; $idx+=5) {
- if (strlen($idx) == 1) $idx = '0'.$idx;
- $OUT .= "\n";
- } // END - for
- break;
-
- case "hour":
- for ($idx = 0; $idx < 24; $idx++) {
- if (strlen($idx) == 1) $idx = '0'.$idx;
- $OUT .= " \n";
- } // END - for
- break;
-
- case 'yn':
- $OUT .= " {$num}");
+ //debug_report_bug("{$ret}<>{$num}");
} // END - if
// Return result
@@ -1352,7 +1308,7 @@ function GENERATE_IMAGE ($img_code, $headerSent=true) {
return;
} elseif (!$headerSent) {
// Return in an HTML code code
- return "\n";
+ $OUT = "
\n";
$OUT .= "
\n";
$OUT .= "\n";
@@ -1491,94 +1447,94 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align="
if (ereg('Y', $display) || (empty($display))) {
// Generate year selection
- $OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 10; $idx++) {
- $OUT .= " \n";
+ $OUT .= ">" . $idx." \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 11; $idx++)
{
- $OUT .= " \n";
+ $OUT .= ">" . $idx." \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 4; $idx++) {
- $OUT .= " \n";
+ $OUT .= ">" . $idx." \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 31; $idx++) {
- $OUT .= " \n";
+ $OUT .= ">" . $idx." \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 23; $idx++) {
- $OUT .= " \n";
+ $OUT .= ">" . $idx." \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 59; $idx++) {
- $OUT .= " \n";
+ $OUT .= ">" . $idx." \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 59; $idx++) {
- $OUT .= " \n";
+ $OUT .= ">" . $idx." \n";
}
$OUT .= " \n";
$OUT .= "
\n";
@@ -1624,15 +1580,15 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
$template = trim($template);
// Load email template
- $msg = LOAD_EMAIL_TEMPLATE($template, $content, $UID);
+ $message = LOAD_EMAIL_TEMPLATE($template, $content, $UID);
// Check which admin shall receive this mail
$result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY admin_id",
- array($template), __FUNCTION__, __LINE__);
+ array($template), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 0) {
// Create new entry (to all admins)
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES (0, '%s')",
- array($template), __FUNCTION__, __LINE__);
+ array($template), __FUNCTION__, __LINE__);
} else {
// Load admin IDs...
// @TODO This can be, somehow, rewritten
@@ -1648,33 +1604,33 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
$result = false;
// "implode" IDs and query string
- $aid = implode(",", $adminIds);
- if ($aid == "-1") {
+ $aid = implode(',', $adminIds);
+ if ($aid == '-1') {
if (EXT_IS_ACTIVE('events')) {
// Add line to user events
- EVENTS_ADD_LINE($subj, $msg, $UID);
+ EVENTS_ADD_LINE($subj, $message, $UID);
} else {
// Log error for debug
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,UID=%s",
- $template,
- $subj,
- $UID
+ $template,
+ $subj,
+ $UID
));
}
} elseif ($aid == '0') {
// Select all email adresses
$result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`",
- __FUNCTION__, __LINE__);
+ __FUNCTION__, __LINE__);
} else {
// If Admin-ID is not "to-all" select
$result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE id IN (%s) ORDER BY `id`",
- array($aid), __FUNCTION__, __LINE__);
+ array($aid), __FUNCTION__, __LINE__);
}
}
// Load email addresses and send away
while ($content = SQL_FETCHARRAY($result)) {
- sendEmail($content['email'], $subj, $msg);
+ sendEmail($content['email'], $subj, $message);
} // END - while
// Free memory
@@ -1713,18 +1669,18 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
$SEP = ''; $TOP = '';
if (!$show_form) {
$TOP = " top2";
- $SEP = "
";
+ $SEP = "
";
}
$NAV = '';
for ($page = 1; $page <= $PAGES; $page++) {
// Is the page currently selected or shall we generate a link to it?
- if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == "1"))) {
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) {
// Is currently selected, so only highlight it
$NAV .= "
-";
} else {
// Open anchor tag and add base URL
- $NAV .= "";
}
$NAV .= $page;
- if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == "1"))) {
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) {
// Is currently selected, so only highlight it
$NAV .= "- ";
} else {
@@ -1771,7 +1727,7 @@ function extractHostnameFromUrl (&$script) {
$url = constant('SERVER_URL');
// Is this URL valid?
- if (substr($script, 0, 7) == "http://") {
+ if (substr($script, 0, 7) == 'http://') {
// Use the hostname from script URL as new hostname
$url = substr($script, 7);
$extract = explode('/', $url);
@@ -1780,12 +1736,12 @@ function extractHostnameFromUrl (&$script) {
} // END - if
// Extract host name
- $host = str_replace("http://", '', $url);
+ $host = str_replace('http://', '', $url);
if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/'));
// Generate relative URL
- //* DEBUG: */ print("SCRIPT=".$script."
\n");
- if (substr(strtolower($script), 0, 7) == "http://") {
+ //* DEBUG: */ print("SCRIPT=" . $script."
\n");
+ 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://") {
@@ -1793,7 +1749,7 @@ function extractHostnameFromUrl (&$script) {
$script = substr($script, (strlen($url) + 8));
}
- //* DEBUG: */ print("SCRIPT=".$script."
\n");
+ //* DEBUG: */ print("SCRIPT=" . $script."
\n");
if (substr($script, 0, 1) == '/') $script = substr($script, 1);
// Return host name
@@ -1809,17 +1765,17 @@ function sendGetRequest ($script) {
$host = extractHostnameFromUrl($script);
// Generate GET request header
- $request = "GET /" . trim($script) . " HTTP/1.1\r\n";
- $request .= "Host: " . $host . "\r\n";
- $request .= "Referer: " . constant('URL') . "/admin.php\r\n";
+ $request = "GET /" . trim($script) . " HTTP/1.1" . getConfig('HTTP_EOL');
+ $request .= "Host: " . $host . getConfig('HTTP_EOL');
+ $request .= "Referer: " . constant('URL') . "/admin.php" . getConfig('HTTP_EOL');
if (defined('FULL_VERSION')) {
- $request .= "User-Agent: " . constant('TITLE') . '/' . constant('FULL_VERSION') . "\r\n";
+ $request .= "User-Agent: " . constant('TITLE') . '/' . constant('FULL_VERSION') . getConfig('HTTP_EOL');
} else {
- $request .= "User-Agent: " . constant('TITLE') . "/?.?.?\r\n";
+ $request .= "User-Agent: " . constant('TITLE') . "/?.?.?" . getConfig('HTTP_EOL');
}
- $request .= "Content-Type: text/plain\r\n";
- $request .= "Cache-Control: no-cache\r\n";
- $request .= "Connection: Close\r\n\r\n";
+ $request .= "Content-Type: text/plain" . getConfig('HTTP_EOL');
+ $request .= "Cache-Control: no-cache" . getConfig('HTTP_EOL');
+ $request .= "Connection: Close" . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
// Send the raw request
$response = sendRawRequest($host, $request);
@@ -1847,14 +1803,14 @@ function sendPostRequest ($script, $postData) {
$data = http_build_query($postData, '','&');
// Generate POST request header
- $request = "POST /" . trim($script) . " HTTP/1.1\r\n";
- $request .= "Host: " . $host . "\r\n";
- $request .= "Referer: " . constant('URL') . "/admin.php\r\n";
- $request .= "User-Agent: " . constant('TITLE') . '/' . constant('FULL_VERSION') . "\r\n";
- $request .= "Content-type: application/x-www-form-urlencoded\r\n";
- $request .= "Content-length: " . strlen($data) . "\r\n";
- $request .= "Cache-Control: no-cache\r\n";
- $request .= "Connection: Close\r\n\r\n";
+ $request = "POST /" . trim($script) . " HTTP/1.1" . getConfig('HTTP_EOL');
+ $request .= "Host: " . $host . getConfig('HTTP_EOL');
+ $request .= "Referer: " . constant('URL') . "/admin.php" . getConfig('HTTP_EOL');
+ $request .= "User-Agent: " . constant('TITLE') . '/' . constant('FULL_VERSION') . getConfig('HTTP_EOL');
+ $request .= "Content-type: application/x-www-form-urlencoded" . getConfig('HTTP_EOL');
+ $request .= "Content-length: " . strlen($data) . getConfig('HTTP_EOL');
+ $request .= "Cache-Control: no-cache" . getConfig('HTTP_EOL');
+ $request .= "Connection: Close" . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
$request .= $data;
// Send the raw request
@@ -1866,6 +1822,9 @@ function sendPostRequest ($script, $postData) {
// Sends a raw request to another host
function sendRawRequest ($host, $request) {
+ // Init errno and errdesc with 'all fine' values
+ $errno = 0; $errdesc = '';
+
// Initialize array
$response = array('', '', '');
@@ -1879,10 +1838,12 @@ function sendRawRequest ($host, $request) {
} // END - if
// Open connection
- //* DEBUG: */ die("SCRIPT=".$script."
\n");
- if ($useProxy) {
- $fp = @fsockopen(COMPILE_CODE(getConfig('proxy_host')), getConfig('proxy_port'), $errno, $errdesc, 30);
+ //* DEBUG: */ die("SCRIPT=" . $script."
\n");
+ if ($useProxy === true) {
+ // Connect to host through proxy connection
+ $fp = @fsockopen(COMPILE_CODE(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
} else {
+ // Connect to host directly
$fp = @fsockopen($host, 80, $errno, $errdesc, 30);
}
@@ -1893,21 +1854,21 @@ function sendRawRequest ($host, $request) {
} // END - if
// Do we use proxy?
- if ($useProxy) {
+ if ($useProxy === true) {
// Generate CONNECT request header
- $proxyTunnel = "CONNECT ".$host.":80 HTTP/1.1\r\n";
- $proxyTunnel .= "Host: ".$host."\r\n";
+ $proxyTunnel = "CONNECT " . $host . ":80 HTTP/1.1" . getConfig('HTTP_EOL');
+ $proxyTunnel .= "Host: " . $host . getConfig('HTTP_EOL');
// Use login data to proxy? (username at least!)
if (getConfig('proxy_username') != '') {
// Add it as well
- $encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')).constant('ENCRYPT_SEPERATOR').COMPILE_CODE(getConfig('proxy_password')));
- $proxyTunnel .= "Proxy-Authorization: Basic ".$encodedAuth."\r\n";
+ $encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . COMPILE_CODE(getConfig('proxy_password')));
+ $proxyTunnel .= "Proxy-Authorization: Basic " . $encodedAuth . getConfig('HTTP_EOL');
} // END - if
// Add last new-line
- $proxyTunnel .= "\r\n";
- //* DEBUG: */ print("
proxyTunnel= ".$proxyTunnel." ");
+ $proxyTunnel .= getConfig('HTTP_EOL');
+ //* DEBUG: */ print("
proxyTunnel= " . $proxyTunnel." ");
// Write request
fputs($fp, $proxyTunnel);
@@ -1957,7 +1918,7 @@ function sendRawRequest ($host, $request) {
//* DEBUG: */ print("
Response: ".print_r($response, true)." ");
// Proxy agent found?
- if ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy)) {
+ if ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) {
// Proxy header detected, so remove two lines
array_shift($response);
array_shift($response);
@@ -1974,22 +1935,22 @@ function sendRawRequest ($host, $request) {
}
// Taken from www.php.net eregi() user comments
-function VALIDATE_EMAIL ($email) {
+function isEmailValid ($email) {
// Compile email
$email = COMPILE_CODE($email);
// Check first part of email address
- $first = "[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*";
+ $first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*';
// Check domain
- $domain = "[a-z0-9-]+(\.[a-z0-9-]{2,5})+";
+ $domain = '[a-z0-9-]+(\.[a-z0-9-]{2,5})+';
// Generate pattern
- $regex = '^'.$first.'@'.$domain.'$';
+ $regex = '@^' . $first . '\@' . $domain . '$@iU';
// Return check result
- // @TODO eregi() should be rewritten here
- return eregi($regex, $email);
+ // @NOTE altered the regex-pattern and added modificator i (match both upper and lower case letters) and U (PCRE_UNGREEDY) to work with preg_match the same way as eregi
+ return preg_match($regex, $email);
}
// Function taken from user comments on www.php.net / function eregi()
@@ -1999,18 +1960,18 @@ function isUrlValid ($URL, $compile=true) {
//* DEBUG: */ echo $URL."
";
// Compile some chars out...
- if ($compile) $URL = compileUriCode($URL, false, false, false);
+ if ($compile === true) $URL = compileUriCode($URL, false, false, false);
//* DEBUG: */ echo $URL."
";
// Check for the extension filter
if (EXT_IS_ACTIVE('filter')) {
// Use the extension's filter set
- return FILTER_isUrlValid($URL, false);
+ 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
- return isUrlValid($URL);
+ return isUrlValidSimple($URL);
}
// Generate a list of administrative links to a given userid
@@ -2022,8 +1983,8 @@ function generateMemberAdminActionLinks ($uid, $status = '') {
$eval = "\$OUT = \"[ ";
foreach ($TARGETS as $tar) {
- $eval .= "
".__LINE__." ): ".$constName."-CACHE!".__LINE__." ): " . $constName."-CACHE!".__LINE__." ): ".$constName."-RESOLVE!".__LINE__." ): " . $constName."-RESOLVE!".__LINE__." ): ".$constName."-FOUND!".__LINE__." ): " . $constName."-FOUND!".__LINE__." ):dir=".$dir."".__LINE__." ):dir=" . $dir."".__LINE__." ):ds[]=".count($ds)."".__LINE__." ):FQFN={$FQFN}".__LINE__." ):DESCENT: ".$newDir."".__LINE__." ):DESCENT: " . $newDir."".__LINE__." ):File: ".$d." found. (".($last_changed['time'] - $time).")".__LINE__." ):File: " . $d." found. (".($last_changed['time'] - $time).")".__LINE__." ) - NEWER!".basename($trace['file'])." :".$trace['line'].", ".$trace['function']."(".count($trace['args']).") ".basename($trace['file'])." :" . $trace['line'].", " . $trace['function'].'('.count($trace['args']).") bugs.mxchange.org :";
+ $debug .= "Please report this bug at bugs.mxchange.org and include the logfile from inc/cache/debug.log in your report (you can now attach files):";
$debug .= debug_get_printable_backtrace();
- $debug .= " Request-URI: ".$_SERVER['REQUEST_URI']." \nRequest-URI: " . $_SERVER['REQUEST_URI']."{--LOGOUT_FAILED--} "; break;
- case getCode('DATA_INVALID') : $msg = getMessage('MAIL_DATA_INVALID'); break;
- case getCode('POSSIBLE_INVALID') : $msg = getMessage('MAIL_POSSIBLE_INVALID'); break;
- case getCode('ACCOUNT_LOCKED') : $msg = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
- case getCode('USER_404') : $msg = getMessage('USER_NOT_FOUND'); break;
- case getCode('STATS_404') : $msg = getMessage('MAIL_STATS_404'); break;
- case getCode('ALREADY_CONFIRMED'): $msg = getMessage('MAIL_ALREADY_CONFIRMED'); break;
+ case getCode('LOGOUT_DONE') : $message = getMessage('LOGOUT_DONE'); break;
+ case getCode('LOGOUT_FAILED') : $message = "{--LOGOUT_FAILED--} "; break;
+ case getCode('DATA_INVALID') : $message = getMessage('MAIL_DATA_INVALID'); break;
+ case getCode('POSSIBLE_INVALID') : $message = getMessage('MAIL_POSSIBLE_INVALID'); break;
+ case getCode('ACCOUNT_LOCKED') : $message = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
+ case getCode('USER_404') : $message = getMessage('USER_NOT_FOUND'); break;
+ case getCode('STATS_404') : $message = getMessage('MAIL_STATS_404'); break;
+ case getCode('ALREADY_CONFIRMED'): $message = getMessage('MAIL_ALREADY_CONFIRMED'); break;
case getCode('ERROR_MAILID'):
if (EXT_IS_ACTIVE($ext, true)) {
- $msg = getMessage('ERROR_CONFIRMING_MAIL');
+ $message = getMessage('ERROR_CONFIRMING_MAIL');
} else {
- $msg = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'mailid');
+ $message = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'mailid');
}
break;
case getCode('EXTENSION_PROBLEM'):
- if (REQUEST_ISSET_GET(('ext'))) {
- $msg = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), REQUEST_GET(('ext')));
+ if (REQUEST_ISSET_GET('ext')) {
+ $message = generateExtensionInactiveNotInstalledMessage(REQUEST_GET('ext'));
} else {
- $msg = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
+ $message = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
}
break;
- case getCode('COOKIES_DISABLED') : $msg = getMessage('LOGIN_NO_COOKIES'); break;
- case getCode('BEG_SAME_AS_OWN') : $msg = getMessage('BEG_SAME_UID_AS_OWN'); break;
- case getCode('LOGIN_FAILED') : $msg = getMessage('LOGIN_FAILED_GENERAL'); break;
- case getCode('MODULE_MEM_ONLY') : $msg = sprintf(getMessage('MODULE_MEM_ONLY'), REQUEST_GET('mod')); break;
+ case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_NO_COOKIES'); break;
+ case getCode('BEG_SAME_AS_OWN') : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
+ case getCode('LOGIN_FAILED') : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
+ case getCode('MODULE_MEM_ONLY') : $message = sprintf(getMessage('MODULE_MEM_ONLY'), REQUEST_GET('mod')); break;
default:
// Missing/invalid code
- $msg = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code);
+ $message = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code);
// Log it
- DEBUG_LOG(__FUNCTION__, __LINE__, $msg);
+ DEBUG_LOG(__FUNCTION__, __LINE__, $message);
break;
} // END - switch
// Return the message
- return $msg;
+ return $message;
}
// Generate a "link" for the given admin id (aid)
@@ -2881,7 +2728,7 @@ function generateAdminLink ($aid) {
// Is the extension there?
if (EXT_IS_ACTIVE('admins')) {
// Admin found
- $admin = "".$login." ";
+ $admin = "" . $login." ";
} else {
// Extension not found
$admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins');
@@ -2896,33 +2743,10 @@ function generateAdminLink ($aid) {
return $admin;
}
-// Checks wether an include file (non-FQFN better) is readable
-function isIncludeReadable ($INC) {
- // Construct FQFN
- $FQFN = constant('PATH') . $INC;
-
- // Is it readable?
- return isFileReadable($FQFN);
-}
-
-// Encode strings
-// @TODO Implement $compress
-function encodeString ($str, $compress=true) {
- $str = urlencode(base64_encode(compileUriCode($str)));
- return $str;
-}
-
-// Decode strings encoded with encodeString()
-// @TODO Implement $decompress
-function decodeString ($str, $decompress=true) {
- $str = compileUriCode(base64_decode(urldecode(compileUriCode($str))));
- return $str;
-}
-
// Compile characters which are allowed in URLs
function compileUriCode ($code, $simple=true) {
// Compile constants
- if (!$simple) $code = str_replace("{--", '".', str_replace("--}", '."', $code));
+ if (!$simple) $code = str_replace('{--', '".', str_replace('--}', '."', $code));
// Compile QUOT and other non-HTML codes
$code = str_replace('{DOT}', '.',
@@ -2942,9 +2766,9 @@ function compileUriCode ($code, $simple=true) {
}
// Function taken from user comments on www.php.net / function eregi()
-function isUrlValid ($url) {
+function isUrlValidSimple ($url) {
// Prepare URL
- $url = strip_tags(str_replace("\\", '', compileUriCode(urldecode($url))));
+ $url = strip_tags(str_replace("\\", '', COMPILE_CODE(urldecode($url))));
// Allows http and https
$http = "(http|https)+(:\/\/)";
@@ -2961,44 +2785,42 @@ function isUrlValid ($url) {
// ... and the string after and including question character
$getstring1 = "([\?/]([[:alnum:]][-\._%[:alnum:]]*(=)?([-\@\._:%[:alnum:]])+)(&([[:alnum:]]([-_%[:alnum:]])*(=)?([-\@\[\._:%[:alnum:]])+(\])*))*)?";
// Pattern for URLs like http://url/dir/doc.html?var=value
- $pattern['d1dpg1'] = $http.$domain1.$dir.$page.$getstring1;
- $pattern['d2dpg1'] = $http.$domain2.$dir.$page.$getstring1;
- $pattern['ipdpg1'] = $http.$ip.$dir.$page.$getstring1;
+ $pattern['d1dpg1'] = $http . $domain1 . $dir . $page . $getstring1;
+ $pattern['d2dpg1'] = $http . $domain2 . $dir . $page . $getstring1;
+ $pattern['ipdpg1'] = $http . $ip . $dir . $page . $getstring1;
// Pattern for URLs like http://url/dir/?var=value
- $pattern['d1dg1'] = $http.$domain1.$dir.'/'.$getstring1;
- $pattern['d2dg1'] = $http.$domain2.$dir.'/'.$getstring1;
- $pattern['ipdg1'] = $http.$ip.$dir.'/'.$getstring1;
+ $pattern['d1dg1'] = $http . $domain1 . $dir.'/' . $getstring1;
+ $pattern['d2dg1'] = $http . $domain2 . $dir.'/' . $getstring1;
+ $pattern['ipdg1'] = $http . $ip . $dir.'/' . $getstring1;
// Pattern for URLs like http://url/dir/page.ext
- $pattern['d1dp'] = $http.$domain1.$dir.$page;
- $pattern['d1dp'] = $http.$domain2.$dir.$page;
- $pattern['ipdp'] = $http.$ip.$dir.$page;
+ $pattern['d1dp'] = $http . $domain1 . $dir . $page;
+ $pattern['d1dp'] = $http . $domain2 . $dir . $page;
+ $pattern['ipdp'] = $http . $ip . $dir . $page;
// Pattern for URLs like http://url/dir
- $pattern['d1d'] = $http.$domain1.$dir;
- $pattern['d2d'] = $http.$domain2.$dir;
- $pattern['ipd'] = $http.$ip.$dir;
+ $pattern['d1d'] = $http . $domain1 . $dir;
+ $pattern['d2d'] = $http . $domain2 . $dir;
+ $pattern['ipd'] = $http . $ip . $dir;
// Pattern for URLs like http://url/?var=value
- $pattern['d1g1'] = $http.$domain1.'/'.$getstring1;
- $pattern['d2g1'] = $http.$domain2.'/'.$getstring1;
- $pattern['ipg1'] = $http.$ip.'/'.$getstring1;
+ $pattern['d1g1'] = $http . $domain1 . '/' . $getstring1;
+ $pattern['d2g1'] = $http . $domain2 . '/' . $getstring1;
+ $pattern['ipg1'] = $http . $ip . '/' . $getstring1;
// Pattern for URLs like http://url?var=value
- $pattern['d1g12'] = $http.$domain1.$getstring1;
- $pattern['d2g12'] = $http.$domain2.$getstring1;
- $pattern['ipg12'] = $http.$ip.$getstring1;
+ $pattern['d1g12'] = $http . $domain1 . $getstring1;
+ $pattern['d2g12'] = $http . $domain2 . $getstring1;
+ $pattern['ipg12'] = $http . $ip . $getstring1;
// Test all patterns
$reg = false;
- foreach ($pattern as $key=>$pat) {
+ foreach ($pattern as $key => $pat) {
// Debug regex?
- if (defined('DEBUG_REGEX')) {
- $pat = str_replace("[:alnum:]", "0-9a-zA-Z", $pat);
- $pat = str_replace("[:alpha:]", "a-zA-Z", $pat);
- $pat = str_replace("[:digit:]", "0-9", $pat);
- $pat = str_replace('.', "\.", $pat);
- $pat = str_replace("@", "\@", $pat);
- echo $key."= ".$pat."READ: ".$FQFN."READ: ' . $FQFN . "WRITE: ".$tmp."WRITE: ' . $tmp . "CHANGE: 404!");
+ copyFileVerified($tmp, $FQFN, 0644);
+ return removeFile($tmp);
+ } elseif ($found === false) {
+ OUTPUT_HTML('CHANGE: 404!');
} else {
- OUTPUT_HTML("TMP: UNDONE!");
+ OUTPUT_HTML('TMP: UNDONE!');
}
}
} else {
// File not found, not readable or writeable
- OUTPUT_HTML("404: ".$FQFN."404: ' . $FQFN . '".__LINE__." ):accessLevel={$accessLevel}