Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

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

diff --git a/inc/modules/member/what-earning.php b/inc/modules/member/what-earning.php
index 8c93babde9595cdc323ab130d869eeddd4acfbae..c4a213e5de5fc2d1e514cbc0a773fd938cb3b3e6 100644 (file)
--- a/inc/modules/member/what-earning.php
+++ b/inc/modules/member/what-earning.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif (!isMember()) {
        redirectToIndexMemberOnlyModule();
 }
@@ -56,68 +56,68 @@ if (isFormSent()) {
 } // END - if
 
 // Check for all earnings
-$result = SQL_QUERY('SELECT
-       d.`earning_id`,
-       d.`earning_group`,
-       d.`earning_provider`
+$result = sqlQuery('SELECT
+       `d`.`earning_id`,
+       `d`.`earning_group`,
+       `d`.`earning_provider`
 FROM
-       `{?_MYSQL_PREFIX?}_earning_data` AS d
+       `{?_MYSQL_PREFIX?}_earning_data` AS `d`
 ORDER BY
-       d.`earning_sorting` ASC', __FILE__, __LINE__);
+       `d`.`earning_sorting` ASC', __FILE__, __LINE__);
 
-// Do we have entries?
-if (SQL_NUMROWS($result) > 0) {
+// Are there entries?
+if (!ifSqlHasZeroNumRows($result)) {
        // Init output
        $OUT = '';
 
        // List all entries
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($content = sqlFetchArray($result)) {
                // Load user_earning data
-               $result2 = SQL_QUERY_ESC('SELECT
-       u.`earning_active`,
-       UNIX_TIMESTAMP(u.`earning_added`) AS `earning_added`,
-       UNIX_TIMESTAMP(u.`earning_canceled`) AS `earning_canceled`,
-       u.`earning_daily_amount`,
-       u.`earning_points`
+               $result2 = sqlQueryEscaped('SELECT
+       `u`.`earning_active`,
+       UNIX_TIMESTAMP(`u`.`earning_added`) AS `earning_added`,
+       UNIX_TIMESTAMP(`u`.`earning_canceled`) AS `earning_canceled`,
+       `u`.`earning_daily_amount`,
+       `u`.`earning_points`
 FROM
-       `{?_MYSQL_PREFIX?}_user_earning` AS u
+       `{?_MYSQL_PREFIX?}_user_earning` AS `u`
 WHERE
-       u.`earning_id`=%s AND
-       u.`earning_userid`=%s
+       `u`.`earning_id`=%s AND
+       `u`.`earning_userid`=%s
 LIMIT 1',
                        array(
                                bigintval($content['earning_id']),
                                getMemberId()
                        ), __FILE__, __LINE__);
 
-               // Do we have an entry?
-               if (SQL_NUMROWS($result2) == 1) {
+               // Is there an entry?
+               if (sqlNumRows($result2) == 1) {
                        // Load it
-                       $content = merge_array($content, SQL_FETCHARRAY($result2));
+                       $content = merge_array($content, sqlFetchArray($result2));
                } // END - if
 
                // Free result
-               SQL_FREERESULT($result2);
+               sqlFreeResult($result2);
 
-               // Do we have user_earning data available?
+               // Is there user_earning data available?
                if (!isset($content['earning_active'])) {
                        // Load row template "open subscription"
-                       $OUT .= loadTemplate('member_earning_' . strtolower($content['earning_group']) . '_form_row', true, $content);
+                       $OUT .= loadTemplate('member_earning_' . strtolower($content['earning_group']) . '_form_row', TRUE, $content);
                } else {
                        // Load row template "already subscribed"
-                       $OUT .= loadTemplate('member_earning_' . strtolower($content['earning_group']) . '_row', true, $content);
+                       $OUT .= loadTemplate('member_earning_' . strtolower($content['earning_group']) . '_row', TRUE, $content);
                }
        } // END - while
 
        // Load main template
-       loadTemplate('member_earning', false, $OUT);
+       loadTemplate('member_earning', FALSE, $OUT);
 } else {
        // Display message
        displayMessage('{--MEMBER_EARNINGS_404--}');
 }
 
 // Free result
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // [EOF]
 ?>