From 3f7e2729bbf1431474b7ecaeabab488cc1de8106 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 1 Jan 2014 10:43:05 +0530 Subject: [PATCH] removed demo hooks --- erpnext/startup/event_handlers.py | 40 ++----------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index f9723e13f2d..c69501cdafa 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -10,16 +10,7 @@ def on_session_creation(login_manager): called after login update login_from and delete parallel sessions """ - # Clear previous sessions i.e. logout previous log-in attempts - allow_multiple_sessions = ['demo@erpnext.com', 'Administrator', 'Guest'] - if webnotes.session['user'] not in allow_multiple_sessions: - from webnotes.sessions import clear_sessions - clear_sessions(webnotes.session.user, keep_current=True) - - # check if account is expired - check_if_expired() - - if webnotes.session['user'] not in ('Guest', 'demo@erpnext.com'): + if webnotes.session['user'] not in ('Guest'): # create feed from webnotes.utils import nowtime from webnotes.profile import get_user_fullname @@ -27,31 +18,4 @@ def on_session_creation(login_manager): make_feed('Login', 'Profile', login_manager.user, login_manager.user, '%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()), login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D') - webnotes.conn.commit() - -def check_if_expired(): - """check if account is expired. If expired, do not allow login""" - from webnotes import conf - # check if expires_on is specified - if not 'expires_on' in conf: return - - # check if expired - from datetime import datetime, date - expires_on = datetime.strptime(conf.expires_on, '%Y-%m-%d').date() - if date.today() <= expires_on: return - - # if expired, stop user from logging in - from webnotes.utils import formatdate - msg = """Oops! Your subscription expired on %s.
""" % formatdate(conf.expires_on) - - if 'System Manager' in webnotes.user.get_roles(): - msg += """Just drop in a mail at support@erpnext.com and - we will guide you to get your account re-activated.""" - else: - msg += """Just ask your System Manager to drop in a mail at support@erpnext.com and - we will guide him to get your account re-activated.""" - - webnotes.msgprint(msg) - - webnotes.response['message'] = 'Account Expired' - raise webnotes.AuthenticationError + webnotes.conn.commit() \ No newline at end of file