X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsponsor_functions.php;h=3e5909476677b783bf26173550e8b80e698556aa;hp=15ebf6c442cbedbf9761c93fd293dd5387da2b4d;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=c4823d28fd0bd22250b16d73f2034f36fc54abda diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 15ebf6c442..3e59094766 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -16,8 +16,8 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2012 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } // END - if // -function handleSponsorRequest ($postData, $update=false, $messageArray=array(), $RET_STATUS=false) { +function handleSponsorRequest ($postData, $update=false, $messageArray = array(), $RET_STATUS=false) { // Init a lot variables $SAVE = true; $UPDATE = false; @@ -71,9 +71,9 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), // Email address is not valid $SAVE = false; } else { - // Do we want to add a new sponsor or update his data? + // Add a new sponsor or update his data? $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE email='%s' LIMIT 1", - array($postData['email']), __FUNCTION__, __LINE__); + array($postData['email']), __FUNCTION__, __LINE__); // Is a sponsor alread in the db? if (SQL_NUMROWS($result) == 1) { @@ -101,18 +101,22 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), break; case 'url': - if (!isUrlValid($v)) $SAVE = false; + if (!isUrlValid($v)) { + // Don't save the URL + $SAVE = false; + } // END - if break; default: // Test if there is are time selections - convertSelectionsToTimestamp($postData, $DATA, $k, $skip); + convertSelectionsToEpocheTime($postData, $DATA, $k, $skip); break; } // END - switch if ((!empty($k)) && ($skip == false)) { // Add data - $DATA['keys'][] = $k; $DATA['values'][] = $v; + array_push($DATA['keys'] , $k); + array_push($DATA['values'], $v); } // END - if } // END - if } // END - foreach @@ -135,31 +139,31 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), // Remove last ", " from SQL string $sql = substr($sql, 0, -2)." WHERE `id`=%s LIMIT 1"; - $DATA['values'][] = bigintval(getRequestParameter('id')); + array_push($DATA['values'], bigintval(getRequestElement('id'))); // Generate message $message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_UPDATED--}', 'updated', $messageArray); $ret = 'updated'; } elseif (($ALREADY === false) || (($postData['force'] == 1) && (isAdmin()))) { // Add new sponsor, first add more data - $DATA['keys'][] = 'status'; + array_push($DATA['keys'], 'status'); if (($update === true) && (isAdmin()) && (getWhat() == 'add_sponsor')) { // Only allowed for admin - $DATA['values'][] = 'PENDING'; + array_push($DATA['values'], 'PENDING'); // Add remote IP address as well - $DATA['keys'][] = 'remote_addr'; - $DATA['values'][] = detectRemoteAddr(); + array_push($DATA['keys'], 'remote_addr'); + array_push($DATA['values'], detectRemoteAddr()); } else { // Guest area - $DATA['values'][] = 'UNCONFIRMED'; + array_push($DATA['values'], 'UNCONFIRMED'); // Generate hash code - $DATA['keys'][] = 'hash'; + array_push($DATA['keys'], 'hash'); // @TODO Rewrite this to API function - $DATA['values'][] = md5(session_id().':'.$postData['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time()); - $DATA['keys'][] = 'remote_addr'; - $DATA['values'][] = detectRemoteAddr(); + array_push($DATA['values'], md5(session_id() . getEncryptSeparator() . $postData['email'] . getEncryptSeparator() . detectRemoteAddr() . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . time())); + array_push($DATA['keys'], 'remote_addr'); + array_push($DATA['values'], detectRemoteAddr()); } // Search the entry @@ -170,7 +174,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), unset($DATA['values'][$key]); // Implode all data into strings - $keyArray = implode('`, `' , $DATA['keys']); + $keyArray = implode('`,`' , $DATA['keys']); $valueArray = str_repeat("%s', '", count($DATA['values']) - 1); // Generate string @@ -198,7 +202,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), return; } else { // Already added! - $message = getMaskedMessage('SPONSOR_ALREADY_FOUND', $postData['email']); + $message = '{%message,SPONSOR_ALREADY_FOUND=' . $postData['email'] . '%}'; $ret = 'already'; } @@ -209,7 +213,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), } else { // Error detected $message = getMessageFromIndexedArray('{--SPONSOR_DATA_NOT_SAVED--}', 'failed', $messageArray); - loadTemplate('admin_settings_saved', false, $message); + displayMessage($message); } // Always return the status @@ -217,7 +221,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), } // Translate the account status -function sponsorTranslateUserStatus ($status) { +function translateSponsorStatus ($status) { // Construct constant name $constantName = sprintf("ACCOUNT_STATUS_%s", $status); @@ -227,9 +231,9 @@ function sponsorTranslateUserStatus ($status) { $ret = getMessage($constantName); } else { // Not found - //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); + //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); - $ret = getMaskedMessage('ACCOUNT_STATUS_UNKNOWN', $status); + $ret = '{%message,ACCOUNT_STATUS_UNKNOWN=' . $status . '%}'; } // Return status @@ -238,7 +242,7 @@ function sponsorTranslateUserStatus ($status) { // Search for an email address in the database function isSponsorRegisteredWithEmail ($email) { - // Do we already have the provided email address in our DB? + // Is there already the provided email address in database? $ret = (countSumTotalData($email, 'sponsor_data', 'id', 'email', true) == 1); // Return result @@ -269,7 +273,8 @@ function addSponsorMenu ($current) { // Load main menu entries $result_main = SQL_QUERY("SELECT - `action` AS `main_action`, `title` AS `main_title` + `action` AS `main_action`, + `title` AS `main_title` FROM `{?_MYSQL_PREFIX?}_sponsor_menu` WHERE @@ -282,7 +287,8 @@ ORDER BY while ($content = SQL_FETCHARRAY($result_main)) { // Load sub menus $result_sub = SQL_QUERY_ESC("SELECT - `what` AS `sub_what`, `title` AS `sub_title` + `what` AS `sub_what`, + `title` AS `sub_title` FROM `{?_MYSQL_PREFIX?}_sponsor_menu` WHERE @@ -311,7 +317,7 @@ ORDER BY $OUT .= loadTemplate('sponsor_action', true, $content); } else { // No sub menus active - $OUT .= loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_SUB_MENUS_ACTIVE--}'); + $OUT .= displayMessage('{--SPONSOR_NO_SUB_MENUS_ACTIVE--}', true); } // Free memory @@ -319,7 +325,7 @@ ORDER BY } // END - while } else { // No main menus active - $OUT .= loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MAIN_MENUS_ACTIVE--}'); + $OUT .= displayMessage('{--SPONSOR_NO_MAIN_MENUS_ACTIVE--}', true); } // Free memory @@ -341,7 +347,7 @@ function addSponsorContent ($what) { loadIncludeOnce($INC); } else { // File not found - $GLOBALS['sponsor_output'] .= loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_CONTENT_404', $what)); + $GLOBALS['sponsor_output'] .= displayMessage('{%message,SPONSOR_CONTENT_404=' . $what . '%}', true); } // Return content @@ -414,7 +420,7 @@ function saveSponsorData ($postData, $content) { $sql .= " `" . secureString($key) . "`='%s',"; // We will secure this later inside the SQL_QUERY_ESC() function - $DATA[] = secureString($value); + array_push($DATA, secureString($value)); } // END - foreach // Check if email has changed @@ -424,24 +430,23 @@ function saveSponsorData ($postData, $content) { $EMAIL = true; // Okay, has changed then add status with UNCONFIRMED and new hash code - $sql .= " `status`='EMAIL', `hash`='%s',"; + $sql .= " `status`='EMAIL',`hash`='%s',"; // Generate hash code // @TODO Rewrite this to API function - $HASH = md5(session_id() . ':' . $postData['email'] . ':' . detectRemoteAddr() . ':' . detectUserAgent() . ':' . time()); - $DATA[] = $HASH; + $HASH = md5(session_id() . getEncryptSeparator() . $postData['email'] . getEncryptSeparator() . detectRemoteAddr() . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . time()); + array_push($DATA, $HASH); } // END - if } // END - if // Remove last commata $sql = substr($sql, 0, -1); // Add last_change - $sql .= ', `last_change`=NOW()'; + $sql .= ',`last_change`=NOW()'; // Add SQL tail data $sql .= " WHERE `id`=%s AND `password`='%s' LIMIT 1"; - $DATA[] = bigintval(getSession('sponsor_id')); - $DATA[] = getSession('sponsor_pass'); + array_push($DATA, bigintval(getSession('sponsor_id')), getSession('sponsor_pass')); // Saving data was completed... ufff... switch (getWhat()) { @@ -449,11 +454,11 @@ function saveSponsorData ($postData, $content) { if ($EMAIL === true) { $message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}'; $templ = 'admin_sponsor_change_email'; - $subj = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}'; + $subject = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}'; } else { $message = '{--SPONSOR_ACCOUNT_DATA_SAVED--}'; $templ = 'admin_sponsor_change_data'; - $subj = '{--ADMIN_SPONSOR_ACC_DATA_SUBJECT--}'; + $subject = '{--ADMIN_SPONSOR_ACC_DATA_SUBJECT--}'; } break; @@ -461,21 +466,21 @@ function saveSponsorData ($postData, $content) { // Set message template and subject for admin $message = '{--SPONSOR_SETTINGS_SAVED--}'; $templ = 'admin_sponsor_settings'; - $subj = '{--ADMIN_SPONSOR_SETTINGS_SUBJECT--}'; + $subject = '{--ADMIN_SPONSOR_SETTINGS_SUBJECT--}'; break; default: // Unknown sponsor what value! logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown sponsor module (what) %s detected.", getWhat())); - $message = getMaskedMessage('SPONSOR_UNKNOWN_WHAT', getWhat()); + $message = '{--SPONSOR_UNKNOWN_WHAT--}'; $templ = ''; - $subj = ''; + $subject = ''; break; } // END - switch // Has an entry updated? if (!SQL_HASZEROAFFECTED()) { // Template and subject are set? - if (!empty($templ) && !empty($subj)) { + if (!empty($templ) && !empty($subject)) { // Run SQL command and check for success $result = SQL_QUERY_ESC($sql, $DATA, __FUNCTION__, __LINE__); @@ -483,7 +488,7 @@ function saveSponsorData ($postData, $content) { $content['new_data'] = $postData; // Send email to admins - sendAdminNotification($subj, $templ, $content); + sendAdminNotification($subject, $templ, $content); // Shall we send mail to the sponsor's new email address? if ($content['receive_warnings'] == 'Y') { @@ -535,7 +540,8 @@ function generateSponsorEmailLink ($email, $mod = 'admin') { FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE - `email`='%s'" . $locked." + '%s' REGEXP `email` + " . $locked . " LIMIT 1", array($email), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { @@ -565,8 +571,8 @@ function doProcessSponsorFormRequest ($messageArray = array()) { switch ($status) { case 'added': // Sponsor successfully added with account status = UNCONFIRMED! // Check for his id number - $result = SQL_QUERY_ESC("SELECT `id`, `hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `email`='%s' LIMIT 1", - array(postRequestParameter('email')), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `id`, `hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE '%s' REGEXP `email` LIMIT 1", + array(postRequestElement('email')), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { // id found so let's load it for the confirmation email list($id, $hash) = SQL_FETCHROW($result); @@ -574,15 +580,15 @@ function doProcessSponsorFormRequest ($messageArray = array()) { // Prepare data for the email template $content['id'] = $id; $content['hash'] = $hash; - $content['email'] = secureString(postRequestParameter('email')); - $content['surname'] = secureString(postRequestParameter('surname')); - $content['family'] = secureString(postRequestParameter('family')); + $content['email'] = postRequestElement('email'); + $content['surname'] = postRequestElement('surname'); + $content['family'] = postRequestElement('family'); $content['timestamp'] = generateDateTime(time(), 0); - $content['password'] = secureString(postRequestParameter('pass1')); + $content['password'] = postRequestElement('pass1'); // Generate email and send it to the new sponsor $message = loadEmailTemplate('sponsor_confirm', $content, $id); - sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJECT--}', $message); + sendEmail(postRequestElement('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJECT--}', $message); // Send mail to admin sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_reg', $content); @@ -591,7 +597,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) { $message = $messageArray['added']; } else { // Sponsor account not found??? - $message = getMaskedMessage('SPONSOR_EMAIL_404', postRequestParameter('email')); + $message = '{%message,SPONSOR_EMAIL_404=' . postRequestElement('email') . '%}'; } // Free memory @@ -602,10 +608,10 @@ function doProcessSponsorFormRequest ($messageArray = array()) { logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); if (!isAdmin()) { // Message for testing admin - $message = getMaskedMessage('ADMIN_SPONSOR_UNKNOWN_STATUS', $status); + $message = '{%message,ADMIN_SPONSOR_UNKNOWN_STATUS=' . $status . '%}'; } else { // Message for the guest - $message = getMaskedMessage('SPONSOR_UNKNOWN_STATUS', $status); + $message = '{%message,SPONSOR_UNKNOWN_STATUS=' . $status . '%}'; } break; } // END - switch @@ -621,7 +627,7 @@ function doExpressionSponsor ($data) { // Sponsor-related data, so is there a sponsor_id? if (!empty($data['matches'][4][$data['key']])) { - // Do we have a sponsor_id or $sponsor_id? + // Is there a sponsor_id or $sponsor_id? if ($data['matches'][4][$data['key']] == '$userid') { // Use dynamic call $functionName = "getFetchedSponsorData('id', \$userid, '" . $data['callback'] . "')"; @@ -634,7 +640,7 @@ function doExpressionSponsor ($data) { $functionName = "getSponsorData('" . $data['callback'] . "')"; } - // Do we have another function to run (e.g. translations) + // Is there another function to run (e.g. translations) if (!empty($data['extra_func'])) { // Surround the original function call with it $functionName = $data['extra_func'] . '(' . $functionName . ')'; @@ -663,7 +669,7 @@ function fetchSponsorData ($sponsor_id, $column = 'id') { // Don't look for invalid sponsor_ids... if (!isValidUserId($sponsor_id)) { // Invalid, so abort here - debug_report_bug(__FUNCTION__, __LINE__, 'Sponsor id ' . $sponsor_id . ' is invalid.'); + reportBug(__FUNCTION__, __LINE__, 'Sponsor id ' . $sponsor_id . ' is invalid.'); } elseif (isSponsorDataValid()) { // Use cache, so it is fine return true; @@ -683,7 +689,7 @@ function fetchSponsorData ($sponsor_id, $column = 'id') { $result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `%s`='%s' LIMIT 1", array($column, $sponsor_id), __FUNCTION__, __LINE__); - // Do we have a record? + // Is there a record? if (SQL_NUMROWS($result) == 1) { // Load data from cookies $data = SQL_FETCHARRAY($result); @@ -696,7 +702,7 @@ function fetchSponsorData ($sponsor_id, $column = 'id') { if (isset($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'])) { // Backup the raw one and zero it $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'] = $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure']; - $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = null; + $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = NULL; // Is it not zero? if (!is_null($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'])) { @@ -735,7 +741,7 @@ function getFetchedSponsorData ($keyColumn, $sponsor_id, $valueColumn) { // Zero ids are not valid if ($sponsor_id == 0) { // Abort here - debug_report_bug(__FUNCTION__, __LINE__, 'Zero sponsor_id provided'); + reportBug(__FUNCTION__, __LINE__, 'Zero sponsor_id provided'); } // END - if // Is it cached? @@ -788,7 +794,7 @@ function getCurrentSponsorId () { // Sponsorid must be set before it can be used if (!isCurrentSponsorIdSet()) { // Not set - debug_report_bug(__FUNCTION__, __LINE__, 'Sponsor id is not set.'); + reportBug(__FUNCTION__, __LINE__, 'Sponsor id is not set.'); } // END - if // Return the sponsor_id @@ -802,7 +808,7 @@ function isCurrentSponsorIdSet () { // Is given sponsor_id valid? function isValidSponsorId ($sponsor_id) { - // Do we have cache? + // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$sponsor_id])) { // Check it out $GLOBALS[__FUNCTION__][$sponsor_id] = ((!is_null($sponsor_id)) && (!empty($sponsor_id)) && ($sponsor_id > 0)); @@ -816,7 +822,7 @@ function isValidSponsorId ($sponsor_id) { function getSponsorData ($column) { // Sponsor id should not be zero if (!isValidUserId(getCurrentSponsorId())) { - debug_report_bug(__FUNCTION__, __LINE__, 'Sponsor id is zero.'); + reportBug(__FUNCTION__, __LINE__, 'Sponsor id is zero.'); } // END - if // Return the value @@ -839,7 +845,7 @@ function destroySponsorSession () { (setSession('sponsor_id', '')) && (setSession('sponsor_pass', '')) && ( - ((isExtensionActive('theme')) && (setTheme(''))) || + ((isExtensionActive('theme')) && (setMailerTheme(''))) || (!isExtensionActive('theme')) ) ); @@ -847,7 +853,7 @@ function destroySponsorSession () { // Getter for sponsor_min_points function getSponsorMinPoints () { - // Do we have cache? + // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it $GLOBALS[__FUNCTION__] = getConfig('sponsor_min_points'); @@ -859,7 +865,7 @@ function getSponsorMinPoints () { // Getter for sponsor_ref_points function getSponsorRefPoints () { - // Do we have cache? + // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it $GLOBALS[__FUNCTION__] = getConfig('sponsor_ref_points');