X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=df47862705423e1d7f52da718881317d3ff6e095;hp=e9eb6681020ff46b822479f1b51822ea084c3321;hb=a806525af1afcb19808ad45337c76f8e9a8c9712;hpb=a4fc56f660a422a080ff241bd86b772a5b5d0c53 diff --git a/inc/functions.php b/inc/functions.php index e9eb668102..df47862705 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -207,7 +207,7 @@ function ADD_FATAL ($message, $extra="") { } // Log fatal messages away - DEBUG_LOG(__FUNCTION__."(".__LINE__."): message={$message}"); + DEBUG_LOG(__FUNCTION__, __LINE__, " message={$message}"); } // Load a template file and return it's content (only it's name; do not use ' or ") @@ -443,7 +443,7 @@ Message : ".$MSG." \n"; // Log the mail away - if (defined('DEBUG_MAIL')) DEBUG_LOG(__FUNCTION__.":to={$TO},subject={$SUBJECT},msg={$MSG}"); + if (defined('DEBUG_MAIL')) DEBUG_LOG(__FUNCTION__, __LINE__, "to={$TO},subject={$SUBJECT},msg={$MSG}"); } elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail"))) { // Send mail as HTML away SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM); @@ -569,13 +569,18 @@ function MAKE_DATETIME ($time, $mode="0") } // Translates the american decimal dot into a german comma -function TRANSLATE_COMMA ($dotted, $cut=true) { +function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) { global $_CONFIG; // Default is 3 you can change this in admin area "Misc -> Misc Options" if (empty($_CONFIG['max_comma'])) $_CONFIG['max_comma'] = "3"; + + // Use from config is default $maxComma = $_CONFIG['max_comma']; + // Use from parameter? + if ($max > 0) $maxComma = $max; + // Cut zeros off? if ($cut) { // Test for commata if in cut-mode @@ -593,7 +598,7 @@ function TRANSLATE_COMMA ($dotted, $cut=true) { } // END - if // Debug log - //DEBUG_LOG(__FUNCTION__.":dotted={$dotted},maxComma={$maxComma}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}"); // Translate it now switch (GET_LANGUAGE()) { @@ -744,8 +749,11 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") { // Is the admin logged in? if (IS_ADMIN()) { + // Get admin id + $aid = GET_ADMIN_ID(get_session('admin_login')); + // Load Admin data - $ADMIN = GET_ADMIN_EMAIL(get_session('admin_login')); + $ADMIN = GET_ADMIN_EMAIL($aid); } // END - if // Neutral email address is default @@ -1254,7 +1262,7 @@ function bigintval($num, $castValue = true) { // Has the whole value changed? if ("".$ret."" != "".$num."") { // Log the values - DEBUG_LOG(__FUNCTION__.": num={$num},ret={$ret}"); + DEBUG_LOG(__FUNCTION__, __LINE__, " num={$num},ret={$ret}"); } // END - if // Return result @@ -1994,7 +2002,7 @@ function generateHash ($plainText, $salt = "") { $keys = SITE_KEY.":".DATE_KEY.":".$_CONFIG['secret_key'].":".$_CONFIG['file_hash'].":".date("d-m-Y (l-F-T)", bigintval($_CONFIG['patch_ctime'])).":".$_CONFIG['master_salt']; // Additional data - $data = $plainText.":".uniqid(rand(), true).":".time(); + $data = $plainText.":".uniqid(mt_rand(), true).":".time(); // Calculate number for generating the code $a = time() + _ADD - 1; @@ -2354,12 +2362,12 @@ function merge_array ($array1, $array2) { die(""); } // Debug message logger -function DEBUG_LOG ($message, $force=false) { +function DEBUG_LOG ($file, $line, $message, $force=false) { // Is debug mode enabled? if ((isBooleanConstantAndTrue('DEBUG_MODE')) || ($force)) { // Log this message away $fp = fopen(PATH."inc/cache/debug.log", 'a') or mxchange_die("Cannot write logfile debug.log!"); - fwrite($fp, date("d.m.Y|H:i:s", time())."|".strip_tags($message)."\n"); + fwrite($fp, date("d.m.Y|H:i:s", time())."|".basename(__FILE__)."|".__LINE__."|".strip_tags($message)."\n"); fclose($fp); } // END - if } @@ -2590,7 +2598,7 @@ function REBUILD_CACHE ($cache, $inc="") { require($fqfn); } else { // Include not found! - DEBUG_LOG(__FUNCTION__.":Include {$inc} not found. cache={$cache}"); + DEBUG_LOG(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}"); } } // END - if } // END - if @@ -2605,7 +2613,7 @@ function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") { return false; } elseif (!is_object($cacheInstance)) { // No cache instance! - DEBUG_LOG(__FUNCTION__.": No cache instance found."); + DEBUG_LOG(__FUNCTION__, __LINE__, " No cache instance found."); return false; } elseif ((!isset($_CONFIG['cache_admin_menu'])) || ($_CONFIG['cache_admin_menu'] == "N")) { // Caching disabled (currently experiemental!) @@ -2720,8 +2728,45 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) { LOAD_TEMPLATE("admin_settings_saved", false, 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!"); + DEBUG_LOG(__FUNCTION__, __LINE__, " cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!"); + } +} +// Determines referal id and sets it +function DETERMINE_REFID () { + global $_CONFIG, $CLICK, $_SERVER; + + // Check if refid is set + if ((!empty($_GET['user'])) && ($CLICK == 1) && (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'])) { + // 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'])) { + // 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'])) { + // Set refid=ref (the referal link uses such variable) + $GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_GET['ref'])); + } elseif ((isSessionVariableSet('refid')) && (get_session('refid') != 0)) { + // Set session refid als global + $GLOBALS['refid'] = bigintval(get_session('refid')); + } elseif ((GET_EXT_VERSION("sql_patches") != "") && ($_CONFIG['def_refid'] > 0)) { + // Set default refid as refid in URL + $GLOBALS['refid'] = bigintval($_CONFIG['def_refid']); + } elseif ((GET_EXT_VERSION("user") >= "0.3.4") && ($_CONFIG['select_user_zero_refid']) == "Y") { + // Select a random user which has confirmed enougth mails + $GLOBALS['refid'] = SELECT_RANDOM_REFID(); + } 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") && (isset($_CONFIG['def_refid'])) && ($_CONFIG['def_refid'] > 0))) { + // Set cookie + set_session('refid', $GLOBALS['refid']); + } // END - if } //////////////////////////////////////////////////