From 051915ce27fb76bee9227564befdd7d033a9508e Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Tue, 5 Mar 2019 16:50:53 +0800
Subject: [PATCH] Fix can't redirect to original page when logged in

---
 views/forget.ejs         | 1 -
 views/forget_confirm.ejs | 1 -
 views/header.ejs         | 4 ++--
 views/login.ejs          | 1 -
 views/sign_up.ejs        | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/views/forget.ejs b/views/forget.ejs
index 5a13421..4a01b3d 100644
--- a/views/forget.ejs
+++ b/views/forget.ejs
@@ -1,5 +1,4 @@
 <% this.title = '忘记密码' %>
-<% this.noPreserveUrl = true; %>
 <% include header %>
 <div class="ui message" id="msgBox" hidden>
     <p id="msgContent"></p>
diff --git a/views/forget_confirm.ejs b/views/forget_confirm.ejs
index e48d26d..502c496 100644
--- a/views/forget_confirm.ejs
+++ b/views/forget_confirm.ejs
@@ -1,5 +1,4 @@
 <% this.title = '重设密码';  %>
-<% this.noPreserveUrl = true; %>
 <% include header %>
 <div class="ui message" id="msgBox" hidden>
     <p id="msgContent"></p>
diff --git a/views/header.ejs b/views/header.ejs
index daf27fc..aec7892 100644
--- a/views/header.ejs
+++ b/views/header.ejs
@@ -80,10 +80,10 @@
               </a>
                 <% } else { %>
                 <div class="item">
-                    <a class="ui button" style="margin-right: 0.5em; " href="<%= syzoj.utils.makeUrl(['login'], { url: this.noPreserveUrl ? undefined : req.originalUrl }) %>">
+                    <a class="ui button" style="margin-right: 0.5em; " href="<%= syzoj.utils.makeUrl(['login'], { url: req.query['url'] || req.originalUrl }) %>">
                         登录
                     </a>
-                    <a class="ui primary button" href="<%= syzoj.utils.makeUrl(['sign_up'], { url: this.noPreserveUrl ? undefined : req.originalUrl }) %>">
+                    <a class="ui primary button" href="<%= syzoj.utils.makeUrl(['sign_up'], { url: req.query['url'] || req.originalUrl }) %>">
                         注册
                     </a>
                 </div>
diff --git a/views/login.ejs b/views/login.ejs
index 416ac89..31561f0 100644
--- a/views/login.ejs
+++ b/views/login.ejs
@@ -1,5 +1,4 @@
 <% this.title = '登录' %>
-<% this.noPreserveUrl = true; %>
 <% include header %>
 <div class="ui error message" id="error" hidden></div>
 <div class="ui middle aligned center aligned grid">
diff --git a/views/sign_up.ejs b/views/sign_up.ejs
index b236fae..edb7507 100644
--- a/views/sign_up.ejs
+++ b/views/sign_up.ejs
@@ -1,5 +1,4 @@
 <% this.title = '注册' %>
-<% this.noPreserveUrl = true; %>
 <% include header %>
 <div class="padding">
   <h1>注册</h1>