|
From: FlorinCB <ory...@us...> - 2009-09-22 03:17:40
|
Update of /cvsroot/mxbb/mx_radio In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24846 Modified Files: Media_Radio.pak db_install.php db_upgrade.php radio_front.php radio_index.php Log Message: upgrade Index: radio_front.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/radio_front.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** radio_front.php 7 Mar 2008 03:26:25 -0000 1.4 --- radio_front.php 22 Sep 2009 03:17:30 -0000 1.5 *************** *** 42,49 **** // Read block Configuration // ! $title = $mx_block->block_info['block_title']; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! $radio_icon = 'radio_front_02.gif'; // -------------------------------------------------------------------------------- --- 42,53 ---- // Read block Configuration // ! $title = $mx_block->block_info['block_title']; ! $block_id = $mx_block->block_info['block_id']; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! $radio_icon = 'radio_front_02.gif'; + $player_size = $mx_block->get_parameters('player_width'); + $player_url = $mx_block->get_parameters('url_file'); + $player_title = $mx_block->get_parameters('url_title'); // -------------------------------------------------------------------------------- *************** *** 167,171 **** 'TOTAL_LISTENERS_ONLINE' => sprintf($lang['How_Many_Listeners'], $howmanylisten), 'LISTENERS_LIST' => $listeners_list, ! 'S_LISTEN_STATION' => mx_append_sid($module_root_path.'radio_index.'.$phpEx), 'L_ALREADY_LISTENING' => $lang['Already_listening'], 'L_CLICK_TO_LISTEN_STATION' => $lang['Click_to_listen_station'], --- 171,175 ---- 'TOTAL_LISTENERS_ONLINE' => sprintf($lang['How_Many_Listeners'], $howmanylisten), 'LISTENERS_LIST' => $listeners_list, ! 'S_LISTEN_STATION' => mx_append_sid($module_root_path.'radio_index.'.$phpEx.'?player_id='.$block_id), 'L_ALREADY_LISTENING' => $lang['Already_listening'], 'L_CLICK_TO_LISTEN_STATION' => $lang['Click_to_listen_station'], *************** *** 174,178 **** 'BLOCK_ID' => $block_id, 'L_VERSION' => _radio_VERSION, ! 'L_TITLE' => 'radio' )); --- 178,182 ---- 'BLOCK_ID' => $block_id, 'L_VERSION' => _radio_VERSION, ! 'L_TITLE' => $player_url ? $player_title : $radio_config['radio_name'] )); Index: Media_Radio.pak =================================================================== RCS file: /cvsroot/mxbb/mx_radio/Media_Radio.pak,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Media_Radio.pak 7 Mar 2008 03:26:24 -0000 1.3 --- Media_Radio.pak 22 Sep 2009 03:17:30 -0000 1.4 *************** *** 1,11 **** ! module=+:72=+:Media Radio=+:modules/mx_radio/=+:mx_radio=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:72=+:89=+:Radio Front=+:mx_radio front block=+:radio_front.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Radio Front=+:Demo block=+:89=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:73=+:126=+:Radio Player=+:Radio Player or Index=+:radio_index.php=+: ! parameter=+:126=+:100=+:player_width=+:Number=+:333=+:=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Radio Player=+:Demo block=+:126=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 \ No newline at end of file --- 1,16 ---- ! module=+:89=+:Media Radio=+:modules/mx_radio/=+:mx_radio=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:89=+:99=+:Radio Front=+:mx_radio front block=+:radio_front.php=+: ! parameter=+:90=+:91=+:player_width=+:Number=+:333=+:=+:1=+:0 ! parameter=+:90=+:92=+:url_file=+:Text=+:127.0.0.1=+:=+:1=+:0 ! parameter=+:90=+:93=+:url_title=+:Text=+:Radio station=+:=+:1=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Radio Front=+:Demo block=+:99=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:89=+:100=+:Radio Player=+:Radio Player or Index=+:radio_index.php=+: ! parameter=+:100=+:107=+:player_width=+:Number=+:333=+:=+:1=+:0 ! parameter=+:100=+:108=+:url_file=+:Text=+:127.0.0.1=+:=+:1=+:0 ! parameter=+:100=+:109=+:url_title=+:Text=+:Radio station=+:=+:1=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Radio Player=+:Demo block=+:100=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 \ No newline at end of file Index: radio_index.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/radio_index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** radio_index.php 7 Mar 2008 03:26:25 -0000 1.3 --- radio_index.php 22 Sep 2009 03:17:30 -0000 1.4 *************** *** 27,37 **** // End session management // - - $title = 'Media Player Radio'; - $block_size = (isset($block_size) && !empty($block_size) ? $block_size : '348'); $player_size = (isset($block_size) && !empty($block_size) ? $block_size - 15 : '333'); $is_block = FALSE; } else --- 27,53 ---- // End session management // $block_size = (isset($block_size) && !empty($block_size) ? $block_size : '348'); + $block_id = (!empty($_GET['player_id'])) ? $_GET['player_id'] : $_POST['block_id']; $player_size = (isset($block_size) && !empty($block_size) ? $block_size - 15 : '333'); + if(!$block_id) + { + $sql = "SELECT * FROM " . BLOCK_TABLE . " WHERE block_title = 'Radio Front' LIMIT 1"; + if(!$result = @$db->sql_query($sql)) + { + mx_message_die(GENERAL_ERROR, "Could not query Radio Center block information", "", __LINE__, __FILE__, $sql); + } + $row = $db->sql_fetchrow($result); + $title = $row['block_title']; + } + + $mx_block->init($block_id); + + $player_url = $mx_block->get_parameters('url_file'); + $player_title = $mx_block->get_parameters('url_title'); + + //$player_title = $title = !empty($_GET['player_title']) ? $_GET['player_title'] : 'Radio Front'; $is_block = FALSE; + //mx_message_die(GENERAL_ERROR, "Could not query Radio Center block information", "", __LINE__, __FILE__, $sql); } else *************** *** 40,48 **** // Read block Configuration // - $title = $mx_block->block_info['block_title']; $desc = $mx_block->block_info['block_desc']; $block_size = (isset($block_size) && !empty($block_size) ? $block_size : '100%'); $player_size = $mx_block->get_parameters('player_width'); if( is_object($mx_block)) --- 56,65 ---- // Read block Configuration // $title = $mx_block->block_info['block_title']; $desc = $mx_block->block_info['block_desc']; $block_size = (isset($block_size) && !empty($block_size) ? $block_size : '100%'); $player_size = $mx_block->get_parameters('player_width'); + $player_url = $mx_block->get_parameters('url_file'); + $player_title = !empty($_GET['player_title']) ? $_GET['player_title'] : $mx_block->get_parameters('url_title'); if( is_object($mx_block)) *************** *** 86,90 **** 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], ! 'S_USER_LANG' => ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'], 'S_UPDATE_RADIO' => mx_append_sid(PORTAL_URL."modules/mx_radio/radio_update.$phpEx"), --- 103,107 ---- 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], ! 'S_USER_LANG' => ($mx_user->lang['default_lang']) ? $mx_user->encode_lang($mx_user->lang['default_lang']) : $board_config['default_lang'], 'S_UPDATE_RADIO' => mx_append_sid(PORTAL_URL."modules/mx_radio/radio_update.$phpEx"), *************** *** 93,97 **** 'SITENAME' => $board_config['sitename'], 'SITE_DESCRIPTION' => $board_config['site_desc'], ! 'L_TITLE' => $radio_config['radio_name'], 'RADIO_NAME' => $radio_config['radio_name'], 'FLASH_FILE' => FLASH_FILE, --- 110,114 ---- 'SITENAME' => $board_config['sitename'], 'SITE_DESCRIPTION' => $board_config['site_desc'], ! 'L_TITLE' => $player_url ? $player_title : $radio_config['radio_name'], 'RADIO_NAME' => $radio_config['radio_name'], 'FLASH_FILE' => FLASH_FILE, *************** *** 105,109 **** 'WMPMODE' => $wmpmode, 'MIMETYPE' => $mimetype, ! 'STATION_STREAM' => $radio_config['radio_FileName'] )); --- 122,126 ---- 'WMPMODE' => $wmpmode, 'MIMETYPE' => $mimetype, ! 'STATION_STREAM' => $player_url ? $player_url : $radio_config['radio_FileName'] )); Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/db_install.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** db_install.php 7 Mar 2008 03:26:24 -0000 1.4 --- db_install.php 22 Sep 2009 03:17:30 -0000 1.5 *************** *** 35,40 **** } ! $mx_module_version = '1.0.8'; ! $mx_module_copy = 'mxBB <i> - Media Radio</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; // If fresh install --- 35,40 ---- } ! $mx_module_version = '1.0.9'; ! $mx_module_copy = 'Mx-Publisher <i> - Media Radio</i> module by OryNider & <a href="http://www.mx-publisher.com" target="_blank">MXP Team</a>'; // If fresh install Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/db_upgrade.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** db_upgrade.php 7 Mar 2008 03:26:24 -0000 1.4 --- db_upgrade.php 22 Sep 2009 03:17:30 -0000 1.5 *************** *** 31,36 **** } ! $mx_module_version = '1.0.8'; ! $mx_module_copy = 'mxBB <i> - Media Radio</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; $message = "<b>Upgrading!</b><br /><br />"; --- 31,36 ---- } ! $mx_module_version = '1.0.9'; ! $mx_module_copy = 'Mx-Publisher <i> - Media Radio</i> module by OryNider & <a href="http://www.mx-publisher.com" target="_blank">MXP Team</a>'; $message = "<b>Upgrading!</b><br /><br />"; |