|
From: Sebastian N. <no...@us...> - 2004-07-27 12:37:26
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17239 Modified Files: serendipity_functions_installer.inc.php Added Files: htaccess.cgi.errordocs.tpl htaccess.cgi.normal.tpl htaccess.cgi.rewrite.tpl Log Message: Fixing a bug with s9y in CGI/Fast-CGI enviroments Index: serendipity_functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- serendipity_functions_installer.inc.php 26 Jul 2004 14:11:22 -0000 1.23 +++ serendipity_functions_installer.inc.php 27 Jul 2004 12:37:17 -0000 1.24 @@ -593,12 +593,19 @@ } } + var_dump(php_sapi_name()); + + if(php_sapi_name() == 'cgi' || php_sapi_name() == 'cgi-fcgi') + $htaccess_cgi = '.cgi'; + else + $htaccess_cgi = ''; + if ($rewrite == 'rewrite') { - $template = 'htaccess.rewrite.tpl'; + $template = 'htaccess' . $htaccess_cgi . '.rewrite.tpl'; } elseif ($rewrite == 'errordocs') { - $template = 'htaccess.errordocs.tpl'; + $template = 'htaccess' . $htaccess_cgi . '.errordocs.tpl'; } else { - $template = 'htaccess.normal.tpl'; + $template = 'htaccess' . $htaccess_cgi . '.normal.tpl'; } if (!($a = file($serendipity['serendipityPath'] . $template, 1))) { --- NEW FILE: htaccess.cgi.rewrite.tpl --- # BEGIN s9y ErrorDocument 404 {PREFIX}{indexFile} DirectoryIndex {PREFIX}{indexFile} RewriteEngine On RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA] RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1_short.html [L,NC,QSA] RewriteRule ^([0-9]+)_[0-9a-z_]*\.html {indexFile}?url=$1_article.html [L,NC,QSA] RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA] RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA] RewriteRule ^{PAT_APPROVE} {indexFile}?url={PATH_APPROVE}/$1/$2/$3 [L,QSA] RewriteRule ^{PAT_DELETE} {indexFile}?url={PATH_DELETE}/$1/$2/$3 [L,QSA] RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA] RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] <Files *.tpl> deny from all </Files> <Files *.sql> deny from all </Files> <Files *.inc.php> deny from all </Files> <Files *.db> deny from all </Files> # END s9y --- NEW FILE: htaccess.cgi.errordocs.tpl --- # BEGIN s9y ErrorDocument 404 {PREFIX}{indexFile} DirectoryIndex {PREFIX}{indexFile} <Files *.tpl> deny from all </Files> <Files *.sql> deny from all </Files> <Files *.inc.php> deny from all </Files> <Files *.db> deny from all </Files> # END s9y --- NEW FILE: htaccess.cgi.normal.tpl --- # BEGIN s9y DirectoryIndex {PREFIX}{indexFile} <Files *.tpl> deny from all </Files> <Files *.sql> deny from all </Files> <Files *.inc.php> deny from all </Files> <Files *.db> deny from all </Files> # END s9y |
