Fix for fix... :(

[mailer.git] / inc / modules / admin / overview-inc.php

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 637e12009ceaa8fe7bed119ecfcbf03d4f73866a..278c2b0e7a24c9778631e117388c2920363aab5e 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -167,14 +167,10 @@ LIMIT 1",
                                // Is a userid assign?
                                if ($userid > 0) {
                                        // Then load his data!
-                                       // @TODO Can this SQL be encapsulated in a function, so all similar queries can be rewritten?
-                                       $result_user = SQL_QUERY_ESC("SELECT `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-                                               array(bigintval($userid)), __FILE__, __LINE__);
-
-                                       // Entry found?
-                                       if (SQL_NUMROWS($result_user) == 1) {
+                                       if (fetchUserData($userid)) {
                                                // Fetch row
-                                               $content = SQL_FETCHARRAY($result_user);
+                                               $content = getUserDataArray();
+
                                                // Generate HTML list entry
                                                $add = "<li>{--ADMIN_MEMBER_UID--}: <strong>".generateUserProfileLink($userid, 'user_data')." (<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>)</strong></li>";
                                        } else {
@@ -182,9 +178,6 @@ LIMIT 1",
                                                logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $userid . ' -> not found!');
                                                $userid = 0;
                                        }
-
-                                       // Free result
-                                       SQL_FREERESULT($result_user);
                                } // END - if
 
                                // Decode entities of the text
@@ -334,14 +327,14 @@ LIMIT 1",
                                                        SQL_FREERESULT($result_pay);
 
                                                        if ((!empty($pid)) && ($pid > 0)) {
-                                                               // Payout ID can be obtained
+                                                               // Payout id can be obtained
                                                                $content = array(
                                                                        'pid' => $pid,
                                                                        'tid' => $tid,
                                                                );
                                                                $OUT .= loadTemplate('admin_payout_overview_form', true, $content);
                                                        } else {
-                                                               // Problem obtaining payout ID
+                                                               // Problem obtaining payout id
                                                                $OUT .= "<div class=\"admin_failed medium\">{--PAYOUT_OBTAIN_ID_FAILED--}</div>\n";
                                                        }
                                                } else {
@@ -359,14 +352,14 @@ LIMIT 1",
                                                        SQL_FREERESULT($result_pay);
 
                                                        if ((!empty($pid)) && ($pid > 0)) {
-                                                               // Payout ID can be obtained
+                                                               // Payout id can be obtained
                                                                $content = array(
                                                                        'pid' => $pid,
                                                                        'tid' => $tid,
                                                                );
                                                                $OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
                                                        } else {
-                                                               // Problem obtaining wernis ID
+                                                               // Problem obtaining wernis id
                                                                $OUT .= "<div class=\"admin_failed medium\">{--WERNIS_OBTAIN_ID_FAILED--}</div>\n";
                                                        }
                                                } else {