Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: FlorinCB <ory...@us...> - 2008-09-10 12:27:00
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4603 Modified Files: db_install.php music.php Log Message: fix Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_install.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** db_install.php 10 Sep 2008 06:36:35 -0000 1.12 --- db_install.php 10 Sep 2008 12:26:14 -0000 1.13 *************** *** 167,171 **** $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('comment', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('music_version', '.0.7')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_size', '10240')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_width', '800')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_height', '600')"; --- 167,171 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('comment', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('music_version', '.0.7')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_size', '256000')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_width', '800')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_height', '600')"; Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** music.php 10 Sep 2008 06:54:21 -0000 1.24 --- music.php 10 Sep 2008 12:26:16 -0000 1.25 *************** *** 693,696 **** --- 693,697 ---- $thiscat = array(); // this category $catrows = array(); // all categories for jumpbox + $auth_data = array(); //album auth while( $row = $db->sql_fetchrow($result) ) *************** *** 762,766 **** } ! if ( $auth_data['upload'] ) { $enable_soung_upload_switch = true; --- 763,767 ---- } ! if ($auth_data['upload']) { $enable_soung_upload_switch = true; |
|
From: FlorinCB <ory...@us...> - 2008-09-10 12:27:00
|
Update of /cvsroot/mxbb/mx_music/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4603/templates/_core Modified Files: music_cat_xs.tpl Log Message: fix Index: music_cat_xs.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_cat_xs.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_cat_xs.tpl 10 Sep 2008 06:05:25 -0000 1.4 --- music_cat_xs.tpl 10 Sep 2008 12:26:20 -0000 1.5 *************** *** 176,180 **** if ( navigator.appName == "Netscape" ){ //Netscape code ! document.write (' <Embed id="wmp" name="wmp" type="audio/mpeg"'); document.write (' pluginspage="http://www.microsoft.com/windows/windowsmedia/"'); document.write (' filename="{song_detail.SONG_URL}"'); --- 176,180 ---- if ( navigator.appName == "Netscape" ){ //Netscape code ! document.write (' <Embed id="wmp" name="wmp" type="{song_detail.MIME_TYPE}"'); document.write (' pluginspage="http://www.microsoft.com/windows/windowsmedia/"'); document.write (' filename="{song_detail.SONG_URL}"'); *************** *** 191,195 **** if ( navigator.appName != "Netscape" ){ ! document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="0" filename="{song_detail.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); } } --- 191,195 ---- if ( navigator.appName != "Netscape" ){ ! document.write(' <embed id="wmp" name="wmp" type="{song_detail.MIME_TYPE}" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="0" filename="{song_detail.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); } } *************** *** 219,223 **** document.write ('<PARAM NAME="height" VALUE="{song_detail.WIDTH}">'); ! document.write (' <Embed type="application/x-mplayer2"'); document.write (' pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"'); document.write (' filename="{song_detail.SONG_URL}"'); --- 219,223 ---- document.write ('<PARAM NAME="height" VALUE="{song_detail.WIDTH}">'); ! document.write (' <Embed type="{song_detail.MIME_TYPE}"'); document.write (' pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"'); document.write (' filename="{song_detail.SONG_URL}"'); *************** *** 255,259 **** //Firefox code ! document.write (' <Embed type="application/x-mplayer2"'); document.write (' pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"'); document.write (' filename="{song_detail.SONG_URL}"'); --- 255,259 ---- //Firefox code ! document.write (' <Embed type="{song_detail.MIME_TYPE}"'); document.write (' pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"'); document.write (' filename="{song_detail.SONG_URL}"'); *************** *** 275,279 **** else { ! document.write(' <embed type="audio/mpeg" height="{song_detail.HEIGHT}" width="{song_detail.WIDTH}" AUTOSTART="0" filename="{song_detail.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); } </SCRIPT> --- 275,279 ---- else { ! document.write(' <embed type="{song_detail.MIME_TYPE}" height="{song_detail.HEIGHT}" width="{song_detail.WIDTH}" AUTOSTART="0" filename="{song_detail.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); } </SCRIPT> *************** *** 344,352 **** </div> <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq RAM --> ! <embed src="{song_detail.SONG_URL}" align="center" ! width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" type="audio/x-pn-realaudio-plugin" console="cons" ! controls="ControlPanel" autostart="false"></embed> <!-- ENDIF --> --- 344,368 ---- </div> <!-- ENDIF --> + + <!-- IF song_detail.S_ROW_TYPE eq X-MOD --> + <div class="wordtube playlist2" id="WT999"> + <OBJECT id="wmp" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" style="background: url('{song_detail.U_IMG}');" classid="CLSID:06DD38D3-D187-11CF-A80D-00C04FD74AD8" type="application/x-oleobject"> + <PARAM NAME="URL" VALUE="{song_detail.SONG_URL}" /> + <PARAM NAME="AutoStart" VALUE="false" /> + <PARAM NAME="ShowControls" VALUE="1" /> + <PARAM NAME="ShowStatusBar" VALUE="1" /> + <PARAM NAME="AutoSize" VALUE="0" /> + <PARAM NAME="width" VALUE="{song_detail.WIDTH}" /> + <PARAM NAME="height" VALUE="{song_detail.WIDTH}" /> + <PARAM NAME="SendPlayStateChangeEvents" VALUE="True" /> + <PARAM name="uiMode" value="none" /> + <PARAM name="PlayCount" value="9999" /> + <EMBED id="wmp" name="wmp" TYPE="application/x-mod" SRC="{song_detail.SONG_URL}" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" autostart="false" autonext="true" /> + </OBJECT> + </div> + <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq RAM --> ! <embed src="{song_detail.SONG_URL}" align="center" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" type="audio/x-pn-realaudio-plugin" console="cons" controls="ControlPanel" autostart="false"></embed> <!-- ENDIF --> |
|
From: FlorinCB <ory...@us...> - 2008-09-10 12:26:55
|
Update of /cvsroot/mxbb/mx_music/music_box/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4603/music_box/modules Modified Files: music_cat.php Log Message: fix Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_cat.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** music_cat.php 10 Sep 2008 06:54:22 -0000 1.12 --- music_cat.php 10 Sep 2008 12:26:18 -0000 1.13 *************** *** 865,874 **** $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' ) ) --- 865,885 ---- $row_type = 'flv'; } ! else if ( ( $song_filetype == 'mod' ) ) { $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'; + $mime_type= 'audio/x-' . $song_filetype; //application/x-mplayer2 $row_type = 'mod'; + } + else if ( ( $song_filetype == 's3m' ) || ( $song_filetype == 'ult' ) || ( $song_filetype == '.xm' ) ) + { + //$template->assign_block_vars('songrow.mod', array()); + $template->assign_block_vars('songrow.x-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'; + $mime_type= 'audio/x-' . $song_filetype; //application/x-mplayer2 + //$row_type = 'mod'; + $row_type = 'x-mod'; } else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) *************** *** 1112,1115 **** --- 1123,1127 ---- $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; + $mime_type = $mime_type ? $mime_type : 'application/x-mplayer2'; $row_type = 'media'; } *************** *** 1170,1173 **** --- 1182,1187 ---- 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, + + 'MIME_TYPE' => $mime_type, 'U_IMG' => mx_append_sid($img_id), *************** *** 1388,1392 **** 'QT' => 'qt', 'FLV' => 'flv', ! 'MOD' => 'mod', 'IMG' => 'img', 'MEDIA' => 'media', --- 1402,1407 ---- 'QT' => 'qt', 'FLV' => 'flv', ! 'MOD' => 'mod', ! 'X-MOD' => 'x-mod', 'IMG' => 'img', 'MEDIA' => 'media', |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:55:00
|
Update of /cvsroot/mxbb/mx_music/music_box/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17215/music_box/modules Modified Files: music_cat.php music_media_cat.php music_pic_cat.php Log Message: fix for phpBB3 backend Index: music_media_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_media_cat.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** music_media_cat.php 10 Sep 2008 06:05:24 -0000 1.9 --- music_media_cat.php 10 Sep 2008 06:54:22 -0000 1.10 *************** *** 160,167 **** if ($thiscat['cat_moderator_groups'] != '') { // Get the namelist of moderator usergroups ! $sql = "SELECT group_id, group_name, group_type, group_single_user FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> 1 AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $thiscat['cat_moderator_groups'] .") --- 160,178 ---- if ($thiscat['cat_moderator_groups'] != '') { + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . "'; + break; + + case 'phpbb3': + $sql_where = 'group_id <> " . true . "'; + break; + } // Get the namelist of moderator usergroups ! $sql = "SELECT * FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $thiscat['cat_moderator_groups'] .") Index: music_pic_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_pic_cat.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** music_pic_cat.php 9 Sep 2008 07:04:33 -0000 1.8 --- music_pic_cat.php 10 Sep 2008 06:54:22 -0000 1.9 *************** *** 158,166 **** if ($thiscat['cat_moderator_groups'] != '') { // Get the namelist of moderator usergroups ! $sql = "SELECT group_id, group_name, group_type, group_single_user FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> 1 ! AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $thiscat['cat_moderator_groups'] .") ORDER BY group_name ASC"; --- 158,176 ---- if ($thiscat['cat_moderator_groups'] != '') { + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . " AND group_type <> ". GROUP_HIDDEN ."'; + break; + + case 'phpbb3': + $sql_where = 'group_id <> " . true . " AND group_id <> ". GROUP_HIDDEN ."'; + break; + } // Get the namelist of moderator usergroups ! $sql = "SELECT * FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " AND group_id IN (". $thiscat['cat_moderator_groups'] .") ORDER BY group_name ASC"; Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_cat.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** music_cat.php 10 Sep 2008 06:05:22 -0000 1.11 --- music_cat.php 10 Sep 2008 06:54:22 -0000 1.12 *************** *** 106,113 **** if( $catrows[$i]['cat_moderator_groups'] != '') { // We have usergroup_ID, now we need usergroup name $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> 1 AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $catrows[$i]['cat_moderator_groups'] .") --- 106,124 ---- if( $catrows[$i]['cat_moderator_groups'] != '') { + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . "'; + break; + + case 'phpbb3': + $sql_where = 'group_id <> " . true . "'; + break; + } // We have usergroup_ID, now we need usergroup name $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $catrows[$i]['cat_moderator_groups'] .") *************** *** 499,506 **** if ($thiscat['cat_moderator_groups'] != '') { // Get the namelist of moderator usergroups ! $sql = "SELECT group_id, group_name, group_type, group_single_user FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> 1 AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $thiscat['cat_moderator_groups'] .") --- 510,528 ---- if ($thiscat['cat_moderator_groups'] != '') { + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . "'; + break; + + case 'phpbb3': + $sql_where = 'group_id <> " . true . "'; + break; + } // Get the namelist of moderator usergroups ! $sql = "SELECT * FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $thiscat['cat_moderator_groups'] .") |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:54:57
|
Update of /cvsroot/mxbb/mx_music/phpbb2/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17215/phpbb2/admin Modified Files: admin_music_auth.php Log Message: fix for phpBB3 backend Index: admin_music_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/phpbb2/admin/admin_music_auth.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_music_auth.php 7 Sep 2008 18:06:56 -0000 1.4 --- admin_music_auth.php 10 Sep 2008 06:54:23 -0000 1.5 *************** *** 166,170 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get Category list', '', __LINE__, __FILE__, $sql); } --- 166,170 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get Category list', '', __LINE__, __FILE__, $sql); } *************** *** 227,239 **** ) ); // Get the list of phpBB usergroups $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE ." ORDER BY group_name ASC"; if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql); } --- 227,250 ---- ) ); + + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . "'; + break; + case 'phpbb3': + $sql_where = 'group_id <> " . true . "'; + break; + } // Get the list of phpBB usergroups $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " ORDER BY group_name ASC"; if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql); } *************** *** 249,253 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get Category information', '', __LINE__, __FILE__, $sql); } --- 260,264 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get Category information', '', __LINE__, __FILE__, $sql); } *************** *** 307,311 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update music config table', '', __LINE__, __FILE__, $sql); } --- 318,322 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update music config table', '', __LINE__, __FILE__, $sql); } *************** *** 313,317 **** $message = $lang['Music_Auth_successfully'] . '<br /><br />' . sprintf($lang['Click_return_music_auth'], '<a href="' . append_sid("admin_music_auth.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $message); } } --- 324,328 ---- $message = $lang['Music_Auth_successfully'] . '<br /><br />' . sprintf($lang['Click_return_music_auth'], '<a href="' . append_sid("admin_music_auth.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } } |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:54:56
|
Update of /cvsroot/mxbb/mx_music/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17215/admin Modified Files: admin_music_auth.php Log Message: fix for phpBB3 backend Index: admin_music_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_auth.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin_music_auth.php 10 Sep 2008 06:05:17 -0000 1.8 --- admin_music_auth.php 10 Sep 2008 06:54:18 -0000 1.9 *************** *** 123,131 **** ) ); // Get the list of phpBB usergroups $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE ." ORDER BY group_name ASC"; if ( !($result = $db->sql_query($sql)) ) --- 123,142 ---- ) ); + + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . "'; + break; + case 'phpbb3': + $sql_where = 'group_id <> " . true . "'; + break; + } // Get the list of phpBB usergroups $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " ORDER BY group_name ASC"; if ( !($result = $db->sql_query($sql)) ) |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:54:56
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17215 Modified Files: music.php Log Message: fix for phpBB3 backend Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** music.php 10 Sep 2008 06:05:21 -0000 1.23 --- music.php 10 Sep 2008 06:54:21 -0000 1.24 *************** *** 405,412 **** if( $catrows[$i]['cat_moderator_groups'] != '') { // We have usergroup_ID, now we need usergroup name $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> 1 AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $catrows[$i]['cat_moderator_groups'] .") --- 405,423 ---- if( $catrows[$i]['cat_moderator_groups'] != '') { + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . "'; + break; + + case 'phpbb3': + $sql_where = 'group_id <> " . true . "'; + break; + } // We have usergroup_ID, now we need usergroup name $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $catrows[$i]['cat_moderator_groups'] .") *************** *** 796,803 **** if ($thiscat['cat_moderator_groups'] != '') { // Get the namelist of moderator usergroups ! $sql = "SELECT group_id, group_name, group_type, group_single_user FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> 1 AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $thiscat['cat_moderator_groups'] .") --- 807,825 ---- if ($thiscat['cat_moderator_groups'] != '') { + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . "'; + break; + + case 'phpbb3': + $sql_where = 'group_id <> " . true . "'; + break; + } // Get the namelist of moderator usergroups ! $sql = "SELECT * FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " AND group_type <> ". GROUP_HIDDEN ." AND group_id IN (". $thiscat['cat_moderator_groups'] .") |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:36:44
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14034 Modified Files: db_install.php db_upgrade.php Log Message: versiopn change to development rel Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_install.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** db_install.php 10 Sep 2008 06:05:19 -0000 1.11 --- db_install.php 10 Sep 2008 06:36:35 -0000 1.12 *************** *** 33,37 **** } ! $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>'; --- 33,37 ---- } ! $mx_module_version = '2.9.3'; $mx_module_copy = 'Mx-Publisher <i> - Music Center</i> module by Cf Manager & <a href="http://www.mx-publisher.com/" target="_blank">OryNider</a>'; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_upgrade.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** db_upgrade.php 10 Sep 2008 06:05:20 -0000 1.9 --- db_upgrade.php 10 Sep 2008 06:36:35 -0000 1.10 *************** *** 30,34 **** } ! $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(); --- 30,34 ---- } ! $mx_module_version = '2.9.3'; $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(); |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:23:07
|
Update of /cvsroot/mxbb/mx_music/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16750 Modified Files: music_flv_body.tpl Log Message: fix Index: music_flv_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_flv_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_flv_body.tpl 10 Sep 2008 06:05:26 -0000 1.2 --- music_flv_body.tpl 10 Sep 2008 06:23:01 -0000 1.3 *************** *** 155,159 **** <!-- BEGIN flv --> <div id="flvplayer"> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" width="425" height="350" id="flvplayer" align="center"> <param name="allowScriptAccess" value="always" /> <param name="movie" value="{VIDEO_URL}" /> --- 155,159 ---- <!-- BEGIN flv --> <div id="flvplayer"> ! <object width="425" height="350" id="flvplayer" align="center"> <param name="allowScriptAccess" value="always" /> <param name="movie" value="{VIDEO_URL}" /> |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:19:06
|
Update of /cvsroot/mxbb/mx_music/music_box/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9231/music_box/modules Modified Files: music_comment_delete.php music_delete.php music_modcp.php Log Message: missing things Index: music_modcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_modcp.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** music_modcp.php 9 Sep 2008 07:04:33 -0000 1.6 --- music_modcp.php 10 Sep 2008 06:17:53 -0000 1.7 *************** *** 919,923 **** $template->set_filenames(array( ! 'body' => 'confirm_body.tpl') ); --- 919,923 ---- $template->set_filenames(array( ! 'body' => 'music_confirm_body.tpl') ); Index: music_comment_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_comment_delete.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_comment_delete.php 29 Jan 2008 07:51:05 -0000 1.2 --- music_comment_delete.php 10 Sep 2008 06:17:52 -0000 1.3 *************** *** 198,202 **** $template->set_filenames(array( ! 'body' => 'confirm_body.tpl') ); --- 198,202 ---- $template->set_filenames(array( ! 'body' => 'music_confirm_body.tpl') ); Index: music_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_delete.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_delete.php 29 Jan 2008 07:51:05 -0000 1.2 --- music_delete.php 10 Sep 2008 06:17:52 -0000 1.3 *************** *** 137,141 **** $template->set_filenames(array( ! 'body' => 'confirm_body.tpl') ); --- 137,141 ---- $template->set_filenames(array( ! 'body' => 'music_confirm_body.tpl') ); |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:18:22
|
Update of /cvsroot/mxbb/mx_music/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9231/templates/_core Added Files: music_confirm_body.tpl Log Message: missing things --- NEW FILE: music_confirm_body.tpl --- <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> <td class="nav" align="left"><a class="nav" href="{U_INDEX}">{L_INDEX}</a></td> </tr> </table> <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0"> <tr> <th class="thHead" height="25" valign="middle">{MESSAGE_TITLE}</th> </tr> <tr> <td class="row1" align="center"><form action="{S_CONFIRM_ACTION}" method="post"><span class="gen"><br />{MESSAGE_TEXT}<br /><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{L_YES}" class="mainoption" /> <input type="submit" name="cancel" value="{L_NO}" class="liteoption" /></span></form></td> </tr> </table> <br clear="all" /> |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:18:17
|
Update of /cvsroot/mxbb/mx_music/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9231/templates/_core/admin Added Files: confirm_body.tpl Log Message: missing things --- NEW FILE: confirm_body.tpl --- <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0"> <tr> <th class="thHead" height="25" valign="middle">{MESSAGE_TITLE}</th> </tr> <tr> <td class="row1" align="center"><form action="{S_CONFIRM_ACTION}" method="post"><span class="gen"><br />{MESSAGE_TEXT}<br /><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{L_YES}" class="mainoption" /> <input type="submit" name="cancel" value="{L_NO}" class="liteoption" /></span></form></td> </tr> </table> <br clear="all" /> |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:18:14
|
Update of /cvsroot/mxbb/mx_music/music_box In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9231/music_box Added Files: modplayer.swf Log Message: missing things --- NEW FILE: modplayer.swf --- (This appears to be a binary file; contents omitted.) |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:18:13
|
Update of /cvsroot/mxbb/mx_music/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9231/language/lang_english Added Files: index.htm lang_admin.php Log Message: missing things --- NEW FILE: lang_admin.php --- <?php /** * * @package mxBB Portal Module - mx_music * @version $Id: lang_admin.php,v 1.6 2008/09/10 06:18:04 orynider Exp $ * @copyright (c) 2007 [ory...@rd..., OryNider] mxBB Development Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ // // The format of this file is: // // ---> $lang["message"] = "text"; // // Specify your language character encoding... [optional] // // setlocale(LC_ALL, "en"); //BlockCP Parameters $lang['num_of_cols'] = "Num of cols"; $lang['num_of_rows'] = "Num of rows"; $lang['flv_file'] = "Flash video file or ID"; $lang['flv_img'] = "Image (optional)"; $lang['display_most_posts'] = "Display most posts"; $lang['display_random_posts'] = "Display random posts"; $lang['display_top_ranked'] = "Display top ranked"; $lang['display_latest_posts'] = "Display latest posts"; $lang['music_config_updated'] = 'Mx MOM Configuration Updated Successfully.'; $lang['Click_return_music_config'] = 'Click %sHere%s to return to mx_music Configuration'; $lang['index'] = 'Mx MOM Album Index'; $lang['mx_music_admin'] = 'mxBB MOM Integration'; $lang['mx_music_admin_explain'] = 'Here, you can do music index and mxBB page mappings.'; $lang['default_pages_title'] = 'mxBB and MOM integration'; $lang['default_pages_title_explain'] = ''; $lang['default_pages_more_title'] = 'More mappings...'; $lang['default_pages_more_title_explain'] = ''; $lang['integration_enabled'] = 'Activate the Integration?'; $lang['integration_enabled_explain'] = 'When the MOM module integration is activated, all mx_music URLs will be directed to mxBB pages. If deactivated, music.php will operate "as usual"'; $lang['integration_enabled_yes'] = 'Activate'; $lang['integration_enabled_no'] = 'Do not integrate music.php'; $lang['override'] = 'Associate music.php and mxBB pages'; $lang['override_explain'] = 'All mx_music urls are redirected to mxBB pages following these settings.'; $lang['override_yes'] = 'Use Block Settings'; $lang['override_no'] = 'Use fixed mappings (see below)'; // // Configuration // $lang['Music_config'] = 'Music Configuration'; $lang['Music_config_explain'] = 'You can change the general settings of your Music Online here'; $lang['Music_config_updated'] = 'Music Configuration has been updated successfully'; $lang['Click_return_music_config'] = 'Click %sHere%s to return to the Music Configuration'; $lang['Max_songs'] = 'Maximum songs for each Category (-1 = unlimited)'; $lang['User_songs_limit'] = 'Songs limit per category for each user (-1 = unlimited)'; $lang['Moderator_songs_limit'] = 'Songs limit per category for each moderator (-1 = unlimited)'; $lang['Songs_Approval'] = 'Songs Approval'; $lang['Rows_per_page'] = 'Number of rows'; $lang['Cols_per_page'] = 'Number of columns'; $lang['Rows_per_page_music_pic_cat'] = 'Number of rows in virtual images subcategories'; $lang['Cols_per_page_music_pic_cat'] = 'Number of columns in virtual images subcategories'; $lang['Rows_per_page_music_media_cat'] = 'Number of rows in virtual media subcategories'; $lang['Cols_per_page_music_media_cat'] = 'Number of columns in virtual media subcategories'; $lang['Top'] = 'Number of songs on Top Hit List'; $lang['Song_Desc_Max_Length'] = 'Song Lyric/Comment Max Length (bytes)'; $lang['Hotlink_prevent'] = 'Hotlink Prevention'; $lang['Hotlink_allowed'] = 'Allowed domains for hotlink (separated by a comma)'; $lang['Rate_system'] = 'Enable rate system'; $lang['Rate_Scale'] =' Rating Scale'; $lang['Comment_system'] = 'Enable comment system'; $lang['Download_system'] = 'Enable download system'; $lang['Extra_Settings'] = 'Extra Settings'; $lang['Default_Sort_Method'] = 'Default Sort Method'; $lang['Default_Sort_Order'] = 'Default Sort Order'; //Index $lang['Music_Index_Settings'] = 'Music Index'; $lang['Show_Index_Subcats'] = 'Show sub categories in index table'; // // Categories // $lang['Music_Categories_Title'] = 'Music Categories Control'; $lang['Music_Categories_Explain'] = 'On this screen you can manage your categories: create, alter, delete, sort, etc.'; $lang['Category_Permissions'] = 'Category Permissions'; $lang['Category_Title'] = 'Category Title'; $lang['Category_Desc'] = 'Category Description'; $lang['View_level'] = 'View Level'; $lang['Upload_level'] = 'Upload Level'; $lang['Rate_level'] = 'Rate Level'; $lang['Comment_level'] = 'Comment Level'; $lang['Edit_level'] = ' Edit Level'; $lang['Delete_level'] = 'Delete Level'; $lang['New_category_created'] = 'New category has been created successfully'; $lang['Click_return_music_category'] = 'Click %sHere%s to return to the Music Categories Manager'; $lang['Category_updated'] = 'This category has been updated successfully'; $lang['Delete_Category'] = 'Delete Category'; $lang['Delete_Category_Explain'] = 'The form below will allow you to delete a category and decide where you want to put songs it contained'; $lang['Delete_all_songs'] = 'Delete all songs'; $lang['Category_deleted'] = 'This category has been deleted successfully'; $lang['Category_changed_order'] = 'This category has been changed order successfully'; $lang['Create_music'] = 'Create new music'; $lang['Create_sub_music'] = 'Create sub-music'; // // Permissions // $lang['Music_Auth_Title'] = 'Music Permissions'; $lang['Music_Auth_Explain'] = 'Here you can choose which usergroup(s) can be the moderators for each Music category or just has the private access'; $lang['Select_a_Category'] = 'Select a Category'; $lang['Look_up_Category'] = 'Look up Category'; $lang['Music_Auth_successfully'] = 'Auth has been updated successfully'; $lang['Click_return_music_auth'] = 'Click %sHere%s to return to the Music Permissions'; $lang['Upload'] = 'Upload'; $lang['Rate'] = 'Rate'; $lang['Comment'] = 'Comment'; //Allowed File Types $lang['MP3_allowed'] = 'MP3 Allowed'; $lang['WAV_allowed'] = 'WAV Allowed'; $lang['WMA_allowed'] = 'WMA Allowed'; $lang['WMV_allowed'] = 'WMV Allowed'; $lang['MIDI_allowed'] = 'MIDI Allowed'; $lang['RAM_allowed'] = 'RAM Allowed'; $lang['AU_allowed'] = 'AU Allowed'; $lang['MPEG_allowed'] = 'MPEG Allowed'; $lang['AVI_allowed'] = 'AVI Allowed'; $lang['SWF_allowed'] = 'SWF Allowed'; $lang['QT_allowed'] = 'QT Allowed'; $lang['FLV_allowed'] = 'FLV Allowed'; $lang['RM_allowed'] = 'RM Allowed'; $lang['IMG_allowed'] = 'JPG, GIF and PNG Allowed'; // // Song Image // $lang['Max_image_size'] = 'Max song image size (bytes)'; $lang['Max_image_width'] = 'Max song image width (pixel)'; $lang['Max_image_height'] = 'Max song image height (pixel)'; // // That's all Folks! // ------------------------------------------------- ?> --- 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> |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:18:00
|
Update of /cvsroot/mxbb/mx_music/language In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9231/language Added Files: index.htm Log Message: missing things --- 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> |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:11:37
|
Update of /cvsroot/mxbb/mx_music/music_box/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1126 Modified Files: lang_admin.php Log Message: parameters Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/language/lang_english/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin.php 21 Mar 2008 20:18:42 -0000 1.2 --- lang_admin.php 10 Sep 2008 06:11:26 -0000 1.3 *************** *** 18,32 **** // setlocale(LC_ALL, "en"); ! $lang['display_most_posts'] = "Display most posts"; ! $lang['display_random_posts'] = "Display random posts"; ! $lang['display_top_ranked'] = "Display top ranked"; ! $lang['display_latest_posts'] = "Display latest posts"; ! $lang['num_of_cols'] = "Num of cols"; ! $lang['num_of_rows'] = "Num of rows"; $lang['music_config_updated'] = 'Mx MOM Configuration Updated Successfully.'; $lang['Click_return_music_config'] = 'Click %sHere%s to return to mx_music Configuration'; ! $lang['index'] = 'Mx MOM Album Index'; $lang['mx_music_admin'] = 'mxBB MOM Integration'; --- 18,36 ---- // setlocale(LC_ALL, "en"); ! //BlockCP Parameters ! $lang['num_of_cols'] = "Num of cols"; ! $lang['num_of_rows'] = "Num of rows"; ! $lang['flv_file'] = "Flash video file or ID"; ! $lang['flv_img'] = "Image (optional)"; ! ! $lang['display_most_posts'] = "Display most posts"; ! $lang['display_random_posts'] = "Display random posts"; ! $lang['display_top_ranked'] = "Display top ranked"; ! $lang['display_latest_posts'] = "Display latest posts"; $lang['music_config_updated'] = 'Mx MOM Configuration Updated Successfully.'; $lang['Click_return_music_config'] = 'Click %sHere%s to return to mx_music Configuration'; ! $lang['index'] = 'Mx MOM Album Index'; $lang['mx_music_admin'] = 'mxBB MOM Integration'; |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:06:05
|
Update of /cvsroot/mxbb/mx_music/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26047/templates/_core Modified Files: music_cat_xs.tpl music_flv_body.tpl music_index_body.tpl music_page_body.tpl Log Message: get ready for release Index: music_flv_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_flv_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_flv_body.tpl 13 Mar 2008 04:53:37 -0000 1.1 --- music_flv_body.tpl 10 Sep 2008 06:05:26 -0000 1.2 *************** *** 1,2 **** --- 1,6 ---- + <div class="forabg block"> + <div id="p1" class="post bg2 online"> + <div class="inner"><span class="corners-top"><span></span></span> + <div class="textbody"> <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> *************** *** 193,196 **** </tr> </table> ! <br clear="all" /> \ No newline at end of file --- 197,202 ---- </tr> </table> ! </div></div></div> ! <span class="corners-bottom"><span></span></span> ! </div></div> <br clear="all" /> \ No newline at end of file Index: music_page_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_page_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_page_body.tpl 7 Sep 2008 18:06:59 -0000 1.2 --- music_page_body.tpl 10 Sep 2008 06:05:27 -0000 1.3 *************** *** 192,196 **** </object> </div> ! <!-- END flv --> <!-- BEGIN ram --> --- 192,212 ---- </object> </div> ! <!-- END flv --> ! ! <!-- BEGIN mod --> ! <div class="wordtube playlist2" id="WT999"> ! <object width="{WIDTH}" height="{HEIGHT}" id="WT999"> ! <img src="{U_IMG}" width="{WIDTH}" height="{HEIGHT}" alt="To play go to music page." title="{SONG_TITLE}" /> ! <param name="allowScriptAccess" value="always" /> ! <param name="movie" value="{VIDEO_URL}" /> ! <param name="modfile" value="{SONG_URL}" /> ! <param name="bufferlength" value="5" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="noscale" /> ! <param name="salign" value="lt" /> ! <embed src="{VIDEO_URL}" flashvars="modfile={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="{WIDTH}" height="10" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> ! </object> ! </div> ! <!-- END mod --> <!-- BEGIN ram --> *************** *** 220,224 **** <td rowspan="2" class="row1"><table width="90%" height="90%" border="0" align="center" cellpadding="3" cellspacing="2"> <tr> ! <td valign="top" align="center"><img src="{U_IMG}" border="0"></td> </tr> <tr> --- 236,240 ---- <td rowspan="2" class="row1"><table width="90%" height="90%" border="0" align="center" cellpadding="3" cellspacing="2"> <tr> ! <td valign="top" align="center"><img src="{SONG_THUMB_URL}" border="0"></td> </tr> <tr> Index: music_cat_xs.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_cat_xs.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_cat_xs.tpl 9 Sep 2008 06:23:58 -0000 1.3 --- music_cat_xs.tpl 10 Sep 2008 06:05:25 -0000 1.4 *************** *** 328,332 **** </object> </div> ! <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq RAM --> --- 328,347 ---- </object> </div> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq MOD --> ! <div class="wordtube playlist2" id="WT999"> ! <object width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="WT999"> ! <a href="{song_detail.U_SONG_PAGE}"><img src="{song_detail.U_IMG}" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" alt="To play go to music page." title="{song_detail.SONG_TITLE}" /></a> ! <param name="allowScriptAccess" value="always" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="modfile" value="{song_detail.SONG_URL}" /> ! <param name="bufferlength" value="5" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="noscale" /> ! <param name="salign" value="lt" /> ! </object> ! </div> ! <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq RAM --> Index: music_index_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_index_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_index_body.tpl 9 Sep 2008 06:23:58 -0000 1.4 --- music_index_body.tpl 10 Sep 2008 06:05:27 -0000 1.5 *************** *** 372,377 **** <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq YOUTUBE --> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="VideoPlayback" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> <param name="movie" value="{song_detail.VIDEO_URL}" /> <param name="wmode" value="transparent" /> --- 372,377 ---- <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq YOUTUBE --> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="VideoPlayback" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> <param name="movie" value="{song_detail.VIDEO_URL}" /> <param name="wmode" value="transparent" /> *************** *** 379,386 **** <param name="flashvars" value="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLV --> <div id="flvplayer"> <object width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="flvplayer" align="center"> --- 379,386 ---- <param name="flashvars" value="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={song_detail.U_IMG}" /> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLV --> <div id="flvplayer"> <object width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="flvplayer" align="center"> *************** *** 399,404 **** </object> </div> ! <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq RAM --> <embed src="{song_detail.SONG_URL}" align="center" --- 399,419 ---- </object> </div> ! <!-- ENDIF --> + <!-- IF song_detail.S_ROW_TYPE eq MOD --> + <div class="wordtube playlist2" id="WT999"> + <object width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="WT999"> + <a href="{song_detail.U_SONG_PAGE}"><img src="{song_detail.U_IMG}" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" alt="To play go to music page." title="{song_detail.SONG_TITLE}" /></a> + <param name="allowScriptAccess" value="always" /> + <param name="movie" value="{song_detail.VIDEO_URL}" /> + <param name="modfile" value="{song_detail.SONG_URL}" /> + <param name="bufferlength" value="5" /> + <param name="allowfullscreen" value="true" /> + <param name="scale" value="noscale" /> + <param name="salign" value="lt" /> + </object> + </div> + <!-- ENDIF --> + <!-- IF song_detail.S_ROW_TYPE eq RAM --> <embed src="{song_detail.SONG_URL}" align="center" |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:06:04
|
Update of /cvsroot/mxbb/mx_music/music_box/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26047/music_box/modules Modified Files: music_cat.php music_comment.php music_image.php music_media_cat.php music_page.php music_upload.php Log Message: get ready for release Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_upload.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_upload.php 9 Sep 2008 10:38:34 -0000 1.4 --- music_upload.php 10 Sep 2008 06:05:25 -0000 1.5 *************** *** 289,301 **** // -------------------------------- ! $song_title = str_replace("\'", "''", htmlspecialchars(trim($_POST['song_title']))); ! $song_url = str_replace("\'", "''", htmlspecialchars(trim($_POST['song_url']))); ! $image_system = str_replace("\'", "''", htmlspecialchars(trim($_POST['image_system']))); ! $song_desc = str_replace("\'", "''", htmlspecialchars(substr(trim($_POST['song_desc']), 0, $music_config['desc_length']))); ! $song_singer = str_replace("\'", "''", htmlspecialchars(trim($_POST['song_singer']))); $song_username = (!$userdata['session_logged_in']) ? substr(str_replace("\'", "''", htmlspecialchars(trim($_POST['song_username']))), 0, 32) : str_replace("'", "''", $userdata['username']); --- 289,303 ---- // -------------------------------- ! $song_title = str_replace("'", "`", htmlspecialchars(trim($_POST['song_title']))); ! $song_url = str_replace("'", "`", htmlspecialchars(trim($_POST['song_url']))); ! $image_system = str_replace("'", "`", htmlspecialchars(trim($_POST['image_system']))); ! $song_desc = str_replace("'", "`", htmlspecialchars(substr(trim($_POST['song_desc']), 0, $music_config['desc_length']))); ! $song_desc = htmlspecialchars(trim(stripslashes($song_desc))); ! ! $song_singer = str_replace("'", "`", htmlspecialchars(trim($_POST['song_singer']))); $song_username = (!$userdata['session_logged_in']) ? substr(str_replace("\'", "''", htmlspecialchars(trim($_POST['song_username']))), 0, 32) : str_replace("'", "''", $userdata['username']); *************** *** 330,333 **** --- 332,336 ---- $filesize = $_FILES['song_file']['size']; $filetmp = $_FILES['song_file']['tmp_name']; + $filename = strtolower(trim($_FILES['song_file']['name'])); // -------------------------------- *************** *** 338,341 **** --- 341,345 ---- $imagesize = ( !empty($_FILES['song_image']['size']) ) ? $_FILES['song_image']['size'] : 0; $imagetmp = ( !empty($_FILES['song_image']['tmp_name']) ) ? $_FILES['song_image']['tmp_name'] : ''; + $imagename = ( !empty($_FILES['song_image']['name']) ) ? $_FILES['song_image']['name'] : ''; // -------------------------------- *************** *** 572,575 **** --- 576,607 ---- mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type'] . ': ' . $filetype); } + + //Overwrite some types + $ext_filetype = substr($filename, strlen($filename) - 3, 3); + + switch ($ext_filetype) + { + case 'mod': + case 'MOD': + $song_filetype = '.mod'; + break; + + case 's3m': + case 'S3M': + $song_filetype = '.s3m'; + break; + + case 'ult': + case 'ULT': + $song_filetype = '.ult'; + break; + + case 'xm': + case '.xm': + case '.XM': + + $song_filetype = '.xm'; + break; + } } else *************** *** 579,583 **** if( empty($song_filetype) ) { ! $song_filetype = ''; } } --- 611,615 ---- if( empty($song_filetype) ) { ! $song_filetype = '.mp3'; } } Index: music_image.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_image.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_image.php 7 Sep 2008 18:06:55 -0000 1.1 --- music_image.php 10 Sep 2008 06:05:23 -0000 1.2 *************** *** 49,66 **** $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']; ! // ------------------------------------ --- 49,55 ---- $user_id = $thissong['song_user_id']; ! $pic_filename = ($thissong['song_imagename']) ? $thissong['song_imagename'] : 'no_image.gif'; ! $song_url = $thissong['song_url']; ! $pic_filetype = $song_filetype = substr($pic_filename, strlen($pic_filename) - 3, 3); // ------------------------------------ *************** *** 158,162 **** // ------------------------------------ ! if ($thissong['song_imagename']) { switch ($pic_filetype) --- 147,151 ---- // ------------------------------------ ! if ($pic_filetype) { switch ($pic_filetype) Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_cat.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** music_cat.php 9 Sep 2008 07:04:32 -0000 1.10 --- music_cat.php 10 Sep 2008 06:05:22 -0000 1.11 *************** *** 838,849 **** 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 = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); --- 838,841 ---- *************** *** 851,854 **** --- 843,853 ---- $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' ) ) { *************** *** 1112,1124 **** $switch_row_type = 'media'; } ! ! 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)); ! } $song_user_ip = (@function_exists( 'decode_ip' )) ? music_decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); --- 1111,1128 ---- $switch_row_type = 'media'; } ! ! 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)); ! } $song_user_ip = (@function_exists( 'decode_ip' )) ? music_decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); *************** *** 1128,1131 **** --- 1132,1137 ---- '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'], *************** *** 1144,1147 **** --- 1150,1157 ---- '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'], *************** *** 1356,1359 **** --- 1366,1370 ---- 'QT' => 'qt', 'FLV' => 'flv', + 'MOD' => 'mod', 'IMG' => 'img', 'MEDIA' => 'media', Index: music_media_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_media_cat.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** music_media_cat.php 9 Sep 2008 07:04:33 -0000 1.8 --- music_media_cat.php 10 Sep 2008 06:05:24 -0000 1.9 *************** *** 517,520 **** --- 517,524 ---- $row_type = 'flv'; } + else if ( ( $song_filetype == 'mod' ) || ( $song_filetype == 's3m' ) || ( $song_filetype == 'ult' ) || ( $song_filetype == '.xm' ) ) + { + $row_type = 'mod'; + } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { *************** *** 705,712 **** break; ! case 'media': $switch_row_type = 'media'; break; case 'img': $switch_row_type = 'img'; --- 709,732 ---- break; ! case 'mod': ! $switch_row_type = 'media'; ! break; ! ! case 's3m': ! $switch_row_type = 'media'; ! break; ! ! case 'ult': $switch_row_type = 'media'; break; + case '.xm': + $switch_row_type = 'media'; + break; + + case 'media': + $switch_row_type = 'media'; + break; + case 'img': $switch_row_type = 'img'; *************** *** 808,811 **** --- 828,837 ---- $url_video = $music_root_path . 'mediaplayer.swf'; } + 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'; + } else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { *************** *** 1043,1053 **** } ! 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)); } --- 1069,1084 ---- } ! 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)); } *************** *** 1058,1061 **** --- 1089,1094 ---- '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'], *************** *** 1070,1073 **** --- 1103,1110 ---- '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'], Index: music_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_comment.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** music_comment.php 9 Sep 2008 10:38:33 -0000 1.7 --- music_comment.php 10 Sep 2008 06:05:23 -0000 1.8 *************** *** 60,66 **** // ------------------------------------ ! $sql = "SELECT s.*, u.user_id, u.username, COUNT(c.comment_id) as comments_count FROM ". MUSIC_TABLE ." AS s - LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id WHERE song_id = '$song_id' --- 60,65 ---- // ------------------------------------ ! $sql = "SELECT s.*, c.*, s.song_username as username, s.song_user_id as user_id, COUNT(c.comment_id) as comments_count FROM ". MUSIC_TABLE ." AS s LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id WHERE song_id = '$song_id' Index: music_page.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_page.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** music_page.php 9 Sep 2008 07:04:33 -0000 1.8 --- music_page.php 10 Sep 2008 06:05:24 -0000 1.9 *************** *** 296,299 **** --- 296,306 ---- $url_video = $music_root_path . 'mediaplayer.swf'; } + else if ( ( $song_filetype == 'mod' ) || ( $song_filetype == 's3m' ) || ( $song_filetype == 'ult' ) || ( $song_filetype == '.xm' ) ) + { + $template->assign_block_vars('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' ) ) { *************** *** 516,526 **** } ! 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=" . $song_id, true)); } --- 523,550 ---- } ! switch ($song_filetype) { ! case 'flv': ! $url_song = PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . $thissong['song_filename']; ! break; ! ! case 'mod': ! $url_song = PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . $thissong['song_filename']; ! break; ! ! case 's3m': ! $url_song = PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . $thissong['song_filename']; ! break; ! ! case 'ult': ! $url_song = PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . $thissong['song_filename']; ! break; ! ! 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=" . $thissong['song_id'], true)); } *************** *** 543,556 **** 'U_IMG' => mx_append_sid("$img_id"), 'SONG_TITLE' => $thissong['song_title'], '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=" . $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=" . $song_id . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, 'SONG_DESC' => nl2br($thissong['song_desc']), --- 567,586 ---- 'U_IMG' => mx_append_sid("$img_id"), + + 'SONG_THUMB_URL' => ($thissong['song_imagename']) ? mx_append_sid(this_mo_mxurl("music_mode=music_image&width=425&song_id=". $thissong['song_id'], true)) : $img_id, 'SONG_TITLE' => $thissong['song_title'], + + 'U_SONG_PAGE' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $thissong['song_id'])), 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, + + 'FLASH_PLAYER' => $music_root_path . 'mediaplayer.swf', + + 'DUMMY_FLV' => PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . 'no_image.flv', 'SONG_DESC' => nl2br($thissong['song_desc']), *************** *** 600,603 **** --- 630,634 ---- 'QT' => 'qt', 'FLV' => 'flv', + 'MOD' => 'mod', 'IMG' => 'img', 'MEDIA' => 'media', |
|
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(); |
|
From: FlorinCB <ory...@us...> - 2008-09-10 06:05:58
|
Update of /cvsroot/mxbb/mx_music/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26047/admin Modified Files: admin_music_auth.php admin_music_cat.php admin_music_cfg.php admin_music_ext.php Log Message: get ready for release Index: admin_music_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_ext.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_music_ext.php 13 Mar 2008 09:35:10 -0000 1.7 --- admin_music_ext.php 10 Sep 2008 06:05:19 -0000 1.8 *************** *** 14,18 **** { $file = basename( __FILE__ ); ! $module['Music_Online']['Configuration ext'] = 'modules/mx_music/admin/' . $file; return; } --- 14,18 ---- { $file = basename( __FILE__ ); ! $module['Music_Center']['Configuration ext'] = 'modules/mx_music/admin/' . $file; return; } Index: admin_music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cat.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin_music_cat.php 13 Mar 2008 09:35:10 -0000 1.8 --- admin_music_cat.php 10 Sep 2008 06:05:18 -0000 1.9 *************** *** 14,18 **** { $file = basename( __FILE__ ); ! $module['Music_Online']['Categories'] = 'modules/mx_music/admin/' . $file; return; } --- 14,18 ---- { $file = basename( __FILE__ ); ! $module['Music_Center']['Categories'] = 'modules/mx_music/admin/' . $file; return; } Index: admin_music_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_auth.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_music_auth.php 13 Mar 2008 09:35:10 -0000 1.7 --- admin_music_auth.php 10 Sep 2008 06:05:17 -0000 1.8 *************** *** 14,18 **** { $file = basename( __FILE__ ); ! $module['Music_Online']['Permissions'] = 'modules/mx_music/admin/' . $file; return; } --- 14,18 ---- { $file = basename( __FILE__ ); ! $module['Music_Center']['Permissions'] = 'modules/mx_music/admin/' . $file; return; } Index: admin_music_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cfg.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_music_cfg.php 13 Mar 2008 09:35:10 -0000 1.10 --- admin_music_cfg.php 10 Sep 2008 06:05:18 -0000 1.11 *************** *** 14,18 **** { $file = basename( __FILE__ ); ! $module['Music_Online']['Configuration std'] = 'modules/mx_music/admin/' . $file; return; } --- 14,18 ---- { $file = basename( __FILE__ ); ! $module['Music_Center']['Configuration std'] = 'modules/mx_music/admin/' . $file; return; } |
|
From: FlorinCB <ory...@us...> - 2008-09-09 10:39:14
|
Update of /cvsroot/mxbb/mx_music/music_box/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6810/music_box/includes Modified Files: music_functions.php Log Message: emoticons added in comments Index: music_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_functions.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_functions.php 9 Sep 2008 06:54:12 -0000 1.4 --- music_functions.php 9 Sep 2008 10:38:32 -0000 1.5 *************** *** 353,356 **** --- 353,478 ---- } + /** + * Rewritten by Nathan Codding - Feb 6, 2001. + * - Goes through the given string, and replaces xxxx://yyyy with an HTML <a> tag linking + * to that URL + * - Goes through the given string, and replaces www.xxxx.yyyy[zzzz] with an HTML <a> tag linking + * to http://www.xxxx.yyyy[/zzzz] + * - Goes through the given string, and replaces xxxx@yyyy with an HTML mailto: tag linking + * to that email address + * - Only matches these 2 patterns either after a space, or at the beginning of a line + * + * Notes: the email one might get annoying - it's easy to make it more restrictive, though.. maybe + * have it require something like xx...@yy... or such. We'll see. + * We can add here more phpBB3 stuff in time - Ory + */ + function music_make_clickable($text) + { + $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text); + + // pad it with a space so we can match things at the start of the 1st line. + $ret = ' ' . $text; + + // matches an "xxxx://yyyy" URL at the start of a line, or after a space. + // xxxx can only be alpha characters. + // yyyy is anything up to the first space, newline, comma, double quote or < + $ret = preg_replace("#(^|[\n ])([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1<a href=\"\\2\" target=\"_blank\">\\2</a>", $ret); + + // matches a "www|ftp.xxxx.yyyy[/zzzz]" kinda lazy URL thing + // Must contain at least 2 dots. xxxx contains either alphanum, or "-" + // zzzz is optional.. will contain everything up to the first space, newline, + // comma, double quote or <. + $ret = preg_replace("#(^|[\n ])((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $ret); + + // matches an email@domain type address at the start of a line, or after a space. + // Note: Only the followed chars are valid; alphanums, "-", "_" and or ".". + $ret = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret); + + // Remove our padding.. + $ret = substr($ret, 1); + + return($ret); + } + + /** + * phpBB Smilies pass. + * + * Hacking smilies_pass from phpbb/includes/bbcode.php + * + * @param string $message + * @return string + * + */ + function music_smilies_pass($message) + { + static $orig, $repl; + global $board_config, $mx_root_path, $phpbb_root_path, $phpEx; + + switch (PORTAL_BACKEND) + { + case 'internal': + $smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed + $smiley_root_path = $phpbb_root_path; //same here + $smiley_url = 'smile_url'; + $smiley_id = 'smilies_id'; + $emotion = 'emoticon'; + break; + case 'phpbb2': + $smiley_path_url = PHPBB_URL; + $smiley_root_path = $phpbb_root_path; + $smiley_url = 'smile_url'; + $smiley_id = 'smilies_id'; + $emotion = 'emoticon'; + break; + case 'phpbb3': + $smiley_path_url = PHPBB_URL; + $smiley_root_path = $phpbb_root_path; + $smiley_url = 'smiley_url'; + $smiley_id = 'smiley_id'; + $emotion = 'emotion'; + $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); + break; + } + + //$smilies_path = $board_config['smilies_path']; + //$board_config['smilies_path'] = $smiley_path_url . $board_config['smilies_path']; + + if (!isset($orig)) + { + global $db; + $orig = $repl = array(); + + $sql = 'SELECT * FROM ' . SMILIES_TABLE; + if( !$result = $db->sql_query($sql) ) + { + mx_message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql); + } + + $smilies = $db->sql_fetchrowset($result); + + if (count($smilies)) + { + @usort($smilies, 'smiley_sort'); + } + + for ($i = 0; $i < count($smilies); $i++) + { + $orig[] = "/(?<=.\W|\W.|^\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/"; + $repl[] = '<img src="' . $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$smiley_url] . '" alt="' . $smilies[$i][$emotion] . '" border="0" />'; + } + } + + if (count($orig)) + { + $message = preg_replace($orig, $repl, ' ' . $message . ' '); + $message = substr($message, 1, -1); + } + + //$board_config['smilies_path'] = $smilies_path; + + return $message; + } + + // ---------------------------------------------------------------------------- |
|
From: FlorinCB <ory...@us...> - 2008-09-09 10:38:42
|
Update of /cvsroot/mxbb/mx_music/music_box/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6810/music_box/modules Modified Files: music_comment.php music_comment_edit.php music_upload.php Log Message: emoticons added in comments Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_upload.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_upload.php 7 Sep 2008 18:06:52 -0000 1.3 --- music_upload.php 9 Sep 2008 10:38:34 -0000 1.4 *************** *** 29,40 **** // for this Upload script, we prefer POST to GET // ------------------------------------ ! ! if( isset($HTTP_POST_VARS['cat_id']) ) ! { ! $cat_id = intval($HTTP_POST_VARS['cat_id']); ! } ! else if( isset($HTTP_GET_VARS['cat_id']) ) { ! $cat_id = intval($HTTP_GET_VARS['cat_id']); } else --- 29,35 ---- // for this Upload script, we prefer POST to GET // ------------------------------------ ! if (!$mx_request_vars->is_empty_request('cat_id')) { ! $cat_id = $mx_request_vars->request('cat_id', MX_TYPE_INT, 0); } else *************** *** 160,164 **** */ ! if( !isset($HTTP_POST_VARS['song_title']) ) // is it not submitted? { // -------------------------------- --- 155,159 ---- */ ! if( !isset($_POST['song_title']) ) // is it not submitted? { // -------------------------------- *************** *** 205,211 **** } - $template->set_filenames(array( ! 'body' => 'music_upload_body.tpl') ); --- 200,205 ---- } $template->set_filenames(array( ! 'upload_body' => 'music_upload_body.tpl') ); *************** *** 282,286 **** // Generate the page // ! $template->pparse('body'); if ( !$is_block ) --- 276,280 ---- // Generate the page // ! $template->pparse('upload_body'); if ( !$is_block ) *************** *** 295,309 **** // -------------------------------- ! $song_title = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['song_title']))); ! $song_url = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['song_url']))); ! $image_system = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['image_system']))); ! $song_desc = str_replace("\'", "''", htmlspecialchars(substr(trim($HTTP_POST_VARS['song_desc']), 0, $music_config['desc_length']))); ! $song_singer = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['song_singer']))); ! $song_username = (!$userdata['session_logged_in']) ? substr(str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['song_username']))), 0, 32) : str_replace("'", "''", $userdata['username']); if( empty($song_title) ) --- 289,303 ---- // -------------------------------- ! $song_title = str_replace("\'", "''", htmlspecialchars(trim($_POST['song_title']))); ! $song_url = str_replace("\'", "''", htmlspecialchars(trim($_POST['song_url']))); ! $image_system = str_replace("\'", "''", htmlspecialchars(trim($_POST['image_system']))); ! $song_desc = str_replace("\'", "''", htmlspecialchars(substr(trim($_POST['song_desc']), 0, $music_config['desc_length']))); ! $song_singer = str_replace("\'", "''", htmlspecialchars(trim($_POST['song_singer']))); ! $song_username = (!$userdata['session_logged_in']) ? substr(str_replace("\'", "''", htmlspecialchars(trim($_POST['song_username']))), 0, 32) : str_replace("'", "''", $userdata['username']); if( empty($song_title) ) *************** *** 333,339 **** // -------------------------------- ! $filetype = $HTTP_POST_FILES['song_file']['type']; ! $filesize = $HTTP_POST_FILES['song_file']['size']; ! $filetmp = $HTTP_POST_FILES['song_file']['tmp_name']; // -------------------------------- --- 327,333 ---- // -------------------------------- ! $filetype = $_FILES['song_file']['type']; ! $filesize = $_FILES['song_file']['size']; ! $filetmp = $_FILES['song_file']['tmp_name']; // -------------------------------- *************** *** 341,347 **** // -------------------------------- ! $imagetype = ( !empty($HTTP_POST_FILES['song_image']['type']) ) ? $HTTP_POST_FILES['song_image']['type'] : ''; ! $imagesize = ( !empty($HTTP_POST_FILES['song_image']['size']) ) ? $HTTP_POST_FILES['song_image']['size'] : 0; ! $imagetmp = ( !empty($HTTP_POST_FILES['song_image']['tmp_name']) ) ? $HTTP_POST_FILES['song_image']['tmp_name'] : ''; // -------------------------------- --- 335,341 ---- // -------------------------------- ! $imagetype = ( !empty($_FILES['song_image']['type']) ) ? $_FILES['song_image']['type'] : ''; ! $imagesize = ( !empty($_FILES['song_image']['size']) ) ? $_FILES['song_image']['size'] : 0; ! $imagetmp = ( !empty($_FILES['song_image']['tmp_name']) ) ? $_FILES['song_image']['tmp_name'] : ''; // -------------------------------- *************** *** 646,650 **** if( $image_system == '1' ) { ! if( !empty($HTTP_POST_FILES['song_image']['tmp_name']) ) { $ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var'; --- 640,644 ---- if( $image_system == '1' ) { ! if( !empty($_FILES['song_image']['tmp_name']) ) { $ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var'; *************** *** 675,679 **** if( $image_system == '1' ) { ! if( !empty($HTTP_POST_FILES['song_image']['size']) ) { $image_size = getimagesize($song_image_path . $song_imagename); --- 669,673 ---- if( $image_system == '1' ) { ! if( !empty($_FILES['song_image']['size']) ) { $image_size = getimagesize($song_image_path . $song_imagename); *************** *** 736,741 **** mx_message_die(GENERAL_MESSAGE, $message); } ! ! // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | --- 730,734 ---- mx_message_die(GENERAL_MESSAGE, $message); } ! print("Powered by Music Online 2.0 (c) 2003 Cf Manager"); //Fix for internal backend // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | Index: music_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_comment.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** music_comment.php 9 Sep 2008 07:04:32 -0000 1.6 --- music_comment.php 9 Sep 2008 10:38:33 -0000 1.7 *************** *** 28,62 **** // 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 ! { ! if( isset($HTTP_GET_VARS['comment_id']) ) ! { ! $comment_id = intval($HTTP_GET_VARS['comment_id']); ! } ! else if( isset($HTTP_POST_VARS['comment_id']) ) ! { ! $comment_id = intval($HTTP_POST_VARS['comment_id']); ! } ! else ! { ! mx_message_die(GENERAL_ERROR, 'Bad request'); ! } ! } ! // ------------------------------------ // Get $song_id from $comment_id // ------------------------------------ ! ! if( isset($comment_id) ) { $sql = "SELECT comment_id, comment_song_id --- 28,38 ---- // Check the request // ------------------------------------ ! $song_id = $mx_request_vars->request('song_id', MX_TYPE_INT, 1); ! $comment_id = $mx_request_vars->request('comment_id', MX_TYPE_INT, false); // ------------------------------------ // Get $song_id from $comment_id // ------------------------------------ ! if(!$mx_request_vars->is_empty_request('comment_id')) { $sql = "SELECT comment_id, comment_song_id *************** *** 101,105 **** $total_comments = $thissong['comments_count']; ! $comments_per_page = $board_config['posts_per_page']; if( empty($thissong) ) --- 77,81 ---- $total_comments = $thissong['comments_count']; ! $comments_per_page = ($board_config['posts_per_page']) ? $board_config['posts_per_page'] : 25; if( empty($thissong) ) *************** *** 157,167 **** ! if( !isset($HTTP_POST_VARS['comment']) ) ! { ! /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! Comments Screen ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ ! // ------------------------------------ // Get the comments thread --- 133,142 ---- ! /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! Comments Screen ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + if(!isset($_POST['comment'])) + { // ------------------------------------ // Get the comments thread *************** *** 169,181 **** // ------------------------------------ ! if( !isset($comment_id) ) { ! 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 --- 144,156 ---- // ------------------------------------ ! if(!is_numeric($comment_id)) { ! if( isset($_GET['start']) ) { ! $start = intval($_GET['start']); } ! else if( isset($_POST['start']) ) { ! $start = intval($_POST['start']); } else *************** *** 209,215 **** } ! if( isset($HTTP_GET_VARS['sort_order']) ) { ! switch ($HTTP_GET_VARS['sort_order']) { case 'ASC': --- 184,190 ---- } ! if( isset($_GET['sort_order']) ) { ! switch ($_GET['sort_order']) { case 'ASC': *************** *** 220,226 **** } } ! else if( isset($HTTP_POST_VARS['sort_order']) ) { ! switch ($HTTP_POST_VARS['sort_order']) { case 'ASC': --- 195,201 ---- } } ! else if( isset($_POST['sort_order']) ) { ! switch ($_POST['sort_order']) { case 'ASC': *************** *** 240,251 **** $limit_sql = ($start == 0) ? $comments_per_page : $start .','. $comments_per_page; ! $sql = "SELECT c.*, u.user_id, u.username FROM ". MUSIC_COMMENT_TABLE ." AS c - LEFT JOIN ". USERS_TABLE ." AS u ON c.comment_user_id = u.user_id WHERE c.comment_song_id = '$song_id' ORDER BY c.comment_id $sort_order LIMIT $limit_sql"; ! if( !$result = $db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain comments information from the database', '', __LINE__, __FILE__, $sql); --- 215,225 ---- $limit_sql = ($start == 0) ? $comments_per_page : $start .','. $comments_per_page; ! $sql = "SELECT c.*, c.comment_username as username, c.comment_user_id as user_id FROM ". MUSIC_COMMENT_TABLE ." AS c WHERE c.comment_song_id = '$song_id' ORDER BY c.comment_id $sort_order LIMIT $limit_sql"; ! if(!$result = $db->sql_query($sql)) { mx_message_die(GENERAL_ERROR, 'Could not obtain comments information from the database', '', __LINE__, __FILE__, $sql); *************** *** 265,275 **** if ($commentrow[$i]['comment_edit_count'] > 0) { ! $sql = "SELECT c.comment_id, c.comment_edit_user_id, u.user_id, u.username FROM ". MUSIC_COMMENT_TABLE ." AS c - LEFT JOIN ". USERS_TABLE ." AS u ON c.comment_edit_user_id = u.user_id WHERE c.comment_id = '".$commentrow[$i]['comment_id']."' LIMIT 1"; ! ! if( !$result = $db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain last edit information from the database', '', __LINE__, __FILE__, $sql); --- 239,247 ---- if ($commentrow[$i]['comment_edit_count'] > 0) { ! $sql = "SELECT c.*, c.comment_username as username, c.comment_edit_user_id as user_id FROM ". MUSIC_COMMENT_TABLE ." AS c WHERE c.comment_id = '".$commentrow[$i]['comment_id']."' LIMIT 1"; ! if( !$result = $db->sql_querylimit($sql, 1) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain last edit information from the database', '', __LINE__, __FILE__, $sql); *************** *** 289,293 **** } ! $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( --- 261,270 ---- } ! $comment_user_ip = music_decode_ip($commentrow[$i]['comment_user_ip']); ! ! // Smilies ! $commentrow[$i]['comment_text'] = $mx_bbcode->smilies_pass($commentrow[$i]['comment_text']); ! $commentrow[$i]['comment_text'] = $mx_bbcode->make_clickable($commentrow[$i]['comment_text']); ! $commentrow[$i]['comment_text'] = nl2br($commentrow[$i]['comment_text']); $template->assign_block_vars('commentrow', array( *************** *** 327,331 **** $template->set_filenames(array( ! 'body' => 'music_comment_body.tpl') ); --- 304,308 ---- $template->set_filenames(array( ! 'comment_body' => 'music_comment_body.tpl') ); *************** *** 351,354 **** --- 328,333 ---- } } + + music_comment_sql_smilies($auth_data['comment']); $thissong_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']); *************** *** 376,380 **** 'L_COMMENTS' => $lang['Comments'], ! 'L_POST_YOUR_COMMENT' => $lang['Post_your_comment'], 'L_MESSAGE' => $lang['Message'], 'L_USERNAME' => $lang['Username'], --- 355,359 ---- 'L_COMMENTS' => $lang['Comments'], ! 'L_POST_YOUR_COMMENT' => $lang['Post_your_comment'] ? $lang['Post_your_comment'] : 'Post your comment', 'L_MESSAGE' => $lang['Message'], 'L_USERNAME' => $lang['Username'], *************** *** 393,396 **** --- 372,377 ---- 'L_SUBMIT' => $lang['Submit'], + + 'U_MUSIC_SMILIES' => mx_append_sid(PHPBB_URL . "posting.$phpEx?mode=smilies"), 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_comment&song_id=$song_id")) *************** *** 401,405 **** // Generate the page // ! $template->pparse('body'); if ( !$is_block ) --- 382,386 ---- // Generate the page // ! $template->pparse('comment_body'); if ( !$is_block ) *************** *** 411,415 **** { /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! Comment Submited ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ --- 392,396 ---- { /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! Comment Submited ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ *************** *** 430,436 **** } ! $comment_text = str_replace("\'", "''", htmlspecialchars(substr(trim($HTTP_POST_VARS['comment']), 0, $music_config['desc_length']))); ! $comment_username = (!$userdata['session_logged_in']) ? str_replace("\'", "''", substr(htmlspecialchars(trim($HTTP_POST_VARS['comment_username'])), 0, 32)) : str_replace("'", "''", htmlspecialchars(trim($userdata['username']))); if( empty($comment_text) ) --- 411,417 ---- } ! $comment_text = str_replace("\'", "''", htmlspecialchars(substr(trim($_POST['comment']), 0, $music_config['desc_length']))); ! $comment_username = (!$userdata['session_logged_in']) ? str_replace("\'", "''", substr(htmlspecialchars(trim($_POST['comment_username'])), 0, 32)) : str_replace("'", "''", htmlspecialchars(trim($userdata['username']))); if( empty($comment_text) ) *************** *** 450,467 **** ! // -------------------------------- ! // Check username for guest posting ! // -------------------------------- if (!$userdata['session_logged_in']) { ! if ($comment_username != '') ! { ! $result = validate_username($comment_username); ! if ( $result['error'] ) { ! mx_message_die(GENERAL_MESSAGE, $result['error_msg']); } - } } --- 431,448 ---- ! // -------------------------------- ! // Check username for guest posting ! // -------------------------------- if (!$userdata['session_logged_in']) { ! if ($comment_username != '') { ! $result = validate_username($comment_username); ! if ( $result['error'] ) ! { ! mx_message_die(GENERAL_MESSAGE, $result['error_msg']); ! } } } *************** *** 472,478 **** $comment_time = time(); - $comment_user_id = $userdata['user_id']; - $comment_user_ip = $userdata['session_ip']; // -------------------------------- --- 453,473 ---- $comment_time = time(); + switch (PORTAL_BACKEND) + { + case 'internal': + + case 'phpbb2': + + $comment_user_id= $userdata['user_id']; + $comment_user_ip = $userdata['session_ip']; + break; + + case 'phpbb3': + + $comment_user_id= $mx_user->data['user_id']; + $comment_user_ip = music_encode_ip($mx_user->data['session_ip']); + break; + } // -------------------------------- *************** *** 480,484 **** // -------------------------------- $sql = "SELECT MAX(comment_id) AS max ! FROM ". MUSIC_COMMENT_TABLE; if( !$result = $db->sql_query($sql) ) --- 475,479 ---- // -------------------------------- $sql = "SELECT MAX(comment_id) AS max ! FROM ". MUSIC_COMMENT_TABLE; if( !$result = $db->sql_query($sql) ) *************** *** 497,501 **** $sql = "INSERT INTO ". MUSIC_COMMENT_TABLE ." (comment_id, comment_song_id, comment_user_id, comment_username, comment_user_ip, comment_time, comment_text) ! VALUES ('$comment_id', '$song_id', '$comment_user_id', '$comment_username', '$comment_user_ip', '$comment_time', '$comment_text')"; if( !$result = $db->sql_query($sql) ) { --- 492,496 ---- $sql = "INSERT INTO ". MUSIC_COMMENT_TABLE ." (comment_id, comment_song_id, comment_user_id, comment_username, comment_user_ip, comment_time, comment_text) ! VALUES ('$comment_id', '$song_id', '$comment_user_id', '$comment_username', '$comment_user_ip', '$comment_time', '$comment_text')"; if( !$result = $db->sql_query($sql) ) { *************** *** 504,513 **** ! // -------------------------------- ! // Complete... now send a message to user ! // -------------------------------- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . '#'.$comment_id.'">') ); --- 499,508 ---- ! // -------------------------------- ! // Complete... now send a message to user ! // -------------------------------- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . '#'.$comment_id.'">') ); *************** *** 516,521 **** mx_message_die(GENERAL_MESSAGE, $message); } ! ! // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | --- 511,515 ---- mx_message_die(GENERAL_MESSAGE, $message); } ! echo("Powered by Music Online 2.0 (c) 2003 Cf Manager"); //Fix for internal backend // +------------------------------------------------------+ // | 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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** music_comment_edit.php 9 Sep 2008 07:04:33 -0000 1.5 --- music_comment_edit.php 9 Sep 2008 10:38:33 -0000 1.6 *************** *** 29,39 **** // ------------------------------------ ! if( isset($HTTP_GET_VARS['comment_id']) ) ! { ! $comment_id = intval($HTTP_GET_VARS['comment_id']); ! } ! else if( isset($HTTP_POST_VARS['comment_id']) ) { ! $comment_id = intval($HTTP_POST_VARS['comment_id']); } else --- 29,35 ---- // ------------------------------------ ! if(!$mx_request_vars->is_empty_request('comment_id')) { ! $comment_id = $mx_request_vars->request('comment_id', MX_TYPE_INT, 1); } else *************** *** 208,212 **** 'L_COMMENTS' => $lang['Comments'], ! 'L_POST_YOUR_COMMENT' => $lang['Post_your_comment'], 'L_MESSAGE' => $lang['Message'], 'L_USERNAME' => $lang['Username'], --- 204,208 ---- 'L_COMMENTS' => $lang['Comments'], ! 'L_POST_YOUR_COMMENT' => $lang['Post_your_comment'] ? $lang['Post_your_comment'] : 'Post your comment', 'L_MESSAGE' => $lang['Message'], 'L_USERNAME' => $lang['Username'], *************** *** 280,285 **** mx_message_die(GENERAL_MESSAGE, $message); } ! ! // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | --- 276,280 ---- mx_message_die(GENERAL_MESSAGE, $message); } ! echo("Powered by Music Online 2.0 (c) 2003 Cf Manager"); //Fix for internal backend // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | |
|
From: FlorinCB <ory...@us...> - 2008-09-09 10:38:41
|
Update of /cvsroot/mxbb/mx_music/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6810/templates/_core Modified Files: music_comment_body.tpl Log Message: emoticons added in comments Index: music_comment_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_comment_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_comment_body.tpl 29 Jan 2008 07:51:29 -0000 1.1 --- music_comment_body.tpl 9 Sep 2008 10:38:35 -0000 1.2 *************** *** 1,4 **** ! <center><b><span class="genmed"><h3>{SONG_TITLE} :: {SINGER}</h3></span></b></center> <form action="{S_MUSIC_ACTION}" method="post"> <table width="100%" cellspacing="2" cellpadding="2" border="0"> --- 1,194 ---- ! <script language="JavaScript" type="text/javascript"> ! <!-- ! function checkForm() { ! formErrors = false; ! ! if ((document.commentform.comment.value.length < 2) && (document.commentform.rate.value == -1)) ! { ! formErrors = "{L_COMMENT_NO_TEXT}"; ! } ! else if (document.commentform.comment.value.length > {S_MAX_LENGTH}) ! { ! formErrors = "{L_COMMENT_TOO_LONG}"; ! } ! ! if (formErrors) ! { ! alert(formErrors); ! return false; ! } ! else ! { ! return true; ! } ! } ! ! function storeCaret(textEl) ! { ! if (textEl.createTextRange) textEl.caretPos = document.selection.createRange().duplicate(); ! } ! ! //how to add smilies ! function emotions(text) ! { ! if (document.commentform.comment.createTextRange && document.commentform.comment.caretPos) ! { ! var caretPos = document.commentform.comment.caretPos; ! caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text; ! document.commentform.comment.focus(); ! } ! else ! { ! document.commentform.comment.value += text; ! document.commentform.comment.focus(); ! } ! } + + + //pops up a window with all smilies + function openAllSmiles() + { + smiles = window.open('{U_MUSIC_SMILIES}', '_phpbbsmilies', 'HEIGHT=600,resizable=yes,scrollbars=yes,WIDTH=470'); + smiles.focus(); + return false; + } + + + function checkFormRate() + { + formErrors = false; + if (document.ratingform.rating.value == -1) + { + formErrors = "{L_PLEASE_RATE_IT}"; + } + + if (formErrors) + { + alert(formErrors); + return false; + } + else + { + return true; + } + } + + // Startup variables + var imageTag = false; + var theSelection = false; + + // Check for Browser & Platform for PC & IE specific bits + // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html + var clientPC = navigator.userAgent.toLowerCase(); // Get client info + var clientVer = parseInt(navigator.appVersion); // Get browser version + + var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1)); + var is_nav = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1) + && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1) + && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1)); + var is_moz = 0; + + var is_win = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1)); + var is_mac = (clientPC.indexOf("mac")!=-1); + + var baseHeight; + window.onload = initInsertions; + //window.attachEvent('onload', function(){initInsertions();}) + + function initInsertions() + { + //document.commentform.comment.focus(); + if (is_ie && typeof(baseHeight) != 'number') baseHeight = document.selection.createRange().duplicate().boundingHeight; + } + + function emoticon2(text) + { + var txtarea = document.commentform.comment; + text = ' ' + text + ' '; + if (txtarea.createTextRange && txtarea.caretPos) + { + if (baseHeight != txtarea.caretPos.boundingHeight) + { + txtarea.focus(); + storeCaret(txtarea); + } + var caretPos = txtarea.caretPos; + caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text; + txtarea.focus(); + } + else if ((txtarea.selectionEnd | txtarea.selectionEnd == 0) && (txtarea.selectionStart | txtarea.selectionStart == 0)) + { + mozInsert(txtarea, text, ""); + return; + } + else + { + txtarea.value += text; + txtarea.focus(); + } + } + + function emoticon(text) { + text = ' ' + text + ' '; + if (opener.document.forms['post'].message.createTextRange && opener.document.forms['post'].message.caretPos) { + var caretPos = opener.document.forms['post'].message.caretPos; + caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text; + opener.document.forms['post'].message.focus(); + } else { + opener.document.forms['post'].message.value += text; + opener.document.forms['post'].message.focus(); + } + } + + // Insert at Claret position. Code from + // http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 + function storeCaret(textEl) + { + if (textEl.createTextRange) textEl.caretPos = document.selection.createRange().duplicate(); + } + + function mozWrap(txtarea, open, close) + { + var selLength = txtarea.textLength; + var selStart = txtarea.selectionStart; + var selEnd = txtarea.selectionEnd; + if (selEnd == 1 || selEnd == 2) + { + selEnd = selLength; + } + + var s1 = (txtarea.value).substring(0,selStart); + var s2 = (txtarea.value).substring(selStart, selEnd) + var s3 = (txtarea.value).substring(selEnd, selLength); + txtarea.value = s1 + open + s2 + close + s3; + return; + } + + function mozInsert(txtarea, openTag, closeTag) + { + if (txtarea.selectionEnd > txtarea.value.length) + { + txtarea.selectionEnd = txtarea.value.length; + } + + var startPos = txtarea.selectionStart; + var endPos = txtarea.selectionEnd + openTag.length; + + txtarea.value=txtarea.value.slice(0,startPos) + openTag + txtarea.value.slice(startPos); + txtarea.value=txtarea.value.slice(0,endPos) + closeTag + txtarea.value.slice(endPos); + + txtarea.selectionStart = startPos + openTag.length; + txtarea.selectionEnd = endPos; + txtarea.focus(); + } + // --> + </script> + + <div class="forabg block"> + <div id="p1" class="post bg2 online"> + <div class="inner"><span class="corners-top"></span></div> + <div class="textbody"> + <center><b><span class="genmed"><h3>{SONG_TITLE} :: {SINGER}</h3></span></b></center> <form action="{S_MUSIC_ACTION}" method="post"> <table width="100%" cellspacing="2" cellpadding="2" border="0"> *************** *** 59,85 **** </form> ! <script language="JavaScript" type="text/javascript"> ! <!-- ! function checkForm() { ! formErrors = false; ! ! if (document.commentform.comment.value.length < 2) ! { ! formErrors = "{L_COMMENT_NO_TEXT}"; ! } ! else if (document.commentform.comment.value.length > {S_MAX_LENGTH}) ! { ! formErrors = "{L_COMMENT_TOO_LONG}"; ! } ! ! if (formErrors) { ! alert(formErrors); ! return false; ! } else { ! return true; ! } ! } ! // --> ! </script> <!-- BEGIN switch_comment_post --> --- 249,254 ---- </form> ! </div> ! </div> <!-- BEGIN switch_comment_post --> *************** *** 96,102 **** <!-- END logout --> <tr> ! <td class="row1" valign="top" width="30%"><span class="genmed">{L_MESSAGE}<br> {L_MAX_LENGTH}: <b>{S_MAX_LENGTH}</b></span></td> <td class="row2" valign="top"><textarea name="comment" class="post" cols="60" rows="7">{S_MESSAGE}</textarea></td> </tr> <tr> --- 265,287 ---- <!-- END logout --> <tr> ! <td class="row1" valign="top" width="30%"><span class="genmed">{L_MESSAGE}<br /> {L_MAX_LENGTH}: <b>{S_MAX_LENGTH}</b></span></td> <td class="row2" valign="top"><textarea name="comment" class="post" cols="60" rows="7">{S_MESSAGE}</textarea></td> + + <td class="row2 bg3" valign="middle" width="20%"> + <table border="0" cellspacing="0" cellpadding="5"> + <tr> + <!-- BEGIN smilies --> + <td><img src="{switch_comment_post.smilies.URL}" border="0" onmouseover="this.style.cursor='hand';" onclick="emotions(' {switch_comment_post.smilies.CODE} ');" alt="{switch_comment_post.smilies.DESC}" /></td> + + <!-- BEGIN new_col --> + </tr><tr> + <!-- END new_col --> + <!-- END smilies --> + </tr> + </table> + + <!-- INPUT TYPE='button' CLASS=BUTTON NAME="SmilesButt" VALUE="Show All Smilies" ONCLICK="openAllSmiles();" / --> + </tr> <tr> *************** *** 107,110 **** --- 292,297 ---- <!-- END switch_comment_post --> + <span class="corners-bottom"><span></span></span> + </div> <br clear="all" /> |
|
From: FlorinCB <ory...@us...> - 2008-09-09 10:38:40
|
Update of /cvsroot/mxbb/mx_music/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6810/templates/prosilver Removed Files: music_lists.html Log Message: emoticons added in comments --- music_lists.html DELETED --- |
|
From: FlorinCB <ory...@us...> - 2008-09-09 10:38:39
|
Update of /cvsroot/mxbb/mx_music/music_box In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6810/music_box Modified Files: music_common.php Log Message: emoticons added in comments Index: music_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/music_common.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** music_common.php 7 Sep 2008 18:06:41 -0000 1.9 --- music_common.php 9 Sep 2008 10:38:35 -0000 1.10 *************** *** 242,245 **** --- 242,246 ---- 'L_MUSIC' => $lang['Music'], 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), + 'U_MUSIC_SMILIES' => mx_append_sid(PHPBB_URL . "posting.$phpEx?mode=smilies"), 'L_SEARCH' => $lang['Search'], 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()) |
2 messages has been excluded from this view by a project administrator.
