Menu
▾
▴
[mxbb-commits] mx_music/includes music_cat.php,1.3,1.4
|
From: OryNider <ory...@us...> - 2007-08-27 15:11:05
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16004/includes Modified Files: music_cat.php Log Message: This will add a switch for mx_xs :P Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_cat.php 25 Aug 2007 00:15:14 -0000 1.3 --- music_cat.php 25 Aug 2007 03:30:27 -0000 1.4 *************** *** 9,13 **** */ ! // MX if ( !defined('IN_PORTAL') ) { --- 9,13 ---- */ ! //mxBB if ( !defined('IN_PORTAL') ) { *************** *** 17,25 **** $music_root_path = $module_root_path . 'music_box/'; - // - // Get general music information - // - include_once($music_root_path . 'music_common.'.$phpEx); - // ------------------------------------ // Check the request --- 17,20 ---- *************** *** 82,86 **** // - // ------------------------------------ // Check permissions --- 77,80 ---- *************** *** 97,100 **** --- 91,95 ---- } } + if ( $auth_data['upload'] ) { *************** *** 106,110 **** // - // ------------------------------------ // Build Auth List --- 101,104 ---- *************** *** 132,136 **** $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } - // // END Auth List --- 126,129 ---- *************** *** 183,187 **** // - // ------------------------------------ // Build the thumbnail page --- 176,179 ---- *************** *** 350,354 **** } - for ($i = 0; $i < count($songrow); $i += $music_config['cols_per_page']) { --- 342,345 ---- *************** *** 444,447 **** --- 435,439 ---- $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; + $row_type = 'flash'; } else if ( $song_filetype == 'ram' ) *************** *** 450,453 **** --- 442,446 ---- $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; + $row_type = 'ram'; } else if ( $song_filetype == '.rm' ) *************** *** 456,459 **** --- 449,453 ---- $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; + $row_type = 'rm'; } else if ( $song_filetype == '.qt' ) *************** *** 462,465 **** --- 456,460 ---- $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; + $row_type = 'qt'; } else if( ($song_filetype == 'pls') && !empty($thissong['song_url']) ) *************** *** 469,472 **** --- 464,468 ---- $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; + $row_type = 'media'; } else if(!empty($thissong['song_url'])) *************** *** 541,544 **** --- 537,541 ---- $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $row_type = 'flashvideo'; } else *************** *** 548,551 **** --- 545,549 ---- $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Watch'] : 'Watch URL' ); + $row_type = 'youtube'; } } *************** *** 556,559 **** --- 554,558 ---- $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); + $row_type = 'youtube'; } } *************** *** 565,568 **** --- 564,568 ---- { $template->assign_block_vars('songrow.flashvideo', array()); + $row_type = 'flashvideo'; } else *************** *** 572,575 **** --- 572,576 ---- 'SONG_URL' => $thissong['song_url'] )); + $row_type = 'youtube'; } *************** *** 590,593 **** --- 591,595 ---- $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; + $row_type = 'flashvideo'; } else *************** *** 598,601 **** --- 600,604 ---- $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplayer.swf?as=0&videoid=' . $videoid['song_url'][1] : $url_download ); + $row_type = 'youtube'; } *************** *** 610,613 **** --- 613,617 ---- $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; + $row_type = 'flashvideo'; } else *************** *** 618,621 **** --- 622,626 ---- $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); + $row_type = 'youtube'; } } *************** *** 633,636 **** --- 638,642 ---- $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; + $row_type = 'flashvideo'; } else *************** *** 641,644 **** --- 647,651 ---- $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); + $row_type = 'youtube'; } } *************** *** 650,653 **** --- 657,661 ---- $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download ); + $row_type = 'youtube'; } *************** *** 659,662 **** --- 667,671 ---- $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; + $row_type = 'media'; } } *************** *** 667,670 **** --- 676,680 ---- $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; + $row_type = 'media'; } *************** *** 686,689 **** --- 696,703 ---- 'POSTER' => $song_poster, + 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), + + 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), + 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), *************** *** 702,707 **** '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 />' : '' ! ) ); } --- 716,722 ---- '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) ); } *************** *** 722,726 **** // - // ------------------------------------ // Build Jumpbox - based on $catrows which was created at the top of this file --- 737,740 ---- *************** *** 742,746 **** // - // ------------------------------------ // additional sorting options --- 756,759 ---- *************** *** 766,771 **** } - - // // Start output of page --- 779,782 ---- *************** *** 777,783 **** } ! $template->set_filenames(array( ! 'body' => 'music_cat_body.tpl') ! ); $template->assign_vars(array( --- 788,803 ---- } ! if(empty($template->xs_version)) ! { ! $template->set_filenames(array( ! 'body' => 'music_cat_body.tpl') ! ); ! } ! else ! { ! $template->set_filenames(array( ! 'body' => 'music_cat_xs.tpl') ! ); ! } $template->assign_vars(array( *************** *** 805,809 **** 'L_COMMENTS' => $lang['Comments'], - 'MUSIC_JUMPBOX' => $music_jumpbox, --- 825,828 ---- *************** *** 845,852 **** 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), 'S_AUTH_LIST' => $auth_list) ); - // // Generate the page --- 864,873 ---- 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), + 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), + 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), + 'S_AUTH_LIST' => $auth_list) ); // // Generate the page *************** *** 859,866 **** } - // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | // +------------------------------------------------------+ ?> \ No newline at end of file --- 880,889 ---- } // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | // +------------------------------------------------------+ + // + // That's all Folks! + // -------------------- ?> \ No newline at end of file |
