X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsponsor_functions.php;h=bc7a15d08f85b598a5bc87c367608cfe6b57321c;hp=1bc1c7ed7f589048c1932df62c4f9c763ae72ffc;hb=116f17077ae6fa32c7373ccd6aaf94044bb6c276;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 1bc1c7ed7f..bc7a15d08f 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Funktionen fuer den Sponsorenbereich * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $Date:: $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -32,12 +37,12 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; + $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; require($INC); } // -function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_STATUS=false) { +function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $messageArray=array(), $RET_STATUS=false) { // Init a lot variables $SAVE = true; $UPDATE = false; @@ -62,15 +67,15 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S // Check only posted input entries not the submit button switch ($k) { - case "email": + case 'email': $ALREADY = false; - if (!VALIDATE_EMAIL($v)) { + if (!isEmailValid($v)) { // Email address is not valid $SAVE = false; } else { // Do we want to 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($POST['email']), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE email='%s' LIMIT 1", + array($POST['email']), __FUNCTION__, __LINE__); // Is a sponsor alread in the db? if (SQL_NUMROWS($result) == 1) { @@ -90,7 +95,7 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S break; case "pass1": - $k = ""; $v = ""; + $k = ''; $v = ''; break; case "pass2": @@ -98,12 +103,12 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S break; case "url": - if (!VALIDATE_URL($v)) $SAVE = false; + if (!isUrlValid($v)) $SAVE = false; break; default: // Test if there is are time selections - CONVERT_SELECTIONS_TO_TIMESTAMP($POST, $DATA, $k, $skip); + convertSelectionsToTimestamp($POST, $DATA, $k, $skip); break; } @@ -120,58 +125,58 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S if ((empty($POST['force'])) || (!IS_ADMIN())) $POST['force'] = 0; // SQL and message string is empty by default - $SQL = ""; $MSG = ""; + $sql = ''; $message = ''; // Update? if ($UPDATE) { // Update his data - $SQL = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET "; + $sql = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET "; foreach ($DATA['keys'] as $k => $v) { - $SQL .= $v."='%s', "; + $sql .= $v."='%s', "; } // Remove last ", " from SQL string - $SQL = substr($SQL, 0, -2)." WHERE id='%s' LIMIT 1"; - $DATA['values'][] = bigintval($_GET['id']); + $sql = substr($sql, 0, -2)." WHERE `id`='%s' LIMIT 1"; + $DATA['values'][] = bigintval(REQUEST_GET('id')); // Generate message - $MSG = SPONSOR_GET_MESSAGE(ADMIN_SPONSOR_UPDATED, "updated", $MSGs); + $message = SPONSOR_GET_MESSAGE(ADMIN_SPONSOR_UPDATED, "updated", $messageArray); $ret = "updated"; - } elseif ((!$ALREADY) || (($POST['force'] == "1") && (IS_ADMIN()))) { + } elseif ((!$ALREADY) || (($POST['force'] == '1') && (IS_ADMIN()))) { // Add new sponsor, first add more data $DATA['keys'][] = "sponsor_created"; $DATA['values'][] = time(); - $DATA['keys'][] = "status"; + $DATA['keys'][] = 'status'; if ((!$NO_UPDATE) && (IS_ADMIN()) && ($GLOBALS['what'] == "add_sponsor")) { // Only allowed for admin $DATA['values'][] = "PENDING"; - } elsen{ + } else { // Guest area $DATA['values'][] = "UNCONFIRMED"; // Generate hash code $DATA['keys'][] = "hash"; - $DATA['values'][] = md5(session_id().":".$POST['email'].":".GET_REMOTE_ADDR().":".GET_USER_AGENT().":".time()); + $DATA['values'][] = md5(session_id().':'.$POST['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time()); $DATA['keys'][] = "remote_addr"; - $DATA['values'][] = GET_REMOTE_ADDR(); + $DATA['values'][] = detectRemoteAddr(); } // Implode all data into strings $KEYS = implode(", " , $DATA['keys']); - $VALUES = str_repeat("%s', '", count($DATA['values']) - 1); + $valueS = str_repeat("%s', '", count($DATA['values']) - 1); // Generate string - $SQL = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_data` (".$KEYS.") VALUES ('".$VALUES."%s')"; + $sql = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_data` (".$KEYS.") VALUES ('".$valueS."%s')"; // Generate message - $MSG = SPONSOR_GET_MESSAGE(ADMIN_SPONSOR_ADDED, "added", $MSGs); + $message = SPONSOR_GET_MESSAGE(getMessage('ADMIN_SPONSOR_ADDED'), "added", $messageArray); $ret = "added"; } elseif ((!$NO_UPDATE) && (IS_ADMIN())) { // Add all data as hidden data - $OUT = ""; + $OUT = ''; foreach ($POST as $k => $v) { // Do not add 'force' ! if ($k != "force") { - $OUT .= "\n"; + $OUT .= "\n"; } } define('__HIDDEN_DATA', $OUT); @@ -182,63 +187,48 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S return; } else { // Already added! - $MSG = SPONSOR_ALREADY_FOUND_1.$POST['email'].SPONSOR_ALREADY_FOUND_2; + $message = sprintf(getMessage('SPONSOR_ALREADY_FOUND', $POST['email'])); $ret = "already"; } - if (!empty($SQL)) { + if (!empty($sql)) { // Run SQL command - $result = SQL_QUERY_ESC($SQL, $DATA['values'], __FILE__, __LINE__); + $result = SQL_QUERY_ESC($sql, $DATA['values'], __FUNCTION__, __LINE__); } // Output message if ((!$NO_UPDATE) && (IS_ADMIN())) { - LOAD_TEMPLATE("admin_settings_saved", false, $MSG); + LOAD_TEMPLATE('admin_settings_saved', false, $message); } } else { // Error found! - $MSG = SPONSOR_GET_MESSAGE(SPONSOR_DATA_NOT_SAVED, "failed", $MSGs); - LOAD_TEMPLATE("admin_settings_saved", false, $MSG); + $message = SPONSOR_GET_MESSAGE(getMessage('SPONSOR_DATA_NOT_SAVED'), "failed", $messageArray); + LOAD_TEMPLATE('admin_settings_saved', false, $message); } // Shall we return the status? if ($RET_STATUS) return $ret; } // -function SPONSOR_TRANSLATE_STATUS($status) { - switch ($status) - { - case "UNCONFIRMED": - $ret = ACCOUNT_UNCONFIRMED; - break; - - case "CONFIRMED": - $ret = ACCOUNT_CONFIRMED; - break; - - case "LOCKED": - $ret = ACCOUNT_LOCKED; - break; - - case "PENDING": - $ret = ACCOUNT_PENDING; - break; - - case "EMAIL": - $ret = ACCOUNT_EMAIL; - break; - - default: +function sponsorTranslateUserStatus ($status) { + // Construct constant name + $constantName = sprintf("ACCOUNT_%s", $status); + + // Is the constant there? + if (defined($constantName)) { + // Then use it + $ret = constant($constantName); + } else { + // Not found! DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); - $ret = UNKNOWN_STATUS_1.$status.UNKNOWN_STATUS_2; - break; + $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status); } return $ret; } // Search for an email address in the database function SPONSOR_FOUND_EMAIL_DB ($email) { // Do we already have the provided email address in our DB? - $ret = (GET_TOTAL_DATA($email, "sponsor_data", "id", "email", true) == 1); + $ret = (GET_TOTAL_DATA($email, "sponsor_data", "id", 'email', true) == 1); // Return result return $ret; @@ -262,11 +252,11 @@ function SPONSOR_GET_MESSAGE ($msg, $pos, $array) { function IS_SPONSOR () { // Failed... $ret = false; - if ((isSessionVariableSet('sponsorid'))) && (isSessionVariableSet('sponsorpass')))) { + if ((isSessionVariableSet('sponsorid')) && (isSessionVariableSet('sponsorpass'))) { // Check cookies against database records... - $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` -WHERE id='%s' AND password='%s' AND status='CONFIRMED' LIMIT 1", - array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_sponsor_data` +WHERE `id`='%s' AND password='%s' AND `status`='CONFIRMED' LIMIT 1", + array(bigintval(getSession('sponsorid')), getSession('sponsorpass')), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { // All is fine $ret = true; @@ -282,36 +272,36 @@ WHERE id='%s' AND password='%s' AND status='CONFIRMED' LIMIT 1", // function GENERATE_SPONSOR_MENU($current) { - $OUT = ""; + $OUT = ''; $WHERE = " AND active='Y'"; - if (IS_ADMIN()) $WHERE = ""; + if (IS_ADMIN()) $WHERE = ''; // Load main menu entries - $result_main = SQL_QUERY("SELECT action, title FROM `{!_MYSQL_PREFIX!}_sponsor_menu` -WHERE (what='' OR `what` IS NULL) ".$WHERE." -ORDER BY `sort`", __FILE__, __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`", __FUNCTION__, __LINE__); + if (SQL_NUMROWS($result_main) > 0) { // Load every menu and it's sub menus - while (list($action, $title_main) = SQL_FETCHROW($result_main)) - { + while ($content = SQL_FETCHARRAY($result_main)) { // Load sub menus - $result_sub = SQL_QUERY_ESC("SELECT what, title FROM `{!_MYSQL_PREFIX!}_sponsor_menu` -WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ".$WHERE." -ORDER BY `sort`", array($action), __FILE__, __LINE__); - if (SQL_NUMROWS($result_sub) > 0) - { + $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`", + array($content['main_action']), __FUNCTION__, __LINE__); + if (SQL_NUMROWS($result_sub) > 0) { // Load sub menus - $SUB = ""; - while (list($what, $title_sub) = SQL_FETCHROW($result_sub)) - { + $SUB = ''; + while ($content2 = SQL_FETCHARRAY($result_sub)) { + // Merge both arrays + $content = merge_array($content, $content2); + // Check if current selected menu is matching the loaded one - if ($current == $what) $title_sub = "".$title_sub.""; + if ($current == $content['sub_what']) $content['sub_title'] = "".$content['sub_title'].""; // Prepare data for the sub template $content = array( - 'what' => $what, - 'title' => $title_sub + 'what' => $content['sub_what'], + 'title' => $content['sub_title'] ); // Load row template @@ -320,27 +310,23 @@ ORDER BY `sort`", array($action), __FILE__, __LINE__); // Prepare data for the main template $content = array( - 'title' => $title_main, + 'title' => $content['main_title'], 'menu' => $SUB ); // Load menu template $OUT .= LOAD_TEMPLATE("sponsor_action", true, $content); - } - else - { + } else { // No sub menus active - $OUT .= LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_NO_SUB_MENUS_ACTIVE); + $OUT .= LOAD_TEMPLATE('admin_settings_saved', true, getMessage('SPONSOR_NO_SUB_MENUS_ACTIVE')); } // Free memory SQL_FREERESULT($result_sub); } - } - else - { + } else { // No main menus active - $OUT .= LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_NO_MAIN_MENUS_ACTIVE); + $OUT .= LOAD_TEMPLATE('admin_settings_saved', true, getMessage('SPONSOR_NO_MAIN_MENUS_ACTIVE')); } // Free memory @@ -349,23 +335,23 @@ ORDER BY `sort`", array($action), __FILE__, __LINE__); // Return content return $OUT; } + // -function GENERATE_SPONSOR_CONTENT($what) -{ - global $_CONFIG; - $OUT = ""; - $FILE = sprintf("%sinc/modules/sponsor/%s.php", PATH, $what); - if (FILE_READABLE($FILE)) { +function GENERATE_SPONSOR_CONTENT ($what) { + $OUT = ''; + $INC = sprintf("inc/modules/sponsor/%s.php", $what); + if (isIncludeReadable($INC)) { // Every sponsor action will output nothing directly. It will be written into $OUT! - require_once($FILE); + loadIncludeOnce($INC); } else { // File not found! - $OUT .= LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_CONTENT_404_1.$what.SPONSOR_CONTENT_404_2); + $OUT .= LOAD_TEMPLATE('admin_settings_saved', true, sprintf(getMessage('SPONSOR_CONTENT_404'), $what)); } // Return content return $OUT; } + // function UPDATE_SPONSOR_LOGIN () { // Failed by default @@ -376,8 +362,8 @@ function UPDATE_SPONSOR_LOGIN () { // Update last online timestamp SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET last_online=UNIX_TIMESTAMP() -WHERE id='%s' AND password='%s' LIMIT 1", - array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__); +WHERE `id`='%s' AND password='%s' LIMIT 1", + array(bigintval(getSession('sponsorid')), getSession('sponsorpass')), __FUNCTION__, __LINE__); // This update went fine? $login = (SQL_AFFECTEDROWS() == 1); @@ -396,7 +382,7 @@ function SPONSOR_SAVE_DATA ($POST, $content) { 'ok', 'pass1', 'pass2'); // Set default message ("not saved") - $MSG = SPONSOR_ACCOUNT_DATA_NOT_SAVED; + $message = getMessage('SPONSOR_ACCOUNT_DATA_NOT_SAVED'); // Check for submitted passwords if ((!empty($POST['pass1'])) && (!empty($POST['pass2']))) { @@ -404,30 +390,30 @@ function SPONSOR_SAVE_DATA ($POST, $content) { if ($POST['pass1'] == $POST['pass2']) { // Okay, then set password and remove pass1 and pass2 $POST['password'] = md5($POST['pass1']); - } - } + } // END - if + } // END - if // Remove all (maybe spoofed) unsafe data from array foreach ($UNSAFE as $remove) { unset($POST[$remove]); - } + } // END - foreach // This array is for the submitted data which we will use with the SQL_QUERY_ESC() function to // secure the data $DATA = array(); // Prepare SQL string - $SQL = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET"; + $sql = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET"; foreach ($POST as $key => $value) { // Mmmmm, too less security here??? - $SQL .= " ".strip_tags($key)."='%s',"; + $sql .= " ".strip_tags($key)."='%s',"; // We will secure this later inside the SQL_QUERY_ESC() function $DATA[] = strip_tags($value); // Compile {SLASH} and so on for the email templates $POST[$key] = COMPILE_CODE($value); - } + } // END - foreach // Check if email has changed if ((!empty($content['email'])) && (!empty($POST['email']))) { @@ -436,80 +422,75 @@ function SPONSOR_SAVE_DATA ($POST, $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 - $HASH = md5(session_id().":".$POST['email'].":".GET_REMOTE_ADDR().":".GET_USER_AGENT().":".time()); + $HASH = md5(session_id().':'.$POST['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time()); $DATA[] = $HASH; - } - } + } // END - if + } // END - if // Remove last commata - $SQL = substr($SQL, 0, -1); + $sql = substr($sql, 0, -1); // Add SQL tail data - $SQL .= " WHERE id='%s' AND password='%s' LIMIT 1"; - $DATA[] = bigintval(get_session('sponsorid')); - $DATA[] = get_session('sponsorpass'); + $sql .= " WHERE `id`='%s' AND password='%s' LIMIT 1"; + $DATA[] = bigintval(getSession('sponsorid')); + $DATA[] = getSession('sponsorpass'); // Saving data was completed... ufff... switch ($GLOBALS['what']) { case "account": // Change account data - if ($EMAIL) { - $MSG = SPONSOR_ACCOUNT_EMAIL_CHANGED; + if ($EMAIL === true) { + $message = getMessage('SPONSOR_ACCOUNT_EMAIL_CHANGED'); $templ = "admin_sponsor_change_email"; - $subj = ADMIN_SPONSOR_ACC_EMAIL_SUBJ; - } - else - { - $MSG = SPONSOR_ACCOUNT_DATA_SAVED; + $subj = getMessage('ADMIN_SPONSOR_ACC_EMAIL_SUBJ'); + } else { + $message = getMessage('SPONSOR_ACCOUNT_DATA_SAVED'); $templ = "admin_sponsor_change_data"; - $subj = ADMIN_SPONSOR_ACC_DATA_SUBJ; + $subj = getMessage('ADMIN_SPONSOR_ACC_DATA_SUBJ'); } break; case "settings": // Change settings // Translate some data - $content['receive'] = TRANSLATE_YESNO($content['receive_warnings']); - $content['interval'] = CREATE_FANCY_TIME($content['warning_interval']); + $content['receive'] = translateYesNo($content['receive_warnings']); + $content['interval'] = createFancyTime($content['warning_interval']); // Set message template and subject for admin - $MSG = SPONSOR_SETTINGS_SAVED; + $message = getMessage('SPONSOR_SETTINGS_SAVED'); $templ = "admin_sponsor_settings"; - $subj = ADMIN_SPONSOR_SETTINGS_SUBJ; + $subj = getMessage('ADMIN_SPONSOR_SETTINGS_SUBJ'); break; default: // Unknown sponsor what value! DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown sponsor module (what) %s detected.", $GLOBALS['what'])); - $MSG = SPONSOR_UNKNOWN_WHAT_1.$GLOBALS['what'].SPONSOR_UNKNOWN_WHAT_2; - $templ = ""; $subj = ""; + $message = sprintf(getMessage('SPONSOR_UNKNOWN_WHAT'), $GLOBALS['what']); + $templ = ''; $subj = ''; break; } - if (SQL_AFFECTEDROWS() == 1) - { - if (!empty($templ) && !empty($subj)) - { + if (SQL_AFFECTEDROWS() == 1) { + if (!empty($templ) && !empty($subj)) { // Run SQL command and check for success - $result = SQL_QUERY_ESC($SQL, $DATA, __FILE__, __LINE__); + $result = SQL_QUERY_ESC($sql, $DATA, __FUNCTION__, __LINE__); // Add all data to content global $DATA; $DATA = $POST; // Change some data - if (isset($content['gender'])) $content['gender'] = TRANSLATE_GENDER($content['gender']); - if (isset($DATA['gender'])) $DATA['gender'] = TRANSLATE_GENDER($DATA['gender']); - if (isset($content['receive_warnings'])) $DATA['receive'] = TRANSLATE_YESNO($POST['receive_warnings']); - if (isset($content['warning_interval'])) $DATA['interval'] = CREATE_FANCY_TIME($POST['warning_interval']); + if (isset($content['gender'])) $content['gender'] = translateGender($content['gender']); + if (isset($DATA['gender'])) $DATA['gender'] = translateGender($DATA['gender']); + if (isset($content['receive_warnings'])) $DATA['receive'] = translateYesNo($POST['receive_warnings']); + if (isset($content['warning_interval'])) $DATA['interval'] = createFancyTime($POST['warning_interval']); // Send email to admins - SEND_ADMIN_NOTIFICATION($subj, $templ, $content); + sendAdminNotification($subj, $templ, $content); // Shall we send mail to the sponsor's new email address? - if ($content['receive_warnings'] == "Y") - { + if ($content['receive_warnings'] == 'Y') { // Okay send email with confirmation link to new address and with no confirmation link // to the old address @@ -518,31 +499,31 @@ function SPONSOR_SAVE_DATA ($POST, $content) { { case "account": // Change account data $email_msg = LOAD_EMAIL_TEMPLATE("sponsor_change_data", $content); - SEND_EMAIL($content['email'], SPONSOR_ACC_DATA_SUBJ, $email_msg); + sendEmail($content['email'], getMessage('SPONSOR_ACC_DATA_SUBJ'), $email_msg); - if ($EMAIL) - { + if ($EMAIL === true) { // Add hash code to content array $content['hash'] = $HASH; // Second mail goes to the new address $email_msg = LOAD_EMAIL_TEMPLATE("sponsor_change_email", $content); - SEND_EMAIL($content['email'], SPONSOR_ACC_EMAIL_SUBJ, $email_msg); + sendEmail($content['email'], getMessage('SPONSOR_ACC_EMAIL_SUBJ'), $email_msg); } break; case "settings": // Change settings // Send email $email_msg = LOAD_EMAIL_TEMPLATE("sponsor_settings", $content); - SEND_EMAIL($content['email'], SPONSOR_SETTINGS_SUBJ, $email_msg); + sendEmail($content['email'], getMessage('SPONSOR_SETTINGS_SUBJ'), $email_msg); break; } - } - } - } + } // END - if + } // END - if + } // END - if // Return final message - return $MSG; + return $message; } + // ?>