X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsponsor_functions.php;h=ee1f9050b9f01966cb2a485522809b272feaf72b;hp=7c48106f356f15f0d0a088abc49c07cfefbfdf44;hb=63f159414369b5ea19a8ca75d8cd8033c45d8341;hpb=f99fabc783c022ddc5ca1f3e9c0d3ab89170dcf5 diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 7c48106f35..ee1f9050b9 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -16,7 +16,7 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * 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 * @@ -101,7 +101,10 @@ 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: @@ -112,7 +115,8 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array() 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(getRequestElement('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() . getEncryptSeparator() . $postData['email'] . getEncryptSeparator() . detectRemoteAddr() . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . 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 @@ -227,7 +231,7 @@ function translateSponsorStatus ($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 = '{%message,ACCOUNT_STATUS_UNKNOWN=' . $status . '%}'; } @@ -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 @@ -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() . getEncryptSeparator() . $postData['email'] . getEncryptSeparator() . detectRemoteAddr() . getEncryptSeparator() . detectUserAgent() . getEncryptSeparator() . time()); - $DATA[] = $HASH; + 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 = '{--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') { @@ -566,7 +571,7 @@ 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 '%s' REGEXP `email` LIMIT 1", + $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 @@ -664,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; @@ -736,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? @@ -789,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 @@ -817,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 @@ -840,7 +845,7 @@ function destroySponsorSession () { (setSession('sponsor_id', '')) && (setSession('sponsor_pass', '')) && ( - ((isExtensionActive('theme')) && (setTheme(''))) || + ((isExtensionActive('theme')) && (setMailerTheme(''))) || (!isExtensionActive('theme')) ) );