[mxbb-commits] mx_shotcast db_install.php, 1.10, 1.11 shotcast_front.php, 1.11, 1.12 shotcast_stats.php, 1.9, 1.10

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/mx_shotcast
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5355

Modified Files:
	db_install.php shotcast_front.php shotcast_stats.php 
Log Message:


Index: shotcast_front.php
===================================================================
RCS file: /cvsroot/mxbb/mx_shotcast/shotcast_front.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shotcast_front.php	29 May 2013 04:34:03 -0000	1.11
--- shotcast_front.php	2 Jul 2013 02:46:54 -0000	1.12
***************
*** 55,58 ****
--- 55,59 ----
  //
  $block_title = (isset($server_name) && !empty($server_name) ? $server_name : $mx_block->block_info['block_title']);
+ $b_description = $mx_block->block_info['block_desc'];
  $block_size = (isset($block_size) && !empty($block_size) ? $block_size : '100%' );
  $shotcast_icon = 'cast_front.gif';
***************
*** 129,141 ****
  			if ($shotcast_config['show_listen_select'])
  			{
! 				$can_listen="yes";
  			}
  			elseif ($record['username'] == $userdata['username'])
  			{
! 				$can_listen="no";
  			}
          	else
  			{
! 				$can_listen="yes";
  			}
  		}                    
--- 130,142 ----
  			if ($shotcast_config['show_listen_select'])
  			{
! 				$can_listen = "yes";
  			}
  			elseif ($record['username'] == $userdata['username'])
  			{
! 				$can_listen = "no";
  			}
          	else
  			{
! 				$can_listen = "yes";
  			}
  		}                    
***************
*** 145,157 ****
  		if ($shotcast_config['show_listen_select'])
  		{
! 			$can_listen="yes";
  		}
  		elseif ($record['username'] == $userdata['username'])
  		{
! 			$can_listen="no";
  		}
  		else
  		{
! 			$can_listen="yes";
  		}
  	}
--- 146,158 ----
  		if ($shotcast_config['show_listen_select'])
  		{
! 			$can_listen = "yes";
  		}
  		elseif ($record['username'] == $userdata['username'])
  		{
! 			$can_listen = "no";
  		}
  		else
  		{
! 			$can_listen = "yes";
  		}
  	}
***************
*** 270,274 ****
  	'L_ALREADY_LISTENING'		=> $lang['Already_listening'],
  	'BLOCK_SIZE'				=> $block_size,
! 	'L_TITLE' 					=> $block_title,	
  // 	'U_URL'					=> mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?block_id=' . $block_id),
  	'BLOCK_ID' 					=> $block_id,
--- 271,276 ----
  	'L_ALREADY_LISTENING'		=> $lang['Already_listening'],
  	'BLOCK_SIZE'				=> $block_size,
! 	'L_TITLE' 					=> $block_title,
! 	'L_DESC'					=> $b_description,	
  // 	'U_URL'					=> mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?block_id=' . $block_id),
  	'BLOCK_ID' 					=> $block_id,

Index: shotcast_stats.php
===================================================================
RCS file: /cvsroot/mxbb/mx_shotcast/shotcast_stats.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shotcast_stats.php	29 May 2013 04:34:03 -0000	1.9
--- shotcast_stats.php	2 Jul 2013 02:46:54 -0000	1.10
***************
*** 71,75 ****
  	'S_SERVERGENRE'			=> $stream_genre,
  	'L_SONGURL'				=> $lang['Stream_URL'],
! 	'S_STREAMURL'				=> $no_cover_url,
  	'S_SONGURL'				=> aws_getInfo($artist, $song, 'track', 'url_info', $no_cover_url, false),	
  	'S_SERVERURL'			=> $server_url,
--- 71,75 ----
  	'S_SERVERGENRE'			=> $stream_genre,
  	'L_SONGURL'				=> $lang['Stream_URL'],
! 	'S_STREAMURL'			=> $no_cover_url,
  	'S_SONGURL'				=> aws_getInfo($artist, $song, 'track', 'url_info', $no_cover_url, false),	
  	'S_SERVERURL'			=> $server_url,
***************
*** 78,81 ****
--- 78,82 ----
  	'BLOCK_SIZE'			=> $block_size,
  	'BLOCK_ID' 				=> $block_id,
+ 	'L_DESC'				=> $b_description,	
  	'L_TITLE'     			=> $block_title,)
  );

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_shotcast/db_install.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** db_install.php	28 May 2013 07:14:33 -0000	1.10
--- db_install.php	2 Jul 2013 02:46:54 -0000	1.11
***************
*** 74,79 ****
  	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('caster', 'shout')";
  	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('skin', 'aero')";	
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('allow_autoplay', '1')"	
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('allow_curl', '1')"
  	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('play_list', 'listen.pls')";
  	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('play_asx', 'livemp3')";
--- 74,79 ----
  	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('caster', 'shout')";
  	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('skin', 'aero')";	
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('allow_autoplay', '1')";	
! 	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('allow_curl', '1')";
  	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('play_list', 'listen.pls')";
  	$sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('play_asx', 'livemp3')";