|
From: Florin C B. <ory...@us...> - 2014-09-29 11:35:56
|
Update of /cvsroot/mxbb/mx_radio/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24547/admin Modified Files: admin_radio.php Log Message: many features updated for new browsers Index: admin_radio.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/admin/admin_radio.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_radio.php 3 Jul 2013 04:30:02 -0000 1.6 --- admin_radio.php 29 Sep 2014 11:35:54 -0000 1.7 *************** *** 86,109 **** } //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>"; } else { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } //Show stationslist? ! if ($new['show_stations']=="true") { ! $show_stations="<select name=\"show_stations\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_stations="<select name=\"show_stations\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 86,222 ---- } + // CD-cover, equliazer, logo (cover, eq, logo) + if ($new['picture_type'] == 'cover') + { + $picture_type = " + <select name=\"picture_type\" size=\"1\"> + <option value=\"cover\" selected> + cover + </option> + <option value=\"eq\"> + eq + </option> + <option value=\"logo\"> + logo + </option> + </select>"; + } + elseif ($new['picture_type'] == 'eq') + { + $picture_type = " + <select name=\"picture_type\" size=\"1\"> + <option value=\"cover\"> + cover + </option> + <option value=\"eq\" selected> + eq + </option> + <option value=\"logo\"> + logo + </option> + </select>"; + } + elseif ($new['picture_type'] == 'logo') + { + $picture_type = " + <select name=\"picture_type\" size=\"1\"> + <option value=\"cover\"> + cover + </option> + <option value=\"eq\"> + eq + </option> + <option value=\"logo\" selected> + logo + </option> + </select>"; + } + else + { + $picture_type = " + <select name=\"picture_type\" size=\"1\"> + <option value=\"cover\"> + cover + </option> + <option value=\"eq\"> + eq + </option> + <option value=\"logo\"> + logo + </option> + </select>"; + } + + // Fallback if no cover is found (eq/logo) + if ($new['fallback'] == 'eq') + { + $fallback_to = " + <select name=\"fallback\" size=1> + <option value=\"eq\" selected> + eq + </option> + <option value=\"logo\"> + logo + </option> + </select>"; + } + else + { + $fallback_to = " + <select name=\"fallback\" size=1> + <option value=\"eq\"> + eq + </option> + <option value=\"logo\" selected> + logo + </option> + </select>"; + } + + //stream_type + if ($new['stream_type'] == 'mp3') + { + $stream_type = " + <select name=\"stream_type\" size=1> + <option value=\"mp3\" selected> + mp3 + </option> + <option value=\"icy\"> + icy + </option> + </select>"; + } + else + { + $stream_type = " + <select name=\"stream_type\" size=1> + <option value=\"mp3\"> + mp3 + </option> + <option value=\"icy\" selected> + icy + </option> + </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>"; } else { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } //Show stationslist? ! if ($new['show_stations'] == "true") { ! $show_stations="<select name=\"show_stations\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_stations="<select name=\"show_stations\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 111,114 **** --- 224,242 ---- $gf_select_no = ( !$new['gf_select'] ) ? ' selected' : ''; + // ALLOW STREAM START AUTOMATIC WHEN PLAYER IS LOADED ? + $allow_autoplay_yes = ($new['allow_autoplay'] == 1) ? 'checked="checked"' : ''; + $allow_autoplay_no = ($new['allow_autoplay'] == 0) ? 'checked="checked"' : ''; + + // ALLOW CURL? + $allow_curl_yes = ($new['allow_curl'] == 1) ? 'checked="checked"' : ''; + $allow_curl_no = ($new['allow_curl'] == 0) ? 'checked="checked"' : ''; + + // ALLOW GUESTS? + $allow_guests_yes = ($new['allow_guests'] == 1) ? 'checked="checked"' : ''; + $allow_guests_no = ($new['allow_guests'] == 0) ? 'checked="checked"' : ''; + + $show_listen_select_yes = ( $new['show_listen_select'] ) ? ' selected' : ''; + $show_listen_select_no = ( !$new['show_listen_select'] ) ? ' selected' : ''; + $template->set_filenames(array( "body" => "admin/radio_config_body.tpl") *************** *** 116,136 **** $template->assign_vars(array( ! 'S_ACTION' => mx_append_sid("admin_radio.$phpEx"), 'L_RADIO_SETTINGS' => $lang['radio_Settings'], ! 'L_RADIO_SETTINGS_EXPLAIN' => $lang['radio_Settings_explain'], ! 'L_RADIO' => $lang['Radio_name'], ! 'L_STREAM' => $lang['Station_stream'], ! 'L_FLASH' => $lang['Flash_file'], ! 'L_GATEWAY' => $lang['Gateway_file'], 'L_SHOW_STATUS' => $lang['Show_status'], 'L_SHOW_STATIONS' => $lang['Show_stations'], ! 'L_SUBMIT' => $lang['Submit'], ! 'L_RESET' => $lang['Reset'], ! 'L_GF' => $lang['flash_gateway'], 'L_GF_INFO' => $lang['flash_gateway_info'], ! 'L_FLASH' => $lang['Flash_mode'], ! 'L_GATEWAY' => $lang['Gateway_mode'], 'L_CHECK_PERIOD' => $lang['Check_period'], ! 'L_CHECK_PERIOD_EXPLAIN' => $lang['Check_period_explain'], 'RADIO_NAME' => $new['radio_name'], --- 244,278 ---- $template->assign_vars(array( ! 'S_ACTION' => mx_append_sid("admin_radio.$phpEx"), 'L_RADIO_SETTINGS' => $lang['radio_Settings'], ! 'L_RADIO_SETTINGS_EXPLAIN' => $lang['radio_Settings_explain'], ! 'L_RADIO' => $lang['Radio_name'], ! 'L_STREAM' => $lang['Station_stream'], ! 'L_FLASH' => $lang['Flash_file'], ! 'L_GATEWAY' => $lang['Gateway_file'], 'L_SHOW_STATUS' => $lang['Show_status'], 'L_SHOW_STATIONS' => $lang['Show_stations'], ! 'L_SUBMIT' => $lang['Submit'], ! 'L_RESET' => $lang['Reset'], ! 'L_GF' => $lang['flash_gateway'], 'L_GF_INFO' => $lang['flash_gateway_info'], ! 'L_FLASH' => $lang['Flash_mode'], ! 'L_GATEWAY' => $lang['Gateway_mode'], 'L_CHECK_PERIOD' => $lang['Check_period'], ! 'L_CHECK_PERIOD_EXPLAIN' => $lang['Check_period_explain'], ! ! 'L_SHOW_STATUS' => $lang['Show_status'], ! 'L_STREAM_TYPE' => $lang['Stream_type'], ! ! 'L_CASTER' => $lang['caster'], ! 'L_ALLOW_AUTOPLAY' => $lang['allow_autoplay'], ! 'L_ALLOW_AUTOPLAY_EXPMAIN' => $lang['allow_autoplay_explain'], ! ! 'L_ALLOW_GUESTS' => $lang['Allow_guests'], ! 'L_GUESTNAME' => $lang['guestname'], ! 'L_GUESTNAME_EXPLAIN' => $lang['guestname_explain'], ! ! "L_NO" => $lang['No'], ! "L_YES" => $lang['Yes'], 'RADIO_NAME' => $new['radio_name'], *************** *** 138,148 **** 'FLASH_FILE_URL' => $new['flash_FileName'], 'GATEWAY_FILE_URL' => $new['gateway_FileName'], ! 'CHECK_PERIOD' => $new['check_period'], ! //GUI_SETTING 'USER_STATE_BUTTON' => $user_state_button, 'SHOW_STATIONS' => $show_stations, 'S_FLASH_YES' => $gf_select_yes, 'S_GATEWAY_YES' => $gf_select_no, 'SHOW_STATUS' => $show_status) ); --- 280,330 ---- 'FLASH_FILE_URL' => $new['flash_FileName'], 'GATEWAY_FILE_URL' => $new['gateway_FileName'], ! ! 'PLAY_LIST' => $new['play_list'], ! 'PLAY_ASX' => $new['play_asx'], ! 'PLAY_HOST' => $new['play_host'], ! 'PLAY_PORT' => $new['play_port'], ! 'PLAY_MOUNT' => $new['play_mount'], ! 'S_CASTER' => $new['caster'], ! ! 'ALLOW_AUTOPLAY_YES' => $allow_autoplay_yes, ! 'ALLOW_AUTOPLAY_NO' => $allow_autoplay_no, ! ! 'PICTURE_TYPE' => $picture_type, ! 'FALLBACK_TO' => $fallback_to, ! 'DISPLAY_LOGO' => $new['logo'], ! ! 'ALLOW_CURL_YES' => $allow_curl_yes, ! 'ALLOW_CURL_NO' => $allow_curl_no, ! ! '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', ! ! 'CHECK_PERIOD' => $new['check_period'], ! ! //GUI_SETTING ! 'L_BUTTON_SETTINGS' => 'USER_STATE_BUTTON', 'USER_STATE_BUTTON' => $user_state_button, + 'S_LISTEN_YES' => $show_listen_select_yes, + 'S_LISTEN_NO' => $show_listen_select_no, + + 'ALLOW_GUESTS_YES' => $allow_guests_yes, + 'ALLOW_GUESTS_NO' => $allow_guests_no, + 'GUESTNAME' => $new['guestname'], + 'SHOW_STATIONS' => $show_stations, 'S_FLASH_YES' => $gf_select_yes, 'S_GATEWAY_YES' => $gf_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) ); |