[mxbb-commits] mx_smartor/album_mod/includes album_integration.php, 1.3, 1.4

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10801

Modified Files:
	album_integration.php 
Log Message:
// Is mod_rewrite enabled? If so, do some url rewrites...

Index: album_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_integration.php	13 Mar 2008 08:35:54 -0000	1.3
--- album_integration.php	31 Aug 2008 00:06:43 -0000	1.4
***************
*** 49,53 ****
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  		if( $force_standalone_mode || !$is_block )
--- 49,53 ----
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
  		if( $force_standalone_mode || !$is_block )
***************
*** 67,70 ****
--- 67,76 ----
  			}
  		}
+ 		// Is mod_rewrite enabled? If so, do some url rewrites...
+ 		if (is_object($mx_mod_rewrite))
+ 		{
+ 			$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
+ 		}	
+ 		
  		return $mxurl;
  	}
***************
*** 72,79 ****
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
  	return $mxurl;
  }
--- 78,91 ----
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block,$mx_mod_rewrite;
  
  	$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
+ 	// Is mod_rewrite enabled? If so, do some url rewrites...
+ 	if (is_object($mx_mod_rewrite))
+ 	{
+ 		$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
+ 	}	
+ 		
  	return $mxurl;
  }
***************
*** 81,85 ****
  function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
--- 93,97 ----
  function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
  	if( $integration_enabled != "1" )
***************
*** 100,108 ****
  
  	}
  	return $mxurl;
  }
  function this_fap_toplisturl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled;
  
  	if( $force_standalone_mode )
--- 112,126 ----
  
  	}
+ 	// Is mod_rewrite enabled? If so, do some url rewrites...
+ 	if (is_object($mx_mod_rewrite))
+ 	{
+ 		$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
+ 	}	
+ 		
  	return $mxurl;
  }
  function this_fap_toplisturl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $mx_mod_rewrite;
  
  	if( $force_standalone_mode )
***************
*** 114,117 ****
--- 132,141 ----
  		$mxurl = $mx_root_path . 'index.' . $phpEx . '?page=' . $album_index . ($args == '' ? '' : '&' . $args);
  	}
+ 	// Is mod_rewrite enabled? If so, do some url rewrites...
+ 	if (is_object($mx_mod_rewrite))
+ 	{
+ 		$mxurl = $mx_mod_rewrite->encode($mxurl);
+ 	}	
+ 	
  	return $mxurl;
  }
***************
*** 149,153 ****
  function this_album_rssurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  
--- 173,177 ----
  function this_album_rssurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
  
***************
*** 168,171 ****
--- 192,202 ----
  		}
  	}
+ 	
+ 	// Is mod_rewrite enabled? If so, do some url rewrites...
+ 	if (is_object($mx_mod_rewrite))
+ 	{
+ 		$mxurl = $mx_mod_rewrite->encode($mxurl);
+ 	}	
+ 	
  	return $mxurl;
  }