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

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

Update of /cvsroot/mxbb/mx_shotcast/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12961/admin

Modified Files:
	admin_shotcast.php 
Log Message:


Index: admin_shotcast.php
===================================================================
RCS file: /cvsroot/mxbb/mx_shotcast/admin/admin_shotcast.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_shotcast.php	2 Oct 2007 04:40:01 -0000	1.2
--- admin_shotcast.php	24 Feb 2008 01:14:04 -0000	1.3
***************
*** 34,38 ****
  // Setup basic portal stuff...
  //
! define('IN_PORTAL', true);
  $mx_root_path = '../../../';
  $module_root_path = "../";
--- 34,38 ----
  // Setup basic portal stuff...
  //
! @define('IN_PORTAL', true);
  $mx_root_path = '../../../';
  $module_root_path = "../";
***************
*** 66,70 ****
  if(!$result = $db->sql_query($sql))
  {
! 	message_die(GENERAL_ERROR, "Couldn't query shotcast config table", "", __LINE__, __FILE__, $sql);
  }
  while( $row = $db->sql_fetchrow($result) )
--- 66,70 ----
  if(!$result = $db->sql_query($sql))
  {
! 	mx_message_die(GENERAL_ERROR, "Couldn't query shotcast config table", "", __LINE__, __FILE__, $sql);
  }
  while( $row = $db->sql_fetchrow($result) )
***************
*** 84,93 ****
  			mx_message_die(GENERAL_ERROR, "Failed to update shotcast configuration for $config_name", "", __LINE__, __FILE__, $sql);
  		}
  	}
  }
  
  
  //Show status?
! if ($new['show_status']=="true")
  {
  	$show_status = "<select name=\"show_status\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>";
--- 84,104 ----
  			mx_message_die(GENERAL_ERROR, "Failed to update shotcast configuration for $config_name", "", __LINE__, __FILE__, $sql);
  		}
+ 		// Behave as per HTTP/1.1 spec for others
+ 		echo '"<meta http-equiv="refresh" content="1;url="$file">"';
  	}
  }
  
+ //stream_type
+ if ($new['stream_type'] == 'mp3')
+ {
+ 	$stream_type = "<select name=\"stream_type\" size=1><option value=\"mp3\" selected>mp3<option value=\"icy\">icy</select>";
+ }
+ else
+ {
+ 	$stream_type = "<select name=\"stream_type\" size=1><option value=\"mp3\">mp3<option value=\"icy\" selected>icy</select>";
+ }
  
  //Show status?
! if ($new['show_status'] == true)
  {
  	$show_status = "<select name=\"show_status\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>";
***************
*** 115,123 ****
  	'L_PLAY_LIST'				=> $lang['play_list'],
  	'L_SHOW_STATUS'				=> $lang['Show_status'],
! 	'L_SUBMIT'				=> $lang['Submit'],
! 	'L_RESET'				=> $lang['Reset'],
! 	'L_CHECK_PERIOD'			=> $lang['Check_period'],
  	'L_CHECK_PERIOD_EXPLAIN'		=> $lang['Check_period_explain'],
! 	'L_SHOW_LISTEN'				=> $lang['show_listen'],
  	'L_SHOW_LISTEN_INFO' 			=> $lang['show_listen_info'],
  	'L_FORCE_ONLINE'				=> !empty($lang['Force_Online']) ? $lang['Force_Online'] : 'Force Online',
--- 126,135 ----
  	'L_PLAY_LIST'				=> $lang['play_list'],
  	'L_SHOW_STATUS'				=> $lang['Show_status'],
! 	'L_STREAM_TYPE'				=> $lang['Stream_type'],
! 	'L_SUBMIT'					=> $lang['Submit'],
! 	'L_RESET'					=> $lang['Reset'],
! 	'L_CHECK_PERIOD'				=> $lang['Check_period'],
  	'L_CHECK_PERIOD_EXPLAIN'		=> $lang['Check_period_explain'],
! 	'L_SHOW_LISTEN'					=> $lang['show_listen'],
  	'L_SHOW_LISTEN_INFO' 			=> $lang['show_listen_info'],
  	'L_FORCE_ONLINE'				=> !empty($lang['Force_Online']) ? $lang['Force_Online'] : 'Force Online',
***************
*** 129,133 ****
  	'STATION_PORT'				=> $new['shotcast_port'],
  	'STATION_PASS'				=> $new['shotcast_pass'],
! 	'PLAY_LIST'				=> $new['play_list'],
  	'CHECK_PERIOD'				=> $new['check_period'],
  
--- 141,145 ----
  	'STATION_PORT'				=> $new['shotcast_port'],
  	'STATION_PASS'				=> $new['shotcast_pass'],
! 	'PLAY_LIST'					=> $new['play_list'],
  	'CHECK_PERIOD'				=> $new['check_period'],
  
***************
*** 135,142 ****
  	//GUI_SETTING
  	'USER_STATE_BUTTON'			=> $user_state_button,
! 	'S_LISTEN_YES' 			=> $show_listen_select_yes,
  	'S_LISTEN_NO'				=> $show_listen_select_no,
  	'FORCE_ON_ENABLED' 			=> ($new['force_online'] == 1) ? 'checked="checked"' : '',
! 	'FORCE_ON_DISABLED' 			=> ($new['force_online'] == 0) ? 'checked="checked"' : '',
  	'SHOW_STATUS'				=> $show_status)
  );
--- 147,155 ----
  	//GUI_SETTING
  	'USER_STATE_BUTTON'			=> $user_state_button,
! 	'S_LISTEN_YES' 				=> $show_listen_select_yes,
  	'S_LISTEN_NO'				=> $show_listen_select_no,
  	'FORCE_ON_ENABLED' 			=> ($new['force_online'] == 1) ? 'checked="checked"' : '',
! 	'FORCE_ON_DISABLED' 		=> ($new['force_online'] == 0) ? 'checked="checked"' : '',
! 	'STREAM_TYPE'				=> $stream_type,
  	'SHOW_STATUS'				=> $show_status)
  );