Fixed some broken URLs and a couple typos.

karai17 · Nov 26, 2016 · 2366e2b · 2366e2b
1 parent 577d4af
commit 2366e2b
Show file tree

Hide file tree

Showing 20 changed files with 66 additions and 105 deletions.
diff --git a/controllers/board.lua b/controllers/board.lua
@@ -131,8 +131,10 @@ return {
 		-- Validate CSRF token
 		csrf.assert_token(self)
 
+		local board_url = self:format_url(self.board_url, self.board.short_name)
+
 		-- Submit new thread
-		if self.params.submit and not self.thread then
+		if self.params.submit then
 			-- Validate user input
 			assert_valid(self.params, {
 				{ "name",    max_length=255 },
@@ -142,11 +144,8 @@ return {
 			})
 
 			-- Validate post
-			local post = assert_error(process.create_thread(
-				self.params, self.session, self.board
-			))
-
-			return { redirect_to = self:format_url(self.post_url, self.board, post.post_id, post.post_id) }
+			local post = assert_error(process.create_thread(self.params, self.session, self.board))
+			return { redirect_to = self:format_url(self.post_url, self.board.short_name, post.post_id, post.post_id) }
 		end
 
 		-- Delete thread
@@ -157,11 +156,8 @@ return {
 			})
 
 			-- Validate deletion
-			assert_error(process.delete_thread(
-				self.params, self.session, self.board
-			))
-
-			return { redirect_to = self:format_url(self.board_url, self.board) }
+			assert_error(process.delete_thread(self.params, self.session, self.board))
+			return { redirect_to = board_url }
 		end
 
 		-- Delete post
@@ -172,15 +168,8 @@ return {
 			})
 
 			-- Validate deletion
-			assert_error(process.delete_post(
-				self.params, self.session, self.board
-			))
-
-			if self.params.thread then
-				return { redirect_to = self:format_url(self.thread_url, self.board, self.params.thread_id) }
-			else
-				return { redirect_to = self:format_url(self.board_url, self.board) }
-			end
+			assert_error(process.delete_post(self.params, self.session, self.board))
+			return { redirect_to = board_url }
 		end
 
 		-- Report post
@@ -192,59 +181,43 @@ return {
 			})
 
 			-- Validate report
-			assert_error(process.report_post(
-				self.params, self.board
-			))
-
-			if self.thread then
-				local op = Posts:get_thread_op(self.thread.id)
-				return { redirect_to = self:format_url(self.thread_url, self.board, op.post_id) }
-			else
-				return { redirect_to = self:format_url(self.board_url, self.board) }
-			end
+			assert_error(process.report_post(self.params, self.board))
+			return { redirect_to = board_url }
 		end
 
 		-- Admin commands
 		if self.session.admin or self.session.mod then
-			local op
-			local thread_url = self:format_url(self.board_url, self.board)
-
-			if self.thread then
-				op         = Posts:get_thread_op(self.thread.id)
-				thread_url = self:format_url(self.thread_url, self.board, op.post_id)
-			end
-
 			-- Sticky thread
 			if self.params.sticky then
 				assert_error(process.sticky_thread(self.params, self.board))
-				return { redirect_to = thread_url }
+				return { redirect_to = board_url }
 			end
 
 			-- Lock thread
 			if self.params.lock then
 				assert_error(process.lock_thread(self.params, self.board))
-				return { redirect_to = thread_url }
+				return { redirect_to = board_url }
 			end
 
 			-- Save thread
 			if self.params.save then
 				assert_error(process.save_thread(self.params, self.board))
-				return { redirect_to = thread_url }
+				return { redirect_to = board_url }
 			end
 
 			-- Override thread
 			if self.params.override then
 				assert_error(process.override_thread(self.params, self.board))
-				return { redirect_to = thread_url }
+				return { redirect_to = board_url }
 			end
 
 			-- Ban user
 			if self.params.ban then
 				assert_error(process.ban_user(self.params, self.board))
-				return { redirect_to = thread_url }
+				return { redirect_to = board_url }
 			end
 		end
 
-		return { redirect_to = self:format_url(self.board_url, self.board) }
+		return { redirect_to = board_url }
 	end
 }
diff --git a/controllers/catalog.lua b/controllers/catalog.lua
@@ -110,13 +110,10 @@ return {
 			})
 
 			-- Validate post
-			local post = assert_error(process.create_thread(
-				self.params, self.session, self.board
-			))
-
-			return { redirect_to = self:format_url(self.post_url, self.board,  post.post_id,  post.post_id) }
+			local post = assert_error(process.create_thread(self.params, self.session, self.board))
+			return { redirect_to = self:format_url(self.post_url, self.board.short_name, post.post_id, post.post_id) }
 		end
 
-		return { redirect_to = self:format_url(self.catalog_url, self.board) }
+		return { redirect_to = self:format_url(self.catalog_url, self.board.short_name) }
 	end
 }
diff --git a/controllers/thread.lua b/controllers/thread.lua
@@ -131,6 +131,9 @@ return {
 		-- Validate CSRF token
 		csrf.assert_token(self)
 
+		local board_url  = self:format_url(self.board_url,  self.board.short_name)
+		local thread_url = self:format_url(self.thread_url, self.board.short_name, self.posts[1].post_id)
+
 		-- Submit new post
 		if self.params.submit and self.thread then
 			-- Validate user input
@@ -143,11 +146,8 @@ return {
 			})
 
 			-- Validate post
-			local post = assert_error(process.create_post(
-				self.params, self.session, self.board, self.thread
-			))
-
-			return { redirect_to = self:format_url(self.post_url, self.board, self.thread, post.post_id) }
+			local post = assert_error(process.create_post(self.params, self.session, self.board, self.thread))
+			return { redirect_to = self:format_url(self.post_url, self.board.short_name, self.posts[1].post_id, post.post_id) }
 		end
 
 		-- Delete thread
@@ -158,11 +158,8 @@ return {
 			})
 
 			-- Validate deletion
-			assert_error(process.delete_thread(
-				self.params, self.session, self.board
-			))
-
-			return { redirect_to = self:format_url(self.board_url, self.board) }
+			assert_error(process.delete_thread(self.params, self.session, self.board))
+			return { redirect_to = board_url }
 		end
 
 		-- Delete post
@@ -173,11 +170,8 @@ return {
 			})
 
 			-- Validate deletion
-			assert_error(process.delete_post(
-				self.params, self.session, self.board
-			))
-
-			return { redirect_to = self:format_url(self.thread_url, self.board, self.thread) }
+			assert_error(process.delete_post(self.params, self.session, self.board))
+			return { redirect_to = thread_url }
 		end
 
 		-- Report post
@@ -189,48 +183,45 @@ return {
 			})
 
 			-- Validate report
-			local post = assert_error(process.report_post(
-				self.params, self.board
-			))
-
-			return { redirect_to = self:format_url(self.thread_url, self.board, self.thread) }
+			assert_error(process.report_post(self.params, self.board))
+			return { redirect_to = thread_url }
 		end
 
 		-- Admin commands
 		if self.session.admin or self.session.mod then
 			-- Sticky thread
 			if self.params.sticky then
 				assert_error(process.sticky_thread(self.params, self.board))
-				return { redirect_to = self:format_url(self.thread_url, self.board, self.thread) }
+				return { redirect_to = thread_url }
 			end
 
 			-- Lock thread
 			if self.params.lock then
 				assert_error(process.lock_thread(self.params, self.board))
-				return { redirect_to = self:format_url(self.thread_url, self.board, self.thread) }
+				return { redirect_to = thread_url }
 			end
 
 			-- Save thread
 			if self.params.save then
 				assert_error(process.save_thread(self.params, self.board))
-				return { redirect_to = self:format_url(self.thread_url, self.board, self.thread) }
+				return { redirect_to = thread_url }
 			end
 
 			-- Override thread
 			if self.params.override then
 				assert_error(process.override_thread(self.params, self.board))
-				return { redirect_to = self:format_url(self.thread_url, self.board, self.thread) }
+				return { redirect_to = thread_url }
 			end
 
 			-- Ban user
 			if self.params.ban then
 				assert_error(process.ban_user(self.params, self.board))
-				return { redirect_to = self:format_url(self.thread_url, self.board, self.thread) }
+				return { redirect_to = thread_url }
 			end
 
-			return { redirect_to = self:format_url(self.thread_url, self.board, self.thread) }
+			return { redirect_to = thread_url }
 		end
 
-		return { redirect_to = self:format_url(self.thread_url, self.board, self.thread) }
+		return { redirect_to = thread_url }
 	end
 }
diff --git a/install.lua b/install.lua
@@ -1,7 +1,7 @@
 local Users    = require "models.users"
 local Boards   = require "models.boards"
 local Pages    = require "models.pages"
-local lsf      = require "lfs"
+local lfs      = require "lfs"
 local validate = require("lapis.validate").validate
 local faq      = [[
 <div class="table_of_contents">
@@ -281,7 +281,7 @@ return {
 				out = out .. "<h2>" .. err .. "</h2>\n"
 			end
 			out = out .. [[
-				<form action="#" method="get">
+				<form action="" method="get">
 					<button>Return</button>
 				</form>
 			</div>

diff --git a/views/admin/admin.etlua b/views/admin/admin.etlua
@@ -4,7 +4,7 @@
 
 <!-- Report Junk -->
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="view_report" type="hidden" />
 		<div>
@@ -22,7 +22,7 @@
 </div>
 
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="delete_report" type="hidden" />
 		<div>
@@ -52,7 +52,7 @@
 </div>
 
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="modify_user" type="hidden" />
 		<div>
@@ -70,7 +70,7 @@
 </div>
 
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="delete_user" type="hidden" />
 		<div>
@@ -100,7 +100,7 @@
 </div>
 
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="modify_board" type="hidden" />
 		<div>
@@ -118,7 +118,7 @@
 </div>
 
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="delete_board" type="hidden" />
 		<div>
@@ -148,7 +148,7 @@
 </div>
 
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="modify_announcement" type="hidden" />
 		<div>
@@ -166,7 +166,7 @@
 </div>
 
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="delete_announcement" type="hidden" />
 		<div>
@@ -196,7 +196,7 @@
 </div>
 
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="modify_page" type="hidden" />
 		<div>
@@ -214,7 +214,7 @@
 </div>
 
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input name="delete_page" type="hidden" />
 		<div>
@@ -233,7 +233,7 @@
 
 <!-- Regen Thumbs -->
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<div>
 			<label class="title"><%= i18n("regen_thumb") %></label>

diff --git a/views/admin/announcement.etlua b/views/admin/announcement.etlua
@@ -1,5 +1,5 @@
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 
 		<div>

diff --git a/views/admin/board.etlua b/views/admin/board.etlua
@@ -1,5 +1,5 @@
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 
 		<div>

diff --git a/views/admin/page.etlua b/views/admin/page.etlua
@@ -1,5 +1,5 @@
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 		<input type="hidden" name="old" value="<%= page.old or page.url or '' %>" />
 

diff --git a/views/admin/user.etlua b/views/admin/user.etlua
@@ -1,5 +1,5 @@
 <div class="admin_form">
-	<form action="#" method="post">
+	<form action="" method="post">
 		<input name="csrf_token" type="hidden" value="<%= csrf_token %>" />
 
 		<div>