A lot rewrites from double-quote to single-quote, some fixes for extension handling...

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 7d6f157c3b2f2b9c7efacd260867987fbd1fcd14..5c76e50c24936abad4c286f5fbb3351f94f9cdf2 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alle Ihrer gesammelten Punkte                    *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -213,7 +213,7 @@ function WERNIS_TEST_API () {
 function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
        // Is the sponsor extension installed?
        if (getConfig('wernis_withdraw_active') != "Y") {
-               if (!EXT_IS_ACTIVE("sponsor")) {
+               if (!EXT_IS_ACTIVE('sponsor')) {
                        // No, abort here
                        return false;
                } elseif (!IS_SPONSOR()) {
@@ -226,7 +226,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
        $result = false;
 
        // Prepare the purpose
-       $eval = "\$purpose = \"".COMPILE_CODE(sprintf(WERNIS_API_PURPOSE_WITHDRAW, $GLOBALS['userid']))."\";";
+       $eval = "\$purpose = \"".COMPILE_CODE(sprintf(WERNIS_API_PURPOSE_WITHDRAW, getUserId()))."\";";
        eval($eval);
 
        // Prepare the request data
@@ -267,7 +267,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
        $result = false;
 
        // Prepare the purpose
-       $eval = "\$purpose = \"".COMPILE_CODE(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), $GLOBALS['userid']))."\";";
+       $eval = "\$purpose = \"".COMPILE_CODE(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getUserId()))."\";";
        eval($eval);
 
        // Prepare the request data
@@ -326,8 +326,8 @@ function WERNIS_TRANSFER_STATUS ($status) {
 // Log the transfer
 function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = "", $status = "") {
        // Register this wernis movement
-       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_wernis` (`userid`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type`, `wernis_api_message`, `wernis_api_status`) VALUES (%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')",
-               array($GLOBALS['userid'], bigintval($wdsId), bigintval($amount), $type, $message, $status), __FUNCTION__, __LINE__);
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_wernis` (`userid`,`wernis_account`,`wernis_amount`,`wernis_timestamp`,`wernis_type`,`wernis_api_message`,`wernis_api_status`) VALUES (%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')",
+               array(getUserId(), bigintval($wdsId), bigintval($amount), $type, $message, $status), __FUNCTION__, __LINE__);
 }
 
 // Take fees and factor
@@ -336,7 +336,7 @@ function WERNIS_TAKE_FEE ($points, $mode) {
        //* DEBUG: */ echo "mode={$mode},points={$points}<br />\n";
        if (!in_array($mode, array('payout', 'withdraw'))) {
                // Log error and abort
-               DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$GLOBALS['userid']},mode={$mode},points={$points}");
+               DEBUG_LOG(__FUNCTION__, __LINE__, "uid={getUserId()},mode={$mode},points={$points}");
                return false;
        } // END - if
 
@@ -350,7 +350,7 @@ function WERNIS_TAKE_FEE ($points, $mode) {
        }
 
        // Divide/multiply the factor
-       if ($mode == "payout") {
+       if ($mode == 'payout') {
                // Divide for payout
                $points = $points / getConfig('wernis_payout_factor');
        } else {