[mxbb-commits] mx_radiocast/includes radiocast_add.php, 1.1, 1.2 radiocast_cat.php, 1.3, 1.4 radioc

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	radiocast_add.php radiocast_cat.php radiocast_comment.php 
	radiocast_comment_delete.php radiocast_comment_edit.php 
	radiocast_delete.php radiocast_edit.php radiocast_list.php 
	radiocast_modcp.php radiocast_rate.php 
Log Message:
fixes for 3.0.x

Index: radiocast_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_comment.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** radiocast_comment.php	21 Mar 2008 08:51:00 -0000	1.3
--- radiocast_comment.php	22 Jan 2009 08:29:51 -0000	1.4
***************
*** 168,172 ****
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_comment&station_id=$station_id"), true));		
  		exit;
  	}
--- 168,172 ----
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_comment&station_id=$station_id"), true));		
  		exit;
  	}
***************
*** 296,300 ****
  			else
  			{
! 				$poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $commentrow[$i]['user_id']) .'">'. $commentrow[$i]['username'] .'</a>';
  			}
  
--- 296,300 ----
  			else
  			{
! 				$poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $commentrow[$i]['user_id']) .'">'. $commentrow[$i]['username'] .'</a>';
  			}
  
***************
*** 332,338 ****
  				'EDIT_INFO' => $edit_info,
  
! 				'EDIT' => ( ( $auth_data['edit'] and ($commentrow[$i]['comment_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != RADIOCAST_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment_edit&comment_id=". $commentrow[$i]['comment_id'])) .'">'. $lang['Edit_station'] .'</a>' : '',
  
! 				'DELETE' => ( ( $auth_data['delete'] and ($commentrow[$i]['comment_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != RADIOCAST_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment_delete&comment_id=". $commentrow[$i]['comment_id'])) .'">'. $lang['Delete_station'] .'</a>' : ''
  				)
  			);
--- 332,338 ----
  				'EDIT_INFO' => $edit_info,
  
! 				'EDIT' => ( ( $auth_data['edit'] and ($commentrow[$i]['comment_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != RADIOCAST_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment_edit&comment_id=". $commentrow[$i]['comment_id'])) .'">'. $lang['Edit_station'] .'</a>' : '',
  
! 				'DELETE' => ( ( $auth_data['delete'] and ($commentrow[$i]['comment_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != RADIOCAST_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment_delete&comment_id=". $commentrow[$i]['comment_id'])) .'">'. $lang['Delete_station'] .'</a>' : ''
  				)
  			);
***************
*** 342,346 ****
  
  		$template->assign_vars(array(
! 			'PAGINATION' => generate_pagination(append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=$station_id&amp;sort_order=$sort_order")), $total_comments, $comments_per_page, $start),
  			'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $comments_per_page ) + 1 ), ceil( $total_comments / $comments_per_page ))
  			)
--- 342,346 ----
  
  		$template->assign_vars(array(
! 			'PAGINATION' => generate_pagination(mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=$station_id&amp;sort_order=$sort_order")), $total_comments, $comments_per_page, $start),
  			'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $comments_per_page ) + 1 ), ceil( $total_comments / $comments_per_page ))
  			)
***************
*** 368,372 ****
  	else
  	{
! 		$poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thisstation['user_id']) .'">'. $thisstation['username'] .'</a>';
  	}
  
--- 368,372 ----
  	else
  	{
! 		$poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thisstation['user_id']) .'">'. $thisstation['username'] .'</a>';
  	}
  
***************
*** 386,392 ****
  	$template->assign_vars(array(
  		'CAT_TITLE' => $thiscat['cat_title'],
! 		'U_VIEW_CAT' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  
! 		'U_STATION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_page&station_id=$station_id")),
  
  		'STATION_TITLE' => $thisstation['station_title'],
--- 386,392 ----
  	$template->assign_vars(array(
  		'CAT_TITLE' => $thiscat['cat_title'],
! 		'U_VIEW_CAT' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  
! 		'U_STATION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_page&station_id=$station_id")),
  
  		'STATION_TITLE' => $thisstation['station_title'],
***************
*** 425,435 ****
  
  		'L_INDEX' => '<<',
! 		'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => append_sid(this_rc_portalurl()),
  
! 		'S_RADIOCAST_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=$station_id"))
  		)
  	);
--- 425,435 ----
  
  		'L_INDEX' => '<<',
! 		'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => mx_append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => mx_append_sid(this_rc_portalurl()),
  
! 		'S_RADIOCAST_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=$station_id"))
  		)
  	);
***************
*** 459,463 ****
  		if (!$userdata['session_logged_in'])
  		{
! 			mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=$station_id"), true));		
  		}
  		else
--- 459,463 ----
  		if (!$userdata['session_logged_in'])
  		{
! 			mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=$station_id"), true));		
  		}
  		else
***************
*** 546,553 ****
  
  	$template->assign_vars(array(
! 		'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")) . '#'.$comment_id.'">')
  	);
  
! 	$message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
--- 546,553 ----
  
  	$template->assign_vars(array(
! 		'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")) . '#'.$comment_id.'">')
  	);
  
! 	$message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);

Index: radiocast_add.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_add.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** radiocast_add.php	6 Jun 2007 23:03:48 -0000	1.1
--- radiocast_add.php	22 Jan 2009 08:29:51 -0000	1.2
***************
*** 104,108 ****
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_add&amp;cat_id=$cat_id"), true));
  	}
  	else
--- 104,108 ----
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_add&amp;cat_id=$cat_id"), true));
  	}
  	else
***************
*** 236,240 ****
  
  	$template->assign_vars(array(
! 		'U_VIEW_CAT' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  		'CAT_TITLE' => $thiscat['cat_title'],
  
--- 236,240 ----
  
  	$template->assign_vars(array(
! 		'U_VIEW_CAT' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  		'CAT_TITLE' => $thiscat['cat_title'],
  
***************
*** 292,302 ****
  		'RADIOCAST_VERSION' => '2' . $radiocast_config['radiocast_version'],
  		'L_INDEX' => '<<',
! 		'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => append_sid(this_rc_portalurl()),
  
! 		'S_RADIOCAST_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_add&cat_id=" . $cat_id)),
  		)
  	);
--- 292,302 ----
  		'RADIOCAST_VERSION' => '2' . $radiocast_config['radiocast_version'],
  		'L_INDEX' => '<<',
! 		'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => mx_append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => mx_append_sid(this_rc_portalurl()),
  
! 		'S_RADIOCAST_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_add&cat_id=" . $cat_id)),
  		)
  	);
***************
*** 413,418 ****
  
  	$station_time = time();
! 	$station_user_id = $userdata['user_id'];
! 	$station_user_ip = $userdata['session_ip'];
  
  	// --------------------------------
--- 413,433 ----
  
  	$station_time = time();
! 
! 	switch (PORTAL_BACKEND)
! 	{
! 		case 'internal':
! 						
! 		case 'phpbb2':
! 			
! 			$station_user_id = $userdata['user_id'];
! 			$station_user_ip = $userdata['session_ip'];
! 		break;
! 
! 		case 'phpbb3':
! 
! 			$station_user_id = $mx_user->data['user_id'];
! 			$station_user_ip = radiocast_encode_ip($mx_user->data['session_ip']);
! 		break;
! 	}	
  
  	// --------------------------------
***************
*** 812,822 ****
  		{
  			$template->assign_vars(array(
! 				'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  			);
  		}
  		//$message .= $sql3;
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
--- 827,837 ----
  		{
  			$template->assign_vars(array(
! 				'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  			);
  		}
  		//$message .= $sql3;
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);

Index: radiocast_edit.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_edit.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** radiocast_edit.php	6 Jun 2007 23:03:51 -0000	1.1
--- radiocast_edit.php	22 Jan 2009 08:29:51 -0000	1.2
***************
*** 128,132 ****
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_edit&station_id=$station_id"), true));
  	}
  	else
--- 128,132 ----
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_edit&station_id=$station_id"), true));
  	}
  	else
***************
*** 172,176 ****
  
  		'CAT_TITLE' => $thiscat['cat_title'],
! 		'U_VIEW_CAT' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  
  		'L_STATION_TITLE' => $lang['Station_Title'],
--- 172,176 ----
  
  		'CAT_TITLE' => $thiscat['cat_title'],
! 		'U_VIEW_CAT' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  
  		'L_STATION_TITLE' => $lang['Station_Title'],
***************
*** 197,205 ****
  		'RADIOCAST_VERSION' => '1' . $radiocast_config['radiocast_version'],
  		'L_INDEX' => '<<',
! 		'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => append_sid(this_rc_portalurl()),
  
  		//Image Edit Added by OryNider
--- 197,205 ----
  		'RADIOCAST_VERSION' => '1' . $radiocast_config['radiocast_version'],
  		'L_INDEX' => '<<',
! 		'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => mx_append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => mx_append_sid(this_rc_portalurl()),
  
  		//Image Edit Added by OryNider
***************
*** 209,213 ****
  		'L_UPLOAD_IMAGE' => $lang['Upload_image'],
  
! 		'S_RADIOCAST_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_edit&station_id=$station_id")),
  		)
  	);
--- 209,213 ----
  		'L_UPLOAD_IMAGE' => $lang['Upload_image'],
  
! 		'S_RADIOCAST_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_edit&station_id=$station_id")),
  		)
  	);
***************
*** 404,413 ****
  
  		$template->assign_vars(array(
! 			'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  		);
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
--- 404,413 ----
  
  		$template->assign_vars(array(
! 			'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  		);
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);

Index: radiocast_rate.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_rate.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** radiocast_rate.php	6 Jun 2007 23:03:52 -0000	1.1
--- radiocast_rate.php	22 Jan 2009 08:29:51 -0000	1.2
***************
*** 126,130 ****
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_rate&station_id=$station_id"), true));
  	}
  	else
--- 126,130 ----
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_rate&station_id=$station_id"), true));
  	}
  	else
***************
*** 212,223 ****
  	else
  	{
! 		$poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thisstation['user_id']) .'">'. $thisstation['username'] .'</a>';
  	}
  
  	$template->assign_vars(array(
  		'CAT_TITLE' => $thiscat['cat_title'],
! 		'U_VIEW_CAT' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  
! 		'U_STATION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_page&station_id=$station_id")),
  
  		'STATION_TITLE' => $thisstation['station_title'],
--- 212,223 ----
  	else
  	{
! 		$poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thisstation['user_id']) .'">'. $thisstation['username'] .'</a>';
  	}
  
  	$template->assign_vars(array(
  		'CAT_TITLE' => $thiscat['cat_title'],
! 		'U_VIEW_CAT' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  
! 		'U_STATION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_page&station_id=$station_id")),
  
  		'STATION_TITLE' => $thisstation['station_title'],
***************
*** 247,257 ****
  		'RADIOCAST_VERSION' => '2' . $radiocast_config['radiocast_version'],
  		'L_INDEX' => '<<',
! 		'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => append_sid(this_rc_portalurl()),
  
! 		'S_RADIOCAST_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_rate&station_id=$station_id")),
  
  		)
--- 247,257 ----
  		'RADIOCAST_VERSION' => '2' . $radiocast_config['radiocast_version'],
  		'L_INDEX' => '<<',
! 		'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => mx_append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => mx_append_sid(this_rc_portalurl()),
  
! 		'S_RADIOCAST_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_rate&station_id=$station_id")),
  
  		)
***************
*** 321,330 ****
  
  		$template->assign_vars(array(
! 			'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  		);
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
--- 321,330 ----
  
  		$template->assign_vars(array(
! 			'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  		);
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);

Index: radiocast_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_cat.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** radiocast_cat.php	21 Mar 2008 08:50:59 -0000	1.3
--- radiocast_cat.php	22 Jan 2009 08:29:51 -0000	1.4
***************
*** 144,148 ****
  if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) )
  {
! 	$auth_list .= sprintf($lang['RadioCast_moderate_can'], '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) .'">', '</a>');
  }
  //
--- 144,148 ----
  if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) )
  {
! 	$auth_list .= sprintf($lang['RadioCast_moderate_can'], '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) .'">', '</a>');
  }
  //
***************
*** 158,170 ****
  $moderators_list = '';
  
! if ($thiscat['cat_moderator_groups'] != '')
  {
  	// Get the namelist of moderator usergroups
! 	$sql = "SELECT group_id, group_name, group_type, group_single_user
! 			FROM " . GROUPS_TABLE . "
! 			WHERE group_single_user <> 1
! 				AND group_type <> ". GROUP_HIDDEN ."
! 				AND group_id IN (". $thiscat['cat_moderator_groups'] .")
! 			ORDER BY group_name ASC";
  	if ( !$result = $db->sql_query($sql) )
  	{
--- 158,170 ----
  $moderators_list = '';
  
! if ($thiscat['cat_moderator_groups'])
  {
  	// Get the namelist of moderator usergroups
! 	// We have usergroup_ID, now we need usergroup name
! 	$sql = "SELECT g.group_id, g.group_name
! 			FROM " . GROUPS_TABLE . " g
! 				WHERE g.group_type <> ". GROUP_HIDDEN ."
! 			AND g.group_id IN (". $thiscat['cat_moderator_groups'] .")				
! 			ORDER BY g.group_type ASC, g.group_name";				
  	if ( !$result = $db->sql_query($sql) )
  	{

Index: radiocast_comment_edit.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_comment_edit.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** radiocast_comment_edit.php	6 Jun 2007 23:03:50 -0000	1.1
--- radiocast_comment_edit.php	22 Jan 2009 08:29:51 -0000	1.2
***************
*** 169,173 ****
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_comment_edit&comment_id=$comment_id"), true));
  	}
  	else
--- 169,173 ----
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_comment_edit&comment_id=$comment_id"), true));
  	}
  	else
***************
*** 207,211 ****
  	else
  	{
! 		$poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thisstation['user_id']) .'">'. $thisstation['username'] .'</a>';
  	}
  
--- 207,211 ----
  	else
  	{
! 		$poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thisstation['user_id']) .'">'. $thisstation['username'] .'</a>';
  	}
  
***************
*** 227,233 ****
  	$template->assign_vars(array(
  		'CAT_TITLE' => $thiscat['cat_title'],
! 		'U_VIEW_CAT' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  
! 		'U_STATION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_station&station_id=$station_id")),
  
  		'STATION_TITLE' => $thisstation['station_title'],
--- 227,233 ----
  	$template->assign_vars(array(
  		'CAT_TITLE' => $thiscat['cat_title'],
! 		'U_VIEW_CAT' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")),
  
! 		'U_STATION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_station&station_id=$station_id")),
  
  		'STATION_TITLE' => $thisstation['station_title'],
***************
*** 254,258 ****
  		'L_SUBMIT' => $lang['Submit'],
  
! 		'S_RADIOCAST_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment_edit&comment_id=$comment_id"))
  		)
  	);
--- 254,258 ----
  		'L_SUBMIT' => $lang['Submit'],
  
! 		'S_RADIOCAST_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment_edit&comment_id=$comment_id"))
  		)
  	);
***************
*** 309,316 ****
  
  	$template->assign_vars(array(
! 		'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")) . '#'.$comment_id.'">')
  	);
  
! 	$message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
--- 309,316 ----
  
  	$template->assign_vars(array(
! 		'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")) . '#'.$comment_id.'">')
  	);
  
! 	$message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);

Index: radiocast_list.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_list.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** radiocast_list.php	21 Mar 2008 08:51:07 -0000	1.3
--- radiocast_list.php	22 Jan 2009 08:29:51 -0000	1.4
***************
*** 163,167 ****
  
  				$template->assign_block_vars('search_stations.search_row', array(
! 					'U_STATION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_page&station_id=". $searchstationrow[$j]['station_id'])),
  					'DESC' => $searchstationrow[$j]['station_desc']
  					)
--- 163,167 ----
  
  				$template->assign_block_vars('search_stations.search_row', array(
! 					'U_STATION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_page&station_id=". $searchstationrow[$j]['station_id'])),
  					'DESC' => $searchstationrow[$j]['station_desc']
  					)
***************
*** 174,182 ****
  				else
  				{
! 					$search_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $searchstationrow[$j]['user_id']) .'">'. $searchstationrow[$j]['username'] .'</a>';
  				}
  
  				$template->assign_block_vars('search_stations.search_detail', array(
! 					'TITLE' => '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_page&station_id=". $searchstationrow[$j]['station_id'])) . '">' . $searchstationrow[$j]['station_title'] . '</a>',
  					'SINGER' => $searchstationrow[$j]['station_singer'],
  					'POSTER' => $search_poster,
--- 174,182 ----
  				else
  				{
! 					$search_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $searchstationrow[$j]['user_id']) .'">'. $searchstationrow[$j]['username'] .'</a>';
  				}
  
  				$template->assign_block_vars('search_stations.search_detail', array(
! 					'TITLE' => '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_page&station_id=". $searchstationrow[$j]['station_id'])) . '">' . $searchstationrow[$j]['station_title'] . '</a>',
  					'SINGER' => $searchstationrow[$j]['station_singer'],
  					'POSTER' => $search_poster,
***************
*** 185,191 ****
  					'VIEW' => $searchstationrow[$j]['station_view_count'],
  
! 					'RATING' => ($radiocast_config['rate'] == 1) ? ( '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_rate&station_id=". $searchstationrow[$j]['station_id'])) . '">' . $searchstationrow[$j]['rating'] . '</a>' ) : '',
  
! 					'COMMENTS' => ($radiocast_config['comment'] == 1) ? ( '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=". $searchstationrow[$j]['station_id'])) . '">' . $searchstationrow[$j]['comments'] . '</a>' ) : ''
  					)
  				);
--- 185,191 ----
  					'VIEW' => $searchstationrow[$j]['station_view_count'],
  
! 					'RATING' => ($radiocast_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_rate&station_id=". $searchstationrow[$j]['station_id'])) . '">' . $searchstationrow[$j]['rating'] . '</a>' ) : '',
  
! 					'COMMENTS' => ($radiocast_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=". $searchstationrow[$j]['station_id'])) . '">' . $searchstationrow[$j]['comments'] . '</a>' ) : ''
  					)
  				);
***************
*** 228,232 ****
  
  $template->assign_vars(array(
! 	'S_RADIOCAST_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_list")),
  
  	'L_SEARCH_STATIONS' => $lang['Search_station'],
--- 228,232 ----
  
  $template->assign_vars(array(
! 	'S_RADIOCAST_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_list")),
  
  	'L_SEARCH_STATIONS' => $lang['Search_station'],
***************
*** 244,252 ****
  	'RADIOCAST_VERSION' => '1' . $radiocast_config['radiocast_version'],
  	'L_INDEX' => '<<',
! 	'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx),
  	'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  	'L_RADIOCAST' => $lang['Radio'],
! 	'U_RADIOCAST' => append_sid(this_rc_mxurl()),
! 	'U_MX_RADIOCAST' => append_sid(this_rc_portalurl()),
  
  	'L_TIME' => $lang['Time'],
--- 244,252 ----
  	'RADIOCAST_VERSION' => '1' . $radiocast_config['radiocast_version'],
  	'L_INDEX' => '<<',
! 	'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx),
  	'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  	'L_RADIOCAST' => $lang['Radio'],
! 	'U_RADIOCAST' => mx_append_sid(this_rc_mxurl()),
! 	'U_MX_RADIOCAST' => mx_append_sid(this_rc_portalurl()),
  
  	'L_TIME' => $lang['Time'],

Index: radiocast_modcp.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_modcp.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** radiocast_modcp.php	10 Jul 2008 22:25:20 -0000	1.2
--- radiocast_modcp.php	22 Jan 2009 08:29:51 -0000	1.3
***************
*** 178,182 ****
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id"), true));
  	}
  	else
--- 178,182 ----
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id"), true));
  	}
  	else
***************
*** 356,365 ****
  			else
  			{
! 				$station_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $stationrow[$i]['user_id']) .'">'. $stationrow[$i]['username'] .'</a>';
  			}
  
  			$template->assign_block_vars('stationrow', array(
  				'STATION_ID' => $stationrow[$i]['station_id'],
! 				'STATION_TITLE' => '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_station&station_id=". $stationrow[$i]['station_id'])) .'" target="_blank">'. $stationrow[$i]['station_title'] .'</a>',
  				'POSTER' => $station_poster,
  				'TIME' => create_date($board_config['default_dateformat'], $stationrow[$i]['station_time'], $board_config['board_timezone']),
--- 356,365 ----
  			else
  			{
! 				$station_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $stationrow[$i]['user_id']) .'">'. $stationrow[$i]['username'] .'</a>';
  			}
  
  			$template->assign_block_vars('stationrow', array(
  				'STATION_ID' => $stationrow[$i]['station_id'],
! 				'STATION_TITLE' => '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_station&station_id=". $stationrow[$i]['station_id'])) .'" target="_blank">'. $stationrow[$i]['station_title'] .'</a>',
  				'POSTER' => $station_poster,
  				'TIME' => create_date($board_config['default_dateformat'], $stationrow[$i]['station_time'], $board_config['board_timezone']),
***************
*** 372,376 ****
  		}
  		$template->assign_vars(array(
! 			'PAGINATION' => generate_pagination(append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_stations, $stations_per_page, $start),
  			'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $stations_per_page ) + 1 ), ceil( $total_stations / $stations_per_page ))
  			)
--- 372,376 ----
  		}
  		$template->assign_vars(array(
! 			'PAGINATION' => generate_pagination(mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_stations, $stations_per_page, $start),
  			'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $stations_per_page ) + 1 ), ceil( $total_stations / $stations_per_page ))
  			)
***************
*** 415,419 ****
  
  	$template->assign_vars(array(
! 		'U_VIEW_CAT' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")),
  		'CAT_TITLE' => $thiscat['cat_title'],
  
--- 415,419 ----
  
  	$template->assign_vars(array(
! 		'U_VIEW_CAT' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")),
  		'CAT_TITLE' => $thiscat['cat_title'],
  
***************
*** 427,431 ****
  		'L_POSTED' => $lang['Posted'],
  
! 		'S_RADIOCAST_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")),
  
  		'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'],
--- 427,431 ----
  		'L_POSTED' => $lang['Posted'],
  
! 		'S_RADIOCAST_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")),
  
  		'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'],
***************
*** 458,466 ****
  		'RADIOCAST_VERSION' => '1' . $radiocast_config['radiocast_version'],
  		'L_INDEX' => '<<',
! 		'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => append_sid(this_rc_portalurl()),
  
  		'SORT_TIME' => ($sort_method == 'station_time') ? 'selected="selected"' : '',
--- 458,466 ----
  		'RADIOCAST_VERSION' => '1' . $radiocast_config['radiocast_version'],
  		'L_INDEX' => '<<',
! 		'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx),
  		'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  		'L_RADIOCAST' => $lang['Radio'],
! 		'U_RADIOCAST' => mx_append_sid(this_rc_mxurl()),
! 		'U_MX_RADIOCAST' => mx_append_sid(this_rc_portalurl()),
  
  		'SORT_TIME' => ($sort_method == 'station_time') ? 'selected="selected"' : '',
***************
*** 588,592 ****
  
  			$template->assign_vars(array(
! 				'S_RADIOCAST_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&mode=move&cat_id=$cat_id")),
  				'L_MOVE' => $lang['Move'],
  				'L_MOVE_TO_CATEGORY' => $lang['Move_to_Category'],
--- 588,592 ----
  
  			$template->assign_vars(array(
! 				'S_RADIOCAST_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&mode=move&cat_id=$cat_id")),
  				'L_MOVE' => $lang['Move'],
  				'L_MOVE_TO_CATEGORY' => $lang['Move_to_Category'],
***************
*** 649,653 ****
  			}
  
! 			$message = $lang['Stations_moved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  			mx_message_die(GENERAL_MESSAGE, $message);
--- 649,653 ----
  			}
  
! 			$message = $lang['Stations_moved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  			mx_message_die(GENERAL_MESSAGE, $message);
***************
*** 711,717 ****
  		$message = $lang['Stations_locked_successfully'] .'<br /><br />';
  
! 		$message .= sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />";
  
! 		$message .= '<br /><br />' . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  		mx_message_die(GENERAL_MESSAGE, $message);
--- 711,717 ----
  		$message = $lang['Stations_locked_successfully'] .'<br /><br />';
  
! 		$message .= sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />";
  
! 		$message .= '<br /><br />' . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  		mx_message_die(GENERAL_MESSAGE, $message);
***************
*** 774,780 ****
  		$message = $lang['Stations_unlocked_successfully'] .'<br /><br />';
  
! 		$message .= sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />";
  
! 		$message .= '<br /><br />' . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  		mx_message_die(GENERAL_MESSAGE, $message);
--- 774,780 ----
  		$message = $lang['Stations_unlocked_successfully'] .'<br /><br />';
  
! 		$message .= sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />";
  
! 		$message .= '<br /><br />' . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  		mx_message_die(GENERAL_MESSAGE, $message);
***************
*** 835,839 ****
  		}
  
! 		$message = $lang['Stations_approved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  		mx_message_die(GENERAL_MESSAGE, $message);
--- 835,839 ----
  		}
  
! 		$message = $lang['Stations_approved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  		mx_message_die(GENERAL_MESSAGE, $message);
***************
*** 894,898 ****
  		}
  
! 		$message = $lang['Stations_unapproved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  		mx_message_die(GENERAL_MESSAGE, $message);
--- 894,898 ----
  		}
  
! 		$message = $lang['Stations_unapproved_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  		mx_message_die(GENERAL_MESSAGE, $message);
***************
*** 962,972 ****
  				'RADIOCAST_VERSION' => '1' . $radiocast_config['radiocast_version'],
  				'L_INDEX' => '<<',
! 				'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx),
  				'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  				'L_RADIOCAST' => $lang['Radio'],
! 				'U_RADIOCAST' => append_sid(this_rc_mxurl()),
! 				'U_MX_RADIOCAST' => append_sid(this_rc_portalurl()),
  
! 				'S_CONFIRM_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&mode=delete&cat_id=$cat_id")),
  				)
  			);
--- 962,972 ----
  				'RADIOCAST_VERSION' => '1' . $radiocast_config['radiocast_version'],
  				'L_INDEX' => '<<',
! 				'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx),
  				'L_RADIOCAST_INDEX' => $lang['Radio_Cast'],
  				'L_RADIOCAST' => $lang['Radio'],
! 				'U_RADIOCAST' => mx_append_sid(this_rc_mxurl()),
! 				'U_MX_RADIOCAST' => mx_append_sid(this_rc_portalurl()),
  
! 				'S_CONFIRM_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&mode=delete&cat_id=$cat_id")),
  				)
  			);
***************
*** 1061,1065 ****
  			}
  
! 			$message = $lang['Stations_deleted_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  			mx_message_die(GENERAL_MESSAGE, $message);
--- 1061,1065 ----
  			}
  
! 			$message = $lang['Stations_deleted_successfully'] .'<br /><br />'. sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>") .'<br /><br />'. sprintf($lang['Click_return_modcp'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_modcp&cat_id=$cat_id")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  			mx_message_die(GENERAL_MESSAGE, $message);

Index: radiocast_comment_delete.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_comment_delete.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** radiocast_comment_delete.php	6 Jun 2007 23:03:50 -0000	1.1
--- radiocast_comment_delete.php	22 Jan 2009 08:29:51 -0000	1.2
***************
*** 174,178 ****
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_comment_delete&comment_id=$comment_id"), true));		
  	}
  	else
--- 174,178 ----
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_comment_delete&comment_id=$comment_id"), true));		
  	}
  	else
***************
*** 211,215 ****
  	if( isset($HTTP_POST_VARS['cancel']) )
  	{
! 		mx_redirect(append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")));
  		exit;
  	}
--- 211,215 ----
  	if( isset($HTTP_POST_VARS['cancel']) )
  	{
! 		mx_redirect(mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&comment_id=$comment_id")));
  		exit;
  	}
***************
*** 236,240 ****
  		'L_YES' => $lang['Yes'],
  
! 		'S_CONFIRM_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment_delete&comment_id=$comment_id")),
  		)
  	);
--- 236,240 ----
  		'L_YES' => $lang['Yes'],
  
! 		'S_CONFIRM_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment_delete&comment_id=$comment_id")),
  		)
  	);
***************
*** 272,282 ****
  
  		$template->assign_vars(array(
! 			'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  		);
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
--- 272,282 ----
  
  		$template->assign_vars(array(
! 			'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  		);
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);

Index: radiocast_delete.php
===================================================================
RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_delete.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** radiocast_delete.php	2 Jul 2007 20:01:15 -0000	1.2
--- radiocast_delete.php	22 Jan 2009 08:29:51 -0000	1.3
***************
*** 114,118 ****
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_delete&station_id=$station_id"), true));		
  	}
  	else
--- 114,118 ----
  	if (!$userdata['session_logged_in'])
  	{
! 		mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_rc_loginurl("radiocast_mode=radiocast_delete&station_id=$station_id"), true));		
  	}
  	else
***************
*** 147,151 ****
  	if( isset($HTTP_POST_VARS['cancel']) )
  	{
! 		mx_redirect(append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")));
  		exit;
  	}
--- 147,151 ----
  	if( isset($HTTP_POST_VARS['cancel']) )
  	{
! 		mx_redirect(mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")));
  		exit;
  	}
***************
*** 172,176 ****
  		'L_YES' => $lang['Yes'],
  
! 		'S_CONFIRM_ACTION' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_delete&station_id=$station_id")),
  		)
  	);
--- 172,176 ----
  		'L_YES' => $lang['Yes'],
  
! 		'S_CONFIRM_ACTION' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_delete&station_id=$station_id")),
  		)
  	);
***************
*** 235,244 ****
  
  		$template->assign_vars(array(
! 			'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  		);
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);
--- 235,244 ----
  
  		$template->assign_vars(array(
! 			'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . '">')
  		);
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=$cat_id")) . "\">", "</a>");
  
! 	$message .= "<br /><br />" . sprintf($lang['Click_return_radiocast_index'], "<a href=\"" . mx_append_sid(this_rc_mxurl()) . "\">", "</a>");
  
  	mx_message_die(GENERAL_MESSAGE, $message);