X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=64fb5c3a211c466035b40e7898cdcc9ca7b6b207;hb=4de4188e5f00d6f7eb3762b69983a80e05b06851;hp=e1ed3428f23adb5f4c8e6cbdae0594201592c46d;hpb=3c23bfaee208fa12adf5cdd9d8e9882612199d03;p=mailer.git diff --git a/inc/functions.php b/inc/functions.php index e1ed3428f2..64fb5c3a21 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -124,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)) { @@ -208,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])) { @@ -244,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()); @@ -325,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'])) . '";'; @@ -382,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! @@ -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 { @@ -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 @@ -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) { @@ -1115,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) { @@ -1151,7 +1154,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums = } // -function addSelectionBox ($type, $default, $prefix = '', $id = 0, $class = 'register_select') { +function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'register_select') { $OUT = ''; if ($type == 'yn') { @@ -1235,8 +1238,8 @@ function addSelectionBox ($type, $default, $prefix = '', $id = 0, $class = 'regi 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 .= "\n"; @@ -1244,8 +1247,8 @@ function addSelectionBox ($type, $default, $prefix = '', $id = 0, $class = 'regi break; case 'hour': - for ($idx = 0; $idx < 24; $idx++) { - if (strlen($idx) == 1) $idx = 0 . $idx; + for ($idx = '0'; $idx < 24; $idx++) { + if (strlen($idx) == 1) $idx = '0' . $idx; $OUT .= "\n"; @@ -1310,8 +1313,8 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') { // At least 10 numbers shall be secure enought! $len = getConfig('code_length'); - if ($len == 0) $len = $length; - if ($len == 0) $len = 10; + if ($len == '0') $len = $length; + if ($len == '0') $len = 10; // Cut off requested counts of number $return = substr(str_replace('.', '', $rcode), 0, $len); @@ -1329,7 +1332,6 @@ function bigintval ($num, $castValue = true) { if ($castValue === true) $ret = (double)$ret; // Has the whole value changed? - // @TODO Remove this if() block if all is working fine if ('' . $ret . '' != '' . $num . '') { // Log the values debug_report_bug('Problem with number found. ret=' . $ret . ', num='. $num); @@ -1342,7 +1344,7 @@ function bigintval ($num, $castValue = true) { // Insert the code in $img_code into jpeg or PNG image function generateImageOrCode ($img_code, $headerSent = true) { // Is the code size oversized or shouldn't we display it? - if ((strlen($img_code) > 6) || (empty($img_code)) || (getConfig('code_length') == 0)) { + if ((strlen($img_code) > 6) || (empty($img_code)) || (getConfig('code_length') == '0')) { // Stop execution of function here because of over-sized code length debug_report_bug('img_code ' . $img_code .' has invalid length. img_code()=' . strlen($img_code) . ' code_length=' . getConfig('code_length')); } elseif ($headerSent === false) { @@ -1403,7 +1405,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = //* DEBUG: */ print("*" . $stamp.'/' . $timestamp."*"); // Do we have a leap year? - $SWITCH = 0; + $SWITCH = '0'; $TEST = date('Y', time()) / 4; $M1 = date('m', time()); $M2 = date('m', (time() + $timestamp)); @@ -1434,7 +1436,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = //* DEBUG: */ print("s={$s}"); // Is seconds zero and time is < 60 seconds? - if (($s == 0) && ($timestamp < 60)) { + if (($s == '0') && ($timestamp < 60)) { // Fix seconds $s = round($timestamp); } // END - if @@ -1493,7 +1495,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = if (ereg('Y', $display) || (empty($display))) { // Generate year selection $OUT .= " \n"; - for ($idx = 0; $idx <= 10; $idx++) { + for ($idx = '0'; $idx <= 10; $idx++) { $OUT .= " \n"; @@ -1506,7 +1508,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = if (ereg('M', $display) || (empty($display))) { // Generate month selection $OUT .= " \n"; - for ($idx = 0; $idx <= 11; $idx++) + for ($idx = '0'; $idx <= 11; $idx++) { $OUT .= " \n"; - for ($idx = 0; $idx <= 4; $idx++) { + for ($idx = '0'; $idx <= 4; $idx++) { $OUT .= " \n"; @@ -1533,7 +1535,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = if (ereg("D", $display) || (empty($display))) { // Generate day selection $OUT .= " \n"; - for ($idx = 0; $idx <= 31; $idx++) { + for ($idx = '0'; $idx <= 31; $idx++) { $OUT .= " \n"; @@ -1546,7 +1548,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = if (ereg("h", $display) || (empty($display))) { // Generate hour selection $OUT .= " \n"; - for ($idx = 0; $idx <= 23; $idx++) { + for ($idx = '0'; $idx <= 23; $idx++) { $OUT .= " \n"; @@ -1559,7 +1561,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = if (ereg('m', $display) || (empty($display))) { // Generate minute selection $OUT .= " \n"; - for ($idx = 0; $idx <= 59; $idx++) { + for ($idx = '0'; $idx <= 59; $idx++) { $OUT .= " \n"; @@ -1572,7 +1574,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = if (ereg("s", $display) || (empty($display))) { // Generate second selection $OUT .= " \n"; - for ($idx = 0; $idx <= 59; $idx++) { + for ($idx = '0'; $idx <= 59; $idx++) { $OUT .= " \n"; @@ -1592,10 +1594,10 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = // function createTimestampFromSelections ($prefix, $postData) { // Initial return value - $ret = 0; + $ret = '0'; // Do we have a leap year? - $SWITCH = 0; + $SWITCH = '0'; $TEST = date('Y', time()) / 4; $M1 = date('m', time()); // If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day) @@ -1810,7 +1812,7 @@ function sendPostRequest ($script, $postData) { // Sends a raw request to another host function sendRawRequest ($host, $request) { // Init errno and errdesc with 'all fine' values - $errno = 0; $errdesc = ''; + $errno = '0'; $errdesc = ''; // Initialize array $response = array('', '', ''); @@ -2095,7 +2097,7 @@ function scrambleString($str) { // Scramble string here //* DEBUG: */ outputHtml("***Original=" . $str."***"); - for ($idx = 0; $idx < strlen($str); $idx++) { + for ($idx = '0'; $idx < strlen($str); $idx++) { // Get char on scrambled position $char = substr($str, $scrambleNums[$idx], 1); @@ -2122,7 +2124,7 @@ function descrambleString($str) { // Begin descrambling $orig = str_repeat(' ', 40); //* DEBUG: */ outputHtml("+++Scrambled=" . $str."+++"); - for ($idx = 0; $idx < 40; $idx++) { + for ($idx = '0'; $idx < 40; $idx++) { $char = substr($str, $idx, 1); $orig = substr_replace($orig, $char, $scrambleNums[$idx], 1); } // END - for @@ -2138,7 +2140,7 @@ function genScrambleString ($len) { $scrambleNumbers = array(); // First we need to setup randomized numbers from 0 to 31 - for ($idx = 0; $idx < $len; $idx++) { + for ($idx = '0'; $idx < $len; $idx++) { // Generate number $rand = mt_rand(0, ($len -1)); @@ -2165,7 +2167,7 @@ function generatePassString ($passHash) { if ((isExtensionInstalled('sql_patches')) && (isExtensionInstalledAndNewer('other', '0.2.5')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { // Only calculate when the secret key is generated $newHash = ''; $start = 9; - for ($idx = 0; $idx < 10; $idx++) { + for ($idx = '0'; $idx < 10; $idx++) { $part1 = hexdec(substr($passHash, $start, 4)); $part2 = hexdec(substr(getConfig('secret_key'), $start, 4)); $mod = dechex($idx); @@ -2252,7 +2254,7 @@ function displayParsingTime() { $start = explode(' ', $GLOBALS['startTime']); $end = explode(' ', $endTime); $runTime = $end[0] - $start[0]; - if ($runTime < 0) $runTime = 0; + if ($runTime < 0) $runTime = '0'; // Prepare output $content = array( @@ -2316,7 +2318,7 @@ function getCurrentTheme () { $ret = getSession('mxchange_theme'); // Is it valid? - if (getThemeId($ret) == 0) { + if (getThemeId($ret) == '0') { // Fix it to default $ret = 'default'; } // END - if @@ -2359,7 +2361,7 @@ function getThemeId ($name) { } // END - if // Default id - $id = 0; + $id = '0'; // Is the cache entry there? if (isset($GLOBALS['cache_array']['themes']['id'][$name])) { @@ -2399,12 +2401,12 @@ function generateErrorCodeFromUserStatus ($status='') { $errorCode = getCode('UNKNOWN_STATUS'); // Generate constant name - $constantName = sprintf("ID_%s", $status); + $codeName = sprintf("ID_%s", $status); // Is the constant there? - if (isCodeSet($constantName)) { + if (isCodeSet($codeName)) { // Then get it! - $errorCode = getCode($constantName); + $errorCode = getCode($codeName); } else { // Unknown status logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown error status %s detected.", $status)); @@ -2536,7 +2538,7 @@ function getArrayFromActualVersion () { $akt_vers = array(); // Init value for counting the founded keywords - $res = 0; + $res = '0'; // Searches all Files and there date of the last modifikation and puts the newest File in $last_changed. searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time); @@ -2674,6 +2676,7 @@ function getMessageFromErrorCode ($code) { case getCode('WRONG_ID') : $message = getMessage('LOGIN_WRONG_ID'); break; case getCode('ID_LOCKED') : $message = getMessage('LOGIN_ID_LOCKED'); break; case getCode('ID_UNCONFIRMED') : $message = getMessage('LOGIN_ID_UNCONFIRMED'); break; + case getCode('ID_GUEST') : $message = getMessage('LOGIN_ID_GUEST'); break; case getCode('NO_COOKIES') : $message = getMessage('LOGIN_NO_COOKIES'); break; case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_NO_COOKIES'); break; case getCode('BEG_SAME_AS_OWN') : $message = getMessage('BEG_SAME_UID_AS_OWN'); break; @@ -2866,7 +2869,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) { // Read from source file $line = fgets ($fp, 1024); - if (strpos($line, $search) > -1) { $next = 0; $found = true; } + if (strpos($line, $search) > -1) { $next = '0'; $found = true; } if ($next > -1) { if ($next === $seek) { @@ -2910,7 +2913,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) { return false; } // Send notification to admin -function sendAdminNotification ($subject, $templateName, $content=array(), $userid = 0) { +function sendAdminNotification ($subject, $templateName, $content=array(), $userid = '0') { if (isExtensionInstalledAndNewer('admins', '0.4.1')) { // Send new way sendAdminsEmails($subject, $templateName, $content, $userid); @@ -3175,14 +3178,17 @@ function determineReferalId () { $GLOBALS['refid'] = getConfig('def_refid'); } else { // No default id when sql_patches is not installed or none set - $GLOBALS['refid'] = 0; + $GLOBALS['refid'] = '0'; } // Set cookie when default refid > 0 - if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == 0) && (isConfigEntrySet('def_refid')) && (getConfig('def_refid') > 0))) { + if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == '0') && (isConfigEntrySet('def_refid')) && (getConfig('def_refid') > 0))) { // Default is not found $found = false; + // Set current userid here if no member + if (!isMember()) setCurrentUserId($GLOBALS['refid']); + // Do we have nickname or userid set? if (isNicknameUsed($GLOBALS['refid'])) { // Nickname in URL, so load the id @@ -3234,13 +3240,13 @@ function shutdown () { // Init member id function initMemberId () { - $GLOBALS['member_id'] = 0; + $GLOBALS['member_id'] = '0'; } // Setter for member id function setMemberId ($memberid) { // We should not set member id to zero - if ($memberid == 0) debug_report_bug('Userid should not be set zero.'); + if ($memberid == '0') debug_report_bug('Userid should not be set zero.'); // Set it secured $GLOBALS['member_id'] = bigintval($memberid); @@ -3249,7 +3255,7 @@ function setMemberId ($memberid) { // Getter for member id or returns zero function getMemberId () { // Default member id - $memberid = 0; + $memberid = '0'; // Is the member id set? if (isMemberIdSet()) {