Wed Feb 8 13:30:46 2006 Michael Jennings (mej)

Convert messu to messages.
----------------------------------------------------------------------

19 files changed, 78 insertions, 76 deletions

diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 62b11d2..4707ae0 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -39,10 +39,10 @@ $tables = array(
 global $gBitInstaller;
 
 foreach( array_keys( $tables ) AS $tableName ) {
-	$gBitInstaller->registerSchemaTable( MESSU_PKG_NAME, $tableName, $tables[$tableName] );
+	$gBitInstaller->registerSchemaTable( MESSAGES_PKG_NAME, $tableName, $tables[$tableName] );
 }
 
-$gBitInstaller->registerPackageInfo( MESSU_PKG_NAME, array(
+$gBitInstaller->registerPackageInfo( MESSAGES_PKG_NAME, array(
 	'description' => "An intra-site messaging system for users.",
 	'license' => '<a href="http://www.gnu.org/licenses/licenses.html#LGPL">LGPL</a>',
 	'version' => '0.1',
@@ -52,7 +52,7 @@ $gBitInstaller->registerPackageInfo( MESSU_PKG_NAME, array(
 
 
 // ### Default User Permissions
-$gBitInstaller->registerUserPermissions( MESSU_PKG_NAME, array(
+$gBitInstaller->registerUserPermissions( MESSAGES_PKG_NAME, array(
 	array('bit_p_messages', 'Can use the messaging system', 'registered', 'messages'),
 ) );
 
@@ -63,6 +63,6 @@ $indices = array (
 );
 // TODO - SPIDERR - following seems to cause time _decrease_ cause bigint on postgres. need more investigation
 //	'blog_posts_created_idx' => array( 'table' => 'blog_posts', 'cols' => 'created', 'opts' => NULL ),
-$gBitInstaller->registerSchemaIndexes( MESSU_PKG_NAME, $indices );
+$gBitInstaller->registerSchemaIndexes( MESSAGES_PKG_NAME, $indices );
 
 ?>
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index ce6a360..8d5fe81 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -52,7 +52,7 @@ array( 'DATADICT' => array(
 
 array( 'DATADICT' => array(
 	array( 'CREATE' => array (
-		'messu_system_message_map' => "
+		'messages_system_message_map' => "
 			msg_id I4,
 			to_user_id I4 NOTNULL,
 			is_read C(1),
@@ -60,7 +60,7 @@ array( 'DATADICT' => array(
 			is_replied C(1),
 			priority I4,
 			is_hidden C(1)
-			CONSTRAINTS	', CONSTRAINT `tiki_messu_system_message_ref` FOREIGN KEY (`msg_id`) REFERENCES `".BIT_DB_PREFIX."messu_messages` (`msg_id`)'
+			CONSTRAINTS	', CONSTRAINT `tiki_messages_system_message_ref` FOREIGN KEY (`msg_id`) REFERENCES `".BIT_DB_PREFIX."messu_messages` (`msg_id`)'
 		"
 	)),
 	array( 'ALTER' => array(
@@ -71,6 +71,8 @@ array( 'DATADICT' => array(
 	// de-tikify tables
 	array( 'RENAMETABLE' => array(
 		'messu_messages' => 'messages',
+		'messu_archive' => 'messages_archive',
+		'messu_sent' => 'messages_sent',
 	)),
 )),
 
@@ -79,7 +81,7 @@ array( 'DATADICT' => array(
 );
 
 if( isset( $upgrades[$gUpgradeFrom][$gUpgradeTo] ) ) {
-	$gBitSystem->registerUpgrade( MESSU_PKG_NAME, $upgrades[$gUpgradeFrom][$gUpgradeTo] );
+	$gBitSystem->registerUpgrade( MESSAGES_PKG_NAME, $upgrades[$gUpgradeFrom][$gUpgradeTo] );
 }
 
 
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 9e05848..262e82e 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -1,10 +1,10 @@
 <?php
 global $gBitSystem;
-$gBitSystem->registerPackage( 'messu', dirname( __FILE__).'/' );
+$gBitSystem->registerPackage( 'messages', dirname( __FILE__).'/' );
 
-if( $gBitSystem->isPackageActive( 'messu' ) && $gBitUser->hasPermission( 'bit_p_messages' ) ) {
-	require_once( MESSU_PKG_PATH.'messages_lib.php' );
-	$unreadMsgs = $messulib->user_unread_messages( $gBitUser->mUserId );
+if( $gBitSystem->isPackageActive( 'messages' ) && $gBitUser->hasPermission( 'bit_p_messages' ) ) {
+	require_once( MESSAGES_PKG_PATH.'messages_lib.php' );
+	$unreadMsgs = $messageslib->user_unread_messages( $gBitUser->mUserId );
 	$gBitSmarty->assign_by_ref( 'unreadMsgs', $unreadMsgs );
 }
 ?>
diff --git a/broadcast.php b/broadcast.php
index e5a8f28..45c9bce 100644
--- a/broadcast.php
+++ b/broadcast.php
@@ -3,7 +3,7 @@
 * message package modules
 *
 * @author   
-* @version  $Header: /cvsroot/bitweaver/_bit_messages/broadcast.php,v 1.8 2006/02/04 19:04:34 squareing Exp $
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/broadcast.php,v 1.9 2006/02/08 18:32:11 mej Exp $
 * @package  messages
 * @subpackage functions
 */
@@ -17,7 +17,7 @@
  */
 require_once( '../bit_setup_inc.php' );
 
-include_once( MESSU_PKG_PATH.'messages_lib.php' );
+include_once( MESSAGES_PKG_PATH.'messages_lib.php' );
 
 if (!$gBitUser->isRegistered()) {
 	$gBitSmarty->assign('msg', tra("You are not logged in"));
@@ -26,7 +26,7 @@ if (!$gBitUser->isRegistered()) {
 	die;
 }
 
-$gBitSystem->isPackageActive( 'messu', TRUE );
+$gBitSystem->isPackageActive( 'messages', TRUE );
 $gBitSystem->verifyPermission( 'bit_p_broeadcast_messages' );
 
 if (!isset($_REQUEST['to']))
@@ -59,7 +59,7 @@ $gBitSmarty->assign('priority', $_REQUEST['priority']);
 $gBitSmarty->assign('sent', 0);
 
 if (isset($_REQUEST['reply']) || isset($_REQUEST['replyall'])) {
-	$messulib->flag_message($user, $_REQUEST['msg_id'], 'is_replied', 'y');
+	$messageslib->flag_message($user, $_REQUEST['msg_id'], 'is_replied', 'y');
 }
 
 
@@ -77,7 +77,7 @@ if (isset($_REQUEST['send'])) {
 	}
 
 	if (!count($errors)) {
-		$messulib->post_system_message($_REQUEST['subject'], $_REQUEST['body'], $_REQUEST['group']);
+		$messageslib->post_system_message($_REQUEST['subject'], $_REQUEST['body'], $_REQUEST['group']);
 		$message = "Message successfully broadcast";
 	}
 	$gBitSmarty->assign('message', $message);
@@ -95,5 +95,5 @@ if ($gBitUser->isAdmin()) {
 
 $gBitSmarty->assign('groups', $groups["data"]);
 
-$gBitSystem->display( 'bitpackage:messu/messages_broadcast.tpl');
+$gBitSystem->display( 'bitpackage:messages/messages_broadcast.tpl');
 ?>
diff --git a/compose.php b/compose.php
index a4006c7..4208819 100644
--- a/compose.php
+++ b/compose.php
@@ -3,7 +3,7 @@
 * message package modules
 *
 * @author   
-* @version  $Header: /cvsroot/bitweaver/_bit_messages/compose.php,v 1.5 2006/02/04 19:04:34 squareing Exp $
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/compose.php,v 1.6 2006/02/08 18:32:11 mej Exp $
 * @package  messages
 * @subpackage functions
 */
@@ -16,7 +16,7 @@
  * required setup
  */
 require_once( '../bit_setup_inc.php' );
-require_once( MESSU_PKG_PATH.'messages_lib.php' );
+require_once( MESSAGES_PKG_PATH.'messages_lib.php' );
 require_once( USERS_PKG_PATH.'BitUser.php' );
 
 if( !$gBitUser->isRegistered() ) {
@@ -25,7 +25,7 @@ if( !$gBitUser->isRegistered() ) {
 	die;
 }
 
-$gBitSystem->isPackageActive( 'messu', TRUE );
+$gBitSystem->isPackageActive( 'messages', TRUE );
 $gBitSystem->verifyPermission( 'bit_p_messages' );
 
 // Configure quicktags list
@@ -77,7 +77,7 @@ $feedback = array();
 $gBitSmarty->assign_by_ref( 'feedback', $feedback );
 
 if (isset($_REQUEST['replyto']) || isset($_REQUEST['replyallto'])) {
-	$messulib->flag_message( $gBitUser->mUserId, $_REQUEST['msg_id'], 'is_replied', 'y' );
+	$messageslib->flag_message( $gBitUser->mUserId, $_REQUEST['msg_id'], 'is_replied', 'y' );
 }
 
 if (isset($_REQUEST['send'])) {
@@ -96,10 +96,10 @@ if (isset($_REQUEST['send'])) {
 			// Insert the message in the inboxes of each user
 			foreach ($toUsers as $toUser) {
 				if( !empty( $toUser ) ) {
-					if( $messulib->post_message( $toUser, $_REQUEST['to'], $_REQUEST['cc'], $_REQUEST['bcc'], $_REQUEST['subject'], $_REQUEST['body'],$_REQUEST['priority'] ) ) {
+					if( $messageslib->post_message( $toUser, $_REQUEST['to'], $_REQUEST['cc'], $_REQUEST['bcc'], $_REQUEST['subject'], $_REQUEST['body'],$_REQUEST['priority'] ) ) {
 						$feedback['success'][] =  tra( "Message will be sent to: " ).' '.$toUser;
 					} else {
-						$feedback['error'][] = $messulib->mErrors['compose'];
+						$feedback['error'][] = $messageslib->mErrors['compose'];
 					}
 				}
 			}
@@ -112,5 +112,5 @@ if (isset($_REQUEST['send'])) {
 	}
 }
 
-$gBitSystem->display( 'bitpackage:messu/messages_compose.tpl', 'Compose Message' );
+$gBitSystem->display( 'bitpackage:messages/messages_compose.tpl', 'Compose Message' );
 ?>
diff --git a/contact.php b/contact.php
index fbf6339..c8a8e1c 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.6 2006/02/06 22:56:47 squareing Exp $
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/contact.php,v 1.7 2006/02/08 18:32:11 mej Exp $
 * @package  messages
 * @subpackage functions
 */
@@ -21,7 +21,7 @@ if( !$gBitSystem->isFeatureActive( 'site_contact' ) ) {
 	$gBitSystem->fatalError( "The Contact feature is disabled." );
 }
 
-include_once( MESSU_PKG_PATH.'messages_lib.php' );
+include_once( MESSAGES_PKG_PATH.'messages_lib.php' );
 
 $userInfo = $gBitUser->getUserInfo( array( 'login' => $gBitSystem->getPreference( 'contact_user' ) ) );
 $email = $userInfo['email'];
@@ -39,10 +39,10 @@ if (!empty($_REQUEST['send'])) {
 	if( empty( $_REQUEST['subject'] ) && empty( $_REQUEST['body'] ) ) {
 		$gBitSystem->fatalError( "Either a subject or a message body is required." );
 	}
-	$messulib->post_message( $userInfo['login'], $gBitUser->mUsername, $_REQUEST['to'], '', $_REQUEST['subject'], $_REQUEST['body'], $_REQUEST['priority']);
+	$messageslib->post_message( $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'] );
 	$gBitSmarty->assign( 'feedback', $feedback );
 }
 
-$gBitSystem->display( 'bitpackage:messu/contact.tpl');
+$gBitSystem->display( 'bitpackage:messages/contact.tpl');
 ?>
diff --git a/icons/pkg_messu.png b/icons/pkg_messages.png
index 280fc92..280fc92 100644
--- a/icons/pkg_messu.png
+++ b/icons/pkg_messages.png
diff --git a/message_box.php b/message_box.php
index 6498dfb..4bc2d60 100644
--- a/message_box.php
+++ b/message_box.php
@@ -3,7 +3,7 @@
 * message package modules
 *
 * @author
-* @version  $Header: /cvsroot/bitweaver/_bit_messages/message_box.php,v 1.9 2006/02/06 00:09:17 squareing Exp $
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/message_box.php,v 1.10 2006/02/08 18:32:11 mej Exp $
 * @package  messages
 * @subpackage functions
 */
@@ -16,7 +16,7 @@
  * required setup
  */
 require_once( '../bit_setup_inc.php' );
-require_once( MESSU_PKG_PATH.'messages_lib.php' );
+require_once( MESSAGES_PKG_PATH.'messages_lib.php' );
 
 if( !$gBitUser->isRegistered() ) {
 	$gBitSmarty->assign('msg', tra("You are not logged in"));
@@ -24,7 +24,7 @@ if( !$gBitUser->isRegistered() ) {
 	die;
 }
 
-$gBitSystem->isPackageActive( 'messu', TRUE );
+$gBitSystem->isPackageActive( 'messages', TRUE );
 $gBitSystem->verifyPermission( 'bit_p_messages' );
 
 $max_records = $gBitSystem->getPreference( 'max_records', 20 );
@@ -33,14 +33,14 @@ $max_records = $gBitSystem->getPreference( 'max_records', 20 );
 if (isset($_REQUEST["mark"]) && isset($_REQUEST["msg"])) {
 	foreach (array_keys($_REQUEST["msg"])as $msg) {
 		$parts = explode('_', $_REQUEST['action']);
-		$messulib->flag_message($gBitUser->mUserId, $msg, $parts[0].'_'.$parts[1], $parts[2]);
+		$messageslib->flag_message($gBitUser->mUserId, $msg, $parts[0].'_'.$parts[1], $parts[2]);
 	}
 }
 
 // Delete messages if the delete button was pressed
 if (isset($_REQUEST["delete"]) && isset($_REQUEST["msg"])) {
 	foreach (array_keys($_REQUEST["msg"])as $msg) {
-		$messulib->delete_message( $gBitUser->mUserId, $msg );
+		$messageslib->delete_message( $gBitUser->mUserId, $msg );
 	}
 }
 
@@ -87,7 +87,7 @@ $gBitSmarty->assign_by_ref('offset', $offset);
 $gBitSmarty->assign_by_ref('sort_mode', $sort_mode);
 $gBitSmarty->assign('find', $find);
 // What are we paginating: items
-$items = $messulib->list_messages( $gBitUser->mUserId, $offset, $max_records, $sort_mode,
+$items = $messageslib->list_messages( $gBitUser->mUserId, $offset, $max_records, $sort_mode,
 	$find, $_REQUEST["flag"], $_REQUEST["flagval"], $_REQUEST['priority']);
 
 $cant_pages = ceil($items["cant"] / $max_records);
@@ -108,5 +108,5 @@ if ($offset > 0) {
 
 $gBitSmarty->assign_by_ref('items', $items["data"]);
 
-$gBitSystem->display( 'bitpackage:messu/messages_mailbox.tpl', 'Message box' );
+$gBitSystem->display( 'bitpackage:messages/messages_mailbox.tpl', 'Message box' );
 ?>
diff --git a/messages_lib.php b/messages_lib.php
index a750eb2..7314ed4 100644
--- a/messages_lib.php
+++ b/messages_lib.php
@@ -3,19 +3,19 @@
 * message package modules
 *
 * @author   
-* @version  $Revision: 1.2 $
+* @version  $Revision: 1.3 $
 * @package  messages
 */
 
 /**
-* Messu base class
+* Messages base class
 *
 * @package  messages
-* @subpackage  Messu
+* @subpackage  Messages
 */
-class Messu extends BitBase {
+class Messages extends BitBase {
 
-	function Messu() {
+	function Messages() {
 		BitBase::BitBase();
 	}
 
@@ -59,7 +59,7 @@ class Messu extends BitBase {
 						$gBitSmarty->assign( 'mail_from', stripslashes( $gBitUser->getDisplayName() ) );
 						$gBitSmarty->assign( 'mail_subject', stripslashes($subject));
 						$gBitSmarty->assign( 'mail_body', stripslashes($body));
-						$mail_data = $gBitSmarty->fetch('bitpackage:messu/messages_message_notification.tpl');
+						$mail_data = $gBitSmarty->fetch('bitpackage:messages/messages_message_notification.tpl');
 
 						if( !empty( $userInfo['email'] ) ) {
 							@mail($userInfo['email'], tra('New message arrived from '). $mailSite, $mail_data,
@@ -388,7 +388,7 @@ class Messu extends BitBase {
 	}
 }
 
-global $messulib;
-$messulib = new Messu();
+global $messageslib;
+$messageslib = new Messages();
 
 ?>
diff --git a/modules/mod_unread_messages.tpl b/modules/mod_unread_messages.tpl
index 9cde826..09f105e 100644
--- a/modules/mod_unread_messages.tpl
+++ b/modules/mod_unread_messages.tpl
@@ -1,7 +1,7 @@
-{* $Header: /cvsroot/bitweaver/_bit_messages/modules/mod_unread_messages.tpl,v 1.2 2005/08/07 17:41:18 squareing Exp $ *}
-{if $gBitUser->isRegistered() and $gBitSystem->isPackageActive( 'messu') and $gBitUser->hasPermission( 'bit_p_messages' )}
+{* $Header: /cvsroot/bitweaver/_bit_messages/modules/mod_unread_messages.tpl,v 1.3 2006/02/08 18:32:11 mej Exp $ *}
+{if $gBitUser->isRegistered() and $gBitSystem->isPackageActive( 'messages') and $gBitUser->hasPermission( 'bit_p_messages' )}
 	{bitmodule title="$moduleTitle" name="messages_unread_messages"}
-		<a href="{$smarty.const.MESSU_PKG_URL}message_box.php">
+		<a href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">
 			{tr}You have <strong>{$unreadMsgs} unread</strong> {if $unreadMsgs eq '1'}message{else}messages{/if}{/tr}
 		</a>
 	{/bitmodule}
diff --git a/read.php b/read.php
index af4ecbe..265ece6 100644
--- a/read.php
+++ b/read.php
@@ -3,7 +3,7 @@
 * message package modules
 *
 * @author   
-* @version  $Header: /cvsroot/bitweaver/_bit_messages/read.php,v 1.5 2006/02/04 19:04:34 squareing Exp $
+* @version  $Header: /cvsroot/bitweaver/_bit_messages/read.php,v 1.6 2006/02/08 18:32:11 mej Exp $
 * @package  messages
 * @subpackage functions
 */
@@ -16,7 +16,7 @@
  * required setup
  */
 require_once( '../bit_setup_inc.php' );
-require_once( MESSU_PKG_PATH.'messages_lib.php' );
+require_once( MESSAGES_PKG_PATH.'messages_lib.php' );
 
 if( !$gBitUser->isRegistered() ) {
 	$gBitSmarty->assign('msg', tra("You are not logged in"));
@@ -24,12 +24,12 @@ if( !$gBitUser->isRegistered() ) {
 	die;
 }
 
-$gBitSystem->isPackageActive( 'messu', TRUE );
+$gBitSystem->isPackageActive( 'messages', TRUE );
 $gBitSystem->verifyPermission( 'bit_p_messages' );
 
 if (isset($_REQUEST["msgdel"])) {
 	
-	$messulib->delete_message($gBitUser->mUserId, $_REQUEST['msgdel']);
+	$messageslib->delete_message($gBitUser->mUserId, $_REQUEST['msgdel']);
 }
 
 $sort_mode = !empty( $_REQUEST['sort_mode'] ) ? $_REQUEST['sort_mode'] : '';
@@ -49,28 +49,28 @@ $gBitSmarty->assign('legend', '');
 
 if (!isset($_REQUEST['msg_id']) || $_REQUEST['msg_id'] == 0) {
 	$gBitSmarty->assign('legend', tra("No more messages"));
-	$gBitSystem->display( 'messu-read.tpl');
+	$gBitSystem->display( 'messages-read.tpl');
 	die;
 }
 
 if (isset($_REQUEST['act'])) {
-	$messulib->flag_message( $gBitUser->mUserId, $_REQUEST['msg_id'], $_REQUEST['act'], $_REQUEST['actval'] );
+	$messageslib->flag_message( $gBitUser->mUserId, $_REQUEST['msg_id'], $_REQUEST['act'], $_REQUEST['actval'] );
 }
 
 // Using the sort_mode, flag, flagval and find get the next and prev messages
 $gBitSmarty->assign('msg_id', $_REQUEST['msg_id']);
-$next = $messulib->get_next_message( $gBitUser->mUserId, $_REQUEST['msg_id'], $sort_mode, $find, $flag, $flagval, $priority );
-$prev = $messulib->get_prev_message( $gBitUser->mUserId, $_REQUEST['msg_id'], $sort_mode, $find, $flag, $flagval, $priority );
+$next = $messageslib->get_next_message( $gBitUser->mUserId, $_REQUEST['msg_id'], $sort_mode, $find, $flag, $flagval, $priority );
+$prev = $messageslib->get_prev_message( $gBitUser->mUserId, $_REQUEST['msg_id'], $sort_mode, $find, $flag, $flagval, $priority );
 $gBitSmarty->assign('next', $next);
 $gBitSmarty->assign('prev', $prev);
 
 // Mark the message as read
-$messulib->flag_message( $gBitUser->mUserId, $_REQUEST['msg_id'], 'is_read', 'y');
+$messageslib->flag_message( $gBitUser->mUserId, $_REQUEST['msg_id'], 'is_read', 'y');
 
 // Get the message and assign its data to template vars
-$msg = $messulib->get_message( $gBitUser->mUserId, $_REQUEST['msg_id']);
+$msg = $messageslib->get_message( $gBitUser->mUserId, $_REQUEST['msg_id']);
 $gBitSmarty->assign('msg', $msg);
 
-$gBitSystem->display( 'bitpackage:messu/messages_read.tpl');
+$gBitSystem->display( 'bitpackage:messages/messages_read.tpl');
 
 ?>
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
index 5481685..10a8854 100644
--- a/templates/header_inc.tpl
+++ b/templates/header_inc.tpl
@@ -3,7 +3,7 @@
 		var redirect = confirm( '{tr}You have {$unreadMsgs} message(s) waiting for you in your personal message box. Click OK to view your messages.{/tr}' );
 		if( redirect == true && !getCookie( 'message_alert_sent' ) ) {ldelim}
 			setCookie( 'message_alert_sent', true, 600 );
-			window.location="{$smarty.const.MESSU_PKG_URL}message_box.php";
+			window.location="{$smarty.const.MESSAGES_PKG_URL}message_box.php";
 		{rdelim}
 	</script>
 {/if}
diff --git a/templates/messages_broadcast.tpl b/templates/messages_broadcast.tpl
index ca46e22..55993f2 100644
--- a/templates/messages_broadcast.tpl
+++ b/templates/messages_broadcast.tpl
@@ -1,18 +1,18 @@
 <div class="floaticon">{bithelp}</div>
 <div class="contain usermessages">
 <div class="header">
-<h1><a href="{$smarty.const.MESSU_PKG_URL}broadcast.php">{tr}Broadcast message{/tr}</a></h1>
+<h1><a href="{$smarty.const.MESSAGES_PKG_URL}broadcast.php">{tr}Broadcast message{/tr}</a></h1>
 </div>
 
 {include file="bitpackage:users/my_bitweaver_bar.tpl"}
-{include file="bitpackage:messu/messages_nav.tpl"}
+{include file="bitpackage:messages/messages_nav.tpl"}
 
 <div class="body">
 {formfeedback error=$errors success=$message}
 {if $sent}
 	{$message}
 {else}
-<form action="{$smarty.const.MESSU_PKG_URL}broadcast.php" method="post">
+<form action="{$smarty.const.MESSAGES_PKG_URL}broadcast.php" method="post">
 <table class="panel">
   <tr>
     <td><label for="broadcast-group">{tr}Group{/tr}:</label></td>
diff --git a/templates/messages_compose.tpl b/templates/messages_compose.tpl
index 4e33bcf..9fad99f 100644
--- a/templates/messages_compose.tpl
+++ b/templates/messages_compose.tpl
@@ -11,7 +11,7 @@
 		{formfeedback hash=$feedback}
 
 		{if $feedback}
-			{tr}Return to your {smartlink ititle="Message Box" ipackage=messu ifile="message_box.php"}{/tr}
+			{tr}Return to your {smartlink ititle="Message Box" ipackage=messages ifile="message_box.php"}{/tr}
 		{/if}
 
 		{if !$feedback or $feedback.error}
diff --git a/templates/messages_mailbox.tpl b/templates/messages_mailbox.tpl
index 53e1370..2bd23f3 100644
--- a/templates/messages_mailbox.tpl
+++ b/templates/messages_mailbox.tpl
@@ -16,14 +16,14 @@
 			<input type="hidden" name="flagval" value="{$flagval|escape}" />
 			<input type="hidden" name="priority" value="{$priority|escape}" />
 
-			<a href="{$smarty.const.MESSU_PKG_URL}compose.php">{biticon ipackage=messu iname=send_mail iexplain="Compose Message" iforce=icon_text}</a>
+			<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{biticon ipackage=messages iname=send_mail iexplain="Compose Message" iforce=icon_text}</a>
 
 			{assign var=displayName value=$gBitSystem->getPreference("display_name","real_name") }
 			<table class="data">
 				<caption>{tr}Messages{/tr}</caption>
 				<tr>
 					<th style="width:1%">&nbsp;</th>
-					<th style="width:1%">{smartlink ititle="Flagged" isort=is_flagged ibiticon="messu/flagged" find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
+					<th style="width:1%">{smartlink ititle="Flagged" isort=is_flagged ibiticon="messages/flagged" find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
 					<th>{smartlink ititle="From" isort=$displayName find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
 					<th>{smartlink ititle="Subject" isort=subject find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
 					<th>{smartlink ititle="Date" isort=date find=$find flag=$flag offset=$offset priority=$priority flagval=$flagval}</th>
@@ -33,9 +33,9 @@
 				{section name=user loop=$items}
 					<tr class="{cycle values="odd,even"} prio{$items[user].priority}{if $items[user].is_read eq 'n'} highlight{/if}">
 						<td><input type="checkbox" name="msg[{$items[user].msg_id}]" /></td>
-						<td>{if $items[user].is_flagged eq 'y'}{biticon ipackage=messu iname=flagged iexplain="Flagged"}{/if}</td>
+						<td>{if $items[user].is_flagged eq 'y'}{biticon ipackage=messages iname=flagged iexplain="Flagged"}{/if}</td>
 						<td>{displayname hash=$items[user]}</td>
-						<td><a href="{$smarty.const.MESSU_PKG_URL}read.php?offset={$offset}&amp;flag={$flag}&amp;priority={$priority}&amp;flagval={$flagval}&amp;sort_mode={$sort_mode}&amp;find={$find}&amp;msg_id={$items[user].msg_id}">{$items[user].subject}</a></td>
+						<td><a href="{$smarty.const.MESSAGES_PKG_URL}read.php?offset={$offset}&amp;flag={$flag}&amp;priority={$priority}&amp;flagval={$flagval}&amp;sort_mode={$sort_mode}&amp;find={$find}&amp;msg_id={$items[user].msg_id}">{$items[user].subject}</a></td>
 						<td style="text-align:right;">{$items[user].date|bit_short_datetime}</td>
 						<td style="text-align:right;">{$items[user].len|kbsize}</td>
 					</tr>
diff --git a/templates/messages_message_notification.tpl b/templates/messages_message_notification.tpl
index 34b805d..2fccab5 100644
--- a/templates/messages_message_notification.tpl
+++ b/templates/messages_message_notification.tpl
@@ -1,5 +1,5 @@
 {tr}Hi,
-A new message was posted to you. To respond, please visit http://{$smarty.server.HTTP_HOST}{$smarty.const.MESSU_PKG_URL}message_box.php
+A new message was posted to you. To respond, please visit http://{$smarty.server.HTTP_HOST}{$smarty.const.MESSAGES_PKG_URL}message_box.php
 
 From: {$mail_from}
 Subject: {$mail_subject}
diff --git a/templates/messages_nav.tpl b/templates/messages_nav.tpl
index e2f2331..62b1988 100644
--- a/templates/messages_nav.tpl
+++ b/templates/messages_nav.tpl
@@ -1,9 +1,9 @@
 <div class="navbar">
 	<ul>
-		<li><a href="{$smarty.const.MESSU_PKG_URL}message_box.php">{tr}Mailbox{/tr}</a></li>
-		<li><a href="{$smarty.const.MESSU_PKG_URL}compose.php">{tr}Compose{/tr}</a></li>
+		<li><a href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">{tr}Mailbox{/tr}</a></li>
+		<li><a href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{tr}Compose{/tr}</a></li>
 		{if $gBitUser->hasPermission( 'bit_p_broadcast')}
-			<li><a href="{$smarty.const.MESSU_PKG_URL}broadcast.php">{tr}Broadcast{/tr}</a></li>
+			<li><a href="{$smarty.const.MESSAGES_PKG_URL}broadcast.php">{tr}Broadcast{/tr}</a></li>
 		{/if}
 	</ul>
 </div>
diff --git a/templates/messages_preferences_inc.tpl b/templates/messages_preferences_inc.tpl
index 75557c1..64a80ca 100644
--- a/templates/messages_preferences_inc.tpl
+++ b/templates/messages_preferences_inc.tpl
@@ -3,7 +3,7 @@
 	<div class="row">
 		{formlabel label="Personal Messages" for=""}
 		{forminput}
-			<a href="{$smarty.const.MESSU_PKG_URL}message_box.php">
+			<a href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">
 				{tr}You have <strong>{$unreadMsgs|default:no} unread</strong> {if $unreadMsgs eq '1'}message{else}messages{/if}{/tr}
 			</a>
 		{/forminput}
diff --git a/templates/messages_read.tpl b/templates/messages_read.tpl
index 5418694..cdcf0f3 100644
--- a/templates/messages_read.tpl
+++ b/templates/messages_read.tpl
@@ -17,7 +17,7 @@
 		<div class="navbar">
 			<ul>
 				{if $msg.is_flagged eq 'y'}
-					<li>{biticon ipackage=messu iname=flagged iexplain=Flagged} {smartlink ititle="Unflag Message" offset=$offset act=is_flagged actval=n msg_id=$msg_id sort_mode=$sort_mode find=$find flag=$flag priority=$priority flagval=$flagval}</li>
+					<li>{biticon ipackage=messages iname=flagged iexplain=Flagged} {smartlink ititle="Unflag Message" offset=$offset act=is_flagged actval=n msg_id=$msg_id sort_mode=$sort_mode find=$find flag=$flag priority=$priority flagval=$flagval}</li>
 				{else}
 					<li>{smartlink ititle="Flag Message" offset=$offset act=is_flagged actval=y msg_id=$msg_id sort_mode=$sort_mode find=$find flag=$flag priority=$priority flagval=$flagval}</li>
 				{/if}
@@ -30,7 +30,7 @@
 		{if $legend}
 			{$legend}
 		{else}
-			{form legend="Message" ipackage=messu ifile='compose.php'}
+			{form legend="Message" ipackage=messages ifile='compose.php'}
 				<div class="row">
 					{formlabel label="Date"}
 					{forminput}
@@ -106,7 +106,7 @@
 {*
 			<table class="panel">
 				<tr class="panelsubmitrow"><td>
-					<form method="post" action="{$smarty.const.MESSU_PKG_URL}read.php">
+					<form method="post" action="{$smarty.const.MESSAGES_PKG_URL}read.php">
 						<input type="hidden" name="offset" value="{$offset}" />
 						<input type="hidden" name="find" value="{$find|escape}" />
 						<input type="hidden" name="sort_mode" value="{$sort_mode}" />
@@ -125,7 +125,7 @@
 					</form>
 					</td>
 					<td>
-					<form method="post" action="{$smarty.const.MESSU_PKG_URL}compose.php">
+					<form method="post" action="{$smarty.const.MESSAGES_PKG_URL}compose.php">
 					<input type="hidden" name="offset" value="{$offset}" />
 					<input type="hidden" name="msg_id" value="{$msg_id}" />
 					<input type="hidden" name="find" value="{$find|escape}" />
@@ -140,7 +140,7 @@
 					</form>
 					</td>
 					<td>
-					<form method="post" action="{$smarty.const.MESSU_PKG_URL}compose.php">
+					<form method="post" action="{$smarty.const.MESSAGES_PKG_URL}compose.php">
 					<input type="hidden" name="offset" value="{$offset}" />
 					<input type="hidden" name="find" value="{$find|escape}" />
 					<input type="hidden" name="msg_id" value="{$msg_id}" />