Applied the GetLoggedInFirst() semantics to the Reply buttons

diff --git a/webcit/static/authmethods.js b/webcit/static/authmethods.js
index 3709669d0151e00bbe95789d44942790f5fdb26f..1fc45a03c37d7b7e154c64bf979b82293a606ea8 100644 (file)
--- a/webcit/static/authmethods.js
+++ b/webcit/static/authmethods.js
@@ -27,7 +27,7 @@ function GetLoggedInFirst(destination_url) {
 
        /* If logged in already, go directly to the destination. */
        if (IsLoggedIn()) {
-               window.location = destination_url;
+               window.location = decodeURIComponent(destination_url);
                return;
        }
 
@@ -50,11 +50,12 @@ function GetLoggedInFirst(destination_url) {
  * Attempt login with username/password, called from modal dialog
  */
 function ajax_try_username_and_password(destination_url) {
+
        $('login_errmsg').innerHTML = "";
         $('ajax_username_password_form').request({
                onSuccess: function(ctdlresult) {
                        if (ctdlresult.responseText.substr(0,1) == '2') {
-                               window.location = destination_url;
+                               window.location = decodeURIComponent(destination_url);
                        }
                        else {
                                $('login_errmsg').innerHTML = ctdlresult.responseText.substr(4) ;

diff --git a/webcit/static/t/get_logged_in.html b/webcit/static/t/get_logged_in.html
index 40124ea57cfdd9c222e5505c4e5247ad86813952..92540c2dd864a8908c78af7aff791b5a434d5336 100644 (file)
--- a/webcit/static/t/get_logged_in.html
+++ b/webcit/static/t/get_logged_in.html
@@ -45,7 +45,7 @@ FIXME login to continue
 <input type="password" name="pass" id="pname">
 <br>
 </form>
-<div class="buttons"><a href="javascript:ajax_try_username_and_password('<?BSTR("destination_url")>');"><?_("Log in")></a></div>
+<div class="buttons"><a href="javascript:ajax_try_username_and_password('<?BSTR("destination_url", "U")>');"><?_("Log in")></a></div>
 </div>
 
 <div class="authbox" id="authbox_openid" style="display: none">

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index fb3296e88c99fb570b4a1e1d86e0548413f6aef6..9c5466cd1d19c0a354c168df412a65f1e5c6039f 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -15,18 +15,18 @@
  <p id="msg<?MAIL:SUMM:N>" class="msgbuttons">
  <a href="display_enter?edit=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:TO("U")>?cc=<?MAIL:SUMM:CCCC("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "", "")>?force_room=_MAIL_"><span>[</span><?_("Edit")><span>]</span></a> 
 <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_BBS")>
-   <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
-   <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a> 
+   <a href="javascript:GetLoggedInFirst(encodeURIComponent('display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>'));"><span>[</span><?_("Reply")><span>]</span></a> 
+   <a href="javascript:GetLoggedInFirst(encodeURIComponent('display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>'));"><span>[</span><?_("ReplyQuoted")><span>]</span></a> 
 <?!("X", 8)>
 <??("COND:ROOM:TYPE_IS", 9, #"VIEW_BBS")>
        <?!("COND:MAIL:SUMM:RFCA", 10)>
-               <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
-               <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E%2C<?MAIL:SUMM:ALLRCPT("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a> 
+               <a href="javascript:GetLoggedInFirst(encodeURIComponent('display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>'));"><span>[</span><?_("Reply")><span>]</span></a> 
+               <a href="javascript:GetLoggedInFirst(encodeURIComponent('display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E%2C<?MAIL:SUMM:ALLRCPT("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>'));"><span>[</span><?_("ReplyAll")><span>]</span></a> 
                <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fw: ", "Fw:")>"><span>[</span><?_("Forward")><span>]</span></a> 
        <?!("X", 10)>
        <??("COND:MAIL:SUMM:RFCA", 11)>
-               <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
-               <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:FROM("U")>%2C<?MAIL:SUMM:ALLRCPT("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a> 
+               <a href="javascript:GetLoggedInFirst(encodeURIComponent('display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>'));"><span>[</span><?_("Reply")><span>]</span></a> 
+               <a href="javascript:GetLoggedInFirst(encodeURIComponent('display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:FROM("U")>%2C<?MAIL:SUMM:ALLRCPT("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>'));"><span>[</span><?_("ReplyAll")><span>]</span></a> 
                <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fw: ", "Fw:")>"><span>[</span><?_("Forward")><span>]</span></a> 
        <??("X", 11)>
 <??("X", 9)>