[pLog-svn] r6094 - in plog/branches/lifetype-1.2: . config
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Thu Nov 29 11:33:25 EST 2007
Author: jondaley
Date: 2007-11-29 11:33:25 -0500 (Thu, 29 Nov 2007)
New Revision: 6094
Modified:
plog/branches/lifetype-1.2/.htaccess
plog/branches/lifetype-1.2/config/config.properties.php
Log:
same old, same old. reverting last commit
Modified: plog/branches/lifetype-1.2/.htaccess
===================================================================
--- plog/branches/lifetype-1.2/.htaccess 2007-11-29 16:32:11 UTC (rev 6093)
+++ plog/branches/lifetype-1.2/.htaccess 2007-11-29 16:33:25 UTC (rev 6094)
@@ -6,96 +6,127 @@
deny from all
</Files>
+Options -Indexes
+Options +FollowSymLinks
+
+<IfModule mod_rewrite.c>
+
RewriteEngine On
-RewriteBase /plog
+RewriteBase /
-#RewriteCond %{REMOTE_HOST} !orange.limedaley.com
-#RewriteRule .* /temporary_failure.html [L]
+ # Point to the sitemap file that is local to the blog
+RewriteRule ^sitemap([0-9]+)\.gz$ tmp/sitemap/$1/sitemap.gz [L,NC]
-# old category name
-RewriteRule ^category/internet(-|_)stuff(.*) /plog/category/internet$2 [R=permanent,L]
+# Permalink to the blog entry (i.e. /1_userfoo/archive/3_title-foo-bar.html)
+RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]+)_[^.]+\.html$ index.php?op=ViewArticle&blogId=$1&articleId=$2 [L,NC]
+# -- same as above but with paging included
+RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]+)_[^.]+\.html\.page\.([1-9]+)$ index.php?op=ViewArticle&blogId=$1&articleId=$2&page=$3 [L,NC]
-# old links
-RewriteRule ^content(.*) /plog/static$1 [R=permanent,L]
+# Monthly archive (i.e. /1_userfoo/archive/200401.html)
+RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]{6})\.html$ index.php?blogId=$1&Date=$2 [L,NC]
+# -- same as above but with paging included
+RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]{6})\.html\.page\.([1-9]+)$ index.php?blogId=$1&Date=$2&page=$3 [L,NC]
-RewriteCond %{REQUEST_URI} ^/plog/(category|archives)/[^_]+_
-RewriteRule ^([^_]+)_(.*)$ $1-$2 [R=permanent,L]
+# Daily archive (i.e. /1_blogfoo/archive/20040101.html)
+RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]{8})\.html$ index.php?blogId=$1&Date=$2 [L,NC]
+# -- same as above but with paging included
+RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]{8})\.html\.page\.([1-9]+)$ index.php?blogId=$1&Date=$2&page=$3 [L,NC]
-RewriteRule ^jonathan/?$ /plog/category/jonathan [R,L]
-RewriteRule ^isaac/?$ /plog/category/isaac [R,L]
-RewriteRule ^(1|jondaley)/?$ /plog/ [R,L]
+# Album (i.e. /88_userfoo/albums/34_title-foo-bar.html)
+RewriteRule ^([0-9]+)_[^/]+/albums/([0-9]+)_[^.]+\.html$ index.php?op=ViewAlbum&blogId=$1&albumId=$2 [L,NC]
+# -- same as above but with paging included
+RewriteRule ^([0-9]+)_[^/]+/albums/([0-9]+)_[^.]+\.html\.page\.([1-9]+)$ index.php?op=ViewAlbum&blogId=$1&albumId=$2&page=$3 [L,NC]
-#############################################################################
-## My query string gets
-# Static Pages (i.e /page/userfoo[.template])
-#RewriteRule ^page/(.+)$ index.php?op=Template&show=$1&%{QUERY_STRING} [L]
+# Albums (i.e. /88_userfoo/albums/)
+RewriteRule ^([0-9]+)_[^/]+/albums/$ index.php?op=ViewAlbum&blogId=$1&albumId=0 [L,NC]
-###############################
-## catch all to avoid errors in the error.log
-#RewriteCond %{REQUEST_URI} !^/plog/error.php
-#RewriteCond %{REQUEST_URI} !^/plog/admin.php
-#RewriteCond %{REQUEST_URI} !^/plog/index.php
-#RewriteCond %{REQUEST_URI} !^/plog/templates
-#RewriteCond %{REQUEST_URI} !^/plog/files
-#RewriteRule (.*) /plog/error.php [L]
-###############################
+# Category view (i.e. /88_userfoo/categories/4_cat-foobar.html)
+RewriteRule ^([0-9]+)_[^/]+/categories/([0-9]+)_[^.]+\.html$ index.php?blogId=$1&postCategoryId=$2 [L,NC]
+# -- same as above but with paging included
+RewriteRule ^([0-9]+)_[^/]+/categories/([0-9]+)_[^.]+\.html\.page\.([1-9]+)$ index.php?blogId=$1&postCategoryId=$2&page=$3 [L,NC]
-<Files *.php>
- ForceType application/x-httpd-php5
-</Files>
+# Category-Feeds (i.e. /3_userfoo/feeds/categories/2_category/atom)
+RewriteRule ^([0-9]+)_[^/]+/feeds/categories/([0-9]+)_[^.]+/(.*)$ rss.php?blogId=$1&categoryId=$2&profile=$3 [L,NC]
+# Feeds (i.e. /3_userfoo/feeds/atom)
+RewriteRule ^([0-9]+)_[^/]+/feeds/(.*)$ rss.php?blogId=$1&profile=$2 [L,NC]
+
+# Trackbacks (i.e. /3_userfoo/trackbacks/34_title-foo-bar.html)
+RewriteRule ^([0-9]+)_[^/]+/trackbacks/([0-9]+)_[^.]+\.html$ index.php?op=Trackbacks&blogId=$1&articleId=$2 [L,NC]
+
+# Comment form (i.e. /88_userfoo/comment/34_title-foo-bar.html)
+RewriteRule ^([0-9]+)_[^/]+/comment/([0-9]+)_[^.]+\.html$ index.php?op=Comment&blogId=$1&articleId=$2 [L,NC]
+
+# Resources (i.e. /88_userfoo/resources/this-is-a-resource-name.pdf.html)
+RewriteRule ^([0-9]+)_[^/]+/resources/([^.]+)\.([^.]+)\.html$ index.php?op=ViewResource&blogId=$1&resource=$2.$3 [L,NC]
+
+# Download a resource (i.e. /88_userfoo/get/this-is-a-resource-name.pdf)
+RewriteRule ^([0-9]+)_[^/]+/get/(.+)$ resserver.php?blogId=$1&resource=$2 [L,NC]
+
+# A non-default blog (i.e. /88_userfoo)
+RewriteRule ^([0-9]+)_[^.]+$ index.php?blogId=$1 [L,NC]
+# -- same as above but with paging included
+RewriteRule ^([0-9]+)_[^.]+\.page\.([1-9]+)$ index.php?blogId=$1&page=$2 [L,NC]
+
+# Static Pages (i.e /3_userfoo/demosites)
+RewriteRule ^([0-9]+)_[^/]+/(.+)$ index.php?op=Template&blogId=$1&show=$2 [NC]
+
+</IfModule>
+
+
+
<Files post>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files archives>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files static>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files rss>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files category>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files trackbacks>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files comment>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files resource>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files get>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files album>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files blog>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files user>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
<Files page>
- ForceType application/x-httpd-php5
+ ForceType application/x-httpd-php
</Files>
-ErrorDocument 401 /plog/error.php
-ErrorDocument 403 /plog/error.php
-ErrorDocument 404 /plog/error.php
+ErrorDocument 401 /error.php
+ErrorDocument 403 /error.php
+ErrorDocument 404 /error.php
Modified: plog/branches/lifetype-1.2/config/config.properties.php
===================================================================
--- plog/branches/lifetype-1.2/config/config.properties.php 2007-11-29 16:32:11 UTC (rev 6093)
+++ plog/branches/lifetype-1.2/config/config.properties.php 2007-11-29 16:33:25 UTC (rev 6094)
@@ -26,14 +26,13 @@
# (note, if upgrading between minor releases:
# 1.0 to 1.0.1, etc. you shouldn't run the wizard)
-$config['db_host'] = 'localhost';
-$config['db_username'] = 'jondaley';
-$config['db_password'] = '4hUJeraG5TEche2U';
-$config['db_database'] = 'jondaley';
+$config['db_host'] = '';
+$config['db_username'] = '';
+$config['db_password'] = '';
+$config['db_database'] = '';
$config["db_persistent"] = true;
$config['db_character_set'] = '';
-#$config['db_options'] = Array( "enable_mysql_fulltext_search" => true );
#
# the database prefix will be appended to the name of each database tables in case you want
# to have more than one version of plog running at the same time, such as the stable and
@@ -41,5 +40,5 @@
# coexist in the same unique database. If you change this after the initial configuration done
# with the installation wizard, please make sure that you also rename the tables.
#
-$config['db_prefix'] = 'plog_';
+$config['db_prefix'] = '';
?>
More information about the pLog-svn
mailing list