From 29150ebc65d0d4cf90da3f437999395a86609504 Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Wed, 10 Apr 2013 05:00:41 +0700 Subject: VKontakte login --- src/java/Login.properties | 2 ++ src/java/Login_ru.properties | 2 ++ src/java/com/juick/http/www/Login.java | 18 ++++++++++++++++++ src/java/com/juick/http/www/VKontakteLogin.java | 7 ++++--- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/java/Login.properties b/src/java/Login.properties index f75010af..f8b3919b 100644 --- a/src/java/Login.properties +++ b/src/java/Login.properties @@ -5,6 +5,8 @@ Login=Login Username=Username Password=Password Login\ Facebook=Login with Facebook +Login\ VK=Login with VKontakte +Login\ VK\ text=Login Login\ XMPP=Login with Jabber/XMPP XMPP\ instructions=Send LOGIN from your Jabber/XMPP account to juick@juick.com. Have\ Juick=Have a Juick account? diff --git a/src/java/Login_ru.properties b/src/java/Login_ru.properties index 84eef016..6d5922e4 100644 --- a/src/java/Login_ru.properties +++ b/src/java/Login_ru.properties @@ -5,6 +5,8 @@ Login=\u0412\u0445\u043e\u0434 Username=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f Password=\u041f\u0430\u0440\u043e\u043b\u044c Login\ Facebook=\u0412\u043e\u0439\u0442\u0438 \u0447\u0435\u0440\u0435\u0437 Facebook +Login\ VK=\u0412\u043e\u0439\u0442\u0438 \u0447\u0435\u0440\u0435\u0437 \u0412\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u0435 +Login\ VK\ text=\u0412\u043e\u0439\u0442\u0438 Login\ XMPP=\u0412\u043e\u0439\u0442\u0438 \u0447\u0435\u0440\u0435\u0437 Jabber/XMPP XMPP\ instructions=\u041e\u0442\u043f\u0440\u0430\u0432\u044c\u0442\u0435 LOGIN \u0441 \u0432\u0430\u0448\u0435\u0433\u043e \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u0430 Jabber/XMPP \u043d\u0430 juick@juick.com. Have\ Juick=\u0423\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b \u043d\u0430 Juick? diff --git a/src/java/com/juick/http/www/Login.java b/src/java/com/juick/http/www/Login.java index 3a715870..7ad921e0 100644 --- a/src/java/com/juick/http/www/Login.java +++ b/src/java/com/juick/http/www/Login.java @@ -37,6 +37,11 @@ public class Login { protected void doGetLoginForm(Connection sql, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { com.juick.User visitor = Utils.getVisitorUser(sql, request); + if (visitor != null) { + Utils.sendTemporaryRedirect(response, "/"); + return; + } + Locale locale = request.getLocale(); ResourceBundle rb = ResourceBundle.getBundle("Login", locale); @@ -52,6 +57,9 @@ public class Login { out.println("
" + rb.getString("Login VK text") + "
"); + out.println("" + rb.getString("XMPP instructions") + "
"); out.println("