From b7e795174514aeb34d0458217e508a0e2852bf4c Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Tue, 8 Jan 2013 03:02:36 +0000
Subject: Fixed move message bugs

---
 vmail-controller.lua        | 4 ++--
 vmail-listmessages-html.lsp | 2 +-
 vmail-model.lua             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vmail-controller.lua b/vmail-controller.lua
index c86a1e8..c4bcc95 100644
--- a/vmail-controller.lua
+++ b/vmail-controller.lua
@@ -71,7 +71,7 @@ emailmymessage = function( self )
 end
 
 movemessage = function( self )
-	return self.handle_form(self, self.model.get_move_message, self.model.move_message, self.clientdata)
+	return self.handle_form(self, self.model.get_move_message, self.model.move_message, self.clientdata, "Move")
 end
 
 movemymessage = function( self )
@@ -79,7 +79,7 @@ movemymessage = function( self )
 	if self.sessiondata.userinfo then
 		self.clientdata.username = self.sessiondata.userinfo.userid
 	end
-	return self.handle_form(self, self.model.get_move_message, self.model.move_message, self.clientdata)
+	return self.handle_form(self, self.model.get_move_message, self.model.move_message, self.clientdata, "Move")
 end
 
 callbackmessage = function( self )
diff --git a/vmail-listmessages-html.lsp b/vmail-listmessages-html.lsp
index df7ef1b..a7553b2 100644
--- a/vmail-listmessages-html.lsp
+++ b/vmail-listmessages-html.lsp
@@ -248,7 +248,7 @@ end
 			" method="POST">
 		<input class="hidden" type="hidden" name="redir"  value="<%= html.html_escape(page_info.orig_action) %>" >
 		<input class="hidden" type="hidden" name="message"  value="" >
-		<input class="submit" type="submit" value="Move">
+		<input class="submit" type="submit" name="submit" value="Move">
 		<select name="newfolder" style="width:auto;"><%= (folderoptions or "") %></select>
 		</form>
 	<% end %>
diff --git a/vmail-model.lua b/vmail-model.lua
index 66c8f4f..5239c04 100644
--- a/vmail-model.lua
+++ b/vmail-model.lua
@@ -633,7 +633,7 @@ move_message = function(self, moverequest)
 		local mess = getselectresponse(sql)
 		if #mess == #messages then
 			-- Check if newfolder exists
-			if validfolder(newfolder) then
+			if validfolder(moverequest.value.newfolder.value) then
 				for i,m in ipairs(mess) do
 					local sql = "UPDATE voicemail_msgs SET in_folder='"..moverequest.value.newfolder.value.."'" .. generatewhereclause(moverequest.value.username.value, messages)
 					runsqlcommand(sql)
@@ -641,7 +641,7 @@ move_message = function(self, moverequest)
 				if #mess == 1 then
 					moverequest.descr = "Moved message"
 				else
-					moverequest.value = "Moved "..#mess.." messages"
+					moverequest.descr = "Moved "..#mess.." messages"
 				end
 				if moverequest.value.username.value then
 					voicemail_update(moverequest.value.username.value, config.domain)
-- 
cgit v1.2.3