Menu
▾
▴
[mxbb-commits] mx_music/music_box/modules music_image.php, NONE, 1.1 music_cat.php, 1.6, 1.7 music_comment.php, 1.3, 1.4 music_comment_edit.php, 1.2, 1.3 music_list.php, 1.2, 1.3 music_media_cat.php, 1.5, 1.6 music_modcp.php, 1.3, 1.4 music_page.php, 1.5, 1.6 music_pic_cat.php, 1.5, 1.6 music_rate.php, 1.2, 1.3 music_rss.php, 1.4, 1.5 music_song.php, 1.2, 1.3 music_upload.php, 1.2, 1.3
|
From: FlorinCB <ory...@us...> - 2008-09-07 18:11:25
|
Update of /cvsroot/mxbb/mx_music/music_box/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9110/music_box/modules Modified Files: music_cat.php music_comment.php music_comment_edit.php music_list.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 Added Files: music_image.php Log Message: upgrade not ready yet Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_upload.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_upload.php 29 Jan 2008 07:51:05 -0000 1.2 --- music_upload.php 7 Sep 2008 18:06:52 -0000 1.3 *************** *** 390,395 **** $song_time = time(); ! $song_user_id = $userdata['user_id']; ! $song_user_ip = $userdata['session_ip']; // -------------------------------- --- 390,410 ---- $song_time = time(); ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! ! case 'phpbb2': ! ! $song_user_id = $userdata['user_id']; ! $song_user_ip = $userdata['session_ip']; ! break; ! ! case 'phpbb3': ! ! $song_user_id = $mx_user->data['user_id']; ! $song_user_ip = music_encode_ip($mx_user->data['session_ip']); ! break; ! } // -------------------------------- *************** *** 687,692 **** // -------------------------------- ! $sql = "INSERT INTO ". MUSIC_TABLE ." (song_filename, song_filetype, song_imagename, song_title, song_url, song_desc, song_singer, song_user_id, song_user_ip, song_username, song_time, song_cat_id, song_approval) ! VALUES ('$song_filename', '$song_filetype', '$song_imagename', '$song_title', '$song_url', '$song_desc', '$song_singer', '$song_user_id', '$song_user_ip', '$song_username', '$song_time', '$cat_id', '$song_approval')"; if( !$result = $db->sql_query($sql) ) { --- 702,707 ---- // -------------------------------- ! $sql = "INSERT INTO ". MUSIC_TABLE ." (song_filename, song_filetype, song_imagename, song_title, song_url, song_desc, song_singer, song_user_id, song_user_ip, song_username, song_time, song_cat_id, song_approval, song_download_count) ! VALUES ('$song_filename', '$song_filetype', '$song_imagename', '$song_title', '$song_url', '$song_desc', '$song_singer', '$song_user_id', '$song_user_ip', '$song_username', '$song_time', '$cat_id', '$song_approval', '0')"; if( !$result = $db->sql_query($sql) ) { --- NEW FILE: music_image.php --- <?php /** * * @package mxBB Portal Module - mx_music * @version $Id: music_image.php,v 1.1 2008/09/07 18:06:55 orynider Exp $ * @copyright (c) 2003 [ory...@rd..., OryNider] mxBB Development Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ // MX if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } // ------------------------------------ // Check the request // ------------------------------------ if( isset($HTTP_GET_VARS['song_id']) ) { $song_id = intval($HTTP_GET_VARS['song_id']); } else if( isset($HTTP_POST_VARS['song_id']) ) { $song_id = intval($HTTP_POST_VARS['song_id']); } else { die('No songs specified'); } // ------------------------------------ // Get this song info // ------------------------------------ $sql = "SELECT * FROM ". MUSIC_TABLE ." WHERE song_id = '$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 = $thissong['song_filename']; } else { $song_filetype = substr($thissong['song_url'], strlen($thissong['song_url']) - 3, 3); $song_url = $thissong['song_url']; } $pic_filetype = substr($thissong['song_imagename'], strlen($thissong['song_imagename']) - 3, 3); $pic_filename = $thissong['song_imagename']; // ------------------------------------ // Get the current Category Info // ------------------------------------ $sql = "SELECT * FROM ". MUSIC_CAT_TABLE ." WHERE cat_id = '$cat_id'"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql); } $thiscat = $db->sql_fetchrow($result); if (empty($thiscat)) { die($lang['Category_not_exist']); } // ------------------------------------ // Check the permissions // ------------------------------------ $music_user_access = music_user_access($cat_id, $thiscat, 1, 0, 0, 0, 0, 0); // VIEW if ($music_user_access['view'] == 0) { die($lang['Not_Authorised']); } // ------------------------------------ // Check song Approval // ------------------------------------ if ($userdata['user_level'] != ADMIN) { if( ($thiscat['cat_approval'] == ADMIN) or (($thiscat['cat_approval'] == MOD) and !$music_user_access['moderator']) ) { if ($thissong['song_approval'] != 1) { die($lang['Not_Authorised']); } } } // ------------------------------------ // Check hotlink // ------------------------------------ if( ($music_config['hotlink_prevent'] == 1) and (isset($HTTP_SERVER_VARS['HTTP_REFERER'])) ) { $check_referer = explode('?', $HTTP_SERVER_VARS['HTTP_REFERER']); $check_referer = trim($check_referer[0]); $good_referers = array(); if ($music_config['hotlink_allowed'] != '') { $good_referers = explode(',', $music_config['hotlink_allowed']); } $good_referers[] = $board_config['server_name'] . $board_config['script_path']; $errored = TRUE; for ($i = 0; $i < count($good_referers); $i++) { $good_referers[$i] = trim($good_referers[$i]); if( (strstr($check_referer, $good_referers[$i])) and ($good_referers[$i] != '') ) { $errored = FALSE; } } if ($errored) { die($lang['Not_Authorised']); } } /* +---------------------------------------------------------- | Main work here... +---------------------------------------------------------- */ // ------------------------------------ // Send the song // ------------------------------------ if ($thissong['song_imagename']) { switch ($pic_filetype) { case '.bmp': $read_function = 'readfile'; break; case '.jpg': case 'jpg': $read_function = 'imagecreatefromjpeg'; break; case '.gif': case 'gif': $read_function = 'imagecreatefromgif'; break; case '.png': case 'png': $read_function = 'imagecreatefrompng'; break; default: $read_function = 'readfile'; } if ($read_function == 'readfile') { switch ($pic_filetype) { case 'mp3': header('Content-type: audio/mp3'); break; case 'wav': header('Content-type: audio/wav'); break; case 'wma': header('Content-type: audio/x-ms-wma'); break; case 'wmv': header('Content-type: video/x-ms-wmv'); break; case 'peg': case 'mpg': header('Content-type: video/mpeg'); break; case 'avi': header('Content-type: video/x-msvideo'); break; case 'swf': header('Content-type: application/x-shockwave-flash'); break; case '.au': header('Content-type: audio/basic'); break; case 'mid': header('Content-type: audio/mid'); break; case '.qt': header('Content-type: video/quicktime'); break; case 'flv': header('Content-type: video/x-flv'); break; case 'ram': header('Content-type: audio/x-pn-realaudio'); break; case '.rm': header('Content-type: application/vnd.rn-realmedia'); break; case 'bmp': header('Content-type: image/bitmap'); break; default: die('The filename data in the DB was corrupted'); } readfile(MUSIC_UPLOAD_PATH . 'song_image/' . $pic_filename); } else { $pic_fullpath = MUSIC_IMAGE_PATH . $pic_filename; //$pic_filetype = strtolower(substr($thissong['song_filename'], strlen($thissong['song_filename']) - 4, 4)); switch ($pic_filetype) { case '.gif': case 'gif': $file_header = 'Content-type: image/gif'; $read_function = 'imagecreatefromgif'; break; case '.jpeg': case 'jpeg': case '.jpg': case 'jpg': case '.pjpeg': $file_header = 'Content-type: image/jpeg'; $read_function = 'imagecreatefromjpeg'; break; case '.png': case 'png': $file_header = 'Content-type: image/png'; $read_function = 'imagecreatefrompng'; break; default: die('Not allowed media or pic file type'); } header($file_header); $max_pic_size = ($music_config['max_image_width'] > $music_config['max_image_height']) ? $music_config['max_image_width'] : $music_config['max_image_height']; if( isset($_GET['width']) ) { $item_size = intval($_GET['width']); $thumbnail_size = ($item_size > $max_pic_size) ? $max_pic_size : $item_size; } else { $thumbnail_size = $item_size = $max_pic_size; } $pic_size = getimagesize($pic_fullpath); $pic_width = $pic_size[0]; $pic_height = $pic_size[1]; if ($pic_width > $pic_height) { $thumbnail_width = $thumbnail_size; $thumbnail_height = $thumbnail_size * ($pic_height / $pic_width); } else { $thumbnail_height = $thumbnail_size; $thumbnail_width = $thumbnail_size * ($pic_width / $pic_height); } $thumbnail = (!function_exists(imagecreatetruecolor)) ? imagecreate($thumbnail_width, $thumbnail_height) : imagecreatetruecolor($thumbnail_width, $thumbnail_height); $resize_function = (!function_exists(imagecopyresampled)) ? 'imagecopyresized' : 'imagecopyresampled'; if( !function_exists($read_function) ) { $source = readfile($pic_fullpath); } else { $source = $read_function($pic_fullpath); } $resize_function($thumbnail, $source, 0, 0, 0, 0, $thumbnail_width, $thumbnail_height, $pic_width, $pic_height); switch ( $pic_filetype ) { case '.gif': case 'gif': imagegif($thumbnail); break; case '.jpeg': case '.jpg': case 'jpg': case '.pjpeg': imagejpeg($thumbnail); break; case '.png': case 'png': imagepng($thumbnail); break; default: readfile(MUSIC_UPLOAD_PATH . 'song_image/' . $pic_filename); } imagedestroy($thumbnail); } } exit; // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | // +------------------------------------------------------+ ?> Index: music_comment_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_comment_edit.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_comment_edit.php 29 Jan 2008 07:51:05 -0000 1.2 --- music_comment_edit.php 7 Sep 2008 18:06:43 -0000 1.3 *************** *** 206,210 **** 'SONG_TITLE' => $thissong['song_title'], 'POSTER' => $poster, ! 'SONG_TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], 'SONG_COMMENTS' => $total_comments, --- 206,210 ---- 'SONG_TITLE' => $thissong['song_title'], 'POSTER' => $poster, ! 'SONG_TIME' => (@function_exists( 'create_date' )) ? music_create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], 'SONG_COMMENTS' => $total_comments, Index: music_pic_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_pic_cat.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** music_pic_cat.php 28 May 2008 23:31:49 -0000 1.5 --- music_pic_cat.php 7 Sep 2008 18:06:48 -0000 1.6 *************** *** 785,789 **** } ! $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); $template->assign_block_vars('songrow.song_detail', array( --- 785,789 ---- } ! $song_user_ip = (@function_exists( 'decode_ip' )) ? music_decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); $template->assign_block_vars('songrow.song_detail', array( *************** *** 812,816 **** 'HEIGHT' => ( !empty($media_height) ? $media_height : '85' ), ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], --- 812,816 ---- 'HEIGHT' => ( !empty($media_height) ? $media_height : '85' ), ! 'TIME' => (@function_exists( 'create_date' )) ? music_create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_cat.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** music_cat.php 28 May 2008 23:31:49 -0000 1.6 --- music_cat.php 7 Sep 2008 18:06:42 -0000 1.7 *************** *** 791,795 **** } ! $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); $template->assign_block_vars('songrow.song_detail', array( --- 791,795 ---- } ! $song_user_ip = (@function_exists( 'decode_ip' )) ? music_decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); $template->assign_block_vars('songrow.song_detail', array( *************** *** 822,826 **** 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], --- 822,826 ---- 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! 'TIME' => (@function_exists( 'create_date' )) ? music_create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], *************** *** 917,920 **** --- 917,931 ---- 'body' => 'music_cat_body.tpl') ); + + $template->assign_vars(array( + 'FLASH' => '', + 'RAM' => '', + 'FLASHVIDEO' => '', + 'YOUTUBE' => '', + 'QT' => '', + 'FLV' => '', + 'IMG' => '', + 'MEDIA' => '') + ); } else *************** *** 923,929 **** --- 934,956 ---- 'body' => 'music_cat_xs.tpl') ); + + $template->assign_vars(array( + 'FLASH' => 'flash', + 'RAM' => 'ram', + 'FLASHVIDEO' => 'flashvideo', + 'YOUTUBE' => 'youtube', + 'QT' => 'qt', + 'FLV' => 'flv', + 'IMG' => 'img', + 'MEDIA' => 'media') + ); } $template->assign_vars(array( + 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), + 'BLOCK_TITLE' => $title, + 'L_DESCRIPTION' => $description, + 'S_SHOW_TITLE' => $show_title, + 'TARGET_BLANK' => ($music_config['fullpic_popup']) ? 'target="_blank"' : '', 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], Index: music_modcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_modcp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_modcp.php 10 Jul 2008 22:22:43 -0000 1.3 --- music_modcp.php 7 Sep 2008 18:06:46 -0000 1.4 *************** *** 341,345 **** 'SONG_TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=". $songrow[$i]['song_id'])) .'" target="_blank">'. $songrow[$i]['song_title'] .'</a>', 'POSTER' => $song_poster, ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $songrow[$i]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$i]['song_time'], $board_config['board_timezone']), 'RATING' => ($songrow[$i]['rating'] == 0) ? $lang['Not_rated'] : round($songrow[$i]['rating'], 2), 'COMMENTS' => $songrow[$i]['comments'], --- 341,345 ---- 'SONG_TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=". $songrow[$i]['song_id'])) .'" target="_blank">'. $songrow[$i]['song_title'] .'</a>', 'POSTER' => $song_poster, ! 'TIME' => (@function_exists( 'create_date' )) ? music_create_date($board_config['default_dateformat'], $songrow[$i]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$i]['song_time'], $board_config['board_timezone']), 'RATING' => ($songrow[$i]['rating'] == 0) ? $lang['Not_rated'] : round($songrow[$i]['rating'], 2), 'COMMENTS' => $songrow[$i]['comments'], Index: music_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_rss.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_rss.php 28 May 2008 23:31:50 -0000 1.4 --- music_rss.php 7 Sep 2008 18:06:50 -0000 1.5 *************** *** 59,63 **** header ('Content-Type: text/xml'); ! $rss_time = (@function_exists( 'create_date' )) ? create_date('D, d M Y H:i:s T', time(), $board_config['board_timezone']) : phpBB2::create_date('D, d M Y H:i:s T', time(), $board_config['board_timezone']); // Create main board url (some code borrowed from functions_post.php) --- 59,63 ---- header ('Content-Type: text/xml'); ! $rss_time = (@function_exists( 'create_date' )) ? music_create_date('D, d M Y H:i:s T', time(), $board_config['board_timezone']) : phpBB2::create_date('D, d M Y H:i:s T', time(), $board_config['board_timezone']); // Create main board url (some code borrowed from functions_post.php) Index: music_list.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_list.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_list.php 29 Jan 2008 07:51:05 -0000 1.2 --- music_list.php 7 Sep 2008 18:06:44 -0000 1.3 *************** *** 171,175 **** 'POSTER' => $search_poster, ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $searchsongrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $searchsongrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $searchsongrow[$j]['song_view_count'], --- 171,175 ---- 'POSTER' => $search_poster, ! 'TIME' => (@function_exists( 'create_date' )) ? music_create_date($board_config['default_dateformat'], $searchsongrow[$j]['song_time'], $board_config['board_timezone']) : music_create_date($board_config['default_dateformat'], $searchsongrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $searchsongrow[$j]['song_view_count'], Index: music_media_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_media_cat.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** music_media_cat.php 28 May 2008 23:31:49 -0000 1.5 --- music_media_cat.php 7 Sep 2008 18:06:45 -0000 1.6 *************** *** 1059,1063 **** } ! $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); $template->assign_block_vars('songrow.song_detail', array( --- 1059,1063 ---- } ! $song_user_ip = (@function_exists( 'decode_ip' )) ? music_decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); $template->assign_block_vars('songrow.song_detail', array( *************** *** 1086,1090 **** 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], --- 1086,1090 ---- 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! 'TIME' => (@function_exists( 'create_date' )) ? music_create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], Index: music_song.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_song.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_song.php 29 Jan 2008 07:51:05 -0000 1.2 --- music_song.php 7 Sep 2008 18:06:51 -0000 1.3 *************** *** 356,373 **** { case '.gif': imagegif($thumbnail); break; case '.jpeg': case '.jpg': case '.pjpeg': imagejpeg($thumbnail); break; case '.png': imagepng($thumbnail); break; default: ! return false; } - imagedestroy($thumbnail); } --- 356,375 ---- { case '.gif': + case 'gif': imagegif($thumbnail); break; case '.jpeg': case '.jpg': + case 'jpg': case '.pjpeg': imagejpeg($thumbnail); break; case '.png': + case 'png': imagepng($thumbnail); break; default: ! readfile(MUSIC_UPLOAD_PATH . 'song_image/' . $pic_filename); } imagedestroy($thumbnail); } Index: music_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_comment.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_comment.php 8 Jul 2008 21:43:50 -0000 1.3 --- music_comment.php 7 Sep 2008 18:06:42 -0000 1.4 *************** *** 285,289 **** $lastedit_row = $db->sql_fetchrow($result); ! $comment_edit_time = (@function_exists('create_date')) ? create_date($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']); $edit_info = ($commentrow[$i]['comment_edit_count'] == 1) ? $lang['Edited_time_total'] : $lang['Edited_times_total']; --- 285,289 ---- $lastedit_row = $db->sql_fetchrow($result); ! $comment_edit_time = (@function_exists('create_date')) ? music_create_date($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']); $edit_info = ($commentrow[$i]['comment_edit_count'] == 1) ? $lang['Edited_time_total'] : $lang['Edited_times_total']; *************** *** 296,300 **** } ! $comment_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($commentrow[$i]['comment_user_ip']) : phpBB2::decode_ip($commentrow[$i]['comment_user_ip']); $template->assign_block_vars('commentrow', array( --- 296,300 ---- } ! $comment_user_ip = (@function_exists( 'decode_ip' )) ? music_decode_ip($commentrow[$i]['comment_user_ip']) : phpBB2::decode_ip($commentrow[$i]['comment_user_ip']); $template->assign_block_vars('commentrow', array( Index: music_page.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_page.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** music_page.php 28 May 2008 23:31:49 -0000 1.5 --- music_page.php 7 Sep 2008 18:06:47 -0000 1.6 *************** *** 534,538 **** --- 534,549 ---- $template->assign_vars(array( + 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), + + 'BLOCK_TITLE' => $title, + + 'L_DESCRIPTION' => $description, + + 'S_SHOW_TITLE' => $show_title, + + 'TARGET_BLANK' => ($music_config['fullpic_popup']) ? 'target="_blank"' : '', + 'CAT_TITLE' => $thiscat['cat_title'], + 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), *************** *** 557,561 **** 'POSTER' => $poster, ! 'SONG_TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], --- 568,572 ---- 'POSTER' => $poster, ! 'SONG_TIME' => (@function_exists( 'create_date' )) ? music_create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], Index: music_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_rate.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_rate.php 29 Jan 2008 07:51:05 -0000 1.2 --- music_rate.php 7 Sep 2008 18:06:49 -0000 1.3 *************** *** 204,208 **** 'POSTER' => $poster, ! 'SONG_TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], 'SONG_RATING' => ($thissong['rating'] != 0) ? round($thissong['rating'], 2) : $lang['Not_rated'], --- 204,208 ---- 'POSTER' => $poster, ! 'SONG_TIME' => (@function_exists( 'create_date' )) ? music_create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], 'SONG_RATING' => ($thissong['rating'] != 0) ? round($thissong['rating'], 2) : $lang['Not_rated'], |
