X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fsponsor_functions.php;h=81810de1d1a09172836f1310bc037f2566f85b2d;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hp=51d3510e97c238cb4cb390f9a323226289d4f159;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 51d3510e97..81810de1d1 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -1,7 +1,7 @@ $v) { // Do not add 'force' ! - if ($k != "force") { - $OUT .= "\n"; - } - } + if ($k != 'force') { + $OUT .= ''; + } // END - if + } // END - foreach + + // Remember data $content['hidden'] = $OUT; $content['email'] = $postData['email']; @@ -187,7 +190,7 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(), return; } else { // Already added! - $message = sprintf(getMessage('SPONSOR_ALREADY_FOUND'), $postData['email']); + $message = getMaskedMessage('SPONSOR_ALREADY_FOUND', $postData['email']); $ret = 'already'; } @@ -202,7 +205,7 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(), } // END - if } else { // Error found! - $message = getMessageFromIndexedArray(getMessage('SPONSOR_DATA_NOT_SAVED'), 'failed', $messageArray); + $message = getMessageFromIndexedArray('{--SPONSOR_DATA_NOT_SAVED--}', 'failed', $messageArray); loadTemplate('admin_settings_saved', false, $message); } @@ -222,7 +225,7 @@ function sponsorTranslateUserStatus ($status) { } else { // Not found! logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); - $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status); + $ret = getMaskedMessage('UNKNOWN_STATUS', $status); } return $ret; } @@ -273,18 +276,32 @@ function addSponsorMenu ($current) { if (isAdmin()) $WHERE = ''; // Load main menu entries - $result_main = SQL_QUERY("SELECT action AS main_action, title AS main_title FROM `{?_MYSQL_PREFIX?}_sponsor_menu` -WHERE (`what`='' OR `what` IS NULL) ".$WHERE." -ORDER BY `sort`", __FUNCTION__, __LINE__); - if (SQL_NUMROWS($result_main) > 0) { + $result_main = SQL_QUERY("SELECT + `action` AS `main_action`, `title` AS `main_title` +FROM + `{?_MYSQL_PREFIX?}_sponsor_menu` +WHERE + (`what`='' OR `what` IS NULL) + ".$WHERE." +ORDER BY + `sort` ASC", __FUNCTION__, __LINE__); + if (!SQL_HASZERONUMS($result_main)) { // Load every menu and it's sub menus while ($content = SQL_FETCHARRAY($result_main)) { // Load sub menus - $result_sub = SQL_QUERY_ESC("SELECT what AS sub_what, title AS sub_title FROM `{?_MYSQL_PREFIX?}_sponsor_menu` -WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$WHERE." -ORDER BY `sort`", + $result_sub = SQL_QUERY_ESC("SELECT + `what` AS `sub_what`, `title` AS `sub_title` +FROM + `{?_MYSQL_PREFIX?}_sponsor_menu` +WHERE + `action`='%s' AND + `what` != '' AND + `what` IS NOT NULL + ".$WHERE." +ORDER BY + `sort` ASC", array($content['main_action']), __FUNCTION__, __LINE__); - if (SQL_NUMROWS($result_sub) > 0) { + if (!SQL_HASZERONUMS($result_sub)) { // Load sub menus $SUB = ''; while ($content2 = SQL_FETCHARRAY($result_sub)) { @@ -292,7 +309,7 @@ ORDER BY `sort`", $content = merge_array($content, $content2); // Check if current selected menu is matching the loaded one - if ($current == $content['sub_what']) $content['sub_title'] = "".$content['sub_title'].""; + if ($current == $content['sub_what']) $content['sub_title'] = '' . $content['sub_title'] . ''; // Prepare data for the sub template $content = array( @@ -314,7 +331,7 @@ ORDER BY `sort`", $OUT .= loadTemplate('sponsor_action', true, $content); } else { // No sub menus active - $OUT .= loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_SUB_MENUS_ACTIVE')); + $OUT .= loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_SUB_MENUS_ACTIVE--}'); } // Free memory @@ -322,7 +339,7 @@ ORDER BY `sort`", } } else { // No main menus active - $OUT .= loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_MAIN_MENUS_ACTIVE')); + $OUT .= loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MAIN_MENUS_ACTIVE--}'); } // Free memory @@ -341,7 +358,7 @@ function addSponsorContent ($what) { loadIncludeOnce($INC); } else { // File not found! - $OUT .= loadTemplate('admin_settings_saved', true, sprintf(getMessage('SPONSOR_CONTENT_404'), $what)); + $OUT .= loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_CONTENT_404', $what)); } // Return content @@ -382,7 +399,7 @@ function saveSponsorData ($postData, $content) { 'ok', 'pass1', 'pass2'); // Set default message ("not saved") - $message = getMessage('SPONSOR_ACCOUNT_DATA_NOT_SAVED'); + $message = '{--SPONSOR_ACCOUNT_DATA_NOT_SAVED--}'; // Check for submitted passwords if ((!empty($postData['pass1'])) && (!empty($postData['pass2']))) { @@ -431,44 +448,42 @@ function saveSponsorData ($postData, $content) { $sql = substr($sql, 0, -1); // Add SQL tail data - $sql .= " WHERE `id`='%s' AND password='%s' LIMIT 1"; + $sql .= " WHERE `id`=%s AND password='%s' LIMIT 1"; $DATA[] = bigintval(getSession('sponsorid')); $DATA[] = getSession('sponsorpass'); // Saving data was completed... ufff... - switch (getWhat()) - { + switch (getWhat()) { case 'account': // Change account data if ($EMAIL === true) { - $message = getMessage('SPONSOR_ACCOUNT_EMAIL_CHANGED'); - $templ = 'admin_sponsor_change_email'; - $subj = getMessage('ADMIN_SPONSOR_ACC_EMAIL_SUBJ'); + $message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}'; + $templ = 'admin_sponsor_change_email'; + $subj = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}'; } else { - $message = getMessage('SPONSOR_ACCOUNT_DATA_SAVED'); - $templ = 'admin_sponsor_change_data'; - $subj = getMessage('ADMIN_SPONSOR_ACC_DATA_SUBJ'); + $message = '{--SPONSOR_ACCOUNT_DATA_SAVED--}'; + $templ = 'admin_sponsor_change_data'; + $subj = '{--ADMIN_SPONSOR_ACC_DATA_SUBJECT--}'; } break; case 'settings': // Change settings - // Translate some data - $content['receive'] = translateYesNo($content['receive_warnings']); - $content['interval'] = createFancyTime($content['warning_interval']); - // Set message template and subject for admin - $message = getMessage('SPONSOR_SETTINGS_SAVED'); - $templ = 'admin_sponsor_settings'; - $subj = getMessage('ADMIN_SPONSOR_SETTINGS_SUBJ'); + $message = '{--SPONSOR_SETTINGS_SAVED--}'; + $templ = 'admin_sponsor_settings'; + $subj = '{--ADMIN_SPONSOR_SETTINGS_SUBJECT--}'; break; default: // Unknown sponsor what value! logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown sponsor module (what) %s detected.", getWhat())); - $message = sprintf(getMessage('SPONSOR_UNKNOWN_WHAT'), getWhat()); - $templ = ''; $subj = ''; + $message = getMaskedMessage('SPONSOR_UNKNOWN_WHAT', getWhat()); + $templ = ''; + $subj = ''; break; - } + } // END - switch + // Has an entry updated? if (SQL_AFFECTEDROWS() == 1) { + // Template and subject are set? if (!empty($templ) && !empty($subj)) { // Run SQL command and check for success $result = SQL_QUERY_ESC($sql, $DATA, __FUNCTION__, __LINE__); @@ -476,26 +491,21 @@ function saveSponsorData ($postData, $content) { // Add all data to content $content['new_data'] = $postData; - // Change some data - if (isset($content['gender'])) $content['gender'] = translateGender($content['gender']); - if (isset($content['new_data']['gender'])) $content['new_data']['gender'] = translateGender($content['new_data']['gender']); - if (isset($content['receive_warnings'])) $content['new_data']['receive'] = translateYesNo($content['new_data']['receive_warnings']); - if (isset($content['warning_interval'])) $content['new_data']['interval'] = createFancyTime($content['new_data']['warning_interval']); - // Send email to admins sendAdminNotification($subj, $templ, $content); // Shall we send mail to the sponsor's new email address? if ($content['receive_warnings'] == 'Y') { - // Okay send email with confirmation link to new address and with no confirmation link - // to the old address + /* + * Okay send email with confirmation link to new address and with no confirmation link + * to the old address. + */ // First to old address - switch (getWhat()) - { + switch (getWhat()) { case 'account': // Change account data $email_msg = loadEmailTemplate('sponsor_change_data', $content); - sendEmail($content['email'], getMessage('SPONSOR_ACC_DATA_SUBJ'), $email_msg); + sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJECT--}', $email_msg); if ($EMAIL === true) { // Add hash code to content array @@ -503,16 +513,16 @@ function saveSponsorData ($postData, $content) { // Second mail goes to the new address $email_msg = loadEmailTemplate('sponsor_change_email', $content); - sendEmail($content['email'], getMessage('SPONSOR_ACC_EMAIL_SUBJ'), $email_msg); - } + sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJECT--}', $email_msg); + } // END - if break; case 'settings': // Change settings // Send email $email_msg = loadEmailTemplate('sponsor_settings', $content); - sendEmail($content['email'], getMessage('SPONSOR_SETTINGS_SUBJ'), $email_msg); + sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJECT--}', $email_msg); break; - } + } // END - switch } // END - if } // END - if } // END - if