Refback and referal points hopefully fixed:

[mailer.git] / inc / libs / sponsor_functions.php

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 15ebf6c442cbedbf9761c93fd293dd5387da2b4d..035c56b875f321eb2ea353728a9c51d91333570f 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -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
 
@@ -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() . getEncryptSeperator() . $postData['email'] . getEncryptSeperator() . detectRemoteAddr() . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . time());
                                        $DATA['keys'][] = 'remote_addr';
                                        $DATA['values'][] = detectRemoteAddr();
                                }
@@ -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';
                        }
 
@@ -209,7 +209,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
@@ -229,7 +229,7 @@ function sponsorTranslateUserStatus ($status) {
                // 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
@@ -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
@@ -341,7 +341,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
@@ -428,7 +428,7 @@ function saveSponsorData ($postData, $content) {
 
                        // Generate hash code
                        // @TODO Rewrite this to API function
-                       $HASH = md5(session_id() . ':' . $postData['email'] . ':' . detectRemoteAddr() . ':' . detectUserAgent() . ':' . time());
+                       $HASH = md5(session_id() . getEncryptSeperator() . $postData['email'] . getEncryptSeperator() . detectRemoteAddr() . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . time());
                        $DATA[] = $HASH;
                } // END - if
        } // END - if
@@ -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;
@@ -574,11 +574,11 @@ 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']     = postRequestParameter('email');
+                               $content['surname']   = postRequestParameter('surname');
+                               $content['family']    = postRequestParameter('family');
                                $content['timestamp'] = generateDateTime(time(), 0);
-                               $content['password']  = secureString(postRequestParameter('pass1'));
+                               $content['password']  = postRequestParameter('pass1');
 
                                // Generate email and send it to the new sponsor
                                $message = loadEmailTemplate('sponsor_confirm', $content, $id);
@@ -591,7 +591,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=' . postRequestParameter('email') . '%}';
                        }
 
                        // Free memory
@@ -602,10 +602,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