[pLog-svn] r7095 - in plog/branches/lifetype-1.2: . config

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Mon Dec 20 14:05:38 EST 2010


Author: jondaley
Date: 2010-12-20 14:05:38 -0500 (Mon, 20 Dec 2010)
New Revision: 7095

Modified:
   plog/branches/lifetype-1.2/.htaccess
   plog/branches/lifetype-1.2/config/config.properties.php
Log:
speaking of things that annoy me.  I need to get the .htaccess and config file out of svn

Modified: plog/branches/lifetype-1.2/.htaccess
===================================================================
--- plog/branches/lifetype-1.2/.htaccess	2010-12-20 19:04:50 UTC (rev 7094)
+++ plog/branches/lifetype-1.2/.htaccess	2010-12-20 19:05:38 UTC (rev 7095)
@@ -6,47 +6,84 @@
 deny from all 
 </Files>
 
-RewriteEngine On
-RewriteBase /plog
+Options -Indexes
+Options +FollowSymLinks
 
-RewriteRule ^subscribe$  index.php?op=subscribe [L]
+<IfModule mod_rewrite.c>
 
-#RewriteCond %{REMOTE_HOST} !orange.limedaley.com
-#RewriteRule .* /temporary_failure.html [L]
+RewriteEngine On
+RewriteBase /
 
-<Files *>
-Deny from 195.88.112.219
-</Files>
-
 # Point to the sitemap file that is local to the blog. This is a Plugin 
 # specific rewrite rule and can safely be commented out, if you are not using
 # the Sitemap plugin (http://wiki.lifetype.net/index.php/Plugin_sitemap).
 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\.([0-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\.([0-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\.([0-9]+)$ index.php?blogId=$1&Date=$2&page=$3 [L,NC]
 
-RewriteRule ^category/programming(.*)  http://limedaley.com/category/blog$2 [R=permanent,L]
-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\.([0-9]+)$ index.php?op=ViewAlbum&blogId=$1&albumId=$2&page=$3 [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]
-###############################
+# Albums (i.e. /88_userfoo/albums/)
+RewriteRule ^([0-9]+)_[^/]+/albums/$ index.php?op=ViewAlbum&blogId=$1&albumId=0 [L,NC]
 
+# 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\.([0-9]+)$ index.php?blogId=$1&postCategoryId=$2&page=$3 [L,NC]
+
+# 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]
+
+# Static Pages (i.e /3_userfoo/demosites)
+RewriteRule ^([0-9]+)_[^/]+/(.+)$ index.php?op=Template&blogId=$1&show=$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\.([0-9]+)$ index.php?blogId=$1&page=$2 [L,NC]
+
+# If you would like to use custom urls but ForceType or SetType directives do
+# not work on your server (e.g. PHP is running as CGI/FastCGI) you may uncomment
+# the rewrite rule below to rewrite all requests to ./blog to ./blog.php.
+# Please note that this works only as long as you don't change the default
+# custom url patterns in your LifeType administration.
+## RewriteRule ^blog/(.+)  blog.php/$1 [L,NC]
+
+</IfModule>
+
+
+
 <Files post>
  ForceType application/x-httpd-php
 </Files>
@@ -103,6 +140,6 @@
  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	2010-12-20 19:04:50 UTC (rev 7094)
+++ plog/branches/lifetype-1.2/config/config.properties.php	2010-12-20 19:05:38 UTC (rev 7095)
@@ -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'] = 'Q9xukeYE';
-$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