X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fsponsor_functions.php;h=6853d09d82ba00b2ba4aa319194856f74865028d;hb=465859de0e017d99130df209391fe0742fc24271;hp=c225215424b2f79ef863463b1064ab67a70d5311;hpb=99be3ce68f08d6e36202789168188a9078b04aea;p=mailer.git diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index c225215424..6853d09d82 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, 2010 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 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; @@ -79,7 +79,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), if (SQL_NUMROWS($result) == 1) { // Yes, he is! if ((getWhat() == 'add_sponsor') || ($update)) { - // Already found! + // Already found $ALREADY = true; } else { // Update his data @@ -106,7 +106,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), default: // Test if there is are time selections - convertSelectionsToTimestamp($postData, $DATA, $k, $skip); + convertSelectionsToEpocheTime($postData, $DATA, $k, $skip); break; } // END - switch @@ -135,7 +135,7 @@ 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')); + $DATA['values'][] = bigintval(getRequestElement('id')); // Generate message $message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_UPDATED--}', 'updated', $messageArray); @@ -157,7 +157,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), // Generate hash code $DATA['keys'][] = 'hash'; // @TODO Rewrite this to API function - $DATA['values'][] = md5(session_id().':'.$postData['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time()); + $DATA['values'][] = md5(session_id() . getEncryptSeparator() . $postData['email'] . getEncryptSeparator() . detectRemoteAddr() . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . time()); $DATA['keys'][] = 'remote_addr'; $DATA['values'][] = detectRemoteAddr(); } @@ -170,7 +170,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 +198,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'; } @@ -207,9 +207,9 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), $result = SQL_QUERY_ESC($sql, $DATA['values'], __FUNCTION__, __LINE__); } // END - if } else { - // Error found! + // Error detected $message = getMessageFromIndexedArray('{--SPONSOR_DATA_NOT_SAVED--}', 'failed', $messageArray); - loadTemplate('admin_settings_saved', false, $message); + displayMessage($message); } // Always return the status @@ -217,7 +217,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); @@ -226,10 +226,10 @@ function sponsorTranslateUserStatus ($status) { // Then use it $ret = getMessage($constantName); } else { - // Not found! + // Not found //* DEBUG: */ debug_report_bug(__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 @@ -269,7 +269,7 @@ 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 +282,7 @@ 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 +311,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 +319,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 @@ -340,8 +340,8 @@ function addSponsorContent ($what) { // Every sponsor action will output nothing directly. It will be written into $GLOBALS['sponsor_output']! loadIncludeOnce($INC); } else { - // File not found! - $GLOBALS['sponsor_output'] .= loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_CONTENT_404', $what)); + // File not found + $GLOBALS['sponsor_output'] .= displayMessage('{%message,SPONSOR_CONTENT_404=' . $what . '%}', true); } // Return content @@ -424,11 +424,11 @@ 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()); + $HASH = md5(session_id() . getEncryptSeparator() . $postData['email'] . getEncryptSeparator() . detectRemoteAddr() . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . time()); $DATA[] = $HASH; } // END - if } // END - if @@ -436,7 +436,7 @@ function saveSponsorData ($postData, $content) { $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"; @@ -466,7 +466,7 @@ function saveSponsorData ($postData, $content) { 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 = ''; break; @@ -535,7 +535,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 +566,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 +575,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 +592,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 +603,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 @@ -696,7 +697,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'])) {