X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=439827a0978e7b24ae29d76998b1204053d81c07;hp=6848f87e4f82bebf81ecbb52f3f89f2376592436;hb=6d6e268d55fb9d9374475e12e2f66dca732ce1eb;hpb=916bba4f00ee924f0d88b8fc273dee5bfb798aed diff --git a/inc/functions.php b/inc/functions.php index 6848f87e4f..439827a097 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($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,7 +385,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 +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 { @@ -665,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 @@ -690,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 @@ -765,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); @@ -776,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 @@ -880,7 +886,7 @@ function countSelection ($array) { } // END - if // Init count - $ret = 0; + $ret = '0'; // Count all entries foreach ($array as $key => $selected) { @@ -1112,7 +1118,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 +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) { @@ -1232,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 .= "