summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2005-10-29 17:54:36 +0000
committerMax Kremmel <xing@synapse.plus.com>2005-10-29 17:54:36 +0000
commit3d585d9232c8f259e3222cf923a5ef961f04fed5 (patch)
tree1929d708e68e253fd1bf2c1a5bdadd7483feb568
parent4909b8eb408a111961ee0c4e553f4d2307ea1cd3 (diff)
downloadmessages-3d585d9232c8f259e3222cf923a5ef961f04fed5.tar.gz
messages-3d585d9232c8f259e3222cf923a5ef961f04fed5.tar.bz2
messages-3d585d9232c8f259e3222cf923a5ef961f04fed5.zip
merge recent changes into HEAD
-rw-r--r--message_box.php5
-rw-r--r--templates/contact.tpl2
-rw-r--r--templates/messu_broadcast.tpl2
-rw-r--r--templates/messu_compose.tpl2
-rw-r--r--templates/messu_message_notification.tpl2
5 files changed, 6 insertions, 7 deletions
diff --git a/message_box.php b/message_box.php
index 7f0b35b..331f5d9 100644
--- a/message_box.php
+++ b/message_box.php
@@ -2,8 +2,8 @@
/**
* message package modules
*
-* @author
-* @version $Header: /cvsroot/bitweaver/_bit_messages/message_box.php,v 1.5 2005/10/12 20:11:32 drewslater Exp $
+* @author
+* @version $Header: /cvsroot/bitweaver/_bit_messages/message_box.php,v 1.6 2005/10/29 17:54:36 squareing Exp $
* @package messages
* @subpackage functions
*/
@@ -39,7 +39,6 @@ if (isset($_REQUEST["mark"]) && isset($_REQUEST["msg"])) {
// 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 );
}
diff --git a/templates/contact.tpl b/templates/contact.tpl
index 3e32921..163d22a 100644
--- a/templates/contact.tpl
+++ b/templates/contact.tpl
@@ -44,7 +44,7 @@
<div class="row">
{forminput}
- <textarea rows="20" cols="80" name="body" id="message_body"></textarea>
+ <textarea rows="20" cols="50" name="body" id="message_body"></textarea>
{formhelp note=""}
{/forminput}
</div>
diff --git a/templates/messu_broadcast.tpl b/templates/messu_broadcast.tpl
index 2a584fc..a188eae 100644
--- a/templates/messu_broadcast.tpl
+++ b/templates/messu_broadcast.tpl
@@ -41,7 +41,7 @@
<td><label for="broadcast-subject">{tr}Subject{/tr}:</label></td><td><input type="text" name="subject" id="broadcast-subject" value="{$subject|escape}" size="50" maxlength="255"/></td>
</tr>
<tr>
- <td><label for="broadcast-body">{tr}Body{/tr}:</label></td><td align="center"><textarea rows="20" cols="80" name="body">{$body|escape}</textarea></td>
+ <td><label for="broadcast-body">{tr}Body{/tr}:</label></td><td align="center"><textarea rows="20" cols="50" name="body">{$body|escape}</textarea></td>
</tr>
<tr class="panelsubmitrow">
<td colspan="2"><input type="submit" name="send" value="{tr}send message{/tr}" /></td>
diff --git a/templates/messu_compose.tpl b/templates/messu_compose.tpl
index 29e4304..4e33bcf 100644
--- a/templates/messu_compose.tpl
+++ b/templates/messu_compose.tpl
@@ -70,7 +70,7 @@
<div class="row">
{forminput}
- <textarea rows="20" cols="80" name="body" id="message_body">{$body|escape}</textarea>
+ <textarea rows="20" cols="50" name="body" id="message_body">{$body|escape}</textarea>
{/forminput}
</div>
diff --git a/templates/messu_message_notification.tpl b/templates/messu_message_notification.tpl
index e9525a1..34b805d 100644
--- a/templates/messu_message_notification.tpl
+++ b/templates/messu_message_notification.tpl
@@ -1,5 +1,5 @@
{tr}Hi,
-A new message was posted to you. To respond, please visit {$gBitLoc.MESSU_PKG_URL}message_box.php
+A new message was posted to you. To respond, please visit http://{$smarty.server.HTTP_HOST}{$smarty.const.MESSU_PKG_URL}message_box.php
From: {$mail_from}
Subject: {$mail_subject}