From 897aeba927f61181a625d1a7ae425e1a68968725 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 19 Jan 2022 00:57:24 +0100 Subject: [PATCH] Move to krk.tojnar.cz subdomain for now. --- .htaccess | 54 +- index.php | 30 +- lob2011/.htaccess | 30 +- lob2011/index.php | 6 +- lob2011/load.lib.php | 10 +- .../pages/-de/Technische_Hinweise_2011.html | 4 +- lob2011/pages/-de/ausschreibung_09.pg | 2 +- lob2011/pages/-de/ausschreibung_10.pg | 2 +- lob2011/pages/-de/hinweise_10.pg | 2 +- lob2011/pages/-de/rozpis_09_de.pg | 2 +- lob2011/pages/cs/main.mn | 8 +- lob2011/pages/cs/pokyny.pg | 8 +- lob2011/pages/cs/rozpis.pg | 6 +- lob2011/pages/cs/rozpis_0.pg | 6 +- ms_2010_nz/.htaccess | 2 +- ms_2010_nz/novinky.phtml | 1038 ++++++++--------- pages/clanky/loby_2010/skiadventure_2010.php | 2 +- pages/kontakt-en.php | 2 +- pages/kontakt.php | 2 +- pages/krk_default-en.php | 2 +- pages/krk_default.php | 48 +- pages/krk_topmenu-en.php | 2 +- pages/krk_topmenu.php | 6 +- pages/krk_vnitro.php | 6 +- pages/mcr_2009/analysis.php | 14 +- pages/mcr_2009/fotky-de.php | 6 +- pages/mcr_2009/fotky-en.php | 6 +- pages/mcr_2009/fotky.php | 6 +- pages/mcr_2009/hrob_2002-de.php | 28 +- pages/mcr_2009/hrob_2002-en.php | 28 +- pages/mcr_2009/hrob_2002.php | 28 +- pages/mcr_2009/lob2002-de.php | 72 +- pages/mcr_2009/lob2002-en.php | 72 +- pages/mcr_2009/lob2002.php | 72 +- pages/mcr_2009/map_centre-de.php | 4 +- pages/mcr_2009/map_centre-en.php | 4 +- pages/mcr_2009/map_centre.php | 4 +- pages/mcr_2009/mcr_2009-de.php | 24 +- pages/mcr_2009/mcr_2009-en.php | 30 +- pages/mcr_2009/mcr_2009.php | 42 +- pages/mcr_2009/menu.php | 4 +- pages/mcr_2009/menukrk.php | 4 +- pages/mcr_2009/menumcr_2009-de.php | 26 +- pages/mcr_2009/menumcr_2009-en.php | 26 +- pages/mcr_2009/menumcr_2009.php | 28 +- pages/mcr_2009/pavlikova.php | 300 ++--- pages/mcr_2009/podzim_2008.php | 308 ++--- pages/mcr_2009/pokyny_rog2009-de.php | 8 +- pages/mcr_2009/pokyny_rog2009-en.php | 8 +- pages/mcr_2009/pokyny_rog2009.php | 8 +- .../probihani_loucna/probihani_loucna-de.php | 28 +- .../probihani_loucna/probihani_loucna-en.php | 28 +- .../probihani_loucna/probihani_loucna.php | 28 +- pages/mcr_2009/results-de.php | 74 +- pages/mcr_2009/results-en.php | 74 +- pages/mcr_2009/results.php | 74 +- pages/mcr_2009/rozpis_cz.php | 10 +- pages/mcr_2009/rozpis_rog2009-de.php | 10 +- pages/mcr_2009/rozpis_rog2009-en.php | 10 +- pages/mcr_2009/rozpis_rog2009.php | 10 +- pages/mcr_2009/rozpis_rog2009_P.php | 10 +- pages/mcr_2009/szrsavsd.php | 10 +- pages/mcr_2009/upoutavka-de.php | 36 +- pages/mcr_2009/upoutavka-en.php | 36 +- pages/mcr_2009/upoutavka.php | 36 +- pages/mcr_2009/zacek.php | 176 +-- pages/menukrk-en.php | 4 +- pages/menukrk.php | 10 +- pages/thumb.php | 36 +- prebor2010/.htaccess | 2 +- prebor2010/novinky.phtml | 2 +- prebor2010/rozpis.phtml | 4 +- 72 files changed, 1574 insertions(+), 1574 deletions(-) diff --git a/.htaccess b/.htaccess index 20a4551..b0d3938 100644 --- a/.htaccess +++ b/.htaccess @@ -1,75 +1,75 @@ -ErrorDocument 404 /krk/index.php +ErrorDocument 404 /index.php ### Redirect old URLs to new ones ## Subpages RewriteCond &%{QUERY_STRING}& &lang=(en|de)& RewriteCond %1@&%{QUERY_STRING}& (en|de)@.*&page=mcr_2009/mcr_2009& -RewriteRule .* /krk/%1/mcr_2009/ [R=301,QSD,L] +RewriteRule .* /%1/mcr_2009/ [R=301,QSD,L] RewriteCond &%{QUERY_STRING}& &page=mcr_2009/probihani_loucna/probihani_loucna& -RewriteRule .* /krk/mcr_2009/probihani_loucna/ [R=301,QSD,L] +RewriteRule .* /mcr_2009/probihani_loucna/ [R=301,QSD,L] RewriteCond &%{QUERY_STRING}& &lang=(en|de)& RewriteCond %1@&%{QUERY_STRING}& (en|de)@.*&page=mcr_2009(/mcr_2009)?& -RewriteRule .* /krk/%1/mcr_2009/ [R=301,QSD,L] +RewriteRule .* /%1/mcr_2009/ [R=301,QSD,L] RewriteCond &%{QUERY_STRING}& &page=mcr_2009(/mcr_2009)?& -RewriteRule .* /krk/mcr_2009/ [R=301,QSD,L] +RewriteRule .* /mcr_2009/ [R=301,QSD,L] RewriteCond &%{QUERY_STRING}& &lang=(en|de)& RewriteCond %1@&%{QUERY_STRING}& (en|de)@.*&page=clanky(/clanky)?& -RewriteRule .* /krk/%1/clanky/ [R=301,QSD,L] +RewriteRule .* /%1/clanky/ [R=301,QSD,L] RewriteCond &%{QUERY_STRING}& &page=clanky(/clanky)?& -RewriteRule .* /krk/clanky/ [R=301,QSD,L] +RewriteRule .* /clanky/ [R=301,QSD,L] RewriteCond &%{QUERY_STRING}& &lang=(en|de)& RewriteCond %1@&%{QUERY_STRING}& (en|de)@.*&page=(krk_default)?& -RewriteRule .* /krk/%1/ [R=301,QSD,L] +RewriteRule .* /%1/ [R=301,QSD,L] RewriteCond &%{QUERY_STRING}& &page=(krk_default)?& -RewriteRule .* /krk/ [R=301,QSD,L] +RewriteRule .* / [R=301,QSD,L] ## Generic fallback RewriteCond &%{QUERY_STRING}& &lang=(en|de)& RewriteCond %1@&%{QUERY_STRING}& (en|de)@.*&page=([^&]+)/& -RewriteRule .* /krk/%1/%2/ [R=301,QSD,L,nosubreq] +RewriteRule .* /%1/%2/ [R=301,QSD,L,nosubreq] RewriteCond &%{QUERY_STRING}& &lang=(en|de)& RewriteCond %1@&%{QUERY_STRING}& (en|de)@.*&page=([^&]+)& -RewriteRule .* /krk/%1/%2.html [R=301,QSD,L,nosubreq] +RewriteRule .* /%1/%2.html [R=301,QSD,L,nosubreq] RewriteCond &%{QUERY_STRING}& &page=([^&]+)/& -RewriteRule .* /krk/%1/ [R=301,QSD,L,nosubreq] +RewriteRule .* /%1/ [R=301,QSD,L,nosubreq] RewriteCond &%{QUERY_STRING}& &page=([^&]+)& -RewriteRule .* /krk/%1.html [R=301,QSD,L,nosubreq] +RewriteRule .* /%1.html [R=301,QSD,L,nosubreq] # No page selected RewriteCond &%{QUERY_STRING}& &lang=(en|de)& -RewriteRule .* /krk/%1/ [R=301,QSD,L,nosubreq] +RewriteRule .* /%1/ [R=301,QSD,L,nosubreq] # No page selected RewriteCond &%{QUERY_STRING}& &lang=cs& -RewriteRule .* /krk/ [R=301,QSD,L,nosubreq] +RewriteRule .* / [R=301,QSD,L,nosubreq] ### Load files in pages/ -RewriteCond %{REQUEST_URI} ^/krk/(.+)$ -RewriteCond %{DOCUMENT_ROOT}/krk/pages/%1 -f -RewriteRule ^(.*)$ /krk/pages/$1 [END] +RewriteCond %{REQUEST_URI} ^/(.+)$ +RewriteCond %{DOCUMENT_ROOT}/pages/%1 -f +RewriteRule ^(.*)$ /pages/$1 [END] ### Canonization -RewriteRule ^cs(?:/(.*))?$ /krk/$1 [R=301,L] -RewriteRule ^(en|de)$ /krk/$1/ [R=301,L] -RewriteRule ^(mainkrk|index|print).php$ /krk/ [R=301,L] -RewriteRule ^pages(/.*)$ /krk$1 [R=301,L,nosubreq] +RewriteRule ^cs(?:/(.*))?$ /$1 [R=301,L] +RewriteRule ^(en|de)$ /$1/ [R=301,L] +RewriteRule ^(mainkrk|index|print).php$ / [R=301,L] +RewriteRule ^pages(/.*)$ $1 [R=301,L,nosubreq] ### Fall back to loading pages through our “CMS” RewriteCond %{REQUEST_URI} !^/pages/ RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-d -RewriteRule ^(en|de)/$ /krk/index.php [END] -RewriteRule ^(en|de)/(.+)\.html$ /krk/index.php [END] -RewriteRule ^(.+)\.html$ /krk/index.php [END] -RewriteRule ^(en|de)/(.+)/$ /krk/index.php [END] -RewriteRule ^(.+/)$ /krk/index.php [END] +RewriteRule ^(en|de)/$ /index.php [END] +RewriteRule ^(en|de)/(.+)\.html$ /index.php [END] +RewriteRule ^(.+)\.html$ /index.php [END] +RewriteRule ^(en|de)/(.+)/$ /index.php [END] +RewriteRule ^(.+/)$ /index.php [END] diff --git a/index.php b/index.php index eab387e..518e7a4 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ en|de)/)?(?P.*?)(\.html)?$)', $_SERVER['REQUEST_URI'] ?? '', $match); +preg_match('(^/(?:(?Pen|de)/)?(?P.*?)(\.html)?$)', $_SERVER['REQUEST_URI'] ?? '', $match); $lang = empty($match['lang']) ? 'cs' : $match['lang']; $page = $match['page'] ?? ''; @@ -8,15 +8,15 @@ ob_start(); - - - + + + - - + +