From 36ce4ddb9730e7040347e640429d438b4f9eeed5 Mon Sep 17 00:00:00 2001 From: dbs Date: Wed, 7 Apr 2010 02:04:04 +0000 Subject: [PATCH] Fix syntax error in Actor.pm Redirect HTTP connections to /opac/password to HTTPS git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16145 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/apache/eg_vhost.conf | 6 ++++++ Open-ILS/src/perlmods/OpenILS/Application/Actor.pm | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf index e2060e1f19..9070338647 100644 --- a/Open-ILS/examples/apache/eg_vhost.conf +++ b/Open-ILS/examples/apache/eg_vhost.conf @@ -172,6 +172,12 @@ RewriteRule - - [E=locale:en-US] [L] Options +ExecCGI PerlSendHeader On allow from all + + # Force clients to use HTTPS + RewriteEngine On + RewriteCond %{HTTPS} !=on [NC] + RewriteCond %{REQUEST_URI} ^/opac/password(/.*)? + RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [R,L] # ---------------------------------------------------------------------------------- diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm index 74ea92c905..15aafaabc8 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm @@ -3413,7 +3413,7 @@ sub _reset_password_request { ] }, where => { - has_been_reset => { '=' => 'f' } }, + has_been_reset => { '=' => 'f' }, request_time => { '>' => $threshold_time } } }); -- 2.11.0