Fix syntax error in Actor.pm
authordbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 7 Apr 2010 02:04:04 +0000 (02:04 +0000)
committerdbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 7 Apr 2010 02:04:04 +0000 (02:04 +0000)
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
Open-ILS/src/perlmods/OpenILS/Application/Actor.pm

index e2060e1..9070338 100644 (file)
@@ -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]
 </Location>
 
 # ----------------------------------------------------------------------------------
index 74ea92c..15aafaa 100644 (file)
@@ -3413,7 +3413,7 @@ sub _reset_password_request {
             ]
         },
         where => {
-            has_been_reset => { '=' => 'f' } },
+            has_been_reset => { '=' => 'f' },
             request_time => { '>' => $threshold_time }
         }
     });