Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37989] trunk/_htaccess
|
From: Filipus K. <ch...@gm...> - 2011-10-05 15:20:55
|
OK, I merged r37984 in r37992, that's all that was missing. Sorry, I didn't realize I had already a commit on the 8.x branch when I committed the fix to trunk. Le 2011-10-05 08:32, Jonny Bradley a écrit : > Hi chealer - FYI: Some of your commits on this in the two branches might have got lost, don't have time to fix sorry... > > jb > > > On 5 Oct 2011, at 13:25, jon...@us... wrote: > >> Revision: 37989 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37989&view=rev >> Author: jonnybradley >> Date: 2011-10-05 12:25:32 +0000 (Wed, 05 Oct 2011) >> Log Message: >> ----------- >> [FIX] rollback merge conflict (please be MORE careful of "partial" backports!) >> >> Modified Paths: >> -------------- >> trunk/_htaccess >> >> Modified: trunk/_htaccess >> =================================================================== >> --- trunk/_htaccess 2011-10-05 12:01:47 UTC (rev 37988) >> +++ trunk/_htaccess 2011-10-05 12:25:32 UTC (rev 37989) >> @@ -1,12 +1,14 @@ >> -# $Id: _htaccess 37986 2011-10-05 05:50:19Z chealer $ [This line is used to check that this configuration file is up to date. Do not edit this line and leave it as the first line.] >> -# These are suggested Rewrite Rules for use with Tiki. >> -# They enhance security and permit short URLs. >> -# In your Tiki instance, visit tiki-admin.php?page=sefurl >> +# $Id: _htaccess 33755 2011-04-01 17:01:37Z sylvieg $ [This line is used to check that this configuration file is up to date. Do not edit this line and leave it as the first line.] >> +# These are suggested configuration directives for use with Tiki. >> +# They enhance security and permit clean URLs. >> +# In your Tiki instance, visit tiki-admin.php?page=sefurl to make Tiki use clean URLs in generated links. >> # >> -# To use >> -# 1- rename _htaccess to .htaccess >> -# or >> -# 2- add the content of this file to your httpd.conf >> +# To use, ideally, create a symbolic link from .htaccess to _htaccess. This will keep the configuration up-to-date. >> +# If you can't, do one of the following: >> +# - Copy _htaccess to .htaccess. >> +# - Add the content of this file to your httpd.conf. >> +# This should be repeated when the reference _htaccess file changes (when upgrading Tiki). >> + >> # >> # Please find more info here >> # http://doc.tiki.org/Rewrite+Rules >> @@ -77,19 +79,10 @@ >> RewriteRule ^calendar$ tiki-calendar.php [L] >> RewriteRule ^articles$ tiki-view_articles.php [L] >> RewriteRule ^blogs$ tiki-list_blogs.php [L] >> -# The following supports up to seven merged calendars; most to least. SEWilco 2008-07-15 >> -RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3&calIds[]=$4&calIds[]=$5&calIds[]=$6&calIds[]=$7 [QSA,L] >> -RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3&calIds[]=$4&calIds[]=$5&calIds[]=$6 [QSA,L] >> -RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3&calIds[]=$4&calIds[]=$5 [QSA,L] >> -RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3&calIds[]=$4 [QSA,L] >> -RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3 [QSA,L] >> -RewriteRule ^cal([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2 [QSA,L] >> -RewriteRule ^cal([0-9]+) tiki-calendar.php?calIds[]=$1 [QSA,L] >> RewriteRule ^categories$ tiki-browse_categories.php [L] >> RewriteRule ^chat$ tiki-chat.php [L] >> RewriteRule ^contact$ tiki-contact.php [L] >> RewriteRule ^directories$ tiki-directory_browse.php [L] >> -RewriteRule ^dirlink([0-9]+) tiki-directory_redirect.php?siteId=$1 [QSA,L] >> RewriteRule ^faqs$ tiki-list_faqs.php [L] >> RewriteRule ^filelist$ tiki-list_file_gallery.php [L] >> RewriteRule ^forums$ tiki-forums.php [L] >> @@ -115,11 +108,22 @@ >> RewriteRule ^blogpost([0-9]+)\-.*$ blogpost$1 >> RewriteRule ^article([0-9]+)(.*) tiki-read_article.php?articleId=$1$2 [QSA,L] >> RewriteRule ^art([0-9]+)(.*) tiki-read_article.php?articleId=$1$2 [QSA,L] >> + >> +# The following supports up to seven merged calendars; most to least. SEWilco 2008-07-15 >> +RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3&calIds[]=$4&calIds[]=$5&calIds[]=$6&calIds[]=$7 [QSA,L] >> +RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3&calIds[]=$4&calIds[]=$5&calIds[]=$6 [QSA,L] >> +RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3&calIds[]=$4&calIds[]=$5 [QSA,L] >> +RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3&calIds[]=$4 [QSA,L] >> +RewriteRule ^cal([0-9]+),([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2&calIds[]=$3 [QSA,L] >> +RewriteRule ^cal([0-9]+),([0-9]+) tiki-calendar.php?calIds[]=$1&calIds[]=$2 [QSA,L] >> +RewriteRule ^cal([0-9]+) tiki-calendar.php?calIds[]=$1 [QSA,L] >> + >> RewriteRule ^cat([0-9]+)\-?[^&]*(.*) tiki-browse_categories.php?parentId=$1$2 [QSA,L] >> RewriteRule ^blog([0-9]+)(.*) tiki-view_blog.php?blogId=$1$2 [QSA,L] >> RewriteRule ^blogpost([0-9]+)(.*) tiki-view_blog_post.php?postId=$1$2 [QSA,L] >> RewriteRule ^browseimage([0-9]+)(.*) tiki-browse_image.php?imageId=$1$2 [QSA,L] >> RewriteRule ^directory([0-9]+)(.*) tiki-directory_browse.php?parent=$1$2 [QSA,L] >> +RewriteRule ^dirlink([0-9]+) tiki-directory_redirect.php?siteId=$1 [QSA,L] >> RewriteRule ^faq([0-9]+)(.*) tiki-view_faq.php?faqId=$1$2 [QSA,L] >> RewriteRule ^file([0-9]+)(.*) tiki-list_file_gallery.php?galleryId=$1$2 [QSA,L] >> RewriteRule ^dl([0-9]+)(.*) tiki-download_file.php?fileId=$1$2 [QSA,L] >> @@ -145,11 +149,14 @@ >> RewriteRule ^user([0-9]+)(.*) tiki-user_information.php?userId=$1$2 [QSA,L] >> RewriteRule ^(lib/wiki3d/.+\.jar)$ $1 [L] >> >> - >> -RewriteRule \.(css|gif|jpg|png|php|html|js|htm|shtml|cgi|sql|phtml|txt|ihtml) - [L] >> +# Stop processing filenames here, so that 404 errors are returned (for example if the URL contains a typo like tiki-indexx.php) rather than being interpreted as a match to a broad rule. >> +# "Dirty URL"s will stop here. >> +RewriteRule \.(css|gif|jpg|png|php|html|js|htm|shtml|cgi|sql|phtml|txt|ihtml) - [last] >> + >> RewriteRule ^tiki-([a-z_]+)-([a-z_]+) tiki-ajax_services.php?controller=$1&action=$2 [QSA,L] >> RewriteRule ^tiki-([a-z_]+) tiki-ajax_services.php?controller=$1 [QSA,L] >> RewriteRule ^(.+)$ tiki-index.php?page=$1 [QSA,L] >> + >> </IfModule> >> # End of rewrite rules >> |