X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=36e2dca25ca518a4fcf45afa9576a04c34c60dad;hb=8def2eea23fae29ba4d86b4bf7df9307e62f61b7;hp=90e2bc50580fd7d076333d0cd2834421576a32d5;hpb=82ba828dcdb063ea3292fad79008469d6423d223;p=mailer.git diff --git a/inc/functions.php b/inc/functions.php index 90e2bc5058..36e2dca25c 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(); @@ -100,49 +103,16 @@ function outputHtml ($htmlCode, $newLine = true) { clearOutputBuffer(); } // END - if - // Send HTTP header - sendHeader('HTTP/1.1 200'); - - // Used later - $now = gmdate('D, d M Y H:i:s') . ' GMT'; - - // General headers for no caching - 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'); - sendHeader('Content-Type: ' . getContentType() . '; charset=UTF-8'); - sendHeader('Content-language: ' . getLanguage()); - // Extension 'rewrite' installed? if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) { $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']); } // END - if - // Init counter - $cnt = 0; - // Compile and run finished rendered HTML code - while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) { - // Prepare the content and eval() it... - $content = array(); - $newContent = ''; - - // Compile it - $eval = "\$newContent = \"".compileCode(smartAddSlashes($GLOBALS['output']))."\";"; - eval($eval); - - // Was that eval okay? - if (empty($newContent)) { - // Something went wrong! - debug_report_bug('Evaluation error:
' . linenumberCode($eval) . '
'); - } // END - if - $GLOBALS['output'] = $newContent; + compileFinalOutput(); - // Count round - $cnt++; - } // END - while + // Send all HTTP headers + sendHttpHeaders(); // Output code here, DO NOT REMOVE! ;-) outputRawCode($GLOBALS['output']); @@ -153,19 +123,68 @@ function outputHtml ($htmlCode, $newLine = true) { } // END - if // Compile and run finished rendered HTML code - while (strpos($GLOBALS['output'], '{!') > 0) { - eval("\$GLOBALS['output'] = \"".compileCode(smartAddSlashes($GLOBALS['output']))."\";"); - } // END - while + compileFinalOutput(); + + // Send all HTTP headers + sendHttpHeaders(); // Output code here, DO NOT REMOVE! ;-) outputRawCode($GLOBALS['output']); } } +// Sends out all headers required for HTTP/1.1 reply +function sendHttpHeaders () { + // Used later + $now = gmdate('D, d M Y H:i:s') . ' GMT'; + + // Send HTTP header + sendHeader('HTTP/1.1 200'); + + // General headers for no caching + 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'); + sendHeader('Content-Type: ' . getContentType() . '; charset=UTF-8'); + sendHeader('Content-Language: ' . getLanguage()); +} + +// Compiles the final output +function compileFinalOutput () { + // Init counter + $cnt = '0'; + + // Compile all out + while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) { + // Init common variables + $content = array(); + $newContent = ''; + + // Compile it + $eval = "\$newContent = \"".compileCode(addslashes($GLOBALS['output']))."\";"; + eval($eval); + + // Was that eval okay? + if (empty($newContent)) { + // Something went wrong! + debug_report_bug('Evaluation error:
' . linenumberCode($eval) . '
'); + } // END - if + $GLOBALS['output'] = $newContent; + + // Count round + $cnt++; + } // END - while + + // Add final length + sendHeader('Content-Length: ' . strlen($GLOBALS['output'])); +} + // Output the raw HTML code function outputRawCode ($htmlCode) { // Output stripped HTML code to avoid broken JavaScript code, etc. - print(stripslashes(stripslashes($htmlCode))); + print($htmlCode); // Flush the output if only getPhpCaching() is not 'on' if (getPhpCaching() != 'on') { @@ -205,7 +224,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 +260,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,20 +341,23 @@ 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($ret)) . '";'; + $eval = '$ret = "' . compileCode(addslashes($ret)) . '";'; + } elseif (substr($template, 0, 3) == 'js_') { + // JavaScripts don't like entities and timings + $eval = '$ret = decodeEntities("' . compileRawCode(addslashes($GLOBALS['tpl_content'])) . '");'; } else { // Prepare eval() command - $eval = '$ret = "' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '";'; + $eval = '$ret = "' . compileCode(addslashes($GLOBALS['tpl_content'])) . '";'; } } else { // Add surrounding HTML comments to help finding bugs faster $ret = "\n" . $GLOBALS['tpl_content'] . "\n"; - $eval = '$ret = "' . smartAddSlashes($ret) . '";'; + $eval = '$ret = "' . addslashes($ret) . '";'; } // END - if // Cache the eval() command here @@ -343,20 +365,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 +391,7 @@ function loadTemplate ($template, $return=false, $content=array()) { // Return the HTML code return $ret; } else { - // Output direct + // Output directly outputHtml($ret); } } elseif (isDebugModeEnabled()) { @@ -379,7 +401,7 @@ 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; // Make sure all template names are lowercase! @@ -409,7 +431,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 { @@ -492,7 +514,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(addslashes($GLOBALS['tpl_content']))."\");"; eval($GLOBALS['tpl_content']); } elseif (!empty($template)) { // Template file not found! @@ -523,7 +545,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { unset($DATA); // Compile the code and eval it - $eval = '$newContent = "' . compileRawCode(smartAddSlashes($newContent)) . '";'; + $eval = '$newContent = "' . compileRawCode(addslashes($newContent)) . '";'; eval($eval); // Return content @@ -535,7 +557,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(\"".compileRawCode(smartAddSlashes($subject))."\");"); + eval("\$subject = decodeEntities(\"".compileRawCode(addslashes($subject))."\");"); // Set from header if ((!eregi('@', $toEmail)) && ($toEmail > 0)) { @@ -581,10 +603,10 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' } // Compile "TO" - eval("\$toEmail = \"".compileRawCode(smartAddSlashes($toEmail))."\";"); + eval("\$toEmail = \"".compileRawCode(addslashes($toEmail))."\";"); // Compile "MSG" - eval("\$message = \"".compileRawCode(smartAddSlashes($message))."\";"); + eval("\$message = \"".compileRawCode(addslashes($message))."\";"); // Fix HTML parameter (default is no!) if (empty($isHtml)) $isHtml = 'N'; @@ -665,16 +687,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 @@ -690,12 +712,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 @@ -703,10 +725,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; @@ -715,10 +737,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; @@ -765,7 +787,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); @@ -776,12 +798,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 @@ -880,7 +902,7 @@ function countSelection ($array) { } // END - if // Init count - $ret = 0; + $ret = '0'; // Count all entries foreach ($array as $key => $selected) { @@ -956,8 +978,11 @@ function redirectToUrl ($URL) { // Output new location link as anchor outputHtml('' . $URL . ''); } elseif (!headers_sent()) { - // Load URL when headers are not sent //* DEBUG: */ debug_report_bug("URL={$URL}"); + // Clear own output buffer + $GLOBALS['output'] = ''; + + // Load URL when headers are not sent sendHeader('Location: '.str_replace('&', '&', $URL)); } else { // Output error message @@ -1112,7 +1137,7 @@ function compileRawCode ($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) { @@ -1148,19 +1173,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) { @@ -1232,8 +1257,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 .= "