Some language strings fixed, renamed. Copyright notice updated

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

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 359b01a39d01f97940cc92adebdf86b768d118ad..fac07ce8cad9b34676fd8cfd024998f98b6b109c 100644 (file)
--- 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 *
@@ -218,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);
@@ -229,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
@@ -372,7 +370,7 @@ LIMIT 1",
                        ), __FUNCTION__, __LINE__);
 
                // This update went fine?
-               $login = (SQL_AFFECTEDROWS() == 1);
+               $login = (!SQL_HASZEROAFFECTED());
        } // END - if
 
        // Return status
@@ -385,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--}';
@@ -475,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
@@ -698,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']);
 
@@ -837,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