Menu
▾
▴
[mxbb-commits] mx_music/includes music_cat.php, 1.13, 1.14 music_delete.php, 1.2, 1.3 music_download.php, 1.5, 1.6 music_media_cat.php, 1.7, 1.8 music_modcp.php, 1.2, 1.3 music_page.php, 1.11, 1.12 music_pic_cat.php, 1.6, 1.7 music_rate.php, 1.2, 1.3 music_rss.php, 1.5, 1.6 music_song.php, 1.6, 1.7 music_upload.php, 1.7, 1.8
|
From: OryNider <ory...@us...> - 2008-01-10 00:41:28
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25473 Modified Files: music_cat.php music_delete.php music_download.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_upload.php Log Message: Index: music_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_delete.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_delete.php 1 Aug 2007 23:33:27 -0000 1.2 --- music_delete.php 10 Jan 2008 00:41:16 -0000 1.3 *************** *** 15,50 **** } - // - // 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/'; - // - // Get general music information - // - if ( !$is_block ) - { - include($music_root_path . 'music_common.'.$phpEx); - } - else - { - include_once($music_root_path . 'music_common.'.$phpEx); - } // ------------------------------------ --- 15,20 ---- Index: music_pic_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_pic_cat.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** music_pic_cat.php 2 Oct 2007 05:13:45 -0000 1.6 --- music_pic_cat.php 10 Jan 2008 00:41:17 -0000 1.7 *************** *** 662,667 **** $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! //$img_id = !empty($thissong['song_imagename']) ? $img_id : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; ! $img_id = 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; --- 662,666 ---- $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'; $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** music_cat.php 2 Oct 2007 05:13:45 -0000 1.13 --- music_cat.php 10 Jan 2008 00:41:16 -0000 1.14 *************** *** 668,673 **** $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! //$img_id = !empty($thissong['song_imagename']) ? $img_id : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; ! $img_id = 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; --- 668,672 ---- $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'; $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; Index: music_modcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_modcp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_modcp.php 1 Aug 2007 23:33:28 -0000 1.2 --- music_modcp.php 10 Jan 2008 00:41:16 -0000 1.3 *************** *** 15,50 **** } - // - // 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/'; - // - // 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_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_rss.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** music_rss.php 21 Sep 2007 22:21:56 -0000 1.5 --- music_rss.php 10 Jan 2008 00:41:17 -0000 1.6 *************** *** 404,422 **** { $videoid['song_url'] = explode("=", $thissong['song_url']); if (empty($videoid['song_url'][1]) ) ! { $row_type = 'flashvideo'; } else { ! $url_video = 'http://' . $domain . '/v/' . $videoid['song_url'][1]; ! //$url_download = append_sid($thissong['song_url']); $row_type = 'youtube'; } $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') ) --- 404,434 ---- { $videoid['song_url'] = explode("=", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + $videoid['song_url'] = explode("/v/", $thissong['song_url']); + } if (empty($videoid['song_url'][1]) ) ! { ! $template->assign_block_vars('songrow.flashvideo', array()); $row_type = 'flashvideo'; } else { ! $template->assign_block_vars('songrow.youtube', array()); $row_type = 'youtube'; } + + if ($sitename == 'www.youtube') + { + $domain = 'youtube.' . $sitesufix; + } $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'; $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); + //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; } else if ( ($sitename == 'www.clipfish') || ($sitename == 'clipfish') ) *************** *** 504,510 **** } ! $title = make_xml_compatible($thissong['song_title']); $url_cat = append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_cat&" . "cat_id=" . $thissong['song_cat_id'])); ! $url_page = append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_page&" . "song_id=" . $thissong['song_id'])); $url_song = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_song&" . "song_id=" . $thissong['song_id'], true)); $url_flv = !empty($thissong['song_url']) ? $thissong['song_url'] : PORTAL_URL . MUSIC_UPLOAD_PATH . $thissong['song_filename']; --- 516,522 ---- } ! $title = make_xml_compatible($thissong['song_title']); $url_cat = append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_cat&" . "cat_id=" . $thissong['song_cat_id'])); ! $url_page = append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_page&" . "song_id=" . $thissong['song_id'])); $url_song = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_song&" . "song_id=" . $thissong['song_id'], true)); $url_flv = !empty($thissong['song_url']) ? $thissong['song_url'] : PORTAL_URL . MUSIC_UPLOAD_PATH . $thissong['song_filename']; *************** *** 533,537 **** case 'youtube': ! $html_code = '<embed src="' . $url_video . '" id="VideoPlayback" wmode="transparent" width="425" height="350" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />'; $enclosure = 'url="' . $url_song . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; break; --- 545,549 ---- case 'youtube': ! $html_code = '<embed src="' . $url_video . '" id="VideoPlayback" wmode="transparent" width="425" height="350" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />' . '<a href="' . $url_page . '">' . '<br />' . '<img src="' . $img_id . '" border="1" vspace="2" hspace="2" align="left" width="425" height="350" />' . '</a>'; $enclosure = 'url="' . $url_song . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; break; Index: music_media_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_media_cat.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** music_media_cat.php 2 Oct 2007 05:13:45 -0000 1.7 --- music_media_cat.php 10 Jan 2008 00:41:16 -0000 1.8 *************** *** 955,960 **** $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! //$img_id = !empty($thissong['song_imagename']) ? $img_id : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; ! $img_id = 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; --- 955,959 ---- $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'; $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; Index: music_page.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_page.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** music_page.php 2 Oct 2007 05:13:45 -0000 1.11 --- music_page.php 10 Jan 2008 00:41:16 -0000 1.12 *************** *** 137,141 **** else { ! $img_id = PORTAL_URL . $song_image_path . $thissong['song_imagename']; } --- 137,141 ---- else { ! $img_id = $song_image_path . $thissong['song_imagename']; } *************** *** 429,434 **** $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! //$img_id = !empty($thissong['song_imagename']) ? $img_id : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; ! $img_id = 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; $url_video = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download; //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; --- 429,433 ---- $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'; $url_video = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download; //$url_player = !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player2.swf?video_id=' . $videoid['song_url'][1] : $url_download; Index: music_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_rate.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_rate.php 1 Aug 2007 23:33:28 -0000 1.2 --- music_rate.php 10 Jan 2008 00:41:17 -0000 1.3 *************** *** 15,50 **** } - // - // 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/'; - // - // 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 ---- |
