[mxbb-commits] mx_shotcast/config config.php,1.2,1.3

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

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

Modified Files:
	config.php 
Log Message:


Index: config.php
===================================================================
RCS file: /cvsroot/mxbb/mx_shotcast/config/config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.php	2 Jul 2013 05:50:07 -0000	1.2
--- config.php	2 Jul 2013 12:56:43 -0000	1.3
***************
*** 32,36 ****
  	$mx_user->init($user_ip, PAGE_INDEX);
  	// End session management
! 	$title = 'Media Player Radio';
  	$is_block = FALSE;
  }
--- 32,36 ----
  	$mx_user->init($user_ip, PAGE_INDEX);
  	// End session management
! 	$title = 'Radio Player';
  	$is_block = FALSE;
  }
***************
*** 38,41 ****
--- 38,54 ----
  {
  	// Read block Configuration
+ 	$block_info = mx_get_info(BLOCK_TABLE, 'block_title', 'Radio Player');		
+ 	$block_id = ((isset($block_id) && !empty($block_id)) ? $block_id : $block_info['block_id']);
+ 	$title = $block_info['block_title'];
+ 	$block_size = ((isset($block_size) && !empty($block_size)) ? $block_size : '100%');
+ 	$description = $block_info['block_desc'];
+ 	$show_block = $block_info['show_block'];
+ 	$show_title = ($userdata['user_level'] == ADMIN) ? true : $block_info['show_title'];
+ 	$show_stats = $block_info['show_stats'];	
+ 	// Init the User BlockCP
+ 	if (is_numeric($block_id))
+ 	{
+ 		$mx_block->init($block_id, true);
+ 	}
  	$title = $mx_block->block_info['block_title'];
  	//$b_description = $mx_block->block_info['block_desc'];
***************
*** 58,62 ****
  // mx_shotcast version...
  //
! $module_name = 'shotcast';
  if (($mx_cache->get('shotcast_module')) && ($use_cache))
  {
--- 71,75 ----
  // mx_shotcast version...
  //
! $module_name = 'SteamCaster';
  if (($mx_cache->get('shotcast_module')) && ($use_cache))
  {
***************
*** 145,151 ****
  // ================================================================================
  $shotcast_config = array();
- //
  // Get radio Settings from config table
- //
  if (($mx_cache->get('shotcast_config')) && ($use_cache))
  {
--- 158,162 ----
***************
*** 330,334 ****
  // Port of the server where the play lists are located. Leave blank if they
  // are on the same server as the caster ip.
! $playlist_port = (int) trim($portal_config['play_port']);
  
  //If other then port 80 where the play lists are located. Leave blank if they
--- 341,345 ----
  // Port of the server where the play lists are located. Leave blank if they
  // are on the same server as the caster ip.
! $playlist_port = isset($portal_config['play_port']) ? (int) trim($portal_config['play_port']) : "";
  
  //If other then port 80 where the play lists are located. Leave blank if they
***************
*** 362,366 ****
  
  // Use Curl to get cd cover data (yes/no)
! $curl = $shotcast_config['use_curl'];
  
  // If both web server and icecast are behind a router and the web server needs
--- 373,377 ----
  
  // Use Curl to get cd cover data (yes/no)
! $curl = isset($portal_config['allow_curl']) ? $shotcast_config['allow_curl'] : false;
  
  // If both web server and icecast are behind a router and the web server needs
***************
*** 370,373 ****
--- 381,386 ----
  $caster_internal_port = $shotcast_config['cast_port'];
  
+ $user_state_button = $shotcast_config['user_state_button'];
+ 
  // Do not rely on cookie_secure, users seem to think that it means a secured cookie instead of an encrypted connection
  $cookie_secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;