Skip to content

Commit

Permalink
WebStyle: add secure_page_p to more client pages
Browse files Browse the repository at this point in the history
  • Loading branch information
kaplun authored and tiborsimko committed Dec 3, 2010
1 parent 92b280b commit 687c496
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 40 deletions.
6 changes: 4 additions & 2 deletions modules/bibcirculation/lib/bibcirculation_webinterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ def display(self, req, form):
lastupdated = __lastupdated__,
req = req,
language = argd['ln'],
navmenuid = "yourloans")
navmenuid = "yourloans",
secure_page_p=1)

def loanshistoricaloverview(self, req, form):
"""
Expand Down Expand Up @@ -159,7 +160,8 @@ def loanshistoricaloverview(self, req, form):
lastupdated = __lastupdated__,
req = req,
language = argd['ln'],
navmenuid = "yourloans")
navmenuid = "yourloans",
secure_page_p=1)


class WebInterfaceILLPages(WebInterfaceDirectory):
Expand Down
3 changes: 2 additions & 1 deletion modules/webalert/lib/webalert_webinterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ def display(self, req, form):
language=argd['ln'],
req=req,
lastupdated=__lastupdated__,
navmenuid='youralerts')
navmenuid='youralerts',
secure_page_p=1)

def input(self, req, form):

Expand Down
51 changes: 34 additions & 17 deletions modules/webbasket/lib/webbasket_webinterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,8 @@ def display(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)

def search(self, req, form):
"""Search baskets interface."""
Expand Down Expand Up @@ -435,7 +436,8 @@ def search(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)

def write_note(self, req, form):
"""Write a comment (just interface for writing)"""
Expand Down Expand Up @@ -499,7 +501,8 @@ def write_note(self, req, form):
warnings = warnings,
req = req,
navmenuid = 'yourbaskets',
of = argd['of'])
of = argd['of'],
secure_page_p=1)

def save_note(self, req, form):
"""Save comment on record in basket"""
Expand Down Expand Up @@ -571,7 +574,8 @@ def save_note(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)

def delete_note(self, req, form):
"""Delete a comment
Expand Down Expand Up @@ -646,7 +650,8 @@ def delete_note(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)

def add(self, req, form):
"""Add records to baskets.
Expand Down Expand Up @@ -743,7 +748,8 @@ def add(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)

def delete(self, req, form):
"""Delete basket interface"""
Expand Down Expand Up @@ -825,7 +831,8 @@ def delete(self, req, form):
warnings = warnings,
req = req,
navmenuid = 'yourbaskets',
of = argd['of'])
of = argd['of'],
secure_page_p=1)

def modify(self, req, form):
"""Modify basket content interface (reorder, suppress record, etc.)"""
Expand Down Expand Up @@ -917,7 +924,8 @@ def modify(self, req, form):
warnings = warnings,
req = req,
navmenuid = 'yourbaskets',
of = argd['of'])
of = argd['of'],
secure_page_p=1)

def edit(self, req, form):
"""Edit basket interface"""
Expand Down Expand Up @@ -1041,7 +1049,8 @@ def edit(self, req, form):
warnings = warnings,
req = req,
navmenuid = 'yourbaskets',
of = argd['of'])
of = argd['of'],
secure_page_p=1)

def edit_topic(self, req, form):
"""Edit topic interface"""
Expand Down Expand Up @@ -1142,7 +1151,8 @@ def edit_topic(self, req, form):
warnings = warnings,
req = req,
navmenuid = 'yourbaskets',
of = argd['of'])
of = argd['of'],
secure_page_p=1)

def create_basket(self, req, form):
"""Create basket interface"""
Expand Down Expand Up @@ -1219,7 +1229,8 @@ def create_basket(self, req, form):
warnings = warnings,
req = req,
navmenuid = 'yourbaskets',
of = argd['of'])
of = argd['of'],
secure_page_p=1)

def display_public(self, req, form):
"""Display a public basket"""
Expand Down Expand Up @@ -1285,7 +1296,8 @@ def display_public(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)

def list_public_baskets(self, req, form):
"""List of public baskets interface."""
Expand Down Expand Up @@ -1324,7 +1336,8 @@ def list_public_baskets(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)

def subscribe(self, req, form):
"""Subscribe to a basket pseudo-interface."""
Expand Down Expand Up @@ -1384,7 +1397,8 @@ def subscribe(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)

def unsubscribe(self, req, form):
"""Unsubscribe from basket pseudo-interface."""
Expand Down Expand Up @@ -1444,7 +1458,8 @@ def unsubscribe(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)

def write_public_note(self, req, form):
"""Write a comment (just interface for writing)"""
Expand Down Expand Up @@ -1503,7 +1518,8 @@ def write_public_note(self, req, form):
warnings = warnings,
req = req,
navmenuid = 'yourbaskets',
of = argd['of'])
of = argd['of'],
secure_page_p=1)

def save_public_note(self, req, form):
"""Save comment on record in basket"""
Expand Down Expand Up @@ -1570,4 +1586,5 @@ def save_public_note(self, req, form):
req = req,
navmenuid = 'yourbaskets',
of = argd['of'],
navtrail_append_title_p = 0)
navtrail_append_title_p = 0,
secure_page_p=1)
18 changes: 12 additions & 6 deletions modules/webmessage/lib/webmessage_webinterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ def display(self, req, form):
language = argd['ln'],
errors = errors,
warnings = warnings,
navmenuid = "yourmessages")
navmenuid = "yourmessages",
secure_page_p=1)

def write(self, req, form):
""" write(): interface for message composing
Expand Down Expand Up @@ -154,7 +155,8 @@ def write(self, req, form):
language = argd['ln'],
errors = errors,
warnings = warnings,
navmenuid = "yourmessages")
navmenuid = "yourmessages",
secure_page_p=1)

def send(self, req, form):
"""
Expand Down Expand Up @@ -274,7 +276,8 @@ def send(self, req, form):
language = argd['ln'],
errors = errors,
warnings = warnings,
navmenuid = "yourmessages")
navmenuid = "yourmessages",
secure_page_p=1)

def delete(self, req, form):
"""
Expand Down Expand Up @@ -321,7 +324,8 @@ def delete(self, req, form):
language = argd['ln'],
errors = errors,
warnings = warnings,
navmenuid = "yourmessages")
navmenuid = "yourmessages",
secure_page_p=1)

def delete_all(self, req, form):
"""
Expand Down Expand Up @@ -368,7 +372,8 @@ def delete_all(self, req, form):
language = argd['ln'],
errors = errors,
warnings = warnings,
navmenuid = "yourmessages")
navmenuid = "yourmessages",
secure_page_p=1)

def display_msg(self, req, form):
"""
Expand Down Expand Up @@ -416,5 +421,6 @@ def display_msg(self, req, form):
language = argd['ln'],
errors = errors,
warnings = warnings,
navmenuid = "yourmessages")
navmenuid = "yourmessages",
secure_page_p=1)

36 changes: 22 additions & 14 deletions modules/websession/lib/websession_webinterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def access(self, req, form):
try:
(role_name, expiration) = mail_cookie_check_role(args['mailcookie'], uid)
except InvenioWebAccessMailCookieDeletedError:
return page(title=_("Role authorization request"), req=req, body=_("This request for an authorization has already been authorized."), uid=webuser.getUid(req), navmenuid='youraccount', language=args['ln'])
return page(title=_("Role authorization request"), req=req, body=_("This request for an authorization has already been authorized."), uid=webuser.getUid(req), navmenuid='youraccount', language=args['ln'], secure_page_p=1)
return page(title=title,
body=webaccount.perform_back(
_("You have successfully obtained an authorization as %(x_role)s! "
Expand All @@ -104,7 +104,8 @@ def access(self, req, form):
uid=webuser.getUid(req),
language=args['ln'],
lastupdated=__lastupdated__,
navmenuid='youraccount')
navmenuid='youraccount',
secure_page_p=1)
elif kind == 'mail_activation':
try:
email = mail_cookie_check_mail_activation(args['mailcookie'])
Expand All @@ -120,7 +121,7 @@ def access(self, req, form):
uid = webuser.update_Uid(req, email)
body += "<p>" + _("You can now go to %(x_url_open)syour account page%(x_url_close)s.") % {'x_url_open' : '<a href="/youraccount/display?ln=%s">' % args['ln'], 'x_url_close' : '</a>'} + "</p>"
return page(title=_("Email address successfully activated"),
body=body, req=req, language=args['ln'], uid=webuser.getUid(req), lastupdated=__lastupdated__, navmenuid='youraccount')
body=body, req=req, language=args['ln'], uid=webuser.getUid(req), lastupdated=__lastupdated__, navmenuid='youraccount', secure_page_p=1)
except InvenioWebAccessMailCookieDeletedError, e:
body = "<p>" + _("You have already confirmed the validity of your email address!") + "</p>"
if CFG_ACCESS_CONTROL_LEVEL_ACCOUNTS == 1:
Expand All @@ -129,7 +130,7 @@ def access(self, req, form):
else:
body += "<p>" + _("You can now go to %(x_url_open)syour account page%(x_url_close)s.") % {'x_url_open' : '<a href="/youraccount/display?ln=%s">' % args['ln'], 'x_url_close' : '</a>'} + "</p>"
return page(title=_("Email address successfully activated"),
body=body, req=req, language=args['ln'], uid=webuser.getUid(req), lastupdated=__lastupdated__, navmenuid='youraccount')
body=body, req=req, language=args['ln'], uid=webuser.getUid(req), lastupdated=__lastupdated__, navmenuid='youraccount', secure_page_p=1)
return webuser.page_not_authorized(req, "../youraccount/access",
text=_("This request for confirmation of an email "
"address is not valid or"
Expand All @@ -155,7 +156,7 @@ def resetpassword(self, req, form):
try:
email = mail_cookie_check_pw_reset(reset_key)
except InvenioWebAccessMailCookieDeletedError:
return page(title=title, req=req, body=_("This request for resetting a password has already been used."), uid=webuser.getUid(req), navmenuid='youraccount', language=args['ln'])
return page(title=title, req=req, body=_("This request for resetting a password has already been used."), uid=webuser.getUid(req), navmenuid='youraccount', language=args['ln'], secure_page_p=1)
except InvenioWebAccessMailCookieError:
return webuser.page_not_authorized(req, "../youraccount/access",
text=_("This request for resetting a password is not valid or"
Expand Down Expand Up @@ -197,7 +198,7 @@ def resetpassword(self, req, form):
req=req,
language=args['ln'],
lastupdated=__lastupdated__,
navmenuid='youraccount')
navmenuid='youraccount', secure_page_p=1)

def display(self, req, form):
args = wash_urlargd(form, {})
Expand Down Expand Up @@ -793,7 +794,7 @@ def login(self, req, form):
keywords="%s , personalize" % CFG_SITE_NAME_INTL.get(args['ln'], CFG_SITE_NAME),
uid=uid,
req=req,
secure_page_p = 1,
secure_page_p=1,
language=args['ln'],
lastupdated=__lastupdated__,
navmenuid='youraccount')
Expand Down Expand Up @@ -968,7 +969,8 @@ def display(self, req, form):
uid=uid,
req=req,
language=argd['ln'],
lastupdated=__lastupdated__)
lastupdated=__lastupdated__,
secure_page_p=1)

class WebInterfaceYourGroupsPages(WebInterfaceDirectory):

Expand Down Expand Up @@ -1011,7 +1013,8 @@ def display(self, req, form):
lastupdated = __lastupdated__,
errors = errors,
warnings = warnings,
navmenuid = 'yourgroups')
navmenuid = 'yourgroups',
secure_page_p = 1)



Expand Down Expand Up @@ -1073,7 +1076,8 @@ def create(self, req, form):
lastupdated = __lastupdated__,
errors = errors,
warnings = warnings,
navmenuid = 'yourgroups')
navmenuid = 'yourgroups',
secure_page_p = 1)

def join(self, req, form):
"""join(): interface for joining a new group
Expand Down Expand Up @@ -1136,7 +1140,8 @@ def join(self, req, form):
lastupdated = __lastupdated__,
errors = errors,
warnings = warnings,
navmenuid = 'yourgroups')
navmenuid = 'yourgroups',
secure_page_p = 1)

def leave(self, req, form):
"""leave(): interface for leaving a group
Expand Down Expand Up @@ -1189,7 +1194,8 @@ def leave(self, req, form):
lastupdated = __lastupdated__,
errors = errors,
warnings = warnings,
navmenuid = 'yourgroups')
navmenuid = 'yourgroups',
secure_page_p = 1)

def edit(self, req, form):
"""edit(): interface for editing group
Expand Down Expand Up @@ -1260,7 +1266,8 @@ def edit(self, req, form):
lastupdated = __lastupdated__,
errors = errors,
warnings = warnings,
navmenuid = 'yourgroups')
navmenuid = 'yourgroups',
secure_page_p = 1)


def members(self, req, form):
Expand Down Expand Up @@ -1333,7 +1340,8 @@ def members(self, req, form):
lastupdated = __lastupdated__,
errors = errors,
warnings = warnings,
navmenuid = 'yourgroups')
navmenuid = 'yourgroups',
secure_page_p = 1)


def wash_login_method(login_method):
Expand Down

0 comments on commit 687c496

Please sign in to comment.