Merge remote-tracking branch 'calcms/master'
This commit is contained in:
@@ -15,7 +15,7 @@ RewriteRule ^feed_kommentare/(.*)$ comments.cgi?template=comments.xml&limit
|
||||
RewriteRule ^kommentar_neu/(.*)$ add_comment.cgi?$1 [L]
|
||||
|
||||
RewriteRule ^sendung/(\d+)/[^&]*(&.*)?$ events.cgi?template=event_details.html&event_id=$1&$2 [L]
|
||||
RewriteRule ^sendung/(.*)$ events.cgi?$1 [L]
|
||||
RewriteRule ^sendung/(.*)$ events.cgi?$1 [L]
|
||||
|
||||
RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(\d)/(.*)$ events.cgi?template=event_list_2.html&from_date=$1&till_date=$2&weekday=$3&$4 [L]
|
||||
RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=event_list_2.html&from_date=$1&till_date=$2&$3 [L]
|
||||
@@ -25,15 +25,14 @@ RewriteRule ^sendungen/(.*)$ events.cgi?$1 [L]
|
||||
|
||||
RewriteRule ^menu/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(\d)/(.*)$ events.cgi?template=event_menu.html&from_date=$1&till_date=$2&weekday=$3&$4 [L]
|
||||
RewriteRule ^menu/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=event_menu.html&from_date=$1&till_date=$2&$3 [L]
|
||||
RewriteRule ^menu/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=event_menu.html&date=$1&$2 [L]
|
||||
RewriteRule ^menu/heute/(.*)$ events.cgi?template=event_menu.html&date=today&$1 [L]
|
||||
RewriteRule ^menu/(.*)$ events.cgi?$1 [L]
|
||||
RewriteRule ^menu/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=event_menu.html&date=$1&$2 [L]
|
||||
RewriteRule ^menu/heute/(.*)$ events.cgi?template=event_menu.html&date=today&$1 [L]
|
||||
RewriteRule ^menu/(.*)$ events.cgi?$1 [L]
|
||||
|
||||
RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})/$ cal.cgi?date=$1&template=calendar_colo.html&open_end=1 [L]
|
||||
RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/$ cal.cgi?from_date=$1&till_date=$2&template=calendar_colo.html&open_end=1 [L]
|
||||
RewriteRule ^kalender/(.*)$ cal.cgi?$1&template=calendar_colo.html&open_end=1 [L]
|
||||
|
||||
RewriteRule ^kategorien/(.*)$ category.cgi?$1 [L]
|
||||
RewriteRule ^sendereihen/(.*)$ series_names.cgi?$1 [L]
|
||||
|
||||
RewriteRule ^playlist/(.*)$ events.cgi?template=event_playlist.html&time=future&limit=5&$1 [L]
|
||||
@@ -48,6 +47,8 @@ RewriteRule ^atom/(.*)$ events.cgi?template=event.atom.xml&time=future&limit=
|
||||
RewriteRule ^atom.xml[\?]?(.*)$ events.cgi?template=event.atom.xml&time=future&limit=100&$1 [L]
|
||||
RewriteRule ^rss/(.*)$ events.cgi?template=event.rss.xml&time=future&limit=100&$1 [L]
|
||||
RewriteRule ^rss.xml[\?]?(.*)$ events.cgi?template=event.rss.xml&time=future&limit=100&$1 [L]
|
||||
RewriteRule ^rss-media/(.*)$ events.cgi?last_days=7&only_recordings=1&template=event_media.rss.xml&$1 [L]
|
||||
|
||||
|
||||
RewriteRule ^ical/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(\d)/(.*)$ events.cgi?template=event.ics&from_date=$1&till_date=$2&weekday=$3&$4 [L]
|
||||
RewriteRule ^ical/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=event.ics&from_date=$1&till_date=$2&$3 [L]
|
||||
@@ -63,27 +64,24 @@ RewriteRule ^suche/(.*?)/(.*?)/vergangene/(.*)$ events.cgi?template=event_list.h
|
||||
RewriteRule ^suche/(.*?)/(.*?)/(.*)$ events.cgi?template=event_list.html&project=$1&search=$2&$3 [L]
|
||||
RewriteRule ^suche/(.*?)/(.*)$ events.cgi?template=event_list.html&search=$1&$2 [L]
|
||||
|
||||
RewriteRule ^kategorie/(.*?)/(.*?)/kommende/(.*)$ events.cgi?template=event_list.html&project=$1&category=$2&archive=coming&$3 [L]
|
||||
RewriteRule ^kategorie/(.*?)/(.*?)/vergangene/(.*)$ events.cgi?template=event_list.html&project=$1&category=$2&archive=gone&$3 [L]
|
||||
RewriteRule ^kategorie/(.*?)/(.*?)/(.*)$ events.cgi?template=event_list.html&project=$1&category=$2&$3 [L]
|
||||
RewriteRule ^kategorie/(.*?)/(.*)$ events.cgi?template=event_list.html&category=$1&$2 [L]
|
||||
|
||||
RewriteRule ^rds/(.*)$ events.cgi?template=event_playlist.txt&time=now&limit=1&$1 [L]
|
||||
RewriteRule ^playlist_show/(.*)$ events.cgi?template=event_playlist_show.html&time=future&limit=3&$1 [L]
|
||||
RewriteRule ^json/(.*)$ events.cgi?template=event.json&time=now&limit=15&$1 [L]
|
||||
|
||||
RewriteRule ^dashboard/sendung/(\d+)/[^&]*(&.*)?$ events.cgi?template=event_dashboard_details.html&event_id=$1&$2 [L]
|
||||
RewriteRule ^dashboard/date/(\d{4}-\d{2}-\d{2})/ events.cgi?template=event_dashboard.html.js&date=$1&$2 [L]
|
||||
RewriteRule ^dashboard/(.*)$ events.cgi?template=event_dashboard.html.js&time=now&limit=1&$1 [L]
|
||||
|
||||
RewriteRule ^sendereihe/(.*?)/(.*?)/kommende/(.*)$ events.cgi?template=event_list.html&project=$1&series_name=$2&archive=coming&$3 [L]
|
||||
RewriteRule ^sendereihe/(.*?)/(.*?)/vergangene/(.*)$ events.cgi?template=event_list.html&project=$1&series_name=$2&archive=gone&$3 [L]
|
||||
RewriteRule ^sendereihe/(.*?)/(.*?)/show/$ events.cgi?template=event_redirect.html&project=$1&series_name=$2&limit=1&$3 [L]
|
||||
RewriteRule ^sendereihe/(.*?)/(.*?)/(.*)$ events.cgi?template=event_list.html&project=$1&series_name=$2&$3 [L]
|
||||
RewriteRule ^sendereihe/(.*?)/(.*)$ events.cgi?template=event_list.html&series_name=$1&$2 [L]
|
||||
|
||||
RewriteRule ^freefm.xml$ events.cgi?template=event_freefm.xml&location=piradio&limit=40
|
||||
RewriteRule ^future$ events.cgi?template=event_list_image.html&limit=20
|
||||
RewriteRule ^dt64-festival.html$ events.cgi?location=dt64&template=event_dt64&archive=all
|
||||
RewriteRule ^frrapo-programm.html$ events.cgi?location=potsdam&template=event_frrapo
|
||||
RewriteRule ^upload_playout_piradio$ upload_playout.cgi?project_id=1&studio_id=1
|
||||
|
||||
|
||||
</IfModule>
|
||||
|
||||
# MOD_PERL
|
||||
@@ -104,18 +102,4 @@ Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
|
||||
AddHandler cgi-script .cgi .pl
|
||||
</IfModule>
|
||||
|
||||
#Order allow,deny
|
||||
#allow from all
|
||||
Require all granted
|
||||
|
||||
## compress
|
||||
<IfModule mod_headers.c>
|
||||
# SetOutputFilter DEFLATE
|
||||
# SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png|zip|mp3)$ no-gzip dont-vary
|
||||
# Header append Vary User-Agent env=!dont-vary
|
||||
|
||||
# <FilesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|js|css|swf)$">
|
||||
# Header set Cache-Control "max-age=600, public"
|
||||
# </FilesMatch>
|
||||
</IfModule>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user