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

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2010-07-30 18:52:22 -0400 (Fri, 30 Jul 2010)
New Revision: 7004

Modified:
   plog/branches/lifetype-1.2/.htaccess
   plog/branches/lifetype-1.2/blog.php
   plog/branches/lifetype-1.2/config/config.properties.php
Log:
check the result of the parser, and force an error in the default action by setting the userId to a string.  HACK, hack hack...

Modified: plog/branches/lifetype-1.2/.htaccess
===================================================================
--- plog/branches/lifetype-1.2/.htaccess	2010-07-30 22:51:39 UTC (rev 7003)
+++ plog/branches/lifetype-1.2/.htaccess	2010-07-30 22:52:22 UTC (rev 7004)
@@ -2,12 +2,17 @@
 deny from all 
 </Files> 
 
+#<Files *>
+#Deny from 117.193.172.135
+#</Files>
+
+
 <Files config.properties.php> 
 deny from all 
 </Files>
 
-Options -Indexes
-Options +FollowSymLinks
+#Options -Indexes
+#Options +FollowSymLinks
 
 <IfModule mod_rewrite.c>
 

Modified: plog/branches/lifetype-1.2/blog.php
===================================================================
--- plog/branches/lifetype-1.2/blog.php	2010-07-30 22:51:39 UTC (rev 7003)
+++ plog/branches/lifetype-1.2/blog.php	2010-07-30 22:52:22 UTC (rev 7004)
@@ -23,13 +23,17 @@
                           
     $server = HttpVars::getServer();
 	$requestParser = new CustomUrlHandler();
-    // TODO: should check the return value of process() and
-    // then display an error page instead of the home page
-    $requestParser->process($server["REQUEST_URI"]);
-	$vars = $requestParser->getVars();
-	$params = $requestParser->getParams();
-	$includeFile = $requestParser->getIncludeFile();
-	
+    $error = $requestParser->process($server["REQUEST_URI"]);
+    $vars = $requestParser->getVars();
+    $params = $requestParser->getParams();
+    $includeFile = $requestParser->getIncludeFile();
+
+    // Hack to force an error page in defaultaction
+    if(!$error){
+      $vars["userId"] = "userId";
+      $params["userId"] = "INVALID";
+    }
+
 	//
 	// fill in the request with the parameters we need
 	//

Modified: plog/branches/lifetype-1.2/config/config.properties.php
===================================================================
--- plog/branches/lifetype-1.2/config/config.properties.php	2010-07-30 22:51:39 UTC (rev 7003)
+++ plog/branches/lifetype-1.2/config/config.properties.php	2010-07-30 22:52:22 UTC (rev 7004)
@@ -26,12 +26,12 @@
 #   (note, if upgrading between minor releases:
 #   1.0 to 1.0.1, etc. you shouldn't run the wizard)
 
-$config['db_host'] = '';
-$config['db_username'] = '';
-$config['db_password'] = '';
-$config['db_database'] = '';
+$config["db_host"] = "localhost";
+$config["db_username"] = "lifetype";
+$config["db_password"] = "Dracu4HEp38DRe6a";
+$config["db_database"] = "lifetype_main";
+$config["db_character_set"] = "latin1";
 $config["db_persistent"] = true;
-$config['db_character_set'] = '';
 
 #
 # the database prefix will be appended to the name of each database tables in case you want
@@ -40,5 +40,14 @@
 # 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'] = '';
+$config["db_prefix"] = "plog_";
+
+#
+# This array is used to pass driver-specific parameters. Currently the only supported
+# one is enable_fulltext_search, that informs the MySQL driver that FULLTEXT indexes
+# can be used to speed up searches. It's disabled by default as it does not work with
+# languages such as Chinese or Japanese. In all other cases, you probably want to enable
+# this for performance reasons (searches are lot faster if using the FULLTEXT indexes)
+#
+$config["db_options"] = Array( "enable_mysql_fulltext_search" => true );
 ?>