More code parts could take advantage of previously improved fixEmptyContentToDashes():

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

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 1c78c583dddb2c449a0f43a9bb0ba11533b7bafe..03231df4cc2ede074fd42e355fc906c25cdd04fc 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -92,15 +92,8 @@ switch ($mode) {
                        // Test if a recipient is selected
                        $valid_recipient = isValidUserId(postRequestParameter('to_userid'));
 
-                       // Check for nickname extension and set additional data
-                       // @TODO Rewrite this to a filter
-                       $add = '';
-                       if (isExtensionActive('nickname')) {
-                               $add = ', `nickname`';
-                       } // END - if
-
                        // Re-check receivers and own personal data
-                       $result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email`".$add." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED' LIMIT 2",
+                       $result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED' LIMIT 2",
                                array(
                                        getMemberId(),
                                        bigintval(postRequestParameter('to_userid'))
@@ -206,34 +199,20 @@ switch ($mode) {
 
                if (!isFormSent()) {
                        // Load member list
-                       if (isExtensionActive('nickname')) {
-                               // Load userid and nickname
-                               $result = SQL_QUERY_ESC("SELECT `userid`, `nickname` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
-                                       array(getMemberId()), __FILE__, __LINE__);
-                       } else {
-                               // Load only userid
-                               $result = SQL_QUERY_ESC("SELECT `userid`, `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
-                                       array(getMemberId()), __FILE__, __LINE__);
-                       }
+                       $result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
+                               array(getMemberId()), __FILE__, __LINE__);
 
                        if (!SQL_HASZERONUMS($result)) {
                                // Load list
                                $OUT  = '<select name="to_userid" size="1" class="form_select">
        <option value="0">{--SELECT_NONE--}</option>';
-                               // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
-                               while (list($userid, $nick) = SQL_FETCHROW($result)) {
+                               while (list($userid) = SQL_FETCHROW($result)) {
                                        $OUT .= '       <option value="' . $userid . '"';
-                                       if ((isPostRequestParameterSet('to_userid')) && (postRequestParameter('to_userid') == $userid)) $OUT .= ' selected="selected"';
-                                       $OUT .= '>';
-                                       if (($nick != $userid) && (!empty($nick))) {
-                                               // Output nickname
-                                               $OUT .= $nick;
-                                       } else {
-                                               // Output userid
-                                               $OUT .= $userid;
-                                       }
-                                       $OUT .= '</option>';
-                               }
+                                       if ((isPostRequestParameterSet('to_userid')) && (postRequestParameter('to_userid') == $userid)) {
+                                               $OUT .= ' selected="selected"';
+                                       } // END - if
+                                       $OUT .= '>' . $userid . ' ({%user,nickname,fixEmptyContentToDashes=' . $userid . '%})</option>';
+                               } // END - while
                                $OUT .= '</select>';
                                $content['to_disabled'] = '';