[mxbb-commits] mx_radiocast/radiocast_mod radiocast_integration.php, 1.2, 1.3

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

Update of /cvsroot/mxbb/mx_radiocast/radiocast_mod
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16903

Modified Files:
	radiocast_integration.php 
Log Message:


Index: radiocast_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/radiocast_mod/radiocast_integration.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** radiocast_integration.php	21 Mar 2008 08:51:10 -0000	1.2
--- radiocast_integration.php	9 Oct 2009 22:02:57 -0000	1.3
***************
*** 47,73 ****
  if (!function_exists('this_rc_mxurl'))
  {
! 	function this_rc_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $module_root_path, $page_id, $radiocast_index, $phpEx, $integration_enabled, $is_block;
  
  
! 		if( $force_standalone_mode || !$is_block )
  		{
! 			$mxurl = $mx_root_path . 'modules/mx_radiocast/' . 'radiocast.' . $phpEx . ($args == '' ? '' : '?' . $args);
  		}
  		else
  		{
  			$mxurl = $mx_root_path . 'index.' . $phpEx;
! 			if( is_numeric($page_id) && !empty($page_id) )
  			{
! 				$mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args);
  			}
  			else
  			{
! 				$mxurl .= '?page=' . $radiocast_index . ($args == '' ? '' : '&' . $args);
  			}
  		}
  		return $mxurl;
! 	}
  }
  
--- 47,119 ----
  if (!function_exists('this_rc_mxurl'))
  {
! 	function this_rc_mxurl($args = '', $force_standalone_mode = false, $non_html_amp = false, $pageId = '', $mod_rewrite = true)
  	{
! 		global $_SID, $_EXTRA_URL, $_GET, $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block, $mx_mod_rewrite;
  
+ 		// Assign sid if session id is not specified
+ 		if ($session_id === false)
+ 		{
+ 			$session_id = $_SID;
+ 		}
  
! 		if (is_array($session_id))
  		{
! 			$session_id = $mx_user->session_id;
! 		}
! 		
! 		$mod_rewrite = $_GET['mod_rewrite'] ?  $_GET['mod_rewrite'] : $mod_rewrite;
! 
! 		$pageId = empty($pageId) ? $page_id : $pageId;
! 		$dynamicId = !empty($_GET['dynamic_block']) ? ( $non_html_amp ? '&dynamic_block=' : '&dynamic_block=' ) . $_GET['dynamic_block'] : '';
! 		
! 		// Replaces same function in mx_sessions_phpbbx.php
! 		if ($mod_rewrite)
! 		{
! 			// Is mod_rewrite enabled? If so, do some url rewrites...
! 			$args .= ($args == '' ? '' : '&' ) . 'modrewrite=yes';			
! 		}
! 		else
! 		{
! 			$mx_root_path = PORTAL_URL;
! 			$module_root_path = PORTAL_URL . $module_root_path; //'modules/mx_radiocast/';			
! 			$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';			
! 		}		
! 	
! 		if ( !MXBB_MODULE )
! 		{
! 			$mxurl = $module_root_path . 'radiocast.' . $phpEx . ( $args == '' ? '' : '?' . $args );
! 			return $mxurl;
! 		}
! 
! 		if ( $force_standalone_mode || !$is_block )
! 		{
! 			$mxurl = $module_root_path . 'radiocast.' . $phpEx . ( $args == '' ? '' : '?' . $args );
  		}
  		else
  		{
  			$mxurl = $mx_root_path . 'index.' . $phpEx;
! 			if (is_numeric($pageId))
  			{
! 				$mxurl .= '?page=' . $pageId . $dynamicId . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args );
  			}
  			else
  			{
! 				$mxurl .= ( $args == '' ? '' : '?' . $args );
! 			}
! 			
! 			$mxurl .= ((!$session_id) ? '' : $amp_delim . 'sid=' . $session_id);
! 		}
! 		
! 		// Replaces same function in mx_sessions_phpbbx.php
! 		if ($mod_rewrite)
! 		{
! 			// Is mod_rewrite enabled? If so, do some url rewrites...
! 			if (is_object($mx_mod_rewrite))
! 			{
! 				$mxurl = $mx_mod_rewrite->encode($mxurl);
  			}
  		}
  		return $mxurl;
! 	}		
  }