[pLog-svn] r984 - plog/trunk

oscar at devel.plogworld.net oscar at devel.plogworld.net
Mon Feb 7 07:38:22 GMT 2005


Author: oscar
Date: 2005-02-07 07:38:21 +0000 (Mon, 07 Feb 2005)
New Revision: 984

Modified:
   plog/trunk/album
   plog/trunk/archives
   plog/trunk/category
   plog/trunk/comment
   plog/trunk/get
   plog/trunk/resource
   plog/trunk/static
   plog/trunk/trackbacks
   plog/trunk/user
Log:
solved issue 222 (http://bugs.plogworld.net/view.php?id=222)


Modified: plog/trunk/album
===================================================================
--- plog/trunk/album	2005-02-07 06:23:42 UTC (rev 983)
+++ plog/trunk/album	2005-02-07 07:38:21 UTC (rev 984)
@@ -15,7 +15,6 @@
     // format of search-engine friendly urls
     if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {
 		$server = HttpVars::getServer();
-		$path_info = $server["PATH_INFO"];
 		$parser = new PrettyRequestParser( "album", $server["PATH_INFO"]);
 		$result = $parser->parse();
 		HttpVars::setRequest( $result );

Modified: plog/trunk/archives
===================================================================
--- plog/trunk/archives	2005-02-07 06:23:42 UTC (rev 983)
+++ plog/trunk/archives	2005-02-07 07:38:21 UTC (rev 984)
@@ -16,7 +16,6 @@
     // format of search-engine friendly urls
     if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {
 		$server = HttpVars::getServer();
-		$path_info = $server["PATH_INFO"];
 		$parser = new PrettyRequestParser( "archives", $server["PATH_INFO"]);
 		$result = $parser->parse();
 		HttpVars::setRequest( $result );

Modified: plog/trunk/category
===================================================================
--- plog/trunk/category	2005-02-07 06:23:42 UTC (rev 983)
+++ plog/trunk/category	2005-02-07 07:38:21 UTC (rev 984)
@@ -15,7 +15,6 @@
     // format of search-engine friendly urls
     if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {	
 		$server = HttpVars::getServer();
-		$path_info = $server["PATH_INFO"];
 		$parser = new PrettyRequestParser( "category", $server["PATH_INFO"]);
 		$result = $parser->parse();
 		HttpVars::setRequest( $result );

Modified: plog/trunk/comment
===================================================================
--- plog/trunk/comment	2005-02-07 06:23:42 UTC (rev 983)
+++ plog/trunk/comment	2005-02-07 07:38:21 UTC (rev 984)
@@ -5,14 +5,22 @@
 
     include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
     include_once( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
+	include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
+	include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
 
-    $server = HttpVars::getServer();
-
-    $path_info = $server["PATH_INFO"];
-
-    $parser = new PrettyRequestParser( "comment", $server["PATH_INFO"]);
-    $result = $parser->parse();
-    HttpVars::setRequest( $result );
-
-    include_once( "index.php" );
+    // get the configuration data
+    $config =& Config::getConfig();
+    
+    // in order to maintain compatilibity with previous version, and the alternative
+    // format of search-engine friendly urls
+    if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {	
+		$server = HttpVars::getServer();
+		$parser = new PrettyRequestParser( "comment", $server["PATH_INFO"]);
+		$result = $parser->parse();
+		HttpVars::setRequest( $result );
+		include_once( "index.php" );
+	}
+	else {
+		include_once( PLOG_CLASS_PATH."blog.php" );
+	}
 ?>

Modified: plog/trunk/get
===================================================================
--- plog/trunk/get	2005-02-07 06:23:42 UTC (rev 983)
+++ plog/trunk/get	2005-02-07 07:38:21 UTC (rev 984)
@@ -15,12 +15,11 @@
     // in order to maintain compatilibity with previous version, and the alternative
     // format of search-engine friendly urls
     if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {
-    $server = HttpVars::getServer();
-    $path_info = $server["PATH_INFO"];
-    $parser = new PrettyRequestParser( "get", $server["PATH_INFO"]);
-    $result = $parser->parse();
-    HttpVars::setRequest( $result );
-    include_once( "resserver.php" );
+    	$server = HttpVars::getServer();
+    	$parser = new PrettyRequestParser( "get", $server["PATH_INFO"]);
+    	$result = $parser->parse();
+    	HttpVars::setRequest( $result );
+    	include_once( "resserver.php" );
 	}
 	else {
 		include_once( PLOG_CLASS_PATH."blog.php" );

Modified: plog/trunk/resource
===================================================================
--- plog/trunk/resource	2005-02-07 06:23:42 UTC (rev 983)
+++ plog/trunk/resource	2005-02-07 07:38:21 UTC (rev 984)
@@ -16,7 +16,6 @@
     // format of search-engine friendly urls
     if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {
 		$server = HttpVars::getServer();
-		$path_info = $server["PATH_INFO"];
 		$parser = new PrettyRequestParser( "resource", $server["PATH_INFO"]);
 		$result = $parser->parse();
 		HttpVars::setRequest( $result );

Modified: plog/trunk/static
===================================================================
--- plog/trunk/static	2005-02-07 06:23:42 UTC (rev 983)
+++ plog/trunk/static	2005-02-07 07:38:21 UTC (rev 984)
@@ -5,14 +5,22 @@
 
     include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
     include_once( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
+	include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
+	include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
 
-    $server = HttpVars::getServer();
-
-    $path_info = $server["PATH_INFO"];
-
-    $parser = new PrettyRequestParser( "static", $server["PATH_INFO"]);
-    $result = $parser->parse();
-    HttpVars::setRequest( $result );
-
-    include_once( "index.php" );
+    // get the configuration data
+    $config =& Config::getConfig();
+    
+    // in order to maintain compatilibity with previous version, and the alternative
+    // format of search-engine friendly urls
+    if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {	
+		$server = HttpVars::getServer();
+		$parser = new PrettyRequestParser( "static", $server["PATH_INFO"]);
+		$result = $parser->parse();
+		HttpVars::setRequest( $result );
+		include_once( "index.php" );
+	}
+	else {
+		include_once( PLOG_CLASS_PATH."blog.php" );
+	}
 ?>

Modified: plog/trunk/trackbacks
===================================================================
--- plog/trunk/trackbacks	2005-02-07 06:23:42 UTC (rev 983)
+++ plog/trunk/trackbacks	2005-02-07 07:38:21 UTC (rev 984)
@@ -5,14 +5,22 @@
 
     include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
     include_once( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
+	include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
+	include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
 
-    $server = HttpVars::getServer();
-
-    $path_info = $server["PATH_INFO"];
-
-    $parser = new PrettyRequestParser( "trackbacks", $server["PATH_INFO"]);
-    $result = $parser->parse();
-    HttpVars::setRequest( $result );
-
-    include_once( "index.php" );
+    // get the configuration data
+    $config =& Config::getConfig();
+    
+    // in order to maintain compatilibity with previous version, and the alternative
+    // format of search-engine friendly urls
+    if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {	
+		$server = HttpVars::getServer();
+		$parser = new PrettyRequestParser( "trackbacks", $server["PATH_INFO"]);
+		$result = $parser->parse();
+		HttpVars::setRequest( $result );
+		include_once( "index.php" );
+	}
+	else {
+		include_once( PLOG_CLASS_PATH."blog.php" );
+	}
 ?>

Modified: plog/trunk/user
===================================================================
--- plog/trunk/user	2005-02-07 06:23:42 UTC (rev 983)
+++ plog/trunk/user	2005-02-07 07:38:21 UTC (rev 984)
@@ -3,7 +3,7 @@
         define( "PLOG_CLASS_PATH", dirname(__FILE__)."/");
     }
 
-    include_once( PLOG_CLASS_PATH."class/net/httpvars.class.php" );
+    include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
     include_once( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
 	include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
 	include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
@@ -15,7 +15,6 @@
     // format of search-engine friendly urls
     if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {	
 		$server = HttpVars::getServer();
-		$path_info = $server["PATH_INFO"];
 		$parser = new PrettyRequestParser( "category", $server["PATH_INFO"]);
 		$result = $parser->parse();
 		HttpVars::setRequest( $result );




More information about the pLog-svn mailing list