|
From: FlorinCB <ory...@us...> - 2009-01-22 08:30:33
|
Update of /cvsroot/mxbb/mx_radiocast In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7371 Modified Files: db_install.php db_upgrade.php radiocast.php Log Message: fixes for 3.0.x Index: radiocast.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/radiocast.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** radiocast.php 21 Mar 2008 09:06:41 -0000 1.5 --- radiocast.php 22 Jan 2009 08:29:51 -0000 1.6 *************** *** 62,66 **** // Get general music information // ! include($radiocast_root_path . 'radiocast_common.'.$phpEx); // --- 62,66 ---- // Get general music information // ! require($radiocast_root_path . 'radiocast_common.'.$phpEx); // *************** *** 70,78 **** // Check $album_user_id // --------------------- ! if (isset ($_POST['user_id'])) { $radiocast_user_id = intval($_POST['user_id']); } ! elseif (isset ($_GET['user_id'])) { $radiocast_user_id = intval($_GET['user_id']); --- 70,78 ---- // Check $album_user_id // --------------------- ! if (isset($_POST['user_id'])) { $radiocast_user_id = intval($_POST['user_id']); } ! elseif (isset($_GET['user_id'])) { $radiocast_user_id = intval($_GET['user_id']); *************** *** 171,178 **** $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => append_sid(this_rc_mxurl("c=" . $thiscat_parent['cat_id'])), ! 'SUBCAT_NAV' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . append_sid(this_rc_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>', 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], ! 'U_RSS' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_rss&c=" . $thiscat_parent['cat_id'] . "&sid=" . $userdata['session_id'], true)), 'CAT_PARENT' => $thiscat_parent['cat_id']) ); --- 171,178 ---- $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => mx_append_sid(this_rc_mxurl("c=" . $thiscat_parent['cat_id'])), ! 'SUBCAT_NAV' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . mx_append_sid(this_rc_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>', 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], ! 'U_RSS' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_rss&c=" . $thiscat_parent['cat_id'] . "&sid=" . $userdata['session_id'], true)), 'CAT_PARENT' => $thiscat_parent['cat_id']) ); *************** *** 182,186 **** { $template->assign_vars(array( ! 'U_RSS' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_rss" . "&sid=" . $userdata['session_id'], true)) )); --- 182,186 ---- { $template->assign_vars(array( ! 'U_RSS' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_rss" . "&sid=" . $userdata['session_id'], true)) )); *************** *** 235,249 **** { // We have usergroup_ID, now we need usergroup name ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> 1 ! AND group_type <> ". GROUP_HIDDEN ." ! AND group_id IN (". $catrows[$i]['cat_moderator_groups'] .") ! ORDER BY group_name ASC"; ! if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain usergroups data', '', __LINE__, __FILE__, $sql); ! } ! while( $row = $db->sql_fetchrow($result) ) { --- 235,248 ---- { // We have usergroup_ID, now we need usergroup name ! $sql = "SELECT g.group_id, g.group_name ! FROM " . GROUPS_TABLE . " g ! WHERE g.group_type <> ". GROUP_HIDDEN ." ! AND g.group_id IN (". $catrows[$i]['cat_moderator_groups'] .") ! ORDER BY g.group_type ASC, g.group_name"; ! if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't get group list", "", __LINE__, __FILE__, $sql ); ! } ! while( $row = $db->sql_fetchrow($result) ) { *************** *** 258,262 **** for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. append_sid($phpbb_root_path. "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; --- 257,261 ---- for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. mx_append_sid($phpbb_root_path. "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; *************** *** 316,320 **** // ---------------------------- ! $last_station_info = create_date($board_config['default_dateformat'], $lastrow['station_time'], $board_config['board_timezone']); $last_station_info .= '<br />'; --- 315,319 ---- // ---------------------------- ! $last_station_info = radiocast_create_date($board_config['default_dateformat'], $lastrow['station_time'], $board_config['board_timezone']); $last_station_info .= '<br />'; *************** *** 331,335 **** else { ! $last_station_info .= $lang['Poster'] .': <a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $lastrow['user_id']) .'">'. $lastrow['username'] .'</a>'; } --- 330,334 ---- else { ! $last_station_info .= $lang['Poster'] .': <a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $lastrow['user_id']) .'">'. $lastrow['username'] .'</a>'; } *************** *** 354,358 **** $last_station_info .= '<br />'. $lang['Station_Title'] .': <a href="'; ! $last_station_info .= append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $lastrow['station_id'])) .'">' ; $last_station_info .= $lastrow['station_title'] .'</a>'; --- 353,357 ---- $last_station_info .= '<br />'. $lang['Station_Title'] .': <a href="'; ! $last_station_info .= mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $lastrow['station_id'])) .'">' ; $last_station_info .= $lastrow['station_title'] .'</a>'; *************** *** 390,399 **** while ( $subcatrow = $db->sql_fetchrow($sc_result) ) { ! $subcats .= ' - <a class="gensmall" href="' . append_sid(this_rc_mxurl('radiocast_mode=radiocast_cat&cat_id='. $subcatrow['cat_id'])) . '">' . $subcatrow['cat_title'] . '</a><br />'; } $subcats .= '</span><br />'; $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_index&c=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], --- 389,398 ---- while ( $subcatrow = $db->sql_fetchrow($sc_result) ) { ! $subcats .= ' - <a class="gensmall" href="' . mx_append_sid(this_rc_mxurl('radiocast_mode=radiocast_cat&cat_id='. $subcatrow['cat_id'])) . '">' . $subcatrow['cat_title'] . '</a><br />'; } $subcats .= '</span><br />'; $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_index&c=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], *************** *** 423,427 **** { $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], --- 422,426 ---- { $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_cat&cat_id=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], *************** *** 591,595 **** $template->assign_block_vars('top_stations.top_row', array( ! 'U_SONG' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $topsongrow[$j]['station_id'])), 'DESC' => $topsongrow[$j]['station_desc'] ) --- 590,594 ---- $template->assign_block_vars('top_stations.top_row', array( ! 'U_SONG' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $topsongrow[$j]['station_id'])), 'DESC' => $topsongrow[$j]['station_desc'] ) *************** *** 602,610 **** else { ! $top_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } $template->assign_block_vars('top_stations.top_detail', array( ! 'TITLE' => '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['station_title'] . '</a>', 'SINGER' => $topsongrow[$j]['station_singer'], --- 601,609 ---- else { ! $top_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } $template->assign_block_vars('top_stations.top_detail', array( ! 'TITLE' => '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['station_title'] . '</a>', 'SINGER' => $topsongrow[$j]['station_singer'], *************** *** 612,624 **** 'POSTER' => $top_poster, ! 'TIME' => create_date($board_config['default_dateformat'], $topsongrow[$j]['station_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['station_view_count'], ! 'RATING' => ($radiocast_config['rate'] == 1) ? ( '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_rate&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! 'COMMENTS' => ($radiocast_config['comment'] == 1) ? ( '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['comments'] . '</a>' ) : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($topsongrow[$j]['station_user_ip']) . '" target="_blank">' . decode_ip($topsongrow[$j]['station_user_ip']) .'</a><br />' : '' ) ); --- 611,623 ---- 'POSTER' => $top_poster, ! 'TIME' => radiocast_create_date($board_config['default_dateformat'], $topsongrow[$j]['station_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['station_view_count'], ! 'RATING' => ($radiocast_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_rate&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! 'COMMENTS' => ($radiocast_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['comments'] . '</a>' ) : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . radiocast_decode_ip($topsongrow[$j]['station_user_ip']) . '" target="_blank">' . radiocast_decode_ip($topsongrow[$j]['station_user_ip']) .'</a><br />' : '' ) ); *************** *** 707,711 **** $template->assign_block_vars('top_stations.top_row', array( ! 'U_SONG' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $topsongrow[$j]['station_id'])), 'DESC' => $topsongrow[$j]['station_desc'] ) --- 706,710 ---- $template->assign_block_vars('top_stations.top_row', array( ! 'U_SONG' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $topsongrow[$j]['station_id'])), 'DESC' => $topsongrow[$j]['station_desc'] ) *************** *** 718,726 **** else { ! $top_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } $template->assign_block_vars('top_stations.top_detail', array( ! 'TITLE' => '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['station_title'] . '</a>', 'SINGER' => $topsongrow[$j]['station_singer'], --- 717,725 ---- else { ! $top_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } $template->assign_block_vars('top_stations.top_detail', array( ! 'TITLE' => '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_player&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['station_title'] . '</a>', 'SINGER' => $topsongrow[$j]['station_singer'], *************** *** 728,740 **** 'POSTER' => $top_poster, ! 'TIME' => create_date($board_config['default_dateformat'], $topsongrow[$j]['station_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['station_view_count'], ! 'RATING' => ($radiocast_config['rate'] == 1) ? ( '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_rate&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! 'COMMENTS' => ($radiocast_config['comment'] == 1) ? ( '<a href="'. append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['comments'] . '</a>' ) : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($topsongrow[$j]['station_user_ip']) . '" target="_blank">' . decode_ip($topsongrow[$j]['station_user_ip']) .'</a><br />' : '' ) ); --- 727,739 ---- 'POSTER' => $top_poster, ! 'TIME' => radiocast_create_date($board_config['default_dateformat'], $topsongrow[$j]['station_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['station_view_count'], ! 'RATING' => ($radiocast_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_rate&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! 'COMMENTS' => ($radiocast_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_comment&station_id=". $topsongrow[$j]['station_id'])) . '">' . $topsongrow[$j]['comments'] . '</a>' ) : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . radiocast_decode_ip($topsongrow[$j]['station_user_ip']) . '" target="_blank">' . radiocast_decode_ip($topsongrow[$j]['station_user_ip']) .'</a><br />' : '' ) ); *************** *** 822,826 **** 'L_LAST_STATION' => $lang['Last_Station'], ! 'S_RADIOCAST_ACTION' => append_sid(this_rc_mxurl()), 'S_ROWS' => $radiocast_config['rows_per_page'], --- 821,825 ---- 'L_LAST_STATION' => $lang['Last_Station'], ! 'S_RADIOCAST_ACTION' => mx_append_sid(this_rc_mxurl()), 'S_ROWS' => $radiocast_config['rows_per_page'], *************** *** 838,842 **** 'L_PUBLIC_CATS' => $lang['Public_Categories'], 'L_SEARCH_STATIONS' => $lang['Search_station'], ! 'S_RADIOCAST_LIST' => append_sid(this_rc_mxurl("radiocast_mode=radiocast_list")), 'L_TIME' => $lang['Time'], --- 837,841 ---- 'L_PUBLIC_CATS' => $lang['Public_Categories'], 'L_SEARCH_STATIONS' => $lang['Search_station'], ! 'S_RADIOCAST_LIST' => mx_append_sid(this_rc_mxurl("radiocast_mode=radiocast_list")), 'L_TIME' => $lang['Time'], Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/db_install.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** db_install.php 21 Mar 2008 08:50:18 -0000 1.4 --- db_install.php 22 Jan 2009 08:29:51 -0000 1.5 *************** *** 33,38 **** } ! $mx_module_version = '1.0.2'; ! $mx_module_copy = 'mxBB <i> - Radio Cast</i> module by <a href="http://www.mxbb.net/" target="_blank">OryNider</a>'; // If fresh install --- 33,38 ---- } ! $mx_module_version = '2.9.0'; ! $mx_module_copy = 'mxBB <i> - Radio Cast</i> module by <a href="http://caleacrestina.com/" target="_blank">OryNider (FlorinCB)</a>'; // If fresh install Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/db_upgrade.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** db_upgrade.php 21 Mar 2008 08:50:20 -0000 1.3 --- db_upgrade.php 22 Jan 2009 08:29:51 -0000 1.4 *************** *** 30,35 **** } ! $mx_module_version = '1.0.2'; ! $mx_module_copy = 'mxBB <i> - Radio Cast</i> module by <a href="http://www.mxbb.net/" target="_blank">OryNider</a>'; $sql = array(); --- 30,35 ---- } ! $mx_module_version = '2.9.0'; ! $mx_module_copy = 'mxBB <i> - Radio Cast</i> module by <a href="http://caleacrestina.com/" target="_blank">OryNider (FlorinCB)</a>'; $sql = array(); |