X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=f55f5135603ad783649c0e0dfd92fd15e04f7ee1;hp=a515308c035b9790ef8dc1e04ab29eaa17513818;hb=07612d2debcc78a93678db0deed050d82df432f1;hpb=f03cb5d87e69bb2efc885b5c5f5f3026b24c06f6
diff --git a/inc/functions.php b/inc/functions.php
index a515308c03..f55f513560 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -37,25 +37,11 @@
************************************************************************/
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
}
-// Check if our config file is writeable or not
-function IS_INC_WRITEABLE ($inc) {
- // Generate FQFN
- $FQFN = sprintf("%sinc/%s.php", constant('PATH'), $inc);
-
- // Abort by simple test
- if ((FILE_READABLE($FQFN)) && (!is_writeable($FQFN))) {
- return false;
- } // END - if
-
- // Test write-access on directory
- return is_writeable(dirname($FQFN));
-}
-
-// Output HTML code directly or "render" it. You addionally switch the new-line character off
+// Output HTML code directly or 'render' it. You addionally switch the new-line character off
function OUTPUT_HTML ($HTML, $newLine = true) {
// Some global variables
global $OUTPUT;
@@ -63,41 +49,40 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
// Do we have HTML-Code here?
if (!empty($HTML)) {
// Yes, so we handle it as you have configured
- switch (constant('OUTPUT_MODE'))
+ switch (getConfig('OUTPUT_MODE'))
{
- case "render":
- // That's why you don't need any \n at the end of your HTML code... :-)
- if (constant('_OB_CACHING') == "on") {
- // Output into PHP's internal buffer
- OUTPUT_RAW($HTML);
-
+ case 'render':
// That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine) echo "\n";
- } else {
- // Render mode for old or lame servers...
- $OUTPUT .= $HTML;
+ if (constant('_OB_CACHING') == 'on') {
+ // Output into PHP's internal buffer
+ outputRawCode($HTML);
- // That's why you don't need any \n at the end of your HTML code... :-)
- if ($newLine) $OUTPUT .= "\n";
- }
- break;
+ // That's why you don't need any \n at the end of your HTML code... :-)
+ if ($newLine) echo "\n";
+ } else {
+ // Render mode for old or lame servers...
+ $OUTPUT .= $HTML;
- case "direct":
- // If we are switching from render to direct output rendered code
- if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ""; }
+ // That's why you don't need any \n at the end of your HTML code... :-)
+ if ($newLine) $OUTPUT .= "\n";
+ }
+ break;
- // The same as above... ^
- OUTPUT_RAW($HTML);
- if ($newLine) echo "\n";
- break;
+ case 'direct':
+ // If we are switching from render to direct output rendered code
+ if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != 'on')) { outputRawCode($OUTPUT); $OUTPUT = ''; }
- default:
- // Huh, something goes wrong or maybe you have edited config.php ???
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE')));
- mxchange_die("{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
- break;
+ // The same as above... ^
+ outputRawCode($HTML);
+ if ($newLine) echo "\n";
+ break;
+
+ default:
+ // Huh, something goes wrong or maybe you have edited config.php ???
+ app_die(__FUNCTION__, __LINE__, "{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}");
+ break;
}
- } elseif ((constant('_OB_CACHING') == "on") && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
+ } elseif ((constant('_OB_CACHING') == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
// Headers already sent?
if (headers_sent()) {
// Log this error
@@ -116,44 +101,47 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
} // END - if
// Send HTTP header
- header("HTTP/1.1 200");
+ sendHeader('HTTP/1.1 200');
// Used later
$now = gmdate('D, d M Y H:i:s') . ' GMT';
// General headers for no caching
- header("Expired: " . $now); // RFC2616 - Section 14.21
- header("Last-Modified: " . $now);
- header("Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0"); // HTTP/1.1
- header("Pragma: no-cache"); // HTTP/1.0
- header("Connection: Close");
-
- // Extension "rewrite" installed?
- if ((EXT_IS_ACTIVE("rewrite")) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
- $OUTPUT = REWRITE_LINKS($OUTPUT);
+ sendHeader('Expired: ' . $now); // RFC2616 - Section 14.21
+ sendHeader('Last-Modified: ' . $now);
+ sendHeader('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
+ sendHeader('Pragma: no-cache'); // HTTP/1.0
+ sendHeader('Connection: Close');
+
+ // Extension 'rewrite' installed?
+ if ((EXT_IS_ACTIVE('rewrite')) && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
+ $OUTPUT = rewriteLinksInCode($OUTPUT);
} // END - if
// Compile and run finished rendered HTML code
while (strpos($OUTPUT, '{!') > 0) {
+ // Replace _MYSQL_PREFIX
+ $OUTPUT = str_replace("{!_MYSQL_PREFIX!}", getConfig('_MYSQL_PREFIX'), $OUTPUT);
+
// Prepare the content and eval() it...
- $newContent = "";
+ $newContent = '';
$eval = "\$newContent = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";";
eval($eval);
// Was that eval okay?
if (empty($newContent)) {
// Something went wrong!
- mxchange_die("Evaluation error:".htmlentities($eval)." ");
+ app_die(__FUNCTION__, __LINE__, 'Evaluation error:' . htmlentities($eval) . ' ');
} // END - if
$OUTPUT = $newContent;
} // END - while
// Output code here, DO NOT REMOVE! ;-)
- OUTPUT_RAW($OUTPUT);
- } elseif ((constant('OUTPUT_MODE') == "render") && (!empty($OUTPUT))) {
+ outputRawCode($OUTPUT);
+ } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($OUTPUT))) {
// Rewrite links when rewrite extension is active
- if ((EXT_IS_ACTIVE("rewrite")) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
- $OUTPUT = REWRITE_LINKS($OUTPUT);
+ if ((EXT_IS_ACTIVE('rewrite')) && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
+ $OUTPUT = rewriteLinksInCode($OUTPUT);
} // END - if
// Compile and run finished rendered HTML code
@@ -163,17 +151,17 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
} // END - while
// Output code here, DO NOT REMOVE! ;-)
- OUTPUT_RAW($OUTPUT);
+ outputRawCode($OUTPUT);
}
}
// Output the raw HTML code
-function OUTPUT_RAW ($HTML) {
+function outputRawCode ($HTML) {
// Output stripped HTML code to avoid broken JavaScript code, etc.
echo stripslashes(stripslashes($HTML));
- // Flush the output if only constant('_OB_CACHING') is not "on"
- if (constant('_OB_CACHING') != "on") {
+ // Flush the output if only constant('_OB_CACHING') is not 'on'
+ if (constant('_OB_CACHING') != 'on') {
// Flush it
flush();
} // END - if
@@ -190,8 +178,7 @@ function getFatalArray () {
}
// Add a fatal error message to the queue array
-function addFatalMessage ($F, $L, $message, $extra="") {
- debug_report_bug($message);
+function addFatalMessage ($F, $L, $message, $extra='') {
if (is_array($extra)) {
// Multiple extras for a message with masks
$message = call_user_func_array('sprintf', $extra);
@@ -224,8 +211,14 @@ function getTotalFatalErrors () {
// Load a template file and return it's content (only it's name; do not use ' or ")
function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
+ // @TODO Remove this sanity-check if all is fine
+ if (!is_bool($return)) debug_report_bug('return is not bool (' . gettype($return) . ')');
+
// Add more variables which you want to use in your template files
- global $DATA, $_CONFIG, $username;
+ global $DATA, $username;
+
+ // Get whole config array
+ $_CONFIG = getConfigArray();
// Make all template names lowercase
$template = strtolower($template);
@@ -234,16 +227,16 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
incrementConfigEntry('num_templates');
// Prepare IP number and User Agent
- $REMOTE_ADDR = GET_REMOTE_ADDR();
+ $REMOTE_ADDR = detectRemoteAddr();
if (!defined('REMOTE_ADDR')) define('REMOTE_ADDR', $REMOTE_ADDR);
- $HTTP_USER_AGENT = GET_USER_AGENT();
+ $HTTP_USER_AGENT = detectUserAgent();
// Init some data
- $ret = "";
+ $ret = '';
if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
// @DEPRECATED Try to rewrite the if() condition
- if ($template == "member_support_form") {
+ if ($template == 'member_support_form') {
// Support request of a member
$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
array(getUserId()), __FUNCTION__, __LINE__);
@@ -254,7 +247,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
$content = merge_array($content, SQL_FETCHARRAY($result));
// Translate gender
- $content['gender'] = TRANSLATE_GENDER($content['gender']);
+ $content['gender'] = translateGender($content['gender']);
} else {
// @DEPRECATED
// @TODO Fine all templates which are using these direct variables and rewrite them.
@@ -262,7 +255,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
list($gender, $surname, $family, $email) = SQL_FETCHROW($result);
// Translate gender
- $gender = TRANSLATE_GENDER($gender);
+ $gender = translateGender($gender);
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("DEPRECATION-WARNING: content is not array (%s).", gettype($content)));
}
@@ -271,77 +264,80 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
} // END - if
// Generate date/time string
- $date_time = MAKE_DATETIME(time(), "1");
+ $date_time = generateDateTime(time(), '1');
// Base directory
- $BASE = sprintf("%stemplates/%s/html/", constant('PATH'), GET_LANGUAGE());
- $MODE = "";
+ $basePath = sprintf("%stemplates/%s/html/", constant('PATH'), getLanguage());
+ $mode = '';
// Check for admin/guest/member templates
- if (strpos($template, "admin_") > -1) {
+ if (strpos($template, 'admin_') > -1) {
// Admin template found
- $MODE = "admin/";
- } elseif (strpos($template, "guest_") > -1) {
+ $mode = 'admin/';
+ } elseif (strpos($template, 'guest_') > -1) {
// Guest template found
- $MODE = "guest/";
- } elseif (strpos($template, "member_") > -1) {
+ $mode = 'guest/';
+ } elseif (strpos($template, 'member_') > -1) {
// Member template found
- $MODE = "member/";
- } elseif (strpos($template, "install_") > -1) {
+ $mode = 'member/';
+ } elseif (strpos($template, 'install_') > -1) {
// Installation template found
- $MODE = "install/";
- } elseif (strpos($template, "ext_") > -1) {
+ $mode = 'install/';
+ } elseif (strpos($template, 'ext_') > -1) {
// Extension template found
- $MODE = "ext/";
- } elseif (strpos($template, "la_") > -1) {
- // "Logical-area" template found
- $MODE = "la/";
+ $mode = 'ext/';
+ } elseif (strpos($template, 'la_') > -1) {
+ // 'Logical-area' template found
+ $mode = 'la/';
+ } elseif (strpos($template, 'js_') > -1) {
+ // JavaScript template found
+ $mode = 'js/';
} else {
// Test for extension
- $test = substr($template, 0, strpos($template, "_"));
+ $test = substr($template, 0, strpos($template, '_'));
if (EXT_IS_ACTIVE($test)) {
// Set extra path to extension's name
- $MODE = $test."/";
- }
+ $mode = $test . '/';
+ } // END - if
}
////////////////////////
// Generate file name //
////////////////////////
- $FQFN = $BASE.$MODE.$template.".tpl";
+ $FQFN = $basePath . $mode . $template . '.tpl';
- if ((!empty($GLOBALS['what'])) && ((strpos($template, "_header") > 0) || (strpos($template, "_footer") > 0)) && (($MODE == "guest/") || ($MODE == "member/") || ($MODE == "admin/"))) {
+ if ((isWhatSet()) && ((strpos($template, '_header') > 0) || (strpos($template, '_footer') > 0)) && (($mode == 'guest/') || ($mode == 'member/') || ($mode == 'admin/'))) {
// Select what depended header/footer template file for admin/guest/member area
$file2 = sprintf("%s%s%s_%s.tpl",
- $BASE,
- $MODE,
+ $basePath,
+ $mode,
$template,
- SQL_ESCAPE($GLOBALS['what'])
+ getWhat()
);
// Probe for it...
- if (FILE_READABLE($file2)) $FQFN = $file2;
+ if (isFileReadable($file2)) $FQFN = $file2;
// Remove variable from memory
unset($file2);
- }
+ } // END - if
// Does the special template exists?
- if (!FILE_READABLE($FQFN)) {
+ if (!isFileReadable($FQFN)) {
// Reset to default template
- $FQFN = $BASE.$template.".tpl";
+ $FQFN = $basePath . $template . '.tpl';
} // END - if
// Now does the final template exists?
- if (FILE_READABLE($FQFN)) {
+ if (isFileReadable($FQFN)) {
// The local file does exists so we load it. :)
- $tmpl_file = READ_FILE($FQFN);
+ $tmpl_file = readFromFile($FQFN);
// Replace ' to our own chars to preventing them being quoted
while (strpos($tmpl_file, "'") !== false) { $tmpl_file = str_replace("'", '{QUOT}', $tmpl_file); }
// Do we have to compile the code?
- $ret = "";
+ $ret = '';
if ((strpos($tmpl_file, "\$") !== false) || (strpos($tmpl_file, '{--') !== false) || (strpos($tmpl_file, '--}') > 0)) {
// Okay, compile it!
$tmpl_file = "\$ret=\"".COMPILE_CODE(smartAddSlashes($tmpl_file))."\";";
@@ -351,16 +347,19 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
$ret = $tmpl_file;
}
- // Add surrounding HTML comments to help finding bugs faster
- $ret = "\n".$ret."\n";
+ // Normal HTML output?
+ if ($GLOBALS['output_mode'] == 0) {
+ // Add surrounding HTML comments to help finding bugs faster
+ $ret = "\n" . $ret . "\n";
+ } // END - if
} elseif ((IS_ADMIN()) || ((isInstalling()) && (!isInstalled()))) {
// Only admins shall see this warning or when installation mode is active
- $ret = "".TEMPLATE_404." {--TEMPLATE_404--} ".print_r($content, true)."
-".TEMPLATE_DATA."
+{--TEMPLATE_DATA--}
".print_r($DATA, true)."
".__LINE__." ):TO={$toEmail},SUBJECT={$subject}".__LINE__." ):TO={$toEmail}
+ OUTPUT_HTML("
".htmlentities(trim($mailHeader))."
-To : ".$toEmail."
-Subject : ".$subject."
-Message : ".$message."
+To : " . $toEmail."
+Subject : " . $subject."
+Message : " . $message."
\n");
- } elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail"))) {
+ } elseif (($HTML == 'Y') && (EXT_IS_ACTIVE('html_mail'))) {
// Send mail as HTML away
- SEND_HTML_EMAIL($toEmail, $subject, $message, $mailHeader);
+ sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
} elseif (!empty($toEmail)) {
// Send Mail away
- SEND_RAW_EMAIL($toEmail, $subject, $message, $mailHeader);
- } elseif ($HTML == "N") {
+ sendRawEmail($toEmail, $subject, $message, $mailHeader);
+ } elseif ($HTML == 'N') {
// Problem found!
- SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$subject, $message, $mailHeader);
+ sendRawEmail(constant('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
}
}
// Check if legacy or PHPMailer command
// @TODO Rewrite this to an extension 'smtp'
// @private
-function CHECK_PHPMAILER_USAGE() {
- return ((defined('SMTP_HOSTNAME')) && (defined('SMTP_USER')) && (defined('SMTP_PASSWORD')) && (constant('SMTP_HOSTNAME') != "") && (constant('SMTP_USER') != ""));
+function checkPhpMailerUsage() {
+ return ((getConfig('SMTP_HOSTNAME') != '') && (getConfig('SMTP_USER') != ''));
}
-/*
- * Send out a raw email with PHPMailer class or legacy mail() command
- */
-function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
+// Send out a raw email with PHPMailer class or legacy mail() command
+function sendRawEmail ($toEmail, $subject, $message, $from) {
// Shall we use PHPMailer class or legacy mode?
- if (CHECK_PHPMAILER_USAGE()) {
+ if (checkPhpMailerUsage()) {
// Use PHPMailer class with SMTP enabled
- LOAD_INC_ONCE("inc/phpmailer/class.phpmailer.php");
- LOAD_INC_ONCE("inc/phpmailer/class.smtp.php");
+ loadIncludeOnce('inc/phpmailer/class.phpmailer.php');
+ loadIncludeOnce('inc/phpmailer/class.smtp.php');
// get new instance
$mail = new PHPMailer();
@@ -495,10 +492,10 @@ function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
$mail->IsSMTP();
$mail->SMTPAuth = true;
- $mail->Host = constant('SMTP_HOSTNAME');
+ $mail->Host = getConfig('SMTP_HOSTNAME');
$mail->Port = 25;
- $mail->Username = constant('SMTP_USER');
- $mail->Password = constant('SMTP_PASSWORD');
+ $mail->Username = getConfig('SMTP_USER');
+ $mail->Password = getConfig('SMTP_PASSWORD');
if (empty($from)) {
$mail->From = constant('WEBMASTER');
} else {
@@ -506,41 +503,41 @@ function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
}
$mail->FromName = constant('MAIN_TITLE');
$mail->Subject = $subject;
- if ((EXT_IS_ACTIVE("html_mail")) && (strip_tags($msg) != $msg)) {
- $mail->Body = $msg;
- $mail->AltBody = "Your mail program required HTML support to read this mail!";
+ if ((EXT_IS_ACTIVE('html_mail')) && (strip_tags($message) != $message)) {
+ $mail->Body = $message;
+ $mail->AltBody = 'Your mail program required HTML support to read this mail!';
$mail->WordWrap = 70;
$mail->IsHTML(true);
} else {
- $mail->Body = decodeEntities($msg);
+ $mail->Body = decodeEntities($message);
}
- $mail->AddAddress($toEmail, "");
+ $mail->AddAddress($toEmail, '');
$mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE'));
- $mail->AddCustomHeader("Errors-To:".constant('WEBMASTER'));
- $mail->AddCustomHeader("X-Loop:".constant('WEBMASTER'));
+ $mail->AddCustomHeader('Errors-To:' . constant('WEBMASTER'));
+ $mail->AddCustomHeader('X-Loop:' . constant('WEBMASTER'));
$mail->Send();
} else {
// Use legacy mail() command
- @mail($toEmail, $subject, decodeEntities($msg), $from);
+ mail($toEmail, $subject, decodeEntities($message), $from);
}
}
-//
// Generate a password in a specified length or use default password length
-function GEN_PASS ($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++) {
+ $PASS = '';
+ for ($i = 0; $i < $length; $i++) {
$PASS .= $ABC[mt_rand(0, count($ABC) -1)];
} // END - for
- // When the size is below 40 we can also add additional security by scrambling it
+ // When the size is below 40 we can also add additional security by scrambling
+ // it. Otherwise we may corrupt hashes
if (strlen($PASS) <= 40) {
// Also scramble the password
$PASS = scrambleString($PASS);
@@ -549,49 +546,85 @@ function GEN_PASS ($LEN = 0) {
// Return the password
return $PASS;
}
-//
-function MAKE_DATETIME ($time, $mode="0")
-{
+
+// Generates a human-readable timestamp from the Uni* stamp
+function generateDateTime ($time, $mode = '0') {
+ // Filter out numbers
+ $time = bigintval($time);
+
+ // If the stamp is zero it mostly didn't "happen"
if ($time == 0) {
// Never happend
- return NEVER_HAPPENED;
- } else {
- // Filter out numbers
- $time = bigintval($time);
- }
+ return getMessage('NEVER_HAPPENED');
+ } // END - if
- switch (GET_LANGUAGE())
+ switch (getLanguage())
{
- case "de": // German date / time format
- switch ($mode) {
- case "0": $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
- case "1": $ret = strtolower(date("d.m.Y - H:i", $time)); break;
- case "2": $ret = date("d.m.Y|H:i", $time); break;
- case "3": $ret = date("d.m.Y", $time); break;
- default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
- break;
- }
- break;
-
- default: // Default is the US date / time format!
- switch ($mode) {
- case "0": $ret = date("r", $time); break;
- case "1": $ret = date("Y-m-d - g:i A", $time); break;
- case "2": $ret = date("y-m-d|H:i", $time); break;
- case "3": $ret = date("y-m-d", $time); break;
- default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
- break;
- }
+ case 'de': // German date / time format
+ switch ($mode) {
+ case '0': $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
+ case '1': $ret = strtolower(date("d.m.Y - H:i", $time)); break;
+ case '2': $ret = date("d.m.Y|H:i", $time); break;
+ case '3': $ret = date("d.m.Y", $time); break;
+ default:
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
+ break;
+ }
+ break;
+
+ default: // Default is the US date / time format!
+ switch ($mode) {
+ case '0': $ret = date("r", $time); break;
+ case '1': $ret = date("Y-m-d - g:i A", $time); break;
+ case '2': $ret = date("y-m-d|H:i", $time); break;
+ case '3': $ret = date("y-m-d", $time); break;
+ default:
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
+ break;
+ }
}
return $ret;
}
+// Translates Y/N to yes/no
+function translateYesNo ($yn) {
+ // Default
+ $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));
+ break;
+ }
+
+ // Return it
+ return $translated;
+}
+
+// Translates the "pool type" into human-readable
+function translatePoolType ($type) {
+ // Default?type is unknown
+ $translated = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type);
+
+ // Generate constant
+ $constName = sprintf("POOL_TYPE_%s", $type);
+
+ // Does it exist?
+ if (defined($constName)) {
+ // Then use it
+ $translated = getMessage($constName);
+ } // END - if
+
+ // Return "translation"
+ return $translated;
+}
+
// Translates the american decimal dot into a german comma
-function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) {
+function translateComma ($dotted, $cut = true, $max = 0) {
// Default is 3 you can change this in admin area "Misc -> Misc Options"
- if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', "3");
+ if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', '3');
// Use from config is default
$maxComma = getConfig('max_comma');
@@ -602,7 +635,7 @@ function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) {
// Cut zeros off?
if (($cut) && ($max == 0)) {
// Test for commata if in cut-mode
- $com = explode(".", $dotted);
+ $com = explode('.', $dotted);
if (count($com) < 2) {
// Don't display commatas even if there are none... ;-)
$maxComma = 0;
@@ -613,42 +646,30 @@ function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) {
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
// Translate it now
- switch (GET_LANGUAGE()) {
- case "de":
- $dotted = number_format($dotted, $maxComma, ",", ".");
- break;
-
- default:
- $dotted = number_format($dotted, $maxComma, ".", ",");
- break;
+ switch (getLanguage()) {
+ case 'de':
+ $dotted = number_format($dotted, $maxComma, ',', '.');
+ break;
+
+ default:
+ $dotted = number_format($dotted, $maxComma, '.', ',');
+ break;
}
// Return translated value
return $dotted;
}
-//
-function DEREFERER ($URL) {
- // Don't de-refer our own links!
- if (substr($URL, 0, strlen(URL)) != URL) {
- // De-refer this link
- $URL = "modules.php?module=loader&url=".encodeString(compileUriCode($URL));
- } // END - if
-
- // Return link
- return $URL;
-}
-
// Translate Uni*-like gender to human-readable
-function TRANSLATE_GENDER ($gender) {
+function translateGender ($gender) {
// Default
- $ret = "!{$gender}!";
+ $ret = '!' . $gender . '!';
// Male/female or company?
switch ($gender) {
- case "M": $ret = getMessage('GENDER_M'); break;
- case "F": $ret = getMessage('GENDER_F'); break;
- case "C": $ret = getMessage('GENDER_C'); break;
+ case 'M': $ret = getMessage('GENDER_M'); break;
+ case 'F': $ret = getMessage('GENDER_F'); break;
+ case 'C': $ret = getMessage('GENDER_C'); break;
default:
// Log unknown gender
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
@@ -659,17 +680,54 @@ function TRANSLATE_GENDER ($gender) {
return $ret;
}
-//
+// "Translates" the user status
+function translateUserStatus ($status) {
+ switch ($status)
+ {
+ case 'UNCONFIRMED':
+ case 'CONFIRMED':
+ case 'LOCKED':
+ $ret = getMessage(sprintf("ACCOUNT_%s", $status));
+ break;
+
+ case '':
+ case null:
+ $ret = getMessage('ACCOUNT_DELETED');
+ break;
+
+ default:
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
+ $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
+ break;
+ }
+
+ // Return it
+ return $ret;
+}
+
+// Generates an URL for the dereferer
+function DEREFERER ($URL) {
+ // Don't de-refer our own links!
+ if (substr($URL, 0, strlen(constant('URL'))) != constant('URL')) {
+ // De-refer this link
+ $URL = 'modules.php?module=loader&url=' . encodeString(compileUriCode($URL));
+ } // END - if
+
+ // Return link
+ return $URL;
+}
+
+// Generates an URL for the frametester
function FRAMETESTER ($URL) {
// Prepare frametester URL
$frametesterUrl = sprintf("{!URL!}/modules.php?module=frametester&url=%s",
- encodeString(compileUriCode($URL))
+ encodeString(compileUriCode($URL))
);
return $frametesterUrl;
}
-//
-function SELECTION_COUNT ($array) {
+// Count entries from e.g. a selection box
+function countSelection ($array) {
$ret = 0;
if (is_array($array)) {
foreach ($array as $key => $selected) {
@@ -678,90 +736,28 @@ function SELECTION_COUNT ($array) {
}
return $ret;
}
-//
-function IMG_CODE ($code, $type, $DATA, $uid) {
- return "".__LINE__." ):UID={$UID},template={$template},content[]=".gettype($content)."".__LINE__." ):NICKNAME!".__LINE__." ):NO-NICK!".print_r($content, true)."
{--TEMPLATE_DATA--}
@@ -887,7 +884,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
// Is there some content?
if (empty($newContent)) {
// Compiling failed
- $newContent = "Compiler error for template {$template}!\nUncompiled content:\n".$tmpl_file;
+ $newContent = "Compiler error for template {$template}!\nUncompiled content:\n" . $tmpl_file;
// Add last error if the required function exists
if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
} // END - if
@@ -899,30 +896,44 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
// Return compiled content
return COMPILE_CODE($newContent);
}
-//
-function MAKE_TIME ($H, $M, $S, $stamp) {
+
+// Generates a timestamp (some wrapper for mktime())
+function makeTime ($H, $M, $S, $stamp) {
// Extract day, month and year from given timestamp
- $DAY = date("d", $stamp);
- $MONTH = date("m", $stamp);
- $YEAR = date('Y', $stamp);
+ $day = date('d', $stamp);
+ $month = date('m', $stamp);
+ $year = date('Y', $stamp);
// Create timestamp for wished time which depends on extracted date
- return mktime($H, $M, $S, $MONTH, $DAY, $YEAR);
+ return mktime($H, $M, $S, $month, $day, $year);
}
-//
-function LOAD_URL ($URL, $addUrlData=true) {
+
+// Redirects to an URL and if neccessarry extends it with own base URL
+function redirectToUrl ($URL) {
// Compile out URI codes
$URL = compileUriCode($URL);
// Check if http(s):// is there
- if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) {
+ if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) {
// Make all URLs full-qualified
- $URL = "".$URL;
- }
+ $URL = constant('URL') . '/' . $URL;
+ } // END - if
- // Get output buffer
+ // Three different debug ways...
//* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, $URL);
+ //* DEBUG: */ die($URL);
+
+ // Default 'rel' value is external, nofollow is evil from Google and hurts the Internet
+ $rel = ' rel="external"';
+
+ // Do we have internal or external URL?
+ if (substr($URL, 0, strlen(constant('URL'))) == constant('URL')) {
+ // Own (=internal) URL
+ $rel = '';
+ } // END - if
+
+ // Get output buffer
$OUTPUT = ob_get_contents();
// Clear it only if there is content
@@ -930,31 +941,30 @@ function LOAD_URL ($URL, $addUrlData=true) {
clearOutputBuffer();
} // END - if
- // Add some data to URL if cookies are not accepted
- if (((!defined('__COOKIES')) || (!constant('__COOKIES'))) && ($addUrlData)) $URL = ADD_URL_DATA($URL);
-
- // Probe for bot from search engine
- if ((eregi("spider", GET_USER_AGENT())) || (eregi("bot", GET_USER_AGENT()))) {
- // Search engine bot detected so let's rewrite many chars for the link
+ // Simple probe for bots/spiders from search engines
+ if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) {
+ // Secure the URL against bad things such als HTML insertions and so on...
$URL = htmlentities(strip_tags($URL), ENT_QUOTES);
// Output new location link as anchor
- OUTPUT_HTML("".$URL." ");
+ OUTPUT_HTML('' . $URL . ' ');
} elseif (!headers_sent()) {
// Load URL when headers are not sent
//* DEBUG: */ debug_report_bug("URL={$URL}");
- header ("Location: ".str_replace("&", "&", $URL));
+ sendHeader('Location: '.str_replace('&', '&', $URL));
} else {
// Output error message
- LOAD_INC("inc/header.php");
- LOAD_TEMPLATE("redirect_url", false, str_replace("&", "&", $URL));
- LOAD_INC("inc/footer.php");
+ loadInclude('inc/header.php');
+ LOAD_TEMPLATE('redirect_url', false, str_replace('&', '&', $URL));
+ loadInclude('inc/footer.php');
}
+
+ // Shut the mailer down here
shutdown();
}
-// Wrapper for LOAD_URL but URL comes from a configuration entry
-function LOAD_CONFIGURED_URL ($configEntry) {
+// Wrapper for redirectToUrl but URL comes from a configuration entry
+function redirectToConfiguredUrl ($configEntry) {
// Get the URL
$URL = getConfig($configEntry);
@@ -965,7 +975,7 @@ function LOAD_CONFIGURED_URL ($configEntry) {
} // END - if
// Load the URL
- LOAD_URL($URL);
+ redirectToUrl($URL);
}
//
@@ -1032,17 +1042,17 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
if ($fuzzyFound) continue;
// Take all string elements
- if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_".$matches[4][$key]]))) {
+ if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key."_" . $matches[4][$key]]))) {
// Replace it in the code
//* DEBUG: */ print __FUNCTION__."(".__LINE__." ):key={$key},match={$match}".__LINE__." ):match={$match}\n";
+ if ($id > 0) $prefix .= "[" . $id."]";
+ $OUT .= " \n";
} else {
// Begin with regular selection box here
if (!empty($prefix)) $prefix .= "_";
$type2 = $type;
- if ($id > 0) $type2 .= "[".$id."]";
- $OUT .= " \n";
+ if ($id > 0) $type2 .= "[" . $id."]";
+ $OUT .= " \n";
}
switch ($type) {
- case "day": // Day
- for ($idx = 1; $idx < 32; $idx++) {
- $OUT .= "\n";
- } // END - for
- break;
-
- case "month": // Month
- foreach ($GLOBALS['month_descr'] as $month => $descr) {
- $OUT .= " \n";
- } // END - for
- break;
-
- case "year": // Year
- // Get current year
- $YEAR = date('Y', time());
+ case "day": // Day
+ for ($idx = 1; $idx < 32; $idx++) {
+ $OUT .= " \n";
+ } // END - for
+ break;
- // Use configured min age or fixed?
- if (GET_EXT_VERSION("other") >= "0.2.1") {
- // Configured
- $startYear = $YEAR - getConfig('min_age');
- } else {
- // Fixed 16 years
- $startYear = $YEAR - 16;
- }
+ case "month": // Month
+ foreach ($GLOBALS['month_descr'] as $month => $descr) {
+ $OUT .= " \n";
+ } // END - for
+ break;
- // Calculate earliest year (100 years old people can still enter Internet???)
- $minYear = $YEAR - 100;
+ case "year": // Year
+ // Get current year
+ $year = date('Y', time());
- // Check if the default value is larger than minimum and bigger than actual year
- if (($DEFAULT > $minYear) && ($DEFAULT >= $YEAR)) {
- for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++) {
- $OUT .= " \n";
- } // END - for
- } elseif ($DEFAULT == -1) {
- // Current year minus 1
- for ($idx = $startYear; $idx <= ($YEAR + 1); $idx++)
- {
- $OUT .= " ".$idx." \n";
+ // Use configured min age or fixed?
+ if (GET_EXT_VERSION('other') >= '0.2.1') {
+ // Configured
+ $startYear = $year - getConfig('min_age');
+ } else {
+ // Fixed 16 years
+ $startYear = $year - 16;
}
- } else {
- // Get current year and subtract the configured minimum age
- $OUT .= "<".$minYear." \n";
- // Calculate earliest year depending on extension version
- if (GET_EXT_VERSION("other") >= "0.2.1") {
- // Use configured minimum age
- $YEAR = date('Y', time()) - getConfig('min_age');
+
+ // Calculate earliest year (100 years old people can still enter Internet???)
+ $minYear = $year - 100;
+
+ // Check if the default value is larger than minimum and bigger than actual year
+ if (($default > $minYear) && ($default >= $year)) {
+ for ($idx = $year; $idx < ($year + 11); $idx++) {
+ $OUT .= "\n";
+ } // END - for
+ } elseif ($default == -1) {
+ // Current year minus 1
+ for ($idx = $startYear; $idx <= ($year + 1); $idx++)
+ {
+ $OUT .= " " . $idx." \n";
+ }
} else {
- // Use fixed 16 years age
- $YEAR = date('Y', time()) - 16;
+ // Get current year and subtract the configured minimum age
+ $OUT .= "<" . $minYear." \n";
+ // Calculate earliest year depending on extension version
+ if (GET_EXT_VERSION('other') >= '0.2.1') {
+ // Use configured minimum age
+ $year = date('Y', time()) - getConfig('min_age');
+ } else {
+ // Use fixed 16 years age
+ $year = date('Y', time()) - 16;
+ }
+
+ // Construct year selection list
+ for ($idx = $minYear; $idx <= $year; $idx++) {
+ $OUT .= "\n";
+ } // END - for
}
+ break;
- // Construct year selection list
- for ($idx = $minYear; $idx <= $YEAR; $idx++) {
- $OUT .= " \n";
+ case "sec":
+ case "min":
+ for ($idx = 0; $idx < 60; $idx+=5) {
+ if (strlen($idx) == 1) $idx = '0' . $idx;
+ $OUT .= " \n";
} // END - for
- }
- break;
-
- case "sec":
- case "min":
- for ($idx = 0; $idx < 60; $idx+=5) {
- if (strlen($idx) == 1) $idx = "0".$idx;
- $OUT .= " \n";
- } // END - for
- break;
-
- case "hour":
- for ($idx = 0; $idx < 24; $idx++) {
- if (strlen($idx) == 1) $idx = "0".$idx;
- $OUT .= " \n";
- } // END - for
- break;
-
- case "yn":
- $OUT .= " \n";
+ } // END - for
break;
- }
- // Return it
- return $translated;
+ case 'yn':
+ $OUT .= " {$num}");
+ //debug_report_bug("{$ret}<>{$num}");
} // END - if
// Return result
@@ -1318,24 +1311,24 @@ function GENERATE_IMAGE ($img_code, $headerSent=true) {
return;
} elseif (!$headerSent) {
// Return in an HTML code code
- return "\n";
+ $OUT = "
\n";
$OUT .= "
\n";
$OUT .= "\n";
@@ -1428,7 +1421,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
$OUT .= " {--_YEARS--}
{--_MONTHS--}
{--_HOURS--}
{--_MINUTES--}
\n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 10; $idx++) {
- $OUT .= " \n";
+ $OUT .= " \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 11; $idx++)
{
- $OUT .= " \n";
+ $OUT .= " \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 4; $idx++) {
- $OUT .= " \n";
+ $OUT .= " \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 31; $idx++) {
- $OUT .= " \n";
+ $OUT .= " \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 23; $idx++) {
- $OUT .= " \n";
+ $OUT .= " \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 59; $idx++) {
- $OUT .= " \n";
+ $OUT .= " \n";
}
$OUT .= " \n";
+ $OUT .= " \n";
for ($idx = 0; $idx <= 59; $idx++) {
- $OUT .= " \n";
+ $OUT .= " \n";
}
$OUT .= " \n";
$OUT .= "
\n";
@@ -1555,14 +1548,14 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
}
//
-function CREATE_TIMESTAMP_FROM_SELECTIONS ($prefix, $POST) {
+function createTimestampFromSelections ($prefix, $POST) {
// Initial return value
$ret = 0;
// Do we have a leap year?
$SWITCH = 0;
$TEST = date('Y', time()) / 4;
- $M1 = date("m", time());
+ $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');
// First add years...
@@ -1590,15 +1583,15 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
$template = trim($template);
// Load email template
- $msg = LOAD_EMAIL_TEMPLATE($template, $content, $UID);
+ $message = LOAD_EMAIL_TEMPLATE($template, $content, $UID);
// Check which admin shall receive this mail
$result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY admin_id",
- array($template), __FUNCTION__, __LINE__);
+ array($template), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 0) {
// Create new entry (to all admins)
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES (0, '%s')",
- array($template), __FUNCTION__, __LINE__);
+ array($template), __FUNCTION__, __LINE__);
} else {
// Load admin IDs...
// @TODO This can be, somehow, rewritten
@@ -1614,44 +1607,44 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
$result = false;
// "implode" IDs and query string
- $aid = implode(",", $adminIds);
- if ($aid == "-1") {
- if (EXT_IS_ACTIVE("events")) {
+ $aid = implode(',', $adminIds);
+ if ($aid == '-1') {
+ if (EXT_IS_ACTIVE('events')) {
// Add line to user events
- EVENTS_ADD_LINE($subj, $msg, $UID);
+ EVENTS_ADD_LINE($subj, $message, $UID);
} else {
// Log error for debug
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,UID=%s",
- $template,
- $subj,
- $UID
+ $template,
+ $subj,
+ $UID
));
}
- } elseif ($aid == "0") {
+ } elseif ($aid == '0') {
// Select all email adresses
$result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`",
- __FUNCTION__, __LINE__);
+ __FUNCTION__, __LINE__);
} else {
// If Admin-ID is not "to-all" select
$result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE id IN (%s) ORDER BY `id`",
- array($aid), __FUNCTION__, __LINE__);
+ array($aid), __FUNCTION__, __LINE__);
}
}
// Load email addresses and send away
while ($content = SQL_FETCHARRAY($result)) {
- SEND_EMAIL($content['email'], $subj, $msg);
+ sendEmail($content['email'], $subj, $message);
} // END - while
// Free memory
SQL_FREERESULT($result);
}
-//
-function CREATE_FANCY_TIME ($stamp) {
+// Creates a 'fancy' human-readable timestamp from a Uni* stamp
+function createFancyTime ($stamp) {
// Get data array with years/months/weeks/days/...
- $data = CREATE_TIME_SELECTIONS($stamp, "", "", "", true);
- $ret = "";
+ $data = createTimeSelections($stamp, '', '', '', true);
+ $ret = '';
foreach($data as $k => $v) {
if ($v > 0) {
// Value is greater than 0 "eval" data to return string
@@ -1676,30 +1669,30 @@ function CREATE_FANCY_TIME ($stamp) {
//
function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
- $SEP = ""; $TOP = "";
+ $SEP = ''; $TOP = '';
if (!$show_form) {
$TOP = " top2";
- $SEP = "
";
+ $SEP = "
";
}
- $NAV = "";
+ $NAV = '';
for ($page = 1; $page <= $PAGES; $page++) {
// Is the page currently selected or shall we generate a link to it?
- if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) {
// Is currently selected, so only highlight it
$NAV .= "
-";
} else {
// Open anchor tag and add base URL
- $NAV .= "";
}
$NAV .= $page;
- if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) {
// Is currently selected, so only highlight it
$NAV .= "- ";
} else {
@@ -1709,7 +1702,7 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
// Add seperator if we have not yet reached total pages
if ($page < $PAGES) $NAV .= " | ";
- }
+ } // END - for
// Define constants only once
if (!defined('__NAV_OUTPUT')) {
@@ -1717,7 +1710,7 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
define('__NAV_COLSPAN', $colspan);
define('__NAV_TOP' , $TOP);
define('__NAV_SEP' , $SEP);
- }
+ } // END - if
// Load navigation template
$OUT = LOAD_TEMPLATE("admin_email_nav_row", true);
@@ -1732,26 +1725,26 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
}
// Extract host from script name
-function EXTRACT_HOST (&$script) {
+function extractHostnameFromUrl (&$script) {
// Use default SERVER_URL by default... ;) So?
$url = constant('SERVER_URL');
// Is this URL valid?
- if (substr($script, 0, 7) == "http://") {
+ if (substr($script, 0, 7) == 'http://') {
// Use the hostname from script URL as new hostname
$url = substr($script, 7);
- $extract = explode("/", $url);
+ $extract = explode('/', $url);
$url = $extract[0];
// Done extracting the URL :)
} // END - if
// Extract host name
- $host = str_replace("http://", "", $url);
- if (ereg("/", $host)) $host = substr($host, 0, strpos($host, "/"));
+ $host = str_replace('http://', '', $url);
+ if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/'));
// Generate relative URL
- //* DEBUG: */ print("SCRIPT=".$script."
\n");
- if (substr(strtolower($script), 0, 7) == "http://") {
+ //* DEBUG: */ print("SCRIPT=" . $script."
\n");
+ if (substr(strtolower($script), 0, 7) == 'http://') {
// But only if http:// is in front!
$script = substr($script, (strlen($url) + 7));
} elseif (substr(strtolower($script), 0, 8) == "https://") {
@@ -1759,96 +1752,101 @@ function EXTRACT_HOST (&$script) {
$script = substr($script, (strlen($url) + 8));
}
- //* DEBUG: */ print("SCRIPT=".$script."
\n");
- if (substr($script, 0, 1) == "/") $script = substr($script, 1);
+ //* DEBUG: */ print("SCRIPT=" . $script."
\n");
+ if (substr($script, 0, 1) == '/') $script = substr($script, 1);
// Return host name
return $host;
}
// Send a GET request
-function GET_URL ($script) {
+function sendGetRequest ($script) {
// Compile the script name
$script = COMPILE_CODE($script);
// Extract host name from script
- $host = EXTRACT_HOST($script);
+ $host = extractHostnameFromUrl($script);
// Generate GET request header
- $request = "GET /" . trim($script) . " HTTP/1.1\r\n";
- $request .= "Host: " . $host . "\r\n";
- $request .= "Referer: " . constant('URL') . "/admin.php\r\n";
+ $request = "GET /" . trim($script) . " HTTP/1.1" . getConfig('HTTP_EOL');
+ $request .= "Host: " . $host . getConfig('HTTP_EOL');
+ $request .= "Referer: " . constant('URL') . "/admin.php" . getConfig('HTTP_EOL');
if (defined('FULL_VERSION')) {
- $request .= "User-Agent: " . constant('TITLE') . "/" . constant('FULL_VERSION') . "\r\n";
+ $request .= "User-Agent: " . constant('TITLE') . '/' . constant('FULL_VERSION') . getConfig('HTTP_EOL');
} else {
- $request .= "User-Agent: " . constant('TITLE') . "/?.?.?\r\n";
+ $request .= "User-Agent: " . constant('TITLE') . "/?.?.?" . getConfig('HTTP_EOL');
}
- $request .= "Content-Type: text/plain\r\n";
- $request .= "Cache-Control: no-cache\r\n";
- $request .= "Connection: Close\r\n\r\n";
+ $request .= "Content-Type: text/plain" . getConfig('HTTP_EOL');
+ $request .= "Cache-Control: no-cache" . getConfig('HTTP_EOL');
+ $request .= "Connection: Close" . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
// Send the raw request
- $response = SEND_RAW_REQUEST($host, $request);
+ $response = sendRawRequest($host, $request);
// Return the result to the caller function
return $response;
}
// Send a POST request
-function POST_URL ($script, $postData) {
+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)));
- return array("", "", "");
+ return array('', '', '');
} // END - if
// Compile the script name
$script = COMPILE_CODE($script);
// Extract host name from script
- $host = EXTRACT_HOST($script);
+ $host = extractHostnameFromUrl($script);
// Construct request
$data = http_build_query($postData, '','&');
// Generate POST request header
- $request = "POST /" . trim($script) . " HTTP/1.1\r\n";
- $request .= "Host: " . $host . "\r\n";
- $request .= "Referer: " . constant('URL') . "/admin.php\r\n";
- $request .= "User-Agent: " . constant('TITLE') . "/" . constant('FULL_VERSION') . "\r\n";
- $request .= "Content-type: application/x-www-form-urlencoded\r\n";
- $request .= "Content-length: " . strlen($data) . "\r\n";
- $request .= "Cache-Control: no-cache\r\n";
- $request .= "Connection: Close\r\n\r\n";
+ $request = "POST /" . trim($script) . " HTTP/1.1" . getConfig('HTTP_EOL');
+ $request .= "Host: " . $host . getConfig('HTTP_EOL');
+ $request .= "Referer: " . constant('URL') . "/admin.php" . getConfig('HTTP_EOL');
+ $request .= "User-Agent: " . constant('TITLE') . '/' . constant('FULL_VERSION') . getConfig('HTTP_EOL');
+ $request .= "Content-type: application/x-www-form-urlencoded" . getConfig('HTTP_EOL');
+ $request .= "Content-length: " . strlen($data) . getConfig('HTTP_EOL');
+ $request .= "Cache-Control: no-cache" . getConfig('HTTP_EOL');
+ $request .= "Connection: Close" . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
$request .= $data;
// Send the raw request
- $response = SEND_RAW_REQUEST($host, $request);
+ $response = sendRawRequest($host, $request);
// Return the result to the caller function
return $response;
}
// Sends a raw request to another host
-function SEND_RAW_REQUEST ($host, $request) {
+function sendRawRequest ($host, $request) {
+ // Init errno and errdesc with 'all fine' values
+ $errno = 0; $errdesc = '';
+
// Initialize array
- $response = array("", "", "");
+ $response = array('', '', '');
// Default is not to use proxy
$useProxy = false;
// Are proxy settins set?
- if ((getConfig('proxy_host') != "") && (getConfig('proxy_port') > 0)) {
+ if ((getConfig('proxy_host') != '') && (getConfig('proxy_port') > 0)) {
// Then use it
$useProxy = true;
} // END - if
// Open connection
- //* DEBUG: */ die("SCRIPT=".$script."
\n");
- if ($useProxy) {
- $fp = @fsockopen(COMPILE_CODE(getConfig('proxy_host')), getConfig('proxy_port'), $errno, $errdesc, 30);
+ //* DEBUG: */ die("SCRIPT=" . $script."
\n");
+ if ($useProxy === true) {
+ // Connect to host through proxy connection
+ $fp = @fsockopen(COMPILE_CODE(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
} else {
+ // Connect to host directly
$fp = @fsockopen($host, 80, $errno, $errdesc, 30);
}
@@ -1859,21 +1857,21 @@ function SEND_RAW_REQUEST ($host, $request) {
} // END - if
// Do we use proxy?
- if ($useProxy) {
+ if ($useProxy === true) {
// Generate CONNECT request header
- $proxyTunnel = "CONNECT ".$host.":80 HTTP/1.1\r\n";
- $proxyTunnel .= "Host: ".$host."\r\n";
+ $proxyTunnel = "CONNECT " . $host . ":80 HTTP/1.1" . getConfig('HTTP_EOL');
+ $proxyTunnel .= "Host: " . $host . getConfig('HTTP_EOL');
// Use login data to proxy? (username at least!)
- if (getConfig('proxy_username') != "") {
+ if (getConfig('proxy_username') != '') {
// Add it as well
- $encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')).":".COMPILE_CODE(getConfig('proxy_password')));
- $proxyTunnel .= "Proxy-Authorization: Basic ".$encodedAuth."\r\n";
+ $encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . COMPILE_CODE(getConfig('proxy_password')));
+ $proxyTunnel .= "Proxy-Authorization: Basic " . $encodedAuth . getConfig('HTTP_EOL');
} // END - if
// Add last new-line
- $proxyTunnel .= "\r\n";
- //* DEBUG: */ print("
proxyTunnel= ".$proxyTunnel." ");
+ $proxyTunnel .= getConfig('HTTP_EOL');
+ //* DEBUG: */ print("
proxyTunnel= " . $proxyTunnel." ");
// Write request
fputs($fp, $proxyTunnel);
@@ -1886,8 +1884,8 @@ function SEND_RAW_REQUEST ($host, $request) {
// Read the first line
$resp = trim(fgets($fp, 10240));
- $respArray = explode(" ", $resp);
- if ((strtolower($respArray[0]) !== "http/1.0") || ($respArray[1] != "200")) {
+ $respArray = explode(' ', $resp);
+ if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) {
// Invalid response!
return $response;
} // END - if
@@ -1923,16 +1921,16 @@ function SEND_RAW_REQUEST ($host, $request) {
//* DEBUG: */ print("
Response: ".print_r($response, true)." ");
// Proxy agent found?
- if ((substr(strtolower($response[0]), 0, 11) == "proxy-agent") && ($useProxy)) {
+ if ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) {
// Proxy header detected, so remove two lines
array_shift($response);
array_shift($response);
} // END - if
// Was the request successfull?
- if ((!eregi("200 OK", $response[0])) || (empty($response[0]))) {
+ if ((!eregi('200 OK', $response[0])) || (empty($response[0]))) {
// Not found / access forbidden
- $response = array("", "", "");
+ $response = array('', '', '');
} // END - if
// Return response
@@ -1940,56 +1938,57 @@ function SEND_RAW_REQUEST ($host, $request) {
}
// Taken from www.php.net eregi() user comments
-function VALIDATE_EMAIL ($email) {
+function isEmailValid ($email) {
// Compile email
$email = COMPILE_CODE($email);
// Check first part of email address
- $first = "[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*";
+ $first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*';
// Check domain
- $domain = "[a-z0-9-]+(\.[a-z0-9-]{2,5})+";
+ $domain = '[a-z0-9-]+(\.[a-z0-9-]{2,5})+';
// Generate pattern
- $regex = "^".$first."@".$domain."$";
+ $regex = '@^' . $first . '\@' . $domain . '$@iU';
// Return check result
- return eregi($regex, $email);
+ // @NOTE altered the regex-pattern and added modificator i (match both upper and lower case letters) and U (PCRE_UNGREEDY) to work with preg_match the same way as eregi
+ return preg_match($regex, $email);
}
// Function taken from user comments on www.php.net / function eregi()
-function VALIDATE_URL ($URL, $compile=true) {
+function isUrlValid ($URL, $compile=true) {
// Trim URL a little
$URL = trim(urldecode($URL));
//* DEBUG: */ echo $URL."
";
// Compile some chars out...
- if ($compile) $URL = compileUriCode($URL, false, false, false);
+ if ($compile === true) $URL = compileUriCode($URL, false, false, false);
//* DEBUG: */ echo $URL."
";
// Check for the extension filter
- if (EXT_IS_ACTIVE("filter")) {
+ if (EXT_IS_ACTIVE('filter')) {
// Use the extension's filter set
return FILTER_VALIDATE_URL($URL, false);
- }
+ } // END - if
// If not installed, perform a simple test. Just make it sure there is always a http:// or
// https:// in front of the URLs
- return isUrlValid($URL);
+ return isUrlValidSimple($URL);
}
// Generate a list of administrative links to a given userid
-function MEMBER_ACTION_LINKS ($uid, $status = "") {
+function generateMemberAdminActionLinks ($uid, $status = '') {
// Define all main targets
- $TARGETS = array("del_user", "edit_user", "lock_user", "add_points", "sub_points");
+ $TARGETS = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
// Begin of navigation links
$eval = "\$OUT = \"[ ";
foreach ($TARGETS as $tar) {
- $eval .= "
".__LINE__." ): ".$constName."-CACHE!".__LINE__." ): " . $constName."-CACHE!".__LINE__." ): ".$constName."-RESOLVE!".__LINE__." ): " . $constName."-RESOLVE!".__LINE__." ): ".$constName."-FOUND!".__LINE__." ): " . $constName."-FOUND!".print_r($GLOBALS['cache_array']['themes'], true)." ");
// Get theme from cookie
- $ret = get_session('mxchange_theme');
+ $ret = getSession('mxchange_theme');
// Is it valid?
- if (THEME_GET_ID($ret) == 0) {
+ if (getThemeId($ret) == 0) {
// Fix it to default
- $ret = "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)) && ((REQUEST_ISSET_GET('theme')) || (REQUEST_ISSET_POST('theme')))) {
// Prepare FQFN for checking
- $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), REQUEST_GET(('theme')));
+ $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), REQUEST_GET('theme'));
// Installation mode active
- if ((REQUEST_ISSET_GET(('theme'))) && (FILE_READABLE($theme))) {
+ if ((REQUEST_ISSET_GET('theme')) && (isFileReadable($theme))) {
// Set cookie from URL data
- set_session('mxchange_theme', REQUEST_GET(('theme')));
- } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE(REQUEST_POST('theme'))))) {
+ setSession('mxchange_theme', REQUEST_GET('theme'));
+ } elseif (isFileReadable(sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE(REQUEST_POST('theme'))))) {
// Set cookie from posted data
- set_session('mxchange_theme', SQL_ESCAPE(REQUEST_POST('theme')));
+ setSession('mxchange_theme', SQL_ESCAPE(REQUEST_POST('theme')));
}
// Set return value
- $ret = get_session('mxchange_theme');
+ $ret = getSession('mxchange_theme');
} else {
// Invalid design, reset cookie
- set_session('mxchange_theme', $ret);
+ setSession('mxchange_theme', $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 (INCLUDE_READABLE($INC)) ADD_INC_TO_POOL($INC);
+ if (isIncludeReadable($INC)) ADD_INC_TO_POOL($INC);
// Return theme value
return $ret;
}
// Get id from theme
-function THEME_GET_ID ($name) {
- // Is the extension "theme" installed?
- if (!EXT_IS_ACTIVE("theme")) {
+function getThemeId ($name) {
+ // Is the extension 'theme' installed?
+ if (!EXT_IS_ACTIVE('theme')) {
// Then abort here
return 0;
} // END - if
@@ -2419,10 +2380,10 @@ function THEME_GET_ID ($name) {
// Count up
incrementConfigEntry('cache_hits');
- } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
+ } elseif (GET_EXT_VERSION('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) {
@@ -2438,64 +2399,16 @@ function THEME_GET_ID ($name) {
return $id;
}
-// Read a given file
-function READ_FILE ($FQFN, $sqlPrepare = false) {
- // Load the file
- if (function_exists('file_get_contents')) {
- // Use new function
- $content = file_get_contents($FQFN);
- } else {
- // Fall-back to implode-file chain
- $content = implode("", file($FQFN));
- }
-
- // Prepare SQL queries?
- if ($sqlPrepare === true) {
- // Remove some unwanted chars
- $content = str_replace("\r", "", $content);
- $content = str_replace("\n\n", "\n", $content);
- } // END - if
-
- // Return the content
- return $content;
-}
-
-// Writes content to a file
-function WRITE_FILE ($FQFN, $content) {
- // Is the file writeable?
- if ((FILE_READABLE($FQFN)) && (!is_writeable($FQFN)) && (!chmod($FQFN, 0644))) {
- // Not writeable!
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("File %s not writeable.", basename($FQFN)));
-
- // Failed! :(
- return false;
+// 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
- // By default all is failed...
- $return = false;
-
- // Is the function there?
- if (function_exists('file_put_contents')) {
- // Write it directly
- $return = file_put_contents($FQFN, $content);
- } else {
- // Write it with fopen
- $fp = fopen($FQFN, 'w') or mxchange_die("Cannot write file ".basename($FQFN)."!");
- fwrite($fp, $content);
- fclose($fp);
-
- // Set CHMOD rights
- $return = chmod($FQFN, 0644);
- }
-
- // Return status
- return $return;
-}
-
-// Generates an error code from given account status
-function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
// Default error code if unknown account status
- $ERROR = getCode('UNKNOWN_STATUS');
+ $errorCode = getCode('UNKNOWN_STATUS');
// Generate constant name
$constantName = sprintf("ID_%s", $status);
@@ -2503,59 +2416,50 @@ function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
// Is the constant there?
if (isCodeSet($constantName)) {
// Then get it!
- $ERROR = getCode($constantName);
+ $errorCode = getCode($constantName);
} else {
// Unknown status
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown error status %s detected.", $status));
}
// Return error code
- return $ERROR;
-}
-
-// Clears the output buffer. This function does *NOT* backup sent content.
-function clearOutputBuffer () {
- // Trigger an error on failure
- if (!ob_end_clean()) {
- // Failed!
- debug_report_bug(__FUNCTION__.": Failed to clean output buffer.");
- } // END - if
+ return $errorCode;
}
// Function to search for the last modifified file
function searchDirsRecursive ($dir, &$last_changed) {
// Get dir as array
- //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):dir=".$dir."".__LINE__." ):dir=" . $dir."".__LINE__." ):ds[]=".count($ds)."".__LINE__." ):FQFN={$FQFN}".__LINE__." ):DESCENT: ".$newDir."".__LINE__." ):File: ".$d." found. (".($last_changed['time'] - $time).")".__LINE__." ) - NEWER!".__LINE__." ):FQFN={$FQFN}".__LINE__." ):DESCENT: " . $newDir."".__LINE__." ):File: " . $d." found. (".($last_changed['time'] - $time).")".__LINE__." ) - NEWER!".print_r($mapper, true).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 {
@@ -2621,12 +2540,13 @@ function getActualVersion ($type = 'Revision') {
// Has it been updated?
if ($new === true) {
- WRITE_FILE($FQFN, implode("\n", getAkt_vers()));
+ writeToFile($FQFN, implode("\n", getArrayFromActualVersion()));
} // END - if
}
}
// Repares an array we are looking for
+// 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');
@@ -2635,84 +2555,69 @@ function getSearchFor () {
return $searchFor;
}
-function getAkt_vers () {
+// @TODO Please describe this function
+function getArrayFromActualVersion () {
// Init variables
- $next_dir = "";
+ $next_dir = ''; // Directory to start with search
$last_changed = array(
- 'path_name' => "",
+ 'path_name' => '',
'time' => 0
);
- $akt_vers = array();
- $res = 0;
+ $akt_vers = array(); // Init return array
+ $res = 0; // Init value for counting the founded keywords
// Searches all Files and there date of the last modifikation and puts the newest File in $last_changed.
- searchDirsRecursive($next_dir, $last_changed);
+ searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
// Get file
- $last_file = READ_FILE($last_changed['path_name']);
+ $last_file = readFromFile($last_changed['path_name']);
+
+ // Get all the keywords to search for
$searchFor = getSearchFor();
- // @TODO What does this loop/regex do? Document it, please.
+ // This foreach loops the $searchFor-Tags (array('Revision', 'Date', 'Tag', 'Author') --> could easaly extended in the future)
foreach ($searchFor as $search) {
- $res += preg_match('@\$'.$search.'(:|::) (.*) \$@U', $last_file, $t);
+ // 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]);
} // END - foreach
- if ($res && $res >= 3) {
- // Prepare content
- preg_match('@(....)-(..)-(..) (..):(..):(..)@', $akt_vers['Date'], $match_d);
+ // Save the last-changed filename for debugging
+ $akt_vers['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'] != '') {
+ // 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]);
- // Add Tag if the author is set and is not quix0r (lead coder)
+ // 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']);
} // END - if
+
} else {
- // No valid Data from the last modificated file so read the Revision from the Server. Fallback-solution!! Could be removed I think.
- $version = GET_URL("check-updates3.php");
+ // No valid Data from the last modificated file so read the Revision from the Server. Fallback-solution!! Should not be removed I think.
+ $version = sendGetRequest('check-updates3.php');
// Prepare content
- $akt_vers['Revision'] = trim($version[10]);
- $akt_vers['Date'] = trim($version[9]);
- $akt_vers['Tag'] = trim($version[8]);
- $akt_vers['Author'] = "quix0r";
+ // 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";
}
// Return prepared array
return $akt_vers;
}
-
-// Loads an include file and logs any missing files for debug purposes
-function LOAD_INC ($INC) {
- // Add the path. This is why we need a trailing slash in config.php
- $FQFN = constant('PATH') . $INC;
-
- // Is the include file there?
- if (!FILE_READABLE($FQFN)) {
- // Not there so log it
- debug_report_bug(sprintf("Include file %s not found.", $INC));
- return false;
- } // END - if
-
- // Try to load it
- require($FQFN);
-}
-
-// Loads an include file once
-function LOAD_INC_ONCE ($INC) {
- // Is it not loaded?
- if (!isset($GLOBALS['load_once'][$INC])) {
- // Then try to load it
- LOAD_INC($INC);
-
- // And mark it as loaded
- $GLOBALS['load_once'][$INC] = "loaded";
- } // END - if
-}
-
// Back-ported from the new ship-simu engine. :-)
function debug_get_printable_backtrace () {
// Init variable
@@ -2724,7 +2629,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']).") ".basename($trace['file'])." :" . $trace['line'].", " . $trace['function'].'('.count($trace['args']).") bugs.mxchange.org :";
+ $debug .= "Please report this bug at bugs.mxchange.org and include the logfile from inc/cache/debug.log in your report (you can now attach files):";
$debug .= debug_get_printable_backtrace();
- $debug .= " Thank you for finding bugs.";
+ $debug .= " \nRequest-URI: " . $_SERVER['REQUEST_URI']."{--LOGOUT_FAILED--} "; break;
- case getCode('DATA_INVALID') : $msg = getMessage('MAIL_DATA_INVALID'); break;
- case getCode('POSSIBLE_INVALID') : $msg = getMessage('MAIL_POSSIBLE_INVALID'); break;
- case getCode('ACCOUNT_LOCKED') : $msg = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
- case getCode('USER_404') : $msg = getMessage('USER_NOT_FOUND'); break;
- case getCode('STATS_404') : $msg = getMessage('MAIL_STATS_404'); break;
- case getCode('ALREADY_CONFIRMED'): $msg = getMessage('MAIL_ALREADY_CONFIRMED'); break;
+ case getCode('LOGOUT_DONE') : $message = getMessage('LOGOUT_DONE'); break;
+ case getCode('LOGOUT_FAILED') : $message = "{--LOGOUT_FAILED--} "; break;
+ case getCode('DATA_INVALID') : $message = getMessage('MAIL_DATA_INVALID'); break;
+ case getCode('POSSIBLE_INVALID') : $message = getMessage('MAIL_POSSIBLE_INVALID'); break;
+ case getCode('ACCOUNT_LOCKED') : $message = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
+ case getCode('USER_404') : $message = getMessage('USER_NOT_FOUND'); break;
+ case getCode('STATS_404') : $message = getMessage('MAIL_STATS_404'); break;
+ case getCode('ALREADY_CONFIRMED'): $message = getMessage('MAIL_ALREADY_CONFIRMED'); break;
case getCode('ERROR_MAILID'):
if (EXT_IS_ACTIVE($ext, true)) {
- $msg = getMessage('ERROR_CONFIRMING_MAIL');
+ $message = getMessage('ERROR_CONFIRMING_MAIL');
} else {
- $msg = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "mailid");
+ $message = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'mailid');
}
break;
case getCode('EXTENSION_PROBLEM'):
- if (REQUEST_ISSET_GET(('ext'))) {
- $msg = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), REQUEST_GET(('ext')));
+ if (REQUEST_ISSET_GET('ext')) {
+ $message = generateExtensionInactiveNotInstalledMessage(REQUEST_GET('ext'));
} else {
- $msg = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
+ $message = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
}
break;
- case getCode('COOKIES_DISABLED') : $msg = getMessage('LOGIN_NO_COOKIES'); break;
- case getCode('BEG_SAME_AS_OWN') : $msg = getMessage('BEG_SAME_UID_AS_OWN'); break;
- case getCode('LOGIN_FAILED') : $msg = getMessage('LOGIN_FAILED_GENERAL'); break;
- case getCode('MODULE_MEM_ONLY') : $msg = sprintf(getMessage('MODULE_MEM_ONLY'), REQUEST_GET('mod')); break;
+ case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_NO_COOKIES'); break;
+ case getCode('BEG_SAME_AS_OWN') : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
+ case getCode('LOGIN_FAILED') : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
+ case getCode('MODULE_MEM_ONLY') : $message = sprintf(getMessage('MODULE_MEM_ONLY'), REQUEST_GET('mod')); break;
default:
// Missing/invalid code
- $msg = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code);
+ $message = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code);
// Log it
- DEBUG_LOG(__FUNCTION__, __LINE__, $msg);
+ DEBUG_LOG(__FUNCTION__, __LINE__, $message);
break;
} // END - switch
// Return the message
- return $msg;
-}
-
-// Checks wether the given extension is currently not installed
-// and redirects if so.
-function REDIRCT_ON_UNINSTALLED_EXTENSION ($ext_name) {
- // Is the extension uninstalled/inactive?
- if (!EXT_IS_ACTIVE($ext_name)) {
- // Redirect to index
- LOAD_URL("modules.php?module=index&msg=".getCode('EXTENSION_PROBLEM')."&ext=".$ext_name);
- } // END - if
+ return $message;
}
// Generate a "link" for the given admin id (aid)
-function GENERATE_AID_LINK ($aid) {
+function generateAdminLink ($aid) {
// No assigned admin is default
$admin = "{--ADMIN_NO_ADMIN_ASSIGNED--} ";
// Zero? = Not assigned
- if ($aid > 0) {
+ if (bigintval($aid) > 0) {
// Load admin's login
- $login = GET_ADMIN_LOGIN($aid);
- if ($login != "***") {
+ $login = getAdminLogin($aid);
+
+ // Is the login valid?
+ if ($login != '***') {
// Is the extension there?
- if (EXT_IS_ACTIVE("admins")) {
+ if (EXT_IS_ACTIVE('admins')) {
// Admin found
- $admin = "".$login." ";
+ $admin = "" . $login." ";
} else {
// Extension not found
- $admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "admins");
+ $admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins');
}
} else {
// Maybe deleted?
@@ -2850,44 +2749,21 @@ function GENERATE_AID_LINK ($aid) {
return $admin;
}
-// Checks wether an include file (non-FQFN better) is readable
-function INCLUDE_READABLE ($INC) {
- // Construct FQFN
- $FQFN = constant('PATH') . $INC;
-
- // Is it readable?
- return FILE_READABLE($FQFN);
-}
-
-// Encode strings
-// @TODO Implement $compress
-function encodeString ($str, $compress=true) {
- $str = urlencode(base64_encode(compileUriCode($str)));
- return $str;
-}
-
-// Decode strings encoded with encodeString()
-// @TODO Implement $decompress
-function decodeString ($str, $decompress=true) {
- $str = compileUriCode(base64_decode(urldecode(compileUriCode($str))));
- return $str;
-}
-
// Compile characters which are allowed in URLs
function compileUriCode ($code, $simple=true) {
// Compile constants
- if (!$simple) $code = str_replace("{--", '".', str_replace("--}", '."', $code));
+ if (!$simple) $code = str_replace('{--', '".', str_replace('--}', '."', $code));
// Compile QUOT and other non-HTML codes
- $code = str_replace("{DOT}", ".",
- 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('{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
)))))))));
@@ -2896,9 +2772,9 @@ function compileUriCode ($code, $simple=true) {
}
// Function taken from user comments on www.php.net / function eregi()
-function isUrlValid ($url) {
+function isUrlValidSimple ($url) {
// Prepare URL
- $url = strip_tags(str_replace("\\", "", compileUriCode(urldecode($url))));
+ $url = strip_tags(str_replace("\\", '', COMPILE_CODE(urldecode($url))));
// Allows http and https
$http = "(http|https)+(:\/\/)";
@@ -2915,44 +2791,42 @@ function isUrlValid ($url) {
// ... and the string after and including question character
$getstring1 = "([\?/]([[:alnum:]][-\._%[:alnum:]]*(=)?([-\@\._:%[:alnum:]])+)(&([[:alnum:]]([-_%[:alnum:]])*(=)?([-\@\[\._:%[:alnum:]])+(\])*))*)?";
// Pattern for URLs like http://url/dir/doc.html?var=value
- $pattern['d1dpg1'] = $http.$domain1.$dir.$page.$getstring1;
- $pattern['d2dpg1'] = $http.$domain2.$dir.$page.$getstring1;
- $pattern['ipdpg1'] = $http.$ip.$dir.$page.$getstring1;
+ $pattern['d1dpg1'] = $http . $domain1 . $dir . $page . $getstring1;
+ $pattern['d2dpg1'] = $http . $domain2 . $dir . $page . $getstring1;
+ $pattern['ipdpg1'] = $http . $ip . $dir . $page . $getstring1;
// Pattern for URLs like http://url/dir/?var=value
- $pattern['d1dg1'] = $http.$domain1.$dir."/".$getstring1;
- $pattern['d2dg1'] = $http.$domain2.$dir."/".$getstring1;
- $pattern['ipdg1'] = $http.$ip.$dir."/".$getstring1;
+ $pattern['d1dg1'] = $http . $domain1 . $dir.'/' . $getstring1;
+ $pattern['d2dg1'] = $http . $domain2 . $dir.'/' . $getstring1;
+ $pattern['ipdg1'] = $http . $ip . $dir.'/' . $getstring1;
// Pattern for URLs like http://url/dir/page.ext
- $pattern['d1dp'] = $http.$domain1.$dir.$page;
- $pattern['d1dp'] = $http.$domain2.$dir.$page;
- $pattern['ipdp'] = $http.$ip.$dir.$page;
+ $pattern['d1dp'] = $http . $domain1 . $dir . $page;
+ $pattern['d1dp'] = $http . $domain2 . $dir . $page;
+ $pattern['ipdp'] = $http . $ip . $dir . $page;
// Pattern for URLs like http://url/dir
- $pattern['d1d'] = $http.$domain1.$dir;
- $pattern['d2d'] = $http.$domain2.$dir;
- $pattern['ipd'] = $http.$ip.$dir;
+ $pattern['d1d'] = $http . $domain1 . $dir;
+ $pattern['d2d'] = $http . $domain2 . $dir;
+ $pattern['ipd'] = $http . $ip . $dir;
// Pattern for URLs like http://url/?var=value
- $pattern['d1g1'] = $http.$domain1."/".$getstring1;
- $pattern['d2g1'] = $http.$domain2."/".$getstring1;
- $pattern['ipg1'] = $http.$ip."/".$getstring1;
+ $pattern['d1g1'] = $http . $domain1 . '/' . $getstring1;
+ $pattern['d2g1'] = $http . $domain2 . '/' . $getstring1;
+ $pattern['ipg1'] = $http . $ip . '/' . $getstring1;
// Pattern for URLs like http://url?var=value
- $pattern['d1g12'] = $http.$domain1.$getstring1;
- $pattern['d2g12'] = $http.$domain2.$getstring1;
- $pattern['ipg12'] = $http.$ip.$getstring1;
+ $pattern['d1g12'] = $http . $domain1 . $getstring1;
+ $pattern['d2g12'] = $http . $domain2 . $getstring1;
+ $pattern['ipg12'] = $http . $ip . $getstring1;
// Test all patterns
$reg = false;
- foreach ($pattern as $key=>$pat) {
+ foreach ($pattern as $key => $pat) {
// Debug regex?
- if (defined('DEBUG_REGEX')) {
- $pat = str_replace("[:alnum:]", "0-9a-zA-Z", $pat);
- $pat = str_replace("[:alpha:]", "a-zA-Z", $pat);
- $pat = str_replace("[:digit:]", "0-9", $pat);
- $pat = str_replace(".", "\.", $pat);
- $pat = str_replace("@", "\@", $pat);
- echo $key."= ".$pat."READ: ".$FQFN."READ: ' . $FQFN . "WRITE: ".$tmp."WRITE: ' . $tmp . "CHANGE: 404!");
+ copyFileVerified($tmp, $FQFN, 0644);
+ return removeFile($tmp);
+ } elseif ($found === false) {
+ OUTPUT_HTML('CHANGE: 404!');
} else {
- OUTPUT_HTML("TMP: UNDONE!");
+ OUTPUT_HTML('TMP: UNDONE!');
}
}
} else {
// File not found, not readable or writeable
- OUTPUT_HTML("404: ".$FQFN."404: ' . $FQFN . '".__LINE__." ):baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}".__LINE__." ): Extension entry ".$baseFile." added.".__LINE__." ): Regular entry ".$baseFile." added.".__LINE__." ):accessLevel={$accessLevel}".__LINE__." ): inc={$inc} - LOADED!Experimental feature: You have to delete the admin_*.cache files by yourself at this point.");
}
-// Translates the "pool type" into human-readable
-function TRANSLATE_POOL_TYPE ($type) {
- // Default type is unknown
- $translated = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type);
-
- // Generate constant
- $constName = sprintf("POOL_TYPE_%s", $type);
-
- // Does it exist?
- if (defined($constName)) {
- // Then use it
- $translated = getMessage($constName);
- } // END - if
-
- // Return "translation"
- return $translated;
-}
-
-// "Getter" for remote IP number
-function GET_REMOTE_ADDR () {
- // Get remote ip from environment
- $remoteAddr = getenv('REMOTE_ADDR');
-
- // Is removeip installed?
- if (EXT_IS_ACTIVE("removeip")) {
- // Then anonymize it
- $remoteAddr = GET_ANONYMOUS_REMOTE_ADDR($remoteAddr);
- } // END - if
-
- // Return it
- return $remoteAddr;
-}
-
-// "Getter" for remote hostname
-function GET_REMOTE_HOST () {
- // Get remote ip from environment
- $remoteHost = getenv('REMOTE_HOST');
-
- // Is removeip installed?
- if (EXT_IS_ACTIVE("removeip")) {
- // Then anonymize it
- $remoteHost = GET_ANONYMOUS_REMOTE_HOST($remoteHost);
- } // END - if
-
- // Return it
- return $remoteHost;
-}
-
-// "Getter" for user agent
-function GET_USER_AGENT () {
- // Get remote ip from environment
- $userAgent = getenv('HTTP_USER_AGENT');
-
- // Is removeip installed?
- if (EXT_IS_ACTIVE("removeip")) {
- // Then anonymize it
- $userAgent = GET_ANONYMOUS_USER_AGENT($userAgent);
- } // END - if
-
- // Return it
- return $userAgent;
-}
-
-// "Getter" for referer
-function GET_REFERER () {
- // Get remote ip from environment
- $referer = getenv('HTTP_REFERER');
+// Determines the real remote address
+function determineRealRemoteAddress () {
+ // Is a proxy in use?
+ if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){
+ // Proxy was used
+ $address = $_SERVER['HTTP_X_FORWARDED_FOR'];
+ } elseif (isset($_SERVER['HTTP_CLIENT_IP'])){
+ // Yet, another proxy
+ $address = $_SERVER['HTTP_CLIENT_IP'];
+ } else {
+ // The regular address when no proxy was used
+ $address = $_SERVER['REMOTE_ADDR'];
+ }
- // Is removeip installed?
- if (EXT_IS_ACTIVE("removeip")) {
- // Then anonymize it
- $referer = GET_ANONYMOUS_REFERER($referer);
+ // This strips out the real address from proxy output
+ if (strstr($address, ',')){
+ $addressArray = explode(',', $address);
+ $address = $addressArray[0];
} // END - if
- // Return it
- return $referer;
+ // Return the result
+ return $address;
}
// Adds a bonus mail to the queue
// This is a high-level function!
-function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
+function addNewBonusMail ($data, $mode = '', $output=true) {
// Use mode from data if not set and availble ;-)
if ((empty($mode)) && (isset($data['mode']))) $mode = $data['mode'];
// Generate receiver list
- $RECEIVER = GENERATE_RECEIVER_LIST($data['cat'], $data['receiver'], $mode);
+ $RECEIVER = generateReceiverList($data['cat'], $data['receiver'], $mode);
// Receivers added?
if (!empty($RECEIVER)) {
// Add bonus mail to queue
- ADD_BONUS_MAIL_TO_QUEUE(
- $data['subject'],
- $data['text'],
- $RECEIVER,
- $data['points'],
- $data['seconds'],
- $data['url'],
- $data['cat'],
- $mode,
- $data['receiver']
+ addBonusMailToQueue(
+ $data['subject'],
+ $data['text'],
+ $RECEIVER,
+ $data['points'],
+ $data['seconds'],
+ $data['url'],
+ $data['cat'],
+ $mode,
+ $data['receiver']
);
// Mail inserted into bonus pool
- if ($output) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_SEND'));
+ if ($output) LOAD_TEMPLATE('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'));
+ LOAD_TEMPLATE('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!");
@@ -3477,59 +3206,42 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
// Determines referal id and sets it
function DETERMINE_REFID () {
// Check if refid is set
- if ((!empty($_GET['user'])) && (basename($_SERVER['PHP_SELF']) == "click.php")) {
+ if ((REQUEST_ISSET_GET('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(REQUEST_GET('user'));
+ } elseif (REQUEST_ISSET_POST('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'] = strip_tags(REQUEST_POST('refid'));
+ } elseif (REQUEST_ISSET_GET('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'] = strip_tags(REQUEST_GET('refid'));
+ } elseif (REQUEST_ISSET_GET('ref')) {
// Set refid=ref (the referal link uses such variable)
- $GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_GET['ref']));
- } elseif ((isSessionVariableSet('refid')) && (get_session('refid') != 0)) {
+ $GLOBALS['refid'] = strip_tags(REQUEST_GET('ref'));
+ } elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) {
// Set session refid als global
- $GLOBALS['refid'] = bigintval(get_session('refid'));
- } elseif ((GET_EXT_VERSION("sql_patches") != "") && (getConfig('def_refid') > 0)) {
+ $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 ((GET_EXT_VERSION('user') >= '0.3.4') && (getConfig('select_user_zero_refid')) == 'Y') {
// Select a random user which has confirmed enougth mails
- $GLOBALS['refid'] = SELECT_RANDOM_REFID();
+ $GLOBALS['refid'] = determineRandomReferalId();
} else {
// No default ID when sql_patches is not installed or none set
$GLOBALS['refid'] = 0;
}
// Set cookie when default refid > 0
- if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((get_session('refid') == "0") && (getConfig('def_refid') > 0))) {
+ if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == '0') && (getConfig('def_refid') > 0))) {
// Set cookie
- set_session('refid', $GLOBALS['refid']);
+ setSession('refid', $GLOBALS['refid']);
} // END - if
// Return determined refid
return $GLOBALS['refid'];
}
-// Check wether we are installing
-function isInstalling () {
- $installing = ((isset($GLOBALS['mxchange_installing'])) || (REQUEST_ISSET_GET('installing')));
- //* DEBUG: */ var_dump($installing);
- return $installing;
-}
-
-// Check wether this script is installed
-function isInstalled () {
- return isBooleanConstantAndTrue('mxchange_installed');
-}
-
-// Check wether an admin is registered
-function isAdminRegistered () {
- return isBooleanConstantAndTrue('admin_registered');
-}
-
// Enables the reset mode. Only call this function if you really want the
// reset to be run!
function enableResetMode () {
@@ -3540,23 +3252,6 @@ function enableResetMode () {
runFilterChain('reset_enabled');
}
-// Checks wether the reset mode is active
-function isResetModeEnabled () {
- // Now simply check it
- return ((isset($GLOBALS['reset_enabled'])) && ($GLOBALS['reset_enabled'] === true));
-}
-
-// Checks wether the debug mode is enabled
-function isDebugModeEnabled () {
- // Simply check it
- return isBooleanConstantAndTrue('DEBUG_MODE');
-}
-
-// Checks wether the cache instance is valid
-function isCacheInstanceValid () {
- return ((isset($GLOBALS['cache_instance'])) && (is_object($GLOBALS['cache_instance'])));
-}
-
// Our shutdown-function
function shutdown () {
// Call the filter chain 'shutdown'
@@ -3599,78 +3294,111 @@ function isUserIdSet () {
return (isset($GLOBALS['userid']));
}
-// Checks wether the given FQFN is a directory and not .,.. or .svn
-function isDirectory ($FQFN) {
- // Generate baseName
- $baseName = basename($FQFN);
+// Handle message codes from URL
+function handleCodeMessage () {
+ if (REQUEST_ISSET_GET('msg')) {
+ // Default extension is 'unknown'
+ $ext = 'unknown';
- // Check it
- $isDirectory = ((is_dir($FQFN)) && ($baseName != ".") && ($baseName != "..") && ($baseName != ".svn"));
+ // Is extension given?
+ if (REQUEST_ISSET_GET('ext')) $ext = REQUEST_GET('ext');
- // Return the result
- return $isDirectory;
-}
+ // Convert the 'msg' parameter from URL to a human-readable message
+ $message = convertCodeToMessage(REQUEST_GET('msg'));
-// Init INC_POOL
-function INIT_INC_POOL () {
- $GLOBALS['inc_pool'] = array();
+ // Load message template
+ LOAD_TEMPLATE('message', false, $message);
+ } // END - if
}
-// Setter for INC_POOL
-function SET_INC_POOL ($includePool) {
- $GLOBALS['inc_pool'] = (array) $includePool;
+// Setter for extra title
+function setExtraTitle ($extraTitle) {
+ $GLOBALS['extra_title'] = $extraTitle;
}
-// Getter for INC_POOL
-function GET_INC_POOL () {
- return $GLOBALS['inc_pool'];
-}
+// Getter for extra title
+function getExtraTitle () {
+ // Is the extra title set?
+ if (!isExtraTitleSet()) {
+ // No, then abort here
+ debug_report_bug('extra_title is not set!');
+ } // END - if
-// Count INC_POOL
-function COUNT_INC_POOL () {
- return count($GLOBALS['inc_pool']);
+ // Return it
+ return $GLOBALS['extra_title'];
}
-// Merge INC_POOL into given
-function MERGE_INC_POOL ($includePool) {
- SET_INC_POOL(merge_array(GET_INC_POOL(), $includePool));
+// Checks if the extra title is set
+function isExtraTitleSet () {
+ return ((isset($GLOBALS['extra_title'])) && (!empty($GLOBALS['extra_title'])));
}
-// Add single include file to INC_POOL
-function ADD_INC_TO_POOL ($INC) {
- $GLOBALS['inc_pool'][] = (string) $INC;
+// Generates a 'extension foo inactive' message
+function generateExtensionInactiveMessage ($ext_name) {
+ // Is the extension empty?
+ if (empty($ext_name)) {
+ // This should not happen
+ trigger_error(__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 (IS_ADMIN()) {
+ // Then output admin message
+ $message = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE'), $ext_name);
+ } // END - if
+
+ // Return prepared message
+ return $message;
}
-// Remove an include file from INC_POOL
-function REMOVE_INC_FROM_POOL ($INC) {
- // First look it up
- $key = array_search($INC, GET_INC_POOL());
+// Generates a 'extension foo not installed' message
+function generateExtensionNotInstalledMessage ($ext_name) {
+ // Is the extension empty?
+ if (empty($ext_name)) {
+ // This should not happen
+ trigger_error(__FUNCTION__ . ': Parameter ext is empty. This should not happen.');
+ } // END - if
- // Is it valid?
- if ($key !== false) {
- // Then remove it
- unset($GLOBALS['inc_pool'][$key]);
+ // Default message
+ $message = sprintf(getMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
- // And sort the list
- asort($GLOBALS['inc_pool']);
+ // Is an admin logged in?
+ if (IS_ADMIN()) {
+ // Then output admin message
+ $message = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
} // END - if
+
+ // Return prepared message
+ return $message;
}
-// Handle message codes from URL
-function handleCodeMessage () {
- if (REQUEST_ISSET_GET(('msg'))) {
- // Default extension is "unknown"
- $ext = "unknown";
+// Generates a message depending on if the extension is not installed or not
+// just activated
+function generateExtensionInactiveNotInstalledMessage ($ext_name) {
+ // Init message
+ $message = '';
- // Is extension given?
- if (REQUEST_ISSET_GET(('ext'))) $ext = REQUEST_GET(('ext'));
+ // Is the extension not installed or just deactivated?
+ switch (isExtensionInstalled($ext_name)) {
+ case true; // Deactivated!
+ $message = generateExtensionInactiveMessage($ext_name);
+ break;
- // Convert the 'msg' parameter from URL to a human-readable message
- $msg = convertCodeToMessage(REQUEST_GET('msg'));
+ case false; // Not installed!
+ $message = generateExtensionNotInstalledMessage($ext_name);
+ break;
- // Load message template
- LOAD_TEMPLATE("message", false, $msg);
- } // END - if
+ default: // Should not happen!
+ DEBUG_LOG(__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;
}
//////////////////////////////////////////////////