#36 - minor changes.

inc/classes/BxDolFormQuery.php

@@ -59,8 +59,10 @@ class BxDolFormQuery extends BxDolDb {
         $aForm['form_attrs'] = array_merge($aDefaultsFormAttrs, !empty($aAddFormAttrs) && is_array($aAddFormAttrs) ? $aAddFormAttrs : array());
 
         // form action
-        if (!empty($aForm['form_attrs']['action']) && 0 != strncasecmp($aForm['form_attrs']['action'], 'http://', 7) && 0 != strncasecmp($aForm['form_attrs']['action'], 'https://', 8))
-            $aForm['form_attrs']['action'] = BX_DOL_URL_ROOT . $aForm['form_attrs']['action'];
+        if (!empty($aForm['form_attrs']['action']) && 0 != strncasecmp($aForm['form_attrs']['action'], 'http://', 7) && 0 != strncasecmp($aForm['form_attrs']['action'], 'https://', 8)) {
+        	bx_import('BxDolPermalinks');
+            $aForm['form_attrs']['action'] = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($aForm['form_attrs']['action']);
+        }
         
         // params
         if (!empty($aObject['params']))

modules/boonex/contact/classes/BxContactModule.php

@@ -63,7 +63,7 @@ class BxContactModule extends BxDolModule
 		        	'SenderName' => bx_process_output($oForm->getCleanValue('name')),
 		        	'SenderEmail' => bx_process_output($oForm->getCleanValue('email')),
 		        	'MessageSubject' => bx_process_output($oForm->getCleanValue('subject')),
-		        	'MessageBody' => bx_process_output($oForm->getCleanValue('body'), BX_DATA_TEXT_MULTILINE),
+		        	'MessageBody' => bx_process_output(nl2br($oForm->getCleanValue('body')), BX_DATA_TEXT_MULTILINE),
 		        	'CustomFields' => $sCustomFields,
 		        );
 		        $aTemplateKeys = array_merge($aTemplateKeys, $aCustomFields);