more message cleanup, simplified a couple of functions, removed lots of the crazy assign stuff - used smarty.request. stuff instead

2 files changed, 27 insertions, 80 deletions

diff --git a/templates/mailbox.tpl b/templates/mailbox.tpl
index 3582338..3fb0005 100644
--- a/templates/mailbox.tpl
+++ b/templates/mailbox.tpl
@@ -10,11 +10,11 @@
 
 	<div class="body">
 		{form legend="Your Personal Messages"}
-			<input type="hidden" name="find" value="{$find|escape}" />
-			<input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
-			<input type="hidden" name="flag" value="{$flag|escape}" />
-			<input type="hidden" name="flagval" value="{$flagval|escape}" />
-			<input type="hidden" name="priority" value="{$priority|escape}" />
+			<input type="hidden" name="find" value="{$smarty.request.find|escape}" />
+			<input type="hidden" name="sort_mode" value="{$smarty.request.sort_mode|escape}" />
+			<input type="hidden" name="flag" value="{$smarty.request.flag|escape}" />
+			<input type="hidden" name="flagval" value="{$smarty.request.flagval|escape}" />
+			<input type="hidden" name="priority" value="{$smarty.request.priority|escape}" />
 
 			<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{biticon ipackage="icons" iname="mail-forward" iexplain="Compose Message" iforce=icon_text}</a>
 
@@ -23,10 +23,10 @@
 				<caption>{tr}Messages{/tr}</caption>
 				<tr>
 					<th style="width:1%">&nbsp;</th>
-					<th style="width:1%">{smartlink ititle="Flagged" isort=is_flagged ibiticon="icons/mail-mark-important" find=$find flag=$flag priority=$priority flagval=$flagval}</th>
-					<th>{smartlink ititle="From" isort=$displayName find=$find flag=$flag priority=$priority flagval=$flagval}</th>
-					<th>{smartlink ititle="Subject" isort=subject find=$find flag=$flag priority=$priority flagval=$flagval}</th>
-					<th>{smartlink ititle="Date" isort=msg_date find=$find flag=$flag priority=$priority flagval=$flagval}</th>
+					<th style="width:1%">{smartlink ititle="Flagged" isort=is_flagged ibiticon="icons/mail-mark-important" find=$smarty.request.find flag=$smarty.request.flag priority=$smarty.request.priority flagval=$smarty.request.flagval}</th>
+					<th>{smartlink ititle="From" isort=$displayName find=$smarty.request.find flag=$smarty.request.flag priority=$smarty.request.priority flagval=$smarty.request.flagval}</th>
+					<th>{smartlink ititle="Subject" isort=subject find=$smarty.request.find flag=$smarty.request.flag priority=$smarty.request.priority flagval=$smarty.request.flagval}</th>
+					<th>{smartlink ititle="Date" isort=msg_date find=$smarty.request.find flag=$smarty.request.flag priority=$smarty.request.priority flagval=$smarty.request.flagval}</th>
 					<th>{tr}Size{/tr}</th>
 				</tr>
 
@@ -36,7 +36,7 @@
 						<td class="prio{$items[user].priority}">{if $items[user].is_flagged eq 'y'}{biticon ipackage="icons" iname="mail-mark-important" iexplain="Flagged"}{/if}</td>
 						<td>{displayname hash=$items[user]}</td>
 						<td>
-							<a href="{$smarty.const.MESSAGES_PKG_URL}read.php?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>
+							<a href="{$smarty.const.MESSAGES_PKG_URL}read.php?flag={$smarty.request.flag}&amp;priority={$smarty.request.priority}&amp;flagval={$smarty.request.flagval}&amp;sort_mode={$smarty.request.sort_mode}&amp;find={$smarty.request.find}&amp;msg_id={$items[user].msg_id}">{$items[user].subject}</a>
 							{if $items[user].is_broadcast_message} <small>[{tr}broadcast{/tr}]</small>{/if}
 						</td>
 						<td style="text-align:right;">{$items[user].msg_date|bit_short_datetime}</td>
@@ -94,7 +94,7 @@
 			<div class="row">
 				{formlabel label="Containing" for="find"}
 				{forminput}
-					<input type="text" name="find" size="40" id="find" value="{$find|escape}" />
+					<input type="text" name="find" size="40" id="find" value="{$smarty.request.find|escape}" />
 					{formhelp note=""}
 				{/forminput}
 			</div>
diff --git a/templates/read.tpl b/templates/read.tpl
index 95fad21..fed771e 100644
--- a/templates/read.tpl
+++ b/templates/read.tpl
@@ -18,13 +18,13 @@
 		<div class="navbar">
 			<ul>
 				{if $msg.is_flagged eq 'y'}
-					<li>{biticon ipackage="icons" iname="mail-mark-important" 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="icons" iname="mail-mark-important" iexplain=Flagged} {smartlink ititle="Unflag Message" offset=$smarty.request.offset act=is_flagged actval=n msg_id=$msg_id sort_mode=$smarty.request.sort_mode find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.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>
+					<li>{smartlink ititle="Flag Message" offset=$smarty.request.offset act=is_flagged actval=y msg_id=$msg_id sort_mode=$smarty.request.sort_mode find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>
 				{/if}
-				<li>{smartlink ititle="Delete" msg_id=$read_id offset=$offset msgdel=$msg_id sort_mode=$sort_mode find=$find flag=$flag priority=$priority flagval=$flagval}</li>
-				{if $prev}<li>{smartlink ianchor=top ititle="Previous message" ibiticon="icons/go-previous" sort_mode=$sort_mode msg_id=$prev find=$find flag=$flag priority=$priority flagval=$flagval}</li>{/if}
-				{if $next}<li>{smartlink ianchor=top ititle="Next message" ibiticon="icons/go-next" sort_mode=$sort_mode msg_id=$next find=$find flag=$flag priority=$priority flagval=$flagval}</li>{/if}
+				<li>{smartlink ititle="Delete" msg_id=$read_id offset=$smarty.request.offset msgdel=$msg_id sort_mode=$smarty.request.sort_mode find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>
+				{if $prev}<li>{smartlink ianchor=top ititle="Previous message" ibiticon="icons/go-previous" sort_mode=$smarty.request.sort_mode msg_id=$prev find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>{/if}
+				{if $next}<li>{smartlink ianchor=top ititle="Next message" ibiticon="icons/go-next" sort_mode=$smarty.request.sort_mode msg_id=$next find=$smarty.request.find flag=$smarty.request.flag priority=$priority flagval=$smarty.request.flagval}</li>{/if}
 			</ul>
 		</div>
 
@@ -75,17 +75,17 @@
 					{/forminput}
 				</div>
 
-				<input type="hidden" name="offset" value="{$offset}" />
-				<input type="hidden" name="find" value="{$find|escape}" />
-				<input type="hidden" name="sort_mode" value="{$sort_mode}" />
-				<input type="hidden" name="flag" value="{$flag}" />
-				<input type="hidden" name="flagval" value="{$flagval}" />
-				<input type="hidden" name="priority" value="{$priority}" />
-				<input type="hidden" name="msgdel" value="{$msg_id}" />
-				<input type="hidden" name="replyto" value="{$msg.from_user_id}" />
-				<input type="hidden" name="replyallto" value="{$msg.msg_to},{$msg.msg_cc}" />
-				<input type="hidden" name="subject" value="{tr}Re:{/tr} {$msg.subject}" />
-				<input type="hidden" name="body" value="{$msg.body|quoted|escape}" />
+				<input type="hidden" name="offset"     value="{$smarty.request.offset}" />
+				<input type="hidden" name="find"       value="{$smarty.request.find|escape}" />
+				<input type="hidden" name="sort_mode"  value="{$smarty.request.sort_mode}" />
+				<input type="hidden" name="flag"       value="{$smarty.request.flag}" />
+				<input type="hidden" name="flagval"    value="{$smarty.request.flagval}" />
+				<input type="hidden" name="priority"   value="{$smarty.request.priority}" />
+				<input type="hidden" name="msgdel"     value="{$smarty.request.msg_id}" />
+				<input type="hidden" name="replyto"    value="{$smarty.request.msg.from_user_id}" />
+				<input type="hidden" name="replyallto" value="{$smarty.request.msg.msg_to},{$msg.msg_cc}" />
+				<input type="hidden" name="subject"    value="{tr}Re:{/tr} {$msg.subject}" />
+				<input type="hidden" name="body"       value="{$msg.body|quoted|escape}" />
 				{if $next}
 					<input type="hidden" name="msg_id" value="{$next}" />
 				{elseif $prev}
@@ -99,60 +99,7 @@
 					<input type="submit" name="action[replyall]" value="{tr}Reply All{/tr}" />
 				</div>
 			{/form}
-
 		{/if}
 	</div><!-- end .body -->
 </div><!-- end .usermessages -->
 {/strip}
-{*
-			<table class="panel">
-				<tr class="panelsubmitrow"><td>
-					<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}" />
-						<input type="hidden" name="flag" value="{$flag}" />
-						<input type="hidden" name="flagval" value="{$flagval}" />
-						<input type="hidden" name="priority" value="{$priority}" />
-						<input type="hidden" name="msgdel" value="{$msg_id}" />
-						{if $next}
-							<input type="hidden" name="msg_id" value="{$next}" />
-						{elseif $prev}
-							<input type="hidden" name="msg_id" value="{$prev}" />
-						{else}
-							<input type="hidden" name="msg_id" value="" />
-						{/if}
-						<input type="submit" name="delete" value="{tr}Delete{/tr}" />
-					</form>
-					</td>
-					<td>
-					<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}" />
-					<input type="hidden" name="sort_mode" value="{$sort_mode}" />
-					<input type="hidden" name="flag" value="{$flag}" />
-					<input type="hidden" name="priority" value="{$priority}" />
-					<input type="hidden" name="flagval" value="{$flagval}" />
-					<input type="hidden" name="to" value="{$msg.user_from|escape}" />
-					<input type="hidden" name="subject" value="{tr}Re:{/tr} {$msg.subject}" />
-					<input type="hidden" name="body" value="{$msg.body|quoted|escape}" />
-					<input type="submit" name="reply" value="{tr}reply{/tr}" />
-					</form>
-					</td>
-					<td>
-					<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}" />
-					<input type="hidden" name="sort_mode" value="{$sort_mode}" />
-					<input type="hidden" name="flag" value="{$flag}" />
-					<input type="hidden" name="priority" value="{$priority}" />
-					<input type="hidden" name="flagval" value="{$flagval}" />
-					<input type="hidden" name="to" value="{$msg.user_from},{$msg.user_cc},{$msg.user_to}" />
-					<input type="hidden" name="subject" value="{tr}Re:{/tr} {$msg.subject}" />
-					<input type="hidden" name="body" value="{$msg.body|quoted|escape}" />
-					<input type="submit" name="replyall" value="{tr}Reply All{/tr}" />
-				</td></tr>
-			</table>
-*}