X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=2add576617475d43f8dbd5cb4e5c813cdbb4b13c;hp=049a7cb9c1252dd342cb910a3de412b67222fed1;hb=7df843bde81b6f3a678bd855f96e7ade07fb8e0d;hpb=16de7d9e8b98108627db01688bc095240b5ba8d2 diff --git a/inc/functions.php b/inc/functions.php index 049a7cb9c1..2add576617 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -43,6 +43,9 @@ if (!defined('__SECURITY')) { // Output HTML code directly or 'render' it. You addionally switch the new-line character off function outputHtml ($htmlCode, $newLine = true) { + // Init output + if (!isset($GLOBALS['output'])) $GLOBALS['output'] = ''; + // Transfer username $username = getMessage('USERNAME_UNKNOWN'); if (isset($GLOBALS['username'])) $username = getUsername(); @@ -121,7 +124,7 @@ function outputHtml ($htmlCode, $newLine = true) { } // END - if // Init counter - $cnt = 0; + $cnt = '0'; // Compile and run finished rendered HTML code while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) { @@ -205,7 +208,7 @@ function addFatalMessage ($F, $L, $message, $extra='') { // Getter for total fatal message count function getTotalFatalErrors () { // Init coun - $count = 0; + $count = '0'; // Do we have at least the first entry? if (!empty($GLOBALS['fatal_messages'][0])) { @@ -241,7 +244,7 @@ function loadTemplate ($template, $return=false, $content=array()) { // Init some data $ret = ''; - if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0; + if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0'; // Base directory $basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage()); @@ -322,12 +325,15 @@ function loadTemplate ($template, $return=false, $content=array()) { $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 (getOutputMode() == 0) { + if (getOutputMode() == '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'])) . '";'; + $eval = '$ret = "' . compileCode(smartAddSlashes($ret)) . '";'; + } elseif (substr($template, 0, 3) == 'js_') { + // JavaScripts don't like entities + $eval = '$ret = decodeEntities("' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '");'; } else { // Prepare eval() command $eval = '$ret = "' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '";'; @@ -343,20 +349,20 @@ function loadTemplate ($template, $return=false, $content=array()) { // 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--}
+ } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) { + // Only admins shall see this warning or when installation mode is active + $ret = '
{--TEMPLATE_404--}
(' . $template . ')

{--TEMPLATE_CONTENT--} 
' . print_r($content, true) . '
{--TEMPLATE_DATA--} 
' . print_r($DATA, true) . '
-

\";'; +

'; + } else { + // No file! + $GLOBALS['template_eval'][$template] = '404'; + } } else { // Eval the code eval($GLOBALS['template_eval'][$template]); @@ -369,7 +375,7 @@ function loadTemplate ($template, $return=false, $content=array()) { // Return the HTML code return $ret; } else { - // Output direct + // Output directly outputHtml($ret); } } elseif (isDebugModeEnabled()) { @@ -379,12 +385,9 @@ function loadTemplate ($template, $return=false, $content=array()) { } // Loads an email template and compiles it -function loadEmailTemplate ($template, $content = array(), $UID = 0) { +function loadEmailTemplate ($template, $content = array(), $UID = '0') { global $DATA; - // Our configuration is kept non-global here - $_CONFIG = getConfigArray(); - // Make sure all template names are lowercase! $template = strtolower($template); @@ -412,7 +415,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { // Expiration in a nice output format // NOTE: Use $content[expiration] in your templates instead of $EXPIRATION - if (getConfig('auto_purge') == 0) { + if (getConfig('auto_purge') == '0') { // Will never expire! $EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE'); } else { @@ -495,7 +498,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { $GLOBALS['tpl_content'] = readFromFile($FQFN); // Run code - $GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileCode(smartAddSlashes($GLOBALS['tpl_content']))."\");"; + $GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileRawCode(smartAddSlashes($GLOBALS['tpl_content']))."\");"; eval($GLOBALS['tpl_content']); } elseif (!empty($template)) { // Template file not found! @@ -526,7 +529,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { unset($DATA); // Compile the code and eval it - $eval = '$newContent = "' . compileCode(smartAddSlashes($newContent)) . '";'; + $eval = '$newContent = "' . compileRawCode(smartAddSlashes($newContent)) . '";'; eval($eval); // Return content @@ -538,7 +541,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):TO={$toEmail},SUBJECT={$subject}
"); // Compile subject line (for POINTS constant etc.) - eval("\$subject = decodeEntities(\"".compileCode(smartAddSlashes($subject))."\");"); + eval("\$subject = decodeEntities(\"".compileRawCode(smartAddSlashes($subject))."\");"); // Set from header if ((!eregi('@', $toEmail)) && ($toEmail > 0)) { @@ -584,10 +587,10 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' } // Compile "TO" - eval("\$toEmail = \"".compileCode(smartAddSlashes($toEmail))."\";"); + eval("\$toEmail = \"".compileRawCode(smartAddSlashes($toEmail))."\";"); // Compile "MSG" - eval("\$message = \"".compileCode(smartAddSlashes($message))."\";"); + eval("\$message = \"".compileRawCode(smartAddSlashes($message))."\";"); // Fix HTML parameter (default is no!) if (empty($isHtml)) $isHtml = 'N'; @@ -668,16 +671,16 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { } // Generate a password in a specified length or use default password length -function generatePassword ($length = 0) { +function generatePassword ($length = '0') { // Auto-fix invalid length of zero - if ($length == 0) $length = 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,-,+,_,/,.'); // Start creating password $PASS = ''; - for ($i = 0; $i < $length; $i++) { + for ($i = '0'; $i < $length; $i++) { $PASS .= $ABC[mt_rand(0, count($ABC) -1)]; } // END - for @@ -693,12 +696,12 @@ function generatePassword ($length = 0) { } // Generates a human-readable timestamp from the Uni* stamp -function generateDateTime ($time, $mode = 0) { +function generateDateTime ($time, $mode = '0') { // Filter out numbers $time = bigintval($time); // If the stamp is zero it mostly didn't "happen" - if ($time == 0) { + if ($time == '0') { // Never happend return getMessage('NEVER_HAPPENED'); } // END - if @@ -706,10 +709,10 @@ function generateDateTime ($time, $mode = 0) { switch (getLanguage()) { case 'de': // German date / time format switch ($mode) { - case 0: $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break; - case 1: $ret = strtolower(date('d.m.Y - H:i', $time)); break; - case 2: $ret = date('d.m.Y|H:i', $time); break; - case 3: $ret = date('d.m.Y', $time); break; + 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: logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode)); break; @@ -718,10 +721,10 @@ function generateDateTime ($time, $mode = 0) { 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; + 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; @@ -768,7 +771,7 @@ function translatePoolType ($type) { } // Translates the american decimal dot into a german comma -function translateComma ($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); @@ -779,12 +782,12 @@ function translateComma ($dotted, $cut = true, $max = 0) { if ($max > 0) $maxComma = $max; // Cut zeros off? - if (($cut === true) && ($max == 0)) { + if (($cut === true) && ($max == '0')) { // Test for commata if in cut-mode $com = explode('.', $dotted); if (count($com) < 2) { // Don't display commatas even if there are none... ;-) - $maxComma = 0; + $maxComma = '0'; } } // END - if @@ -883,7 +886,7 @@ function countSelection ($array) { } // END - if // Init count - $ret = 0; + $ret = '0'; // Count all entries foreach ($array as $key => $selected) { @@ -921,7 +924,7 @@ function makeTime ($hours, $minutes, $seconds, $stamp) { // Redirects to an URL and if neccessarry extends it with own base URL function redirectToUrl ($URL) { // Compile out codes - eval('$URL = "' . compileCode($URL) . '";'); + eval('$URL = "' . compileRawCode($URL) . '";'); // Check if http(s):// is there if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) { @@ -996,6 +999,30 @@ function compileCode ($code, $simple = false, $constants = true, $full = true) { return $code; } // END - if + // Start couting + $startCompile = explode(' ', microtime()); + + // Comile the code + $code = compileRawCode($code, $simple, $constants, $full); + + // Get timing + $compiled = explode(' ', microtime()); + + // Add timing + $code .= ''; + + // Return compiled code + return $code; +} + +// Compiles the code (use compileCode() only for HTML because of the comments) +function compileRawCode ($code, $simple = false, $constants = true, $full = true) { + // Is the code a string? + if (!is_string($code)) { + // Silently return it + return $code; + } // END - if + // Init replacement-array with full security characters $secChars = $GLOBALS['security_chars']; @@ -1071,7 +1098,7 @@ function compileCode ($code, $simple = false, $constants = true, $full = true) { } // END - foreach } // END - if - // Return compiled code + // Return it return $code; } @@ -1091,7 +1118,7 @@ function compileCode ($code, $simple = false, $constants = true, $full = true) { * Sie, dass es doch nicht so schwer ist! :-) * * * ************************************************************************/ -function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums = false) { +function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = false) { $dummy = $array; while ($primary_key < count($a_sort)) { foreach ($dummy[$a_sort[$primary_key]] as $key => $value) { @@ -1127,19 +1154,19 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums = } // -function addSelectionBox ($type, $default, $prefix = '', $id = 0) { +function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'register_select') { $OUT = ''; if ($type == 'yn') { // This is a yes/no selection only! 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"; } switch ($type) { @@ -1211,8 +1238,8 @@ function addSelectionBox ($type, $default, $prefix = '', $id = 0) { case 'sec': case 'min': - for ($idx = 0; $idx < 60; $idx+=5) { - if (strlen($idx) == 1) $idx = 0 . $idx; + for ($idx = '0'; $idx < 60; $idx+=5) { + if (strlen($idx) == 1) $idx = '0' . $idx; $OUT .= "