Menu
▾
▴
[mxbb-commits] mx_music/includes music_cat.php, 1.2, 1.3 music_edit.php, 1.2, 1.3 music_page.php, 1.2, 1.3 music_upload.php, 1.2, 1.3
|
From: OryNider <ory...@us...> - 2007-08-25 00:15:23
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22425 Modified Files: music_cat.php music_edit.php music_page.php music_upload.php Log Message: Added a more advanced category page that can be enabled manualy for now, and require mx_xs Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_upload.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_upload.php 1 Aug 2007 23:33:28 -0000 1.2 --- music_upload.php 25 Aug 2007 00:15:14 -0000 1.3 *************** *** 15,53 **** } - // - // Let's include some stuff... - // - $phpEx = substr(strrchr(__FILE__, '.'), 1); - - if ( !defined('TEMPLATE_ROOT_PATH') ) - { - include_once($mx_root_path . 'common.' . $phpEx); - - // - // Start session management - // - $mx_user->init($user_ip, PAGE_INDEX); - // - // End session management - // - } - - $music_root_path = $module_root_path . 'music_box/'; $song_image_path = $module_root_path . 'upload/song_image/'; - // - // Get general music information - // - if ( !$is_block ) - { - include($music_root_path . 'music_common.'.$phpEx); - } - else - { - include_once($music_root_path . 'music_common.'.$phpEx); - } - - /* +---------------------------------------------------------- --- 15,21 ---- Index: music_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_edit.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_edit.php 1 Aug 2007 23:33:28 -0000 1.2 --- music_edit.php 25 Aug 2007 00:15:14 -0000 1.3 *************** *** 15,53 **** } - // - // Let's include some stuff... - // - $phpEx = substr(strrchr(__FILE__, '.'), 1); - - if ( !defined('TEMPLATE_ROOT_PATH') ) - { - include_once($mx_root_path . 'common.' . $phpEx); - - // - // Start session management - // - $mx_user->init($user_ip, PAGE_INDEX); - // - // End session management - // - } - - $music_root_path = $module_root_path . 'music_box/'; //Image Edit Added by OryNider $song_image_path = $module_root_path . 'upload/song_image/'; - // - // Get general music information - // - if ( !$is_block ) - { - include($music_root_path . 'music_common.'.$phpEx); - } - else - { - include_once($music_root_path . 'music_common.'.$phpEx); - } - // ------------------------------------ // Check the request --- 15,22 ---- Index: music_page.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_page.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_page.php 1 Aug 2007 23:33:28 -0000 1.2 --- music_page.php 25 Aug 2007 00:15:14 -0000 1.3 *************** *** 31,70 **** } - // - // Let's include some stuff... - // - $phpEx = substr(strrchr(__FILE__, '.'), 1); - - - if ( !defined('TEMPLATE_ROOT_PATH') ) - { - include_once($mx_root_path . 'common.' . $phpEx); - - // - // Start session management - // - $mx_user->init($user_ip, PAGE_INDEX); - // - // End session management - // - } - $music_root_path = $module_root_path . 'music_box/'; $song_image_path = $module_root_path . 'upload/song_image/'; $song_image_default = $mx_images['no_image']; // The default image - - // - // Get general music information - // - if ( !$is_block ) - { - include($music_root_path . 'music_common.'.$phpEx); - } - else - { - include_once($music_root_path . 'music_common.'.$phpEx); - } - // ------------------------------------ // Check the request --- 31,38 ---- *************** *** 323,327 **** { $template->assign_block_vars('media', array()); ! $url_download = append_sid($module_root_path . 'music.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; --- 291,295 ---- { $template->assign_block_vars('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; *************** *** 515,524 **** { $template->assign_block_vars('media', array()); ! //$url_download = append_sid($module_root_path . 'music.' . $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; } ! //$url_song = append_sid($module_root_path . 'music.' . $phpEx . '?music_mode=music_song&song_id=' . $song_id); $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id)); --- 483,492 ---- { $template->assign_block_vars('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; } ! //$url_song = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_song&song_id=' . $song_id); $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id)); *************** *** 527,531 **** 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), ! //'U_SONG' => append_sid($module_root_path . 'music.' . $phpEx . '?music_mode=music_song&song_id=' . $song_id), 'U_SONG' => $url_song, --- 495,499 ---- 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), ! //'U_SONG' => append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_song&song_id=' . $song_id), 'U_SONG' => $url_song, Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_cat.php 1 Aug 2007 23:33:27 -0000 1.2 --- music_cat.php 25 Aug 2007 00:15:14 -0000 1.3 *************** *** 15,36 **** } - // - // Let's include some stuff... - // - $phpEx = substr(strrchr(__FILE__, '.'), 1); - - if ( !defined('TEMPLATE_ROOT_PATH') ) - { - include_once($mx_root_path . 'common.' . $phpEx); - - // - // Start session management - // - $mx_user->init($user_ip, PAGE_INDEX); - // - // End session management - // - } - $music_root_path = $module_root_path . 'music_box/'; --- 15,18 ---- *************** *** 421,428 **** --- 403,689 ---- } + // ------------------------------------ + // Get this song info + // ------------------------------------ + + $song_id = $songrow[$j]['song_id']; + + $sql = "SELECT s.*, u.user_id, u.username, r.rate_song_id, AVG(r.rate_point) AS rating, COUNT(DISTINCT c.comment_id) AS comments + FROM ". MUSIC_TABLE ." AS s + LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id + LEFT JOIN ". MUSIC_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id + LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id + WHERE song_id = '$song_id' + GROUP BY s.song_id"; + if( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, 'Could not query song information', '', __LINE__, __FILE__, $sql); + } + $thissong = $db->sql_fetchrow($result); + + $cat_id = $thissong['song_cat_id']; + $user_id = $thissong['song_user_id']; + + if ( $thissong['song_url'] == '' ) + { + $song_filetype = substr($thissong['song_filename'], strlen($thissong['song_filename']) - 3, 3); + $song_filename = ( !empty($thissong['song_filename']) ? $thissong['song_filename'] : '' ); + } + else + { + $song_filetype = substr($thissong['song_url'], strlen($thissong['song_url']) - 3, 3); + $song_url = $thissong['song_url']; + } + + // + // Media Center + // + if ( $song_filetype == 'swf' ) + { + $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; + } + else if ( $song_filetype == 'ram' ) + { + $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; + } + else if ( $song_filetype == '.rm' ) + { + $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; + } + else if ( $song_filetype == '.qt' ) + { + $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; + } + else if( ($song_filetype == 'pls') && !empty($thissong['song_url']) ) + { + $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; + } + else if(!empty($thissong['song_url'])) + { + $host = explode("//", $thissong['song_url']); + $host = $host[1]; + $host = explode("/", $host); + $domain = $host[0]; + $counthost = count($host) - 1; + $docid2 = $host[$counthost]; + + // $domaintmp = explode(".", $domain, -1); // Php 5 only + // $sitename = implode(".", $domaintmp); + + if( !function_exists('mx_music_sitename') ) + { + function mx_music_sitename($domain) { + $domaintmp = explode(".", $domain); + + $y = count($domaintmp) - 1; + $r = ""; + for ($a = 0; $y > $a; $a++) { + $r .= ".".$domaintmp[$a]; + } + return $r; + } + } + + $sitename = substr(mx_music_sitename($domain), 1); + + if( !function_exists('mx_music_sitesufix') ) + { + function mx_music_sitesufix($domain) { + $domaintmp = explode(".", $domain); + + $y = count($domaintmp) - 1; + $r = $domaintmp[$y];; + return $r; + } + } + + $sitesufix = mx_music_sitesufix($domain); + + if (!empty($sitesufix) ) + { + if ($sitesufix == 'de') + { + $sitelngprefix = 'de.'; + } + else + { + $sitelngprefix = 'en.'; + } + } + else + { + $sitelngprefix = ''; + } + + if ($sitename == 'video.google') + { + $videoid['song_url'] = explode("-", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + $docid['song_url'] = explode("?", $thissong['song_url']); + + if (empty($docid['song_url'][1]) ) + { + $template->assign_block_vars('songrow.flashvideo', array()); + $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); + $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' ); + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); + $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' ); + } + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?docId=-' . $videoid['song_url'][1] : $thissong['song_url'] ); + $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' ); + } + } + else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') ) + { + $videoid['song_url'] = explode("=", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + $template->assign_block_vars('songrow.flashvideo', array()); + } + else + { + $template->assign_block_vars('songrow.youtube', array( + 'VIDEO_URL' => 'http://' . $domain . '/v/' . $videoid['song_url'][1], + 'SONG_URL' => $thissong['song_url'] + )); + } + + $url_download = append_sid($thissong['song_url']); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); + } + else if ( ($sitename == 'www.clipfish') || ($sitename == 'clipfish') ) + { + $thisvid['song_url'] = explode("videoid", $thissong['song_url']); + $videoid['song_url'] = explode("=", $thisvid['song_url'][1]); + + if (empty($videoid['song_url'][1]) ) + { + $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; + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + + $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player.php?videoid=' . $videoid['song_url'][1] : $thissong['song_url'] ); + $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 ); + } + + } + else if ( ($sitename == 'www.myvideo') || ($sitename == 'myvideo') ) + { + if (empty($docid2) ) + { + $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; + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + + $url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $thissong['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); + } + } + else if ( ($sitename == 'de.sevenload') || ($sitename == 'sevenload') || ($sitename == 'page.sevenload') || ($sitename == 'www.sevenload') ) + { + $videoid['song_url'] = explode("=", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + if (empty($docid2) ) + { + $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; + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + + $url_download = ( !empty($docid2) ? 'http://' . $sitelngprefix . 'sevenload.' . 'com' . '/videos/' . $docid2 : $thissong['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); + } + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + + $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $sitelngprefix . 'sevenload.'. 'com' . '/videos/' . $videoid['song_url'][1] : $thissong['song_url'] ); + $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 ); + } + + } + else + { + $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; + } + } + else + { + $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; + } + + $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id)); + $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, + + 'SONG_TITLE' => $thissong['song_title'], + + 'SONG_URL' => $thissong['song_url'], + + 'VIDEO_URL' => $url_video, + 'SINGER' => $songrow[$j]['song_singer'], + 'POSTER' => $song_poster, + 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), |
