X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=fd2eab7f3dd216f1fccbe8b94ec91c072ea06f23;hp=66614abbb7ad6e4637240e26f250ed785d8e29be;hb=ab82613b0100336c0966a742c986874ec1692672;hpb=3afdce4fe00b4af570122ce7b8158ced44aec7d3
diff --git a/inc/functions.php b/inc/functions.php
index 66614abbb7..fd2eab7f3d 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -17,7 +17,7 @@
* Needs to be in all Files and every File needs "svn propset *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -35,68 +35,67 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, *
* MA 02110-1301 USA *
************************************************************************/
+
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
- require($INC);
-}
+ die();
+} // END - if
// 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;
+function outputHtml ($htmlCode, $newLine = true) {
+ // Transfer username
+ $username = getUsername();
// Do we have HTML-Code here?
- if (!empty($HTML)) {
+ if (!empty($htmlCode)) {
// Yes, so we handle it as you have configured
- switch (getConfig('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') {
+ if (getPhpCaching() == 'on') {
// Output into PHP's internal buffer
- outputRawCode($HTML);
+ outputRawCode($htmlCode);
// That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine) echo "\n";
+ if ($newLine === true) print("\n");
} else {
// Render mode for old or lame servers...
- $OUTPUT .= $HTML;
+ $GLOBALS['output'] .= $htmlCode;
// That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine) $OUTPUT .= "\n";
+ if ($newLine === true) $GLOBALS['output'] .= "\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 = ''; }
+ if ((!empty($GLOBALS['output'])) && (getPhpCaching() != 'on')) { outputRawCode($GLOBALS['output']); $GLOBALS['output'] = ''; }
// The same as above... ^
- outputRawCode($HTML);
- if ($newLine) echo "\n";
+ outputRawCode($htmlCode);
+ if ($newLine) print("\n");
break;
default:
// Huh, something goes wrong or maybe you have edited config.php ???
- app_die(__FUNCTION__, __LINE__, "{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
+ app_die(__FUNCTION__, __LINE__, '{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}');
break;
- }
- } elseif ((constant('_OB_CACHING') == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
+ } // END - switch
+ } elseif ((getPhpCaching() == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
// Headers already sent?
if (headers_sent()) {
// Log this error
- DEBUG_LOG(__FUNCTION__, __LINE__, "Headers already sent! We need debug backtrace here.");
+ logDebugMessage(__FUNCTION__, __LINE__, 'Headers already sent! We need debug backtrace here.');
// Trigger an user error
- debug_report_bug("Headers are already sent!");
+ debug_report_bug('Headers are already sent!');
} // END - if
// Output cached HTML code
- $OUTPUT = ob_get_contents();
+ $GLOBALS['output'] = ob_get_contents();
// Clear output buffer for later output if output is found
- if (!empty($OUTPUT)) {
+ if (!empty($GLOBALS['output'])) {
clearOutputBuffer();
} // END - if
@@ -112,53 +111,57 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
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');
+ sendHeader('Content-Type: ' . getContentType() . '; charset=UTF-8');
+ sendHeader('Content-language: ' . getLanguage());
// Extension 'rewrite' installed?
- if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) {
- $OUTPUT = rewriteLinksInCode($OUTPUT);
+ if ((isExtensionActive('rewrite')) && (getOutputMode() != '1')) {
+ $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
} // END - if
// Compile and run finished rendered HTML code
- while (strpos($OUTPUT, '{!') > 0) {
+ while ((strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) {
// Prepare the content and eval() it...
+ $content = array();
$newContent = '';
- $eval = "\$newContent = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";";
+
+ // Compile it
+ $eval = "\$newContent = \"".compileCode(smartAddSlashes($GLOBALS['output']))."\";";
eval($eval);
// Was that eval okay?
if (empty($newContent)) {
// Something went wrong!
- app_die(__FUNCTION__, __LINE__, "Evaluation error:".htmlentities($eval)." ");
+ debug_report_bug('Evaluation error:' . htmlentities($eval) . ' ');
} // END - if
- $OUTPUT = $newContent;
+ $GLOBALS['output'] = $newContent;
} // END - while
// Output code here, DO NOT REMOVE! ;-)
- outputRawCode($OUTPUT);
- } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($OUTPUT))) {
+ outputRawCode($GLOBALS['output']);
+ } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
// Rewrite links when rewrite extension is active
- if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) {
- $OUTPUT = rewriteLinksInCode($OUTPUT);
+ if ((isExtensionActive('rewrite')) && (getOutputMode() != '1')) {
+ $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
} // END - if
// Compile and run finished rendered HTML code
- while (strpos($OUTPUT, '{!') > 0) {
- $eval = "\$OUTPUT = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";";
- eval($eval);
+ while (strpos($GLOBALS['output'], '{!') > 0) {
+ eval("\$GLOBALS['output'] = \"".compileCode(smartAddSlashes($GLOBALS['output']))."\";");
} // END - while
// Output code here, DO NOT REMOVE! ;-)
- outputRawCode($OUTPUT);
+ outputRawCode($GLOBALS['output']);
}
}
// Output the raw HTML code
-function outputRawCode ($HTML) {
+function outputRawCode ($htmlCode) {
// Output stripped HTML code to avoid broken JavaScript code, etc.
- echo stripslashes(stripslashes($HTML));
+ print(stripslashes(stripslashes($htmlCode)));
- // Flush the output if only constant('_OB_CACHING') is not 'on'
- if (constant('_OB_CACHING') != 'on') {
+ // Flush the output if only getPhpCaching() is not 'on'
+ if (getPhpCaching() != 'on') {
// Flush it
flush();
} // END - if
@@ -188,7 +191,7 @@ function addFatalMessage ($F, $L, $message, $extra='') {
$GLOBALS['fatal_messages'][] = $message;
// Log fatal messages away
- DEBUG_LOG($F, $L, " message={$message}");
+ logDebugMessage($F, $L, " message={$message}");
}
// Getter for total fatal message count
@@ -207,189 +210,370 @@ 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()) {
- // Add more variables which you want to use in your template files
- global $DATA, $username;
+function loadTemplate ($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) . ')');
+
+ // @TODO Try to rewrite all $DATA to $content
+ global $DATA;
+
+ // Do we have cache?
+ if (!isset($GLOBALS['template_eval'][$template])) {
+ // Add more variables which you want to use in your template files
+ $username = getUsername();
+
+ // Make all template names lowercase
+ $template = strtolower($template);
+
+ // Count the template load
+ incrementConfigEntry('num_templates');
+
+ // Init some data
+ $ret = '';
+ if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
+
+ // Generate date/time string
+ $date_time = generateDateTime(time(), '1');
+
+ // Is content an array
+ if (is_array($content)) $content['date_time'] = $date_time;
+
+ // @DEPRECATED Try to rewrite the if() condition
+ 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__);
- // Get whole config array
+ // Is content an array?
+ if (is_array($content)) {
+ // Merge data
+ $content = merge_array($content, SQL_FETCHARRAY($result));
+
+ // Translate gender
+ $content['gender'] = translateGender($content['gender']);
+ } else {
+ // @DEPRECATED
+ // @TODO Find all templates which are using these direct variables and rewrite them.
+ // @TODO After this step is done, this else-block is history
+ list($gender, $surname, $family, $email) = SQL_FETCHROW($result);
+
+ // Translate gender
+ $gender = translateGender($gender);
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("DEPRECATION-WARNING: content is not array [%s], template=%s.", gettype($content), $template));
+ }
+
+ // Free result
+ SQL_FREERESULT($result);
+ } // END - if
+
+ // Base directory
+ $basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage());
+ $mode = '';
+
+ // Check for admin/guest/member templates
+ if (substr($template, 0, 6) == 'admin_') {
+ // Admin template found
+ $mode = 'admin/';
+ } elseif (substr($template, 0, 6) == 'guest_') {
+ // Guest template found
+ $mode = 'guest/';
+ } elseif (substr($template, 0, 7) == 'member_') {
+ // Member template found
+ $mode = 'member/';
+ } elseif (substr($template, 0, 8) == 'install_') {
+ // Installation template found
+ $mode = 'install/';
+ } elseif (substr($template, 0, 4) == 'ext_') {
+ // Extension template found
+ $mode = 'ext/';
+ } elseif (substr($template, 0, 3) == 'la_') {
+ // 'Logical-area' template found
+ $mode = 'la/';
+ } elseif (substr($template, 0, 3) == 'js_') {
+ // JavaScript template found
+ $mode = 'js/';
+ } elseif (substr($template, 0, 5) == 'menu_') {
+ // Menu template found
+ $mode = 'menu/';
+ } else {
+ // Test for extension
+ $test = substr($template, 0, strpos($template, '_'));
+
+ // Probe for valid extension name
+ if (isExtensionNameValid($test)) {
+ // Set extra path to extension's name
+ $mode = $test . '/';
+ } // END - if
+ }
+
+ ////////////////////////
+ // Generate file name //
+ ////////////////////////
+ $FQFN = $basePath . $mode . $template . '.tpl';
+
+ 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,
+ getWhat()
+ );
+
+ // Probe for it...
+ if (isFileReadable($file2)) $FQFN = $file2;
+
+ // Remove variable from memory
+ unset($file2);
+ } // END - if
+
+ // Does the special template exists?
+ if (!isFileReadable($FQFN)) {
+ // Reset to default template
+ $FQFN = $basePath . $template . '.tpl';
+ } // END - if
+
+ // Now does the final template exists?
+ if (isFileReadable($FQFN)) {
+ // The local file does exists so we load it. :)
+ $GLOBALS['tpl_content'] = readFromFile($FQFN);
+
+ // Replace ' to our own chars to preventing them being quoted
+ while (strpos($GLOBALS['tpl_content'], "'") !== false) { $GLOBALS['tpl_content'] = str_replace("'", '{QUOT}', $GLOBALS['tpl_content']); }
+
+ // Do we have to compile the code?
+ $ret = '';
+ if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) {
+ // Normal HTML output?
+ if ($GLOBALS['output_mode'] == 0) {
+ // Add surrounding HTML comments to help finding bugs faster
+ $ret = "\n" . $GLOBALS['tpl_content'] . "\n";
+
+ // Prepare eval() command
+ $eval = '$ret = "' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '";';
+ } else {
+ // Prepare eval() command
+ $eval = '$ret = "' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '";';
+ }
+ } else {
+ // Simply return loaded code
+ $eval = '$ret = $GLOBALS[\'tpl_content\'];';
+ } // END - if
+
+ // Cache the eval() command here
+ $GLOBALS['template_eval'][$template] = $eval;
+
+ // Eval the code
+ eval($GLOBALS['template_eval'][$template]);
+ } else {
+ // No file!
+ $GLOBALS['template_eval'][$template] = '404';
+ }
+ } elseif (((isAdmin()) || ((isInstalling()) && (!isInstalled()))) && ($GLOBALS['template_eval'][$template] == '404')) {
+ // Only admins shall see this warning or when installation mode is active
+ $ret = '{--TEMPLATE_404--} ' . print_r($content, true) . '
+{--TEMPLATE_DATA--}
+' . print_r($DATA, true) . '
+' . print_r($content, true) . ' ';
+ }
+}
+
+// Loads an email template and compiles it
+function loadEmailTemplate ($template, $content = array(), $UID = '0') {
+ global $DATA;
+
+ // Our configuration is kept non-global here
$_CONFIG = getConfigArray();
- // Make all template names lowercase
+ // Make sure all template names are lowercase!
$template = strtolower($template);
- // Count the template load
- incrementConfigEntry('num_templates');
+ // Default 'nickname' if extension is not installed
+ $nick = '---';
// Prepare IP number and User Agent
$REMOTE_ADDR = detectRemoteAddr();
- if (!defined('REMOTE_ADDR')) define('REMOTE_ADDR', $REMOTE_ADDR);
$HTTP_USER_AGENT = detectUserAgent();
- // Init some data
- $ret = '';
- if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
+ // Default admin
+ $ADMIN = getConfig('MAIN_TITLE');
- // @DEPRECATED Try to rewrite the if() condition
- 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__);
+ // Is the admin logged in?
+ if (isAdmin()) {
+ // Get admin id
+ $adminId = getCurrentAdminId();
+
+ // Load Admin data
+ $ADMIN = getAdminEmail($adminId);
+ } // END - if
+
+ // Neutral email address is default
+ $email = getConfig('WEBMASTER');
+
+ // Expiration in a nice output format
+ // NOTE: Use $content[expiration] in your templates instead of $EXPIRATION
+ if (getConfig('auto_purge') == 0) {
+ // Will never expire!
+ $EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE');
+ } else {
+ // Create nice date string
+ $EXPIRATION = createFancyTime(getConfig('auto_purge'));
+ }
- // Is content an array?
- if (is_array($content)) {
- // Merge data
- $content = merge_array($content, SQL_FETCHARRAY($result));
+ // Is content an array?
+ if (is_array($content)) {
+ // Add expiration to array, $EXPIRATION is now deprecated!
+ $content['expiration'] = $EXPIRATION;
+ } // END - if
- // Translate gender
- $content['gender'] = translateGender($content['gender']);
+ // Load user's data
+ //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__." ):UID={$UID},template={$template},content[]=".gettype($content)."".__LINE__." ):NICKNAME!".__LINE__." ):NO-NICK!".__LINE__." ):content()=".count($content)." - PRE".__LINE__." ):content()=".count($content)." - AFTER{--TEMPLATE_404--} ".print_r($content, true)."
{--TEMPLATE_DATA--}
".print_r($DATA, true)."
".__LINE__." ):TO={$toEmail},SUBJECT={$subject}".__LINE__." ):TO={$toEmail},SUBJECT={$subject}".__LINE__." ):numRows=".SQL_NUMROWS($result_email)."".__LINE__." ):numRows=".SQL_NUMROWS($result_email)."".__LINE__." ):TO={$toEmail}".__LINE__." ):TO={$toEmail}
+ outputHtml("
".htmlentities(trim($mailHeader))."
-To : ".$toEmail."
-Subject : ".$subject."
-Message : ".$message."
+To : " . $toEmail."
+Subject : " . $subject."
+Message : " . $message."
\n");
- } elseif (($HTML == 'Y') && (EXT_IS_ACTIVE('html_mail'))) {
+ } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
// Send mail as HTML away
sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
} elseif (!empty($toEmail)) {
// Send Mail away
sendRawEmail($toEmail, $subject, $message, $mailHeader);
- } elseif ($HTML == 'N') {
+ } elseif ($isHtml != 'Y') {
// Problem found!
- sendRawEmail(constant('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
+ sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
}
}
@@ -467,7 +649,7 @@ function checkPhpMailerUsage() {
}
// Send out a raw email with PHPMailer class or legacy mail() command
-function sendRawEmail ($toEmail, $subject, $msg, $from) {
+function sendRawEmail ($toEmail, $subject, $message, $from) {
// Shall we use PHPMailer class or legacy mode?
if (checkPhpMailerUsage()) {
// Use PHPMailer class with SMTP enabled
@@ -476,7 +658,7 @@ function sendRawEmail ($toEmail, $subject, $msg, $from) {
// get new instance
$mail = new PHPMailer();
- $mail->PluginDir = sprintf("%sinc/phpmailer/", constant('PATH'));
+ $mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH'));
$mail->IsSMTP();
$mail->SMTPAuth = true;
@@ -485,42 +667,42 @@ function sendRawEmail ($toEmail, $subject, $msg, $from) {
$mail->Username = getConfig('SMTP_USER');
$mail->Password = getConfig('SMTP_PASSWORD');
if (empty($from)) {
- $mail->From = constant('WEBMASTER');
+ $mail->From = getConfig('WEBMASTER');
} else {
$mail->From = $from;
}
- $mail->FromName = constant('MAIN_TITLE');
+ $mail->FromName = getConfig('MAIN_TITLE');
$mail->Subject = $subject;
- if ((EXT_IS_ACTIVE('html_mail')) && (strip_tags($msg) != $msg)) {
- $mail->Body = $msg;
+ 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($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->AddReplyTo(getConfig('WEBMASTER'), getConfig('MAIN_TITLE'));
+ $mail->AddCustomHeader('Errors-To:' . getConfig('WEBMASTER'));
+ $mail->AddCustomHeader('X-Loop:' . getConfig('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
@@ -546,8 +728,7 @@ function generateDateTime ($time, $mode = '0') {
return getMessage('NEVER_HAPPENED');
} // END - if
- switch (getLanguage())
- {
+ 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;
@@ -555,35 +736,37 @@ function generateDateTime ($time, $mode = '0') {
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));
+ logDebugMessage(__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;
- }
- }
+ 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:
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
+ break;
+ } // END - switch
+ } // END - switch
+
+ // Return result
return $ret;
}
// 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;
default:
// Log unknown value
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn));
break;
}
@@ -600,7 +783,7 @@ function translatePoolType ($type) {
$constName = sprintf("POOL_TYPE_%s", $type);
// Does it exist?
- if (defined($constName)) {
+ if (isMessageIdValid($constName)) {
// Then use it
$translated = getMessage($constName);
} // END - if
@@ -621,7 +804,7 @@ function translateComma ($dotted, $cut = true, $max = 0) {
if ($max > 0) $maxComma = $max;
// Cut zeros off?
- if (($cut) && ($max == 0)) {
+ if (($cut === true) && ($max == 0)) {
// Test for commata if in cut-mode
$com = explode('.', $dotted);
if (count($com) < 2) {
@@ -631,15 +814,15 @@ function translateComma ($dotted, $cut = true, $max = 0) {
} // END - if
// Debug log
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
// Translate it now
switch (getLanguage()) {
- case 'de':
+ case 'de': // German language
$dotted = number_format($dotted, $maxComma, ',', '.');
break;
- default:
+ default: // All others
$dotted = number_format($dotted, $maxComma, '.', ',');
break;
}
@@ -660,7 +843,7 @@ function translateGender ($gender) {
case 'C': $ret = getMessage('GENDER_C'); break;
default:
// Log unknown gender
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
break;
}
@@ -670,8 +853,8 @@ function translateGender ($gender) {
// "Translates" the user status
function translateUserStatus ($status) {
- switch ($status)
- {
+ // Generate message depending on status
+ switch ($status) {
case 'UNCONFIRMED':
case 'CONFIRMED':
case 'LOCKED':
@@ -684,19 +867,19 @@ function translateUserStatus ($status) {
break;
default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
$ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
break;
- }
+ } // END - switch
// Return it
return $ret;
}
// Generates an URL for the dereferer
-function DEREFERER ($URL) {
+function generateDerefererUrl ($URL) {
// Don't de-refer our own links!
- if (substr($URL, 0, strlen(constant('URL'))) != constant('URL')) {
+ if (substr($URL, 0, strlen(getConfig('URL'))) != getConfig('URL')) {
// De-refer this link
$URL = 'modules.php?module=loader&url=' . encodeString(compileUriCode($URL));
} // END - if
@@ -706,180 +889,40 @@ function DEREFERER ($URL) {
}
// Generates an URL for the frametester
-function FRAMETESTER ($URL) {
+function generateFrametesterUrl ($URL) {
// Prepare frametester URL
- $frametesterUrl = sprintf("{!URL!}/modules.php?module=frametester&url=%s",
- encodeString(compileUriCode($URL))
+ $frametesterUrl = sprintf("{?URL?}/modules.php?module=frametester&url=%s",
+ encodeString(compileUriCode($URL))
);
+
+ // Return the new URL
return $frametesterUrl;
}
// Count entries from e.g. a selection box
function countSelection ($array) {
- $ret = 0;
- if (is_array($array)) {
- foreach ($array as $key => $selected) {
- if (!empty($selected)) $ret++;
- }
- }
- return $ret;
-}
-
-// Generate XHTML code for the CAPTCHA
-function generateCaptchaCode ($code, $type, $DATA, $uid) {
- return '".__LINE__." ):UID={$UID},template={$template},content[]=".gettype($content)."".__LINE__." ):NICKNAME!".__LINE__." ):NO-NICK!".__LINE__." ):content()=".count($content)." - PRE".__LINE__." ):content()=".count($content)." - AFTER".print_r($content, true)."
-{--TEMPLATE_DATA--}
-".print_r($DATA, true)."
-' . $URL . ' ');
+ outputHtml('' . $URL . ' ');
} elseif (!headers_sent()) {
// Load URL when headers are not sent
//* DEBUG: */ debug_report_bug("URL={$URL}");
@@ -940,7 +983,7 @@ function redirectToUrl ($URL) {
} else {
// Output error message
loadInclude('inc/header.php');
- LOAD_TEMPLATE('redirect_url', false, str_replace('&', '&', $URL));
+ loadTemplate('redirect_url', false, str_replace('&', '&', $URL));
loadInclude('inc/footer.php');
}
@@ -956,15 +999,15 @@ function redirectToConfiguredUrl ($configEntry) {
// Is this URL set?
if (is_null($URL)) {
// Then abort here
- trigger_error(sprintf("Configuration entry %s is not set!", $configEntry));
+ debug_report_bug(sprintf("Configuration entry %s is not set!", $configEntry));
} // END - if
// Load the URL
redirectToUrl($URL);
}
-//
-function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true) {
+// Compiles the given HTML/mail code
+function compileCode ($code, $simple = false, $constants = true, $full = true) {
// Is the code a string?
if (!is_string($code)) {
// Silently return it
@@ -975,17 +1018,20 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
$secChars = $GLOBALS['security_chars'];
// Select smaller set of chars to replace when we e.g. want to compile URLs
- if (!$full) $secChars = $GLOBALS['url_chars'];
+ if ($full === false) $secChars = $GLOBALS['url_chars'];
+
+ // Compile more through a filter
+ $code = runFilterChain('compile_code', $code);
// Compile constants
if ($constants === true) {
// BEFORE 0.2.1 : Language and data constants
// WITH 0.2.1+ : Only language constants
- $code = str_replace('{--','".', str_replace('--}','."', $code));
+ $code = str_replace('{--', "\".getMessage('", str_replace('--}', "').\"", $code));
// BEFORE 0.2.1 : Not used
// WITH 0.2.1+ : Data constants
- $code = str_replace('{!','".', str_replace("!}", '."', $code));
+ $code = str_replace('{!', "\".constant('", str_replace("!}", "').\"", $code));
} // END - if
// Compile QUOT and other non-HTML codes
@@ -998,7 +1044,7 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
if ($simple) $code = str_replace("'", '{QUOT}', $code);
// Find $content[bla][blub] entries
- preg_match_all('/\$(content|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
+ preg_match_all('/\$(content|GLOBALS|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
// Are some matches found?
if ((count($matches) > 0) && (count($matches[0]) > 0)) {
@@ -1014,30 +1060,30 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
$test = substr($found, 0, strlen($match));
// Does this entry exist?
- //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):found={$found},match={$match},set={$set}".__LINE__." ):found={$found},match={$match},set={$set}".__LINE__." ):fuzzyFound!".__LINE__." ):fuzzyFound!".__LINE__." ):key={$key},match={$match}".__LINE__." ):key={$key},match={$match}".__LINE__." ):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
+ case 'day': // Day
for ($idx = 1; $idx < 32; $idx++) {
- $OUT .= "\n";
+ $OUT .= ">" . $idx." \n";
} // END - for
break;
- case "month": // Month
+ case 'month': // Month
foreach ($GLOBALS['month_descr'] as $month => $descr) {
- $OUT .= "\n";
+ $OUT .= ">" . $descr." \n";
} // END - for
break;
- case "year": // Year
+ case 'year': // Year
// Get current year
$year = date('Y', time());
// Use configured min age or fixed?
- if (GET_EXT_VERSION('other') >= '0.2.1') {
+ if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
// Configured
$startYear = $year - getConfig('min_age');
} else {
@@ -1150,21 +1196,21 @@ function ADD_SELECTION ($type, $default, $prefix = '', $id = '0') {
// 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";
+ $OUT .= "" . $idx." \n";
}
} else {
// Get current year and subtract the configured minimum age
- $OUT .= "<".$minYear." \n";
+ $OUT .= "<" . $minYear." \n";
// Calculate earliest year depending on extension version
- if (GET_EXT_VERSION('other') >= '0.2.1') {
+ if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
// Use configured minimum age
$year = date('Y', time()) - getConfig('min_age');
} else {
@@ -1174,29 +1220,29 @@ function ADD_SELECTION ($type, $default, $prefix = '', $id = '0') {
// Construct year selection list
for ($idx = $minYear; $idx <= $year; $idx++) {
- $OUT .= "\n";
+ $OUT .= ">" . $idx." \n";
} // END - for
}
break;
- case "sec":
- case "min":
+ case 'sec':
+ case 'min':
for ($idx = 0; $idx < 60; $idx+=5) {
- if (strlen($idx) == 1) $idx = '0'.$idx;
- $OUT .= "\n";
+ $OUT .= ">" . $idx." \n";
} // END - for
break;
- case "hour":
+ case 'hour':
for ($idx = 0; $idx < 24; $idx++) {
- if (strlen($idx) == 1) $idx = '0'.$idx;
- $OUT .= "\n";
+ $OUT .= ">" . $idx." \n";
} // END - for
break;
@@ -1204,7 +1250,7 @@ function ADD_SELECTION ($type, $default, $prefix = '', $id = '0') {
$OUT .= "{$num}");
+ //debug_report_bug("{$ret}<>{$num}");
} // END - if
// Return result
@@ -1290,34 +1334,34 @@ function bigintval ($num, $castValue = true) {
}
// Insert the code in $img_code into jpeg or PNG image
-function GENERATE_IMAGE ($img_code, $headerSent=true) {
+function generateImageOrCode ($img_code, $headerSent=true) {
if ((strlen($img_code) > 6) || (empty($img_code)) || (getConfig('code_length') == 0)) {
// Stop execution of function here because of over-sized code length
return;
- } elseif (!$headerSent) {
+ } elseif ($headerSent === false) {
// Return in an HTML code code
- return "\n";
+ $OUT = "
\n";
$OUT .= "
\n";
$OUT .= "\n";
@@ -1406,7 +1450,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
$OUT .= " {--_YEARS--}
{--_MONTHS--}
\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";
@@ -1533,7 +1577,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
}
//
-function createTimestampFromSelections ($prefix, $POST) {
+function createTimestampFromSelections ($prefix, $postData) {
// Initial return value
$ret = 0;
@@ -1542,89 +1586,25 @@ function createTimestampFromSelections ($prefix, $POST) {
$TEST = date('Y', time()) / 4;
$M1 = date('m', time());
// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
- if ((floor($TEST) == $TEST) && ($M1 == "02") && ($POST[$prefix."_mo"] > "02")) $SWITCH = getConfig('one_day');
+ if ((floor($TEST) == $TEST) && ($M1 == "02") && ($postData[$prefix."_mo"] > "02")) $SWITCH = getConfig('ONE_DAY');
// First add years...
- $ret += $POST[$prefix."_ye"] * (31536000 + $SWITCH);
+ $ret += $postData[$prefix."_ye"] * (31536000 + $SWITCH);
// Next months...
- $ret += $POST[$prefix."_mo"] * 2628000;
+ $ret += $postData[$prefix."_mo"] * 2628000;
// Next weeks
- $ret += $POST[$prefix."_we"] * 604800;
+ $ret += $postData[$prefix."_we"] * 604800;
// Next days...
- $ret += $POST[$prefix."_da"] * 86400;
+ $ret += $postData[$prefix."_da"] * 86400;
// Next hours...
- $ret += $POST[$prefix."_ho"] * 3600;
+ $ret += $postData[$prefix."_ho"] * 3600;
// Next minutes..
- $ret += $POST[$prefix."_mi"] * 60;
+ $ret += $postData[$prefix."_mi"] * 60;
// And at last seconds...
- $ret += $POST[$prefix."_se"];
+ $ret += $postData[$prefix."_se"];
// Return calculated value
return $ret;
}
-// Sends out mail to all administrators
-// IMPORTANT: Please use SEND_ADMIN_NOTIFCATION() for now!
-function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
- // Trim template name
- $template = trim($template);
-
- // Load email template
- $msg = 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__);
- 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__);
- } else {
- // Load admin IDs...
- // @TODO This can be, somehow, rewritten
- $adminIds = array();
- while ($content = SQL_FETCHARRAY($result)) {
- $adminIds[] = $content['admin_id'];
- } // END - while
-
- // Free memory
- SQL_FREERESULT($result);
-
- // Init result
- $result = false;
-
- // "implode" IDs and query string
- $aid = implode(',', $adminIds);
- if ($aid == '-1') {
- if (EXT_IS_ACTIVE('events')) {
- // Add line to user events
- EVENTS_ADD_LINE($subj, $msg, $UID);
- } else {
- // Log error for debug
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,UID=%s",
- $template,
- $subj,
- $UID
- ));
- }
- } elseif ($aid == '0') {
- // Select all email adresses
- $result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`",
- __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__);
- }
- }
-
- // Load email addresses and send away
- while ($content = SQL_FETCHARRAY($result)) {
- sendEmail($content['email'], $subj, $msg);
- } // END - while
-
- // Free memory
- SQL_FREERESULT($result);
-}
-
// Creates a 'fancy' human-readable timestamp from a Uni* stamp
function createFancyTime ($stamp) {
// Get data array with years/months/weeks/days/...
@@ -1633,8 +1613,7 @@ function createFancyTime ($stamp) {
foreach($data as $k => $v) {
if ($v > 0) {
// Value is greater than 0 "eval" data to return string
- $eval = "\$ret .= \", \".\$v.\" {--_".strtoupper($k)."--}\";";
- eval($eval);
+ eval("\$ret .= \", \".\$v.\" {--_".strtoupper($k)."--}\";");
break;
} // END - if
} // END - foreach
@@ -1652,67 +1631,65 @@ function createFancyTime ($stamp) {
return $ret;
}
-//
-function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
+// Generates a navigation row for listing emails
+function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=false) {
$SEP = ''; $TOP = '';
- if (!$show_form) {
+ if ($show_form === false) {
$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 == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == '1'))) {
// Is currently selected, so only highlight it
- $NAV .= "
-";
+ $NAV .= '-';
} else {
// Open anchor tag and add base URL
- $NAV .= " 0)) $NAV .= "&uid=".bigintval(REQUEST_GET('uid'));
+ if ((isGetRequestElementSet('userid')) && (bigintval(getRequestElement('userid')) > 0)) $NAV .= '&userid=' . bigintval(getRequestElement('userid'));
// Close open anchor tag
- $NAV .= "\">";
+ $NAV .= '">';
}
$NAV .= $page;
- if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) {
+ if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == '1'))) {
// Is currently selected, so only highlight it
- $NAV .= "- ";
+ $NAV .= '- ';
} else {
// Close anchor tag
- $NAV .= "";
+ $NAV .= '';
}
// Add seperator if we have not yet reached total pages
- if ($page < $PAGES) $NAV .= " | ";
+ if ($page < $PAGES) $NAV .= ' | ';
} // END - for
// Define constants only once
- if (!defined('__NAV_OUTPUT')) {
- define('__NAV_OUTPUT' , $NAV);
- define('__NAV_COLSPAN', $colspan);
- define('__NAV_TOP' , $TOP);
- define('__NAV_SEP' , $SEP);
- } // END - if
+ $content['nav'] = $NAV;
+ $content['span'] = $colspan;
+ $content['top'] = $TOP;
+ $content['sep'] = $SEP;
// Load navigation template
- $OUT = LOAD_TEMPLATE("admin_email_nav_row", true);
+ $OUT = loadTemplate('admin_email_nav_row', true, $content);
if ($return === true) {
// Return generated HTML-Code
return $OUT;
} else {
// Output HTML-Code
- OUTPUT_HTML($OUT);
+ outputHtml($OUT);
}
}
// Extract host from script name
function extractHostnameFromUrl (&$script) {
// Use default SERVER_URL by default... ;) So?
- $url = constant('SERVER_URL');
+ $url = getConfig('SERVER_URL');
// Is this URL valid?
if (substr($script, 0, 7) == 'http://') {
@@ -1728,7 +1705,7 @@ function extractHostnameFromUrl (&$script) {
if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/'));
// Generate relative URL
- //* DEBUG: */ print("SCRIPT=".$script."
\n");
+ //* DEBUG: */ print("SCRIPT=" . $script."
");
if (substr(strtolower($script), 0, 7) == 'http://') {
// But only if http:// is in front!
$script = substr($script, (strlen($url) + 7));
@@ -1737,7 +1714,7 @@ function extractHostnameFromUrl (&$script) {
$script = substr($script, (strlen($url) + 8));
}
- //* DEBUG: */ print("SCRIPT=".$script."
\n");
+ //* DEBUG: */ print("SCRIPT=" . $script."
");
if (substr($script, 0, 1) == '/') $script = substr($script, 1);
// Return host name
@@ -1746,24 +1723,21 @@ function extractHostnameFromUrl (&$script) {
// Send a GET request
function sendGetRequest ($script) {
- // Compile the script name
- $script = COMPILE_CODE($script);
-
// Extract host name from script
$host = extractHostnameFromUrl($script);
// Generate GET request header
- $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') . getConfig('HTTP_EOL');
+ $request = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+ $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
+ $request .= 'Referer: ' . getConfig('URL') . '/admin.php' . getConfig('HTTP_EOL');
+ if (isConfigEntrySet('FULL_VERSION')) {
+ $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('FULL_VERSION') . getConfig('HTTP_EOL');
} else {
- $request .= "User-Agent: " . constant('TITLE') . "/?.?.?" . getConfig('HTTP_EOL');
+ $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('VERSION') . getConfig('HTTP_EOL');
}
- $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');
+ $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);
@@ -1777,12 +1751,12 @@ function sendPostRequest ($script, $postData) {
// Is postData an array?
if (!is_array($postData)) {
// Abort here
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("postData is not an array. Type: %s", gettype($postData)));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("postData is not an array. Type: %s", gettype($postData)));
return array('', '', '');
} // END - if
// Compile the script name
- $script = COMPILE_CODE($script);
+ $script = compileCode($script);
// Extract host name from script
$host = extractHostnameFromUrl($script);
@@ -1791,14 +1765,14 @@ function sendPostRequest ($script, $postData) {
$data = http_build_query($postData, '','&');
// Generate POST request header
- $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 = 'POST /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+ $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
+ $request .= 'Referer: ' . getConfig('URL') . '/admin.php' . getConfig('HTTP_EOL');
+ $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('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
@@ -1820,16 +1794,16 @@ function sendRawRequest ($host, $request) {
$useProxy = false;
// Are proxy settins set?
- if ((getConfig('proxy_host') != '') && (getConfig('proxy_port') > 0)) {
+ if ((isConfigEntrySet('proxy_host')) && (getConfig('proxy_host') != '') && (isConfigEntrySet('proxy_port')) && (getConfig('proxy_port') > 0)) {
// Then use it
$useProxy = true;
} // END - if
// Open connection
- //* DEBUG: */ die("SCRIPT=".$script."
\n");
+ //* DEBUG: */ die("SCRIPT=" . $script."
");
if ($useProxy === true) {
// Connect to host through proxy connection
- $fp = @fsockopen(COMPILE_CODE(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
+ $fp = @fsockopen(compileCode(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
} else {
// Connect to host directly
$fp = @fsockopen($host, 80, $errno, $errdesc, 30);
@@ -1850,13 +1824,13 @@ function sendRawRequest ($host, $request) {
// Use login data to proxy? (username at least!)
if (getConfig('proxy_username') != '') {
// Add it as well
- $encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . COMPILE_CODE(getConfig('proxy_password')));
+ $encodedAuth = base64_encode(compileCode(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . compileCode(getConfig('proxy_password')));
$proxyTunnel .= "Proxy-Authorization: Basic " . $encodedAuth . getConfig('HTTP_EOL');
} // END - if
// Add last new-line
$proxyTunnel .= getConfig('HTTP_EOL');
- //* DEBUG: */ print("
proxyTunnel= ".$proxyTunnel." ");
+ //* DEBUG: */ print("
proxyTunnel= " . $proxyTunnel." ");
// Write request
fputs($fp, $proxyTunnel);
@@ -1925,7 +1899,7 @@ function sendRawRequest ($host, $request) {
// Taken from www.php.net eregi() user comments
function isEmailValid ($email) {
// Compile email
- $email = COMPILE_CODE($email);
+ $email = compileCode($email);
// Check first part of email address
$first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*';
@@ -1937,7 +1911,6 @@ function isEmailValid ($email) {
$regex = '@^' . $first . '\@' . $domain . '$@iU';
// Return check result
- // @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);
}
@@ -1945,16 +1918,16 @@ function isEmailValid ($email) {
function isUrlValid ($URL, $compile=true) {
// Trim URL a little
$URL = trim(urldecode($URL));
- //* DEBUG: */ echo $URL."
";
+ //* DEBUG: */ outputHtml($URL."
");
// Compile some chars out...
- if ($compile) $URL = compileUriCode($URL, false, false, false);
- //* DEBUG: */ echo $URL."
";
+ if ($compile === true) $URL = compileUriCode($URL, false, false, false);
+ //* DEBUG: */ outputHtml($URL."
");
// Check for the extension filter
- if (EXT_IS_ACTIVE('filter')) {
+ if (isExtensionActive('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
@@ -1963,61 +1936,63 @@ function isUrlValid ($URL, $compile=true) {
}
// Generate a list of administrative links to a given userid
-function generateMemberAdminActionLinks ($uid, $status = '') {
+function generateMemberAdminActionLinks ($userid, $status = '') {
+ // Make sure userid is a number
+ if ($userid != bigintval($userid)) debug_report_bug('userid is not a number!');
+
// Define all main targets
- $TARGETS = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
+ $targetArray = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
// Begin of navigation links
- $eval = "\$OUT = \"[ ";
+ $OUT = "[ ";
- foreach ($TARGETS as $tar) {
- $eval .= "
| ";
}
// Finish navigation link
- $eval = substr($eval, 0, -7)."]\";";
- eval($eval);
+ $OUT = substr($OUT, 0, -7) . ']';
// Return string
return $OUT;
}
// Generate an email link
-function generateMemberEmailLink ($email, $table = 'admins') {
+function generateEmailLink ($email, $table = 'admins') {
// Default email link (INSECURE! Spammer can read this by harvester programs)
$EMAIL = 'mailto:' . $email;
// Check for several extensions
- if ((EXT_IS_ACTIVE('admins')) && ($table == 'admins')) {
+ if ((isExtensionActive('admins')) && ($table == 'admins')) {
// Create email link for contacting admin in guest area
- $EMAIL = adminsCreateEmailLink($email);
- } elseif ((EXT_IS_ACTIVE('user')) && (GET_EXT_VERSION('user') >= '0.3.3') && ($table == 'user_data')) {
+ $EMAIL = generateAdminEmailLink($email);
+ } elseif ((isExtensionActive('user')) && (getExtensionVersion('user') >= '0.3.3') && ($table == 'user_data')) {
// Create email link for contacting a member within admin area (or later in other areas, too?)
- $EMAIL = USER_generateMemberEmailLink($email);
- } elseif ((EXT_IS_ACTIVE('sponsor')) && ($table == 'sponsor_data')) {
+ $EMAIL = generateUserEmailLink($email, 'admin');
+ } elseif ((isExtensionActive('sponsor')) && ($table == 'sponsor_data')) {
// Create email link to contact sponsor within admin area (or like the link above?)
- $EMAIL = SPONSOR_generateMemberEmailLink($email);
+ $EMAIL = generateSponsorEmailLink($email, 'sponsor_data');
}
// Shall I close the link when there is no admin?
- if ((!IS_ADMIN()) && ($EMAIL == $email)) $EMAIL = '#'; // Closed!
+ if ((!isAdmin()) && ($EMAIL == $email)) $EMAIL = '#'; // Closed!
// Return email link
return $EMAIL;
@@ -2026,7 +2001,7 @@ function generateMemberEmailLink ($email, $table = 'admins') {
// Generate a hash for extra-security for all passwords
function generateHash ($plainText, $salt = '') {
// Is the required extension 'sql_patches' there and a salt is not given?
- if (((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (!EXT_IS_ACTIVE('sql_patches'))) && (empty($salt))) {
+ if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionActive('sql_patches'))) && (empty($salt))) {
// Extension sql_patches is missing/outdated so we hash the plain text with MD5
return md5($plainText);
} // END - if
@@ -2040,36 +2015,36 @@ function generateHash ($plainText, $salt = '') {
// 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 (inc/databases.php is no longer updated with every commit)
- $server = $_SERVER['PHP_SELF'].getConfig('ENCRYPT_SEPERATOR').detectUserAgent().getConfig('ENCRYPT_SEPERATOR').getenv('SERVER_SOFTWARE').getConfig('ENCRYPT_SEPERATOR').detectRemoteAddr();
+ $server = $_SERVER['PHP_SELF'] . getConfig('ENCRYPT_SEPERATOR') . detectUserAgent() . getConfig('ENCRYPT_SEPERATOR') . getenv('SERVER_SOFTWARE') . getConfig('ENCRYPT_SEPERATOR') . detectRemoteAddr();
// Build key string
- $keys = getConfig('SITE_KEY').getConfig('ENCRYPT_SEPERATOR').getConfig('DATE_KEY').getConfig('ENCRYPT_SEPERATOR').getConfig('secret_key').getConfig('ENCRYPT_SEPERATOR').getConfig('file_hash').getConfig('ENCRYPT_SEPERATOR').date("d-m-Y (l-F-T)", getConfig(('patch_ctime'))).getConfig('ENCRYPT_SEPERATOR').getConfig('master_salt');
+ $keys = getConfig('SITE_KEY') . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . getConfig('secret_key') . getConfig('ENCRYPT_SEPERATOR') . getConfig('file_hash') . getConfig('ENCRYPT_SEPERATOR') . date('d-m-Y (l-F-T)', getConfig('patch_ctime')) . getConfig('ENCRYPT_SEPERATOR') . getConfig('master_salt');
// Additional data
- $data = $plainText.getConfig('ENCRYPT_SEPERATOR').uniqid(mt_rand(), true).getConfig('ENCRYPT_SEPERATOR').time();
+ $data = $plainText . getConfig('ENCRYPT_SEPERATOR') . uniqid(mt_rand(), true) . getConfig('ENCRYPT_SEPERATOR') . 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 % getConfig('_PRIME')).$server.getConfig('ENCRYPT_SEPERATOR').$keys.getConfig('ENCRYPT_SEPERATOR').$data.getConfig('ENCRYPT_SEPERATOR').getConfig('DATE_KEY').getConfig('ENCRYPT_SEPERATOR').$a);
- //* DEBUG: */ echo "SHA1=".$sha1." (".strlen($sha1).")
";
+ $sha1 = sha1(($a % getConfig('_PRIME')) . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a);
+ //* DEBUG: */ outputHtml("SHA1=" . $sha1." (".strlen($sha1).")
");
$sha1 = scrambleString($sha1);
- //* DEBUG: */ echo "Scrambled=".$sha1." (".strlen($sha1).")
";
+ //* DEBUG: */ outputHtml("Scrambled=" . $sha1." (".strlen($sha1).")
");
//* DEBUG: */ $sha1b = descrambleString($sha1);
- //* DEBUG: */ echo "Descrambled=".$sha1b." (".strlen($sha1b).")
";
+ //* DEBUG: */ outputHtml("Descrambled=" . $sha1b." (".strlen($sha1b).")
");
// Generate the password salt string
$salt = substr($sha1, 0, getConfig('salt_length'));
- //* DEBUG: */ echo $salt." (".strlen($salt).")
";
+ //* DEBUG: */ outputHtml($salt." (".strlen($salt).")
");
} else {
// Use given salt
$salt = substr($salt, 0, getConfig('salt_length'));
- //* DEBUG: */ echo "GIVEN={$salt}
\n";
+ //* DEBUG: */ outputHtml("GIVEN={$salt}
");
}
// Return hash
- return $salt.sha1($salt.$plainText);
+ return $salt.sha1($salt . $plainText);
}
// Scramble a string
@@ -2090,7 +2065,7 @@ function scrambleString($str) {
}
// Scramble string here
- //* DEBUG: */ echo "***Original=".$str."***
";
+ //* DEBUG: */ outputHtml("***Original=" . $str."***
");
for ($idx = 0; $idx < strlen($str); $idx++) {
// Get char on scrambled position
$char = substr($str, $scrambleNums[$idx], 1);
@@ -2100,7 +2075,7 @@ function scrambleString($str) {
} // END - for
// Return scrambled string
- //* DEBUG: */ echo "***Scrambled=".$scrambled."***
";
+ //* DEBUG: */ outputHtml("***Scrambled=" . $scrambled."***
");
return $scrambled;
}
@@ -2116,15 +2091,15 @@ function descrambleString($str) {
if (count($scrambleNums) != 40) return $str;
// Begin descrambling
- $orig = str_repeat(" ", 40);
- //* DEBUG: */ echo "+++Scrambled=".$str."+++
";
+ $orig = str_repeat(' ', 40);
+ //* DEBUG: */ outputHtml("+++Scrambled=" . $str."+++
");
for ($idx = 0; $idx < 40; $idx++) {
$char = substr($str, $idx, 1);
$orig = substr_replace($orig, $char, $scrambleNums[$idx], 1);
} // END - for
// Return scrambled string
- //* DEBUG: */ echo "+++Original=".$orig."+++
";
+ //* DEBUG: */ outputHtml("+++Original=" . $orig."+++
");
return $orig;
}
@@ -2158,7 +2133,7 @@ function generatePassString ($passHash) {
$ret = $passHash;
// Is a secret key and master salt already initialized?
- if ((getConfig('secret_key') != '') && (getConfig('master_salt') != '')) {
+ if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) {
// Only calculate when the secret key is generated
$newHash = ''; $start = 9;
for ($idx = 0; $idx < 10; $idx++) {
@@ -2171,20 +2146,20 @@ function generatePassString ($passHash) {
$mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi()));
}
$mod = substr(round($mod), 0, 4);
- $mod = str_repeat('0', 4-strlen($mod)).$mod;
- //* DEBUG: */ echo "*".$start.'='.$mod."*
";
+ $mod = str_repeat('0', 4-strlen($mod)) . $mod;
+ //* DEBUG: */ outputHtml("*" . $start.'=' . $mod."*
");
$start += 4;
$newHash .= $mod;
} // END - for
- //* DEBUG: */ print($passHash."
".$newHash." (".strlen($newHash).')');
+ //* DEBUG: */ print($passHash."
" . $newHash." (".strlen($newHash).')');
$ret = generateHash($newHash, getConfig('master_salt'));
- //* DEBUG: */ print($ret."
\n");
+ //* DEBUG: */ print($ret."
");
} else {
// Hash it simple
- //* DEBUG: */ echo "--".$passHash."--
\n";
+ //* DEBUG: */ outputHtml("--" . $passHash."--
");
$ret = md5($passHash);
- //* DEBUG: */ echo "++".$ret."++
\n";
+ //* DEBUG: */ outputHtml("++" . $ret."++
");
}
// Return result
@@ -2206,7 +2181,7 @@ function fixDeletedCookies ($cookies) {
}
// Output error messages in a fasioned way and die...
-function app_die ($F, $L, $msg) {
+function app_die ($F, $L, $message) {
// Check if Script is already dieing and not let it kill itself another 1000 times
if (!isset($GLOBALS['app_died'])) {
// Make sure, that the script realy realy diese here and now
@@ -2215,17 +2190,20 @@ function app_die ($F, $L, $msg) {
// Load header
loadIncludeOnce('inc/header.php');
- // Prepare message for output
- $msg = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $msg);
+ // Rewrite message for output
+ $message = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $message);
+
+ // Better log this message away
+ logDebugMessage($F, $L, $message);
// Load the message template
- LOAD_TEMPLATE('admin_settings_saved', false, $msg);
+ loadTemplate('admin_settings_saved', false, $message);
// Load footer
loadIncludeOnce('inc/footer.php');
} else {
// Script tried to kill itself twice
- debug_report_bug('Script wanted to kill itself more than once! Raw message=' . $msg . ', file/function=' . $F . ', line=' . $L);
+ debug_report_bug('Script wanted to kill itself more than once! Raw message=' . $message . ', file/function=' . $F . ', line=' . $L);
}
}
@@ -2245,17 +2223,15 @@ function displayParsingTime() {
$end = explode(' ', $endTime);
$runTime = $end[0] - $start[0];
if ($runTime < 0) $runTime = 0;
- $runTime = translateComma($runTime);
// Prepare output
$content = array(
- 'runtime' => $runTime,
- 'numSQLs' => (getConfig('sql_count') + 1),
- 'numTemplates' => (getConfig('num_templates') + 1)
+ 'runtime' => translateComma($runTime),
+ 'timeSQLs' => translateComma(getConfig('sql_time') * 1000),
);
// Load the template
- LOAD_TEMPLATE('show_timings', false, $content);
+ loadTemplate('show_timings', false, $content);
}
// Check wether a boolean constant is set
@@ -2267,14 +2243,14 @@ function isBooleanConstantAndTrue ($constName) { // : Boolean
// In cache?
if (isset($GLOBALS['cache_array']['const'][$constName])) {
// Use cache
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ): ".$constName."-CACHE!
\n";
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ): " . $constName."-CACHE!
");
$res = ($GLOBALS['cache_array']['const'][$constName] === true);
} else {
// Check constant
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ): ".$constName."-RESOLVE!
\n";
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ): " . $constName."-RESOLVE!
");
if (defined($constName)) {
// Found!
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ): ".$constName."-FOUND!
\n";
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ): " . $constName."-FOUND!
");
$res = (constant($constName) === true);
} // END - if
@@ -2294,7 +2270,7 @@ function isApacheModuleLoaded ($apacheModule) {
}
// Get current theme name
-function getCurrentTheme() {
+function getCurrentTheme () {
// The default theme is 'default'... ;-)
$ret = 'default';
@@ -2303,8 +2279,8 @@ function getCurrentTheme() {
if (!isSessionVariableSet('mxchange_theme')) {
// Set default theme
- setSession('mxchange_theme', $ret);
- } elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION('sql_patches') >= '0.1.4')) {
+ setTheme($ret);
+ } elseif ((isSessionVariableSet('mxchange_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
//die("
".print_r($GLOBALS['cache_array']['themes'], true)." ");
// Get theme from cookie
$ret = getSession('mxchange_theme');
@@ -2314,40 +2290,40 @@ function getCurrentTheme() {
// Fix it to default
$ret = 'default';
} // END - if
- } elseif ((!isInstalled()) && ((isInstalling()) || ($GLOBALS['output_mode'] == true)) && ((REQUEST_ISSET_GET('theme')) || (REQUEST_ISSET_POST('theme')))) {
+ } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
// Prepare FQFN for checking
- $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), REQUEST_GET('theme'));
+ $theme = sprintf("%stheme/%s/theme.php", getConfig('PATH'), getRequestElement('theme'));
// Installation mode active
- if ((REQUEST_ISSET_GET('theme')) && (isFileReadable($theme))) {
+ if ((isGetRequestElementSet('theme')) && (isFileReadable($theme))) {
// Set cookie from URL data
- setSession('mxchange_theme', REQUEST_GET('theme'));
- } elseif (isFileReadable(sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE(REQUEST_POST('theme'))))) {
+ setTheme(getRequestElement('theme'));
+ } elseif (isFileReadable(sprintf("%stheme/%s/theme.php", getConfig('PATH'), SQL_ESCAPE(postRequestElement('theme'))))) {
// Set cookie from posted data
- setSession('mxchange_theme', SQL_ESCAPE(REQUEST_POST('theme')));
+ setTheme(SQL_ESCAPE(postRequestElement('theme')));
}
// Set return value
$ret = getSession('mxchange_theme');
} else {
// Invalid design, reset cookie
- setSession('mxchange_theme', $ret);
+ setTheme($ret);
}
- // Add (maybe) found theme.php file to inclusion list
- $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($ret));
-
- // Try to load the requested include file
- if (isIncludeReadable($INC)) ADD_INC_TO_POOL($INC);
-
// Return theme value
return $ret;
}
+// Setter for theme in session
+function setTheme ($newTheme) {
+ setSession('mxchange_theme', $newTheme);
+}
+
// Get id from theme
+// @TODO Try to move this to inc/libs/theme_functions.php
function getThemeId ($name) {
// Is the extension 'theme' installed?
- if (!EXT_IS_ACTIVE('theme')) {
+ if (!isExtensionActive('theme')) {
// Then abort here
return 0;
} // END - if
@@ -2361,11 +2337,11 @@ function getThemeId ($name) {
$id = $GLOBALS['cache_array']['themes']['id'][$name];
// Count up
- incrementConfigEntry('cache_hits');
- } elseif (GET_EXT_VERSION('cache') != '0.1.8') {
+ incrementStatsEntry('cache_hits');
+ } elseif (getExtensionVersion('cache') != '0.1.8') {
// Check if current theme is already imported or not
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
- array($name), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1",
+ array($name), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
@@ -2383,6 +2359,12 @@ function getThemeId ($name) {
// Generates an error code from given account status
function generateErrorCodeFromUserStatus ($status) {
+ // @TODO The status should never be empty
+ if (empty($status)) {
+ // Something really bad happend here
+ debug_report_bug(__FUNCTION__ . ': status is empty.');
+ } // END - if
+
// Default error code if unknown account status
$errorCode = getCode('UNKNOWN_STATUS');
@@ -2395,7 +2377,7 @@ function generateErrorCodeFromUserStatus ($status) {
$errorCode = getCode($constantName);
} else {
// Unknown status
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown error status %s detected.", $status));
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown error status %s detected.", $status));
}
// Return error code
@@ -2405,33 +2387,33 @@ function generateErrorCodeFromUserStatus ($status) {
// Function to search for the last modifified file
function searchDirsRecursive ($dir, &$last_changed) {
// Get dir as array
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ):dir=".$dir."
\n";
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ):dir=" . $dir."
");
// Does it match what we are looking for? (We skip a lot files already!)
// RegexPattern to exclude ., .., .revision, .svn, debug.log or .cache in the filenames
- $excludePattern = '@(\.|\.\.|\.revision|\.svn|debug\.log|\.cache|config\.php)$@';
- $ds = getArrayFromDirectory($dir, '', true, false, $excludePattern);
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ):ds[]=".count($ds)."
\n";
+ $excludePattern = '@(\.revision|debug\.log|\.cache|config\.php)$@';
+ $ds = getArrayFromDirectory($dir, '', true, false, array(), '.php', $excludePattern);
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ):ds[]=".count($ds)."
");
// Walk through all entries
foreach ($ds as $d) {
// Generate proper FQFN
- $FQFN = str_replace("//", '/', constant('PATH') . $dir. '/'. $d);
+ $FQFN = str_replace('//', '/', getConfig('PATH') . $dir. '/'. $d);
// Is it a file and readable?
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ):FQFN={$FQFN}
\n";
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ):FQFN={$FQFN}
");
if (isDirectory($FQFN)) {
// $FQFN is a directory so also crawl into this directory
$newDir = $d;
if (!empty($dir)) $newDir = $dir . '/'. $d;
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ):DESCENT: ".$newDir."
\n";
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ):DESCENT: " . $newDir."
");
searchDirsRecursive($newDir, $last_changed);
} elseif (isFileReadable($FQFN)) {
// $FQFN is a filename and no directory
$time = filemtime($FQFN);
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ):File: ".$d." found. (".($last_changed['time'] - $time).")
\n";
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ):File: " . $d." found. (".($last_changed['time'] - $time).")
");
if ($last_changed['time'] < $time) {
// This file is newer as the file before
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ) - NEWER!
\n";
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ) - NEWER!
");
$last_changed['path_name'] = $FQFN;
$last_changed['time'] = $time;
} // END - if
@@ -2444,36 +2426,20 @@ function getActualVersion ($type = 'Revision') {
// By default nothing is new... ;-)
$new = false;
- if (EXT_IS_ACTIVE('cache')) {
- // Check if REQUEST_GET('check_revision_data') is setted (switch for manually rewrite the .revision-File)
- if (REQUEST_ISSET_GET('check_revision_data') && REQUEST_GET('check_revision_data') == 'yes') $new = true;
- if (!isset($GLOBALS['cache_array']['revision'][$type])
- || count($GLOBALS['cache_array']['revision']) < 3
- || !$GLOBALS['cache_instance']->loadCacheFile('revision')) $new = true;
-
- // Is the cache file outdated/invalid?
- if ($new === true){
- $GLOBALS['cache_instance']->destroyCacheFile(); // @TODO isn't it better to do $GLOBALS['cache_instance']->destroyCacheFile('revision')?
-
- // @TODO shouldn't do the unset and the reloading $GLOBALS['cache_instance']->destroyCacheFile() Or a new methode like forceCacheReload('revision')?
- unset($GLOBALS['cache_array']['revision']);
-
- // Reload load_cach-revison.php
- loadInclude('inc/loader/load_cache-revision.php');
- } // END - if
+ // Is the cache entry there?
+ if (isset($GLOBALS['cache_array']['revision'][$type])) {
+ // Found so increase cache hit
+ incrementStatsEntry('cache_hits');
- // Return found value
+ // Return it
return $GLOBALS['cache_array']['revision'][$type][0];
-
} else {
- // Old Version without ext-cache active (deprecated ?)
-
// FQFN of revision file
- $FQFN = sprintf("%sinc/cache/.revision", constant('PATH'));
+ $FQFN = sprintf("%s/.revision", getConfig('CACHE_PATH'));
- // Check if REQUEST_GET('check_revision_data') is setted (switch for manually rewrite the .revision-File)
- if ((REQUEST_ISSET_GET('check_revision_data')) && (REQUEST_GET('check_revision_data') == 'yes')) {
- // Has changed!
+ // Check if 'check_revision_data' is setted (switch for manually rewrite the .revision-File)
+ if ((isGetRequestElementSet('check_revision_data')) && (getRequestElement('check_revision_data') == 'yes')) {
+ // Forced rebuild of .revision file
$new = true;
} else {
// Check for revision file
@@ -2486,13 +2452,18 @@ function getActualVersion ($type = 'Revision') {
// Get array for mapping information
$mapper = array_flip(getSearchFor());
- //* DEBUG: */ print("
".print_r($mapper, true).print_r($ins_vers, true)." ");
+ //* DEBUG: */ print('
mapper='.print_r($mapper, true).' ins_vers=
'.print_r($ins_vers, true).' ');
// Is the content valid?
- if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == '') || ($ins_vers[0]) == "new") {
+ if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == '') || ($ins_vers[0]) == 'new') {
// File needs update!
$new = true;
} else {
+ // Generate fake cache entry
+ foreach ($mapper as $map=>$idx) {
+ $GLOBALS['cache_array']['revision'][$map][0] = $ins_vers[$idx];
+ } // END - foreach
+
// Return found value
return trim($ins_vers[$mapper[$type]]);
}
@@ -2501,7 +2472,11 @@ function getActualVersion ($type = 'Revision') {
// Has it been updated?
if ($new === true) {
+ // Write it
writeToFile($FQFN, implode("\n", getArrayFromActualVersion()));
+
+ // ... and call recursive
+ return getActualVersion($type);
} // END - if
}
}
@@ -2510,7 +2485,7 @@ function getActualVersion ($type = 'Revision') {
// The returned Array is needed twice (in getArrayFromActualVersion() and in getActualVersion() in the old .revision-fallback) so I puted it in an extra function to not polute the global namespace
function getSearchFor () {
// Add Revision, Date, Tag and Author
- $searchFor = array('Revision', 'Date', 'Tag', 'Author');
+ $searchFor = array('Revision', 'Date', 'Tag', 'Author', 'File');
// Return the created array
return $searchFor;
@@ -2519,13 +2494,19 @@ function getSearchFor () {
// @TODO Please describe this function
function getArrayFromActualVersion () {
// Init variables
- $next_dir = ''; // Directory to start with search
+ $next_dir = '';
+
+ // Directory to start with search
$last_changed = array(
'path_name' => '',
'time' => 0
);
- $akt_vers = array(); // Init return array
- $res = 0; // Init value for counting the founded keywords
+
+ // Init return array
+ $akt_vers = array();
+
+ // Init value for counting the founded keywords
+ $res = 0;
// Searches all Files and there date of the last modifikation and puts the newest File in $last_changed.
searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
@@ -2539,28 +2520,28 @@ function getArrayFromActualVersion () {
// This foreach loops the $searchFor-Tags (array('Revision', 'Date', 'Tag', 'Author') --> could easaly extended in the future)
foreach ($searchFor as $search) {
// Searches for "$search-tag:VALUE$" or "$search-tag::VALUE$"(the stylish keywordversion ;-)) in the lates modified file
- $res += preg_match('@\$'.$search.'(:|::) (.*) \$@U', $last_file, $t);
- // This trimms the search-result and puts it in the $akt_vers-return array
- if (isset($t[2])) $akt_vers[$search] = trim($t[2]);
+ $res += preg_match('@\$' . $search.'(:|::) (.*) \$@U', $last_file, $t);
+ // This trimms the search-result and puts it in the $GLOBALS['cache_array']['revision']-return array
+ if (isset($t[2])) $GLOBALS['cache_array']['revision'][$search] = trim($t[2]);
} // END - foreach
// Save the last-changed filename for debugging
- $akt_vers['File'] = $last_changed['path_name'];
+ $GLOBALS['cache_array']['revision']['File'] = $last_changed['path_name'];
// at least 3 keyword-Tags are needed for propper values
if ($res && $res >= 3
- && isset($akt_vers['Revision']) && $akt_vers['Revision'] != ''
- && isset($akt_vers['Date']) && $akt_vers['Date'] != ''
- && isset($akt_vers['Tag']) && $akt_vers['Tag'] != '') {
+ && isset($GLOBALS['cache_array']['revision']['Revision']) && $GLOBALS['cache_array']['revision']['Revision'] != ''
+ && isset($GLOBALS['cache_array']['revision']['Date']) && $GLOBALS['cache_array']['revision']['Date'] != ''
+ && isset($GLOBALS['cache_array']['revision']['Tag']) && $GLOBALS['cache_array']['revision']['Tag'] != '') {
// Prepare content witch need special treadment
// Prepare timestamp for date
- preg_match('@(....)-(..)-(..) (..):(..):(..)@', $akt_vers['Date'], $match_d);
- $akt_vers['Date'] = mktime($match_d[4], $match_d[5], $match_d[6], $match_d[2], $match_d[3], $match_d[1]);
+ preg_match('@(....)-(..)-(..) (..):(..):(..)@', $GLOBALS['cache_array']['revision']['Date'], $match_d);
+ $GLOBALS['cache_array']['revision']['Date'] = mktime($match_d[4], $match_d[5], $match_d[6], $match_d[2], $match_d[3], $match_d[1]);
// Add author to the Tag if the author is set and is not quix0r (lead coder)
- if ((isset($akt_vers['Author'])) && ($akt_vers['Author'] != "quix0r")) {
- $akt_vers['Tag'] .= '-'.strtoupper($akt_vers['Author']);
+ if ((isset($GLOBALS['cache_array']['revision']['Author'])) && ($GLOBALS['cache_array']['revision']['Author'] != 'quix0r')) {
+ $GLOBALS['cache_array']['revision']['Tag'] .= '-'.strtoupper($GLOBALS['cache_array']['revision']['Author']);
} // END - if
} else {
@@ -2569,14 +2550,15 @@ function getArrayFromActualVersion () {
// Prepare content
// Only sets not setted or not proper values to the Online-Server-Fallback-Solution
- if (!isset($akt_vers['Revision']) || $akt_vers['Revision'] == '') $akt_vers['Revision'] = trim($version[10]);
- if (!isset($akt_vers['Date']) || $akt_vers['Date'] == '') $akt_vers['Date'] = trim($version[9]);
- if (!isset($akt_vers['Tag']) || $akt_vers['Tag'] == '') $akt_vers['Tag'] = trim($version[8]);
- if (!isset($akt_vers['Author']) || $akt_vers['Author'] == '') $akt_vers['Author'] = "quix0r";
+ if (!isset($GLOBALS['cache_array']['revision']['Revision']) || $GLOBALS['cache_array']['revision']['Revision'] == '') $GLOBALS['cache_array']['revision']['Revision'] = trim($version[10]);
+ if (!isset($GLOBALS['cache_array']['revision']['Date']) || $GLOBALS['cache_array']['revision']['Date'] == '') $GLOBALS['cache_array']['revision']['Date'] = trim($version[9]);
+ if (!isset($GLOBALS['cache_array']['revision']['Tag']) || $GLOBALS['cache_array']['revision']['Tag'] == '') $GLOBALS['cache_array']['revision']['Tag'] = trim($version[8]);
+ if (!isset($GLOBALS['cache_array']['revision']['Author']) || $GLOBALS['cache_array']['revision']['Author'] == '') $GLOBALS['cache_array']['revision']['Author'] = 'quix0r';
+ if (!isset($GLOBALS['cache_array']['revision']['File']) || $GLOBALS['cache_array']['revision']['File'] == '') $GLOBALS['cache_array']['revision']['File'] = trim($version[11]);
}
// Return prepared array
- return $akt_vers;
+ return $GLOBALS['cache_array']['revision'];
}
// Back-ported from the new ship-simu engine. :-)
@@ -2590,7 +2572,7 @@ function debug_get_printable_backtrace () {
if (!isset($trace['file'])) $trace['file'] = __FUNCTION__;
if (!isset($trace['line'])) $trace['line'] = __LINE__;
if (!isset($trace['args'])) $trace['args'] = array();
- $backtrace .= "
".basename($trace['file'])." :".$trace['line'].", ".$trace['function'].'('.count($trace['args']).") \n";
+ $backtrace .= "
".basename($trace['file'])." :" . $trace['line'].", " . $trace['function'].'('.count($trace['args']).") \n";
} // END - foreach
// Close it
@@ -2604,21 +2586,22 @@ function debug_get_printable_backtrace () {
function debug_report_bug ($message = '') {
// Init message
$debug = '';
+
// Is the optional message set?
if (!empty($message)) {
// Use and log it
$debug = sprintf("Note: %s
\n",
- $message
+ $message
);
// @TODO Add a little more infos here
- DEBUG_LOG(__FUNCTION__, __LINE__, $message);
+ logDebugMessage(__FUNCTION__, __LINE__, strip_tags($message));
} // END - if
// Add output
- $debug .= "Please report this bug at
bugs.mxchange.org and include the logfile from
inc/cache/debug.log in your report (you cannot attach files!):
";
+ $debug .= "Please report this bug at bugs.mxchange.org and include the logfile from " . getConfig('CACHE_PATH') . "debug.log in your report (you can now attach files):";
$debug .= debug_get_printable_backtrace();
- $debug .= " \nRequest-URI: ".$_SERVER['REQUEST_URI']." \nRequest-URI: " . getRequestUri()."
\n";
$debug .= "Thank you for finding bugs.";
// And abort here
@@ -2628,80 +2611,124 @@ function debug_report_bug ($message = '') {
// Generates a ***weak*** seed (taken from de.php.net/mt_srand)
function generateSeed () {
- list($usec, $sec) = explode(" ", microtime());
- return ((float)$sec + (float)$usec);
+ list($usec, $sec) = explode(' ', microtime());
+ $microTime = (((float)$sec + (float)$usec)) * 100000;
+ return $microTime;
}
// Converts a message code to a human-readable message
-function convertCodeToMessage ($code) {
- $msg = '';
+function getMessageFromErrorCode ($code) {
+ $message = '';
switch ($code) {
- case getCode('LOGOUT_DONE') : $msg = getMessage('LOGOUT_DONE'); break;
- case getCode('LOGOUT_FAILED') : $msg = "
{--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 '': 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_404'); break;
+ case getCode('STATS_404') : $message = getMessage('MAIL_STATS_404'); break;
+ case getCode('ALREADY_CONFIRMED'): $message = getMessage('MAIL_ALREADY_CONFIRMED'); break;
+ case getCode('WRONG_PASS') : $message = getMessage('LOGIN_WRONG_PASS'); break;
+ case getCode('WRONG_ID') : $message = getMessage('LOGIN_WRONG_ID'); break;
+ case getCode('ID_LOCKED') : $message = getMessage('LOGIN_ID_LOCKED'); break;
+ case getCode('ID_UNCONFIRMED') : $message = getMessage('LOGIN_ID_UNCONFIRMED'); break;
+ case getCode('NO_COOKIES') : $message = getMessage('LOGIN_NO_COOKIES'); 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'), getRequestElement('mod')); break;
+ case getCode('OVERLENGTH') : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
+ case getCode('URL_FOUND') : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
+ case getCode('SUBJ_URL') : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
+ case getCode('BLIST_URL') : $message = "{--MEMBER_URL_BLACK_LISTED--}
\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestElement('blist'), '0'); break;
+ case getCode('NO_RECS_LEFT') : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
+ case getCode('INVALID_TAGS') : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
+ case getCode('MORE_POINTS') : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
+ case getCode('MORE_RECEIVERS1') : $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS'); break;
+ case getCode('MORE_RECEIVERS2') : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break;
+ case getCode('MORE_RECEIVERS3') : $message = sprintf(getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'), getConfig('order_min')); break;
+ case getCode('INVALID_URL') : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break;
case getCode('ERROR_MAILID'):
- if (EXT_IS_ACTIVE($ext, true)) {
- $msg = getMessage('ERROR_CONFIRMING_MAIL');
+ if (isExtensionActive('mailid', true)) {
+ $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 (isGetRequestElementSet('ext')) {
+ $message = generateExtensionInactiveNotInstalledMessage(getRequestElement('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('URL_TLOCK'):
+ $result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+ array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
+
+ // Load timestamp from last order
+ list($timestamp) = SQL_FETCHROW($result);
+ $timestamp = generateDateTime($timestamp, '1');
+
+ // Free memory
+ SQL_FREERESULT($result);
+
+ // Calculate hours...
+ $STD = round(getConfig('url_tlock') / 60 / 60);
+
+ // Minutes...
+ $MIN = round((getConfig('url_tlock') - $STD * 60 * 60) / 60);
+
+ // And seconds
+ $SEC = getConfig('url_tlock') - $STD * 60 * 60 - $MIN * 60;
+
+ // Finally contruct the message
+ // @TODO Rewrite this old lost code to a template
+ $message = "{--MEMBER_URL_TIME_LOCK--}
{--CONFIG_URL_TLOCK--} ".$STD."
+ {--_HOURS--}, ".$MIN." {--_MINUTES--} {--_AND--} ".$SEC." {--_SECONDS--}
+ {--MEMBER_LAST_TLOCK--}: ".$timestamp;
+ 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);
+ logDebugMessage(__FUNCTION__, __LINE__, $message);
break;
} // END - switch
// Return the message
- return $msg;
+ return $message;
}
-// Generate a "link" for the given admin id (aid)
-function generateAdminLink ($aid) {
+// Generate a "link" for the given admin id (admin_id)
+function generateAdminLink ($adminId) {
// No assigned admin is default
$admin = "
{--ADMIN_NO_ADMIN_ASSIGNED--} ";
// Zero? = Not assigned
- if (bigintval($aid) > 0) {
+ if (bigintval($adminId) > 0) {
// Load admin's login
- $login = getAdminLogin($aid);
+ $login = getAdminLogin($adminId);
// Is the login valid?
if ($login != '***') {
// Is the extension there?
- if (EXT_IS_ACTIVE('admins')) {
+ if (isExtensionActive('admins')) {
// Admin found
- $admin = "
".$login." ";
+ $admin = "
" . $login." ";
} else {
// Extension not found
$admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins');
}
} else {
// Maybe deleted?
- $admin = "
".sprintf(getMessage('ADMIN_ID_404'), $aid)."
";
+ $admin = "
".sprintf(getMessage('ADMIN_ID_404'), $adminId)."
";
}
} // END - if
@@ -2710,21 +2737,21 @@ function generateAdminLink ($aid) {
}
// Compile characters which are allowed in URLs
-function compileUriCode ($code, $simple=true) {
+function compileUriCode ($code, $simple = true) {
// Compile constants
- if (!$simple) $code = str_replace("{--", '".', str_replace("--}", '."', $code));
+ if ($simple === false) $code = str_replace('{--', '".', str_replace('--}', '."', $code));
// Compile QUOT and other non-HTML codes
$code = str_replace('{DOT}', '.',
- str_replace('{SLASH}', '/',
- str_replace('{QUOT}', "'",
- str_replace('{DOLLAR}', '$',
- str_replace('{OPEN_ANCHOR}', '(',
- str_replace('{CLOSE_ANCHOR}', ')',
- str_replace('{OPEN_SQR}', '[',
- str_replace('{CLOSE_SQR}', ']',
- str_replace('{PER}', '%',
- $code
+ str_replace('{SLASH}', '/',
+ str_replace('{QUOT}', "'",
+ str_replace('{DOLLAR}', '$',
+ str_replace('{OPEN_ANCHOR}', '(',
+ str_replace('{CLOSE_ANCHOR}', ')',
+ str_replace('{OPEN_SQR}', '[',
+ str_replace('{CLOSE_SQR}', ']',
+ str_replace('{PER}', '%',
+ $code
)))))))));
// Return compiled code
@@ -2734,7 +2761,7 @@ function compileUriCode ($code, $simple=true) {
// Function taken from user comments on www.php.net / function eregi()
function isUrlValidSimple ($url) {
// Prepare URL
- $url = strip_tags(str_replace("\\", '', compileUriCode(urldecode($url))));
+ $url = secureString(str_replace("\\", '', compileCode(urldecode($url))));
// Allows http and https
$http = "(http|https)+(:\/\/)";
@@ -2751,44 +2778,42 @@ function isUrlValidSimple ($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."
";
- }
+ if (isDebugRegExpressionEnabled()) {
+ // @TODO Are these convertions still required?
+ $pat = str_replace('.', "\.", $pat);
+ $pat = str_replace('@', "\@", $pat);
+ //* DEBUG: */ outputHtml($key."= " . $pat . "
");
+ } // END - if
// Check if expression matches
- $reg = ($reg || preg_match(("^".$pat."^"), $url));
+ $reg = ($reg || preg_match(('^' . $pat.'^'), $url));
// Does it match?
if ($reg === true) break;
@@ -2813,15 +2838,19 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
$tmp = $FQFN . '.tmp';
// Open the source file
- $fp = fopen($FQFN, 'r') or OUTPUT_HTML('
READ: ' . $FQFN . "
\n");
+ $fp = fopen($FQFN, 'r') or outputHtml('
READ: ' . $FQFN . '
');
// Is the resource valid?
if (is_resource($fp)) {
// Open temporary file
- $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML('
WRITE: ' . $tmp . "
\n");
+ $fp_tmp = fopen($tmp, 'w') or outputHtml('
WRITE: ' . $tmp . '
');
// Is the resource again valid?
if (is_resource($fp_tmp)) {
+ // Mark temporary file as readable
+ $GLOBALS['file_readable'][$tmp] = true;
+
+ // Start reading
while (!feof($fp)) {
// Read from source file
$line = fgets ($fp, 1024);
@@ -2835,7 +2864,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
} else {
$next++;
}
- }
+ } // END - if
// Write to temp file
fputs($fp_tmp, $line);
@@ -2856,90 +2885,45 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
copyFileVerified($tmp, $FQFN, 0644);
return removeFile($tmp);
} elseif ($found === false) {
- OUTPUT_HTML('
CHANGE: 404!');
+ outputHtml('
CHANGE: 404!');
} else {
- OUTPUT_HTML('
TMP: UNDONE!');
+ outputHtml('
TMP: UNDONE!');
}
}
} else {
// File not found, not readable or writeable
- OUTPUT_HTML('
404: ' . $FQFN . '
');
+ outputHtml('
404: ' . $FQFN . '
');
}
// An error was detected!
return false;
}
// Send notification to admin
-function sendAdminNotification ($subject, $templateName, $content=array(), $uid = '0') {
- if (GET_EXT_VERSION('admins') >= '0.4.1') {
+function sendAdminNotification ($subject, $templateName, $content=array(), $userid = '0') {
+ if (getExtensionVersion('admins') >= '0.4.1') {
// Send new way
- SEND_ADMIN_EMAILS_PRO($subject, $templateName, $content, $uid);
+ sendAdminsEmails($subject, $templateName, $content, $userid);
} else {
// Send out out-dated way
- $msg = LOAD_EMAIL_TEMPLATE($templateName, $content, $uid);
- SEND_ADMIN_EMAILS($subject, $msg);
+ $message = loadEmailTemplate($templateName, $content, $userid);
+ sendAdminEmails($subject, $message);
}
}
// Debug message logger
-function DEBUG_LOG ($funcFile, $line, $message, $force=true) {
+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));
- // Log this message away
- $fp = fopen(constant('PATH')."inc/cache/debug.log", 'a') or app_die(__FUNCTION__, __LINE__, "Cannot write logfile debug.log!");
- fwrite($fp, date("d.m.Y|H:i:s", time())."|".$GLOBALS['module']."|".basename($funcFile)."|".$line."|".strip_tags($message)."\n");
+ // Log this message away, we better don't call app_die() here to prevent an endless loop
+ $fp = fopen(getConfig('CACHE_PATH') . 'debug.log', 'a') or die(__FUNCTION__.'['.__LINE__.']: Cannot write logfile debug.log!');
+ fwrite($fp, date('d.m.Y|H:i:s', time()) . '|' . getModule() . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n");
fclose($fp);
} // END - if
}
-// Load more reset scripts
-function runResetIncludes () {
- // Is the reset set or old sql_patches?
- if ((!isResetModeEnabled()) || (EXT_VERSION_IS_OLDER('sql_patches', '0.4.5'))) {
- // Then abort here
- DEBUG_LOG(__FUNCTION__, __LINE__, "Cannot run reset! Please report this bug. Thanks");
- } // END - if
-
- // Get more daily reset scripts
- SET_INC_POOL(getArrayFromDirectory('inc/reset/', 'reset_'));
-
- // Update database
- if (getConfig('DEBUG_RESET') != 'Y') updateConfiguration('last_update', time());
-
- // Is the config entry set?
- if (GET_EXT_VERSION('sql_patches') >= '0.4.2') {
- // Create current week mark
- $currWeek = date('W', time());
-
- // Has it changed?
- if (getConfig('last_week') != $currWeek) {
- // Include weekly reset scripts
- MERGE_INC_POOL(getArrayFromDirectory('inc/weekly/', 'weekly_'));
-
- // Update config
- if (getConfig('DEBUG_WEEKLY') != 'Y') updateConfiguration('last_week', $currWeek);
- } // END - if
-
- // Create current month mark
- $currMonth = date('m', time());
-
- // Has it changed?
- if (getConfig('last_month') != $currMonth) {
- // Include monthly reset scripts
- MERGE_INC_POOL(getArrayFromDirectory('inc/monthly/', 'monthly_'));
-
- // Update config
- if (getConfig('DEBUG_MONTHLY') != 'Y') updateConfiguration('last_month', $currMonth);
- } // END - if
- } // END - if
-
- // Run the filter
- runFilterChain('load_includes');
-}
-
// Handle extra values
function handleExtraValues ($filterFunction, $value, $extraValue) {
// Default is the value itself
@@ -2974,7 +2958,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
}
// Converts timestamp selections into a timestamp
-function convertSelectionsToTimestamp (&$POST, &$DATA, &$id, &$skip) {
+function convertSelectionsToTimestamp (&$postData, &$DATA, &$id, &$skip) {
// Init test variable
$test2 = '';
@@ -2985,14 +2969,14 @@ function convertSelectionsToTimestamp (&$POST, &$DATA, &$id, &$skip) {
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($POST[$test.'_ye'])) && (isset($POST[$test.'_mo'])) && (isset($POST[$test.'_we'])) && (isset($POST[$test.'_da'])) && (isset($POST[$test.'_ho'])) && (isset($POST[$test.'_mi'])) && (isset($POST[$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
- $POST[$test] = createTimestampFromSelections($test, $POST);
- $DATA[] = sprintf("%s='%s'", $test, $POST[$test]);
+ $postData[$test] = createTimestampFromSelections($test, $postData);
+ $DATA[] = sprintf("%s='%s'", $test, $postData[$test]);
// Remove data from array
foreach (array('ye', 'mo', 'we', 'da', 'ho', 'mi', 'se') as $rem) {
- unset($POST[$test.'_'.$rem]);
+ unset($postData[$test.'_' . $rem]);
} // END - foreach
// Skip adding
@@ -3031,28 +3015,28 @@ function convertCommaToDot ($str) {
}
// Handle menu-depending failed logins and return the rendered content
-function HANDLE_LOGIN_FAILTURES ($accessLevel) {
+function handleLoginFailtures ($accessLevel) {
// Default output is empty ;-)
$OUT = '';
// Is the session data set?
- if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
+ if ((isSessionVariableSet('mxchange_' . $accessLevel.'_failures')) && (isSessionVariableSet('mxchange_' . $accessLevel.'_last_fail'))) {
// Ignore zero values
- if (getSession('mxchange_'.$accessLevel.'_failures') > 0) {
+ if (getSession('mxchange_' . $accessLevel.'_failures') > 0) {
// Non-guest has login failures found, get both data and prepare it for template
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ):accessLevel={$accessLevel}
\n";
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ):accessLevel={$accessLevel}
");
$content = array(
- 'login_failures' => getSession('mxchange_'.$accessLevel.'_failures'),
- 'last_failure' => generateDateTime(getSession('mxchange_'.$accessLevel.'_last_fail'), '2')
+ 'login_failures' => getSession('mxchange_' . $accessLevel.'_failures'),
+ 'last_failure' => generateDateTime(getSession('mxchange_' . $accessLevel.'_last_fail'), '2')
);
// Load template
- $OUT = LOAD_TEMPLATE('login_failures', true, $content);
+ $OUT = loadTemplate('login_failures', true, $content);
} // END - if
// Reset session data
- setSession('mxchange_'.$accessLevel.'_failures', '');
- setSession('mxchange_'.$accessLevel.'_last_fail', '');
+ setSession('mxchange_' . $accessLevel.'_failures', '');
+ setSession('mxchange_' . $accessLevel.'_last_fail', '');
} // END - if
// Return rendered content
@@ -3060,59 +3044,43 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
}
// Rebuild cache
-function rebuildCacheFiles ($cache, $inc = '') {
+function rebuildCacheFile ($cache, $inc = '', $force = false) {
+ // Debug message
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force)));
+
// Shall I remove the cache file?
- if ((EXT_IS_ACTIVE('cache')) && (isCacheInstanceValid())) {
+ if (isCacheInstanceValid()) {
// Rebuild cache
if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
// Destroy it
- $GLOBALS['cache_instance']->destroyCacheFile();
+ $GLOBALS['cache_instance']->removeCacheFile(false, $force);
} // END - if
// Include file given?
if (!empty($inc)) {
// Construct FQFN
- $INC = sprintf("inc/loader/load_cache-%s.php", $inc);
+ $inc = sprintf("inc/loader/load_cache-%s.php", $inc);
// Is the include there?
- if (isIncludeReadable($INC)) {
+ if (isIncludeReadable($inc)) {
// And rebuild it from scratch
- //* DEBUG: */ print __FUNCTION__."(
".__LINE__." ): inc={$inc} - LOADED!
\n";
- loadInclude($INC);
+ //* DEBUG: */ outputHtml(__FUNCTION__."(
".__LINE__." ): inc={$inc} - LOADED!
");
+ loadInclude($inc);
} else {
// Include not found!
- DEBUG_LOG(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}");
+ logDebugMessage(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}");
}
} // END - if
} // END - if
}
-// Purge admin menu cache
-function cachePurgeAdminMenu ($id=0, $action = '', $what = '', $str = '') {
- // Is the cache extension enabled or no cache instance or admin menu cache disabled?
- if (!EXT_IS_ACTIVE('cache')) {
- // Cache extension not active
- return false;
- } elseif (!isCacheInstanceValid()) {
- // No cache instance!
- DEBUG_LOG(__FUNCTION__, __LINE__, " No cache instance found.");
- return false;
- } elseif ((!isConfigEntrySet('cache_admin_menu')) || (getConfig('cache_admin_menu') != 'Y')) {
- // Caching disabled (currently experiemental!)
- return false;
- }
-
- // Experiemental feature!
- debug_report_bug("
Experimental feature: You have to delete the admin_*.cache files by yourself at this point.");
-}
-
// Determines the real remote address
function determineRealRemoteAddress () {
// Is a proxy in use?
- if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){
+ if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
// Proxy was used
$address = $_SERVER['HTTP_X_FORWARDED_FOR'];
- } elseif (isset($_SERVER['HTTP_CLIENT_IP'])){
+ } elseif (isset($_SERVER['HTTP_CLIENT_IP'])) {
// Yet, another proxy
$address = $_SERVER['HTTP_CLIENT_IP'];
} else {
@@ -3121,7 +3089,7 @@ function determineRealRemoteAddress () {
}
// This strips out the real address from proxy output
- if (strstr($address, ',')){
+ if (strstr($address, ',')) {
$addressArray = explode(',', $address);
$address = $addressArray[0];
} // END - if
@@ -3155,40 +3123,45 @@ function addNewBonusMail ($data, $mode = '', $output=true) {
);
// Mail inserted into bonus pool
- if ($output) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BONUS_SEND'));
+ if ($output) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_SEND'));
} elseif ($output) {
// More entered than can be reached!
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_MORE_SELECTED'));
+ loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MORE_SELECTED'));
} else {
// Debug log
- DEBUG_LOG(__FUNCTION__, __LINE__, " cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");
+ logDebugMessage(__FUNCTION__, __LINE__, "cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");
}
}
// Determines referal id and sets it
-function DETERMINE_REFID () {
+function determineReferalId () {
+ // Skip this in non-html-mode
+ if (getOutputMode() != '0') return false;
+
// Check if refid is set
- if ((!empty($_GET['user'])) && (basename($_SERVER['PHP_SELF']) == "click.php")) {
+ if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) {
+ // This is fine...
+ } elseif ((isGetRequestElementSet('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($_GET['user']);
- } elseif (!empty($_POST['refid'])) {
+ $GLOBALS['refid'] = bigintval(getRequestElement('user'));
+ } elseif (isPostRequestElementSet('refid')) {
// Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
- $GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_POST['refid']));
- } elseif (!empty($_GET['refid'])) {
+ $GLOBALS['refid'] = secureString(postRequestElement('refid'));
+ } elseif (isGetRequestElementSet('refid')) {
// Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
- $GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_GET['refid']));
- } elseif (!empty($_GET['ref'])) {
+ $GLOBALS['refid'] = secureString(getRequestElement('refid'));
+ } elseif (isGetRequestElementSet('ref')) {
// Set refid=ref (the referal link uses such variable)
- $GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_GET['ref']));
+ $GLOBALS['refid'] = secureString(getRequestElement('ref'));
} elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) {
// Set session refid als global
$GLOBALS['refid'] = bigintval(getSession('refid'));
- } elseif ((GET_EXT_VERSION('sql_patches') != '') && (getConfig('def_refid') > 0)) {
- // Set default refid as refid in URL
- $GLOBALS['refid'] = getConfig(('def_refid'));
- } elseif ((GET_EXT_VERSION('user') >= '0.3.4') && (getConfig('select_user_zero_refid')) == 'Y') {
+ } elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid')) == 'Y') {
// Select a random user which has confirmed enougth mails
$GLOBALS['refid'] = determineRandomReferalId();
+ } elseif ((isExtensionInstalled('sql_patches')) && (getConfig('def_refid') > 0)) {
+ // Set default refid as refid in URL
+ $GLOBALS['refid'] = getConfig('def_refid');
} else {
// No default ID when sql_patches is not installed or none set
$GLOBALS['refid'] = 0;
@@ -3204,25 +3177,24 @@ function DETERMINE_REFID () {
return $GLOBALS['refid'];
}
-// Enables the reset mode. Only call this function if you really want the
-// reset to be run!
-function enableResetMode () {
+// Enables the reset mode and runs it
+function doReset () {
// Enable the reset mode
$GLOBALS['reset_enabled'] = true;
// Run filters
- runFilterChain('reset_enabled');
+ runFilterChain('reset');
}
// Our shutdown-function
function shutdown () {
// Call the filter chain 'shutdown'
- runFilterChain('shutdown', null, false);
+ runFilterChain('shutdown', null);
if (SQL_IS_LINK_UP()) {
// Close link
SQL_CLOSE(__FILE__, __LINE__);
- } elseif ((!isInstalling()) && (isInstalled())) {
+ } elseif (!isInstallationPhase()) {
// No database link
addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
}
@@ -3258,18 +3230,18 @@ function isUserIdSet () {
// Handle message codes from URL
function handleCodeMessage () {
- if (REQUEST_ISSET_GET('msg')) {
- // Default extension is "unknown"
+ if (isGetRequestElementSet('code')) {
+ // Default extension is 'unknown'
$ext = 'unknown';
// Is extension given?
- if (REQUEST_ISSET_GET('ext')) $ext = REQUEST_GET('ext');
+ if (isGetRequestElementSet('ext')) $ext = getRequestElement('ext');
- // Convert the 'msg' parameter from URL to a human-readable message
- $msg = convertCodeToMessage(REQUEST_GET('msg'));
+ // Convert the 'code' parameter from URL to a human-readable message
+ $message = getMessageFromErrorCode(getRequestElement('code'));
// Load message template
- LOAD_TEMPLATE('message', false, $msg);
+ loadTemplate('message', false, $message);
} // END - if
}
@@ -3295,6 +3267,325 @@ function isExtraTitleSet () {
return ((isset($GLOBALS['extra_title'])) && (!empty($GLOBALS['extra_title'])));
}
+// Generates a 'extension foo inactive' message
+function generateExtensionInactiveMessage ($ext_name) {
+ // Is the extension empty?
+ if (empty($ext_name)) {
+ // This should not happen
+ debug_report_bug(__FUNCTION__ . ': Parameter ext is empty. This should not happen.');
+ } // END - if
+
+ // Default message
+ $message = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), $ext_name);
+
+ // Is an admin logged in?
+ if (isAdmin()) {
+ // Then output admin message
+ $message = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE'), $ext_name);
+ } // END - if
+
+ // Return prepared message
+ return $message;
+}
+
+// Generates a 'extension foo not installed' message
+function generateExtensionNotInstalledMessage ($ext_name) {
+ // Is the extension empty?
+ if (empty($ext_name)) {
+ // This should not happen
+ debug_report_bug(__FUNCTION__ . ': Parameter ext is empty. This should not happen.');
+ } // END - if
+
+ // Default message
+ $message = sprintf(getMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
+
+ // Is an admin logged in?
+ if (isAdmin()) {
+ // Then output admin message
+ $message = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
+ } // END - if
+
+ // Return prepared message
+ return $message;
+}
+
+// Generates a message depending on if the extension is not installed or not
+// just activated
+function generateExtensionInactiveNotInstalledMessage ($ext_name) {
+ // Init message
+ $message = '';
+
+ // Is the extension not installed or just deactivated?
+ switch (isExtensionInstalled($ext_name)) {
+ case true; // Deactivated!
+ $message = generateExtensionInactiveMessage($ext_name);
+ break;
+
+ case false; // Not installed!
+ $message = generateExtensionNotInstalledMessage($ext_name);
+ break;
+
+ default: // Should not happen!
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid state of extension %s detected.", $ext_name));
+ $message = sprintf("Invalid state of extension %s detected.", $ext_name);
+ break;
+ } // END - switch
+
+ // Return the message
+ return $message;
+}
+
+// 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.
+function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $addBaseDir = true, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = true) {
+ // Add default entries we should exclude
+ $excludeArray[] = '.';
+ $excludeArray[] = '..';
+ $excludeArray[] = '.svn';
+ $excludeArray[] = '.htaccess';
+
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix} - Entered!");
+ // Init includes
+ $files = array();
+
+ // Open directory
+ $dirPointer = opendir(getConfig('PATH') . $baseDir) or app_die(__FUNCTION__, __LINE__, 'Cannot read directory ' . basename($baseDir) . '.');
+
+ // Read all entries
+ while ($baseFile = readdir($dirPointer)) {
+ // Exclude '.', '..' and entries in $excludeArray automatically
+ if (in_array($baseFile, $excludeArray, true)) {
+ // Exclude them
+ //* DEBUG: */ outputHtml('excluded=' . $baseFile . "
");
+ continue;
+ } // END - if
+
+ // Construct include filename and FQFN
+ $fileName = $baseDir . $baseFile;
+ $FQFN = getConfig('PATH') . $fileName;
+
+ // Remove double slashes
+ $FQFN = str_replace('//', '/', $FQFN);
+
+ // Check if the base filename 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: */ outputHtml('baseDir:' . $baseDir . "
");
+ //* DEBUG: */ outputHtml('baseFile:' . $baseFile . "
");
+ //* DEBUG: */ outputHtml('FQFN:' . $FQFN . "
");
+
+ // Exclude this one
+ continue;
+ } // END - if
+
+ // 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));
+
+ // And skip further processing
+ continue;
+ } elseif (substr($baseFile, 0, strlen($prefix)) != $prefix) {
+ // Skip this file
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid prefix in file " . $baseFile . ", prefix=" . $prefix);
+ continue;
+ } elseif (!isFileReadable($FQFN)) {
+ // Not readable so skip it
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "File " . $FQFN . " is not readable!");
+ continue;
+ }
+
+ // Is the file a PHP script or other?
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}");
+ if ((substr($baseFile, -4, 4) == '.php') || (($fileIncludeDirs === true) && (isDirectory($FQFN)))) {
+ // Is this a valid include file?
+ if ($extension == '.php') {
+ // Remove both for extension name
+ $extName = substr($baseFile, strlen($prefix), -4);
+
+ // Is the extension valid and active?
+ if (isExtensionNameValid($extName)) {
+ // Then add this file
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension entry ' . $baseFile . ' added.');
+ $files[] = $fileName;
+ } else {
+ // Add non-extension files as well
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Regular entry ' . $baseFile . ' added.');
+ if ($addBaseDir === true) {
+ $files[] = $fileName;
+ } else {
+ $files[] = $baseFile;
+ }
+ }
+ } else {
+ // We found .php file but should not search for them, why?
+ debug_report_bug('We should find files with extension=' . $extension . ', but we found a PHP script.');
+ }
+ } elseif (substr($baseFile, -4, 4) == $extension) {
+ // Other, generic file found
+ $files[] = $fileName;
+ }
+ } // END - while
+
+ // Close directory
+ closedir($dirPointer);
+
+ // Sort array
+ asort($files);
+
+ // Return array with include files
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
+ return $files;
+}
+
+// Maps a module name into a database table name
+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;
+ // Anything else will not be mapped, silently.
+ } // END - switch
+
+ // Return result
+ return $moduleName;
+}
+
+// Add SQL debug data to array for later output
+function addSqlToDebug ($result, $sqlString, $timing, $F, $L) {
+ // Don't execute anything here if we don't need
+ if (getConfig('display_debug_sqls') != 'Y') return;
+
+ // Generate record
+ $record = array(
+ 'num_rows' => SQL_NUMROWS($result),
+ 'affected' => SQL_AFFECTEDROWS(),
+ 'sql_str' => $sqlString,
+ 'timing' => $timing,
+ 'file' => basename($F),
+ 'line' => $L
+ );
+
+ // Add it
+ $GLOBALS['debug_sqls'][] = $record;
+}
+
+// Initializes the cache instance
+function initCacheInstance () {
+ // Load include for CacheSystem class
+ loadIncludeOnce('inc/classes/cachesystem.class.php');
+
+ // Initialize cache system only when it's needed
+ $GLOBALS['cache_instance'] = new CacheSystem();
+ if ($GLOBALS['cache_instance']->getStatus() != 'done') {
+ // Failed to initialize cache sustem
+ addFatalMessage(__FILE__, __LINE__, "(
".__LINE__." ): ".getMessage('CACHE_CANNOT_INITIALIZE'));
+ } // END - if
+}
+
+// Getter for message from array or raw message
+function getMessageFromIndexedArray ($message, $pos, $array) {
+ // Check if the requested message was found in array
+ if (isset($array[$pos])) {
+ // ... if yes then use it!
+ $ret = $array[$pos];
+ } else {
+ // ... else use default message
+ $ret = $message;
+ }
+
+ // Return result
+ return $ret;
+}
+
+// Handles fatal errors
+function handleFatalErrors () {
+ // Do we have errors to handle and right output mode?
+ if ((getTotalFatalErrors() == 0) || (getOutputMode() != 0)) {
+ // Abort executing here
+ return false;
+ } // END - if
+
+ // Set content type
+ setContentType('text/html');
+
+ // Load config here
+ loadIncludeOnce('inc/load_config.php');
+
+ // Set unset variable
+ if (empty($check)) $check = '';
+
+ // Default is none
+ $content = '';
+
+ // Installation phase or regular mode?
+ if ((isInstallationPhase())) {
+ // While we are installing ouput other header than while it is installed... :-)
+ $OUT = '';
+ foreach (getFatalArray() as $key => $value) {
+ // Prepare content for the template
+ $content = array(
+ 'key' => ($key + 1),
+ 'value' => $value
+ );
+
+ // Load row template
+ $OUT .= loadTemplate('install_fatal_row', true, $content);
+ }
+
+ // Load main template
+ $content = loadTemplate('install_fatal_table', true, $OUT);
+ } elseif (isInstalled()) {
+ // Display all runtime fatal errors
+ $OUT = '';
+ foreach (getFatalArray() as $key => $value) {
+ // Prepare content for the template
+ $content = array(
+ 'key' => ($key + 1),
+ 'value' => $value
+ );
+
+ // Load row template
+ $OUT .= loadTemplate('runtime_fatal_row', true, $content);
+ }
+
+ // Load main template
+ $content = loadTemplate('runtime_fatal_table', true, $OUT);
+ }
+
+ // Message to regular users (non-admin)
+ $CORR = getMessage('FATAL_REPORT_ERRORS');
+
+ // PHP warnings fixed
+ if ($check == 'done') {
+ if (isAdmin()) $CORR = getMessage('FATAL_CORRECT_ERRORS');
+ } // END - if
+
+ // Remember all in array
+ $content = array(
+ 'rows' => $content,
+ 'corr' => $CORR
+ );
+
+ // Load footer
+ loadIncludeOnce('inc/header.php');
+
+ // Load main template
+ loadTemplate('fatal_errors', false, $content);
+
+ // Delete all to prevent double-display
+ initFatalMessages();
+
+ // Load footer
+ loadIncludeOnce('inc/footer.php');
+
+ // Abort here
+ shutdown();
+}
+
//////////////////////////////////////////////////
// AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
//////////////////////////////////////////////////