ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

Removed facebook support because of old api

Browse source
This commit is contained in:
Ziver Koc 2016-11-23 00:50:01 +01:00
parent e79cea52ce
commit 7b7ba10b5d
5 changed files with 1 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/zall/Zallery.java
View file

@ -2,7 +2,6 @@ package zall;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -21,13 +20,9 @@ import zall.bean.Image;
import zall.bean.Media;
import zall.bean.User;
import zall.util.Email;
import zall.util.facebook.FBUser;
import zall.util.facebook.FacebookConnect;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
import zutil.db.bean.DBBean;
import zutil.db.bean.DBBeanSQLResultHandler;
import zutil.log.LogUtil;
public class Zallery extends HttpServlet{
@ -68,12 +63,6 @@ public class Zallery extends HttpServlet{
throw new ServletException("Missing DATA_PATH parameter!");
if( config.getInitParameter("THEME") != null )
THEME = config.getInitParameter("THEME");
if( config.getInitParameter("FB_APPID") != null &&
config.getInitParameter("FB_APPID") != null)
FacebookConnect.setApplicationID(
config.getInitParameter("FB_APPID"),
config.getInitParameter("FB_APPSEC"));
LogUtil.setLevel("zall", Level.FINEST);
//LogUtil.setLevel("zutil", Level.FINEST);
}
@ -98,27 +87,10 @@ public class Zallery extends HttpServlet{
String page = new File(request.getRequestURI()).getName();
request.setAttribute("page", page);
User user = (User) session.getAttribute("user");
FacebookConnect fbc = (FacebookConnect) session.getAttribute("facebook");
if( fbc == null )
fbc = FacebookConnect.getConnection( request.getCookies() );
String action = request.getParameter("action");
if( action == null ) action = "";
UserMessage msgs = UserMessage.getUserMessage(session);
// Take care of facebook open graph
if( request.getHeader("User-Agent").startsWith("facebookexternalhit/1.1") && page.startsWith("media") ){
PrintWriter out = response.getWriter();
out.print("<HTML><HEAD>"+
"<!-- Facebook OpenGraph -->"+
"<meta property='og:title' content='"+WEBSITE_NAME+"'/>"+
"<meta property='og:type' content='album'/>"+
"<meta property='fb:app_id' content='"+FacebookConnect.getAplicationId()+"'/>"+
"<meta property='og:url' content='"+WEBSITE_URL+"media?type="+request.getParameter("type")+"&id="+request.getParameter("id")+"'/>"+
"<meta property='og:image' content='"+WEBSITE_URL+"content?type="+request.getParameter("type")+"&id="+request.getParameter("id")+"&size=small'/>"+
"<meta property='og:site_name' content='"+WEBSITE_NAME+"'/>"+
"</HEAD></HTML>");
return;
}
// Verify email address
if( action.equalsIgnoreCase("verfemail") ){
@ -132,35 +104,6 @@ public class Zallery extends HttpServlet{
else
msgs.add(MessageType.ERROR, "Email verification failed!");
}
// auth with facebook
if( user == null ){
if( fbc != null ){
FBUser fb_user = fbc.getUser();
user = User.loadByFacebook(request, response, db, fb_user.getUID() );
// New user?
if( user == null ){
logger.info("Creating new user from Facebook login.");
user = new User();
user.setFacebookUid( fb_user.getUID() );
user.setName( fb_user.getName() );
user.setEmail( "" );
user.registerOnHost(request, response, db, false );
ZalleryAjax.sendEmailNewUserToAdmin(user, db);
msgs.add(MessageType.INFO, "Your account has successfully been created. The account is waiting account activation by an admin.");
}
logger.info("Used Facebook to auth User: \""+user.getName()+"\".");
user.registerOnHost(request, response, db, false );
session.setAttribute("user", user);
session.setAttribute("facebook", fbc);
user.save(db);
//if( page.startsWith("login") )
response.sendRedirect( "gallery" );
//else
// response.sendRedirect( page );
return;
}
}
// auth with cookie
if( user == null ){
user = User.loadByCookie(request, db, getCookieValue(request.getCookies(), "sessionHash") );
@ -181,7 +124,6 @@ public class Zallery extends HttpServlet{
session.invalidate();
session = request.getSession( true );
msgs.setSession( session );
if( fbc != null ) fbc.logout( response );
user.logout( response );
if( !user.isEmailVerified() )
@ -199,12 +141,6 @@ public class Zallery extends HttpServlet{
String include_jsp = null;
if( user != null ){
logger.finest("Valid user: \""+user.getName()+"\"");
// Register facebook on user
if( user.getFacebookUid() == null && fbc != null){
FBUser fb_user = fbc.getUser();
user.setFacebookUid( fb_user.getUID() );
msgs.add(MessageType.INFO, "Facebook connected to your account.");
}
// Import JSP pages
if(page.startsWith("media")){
try{