Menu
▾
▴
[mxbb-commits] mx_music/includes index.htm, 1.1, 1.2 music_cat.php, 1.9, 1.10 music_media_cat.php, 1.3, 1.4 music_rss.php, 1.3, 1.4
|
From: OryNider <ory...@us...> - 2007-09-13 11:26:06
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14648/includes Modified Files: music_cat.php music_media_cat.php music_rss.php Added Files: index.htm Log Message: this is not upgrade for 2.9.x, just to the latest version now... Index: music_media_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_media_cat.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_media_cat.php 10 Sep 2007 22:27:39 -0000 1.3 --- music_media_cat.php 13 Sep 2007 11:25:57 -0000 1.4 *************** *** 1237,1242 **** 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), 'FLASH' => 'flash', --- 1237,1242 ---- 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), 'FLASH' => 'flash', Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** music_cat.php 10 Sep 2007 22:27:39 -0000 1.9 --- music_cat.php 13 Sep 2007 11:25:57 -0000 1.10 *************** *** 972,977 **** 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), 'FLASH' => 'flash', --- 972,977 ---- 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), 'FLASH' => 'flash', *************** *** 984,987 **** --- 984,990 ---- 'MEDIA' => 'media', + '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) ); --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> Index: music_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_rss.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_rss.php 8 Sep 2007 13:28:29 -0000 1.3 --- music_rss.php 13 Sep 2007 11:25:58 -0000 1.4 *************** *** 115,127 **** $no_limit=( isset($HTTP_GET_VARS['nolimit']) ) ? true : false; ! $sql = "SELECT c.*, COUNT(s.song_id) AS count FROM ". MUSIC_CAT_TABLE ." AS c LEFT JOIN ". MUSIC_TABLE ." AS s ON c.cat_id = s.song_cat_id ! WHERE cat_id <> 0 GROUP BY cat_id ORDER BY cat_order ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! die("Could not query categories list"); } --- 115,147 ---- $no_limit=( isset($HTTP_GET_VARS['nolimit']) ) ? true : false; ! $cat_id = $_POST['cat_id'] ? $_POST['cat_id'] : ( $_GET['cat_id'] ? $_GET['cat_id'] : 0 ); ! $cat_parent = $_POST['c'] ? $_POST['c'] : ( $_GET['c'] ? $_GET['c'] : 0 ); ! $cat_where = ($cat_id != 0) ? "cat_parent = $cat_parent" : "cat_id <> 0"; ! ! if ($cat_id != 0) ! { ! $sql = "SELECT c.*, COUNT(s.song_id) AS count ! FROM ". MUSIC_CAT_TABLE ." AS c ! LEFT JOIN ". MUSIC_TABLE ." AS s ON c.cat_id = s.song_cat_id ! WHERE cat_id = $cat_id ! GROUP BY cat_id ! ORDER BY cat_order ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! die("Could not query this category"); ! } ! } ! else ! { ! $sql = "SELECT c.*, COUNT(s.song_id) AS count FROM ". MUSIC_CAT_TABLE ." AS c LEFT JOIN ". MUSIC_TABLE ." AS s ON c.cat_id = s.song_cat_id ! WHERE $cat_where GROUP BY cat_id ORDER BY cat_order ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! die("Could not query categories list"); ! } } *************** *** 209,212 **** --- 229,241 ---- $thissong = $db->sql_fetchrow($result); + if ( $thissong['song_imagename'] == '' ) + { + $img_id = $mx_images['no_image']; + } + else + { + $img_id = ($module_root_path . 'upload/song_image/' . $thissong['song_imagename']); + } + if ( $thissong['song_url'] == '' ) { *************** *** 256,264 **** $row_type = 'qt'; } ! 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'; } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) --- 285,302 ---- $row_type = 'qt'; } ! else if ( $song_filetype == 'flv' ) { ! /* ! if ( !is_object($mx_page) ) ! { ! $mx_page = new mx_page(); ! } ! $mx_page->add_footer_text( $music_root_path . 'music_player.js', true ); ! */ ! ! $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'; } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) *************** *** 470,473 **** --- 508,512 ---- $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']; $url_comment = append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_comment&" . "song_id=" . $thissong['song_id'])); *************** *** 489,499 **** case 'flashvideo': ! $html_code = '<embed src="' . $url_song . '" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""></embed>'; ! $enclosure = 'url="' . $url_video . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; break; case 'youtube': ! $html_code = '<embed src="' . $url_video . '" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""></embed>'; ! $enclosure = 'url="' . $url_video . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; break; --- 528,543 ---- case 'flashvideo': ! $html_code = '<embed src="' . $url_video . '" 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; 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; ! ! case 'flv': ! $html_code = '<embed src="' . $url_video . '" flashvars="file=' . $url_flv . '&image=' . $img_id . '&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="425" height="350" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />'; ! $enclosure = 'url="' . $url_song . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; break; *************** *** 504,508 **** case 'img': ! $html_code = '<a href="' . $url_page . '">' . '<img src="' . $url_thumb_song . '" border="1" vspace="2" hspace="2" align="left" width="425" height="350">' . '</a>'; $enclosure = 'url="' . $url_song . '" ' . 'type="image/png" length="1024000"'; break; --- 548,552 ---- case 'img': ! $html_code = '<a href="' . $url_page . '">' . '<img src="' . $url_thumb_song . '" border="1" vspace="2" hspace="2" align="left" width="425" height="350" />' . '</a>'; $enclosure = 'url="' . $url_song . '" ' . 'type="image/png" length="1024000"'; break; |
