Menu
▾
▴
[mxbb-commits] mx_music/music_box/modules music_cat.php, 1.1.2.1, 1.1.2.2 music_comment.php, 1.1.2.1, 1.1.2.2 music_comment_delete.php, 1.1.2.1, 1.1.2.2 music_comment_edit.php, 1.1.2.1, 1.1.2.2 music_delete.php, 1.1.2.1, 1.1.2.2 music_download.php, 1.1.2.1, 1.1.2.2 music_edit.php, 1.1.2.1, 1.1.2.2 music_list.php, 1.1.2.1, 1.1.2.2 music_media_cat.php, 1.1.2.1, 1.1.2.2 music_modcp.php, 1.1.2.1, 1.1.2.2 music_page.php, 1.1.2.1, 1.1.2.2 music_pic_cat.php, 1.1.2.1, 1.1.2.2 music_rate.php, 1.1.2.1, 1.1.2.2 music_rss.php, 1.1.2.1, 1.1.2.2 music_song.php, 1.1.2.1, 1.1.2.2 music_stream.php, 1.1.2.1, 1.1.2.2 music_upload.php, 1.1.2.1, 1.1.2.2
Update of /cvsroot/mxbb/mx_music/music_box/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5442/modules Modified Files: Tag: core28x music_cat.php music_comment.php music_comment_delete.php music_comment_edit.php music_delete.php music_download.php music_edit.php music_list.php music_media_cat.php music_modcp.php music_page.php music_pic_cat.php music_rate.php music_rss.php music_song.php music_stream.php music_upload.php Log Message: ready for 2.8.1 release. Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_upload.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_upload.php 16 Jan 2008 19:53:16 -0000 1.1.2.1 --- music_upload.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 79,83 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_upload&cat_id=$cat_id"), true)); } else --- 79,83 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_upload&cat_id=$cat_id"), true)); } else *************** *** 211,215 **** $template->assign_vars(array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], --- 211,215 ---- $template->assign_vars(array( ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], *************** *** 269,279 **** 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), ) ); --- 269,279 ---- 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()), ! 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), ) ); *************** *** 671,675 **** @unlink($song_image_path . $song_imagename); ! message_die(GENERAL_ERROR, 'Your uploaded image size is too big'); } } --- 671,675 ---- @unlink($song_image_path . $song_imagename); ! mx_message_die(GENERAL_ERROR, 'Your uploaded image size is too big'); } } *************** *** 711,721 **** { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . '">') ); } //$message .= $sql; ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . "\">", "</a>"); ! $message .= "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 711,721 ---- { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . '">') ); } //$message .= $sql; ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . "\">", "</a>"); ! $message .= "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . mx_append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: music_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_delete.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_delete.php 16 Jan 2008 19:53:12 -0000 1.1.2.1 --- music_delete.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 90,94 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_delete&song_id=$song_id"), true)); } else --- 90,94 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_delete&song_id=$song_id"), true)); } else *************** *** 123,127 **** if( isset($HTTP_POST_VARS['cancel']) ) { ! mx_redirect(append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id"))); exit; } --- 123,127 ---- if( isset($HTTP_POST_VARS['cancel']) ) { ! mx_redirect(mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id"))); exit; } *************** *** 148,152 **** 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => append_sid(this_mo_mxurl("music_mode=music_delete&song_id=$song_id")), ) ); --- 148,152 ---- 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_delete&song_id=$song_id")), ) ); *************** *** 210,219 **** $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . "\">", "</a>"); ! $message .= "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 210,219 ---- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . "\">", "</a>"); ! $message .= "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . mx_append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: music_comment_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_comment_edit.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_comment_edit.php 16 Jan 2008 19:53:12 -0000 1.1.2.1 --- music_comment_edit.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 142,146 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_comment_edit&comment_id=$comment_id"), true)); } else --- 142,146 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_comment_edit&comment_id=$comment_id"), true)); } else *************** *** 180,184 **** else { ! $poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thissong['user_id']) .'">'. $thissong['username'] .'</a>'; } --- 180,184 ---- else { ! $poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thissong['user_id']) .'">'. $thissong['username'] .'</a>'; } *************** *** 200,210 **** $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), ! 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_song&song_id=$song_id")), 'SONG_TITLE' => $thissong['song_title'], 'POSTER' => $poster, ! 'SONG_TIME' => create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], 'SONG_COMMENTS' => $total_comments, --- 200,210 ---- $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), ! 'U_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=$song_id")), 'SONG_TITLE' => $thissong['song_title'], 'POSTER' => $poster, ! 'SONG_TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], 'SONG_COMMENTS' => $total_comments, *************** *** 227,231 **** 'L_SUBMIT' => $lang['Submit'], ! 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl("music_mode=music_comment_edit&comment_id=$comment_id")) ) ); --- 227,231 ---- 'L_SUBMIT' => $lang['Submit'], ! 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_comment_edit&comment_id=$comment_id")) ) ); *************** *** 282,289 **** $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . '#'.$comment_id.'">') ); ! $message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 282,289 ---- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . '#'.$comment_id.'">') ); ! $message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . mx_append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . mx_append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: music_pic_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_pic_cat.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_pic_cat.php 16 Jan 2008 19:53:15 -0000 1.1.2.1 --- music_pic_cat.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 85,89 **** $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], 'CAT_PARENT' => $thiscat_parent['cat_id']) --- 85,89 ---- $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => mx_append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], 'CAT_PARENT' => $thiscat_parent['cat_id']) *************** *** 102,106 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_pic_cat&cat_id=$cat_id"), true)); } else --- 102,106 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_pic_cat&cat_id=$cat_id"), true)); } else *************** *** 142,146 **** if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // --- 142,146 ---- if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // *************** *** 179,183 **** 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; --- 179,183 ---- 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; *************** *** 394,398 **** $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link .= '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; --- 394,398 ---- $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link .= '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; *************** *** 403,407 **** $template->assign_block_vars('songrow.songcol', array( ! 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, --- 403,407 ---- $template->assign_block_vars('songrow.songcol', array( ! 'U_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, *************** *** 415,419 **** else { ! $song_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } --- 415,419 ---- else { ! $song_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } *************** *** 482,486 **** { $template->assign_block_vars('songrow.flash', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; --- 482,486 ---- { $template->assign_block_vars('songrow.flash', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; *************** *** 489,493 **** { $template->assign_block_vars('songrow.ram', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; --- 489,493 ---- { $template->assign_block_vars('songrow.ram', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; *************** *** 496,500 **** { $template->assign_block_vars('songrow.rm', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; --- 496,500 ---- { $template->assign_block_vars('songrow.rm', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; *************** *** 503,507 **** { $template->assign_block_vars('songrow.qt', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; --- 503,507 ---- { $template->assign_block_vars('songrow.qt', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; *************** *** 518,522 **** $template->assign_block_vars('songrow.flv', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $music_root_path . 'music_player.swf'; $row_type = 'flv'; --- 518,522 ---- $template->assign_block_vars('songrow.flv', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $music_root_path . 'music_player.swf'; $row_type = 'flv'; *************** *** 524,528 **** else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; --- 524,528 ---- else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; *************** *** 536,540 **** { $template->assign_block_vars('songrow.media', array()); ! $url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; --- 536,540 ---- { $template->assign_block_vars('songrow.media', array()); ! $url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; *************** *** 660,664 **** } ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $img_id = !empty($thissong['song_imagename']) ? $thissong['song_imagename'] : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; --- 660,664 ---- } ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $img_id = !empty($thissong['song_imagename']) ? $thissong['song_imagename'] : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; *************** *** 675,679 **** $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 675,679 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 697,701 **** $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 697,701 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 722,726 **** $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 722,726 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 751,755 **** { $template->assign_block_vars('songrow.media', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 751,755 ---- { $template->assign_block_vars('songrow.media', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 760,765 **** { $template->assign_block_vars('songrow.media', array()); ! //$url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; $row_type = 'media'; --- 760,765 ---- { $template->assign_block_vars('songrow.media', array()); ! //$url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; $row_type = 'media'; *************** *** 782,790 **** else { ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } $template->assign_block_vars('songrow.song_detail', array( ! 'TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', 'U_SONG' => $url_song, --- 782,792 ---- else { ! $url_song = mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } + $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); + $template->assign_block_vars('songrow.song_detail', array( ! 'TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', 'U_SONG' => $url_song, *************** *** 794,804 **** 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, ! 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=114", true)), ! 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, ! 'U_IMG' => append_sid("$img_id"), 'SINGER' => $songrow[$j]['song_singer'], --- 796,806 ---- 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, ! 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=114", true)), ! 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, ! 'U_IMG' => mx_append_sid("$img_id"), 'SINGER' => $songrow[$j]['song_singer'], *************** *** 810,830 **** 'HEIGHT' => ( !empty($media_height) ? $media_height : '85' ), ! 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $songrow[$j]['song_id']) . '">' . $songrow[$j]['rating'] . '</a>')) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['comments'] . '</a>' ) : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_edit&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Edit_song'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_delete&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Delete_song'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=move&song_id=". $songrow[$j]['song_id'])) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', 'S_ROW_TYPE' => $row_type, --- 812,832 ---- 'HEIGHT' => ( !empty($media_height) ? $media_height : '85' ), ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $songrow[$j]['song_id']) . '">' . $songrow[$j]['rating'] . '</a>')) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['comments'] . '</a>' ) : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_edit&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Edit_song'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_delete&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Delete_song'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=move&song_id=". $songrow[$j]['song_id'])) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . $song_user_ip . '" target="_blank">' . $song_user_ip .'</a><br />' : '', 'S_ROW_TYPE' => $row_type, *************** *** 838,842 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_images, $songs_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $songs_per_page ) + 1 ), ceil( $total_images / $songs_per_page )) ) --- 840,844 ---- $template->assign_vars(array( ! 'PAGINATION' => mx_generate_pagination(mx_append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_images, $songs_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $songs_per_page ) + 1 ), ceil( $total_images / $songs_per_page )) ) *************** *** 854,858 **** // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $music_jumpbox = '<form name="jumpbox" action="'. append_sid(this_mo_mxurl("music_mode=music_pic_cat")) .'" method="get">'; $music_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) --- 856,860 ---- // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $music_jumpbox = '<form name="jumpbox" action="'. mx_append_sid(this_mo_mxurl("music_mode=music_pic_cat")) .'" method="get">'; $music_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) *************** *** 914,921 **** $template->assign_vars(array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT_VIRTUAL' => append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'CAT_TITLE_VIRTUAL' => $lang['Images'], --- 916,923 ---- $template->assign_vars(array( ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT_VIRTUAL' => mx_append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'CAT_TITLE_VIRTUAL' => $lang['Images'], *************** *** 923,927 **** 'MODERATORS' => $moderators_list, ! 'U_UPLOAD_SONG' => append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), 'UPLOAD_SONG_IMG' => $mx_images['upload_song'], 'L_UPLOAD_SONG' => $lang['Upload_Song'], --- 925,929 ---- 'MODERATORS' => $moderators_list, ! 'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), 'UPLOAD_SONG_IMG' => $mx_images['upload_song'], 'L_UPLOAD_SONG' => $lang['Upload_Song'], *************** *** 943,947 **** 'MUSIC_JUMPBOX' => $music_jumpbox, ! 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], --- 945,949 ---- 'MUSIC_JUMPBOX' => $music_jumpbox, ! 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], *************** *** 975,983 **** 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '114' ), --- 977,985 ---- 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '114' ), Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_cat.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_cat.php 16 Jan 2008 19:53:11 -0000 1.1.2.1 --- music_cat.php 31 Jan 2008 04:16:58 -0000 1.1.2.2 *************** *** 87,92 **** $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), ! 'U_NAV_CAT_PARENT' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>', 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], 'CAT_PARENT' => $thiscat_parent['cat_id']) --- 87,92 ---- $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => mx_append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), ! 'U_NAV_CAT_PARENT' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . mx_append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>', 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], 'CAT_PARENT' => $thiscat_parent['cat_id']) *************** *** 105,109 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_cat&cat_id=$cat_id"), true)); } else --- 105,109 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_cat&cat_id=$cat_id"), true)); } else *************** *** 145,149 **** if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // --- 145,149 ---- if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // *************** *** 182,186 **** 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; --- 182,186 ---- 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; *************** *** 391,395 **** $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link .= '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; --- 391,395 ---- $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link .= '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; *************** *** 400,404 **** $template->assign_block_vars('songrow.songcol', array( ! 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, --- 400,404 ---- $template->assign_block_vars('songrow.songcol', array( ! 'U_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, *************** *** 412,416 **** else { ! $song_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } --- 412,416 ---- else { ! $song_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } *************** *** 480,484 **** { $template->assign_block_vars('songrow.flash', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; --- 480,484 ---- { $template->assign_block_vars('songrow.flash', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; *************** *** 487,491 **** { $template->assign_block_vars('songrow.ram', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; --- 487,491 ---- { $template->assign_block_vars('songrow.ram', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; *************** *** 494,498 **** { $template->assign_block_vars('songrow.rm', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; --- 494,498 ---- { $template->assign_block_vars('songrow.rm', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; *************** *** 501,505 **** { $template->assign_block_vars('songrow.qt', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; --- 501,505 ---- { $template->assign_block_vars('songrow.qt', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; *************** *** 516,520 **** $template->assign_block_vars('songrow.flv', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $music_root_path . 'music_player.swf'; $row_type = 'flv'; --- 516,520 ---- $template->assign_block_vars('songrow.flv', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $music_root_path . 'music_player.swf'; $row_type = 'flv'; *************** *** 522,526 **** else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; --- 522,526 ---- else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; *************** *** 533,537 **** else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; --- 533,537 ---- else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; *************** *** 545,549 **** { $template->assign_block_vars('songrow.media', array()); ! $url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; --- 545,549 ---- { $template->assign_block_vars('songrow.media', array()); ! $url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; *************** *** 666,670 **** } ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $img_id = !empty($thissong['song_imagename']) ? $thissong['song_imagename'] : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; --- 666,670 ---- } ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $img_id = !empty($thissong['song_imagename']) ? $thissong['song_imagename'] : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; *************** *** 681,685 **** $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 681,685 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 703,707 **** $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 703,707 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 728,732 **** $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 728,732 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 757,761 **** { $template->assign_block_vars('songrow.media', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 757,761 ---- { $template->assign_block_vars('songrow.media', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 766,771 **** { $template->assign_block_vars('songrow.media', array()); ! //$url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; $row_type = 'media'; --- 766,771 ---- { $template->assign_block_vars('songrow.media', array()); ! //$url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; $row_type = 'media'; *************** *** 788,796 **** else { ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } $template->assign_block_vars('songrow.song_detail', array( ! 'TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', 'U_SONG' => $url_song, --- 788,798 ---- else { ! $url_song = mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } + $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); + $template->assign_block_vars('songrow.song_detail', array( ! 'TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', 'U_SONG' => $url_song, *************** *** 800,810 **** 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, ! 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=425", true)), ! 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, ! 'U_IMG' => append_sid("$img_id"), 'SINGER' => $songrow[$j]['song_singer'], --- 802,812 ---- 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, ! 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=425", true)), ! 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, ! 'U_IMG' => mx_append_sid("$img_id"), 'SINGER' => $songrow[$j]['song_singer'], *************** *** 816,836 **** 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $songrow[$j]['song_id']) . '">' . $songrow[$j]['rating'] . '</a>')) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['comments'] . '</a>' ) : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_edit&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Edit_song'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_delete&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Delete_song'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=move&song_id=". $songrow[$j]['song_id'])) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', 'S_ROW_TYPE' => $row_type, --- 818,838 ---- 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $songrow[$j]['song_id']) . '">' . $songrow[$j]['rating'] . '</a>')) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['comments'] . '</a>' ) : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_edit&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Edit_song'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_delete&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Delete_song'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=move&song_id=". $songrow[$j]['song_id'])) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . $song_user_ip . '" target="_blank">' . $song_user_ip .'</a><br />' : '', 'S_ROW_TYPE' => $row_type, *************** *** 842,846 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_songs, $songs_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $songs_per_page ) + 1 ), ceil( $total_songs / $songs_per_page )) ) --- 844,848 ---- $template->assign_vars(array( ! 'PAGINATION' => mx_generate_pagination(mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_songs, $songs_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $songs_per_page ) + 1 ), ceil( $total_songs / $songs_per_page )) ) *************** *** 858,862 **** // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $music_jumpbox = '<form name="jumpbox" action="'. append_sid(this_mo_mxurl("music_mode=music_cat")) .'" method="get">'; $music_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) --- 860,864 ---- // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $music_jumpbox = '<form name="jumpbox" action="'. mx_append_sid(this_mo_mxurl("music_mode=music_cat")) .'" method="get">'; $music_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) *************** *** 920,924 **** $template->assign_vars(array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], --- 922,926 ---- $template->assign_vars(array( ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], *************** *** 926,930 **** 'MODERATORS' => $moderators_list, ! 'U_UPLOAD_SONG' => append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), 'UPLOAD_SONG_IMG' => $mx_images['upload_song'], 'L_UPLOAD_SONG' => $lang['Upload_Song'], --- 928,932 ---- 'MODERATORS' => $moderators_list, ! 'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), 'UPLOAD_SONG_IMG' => $mx_images['upload_song'], 'L_UPLOAD_SONG' => $lang['Upload_Song'], *************** *** 945,949 **** 'MUSIC_JUMPBOX' => $music_jumpbox, ! 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], --- 947,951 ---- 'MUSIC_JUMPBOX' => $music_jumpbox, ! 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], *************** *** 977,985 **** 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), --- 979,987 ---- 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), *************** *** 996,1000 **** 'L_RSS' => ( !empty($lang['Rss_Feed']) ? $lang['Rss_Feed'] : 'RSS Feed' ), ! 'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss&cat_id=" . $cat_id . "&sid=" . $userdata['session_id'], true)), 'S_AUTH_LIST' => $auth_list) --- 998,1002 ---- 'L_RSS' => ( !empty($lang['Rss_Feed']) ? $lang['Rss_Feed'] : 'RSS Feed' ), ! 'U_RSS' => mx_append_sid(this_mo_mxurl("music_mode=music_rss&cat_id=" . $cat_id . "&sid=" . $userdata['session_id'], true)), 'S_AUTH_LIST' => $auth_list) Index: music_modcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_modcp.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_modcp.php 16 Jan 2008 19:53:14 -0000 1.1.2.1 --- music_modcp.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 156,160 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_modcp&cat_id=$cat_id"), true)); } else --- 156,160 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_modcp&cat_id=$cat_id"), true)); } else *************** *** 334,345 **** else { ! $song_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$i]['user_id']) .'">'. $songrow[$i]['username'] .'</a>'; } $template->assign_block_vars('songrow', array( 'SONG_ID' => $songrow[$i]['song_id'], ! 'SONG_TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_song&song_id=". $songrow[$i]['song_id'])) .'" target="_blank">'. $songrow[$i]['song_title'] .'</a>', 'POSTER' => $song_poster, ! 'TIME' => create_date($board_config['default_dateformat'], $songrow[$i]['song_time'], $board_config['board_timezone']), 'RATING' => ($songrow[$i]['rating'] == 0) ? $lang['Not_rated'] : round($songrow[$i]['rating'], 2), 'COMMENTS' => $songrow[$i]['comments'], --- 334,345 ---- else { ! $song_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$i]['user_id']) .'">'. $songrow[$i]['username'] .'</a>'; } $template->assign_block_vars('songrow', array( 'SONG_ID' => $songrow[$i]['song_id'], ! 'SONG_TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=". $songrow[$i]['song_id'])) .'" target="_blank">'. $songrow[$i]['song_title'] .'</a>', 'POSTER' => $song_poster, ... [truncated message content] |
