More complete rewrite to use wrapper function isExtensionInstalledAndNewer(), some...

[mailer.git] / inc / modules / member / what-payout.php

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 48491080937cda2b89571be3261ba9cf144303f2..95ccddf4d562bbf4078749af90712cfc68838180 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -65,7 +66,7 @@ $totalPoints = ($totalPoints - $usedPoints);
 // Sanity check...
 if (empty($totalPoints)) $totalPoints = '0.00000';
 
-if (!isGetRequestElementSet('payout')) {
+if (!isGetRequestParameterSet('payout')) {
        // Load payout types
        $result = SQL_QUERY_ESC("SELECT
        `id`, `type`, `rate`, `min_points`, `allow_url`
@@ -150,7 +151,7 @@ ORDER BY
 } else {
        // Chedk if he can get paid by selected type
        $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url AS allow FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
-               array(bigintval(getRequestElement('payout'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('payout'))), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1) {
                // id is valid so load the data
@@ -162,8 +163,8 @@ ORDER BY
 
                // Calulcate points from submitted amount
                $points = '0';
-               if (isPostRequestElementSet('payout')) {
-                       $points  = bigintval(postRequestElement('payout')) / $content['rate'];
+               if (isPostRequestParameterSet('payout')) {
+                       $points  = bigintval(postRequestParameter('payout')) / $content['rate'];
                        $PAY_MAX = $max / $content['rate'];
                }
 
@@ -172,8 +173,8 @@ ORDER BY
                        // Ok, he can get be paid
                        if ((isFormSent()) && ($points <= $PAY_MAX) && ($points >= $content['min_points'])) {
                                // Remember points in array
-                               setRequestPostElement('payout_points', translateComma($points));
-                               setRequestPostElement('type'         , $content['type']);
+                               setPostRequestParameter('payout_points', translateComma($points));
+                               setPostRequestParameter('type'         , $content['type']);
 
                                // Subtract points from member's account
                                subtractPoints('payout', getMemberId(), $points);
@@ -185,16 +186,16 @@ ORDER BY
 VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
                                        array(
                                                getMemberId(),
-                                               bigintval(postRequestElement('payout')),
-                                               bigintval(getRequestElement('payout')),
-                                               postRequestElement('turl'),
-                                               postRequestElement('alt'),
-                                               postRequestElement('banner')
+                                               bigintval(postRequestParameter('payout')),
+                                               bigintval(getRequestParameter('payout')),
+                                               postRequestParameter('turl'),
+                                               postRequestParameter('alt'),
+                                               postRequestParameter('banner')
                                        ), __FILE__, __LINE__);
 
                                        // Load templates
                                        $message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getMemberId());
-                                       if (getExtensionVersion('admins') >= '0.4.1') {
+                                       if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
                                                $adm_tpl = 'admin_payout_request_banner';
                                        } else {
                                                $message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getMemberId());
@@ -205,11 +206,11 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
 VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                        array(
                                                getMemberId(),
-                                               bigintval(postRequestElement('payout')),
-                                               bigintval(postRequestElement('account')),
-                                               postRequestElement('bank'),
-                                               bigintval(getRequestElement('payout')),
-                                               postRequestElement('pass')
+                                               bigintval(postRequestParameter('payout')),
+                                               bigintval(postRequestParameter('account')),
+                                               postRequestParameter('bank'),
+                                               bigintval(getRequestParameter('payout')),
+                                               postRequestParameter('pass')
                                        ), __FILE__, __LINE__);
 
                                        // Load templates
@@ -218,7 +219,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                        $admin_tpl = '';
 
                                        // @TODO Rewrite this to a filter
-                                       if (getExtensionVersion('admins') >= '0.4.1') {
+                                       if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
                                                $admin_tpl = 'admin_payout_request';
                                        } // END - if
                                }
@@ -239,7 +240,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                $content = array(
                                        'max'    => $max,
                                        'type'   => $content['type'],
-                                       'payout' => bigintval(getRequestElement('payout'))
+                                       'payout' => bigintval(getRequestParameter('payout'))
                                );
 
                                // Generate banner order form
@@ -249,7 +250,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                $content = array(
                                        'max'    => $max,
                                        'type'   => $content['type'],
-                                       'payout' => bigintval(getRequestElement('payout'))
+                                       'payout' => bigintval(getRequestParameter('payout'))
                                );
 
                                // Generate normal form