- list($uid1, $gender1, $sname1, $fname1, $email1, $nick1) = SQL_FETCHROW($result);
- list($uid2, $gender2, $sname2, $fname2, $email2, $nick2) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
- // @TODO Rewrite all these constants to array elements
- if ($uid1 == getUserId()) {
- // Data row 1 is sender's data
- define('__SENDER_GENDER' , translateGender($gender1));
- define('__SENDER_NICK' , $nick1);
- define('__SENDER_SNAME' , $sname1);
- define('__SENDER_FNAME' , $fname1);
- define('__SENDER_EMAIL' , $email1);
- // Data row 2 is recpient's data
- define('__RECIPIENT_GENDER', translateGender($gender2));
- define('__RECIPIENT_NICK' , $nick2);
- define('__RECIPIENT_SNAME' , $sname2);
- define('__RECIPIENT_FNAME' , $fname2);
- define('__RECIPIENT_EMAIL' , $email2);
-
- // Prepare variables for testing
- $TEST_NICK_SENDER = $nick1;
- $TEST_NICK_REC = $nick2;
- } else {
- // Data row 2 is sender's data
- define('__SENDER_GENDER' , translateGender($gender2));
- define('__SENDER_NICK' , $nick2);
- define('__SENDER_SNAME' , $sname2);
- define('__SENDER_FNAME' , $fname2);
- define('__SENDER_EMAIL' , $email2);
- // Data row 1 is recpient's data
- define('__RECIPIENT_GENDER', translateGender($gender1));
- define('__RECIPIENT_NICK' , $nick1);
- define('__RECIPIENT_SNAME' , $sname1);
- define('__RECIPIENT_FNAME' , $fname1);
- define('__RECIPIENT_EMAIL' , $email1);
-
- // Prepare variables for testing
- $TEST_NICK_SENDER = $nick2;
- $TEST_NICK_REC = $nick1;
- }
-
- // Sender's UID is always currently stored in cookie userid...
- define('__SENDER_UID' , getUserId());
- define('__RECIPIENT_UID' , REQUEST_POST('to_uid'));
-
- $SENDER = constant('__SENDER_UID');
- $RECIPIENT = constant('__RECIPIENT_UID');
- if ($nick) {
- if (($TEST_NICK_SENDER != constant('__SENDER_UID')) && (!empty($TEST_NICK_SENDER))) {
- $SENDER = constant('__SENDER_NICK');
- }
-
- if (($TEST_NICK_REC != constant('__RECIPIENT_UID')) && (!empty($TEST_NICK_REC))) {
- $RECIPIENT = constant('__RECIPIENT_NICK');
- }
- }
-
- // Remember transfer reason and fancy date/time in constants
- define('__TRANSFER_REASON', REQUEST_POST('reason'));
- define('__TRANSFER_EXPIRES', createFancyTime(getConfig('transfer_age')));
+ $content['sender'] = SQL_FETCHARRAY($result);
+ $content['recipient'] = SQL_FETCHARRAY($result);
+
+ // Is the nickname extension not installed?
+ if (!isExtensionActive('nickname')) {
+ // Fix empty nicknames
+ $content['sender']['nickname'] = '';
+ $content['recipient']['nickname'] = '';
+ } // END - if
+
+ // Prepare variables for testing
+ $TEST_NICK_SENDER = $content['sender']['nickname'];
+ $TEST_NICK_REC = $content['recipient']['nickname'];
+
+ // Default is userids for subject line
+ $SENDER = getMemberId();
+ $RECIPIENT = bigintval(postRequestElement('to_userid'));
+
+ // If nickname is installed we can set the nickname
+ // @TODO Rewrite this to a filter
+ if (isExtensionActive('nickname')) {
+ if (($TEST_NICK_SENDER != getMemberId()) && (!empty($TEST_NICK_SENDER))) {
+ $SENDER = $content['sender']['nickname'];
+ } // END - if
+
+ if (($TEST_NICK_REC != postRequestElement('to_userid')) && (!empty($TEST_NICK_REC))) {
+ $RECIPIENT = $content['recipient']['nickname'];
+ } // END - if
+ } // END - if
+
+ // Remember transfer reason
+ $content['reason'] = postRequestElement('reason');