X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsponsor_functions.php;h=fac07ce8cad9b34676fd8cfd024998f98b6b109c;hp=d54a64238a42f2d22e02b4bbc08bc371d32c95b2;hb=c3b4eaf29946349ff058691db2dcb615a5379bb2;hpb=19188207e6802b82a134b340408cfa34b9b3a80f diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index d54a64238a..fac07ce8ca 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -14,11 +14,9 @@ * $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 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -66,8 +64,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), foreach ($postData as $k => $v) { if (!(array_search($k, $SKIPPED) > -1)) { // Check only posted input entries not the submit button - switch ($k) - { + switch ($k) { case 'email': $ALREADY = false; if (!isEmailValid($v)) { @@ -111,14 +108,14 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), // Test if there is are time selections convertSelectionsToTimestamp($postData, $DATA, $k, $skip); break; - } + } // END - switch if ((!empty($k)) && ($skip == false)) { // Add data $DATA['keys'][] = $k; $DATA['values'][] = $v; - } - } - } + } // END - if + } // END - if + } // END - foreach // Save sponsor? if ($SAVE === true) { @@ -219,7 +216,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), return $ret; } -// +// Translate the account status function sponsorTranslateUserStatus ($status) { // Construct constant name $constantName = sprintf("ACCOUNT_STATUS_%s", $status); @@ -230,9 +227,9 @@ function sponsorTranslateUserStatus ($status) { $ret = getMessage($constantName); } else { // Not found! - /* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); + //* 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', $status); + $ret = getMaskedMessage('ACCOUNT_STATUS_UNKNOWN', $status); } // Return status @@ -373,7 +370,7 @@ LIMIT 1", ), __FUNCTION__, __LINE__); // This update went fine? - $login = (SQL_AFFECTEDROWS() == 1); + $login = (!SQL_HASZEROAFFECTED()); } // END - if // Return status @@ -386,8 +383,8 @@ function saveSponsorData ($postData, $content) { // Unsecure data which we don't want $UNSAFE = array('password', 'id', 'remote_addr', 'sponsor_created', 'last_online', 'status', 'ref_count', - 'points_amount', 'points_used', 'refid', 'hash', 'last_pay', 'last_curr', 'pass_old', - 'ok', 'pass1', 'pass2'); + 'points_amount', 'points_used', 'refid', 'hash', 'last_payment', 'last_currency', + 'pass_old', 'ok', 'pass1', 'pass2'); // Set default message ("not saved") $message = '{--SPONSOR_ACCOUNT_DATA_NOT_SAVED--}'; @@ -476,7 +473,7 @@ function saveSponsorData ($postData, $content) { } // END - switch // Has an entry updated? - if (SQL_AFFECTEDROWS() == 1) { + if (!SQL_HASZEROAFFECTED()) { // Template and subject are set? if (!empty($templ) && !empty($subj)) { // Run SQL command and check for success @@ -611,7 +608,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) { $message = getMaskedMessage('SPONSOR_UNKNOWN_STATUS', $status); } break; - } + } // END - switch // Return message return $message; @@ -699,10 +696,10 @@ function fetchSponsorData ($sponsor_id, $column = 'id') { 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'; + $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = null; // Is it not zero? - if ($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'] != '0000-00-00 00:00:00') { + if (!is_null($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'])) { // Seperate data/time $array = explode(' ', $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw']); @@ -806,13 +803,13 @@ function isCurrentSponsorIdSet () { // Is given sponsor_id valid? function isValidSponsorId ($sponsor_id) { // Do we have cache? - if (!isset($GLOBALS['is_valid_sponsor_id'][$sponsor_id])) { + if (!isset($GLOBALS[__FUNCTION__][$sponsor_id])) { // Check it out - $GLOBALS['is_valid_sponsor_id'][$sponsor_id] = ((!is_null($sponsor_id)) && (!empty($sponsor_id)) && ($sponsor_id > 0)); + $GLOBALS[__FUNCTION__][$sponsor_id] = ((!is_null($sponsor_id)) && (!empty($sponsor_id)) && ($sponsor_id > 0)); } // END - if // Return cache - return $GLOBALS['is_valid_sponsor_id'][$sponsor_id]; + return $GLOBALS[__FUNCTION__][$sponsor_id]; } // Getter for sponsor data @@ -838,7 +835,14 @@ function determineSponsorCountry ($sponsor_id) { // Destroy sponsor session function destroySponsorSession () { // Remove all user data from session - return ((setSession('sponsor_id', '')) && (setSession('sponsor_pass', ''))); + return ( + (setSession('sponsor_id', '')) && + (setSession('sponsor_pass', '')) && + ( + ((isExtensionActive('theme')) && (setTheme(''))) || + (!isExtensionActive('theme')) + ) + ); } // Getter for sponsor_min_points