[mxbb-commits] core/includes mx_functions.php,1.48,1.49 mx_functions_phpbb.php,1.14,1.15

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9656/includes

Modified Files:
	mx_functions.php mx_functions_phpbb.php 
Log Message:
added some mod_rewrite support

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mx_functions_phpbb.php	12 Oct 2005 15:37:32 -0000	1.14
--- mx_functions_phpbb.php	13 Oct 2005 17:25:51 -0000	1.15
***************
*** 507,518 ****
  function mx_append_sid( $url, $non_html_amp = false )
  { 
  	//
  	// Is mod_rewrite enabled? If so, do some url rewrites...
  	//
! 	if ($mx_mod_rewrite || true)
  	{
! 
  	}
! 	
  	//
  	// Replaces same function in sessions.php
--- 507,520 ----
  function mx_append_sid( $url, $non_html_amp = false )
  { 
+ 	global $portal_config, $mx_mod_rewrite;
+ 	
  	//
  	// Is mod_rewrite enabled? If so, do some url rewrites...
  	//
! 	if (is_object($mx_mod_rewrite))
  	{
! 		$url = $mx_mod_rewrite->encode($url);
  	}
! 
  	//
  	// Replaces same function in sessions.php

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** mx_functions.php	12 Oct 2005 15:37:32 -0000	1.48
--- mx_functions.php	13 Oct 2005 17:25:51 -0000	1.49
***************
*** 1504,1506 ****
--- 1504,1620 ----
  
  }	// class mx_request_vars
+ 
+ class mx_mod_rewrite
+ {
+  	function encode($url)
+  	{
+  		//echo('<br><br>'.$url);
+  		
+ 		$input = array( 
+ 			"'(?)index.php'",
+ 			
+ 			//
+ 			// User defined
+ 			//
+ 			"'(?)index.htm\?page=9(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=5(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=7(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=27(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=11(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=3(&amp;|\&|$)'",	
+ 			
+ 			"'(?)index.htm\?page=10(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=46(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=6(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=8(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=28(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=22(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=35(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=32(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=41(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=19(&amp;|\&|$)'",	
+ 			"'(?)index.htm\?page=4(&amp;|\&|$)'",	
+ 			
+ 			"'(?)index.htm\?page=1(&amp;|\&|$)'",	
+ 			
+ 			"'(?)index.htm\?page=2(&amp;|\&|$)'",	
+ 				"'dynamic_block=78'",	// idag/lilla
+ 				"'dynamic_block=79'",	// idag/stora/ar-7-9
+ 				"'dynamic_block=80'",	// idag/stora/gymnasiet
+ 				"'dynamic_block=69'",	// traditioner/1
+ 				"'dynamic_block=71'",	// traditioner/2
+ 				"'dynamic_block=70'",	// pedagogik/1
+ 				"'dynamic_block=74'",	// pedagogik/2
+ 				"'dynamic_block=75'",	// pedagogik/3
+ 				"'dynamic_block=76'",	// pedagogik/4
+ 				"'dynamic_block=77'",	// pedagogik/5
+ 				
+ 			"'(?)index.htm\?page=81(&amp;|\&|$)'",	
+ 			
+ 					
+ 			//
+ 			// General
+ 			//
+ 			"'(?)index.htm\?page=([0-9]*)'",
+ 			"'(?)index.htm\?block_id=([0-9]*)'",
+ 			"'(&amp;|\&)dynamic_block=([0-9]*)'",
+ 			"'(&amp;|\&)cat_link=([0-9]*)'",
+ 		); 
+ 		
+ 		$output = array(
+ 			"index.htm",
+ 			
+ 			//
+ 			// Site Specific
+ 			//
+ 			"lilla/elev",
+ 			"lilla/kalender",
+ 			"lilla/kontakt",
+ 			"lilla/lankar",
+ 			"lilla/forum",
+ 			"lilla",
+ 			
+ 			"stora/elev",
+ 			"stora/foto",
+ 			"stora/kalender",
+ 			"stora/kontakt",
+ 			"stora/lankar",
+ 			"stora/forum",
+ 			"stora/basketligan",
+ 			"stora/elevrad",
+ 			"stora/sambladet",
+ 			"stora/sambladet",
+ 			"stora",	
+ 					
+ 			"hem",			
+ 			"omskolan",	
+ 				"/idag/lilla",		
+ 				"/idag/stora/ar7-9",		
+ 				"/idag/stora/gymnasiet",		
+ 				"/traditioner/1",		
+ 				"/traditioner/2",		
+ 				"/pedagogik/1",		
+ 				"/pedagogik/2",		
+ 				"/pedagogik/3",		
+ 				"/pedagogik/4",		
+ 				"/pedagogik/5",		
+ 			"ansokan",			
+ 			
+ 			//
+ 			// General
+ 			// 
+ 			"page\\1", 
+ 			"block\\1", 
+ 			"/sub\\2", 
+ 			"/catlink\\2", 
+ 		); 
+ 		
+ 		$url = preg_replace($input, $output, $url); 
+ 		
+ 		//echo('<br>'.$url);
+ 		
+ 		return $url; 
+  	}	
+ }
+ 
  ?>
\ No newline at end of file