Permalink
Browse files

Merge branch 'master' of github.com:akashgupta/FacialSecurity

  • Loading branch information...
2 parents 55c7957 + ba0a817 commit 5e18de2a7883d67a39d0e2f25b793d4f50dccee8 @akashgupta committed Dec 6, 2011
Showing with 7 additions and 5 deletions.
  1. BIN website/accesses.db
  2. +1 −2 website/main.py
  3. +6 −2 website/static/script.js
  4. +0 −1 website/templates/login.html
View
Binary file not shown.
View
@@ -27,8 +27,7 @@ def post(self):
class LoginHandler(tornado.web.RequestHandler):
def get(self):
- ref = self.get_argument("ref")
- self.render("login.html", ref=ref)
+ self.render("login.html")
class RejectedHandler(tornado.web.RequestHandler):
def get(self):
View
@@ -35,8 +35,7 @@ function onReturn(urls, response) {
}
if (userExists == true) {
- // Redirect to fb
- //window.location.replace(localStorage["fbUrl"]);
+ window.location.replace("https://www.facebook.com");
} else {
window.location.replace("http://ghost.eecs.berkeley.edu:8888/rejected");
}
@@ -46,8 +45,13 @@ function onAuthenticated(response) {
console.log(response.authResponse);
uid = response.authResponse.userID;
+
+ //akash
var urls = ["https://fbcdn-sphotos-a.akamaihd.net/hphotos-ak-ash4/230131_10150185516282229_504182228_6642763_1929002_n.jpg"];
+ //bdong
+ //var urls = ["https://fbcdn-sphotos-a.akamaihd.net/hphotos-ak-ash2/36206_403655656502_612641502_4821418_7400074_n.jpg"];
+
var options = {
uids: "friends@facebook.com",
namespace: "facebook.com",
@@ -8,7 +8,6 @@
<script src="{{ static_url('script.js') }}"></script>
</head>
<body>
- <div id="invisible">{% ref %}</div>
<div id="fb-root"></div>
<script src="//connect.facebook.net/en_US/all.js"></script>
<script>

0 comments on commit 5e18de2

Please sign in to comment.