Menu
▾
▴
[mxbb-commits] mx_music db_install.php, 1.10, 1.11 db_upgrade.php, 1.8, 1.9 music.php, 1.22, 1.23 music_center.pak, 1.4, 1.5 music_lists.php, 1.7, 1.8
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:05:59
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26047 Modified Files: db_install.php db_upgrade.php music.php music_center.pak music_lists.php Log Message: get ready for release Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_install.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** db_install.php 1 Feb 2008 22:01:47 -0000 1.10 --- db_install.php 10 Sep 2008 06:05:19 -0000 1.11 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_music * @version $Id$ * @copyright (c) 2003 [ory...@rd..., OryNider] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_music * @version $Id$ * @copyright (c) 2003 [ory...@rd..., OryNider] mxBB Development Team *************** *** 34,38 **** $mx_module_version = '2.1.0'; ! $mx_module_copy = 'mxBB <i> - Music Center</i> module by Cf Manager & <a href="http://www.mxbb.net" target="_blank">OryNider</a>'; // If fresh install --- 34,38 ---- $mx_module_version = '2.1.0'; ! $mx_module_copy = 'Mx-Publisher <i> - Music Center</i> module by Cf Manager & <a href="http://www.mx-publisher.com/" target="_blank">OryNider</a>'; // If fresh install *************** *** 182,185 **** --- 182,188 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('rows_per_page_media', '10')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('cols_per_page_media', '1')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_cat VALUES ('1', '0', '0', 'Category', 'Just a Test Category', '1', '0', '-1', '0', '0', '0', '0', '2', 'NULL', 'NULL', 'NULL', 'NULL', 'NULL', 'NULL', 'NULL', '0')"; + $sql[] = "UPDATE " . $mx_table_prefix . "module" . " Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** music.php 9 Sep 2008 07:29:17 -0000 1.22 --- music.php 10 Sep 2008 06:05:21 -0000 1.23 *************** *** 160,164 **** // End session management // ! $block_id = ( !empty($HTTP_GET_VARS['block_id']) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id']; if( empty($block_id) ) { --- 160,164 ---- // End session management // ! $block_id = ( !empty($_GET['block_id']) ) ? $_GET['block_id'] : $_POST['id']; if( empty($block_id) ) { *************** *** 731,734 **** --- 731,735 ---- 'QT' => '', 'FLV' => '', + 'MOD' => '', 'IMG' => '', 'MEDIA' => '') *************** *** 744,747 **** --- 745,749 ---- 'QT' => 'qt', 'FLV' => 'flv', + 'MOD' => 'mod', 'IMG' => 'img', 'MEDIA' => 'media') *************** *** 834,844 **** // ------------------------------------ ! if( isset($HTTP_GET_VARS['start']) ) { ! $start = intval($HTTP_GET_VARS['start']); } ! else if( isset($HTTP_POST_VARS['start']) ) { ! $start = intval($HTTP_POST_VARS['start']); } else --- 836,846 ---- // ------------------------------------ ! if( isset($_GET['start']) ) { ! $start = intval($_GET['start']); } ! else if( isset($_POST['start']) ) { ! $start = intval($_POST['start']); } else *************** *** 847,853 **** } ! if( isset($HTTP_GET_VARS['sort_method']) ) { ! switch ($HTTP_GET_VARS['sort_method']) { case 'song_time': --- 849,855 ---- } ! if( isset($_GET['sort_method']) ) { ! switch ($_GET['sort_method']) { case 'song_time': *************** *** 879,885 **** } } ! else if( isset($HTTP_POST_VARS['sort_method']) ) { ! switch ($HTTP_POST_VARS['sort_method']) { case 'song_time': --- 881,887 ---- } } ! else if( isset($_POST['sort_method']) ) { ! switch ($_POST['sort_method']) { case 'song_time': *************** *** 916,922 **** } ! if( isset($HTTP_GET_VARS['sort_order']) ) { ! switch ($HTTP_GET_VARS['sort_order']) { case 'ASC': --- 918,924 ---- } ! if( isset($_GET['sort_order']) ) { ! switch ($_GET['sort_order']) { case 'ASC': *************** *** 930,936 **** } } ! else if( isset($HTTP_POST_VARS['sort_order']) ) { ! switch ($HTTP_POST_VARS['sort_order']) { case 'ASC': --- 932,938 ---- } } ! else if( isset($_POST['sort_order']) ) { ! switch ($_POST['sort_order']) { case 'ASC': *************** *** 1150,1153 **** --- 1152,1162 ---- $row_type = 'flv'; } + else if ( ( $song_filetype == 'mod' ) || ( $song_filetype == 's3m' ) || ( $song_filetype == 'ult' ) || ( $song_filetype == '.xm' ) ) + { + $template->assign_block_vars('songrow.mod', array()); + $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $music_root_path . 'modplayer.swf'; + $row_type = 'mod'; + } else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { *************** *** 1412,1422 **** } ! if ($song_filetype == 'flv') ! { ! $url_song = PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . $thissong['song_filename']; ! } ! else { ! $url_song = mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } --- 1421,1436 ---- } ! switch ($song_filetype) { ! case 'flv': ! case 'mod': ! case 's3m': ! case 'ult': ! case '.xm': ! $url_song = PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . $thissong['song_filename']; ! break; ! ! default: ! $url_song = mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } *************** *** 1427,1430 **** --- 1441,1446 ---- 'U_SONG' => $url_song, + + 'U_SONG_PAGE' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'SONG_TITLE' => $thissong['song_title'], *************** *** 1436,1440 **** '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)), --- 1452,1456 ---- 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, ! 'SONG_THUMB_URL' => mx_append_sid(this_mo_mxurl("music_mode=music_image&width=425&song_id=". $songrow[$j]['song_id'], 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)), *************** *** 1443,1446 **** --- 1459,1466 ---- 'U_IMG' => mx_append_sid($img_id), + + 'FLASH_PLAYER' => $music_root_path . 'mediaplayer.swf', + + 'DUMMY_FLV' => PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . 'no_image.flv', 'SINGER' => $songrow[$j]['song_singer'], *************** *** 1543,1549 **** */ ! if( isset($HTTP_GET_VARS['sort_method']) ) { ! switch ($HTTP_GET_VARS['sort_method']) { case 'song_time': --- 1563,1569 ---- */ ! if( isset($_GET['sort_method']) ) { ! switch ($_GET['sort_method']) { case 'song_time': *************** *** 1566,1572 **** } } ! else if( isset($HTTP_POST_VARS['sort_method']) ) { ! switch ($HTTP_POST_VARS['sort_method']) { case 'song_time': --- 1586,1592 ---- } } ! else if( isset($_POST['sort_method']) ) { ! switch ($_POST['sort_method']) { case 'song_time': *************** *** 1595,1601 **** // Song limit ! if( isset($HTTP_GET_VARS['song_limit']) ) { ! switch ($HTTP_GET_VARS['song_limit']) { case '5': --- 1615,1621 ---- // Song limit ! if( isset($_GET['song_limit']) ) { ! switch ($_GET['song_limit']) { case '5': *************** *** 1615,1621 **** } } ! else if( isset($HTTP_POST_VARS['song_limit']) ) { ! switch ($HTTP_POST_VARS['song_limit']) { case '5': --- 1635,1641 ---- } } ! else if( isset($_POST['song_limit']) ) { ! switch ($_POST['song_limit']) { case '5': Index: music_center.pak =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_center.pak,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_center.pak 12 Mar 2008 07:15:29 -0000 1.4 --- music_center.pak 10 Sep 2008 06:05:21 -0000 1.5 *************** *** 1,3 **** ! module=+:74=+:Media Center=+:modules/mx_music/=+:mxBB Media Center=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:74=+:89=+:music_center=+:Media Center=+:music.php=+: --- 1,3 ---- ! module=+:74=+:Media Center=+:modules/mx_music/=+:MXP Media Center=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:74=+:89=+:music_center=+:Media Center=+:music.php=+: *************** *** 6,15 **** New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:74=+:91=+:music_flv=+:flv_player=+:music_flv.php=+: ! parameter=+:91=+:199=+:flv_file=+:Text=+:no_image.flv=+:=+:1=+:0 ! parameter=+:91=+:200=+:flv_img=+:Text=+:no_image.gif=+:=+:1=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:music_flv=+:Demo block=+:91=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:74=+:90=+:Music_list=+:Media toplists=+:music_lists.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Music_list=+:Demo block=+:90=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 --- 6,17 ---- New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:74=+:91=+:music_flv=+:flv_player=+:music_flv.php=+: ! parameter=+:91=+:196=+:flv_file=+:Text=+:no_image.flv=+:=+:1=+:0 ! parameter=+:91=+:197=+:flv_img=+:Text=+:no_image.gif=+:=+:1=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:music_flv=+:Demo block=+:91=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:74=+:90=+:Music_list=+:Media toplists=+:music_lists.php=+: + parameter=+:90=+:198=+:num_of_rows=+:Number=+:2=+:=+:0=+:0 + parameter=+:90=+:199=+:num_of_cols=+:Number=+:1=+:=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Music_list=+:Demo block=+:90=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 Index: music_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_lists.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** music_lists.php 9 Sep 2008 07:04:32 -0000 1.7 --- music_lists.php 10 Sep 2008 06:05:22 -0000 1.8 *************** *** 47,50 **** --- 47,57 ---- include_once($music_root_path . 'music_common.'.$phpEx); + if ($mx_block->get_parameters('num_of_rows')) + { + $music_config['song_rows'] = $mx_block->get_parameters('num_of_rows'); + $music_config['song_cols'] = $mx_block->get_parameters('num_of_cols'); + $music_config['top'] = $music_config['song_cols'] * $music_config['song_rows']; + } + // // Nav switch for mx *************** *** 197,202 **** // ---------------------------- ! $sql = "SELECT s.*, u.user_id, u.username ! FROM ". MUSIC_TABLE ." AS s LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id WHERE s.song_cat_id = '". $catrows[$i]['cat_id'] ."' $song_approval_sql ORDER BY s.song_time DESC --- 204,209 ---- // ---------------------------- ! $sql = "SELECT s.*, s.song_user_id as user_id, s.song_username as username ! FROM ". MUSIC_TABLE ." AS s WHERE s.song_cat_id = '". $catrows[$i]['cat_id'] ."' $song_approval_sql ORDER BY s.song_time DESC *************** *** 373,379 **** if ($allowed_cat != '') { ! $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, MAX(c.comment_id) as new_comment FROM ". MUSIC_TABLE ." AS s - LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id LEFT JOIN ". MUSIC_CAT_TABLE ." AS ct ON s.song_cat_id = ct.cat_id LEFT JOIN ". MUSIC_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id --- 380,385 ---- if ($allowed_cat != '') { ! $sql = "SELECT s.*, s.song_user_id as user_id, s.song_username as username, r.rate_song_id, AVG(r.rate_point) AS rating, COUNT(DISTINCT c.comment_id) AS comments, MAX(c.comment_id) as new_comment FROM ". MUSIC_TABLE ." AS s LEFT JOIN ". MUSIC_CAT_TABLE ." AS ct ON s.song_cat_id = ct.cat_id LEFT JOIN ". MUSIC_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_upgrade.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** db_upgrade.php 1 Feb 2008 22:01:47 -0000 1.8 --- db_upgrade.php 10 Sep 2008 06:05:20 -0000 1.9 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_music * @version $Id$ * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_music * @version $Id$ * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team *************** *** 31,35 **** $mx_module_version = '2.1.0'; ! $mx_module_copy = 'mxBB <i> - Music Center</i> module by Cf Manager & <a href="http://www.mxbb.net" target="_blank">OryNider</a>'; $sql = array(); --- 31,35 ---- $mx_module_version = '2.1.0'; ! $mx_module_copy = 'Mx-Publisher <i> - Music Center</i> module by Cf Manager & <a href="http://www.mx-publisher.com/" target="_blank">OryNider</a>'; $sql = array(); |
