From 366edc3b09ab27055271c96939d634f6561e6ec9 Mon Sep 17 00:00:00 2001
From: cktricky <ken.johnson@nvisiumsecurity.com>
Date: Thu, 17 Apr 2014 11:33:18 -0400
Subject: [PATCH] not sure if this is working

---
 app/views/sessions/new.html.erb | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index dbeea1f..2d1d450 100755
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,3 +1,22 @@
+<<<<<<< HEAD
+=======
+<div align="right">
+  <!-- support for multiple languages coming soon! -->
+  <script>
+    //document.write("<select style=\"width: 100px;\">");
+    //document.write("<OPTION value=1>English</OPTION>");
+    //document.write("<OPTION value=2>Spanish</OPTION>");
+    try {
+      var hashParam = location.hash.split("#")[1];
+      var paramName = hashParam.split('=')[0];
+      var paramValue = hashParam.split('=')[1];
+      document.write("<OPTION value=3>" + paramValue + "</OPTION>");
+    } catch(err) {
+    }
+    //document.write("</select>");
+  </script>
+</div>
+>>>>>>> ab536af... removing select but keeping DOM XSS
 <div class="row-fluid">
   <h2 align="center">MetaCorp</h2>
   <h3 align="center">A GoatGroup Company</h3>
@@ -38,4 +57,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>