Fixed issue: Replacing @@SURVEYURL@@ incorrectly in RPC

When using the value @@SURVEYURL@@ in an email, SURVEYURL will be replaced by calling ReplaceFields as it's a part of the $fieldsarray.
This way, the barebone_link is never replaced correctly.

To fix this, we need to replace the barebone_link before caling ReplaceFields.

To reproduce:

• Add @@SURVEYURL@@ to an email template (invite or remind in my case)
• Send a mail using the RPC.