Move items out of the 'patrons-circle' folder into the root

This commit is contained in:
Alex Cabal 2022-07-09 19:39:29 -05:00
parent 12b79b5dcd
commit 76a4c34688
17 changed files with 95 additions and 39 deletions

View file

@ -259,15 +259,15 @@ Define webroot /standardebooks.org/web
RewriteRule ^/newsletter/subscriptions/([^/\.]+?)/(confirm|delete)$ /newsletter/subscriptions/$2.php?uuid=$1 [L]
# Polls
RewriteRule ^/patrons-circle/polls/([^/\.]+)$ /patrons-circle/polls/get.php?pollurlname=$1 [L]
RewriteRule ^/patrons-circle/polls/([^/\.]+)/votes/new$ /patrons-circle/polls/votes/new.php?pollurlname=$1 [L]
RewriteRule ^/patrons-circle/polls/([^/\.]+)/votes/([0-9]+)$ /patrons-circle/polls/votes/get.php?pollurlname=$1&userid=$2 [L]
RewriteRule ^/polls/([^/\.]+)$ /polls/get.php?pollurlname=$1 [L]
RewriteRule ^/polls/([^/\.]+)/votes/new$ /polls/votes/new.php?pollurlname=$1 [L]
RewriteRule ^/polls/([^/\.]+)/votes/([0-9]+)$ /polls/votes/get.php?pollurlname=$1&userid=$2 [L]
RewriteCond expr "tolower(%{REQUEST_METHOD}) =~ /^get$/"
RewriteRule ^/patrons-circle/polls/([^/\.]+)/votes$ /patrons-circle/polls/votes/index.php?pollurlname=$1 [L]
RewriteRule ^/polls/([^/\.]+)/votes$ /polls/votes/index.php?pollurlname=$1 [L]
RewriteCond expr "tolower(%{REQUEST_METHOD}) =~ /^post$/"
RewriteRule ^/patrons-circle/polls/([^/\.]+)/votes$ /patrons-circle/polls/votes/post.php?pollurlname=$1 [L]
RewriteRule ^/polls/([^/\.]+)/votes$ /polls/votes/post.php?pollurlname=$1 [L]
# Feeds
# Rewrite old links to feeds
@ -281,9 +281,10 @@ Define webroot /standardebooks.org/web
DBDriver mysql
DBDParams "dbname=se user=www-data"
# HTTP Basic Auth configuration for:
# /patrons-circle/downloads
# /bulk-downloads
# /feeds
<DirectoryMatch "^${webroot}/www/(patrons-circle|feeds/(opds|rss|atom))">
# /polls/votes (we will allow access to view results at /polls/votes/index.php further down)
<DirectoryMatch "^${webroot}/www/(polls/votes|bulk-downloads|feeds/(opds|rss|atom))">
AuthType Basic
AuthName "Enter your Patrons Circle email address and leave the password empty."
Require valid-user
@ -307,15 +308,23 @@ Define webroot /standardebooks.org/web
"
</DirectoryMatch>
# Specific config for /patrons-circle/downloads
<DirectoryMatch "^${webroot}/www/patrons-circle/downloads">
# Specific config for /bulk-downloads
<DirectoryMatch "^${webroot}/www/bulk-downloads">
<FilesMatch "\.php$">
# Disable HTTP Basic auth for the index and 401 pages
Require all granted
</FilesMatch>
<FilesMatch "\.zip$">
ErrorDocument 401 /patrons-circle/downloads
ErrorDocument 401 /bulk-downloads
</FilesMatch>
</DirectoryMatch>
# Specific config for /polls/votes
<DirectoryMatch "^${webroot}/www/polls/votes">
<FilesMatch "index.php$">
# Disable HTTP Basic auth for the index page
Require all granted
</FilesMatch>
</DirectoryMatch>

View file

@ -241,15 +241,15 @@ Define webroot /standardebooks.org/web
RewriteRule ^/newsletter/subscriptions/([^/\.]+?)/(confirm|delete)$ /newsletter/subscriptions/$2.php?uuid=$1 [L]
# Polls
RewriteRule ^/patrons-circle/polls/([^/\.]+)$ /patrons-circle/polls/get.php?pollurlname=$1 [L]
RewriteRule ^/patrons-circle/polls/([^/\.]+)/votes/new$ /patrons-circle/polls/votes/new.php?pollurlname=$1 [L]
RewriteRule ^/patrons-circle/polls/([^/\.]+)/votes/([0-9]+)$ /patrons-circle/polls/votes/get.php?pollurlname=$1&userid=$2 [L]
RewriteRule ^/polls/([^/\.]+)$ /polls/get.php?pollurlname=$1 [L]
RewriteRule ^/polls/([^/\.]+)/votes/new$ /polls/votes/new.php?pollurlname=$1 [L]
RewriteRule ^/polls/([^/\.]+)/votes/([0-9]+)$ /polls/votes/get.php?pollurlname=$1&userid=$2 [L]
RewriteCond expr "tolower(%{REQUEST_METHOD}) =~ /^get$/"
RewriteRule ^/patrons-circle/polls/([^/\.]+)/votes$ /patrons-circle/polls/votes/index.php?pollurlname=$1 [L]
RewriteRule ^/polls/([^/\.]+)/votes$ /polls/votes/index.php?pollurlname=$1 [L]
RewriteCond expr "tolower(%{REQUEST_METHOD}) =~ /^post$/"
RewriteRule ^/patrons-circle/polls/([^/\.]+)/votes$ /patrons-circle/polls/votes/post.php?pollurlname=$1 [L]
RewriteRule ^/polls/([^/\.]+)/votes$ /polls/votes/post.php?pollurlname=$1 [L]
# Feeds
# Rewrite old links to feeds
@ -263,9 +263,10 @@ Define webroot /standardebooks.org/web
DBDriver mysql
DBDParams "dbname=se user=www-data"
# HTTP Basic Auth configuration for:
# /patrons-circle/downloads
# /bulk-downloads
# /feeds
<DirectoryMatch "^${webroot}/www/(patrons-circle|feeds/(opds|rss|atom))">
# /polls/votes (we will allow access to view results at /polls/votes/index.php further down)
<DirectoryMatch "^${webroot}/www/(polls/votes|bulk-downloads|feeds/(opds|rss|atom))">
AuthType Basic
AuthName "Enter your Patrons Circle email address and leave the password empty."
Require valid-user
@ -289,15 +290,23 @@ Define webroot /standardebooks.org/web
"
</DirectoryMatch>
# Specific config for /patrons-circle/downloads
<DirectoryMatch "^${webroot}/www/patrons-circle/downloads">
# Specific config for /bulk-downloads
<DirectoryMatch "^${webroot}/www/bulk-downloads">
<FilesMatch "\.php$">
# Disable HTTP Basic auth for the index and 401 pages
Require all granted
</FilesMatch>
<FilesMatch "\.zip$">
ErrorDocument 401 /patrons-circle/downloads
ErrorDocument 401 /bulk-downloads
</FilesMatch>
</DirectoryMatch>
# Specific config for /polls/votes
<DirectoryMatch "^${webroot}/www/polls/votes">
<FilesMatch "index.php$">
# Disable HTTP Basic auth for the index page
Require all granted
</FilesMatch>
</DirectoryMatch>