switch login/logout to be POSTs

3 files changed, 87 insertions, 84 deletions

diff --git a/src/site.clj b/src/site.clj
index 7806d7b..d692849 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -1212,9 +1212,12 @@ WHERE  u.user_id = ANY(?)"
   (GET "/u/:nick/:offset" (redirect-to (str "/" (params :nick))))
   
   (GET "/p/:nick/:postid" (single-message session (params :nick) (params :postid)))
-  ;; TODO: these shouldn't be GETs
+
+  ;; TODO: delete GET routes very shortly
   (GET "/login" (login session params cookies request))
+  (POST "/login" (login session params cookies request))
   (GET "/logout" (logout session))
+  (POST "/logout" (logout session))
   (GET "/register" (serve-static "static" "register.html"))
   (GET "/registerdis" (serve-static "static" "registerdis.html"))
   (GET "/browser" (browser session))
diff --git a/static/js/home.js b/static/js/home.js
index db2d428..736fc84 100755
--- a/static/js/home.js
+++ b/static/js/home.js
@@ -161,7 +161,7 @@ function login() {
     };
 
     $.ajax({
-        type: 'GET',
+        type: 'POST',
         timeout: 5000,
         url: '/login',
         data: {'nick': nick, ts: '', 'hash': hash, 'rememberme': rememberme},
diff --git a/template/banner.st b/template/banner.st
index eb7f0a9..d032a19 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -8,104 +8,104 @@
 	</div>
       </div>
       <div class="white">
-      $if(!user_nick)$
-	<div id="bar7dis">   $else$
-		<div id="bar7"> 
-		$endif$
-          <div style="float: left;">
-            <div align="center">
-              $if(user_nick)$
- 
-	     <!-- <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;">	<img src="$domain$/static/img/thumbs/logbaricon.png"/> Log</a> -->
-              <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
+        $if(!user_nick)$
+	<div id="bar7dis">
+          $else$
+	  <div id="bar7"> 
+	    $endif$
+            <div style="float: left;">
+              <div align="center">
+                $if(user_nick)$
+                
+	        <!-- <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;">	<img src="$domain$/static/img/thumbs/logbaricon.png"/> Log</a> -->
+                <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
 
-	<img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a>           
-              <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;">
-		<img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory
-	      </a>
-	                    <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;">
-		<img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame 
-	      </a>
-	           <!--     <a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> -->
-   <a href="$domain$/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="$domain$/static/img/thumbs/favsbaricon.png"/> Favs</a>
-              <a href="$domain$/browser" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Image Search</a>
+	          <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a>           
+                <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;">
+		  <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory
+	        </a>
+	        <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;">
+		  <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame 
+	        </a>
+	        <!--     <a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> -->
+                <a href="$domain$/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="$domain$/static/img/thumbs/favsbaricon.png"/> Favs</a>
+                <a href="$domain$/browser" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Image Search</a>
 
 
 
-   <div id="toptools">
-           <form name="Tools" >
-<select class="toolsmenu" name="menu" onChange="location=document.Tools.menu.options[document.Tools.menu.selectedIndex].value;">
-<option>Tools</option>
-<option value="http://bon.gs/tile/" target="_blank">Tile Tool</option>
-<option value="http://dump.fm/m/oie">Online Image Editor</option>
-<option value="http://dump.fm/m/dwi">Deal With It Maker</option>
-<option value="http://dump.fm/m/pixlr">Pixlr(image editor)</option>
-<option value="http://dump.fm/m/arcade">Arcade Font Maker</option>
-<option value="http://dump.fm/m/flamingtxt">Flaming Text(and more)</option>
-<option value="http://dump.fm/m/glitter">Glitter Text</option>
-<option value="http://dump.fm/m/glitter2">Glitter Text 2</option>
-<option value="http://dump.fm/m/celeb">Celebrity Photo</option>
-<option value="http://dump.fm/m/signgenerator">Sign Generator</option>
-<option value="http://dump.fm/m/20years">In 20 Years</option>
-<option value="http://dump.fm/m/flag">Flag Maker</option>
+                <div id="toptools">
+                  <form name="Tools" >
+                    <select class="toolsmenu" name="menu" onChange="location=document.Tools.menu.options[document.Tools.menu.selectedIndex].value;">
+                      <option>Tools</option>
+                      <option value="http://bon.gs/tile/" target="_blank">Tile Tool</option>
+                      <option value="http://dump.fm/m/oie">Online Image Editor</option>
+                      <option value="http://dump.fm/m/dwi">Deal With It Maker</option>
+                      <option value="http://dump.fm/m/pixlr">Pixlr(image editor)</option>
+                      <option value="http://dump.fm/m/arcade">Arcade Font Maker</option>
+                      <option value="http://dump.fm/m/flamingtxt">Flaming Text(and more)</option>
+                      <option value="http://dump.fm/m/glitter">Glitter Text</option>
+                      <option value="http://dump.fm/m/glitter2">Glitter Text 2</option>
+                      <option value="http://dump.fm/m/celeb">Celebrity Photo</option>
+                      <option value="http://dump.fm/m/signgenerator">Sign Generator</option>
+                      <option value="http://dump.fm/m/20years">In 20 Years</option>
+                      <option value="http://dump.fm/m/flag">Flag Maker</option>
 
 
-</select>
-</form>
-           </div>
+                    </select>
+                  </form>
+                </div>
 
-           
-	      $else$
-	      <a href="http://dump.fm/register" id="disregister">Register</a>
-	      $endif$     
-            </div>
+                
+	        $else$
+	        <a href="http://dump.fm/register" id="disregister">Register</a>
+	        $endif$     
+              </div>
+	    </div>
 	  </div>
-	</div>
+        </div>
       </div>
-    </div>
-    
-    $if(user_nick)$
-  <!--  <div id="facebooklike">
-    <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149%3Fref%3Dts&amp;layout=button_count&amp;show_faces=true&amp;width=100&amp;action=like&amp;font=segoe+ui&amp;colorscheme=dark&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"></iframe>
-    </div> ---!>
+      
+      $if(user_nick)$
+      <!--  <div id="facebooklike">
+            <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149%3Fref%3Dts&amp;layout=button_count&amp;show_faces=true&amp;width=100&amp;action=like&amp;font=segoe+ui&amp;colorscheme=dark&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"></iframe>
+      </div> ---!>
 
 
-    <div id="searchbox">
-      <input type="text" name="search-query" id="search-query" />
+      <div id="searchbox">
+        <input type="text" name="search-query" id="search-query" />
 	<!--<div class="search_icon"></div>-->
-    </div>
-    $else$
-    <div id="nouserstripes">
-    
-    </div>
-    
-    
-    $endif$
-    <div id="topic"></div>
-    <div id="dumplist">
+      </div>
+      $else$
+      <div id="nouserstripes">
+        
+      </div>
+      
+      
+      $endif$
+      <div id="topic"></div>
+      <div id="dumplist">
 
-$if(user_nick)$
-    <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen - </a><a href="http://dump.fm/stickers">SUPPORT DUMP.FM! BUY SOME STICKERS!!</a><a href="http://dis.dump.fm">- dis magazine new style options</a>  $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$ 
-	
-       $if(isadmin)$  -<a href="http://vip.dump.fm/">  NAUGHTY BOYS DELIGHT </a>
-$endif$
-    </div>
-    
-    
-    
-$if(user_nick)$
-    <div id="logout7" class="white">   
-      <div align="center">
-	<a href="/logout" onclick="pageTracker._trackEvent('button', 'logout'); return true;">Logout</a>
+        $if(user_nick)$
+        <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen - </a><a href="http://dump.fm/stickers">SUPPORT DUMP.FM! BUY SOME STICKERS!!</a><a href="http://dis.dump.fm">- dis magazine new style options</a>  $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$	
+        $if(isadmin)$  -<a href="http://vip.dump.fm/">NAUGHTY BOYS DELIGHT </a>
+        $endif$
       </div>
-    </div>
-    
-    
-$else$
+      
+      
+      
+      $if(user_nick)$
+      <div id="logout7" class="white">   
+        <div align="center">
+          <form id="logout" action="/logout" method="POST">
+	    <a href="#" onclick="pageTracker._trackEvent('button', 'logout'); jQuery('#logout').submit(); return false">Logout</a>
+          </form>
+        </div>
+      </div>    
+      $else$
       <div id="toplogin" class="white">
-  $form_login()$
+        $form_login()$
       </div>
-$endif$
+      $endif$