fix contact feature and some other minor issues.

3 files changed, 12 insertions, 19 deletions

diff --git a/contact.php b/contact.php
index 8030f5d..a4a091f 100644
--- a/contact.php
+++ b/contact.php
@@ -3,7 +3,7 @@
 * message package modules
 *
 * @author   
-* @version  $Header: /cvsroot/bitweaver/_bit_messages/contact.php,v 1.13 2008/06/25 22:21:13 spiderr Exp $
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/contact.php,v 1.14 2008/10/14 22:03:40 squareing Exp $
 * @package  messages
 * @subpackage functions
 */
@@ -16,28 +16,21 @@
  * required setup
  */
 require_once( '../bit_setup_inc.php' );
+require_once( MESSAGES_PKG_PATH.'Messages.php' );
 
-if( !$gBitSystem->isFeatureActive( 'messages_site_contact' ) ) {
-	$gBitSystem->fatalError( tra( "The Contact feature is disabled." ));
-}
-
-include_once( MESSAGES_PKG_PATH.'Messages.php' );
+$gBitSystem->verifyFeature( 'messages_site_contact' );
 $messages = new Messages();
 
-$userInfo = $gBitUser->getUserInfo( array( 'login' => $gBitSystem->getConfig( 'messages_contact_user' ) ) );
-$email = $userInfo['email'];
-if( empty( $email ) ) {
-	$gBitSystem->fatalError( tra( "This feature is not correctly set up. The email address is missing." ));
-} else {
-	$gBitSmarty->assign( 'email', $email );
-}
-
-if (!empty($_REQUEST['send'])) {
+if( !empty( $_REQUEST['send'] )) {
 	if( empty( $_REQUEST['subject'] ) && empty( $_REQUEST['body'] ) ) {
 		$gBitSystem->fatalError( tra( "Either a subject or a message body is required." ));
 	}
-	$messages->postMessage( $userInfo['login'], $gBitUser->mUsername, $_REQUEST['to'], '', $_REQUEST['subject'], $_REQUEST['body'], $_REQUEST['priority']);
-	$feedback['success'] = tra( 'Your message was sent to' ).': '.( !empty( $userInfo['real_name'] ) ? $userInfo['real_name'] : $userInfo['login'] );
+
+	$postHash = $_REQUEST;
+	$postHash['to_login'] = $postHash['msg_to'] = $gBitSystem->getConfig( 'messages_contact_user' );
+	$messages->postMessage( $postHash );
+
+	$feedback['success'] = tra( 'Your message was sent to' ).': '.$gBitSystem->getConfig( 'messages_contact_user' );
 	$gBitSmarty->assign( 'feedback', $feedback );
 }
 
diff --git a/templates/contact.tpl b/templates/contact.tpl
index f838f54..af8e6c0 100644
--- a/templates/contact.tpl
+++ b/templates/contact.tpl
@@ -9,7 +9,7 @@
 
 		{form legend="Send us a message"}
 			<input type="hidden" name="to" value="{$gBitSystem->getConfig('messages_contact_user')|escape}" />
-			
+
 			<div class="row">
 				{formlabel label="Priority" for="priority"}
 				{forminput}
diff --git a/templates/read.tpl b/templates/read.tpl
index 933beb3..f0f3231 100644
--- a/templates/read.tpl
+++ b/templates/read.tpl
@@ -49,7 +49,7 @@
 				<div class="row">
 					{formlabel label="To"}
 					{forminput}
-						{$msg.msg_to}
+						{$msg.msg_to|default:"&nbsp;"}
 					{/forminput}
 				</div>