From: quix0r Date: Fri, 23 Jul 2010 04:10:05 +0000 (+0000) Subject: A lot template functions for ext-sponsor added, fixes in admin template X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;ds=sidebyside;h=0c7966d541c1b0d878ed2cb84a1c96ac6fc4c0f6;p=mailer.git A lot template functions for ext-sponsor added, fixes in admin template --- diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index a0260fd742..a625a5517e 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -150,6 +150,10 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), if (($update === true) && (isAdmin()) && (getWhat() == 'add_sponsor')) { // Only allowed for admin $DATA['values'][] = 'PENDING'; + + // Add remote IP address as well + $DATA['keys'][] = 'remote_addr'; + $DATA['values'][] = detectRemoteAddr(); } else { // Guest area $DATA['values'][] = 'UNCONFIRMED'; @@ -595,11 +599,11 @@ function doProcessSponsorFormRequest ($messageArray = array()) { $content['password'] = secureString(postRequestParameter('pass1')); // Generate email and send it to the new sponsor - $message = loadEmailTemplate('sponsor_confirm', $hash); + $message = loadEmailTemplate('sponsor_confirm', $content, $id); sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJECT--}', $message); // Send mail to admin - sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_reg', $hash); + sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_reg', $content); // Output message: DONE $message = $messageArray['added']; @@ -628,5 +632,212 @@ function doProcessSponsorFormRequest ($messageArray = array()) { return $message; } +// Expression call-back function for fetching sponsor data +function doExpressionSponsor ($data) { + // Use current sponsor_id by default + $functionName = 'getSponsorId()'; + + // Sponsor-related data, so is there a sponsor_id? + if (!empty($data['matches'][4][$data['key']])) { + // Do we have a sponsor_id or $sponsor_id? + if ($data['matches'][4][$data['key']] == '$userid') { + // Use dynamic call + $functionName = "getFetchedSponsorData('id', \$userid, '" . $data['callback'] . "')"; + } elseif (!empty($data['matches'][4][$data['key']])) { + // Sponsor data found + $functionName = "getFetchedSponsorData('id', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')"; + } + } elseif ((!empty($data['callback'])) && (isSponsorDataValid())) { + // "Call-back" alias column for current logged in sponsor's data + $functionName = "getSponsorData('" . $data['callback'] . "')"; + } + + // Do we have another function to run (e.g. translations) + if (!empty($data['extra_func'])) { + // Surround the original function call with it + $functionName = $data['extra_func'] . '(' . $functionName . ')'; + } // END - if + + // Generate replacer + $replacer = '{DQUOTE} . ' . $functionName . ' . {DQUOTE}'; + + // Now replace the code + $code = replaceExpressionCode($data, $replacer); + + // Return replaced code + return $code; +} + +// Fetch sponsor data for given sponsor id +function fetchSponsorData ($sponsor_id, $column = 'id') { + // If we should look for sponsor_id secure&set it here + if ($column == 'id') { + // Secure sponsor_id + $sponsor_id = bigintval($sponsor_id); + + // Set it here + setCurrentSponsorId($sponsor_id); + + // Don't look for invalid sponsor_ids... + if ($sponsor_id < 1) { + // Invalid, so abort here + debug_report_bug(__FUNCTION__, __LINE__, 'Sponsor id ' . $sponsor_id . ' is invalid.'); + } elseif (isSponsorDataValid()) { + // Use cache, so it is fine + return true; + } + } elseif (isSponsorDataValid()) { + // Use cache, so it is fine + return true; + } + + // By default none was found + $found = false; + + // Extra statements + $ADD = ''; + + // Query for the sponsor + $result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `%s`='%s' LIMIT 1", + array($column, $sponsor_id), __FUNCTION__, __LINE__); + + // Do we have a record? + if (SQL_NUMROWS($result) == 1) { + // Load data from cookies + $data = SQL_FETCHARRAY($result); + + // Set the sponsor_id for later use + setCurrentSponsorId($data['id']); + $GLOBALS['sponsor_data'][getCurrentSponsorId()] = $data; + + // Rewrite 'last_failure' if found + 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'] = '0'; + + // Is it not zero? + if ($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'] != '0000-00-00 00:00:00') { + // Seperate data/time + $array = explode(' ', $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw']); + + // Seperate data and time again + $array['date'] = explode('-', $array[0]); + $array['time'] = explode(':', $array[1]); + + // Now pass it to mktime() + $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = mktime( + $array['time'][0], + $array['time'][1], + $array['time'][2], + $array['date'][1], + $array['date'][2], + $array['date'][0] + ); + } // END - if + } // END - if + + // Found, but valid? + $found = isSponsorDataValid(); + } // END - if + + // Free memory + SQL_FREERESULT($result); + + // Return result + return $found; +} + +// Wrapper for fetchSponsorData() and getSponsorData() calls +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'); + } // END - if + + // Is it cached? + if (!isset($GLOBALS['sponsor_data_cache'][$sponsor_id][$keyColumn][$valueColumn])) { + // Default is empty + $data = ''; + + // Can we fetch the sponsor data? + if ((isValidSponsorId($sponsor_id)) && (fetchSponsorData($sponsor_id, $keyColumn))) { + // Now get the data back + $data = getSponsorData($valueColumn); + } // END - if + + // Cache it + /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cached:id=' . $sponsor_id . ',keyColumn=' . $keyColumn . ',valueColumn=' . $valueColumn . ',data=' . $data); + $GLOBALS['sponsor_data_cache'][$sponsor_id][$keyColumn][$valueColumn] = $data; + } // END - if + + // Return it + return $GLOBALS['sponsor_data_cache'][$sponsor_id][$keyColumn][$valueColumn]; +} + +// Checks if the sponsor data is valid, this may indicate that the sponsor has logged +// in, but you should use isMember() if you want to find that out. +function isSponsorDataValid () { + // Sponsor id should not be zero so abort here + if (!isCurrentSponsorIdSet()) return false; + + // Is it cached? + if (!isset($GLOBALS['is_sponsor_data_valid'][getCurrentSponsorId()])) { + // Determine it + $GLOBALS['is_sponsor_data_valid'][getCurrentSponsorId()] = ((isset($GLOBALS['sponsor_data'][getCurrentSponsorId()])) && (count($GLOBALS['sponsor_data'][getCurrentSponsorId()]) > 1)); + } // END - if + + // Return the result + return $GLOBALS['is_sponsor_data_valid'][getCurrentSponsorId()]; +} + +// Setter for current sponsor_id +function setCurrentSponsorId ($sponsor_id) { + // Set sponsor_id + $GLOBALS['current_sponsor_id'] = bigintval($sponsor_id); + + // Unset it to re-determine the actual state + unset($GLOBALS['is_sponsor_data_valid'][$sponsor_id]); +} + +// Getter for current sponsor_id +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.'); + } // END - if + + // Return the sponsor_id + return $GLOBALS['current_sponsor_id']; +} + +// Checks if current sponsor_id is set +function isCurrentSponsorIdSet () { + return ((isset($GLOBALS['current_sponsor_id'])) && (isValidSponsorId($GLOBALS['current_sponsor_id']))); +} + +// Is given sponsor_id valid? +function isValidSponsorId ($sponsor_id) { + // Do we have cache? + if (!isset($GLOBALS['is_valid_sponsor_id'][$sponsor_id])) { + // Check it out + $GLOBALS['is_valid_sponsor_id'][$sponsor_id] = ((!is_null($sponsor_id)) && (!empty($sponsor_id)) && ($sponsor_id > 0)); + } // END - if + + // Return cache + return $GLOBALS['is_valid_sponsor_id'][$sponsor_id]; +} + +// Getter for sponsor data +function getSponsorData ($column) { + // Sponsor id should not be zero + if (getCurrentSponsorId() < 1) debug_report_bug(__FUNCTION__, __LINE__, 'Sponsor id is zero.'); + + // Return the value + return $GLOBALS['sponsor_data'][getCurrentSponsorId()][$column]; +} + // [EOF] ?> diff --git a/inc/modules/admin/what-add_sponsor.php b/inc/modules/admin/what-add_sponsor.php index 4cb26dd0bb..144f8c7fe6 100644 --- a/inc/modules/admin/what-add_sponsor.php +++ b/inc/modules/admin/what-add_sponsor.php @@ -46,8 +46,14 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addMenuDescription('admin', __FILE__); if (isFormSent()) { + // Generate message array + $messageArray = array( + 'failed' => '{--SPONSOR_REGISTRATION_FAILED--}', + 'added' => '{--SPONSOR_REGISTRATION_COMPLETED--}', + ); + // Save sponsor in database - loadTemplate('admin_settings_saved', false, doProcessSponsorFormRequest()); + loadTemplate('admin_settings_saved', false, doProcessSponsorFormRequest($messageArray)); } else { // Output form loadTemplate('admin_add_sponsor'); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index af1420e77e..6100e64225 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -454,7 +454,6 @@ function fetchUserData ($userid, $column = 'userid') { return true; } - // By default none was found $found = false; diff --git a/templates/de/emails/admin/admin_sponsor_reg.tpl b/templates/de/emails/admin/admin_sponsor_reg.tpl index b4e487ad71..96abf6115b 100644 --- a/templates/de/emails/admin/admin_sponsor_reg.tpl +++ b/templates/de/emails/admin/admin_sponsor_reg.tpl @@ -11,11 +11,11 @@ Hash-Wert: $content[hash] ------------------------------ Angemeldet am: $content[timestamp] ------------------------------ -Anrede: {%sponsor,gender,translateGender=$userid%} +Anrede: {%sponsor,gender,translateGender=$content[id]%} ------------------------------ -Vorname: {%sponsor,surname=$userid%} +Vorname: {%sponsor,surname=$content[id]%} ------------------------------ -Nachname: {%sponsor,family=$userid%} +Nachname: {%sponsor,family=$content[id]%} ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------