[mxbb-commits] mx_music/music_box/includes music_constants.php, 1.9, 1.10 music_functions.php, 1.7, 1.8 music_integration.php, 1.4, 1.5

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

Update of /cvsroot/mxbb/mx_music/music_box/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6040/music_box/includes

Modified Files:
	music_constants.php music_functions.php music_integration.php 
Log Message:
version 2.9.4

Index: music_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_functions.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** music_functions.php	18 Sep 2008 00:56:53 -0000	1.7
--- music_functions.php	18 Sep 2008 07:24:45 -0000	1.8
***************
*** 228,232 ****
  			if ($user_id && $user_id != ANONYMOUS)
  			{
! 				$profile_url = mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&u=" . (int) $user_id);
  				$full_url = '<a href="' . $profile_url . '"><span ' . $user_style. '>' . $username . '</span></a>';
  			}
--- 228,232 ----
  			if ($user_id && $user_id != ANONYMOUS)
  			{
! 				$profile_url = mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;u=" . (int) $user_id);
  				$full_url = '<a href="' . $profile_url . '"><span ' . $user_style. '>' . $username . '</span></a>';
  			}
***************
*** 277,281 ****
  function music_comment_sql_smilies($auth_data)
  {
! 	global $db, $template, $board_config;
  	
  	$inline_columns = 6;
--- 277,281 ----
  function music_comment_sql_smilies($auth_data)
  {
! 	global $db, $template, $board_config, $phpbb_root_path;
  	
  	$inline_columns = 6;
***************
*** 285,289 ****
  	{
  		case 'internal':
! 			$smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed
  			$fields = 'smilies';		
  			$smiley_url = 'smile_url';
--- 285,289 ----
  	{
  		case 'internal':
! 			$smiley_path_url = $phpbb_root_path; //change this to PORTAL_URL when shared folder will be removed
  			$fields = 'smilies';		
  			$smiley_url = 'smile_url';
***************
*** 292,296 ****
  		break;
  		case 'phpbb2':
! 			$smiley_path_url = PHPBB_URL;
  			$fields = 'smilies';		
  			$smiley_url = 'smile_url';
--- 292,296 ----
  		break;
  		case 'phpbb2':
! 			$smiley_path_url = $phpbb_root_path;
  			$fields = 'smilies';		
  			$smiley_url = 'smile_url';
***************
*** 299,303 ****
  		break;
  		case 'phpbb3':
! 			$smiley_path_url = PHPBB_URL;
  			$fields = 'smiley';		
  			$smiley_url = 'smiley_url';
--- 299,303 ----
  		break;
  		case 'phpbb3':
! 			$smiley_path_url = $phpbb_root_path;
  			$fields = 'smiley';		
  			$smiley_url = 'smiley_url';
***************
*** 326,330 ****
  	}
  	
! 	if (!$result = $db->sql_query_limit($sql, $max_smilies))
  	{
  		mx_message_die(GENERAL_ERROR, "Couldn't retrieve smilies list", '', __LINE__, __FILE__, $sql);
--- 326,332 ----
  	}
  	
! 	$sql .= " LIMIT $max_smilies";
! 	
! 	if (!$result = $db->sql_query($sql))
  	{
  		mx_message_die(GENERAL_ERROR, "Couldn't retrieve smilies list", '', __LINE__, __FILE__, $sql);
***************
*** 410,414 ****
  	{
  		case 'internal':
! 			$smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed
  			$smiley_root_path =	$phpbb_root_path; //same here	
  			$smiley_url = 'smile_url';
--- 412,416 ----
  	{
  		case 'internal':
! 			$smiley_path_url = $phpbb_root_path; //change this to PORTAL_URL when shared folder will be removed
  			$smiley_root_path =	$phpbb_root_path; //same here	
  			$smiley_url = 'smile_url';
***************
*** 417,421 ****
  		break;
  		case 'phpbb2':
! 			$smiley_path_url = PHPBB_URL;
  			$smiley_root_path =	$phpbb_root_path;		
  			$smiley_url = 'smile_url';
--- 419,423 ----
  		break;
  		case 'phpbb2':
! 			$smiley_path_url = $phpbb_root_path;
  			$smiley_root_path =	$phpbb_root_path;		
  			$smiley_url = 'smile_url';
***************
*** 424,428 ****
  		break;
  		case 'phpbb3':
! 			$smiley_path_url = PHPBB_URL;
  			$smiley_root_path =	$phpbb_root_path;		
  			$smiley_url = 'smiley_url';
--- 426,430 ----
  		break;
  		case 'phpbb3':
! 			$smiley_path_url = $phpbb_root_path;
  			$smiley_root_path =	$phpbb_root_path;		
  			$smiley_url = 'smiley_url';

Index: music_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_integration.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** music_integration.php	7 Sep 2008 18:06:29 -0000	1.4
--- music_integration.php	18 Sep 2008 07:24:46 -0000	1.5
***************
*** 66,70 ****
  		$pageid = ($new_pageid) ? intval($new_pageid) : ($page_id && is_numeric($page_id)) ? intval($page_id) : $mx_request_vars->request('page', MX_TYPE_INT, $music_index);
  
! 		$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
  		
  		$dynamicId = !empty($dynamic_block) ? ( $non_html_amp ? '&dynamic_block=' : '&amp;dynamic_block=' ) . $dynamic_block : '';
--- 66,70 ----
  		$pageid = ($new_pageid) ? intval($new_pageid) : ($page_id && is_numeric($page_id)) ? intval($page_id) : $mx_request_vars->request('page', MX_TYPE_INT, $music_index);
  
! 		$args .= (($args == '') ? '' : '&' ) . 'modrewrite=no';
  		
  		$dynamicId = !empty($dynamic_block) ? ( $non_html_amp ? '&dynamic_block=' : '&amp;dynamic_block=' ) . $dynamic_block : '';

Index: music_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_constants.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** music_constants.php	18 Sep 2008 00:56:53 -0000	1.9
--- music_constants.php	18 Sep 2008 07:24:45 -0000	1.10
***************
*** 15,20 ****
  
  if ( !MXBB_MODULE )
! {
! 	$this_phpbb_url = str_replace("//", "/", $portal_config['portal_url'] . '/');
  			
  	define('PORTAL_URL', $this_phpbb_url);
--- 15,20 ----
  
  if ( !MXBB_MODULE )
! {	
! 	$this_phpbb_url = $portal_config['portal_url'];
  			
  	define('PORTAL_URL', $this_phpbb_url);