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: Jon O. <jon...@us...> - 2007-09-09 16:22:46
|
Update of /cvsroot/mxbb/core/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29984/prosilver Log Message: Directory /cvsroot/mxbb/core/templates/prosilver added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:22:46
|
Update of /cvsroot/mxbb/core/templates/subsilver2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29984/subsilver2 Log Message: Directory /cvsroot/mxbb/core/templates/subsilver2 added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:19:10
|
Update of /cvsroot/mxbb/core/templates/mxSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28647/mxSilver Log Message: Directory /cvsroot/mxbb/core/templates/mxSilver added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:18:22
|
Update of /cvsroot/mxbb/core/templates/_core/images/phpbb2/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28243/lang_english Log Message: Directory /cvsroot/mxbb/core/templates/_core/images/phpbb2/lang_english added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:17:35
|
Update of /cvsroot/mxbb/core/templates/_core/images/block_icons In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27782/block_icons Log Message: Directory /cvsroot/mxbb/core/templates/_core/images/block_icons added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:17:35
|
Update of /cvsroot/mxbb/core/templates/_core/images/menu_icons In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27782/menu_icons Log Message: Directory /cvsroot/mxbb/core/templates/_core/images/menu_icons added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:17:35
|
Update of /cvsroot/mxbb/core/templates/_core/images/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27782/phpbb2 Log Message: Directory /cvsroot/mxbb/core/templates/_core/images/phpbb2 added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:17:35
|
Update of /cvsroot/mxbb/core/templates/_core/images/page_icons In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27782/page_icons Log Message: Directory /cvsroot/mxbb/core/templates/_core/images/page_icons added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:17:35
|
Update of /cvsroot/mxbb/core/templates/_core/images/admin_icons In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27782/admin_icons Log Message: Directory /cvsroot/mxbb/core/templates/_core/images/admin_icons added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:17:22
|
Update of /cvsroot/mxbb/core/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27752/admin Log Message: Directory /cvsroot/mxbb/core/templates/_core/admin added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:17:21
|
Update of /cvsroot/mxbb/core/templates/_core/images In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27752/images Log Message: Directory /cvsroot/mxbb/core/templates/_core/images added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:17:01
|
Update of /cvsroot/mxbb/core/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27365/_core Log Message: Directory /cvsroot/mxbb/core/templates/_core added to the repository |
|
From: OryNider <ory...@us...> - 2007-09-08 13:29:07
|
Update of /cvsroot/mxbb/mx_music/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1686 Modified Files: music_cat_body.tpl music_cat_xs.tpl music_index_body.tpl music_media_cat_body.tpl music_pic_cat_body.tpl Log Message: This will fix many bugs that commed with the new features. If you allready upgraded to 2.0.7 please upgrade manualy the database. :P Index: music_cat_xs.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_cat_xs.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** music_cat_xs.tpl 5 Sep 2007 23:37:49 -0000 1.6 --- music_cat_xs.tpl 8 Sep 2007 13:29:03 -0000 1.7 *************** *** 24,186 **** <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th class="thTop" height="25" align="center" colspan="7" nowrap="nowrap">{L_CATEGORY} ! :: {CAT_TITLE}</th> </tr> <tr> ! <td width="31%" align="center" class="catBottom"> ! ! <!-- BEGIN songrow --> ! <!-- BEGIN song_detail --> ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <th height="25" colspan="2" class="thTop"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></th> ! </tr> ! <tr> ! <td width="44%" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq media --> ! <SCRIPT LANGUAGE="JavaScript"> ! var WMP7; ! var Mac; ! var Win; ! var Unix; ! var Linux; ! Win = navigator.userAgent.indexOf("Win") > -1; ! Mac = navigator.userAgent.indexOf("Mac") > -1; ! Unix = navigator.appVersion.indexOf("X11") > -1; ! Linux = navigator.appVersion.indexOf("Linux") > -1; ! if (Mac) ! { ! 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.U_SONG}"'); ! document.write (' src="{song_detail.U_SONG}"'); ! document.write (' Name=MediaPlayer'); ! document.write (' ShowControls=1'); ! document.write (' ShowDisplay=1'); ! document.write (' ShowStatusBar=1'); ! document.write (' AUTOSTART=0'); ! document.write (' AutoSize=1'); ! document.write (' width="{song_detail.WIDTH}"'); ! document.write (' height="{song_detail.HEIGHT}">'); ! document.write (' </Embed>'); } ! if ( navigator.appName != "Netscape" ){ ! document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="70" height="300" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="0" filename="{song_detail.U_SONG}" src="{song_detail.U_SONG}" ></embed>'); } ! } ! if (Win) ! { ! if ( navigator.appName != "Netscape" ) ! { ! WMP7 = new ActiveXObject('WMPlayer.OCX'); ! } ! // Windows Media Player 7 Code ! if ( WMP7 ) ! { ! document.write (' <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="1">'); ! document.write ('<PARAM NAME="uiMode" VALUE="mini">'); ! 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.U_SONG}"'); ! document.write (' src="{song_detail.U_SONG}"'); ! document.write (' Name="MediaPlayer2"'); ! document.write (' ShowControls="1"'); ! document.write (' ShowDisplay="1"'); ! document.write (' ShowStatusBar="1"'); ! document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="1"'); ! document.write (' width="70"'); ! document.write (' height="300">'); ! document.write (' </embed>'); ! document.write ('</OBJECT>'); ! } ! // Windows Media Player 6.4 Code ! else ! { ! //IE Code ! document.write (' <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="1">'); ! //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.U_SONG}"'); ! document.write (' src="{song_detail.U_SONG}"'); ! document.write (' Name="MediaPlayer"'); ! document.write (' ShowControls="1"'); ! document.write (' ShowDisplay="1"'); ! document.write (' ShowStatusBar="1"'); ! document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="1"'); ! document.write (' width="{song_detail.WIDTH}"'); ! document.write (' height="{song_detail.HEIGHT}">'); ! document.write (' </embed>'); ! document.write ('</OBJECT>'); ! } ! } ! else ! { ! document.write(' <embed type="audio/mpeg" height="70" width="300" AUTOSTART="0" filename="{song_detail.U_SONG}" src="{song_detail.U_SONG}" ></embed>'); ! } ! </SCRIPT> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq flash --> ! <EMBED src="{song_detail.U_SONG}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"> ! </EMBED> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq flashvideo --> ! <embed src="{song_detail.SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> ! </embed> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq youtube --> ! <object width="425" height="350"> ! <param name="movie" value="{song_detail.SONG_URL}"></param> ! <param name="wmode" value="transparent"></param> ! <embed src="{song_detail.VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> ! </embed> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq ram --> ! <embed src="{song_detail.U_SONG}" align="center" ! width="275" height="40" type="audio/x-pn-realaudio-plugin" console="cons" ! controls="ControlPanel" autostart="false"></embed> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq qt --> ! <object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="377" height="212"> <param name="qtsrc" value="{song_detail.U_SONG}"> <param name="autoplay" value="false"> --- 24,237 ---- <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th class="thTop" height="25" align="center" colspan="7" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE}</th> </tr> + <!-- BEGIN no_songs --> <tr> ! <td class="row1" align="center" colspan="{S_COLS}" height="50"><span class="gen">{L_NO_SONGS}</span></td> ! </tr> ! <!-- END no_songs --> ! <!-- BEGIN songrow --> ! <tr> ! <!-- BEGIN songcol --> ! <td align="center" width="{S_COL_WIDTH}" class="row1"></td> ! <!-- END songcol --> ! </tr> ! <tr> ! <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq img --> ! <td> ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <th height="25" colspan="7" class="thTop"><span class="genmed">{L_PIC_TITLE} :: {song_detail.SONG_TITLE}</span></th> ! </tr> ! <tr> ! <td class="row1" width="{S_COL_WIDTH}" colspan="7" align="center" valign="top" class="catBottom"> ! <div align="center" valign="top"> ! <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> ! </div> ! <!-- ! <div align="center" valign="top"> ! <span class="genmed">{L_PIC_TITLE} :: {song_detail.SONG_TITLE}</span> ! </div> ! --> ! </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="catBottom" height="28"><span class="gen">{L_PIC_TITLE}</span></td> ! <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER} </span></td> ! <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED} </span></td> ! <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW} </span></td> ! <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING} </span></td> ! <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS} </span></td> ! <td width="5%" align="center" class="catBottom" height="28"> </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE} ! </span></td> ! <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td> ! <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td> ! <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td> ! <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td> ! <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td> ! <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR /> ! {songrow.song_detail.DELETE}<BR /> ! {songrow.song_detail.LOCK}<BR /> ! {songrow.song_detail.MOVE}</span></td> ! </tr> ! </table> ! </td> ! <!-- ELSE --> ! <td> ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <th height="25" colspan="7" class="thTop"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></th> ! </tr> ! <tr> ! <td width="44%" colspan="7" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq media --> ! <SCRIPT LANGUAGE="JavaScript"> ! var WMP7; ! var Mac; ! var Win; ! var Unix; ! var Linux; ! Win = navigator.userAgent.indexOf("Win") > -1; ! Mac = navigator.userAgent.indexOf("Mac") > -1; ! Unix = navigator.appVersion.indexOf("X11") > -1; ! Linux = navigator.appVersion.indexOf("Linux") > -1; ! if (Mac) ! { ! 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.U_SONG}"'); ! document.write (' src="{song_detail.U_SONG}"'); ! document.write (' Name=MediaPlayer'); ! document.write (' ShowControls=1'); ! document.write (' ShowDisplay=1'); ! document.write (' ShowStatusBar=1'); ! document.write (' AUTOSTART=0'); ! document.write (' AutoSize=1'); ! document.write (' width="{song_detail.WIDTH}"'); ! document.write (' height="{song_detail.HEIGHT}">'); ! document.write (' </Embed>'); } ! if ( navigator.appName != "Netscape" ){ ! document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="70" height="300" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="0" filename="{song_detail.U_SONG}" src="{song_detail.U_SONG}" ></embed>'); } ! } ! if (Win) ! { ! if ( navigator.appName != "Netscape" ) ! { ! WMP7 = new ActiveXObject('WMPlayer.OCX'); ! } ! // Windows Media Player 7 Code ! if ( WMP7 ) ! { ! document.write (' <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="1">'); ! document.write ('<PARAM NAME="uiMode" VALUE="mini">'); ! 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.U_SONG}"'); ! document.write (' src="{song_detail.U_SONG}"'); ! document.write (' Name="MediaPlayer2"'); ! document.write (' ShowControls="1"'); ! document.write (' ShowDisplay="1"'); ! document.write (' ShowStatusBar="1"'); ! document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="1"'); ! document.write (' width="70"'); ! document.write (' height="300">'); ! document.write (' </embed>'); ! document.write ('</OBJECT>'); ! } ! // Windows Media Player 6.4 Code ! else ! { ! //IE Code ! document.write (' <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="1">'); ! //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.U_SONG}"'); ! document.write (' src="{song_detail.U_SONG}"'); ! document.write (' Name="MediaPlayer"'); ! document.write (' ShowControls="1"'); ! document.write (' ShowDisplay="1"'); ! document.write (' ShowStatusBar="1"'); ! document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="1"'); ! document.write (' width="{song_detail.WIDTH}"'); ! document.write (' height="{song_detail.HEIGHT}">'); ! document.write (' </embed>'); ! document.write ('</OBJECT>'); ! } ! } ! else ! { ! document.write(' <embed type="audio/mpeg" height="70" width="300" AUTOSTART="0" filename="{song_detail.U_SONG}" src="{song_detail.U_SONG}" ></embed>'); ! } ! </SCRIPT> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq flash --> ! <EMBED src="{song_detail.U_SONG}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"> ! </EMBED> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq flashvideo --> ! <embed src="{song_detail.SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> ! </embed> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq youtube --> ! <object width="425" height="350"> ! <param name="movie" value="{song_detail.SONG_URL}"></param> ! <param name="wmode" value="transparent"></param> ! <embed src="{song_detail.VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> ! </embed> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq ram --> ! <embed src="{song_detail.U_SONG}" align="center" ! width="275" height="40" type="audio/x-pn-realaudio-plugin" console="cons" ! controls="ControlPanel" autostart="false"></embed> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq qt --> ! <object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="377" height="212"> <param name="qtsrc" value="{song_detail.U_SONG}"> <param name="autoplay" value="false"> *************** *** 190,248 **** <param name="cache" value="false"> <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="false" kioskmode="true" cache="false"> - </embed> - </object> - <!-- ENDIF --> - - <!-- IF song_detail.S_ROW_TYPE eq img --> - <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> - <!-- ENDIF --> - - </td> - </tr> - </table> - <!-- END song_detail --> ! </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="catBottom"> ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SONG_TITLE} </span></td> ! <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER} </span></td> ! <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED} </span></td> ! <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW} </span></td> ! <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING} </span></td> ! <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS} </span></td> ! <td width="5%" align="center" class="catBottom" height="28"> </td> ! </tr> ! <!-- BEGIN no_songs --> ! <tr> ! <td class="row1" align="center" colspan="7" height="50"><span class="gen">{L_NO_SONGS}</span></td> ! </tr> ! <!-- END no_songs --> ! <tr> ! <!-- BEGIN songcol --> ! <!-- END songcol --> ! <!-- BEGIN song_detail --> ! <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE}</span></td> ! <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td> ! <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td> ! <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td> ! <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td> ! <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td> ! <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR /> ! {songrow.song_detail.DELETE}<BR /> ! {songrow.song_detail.LOCK}<BR /> ! {songrow.song_detail.MOVE}</span></td> ! <!-- END song_detail --> ! </tr> ! <!-- END songrow --> ! </table> ! </td> ! </tr> ! <tr> <td class="catBottom" colspan="7" align="center" height="28"> <span class="gensmall">{L_SELECT_SORT_METHOD}: <select name="sort_method"> --- 241,284 ---- <param name="cache" value="false"> <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="false" kioskmode="true" cache="false"> ! </embed> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq img --> ! <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> ! <!-- ENDIF --> ! </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="catBottom" height="28"><span class="gen">{L_SONG_TITLE}</span></td> ! <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER} </span></td> ! <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED} </span></td> ! <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW} </span></td> ! <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING} </span></td> ! <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS} </span></td> ! <td width="5%" align="center" class="catBottom" height="28"> </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE} ! </span></td> ! <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td> ! <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td> ! <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td> ! <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td> ! <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td> ! <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR /> ! {songrow.song_detail.DELETE}<BR /> ! {songrow.song_detail.LOCK}<BR /> ! {songrow.song_detail.MOVE}</span></td> ! </tr> ! </table> ! </td> ! <!-- ENDIF --> ! <!-- END song_detail --> ! </tr> ! <!-- END songrow --> ! <tr> <td class="catBottom" colspan="7" align="center" height="28"> <span class="gensmall">{L_SELECT_SORT_METHOD}: <select name="sort_method"> Index: music_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_cat_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_cat_body.tpl 5 Sep 2007 23:37:49 -0000 1.2 --- music_cat_body.tpl 8 Sep 2007 13:29:03 -0000 1.3 *************** *** 24,61 **** <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th class="thTop" height="25" align="center" colspan="7" nowrap="nowrap">{L_CATEGORY} ! :: {CAT_TITLE}</th> ! </tr> ! <tr> ! <td width="31%" align="center" class="catBottom" height="28"><span class="gen">{L_SONG_TITLE}</span></td> ! <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER} </span></td> ! <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED} </span></td> ! <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW} </span></td> ! <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING} </span></td> ! <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS} </span></td> ! <td width="5%" align="center" class="catBottom" height="28"> </td> </tr> <!-- BEGIN no_songs --> <tr> ! <td class="row1" align="center" colspan="7" height="50"><span class="gen">{L_NO_SONGS}</span></td> </tr> <!-- END no_songs --> <!-- BEGIN songrow --> ! <tr> ! <!-- BEGIN songcol --> ! <!-- END songcol --> ! <!-- BEGIN song_detail --> ! <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE} ! </span></td> ! <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td> ! <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td> ! <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td> ! <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td> ! <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td> ! <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR /> ! {songrow.song_detail.DELETE}<BR /> ! {songrow.song_detail.LOCK}<BR /> ! {songrow.song_detail.MOVE}</span></td> ! <!-- END song_detail --> </tr> <!-- END songrow --> --- 24,72 ---- <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th class="thTop" height="25" align="center" colspan="7" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE}</th> </tr> <!-- BEGIN no_songs --> <tr> ! <td class="row1" align="center" colspan="{S_COLS}" height="50"><span class="gen">{L_NO_SONGS}</span></td> </tr> <!-- END no_songs --> <!-- BEGIN songrow --> ! <tr> ! <!-- BEGIN songcol --> ! <td align="center" width="{S_COL_WIDTH}" class="row1"></td> ! <!-- END songcol --> ! </tr> ! <tr> ! <!-- BEGIN song_detail --> ! <td> ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <th height="25" colspan="7" class="thTop"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></th> ! </tr> ! <tr> ! <td width="31%" align="center" class="catBottom" height="28"><span class="gen">{L_SONG_TITLE}</span></td> ! <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER} </span></td> ! <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED} </span></td> ! <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW} </span></td> ! <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING} </span></td> ! <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS} </span></td> ! <td width="5%" align="center" class="catBottom" height="28"> </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE} ! </span></td> ! <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td> ! <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td> ! <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td> ! <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td> ! <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td> ! <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR /> ! {songrow.song_detail.DELETE}<BR /> ! {songrow.song_detail.LOCK}<BR /> ! {songrow.song_detail.MOVE}</span></td> ! </tr> ! </table> ! </td> ! <!-- END song_detail --> </tr> <!-- END songrow --> Index: music_pic_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_pic_cat_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_pic_cat_body.tpl 5 Sep 2007 23:37:50 -0000 1.1 --- music_pic_cat_body.tpl 8 Sep 2007 13:29:03 -0000 1.2 *************** *** 45,58 **** <tr> <!-- BEGIN song_detail --> ! <!-- IF song_detail.S_ROW_TYPE eq img --> ! <td class="row1" width="{S_COL_WIDTH}" align="center" valign="top" class="catBottom"> ! <div align="center" valign="top"> ! <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> ! </div> ! <div align="center" valign="top"> ! <span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span> ! </div> ! </td> ! <!-- ENDIF --> <!-- END song_detail --> </tr> --- 45,246 ---- <tr> <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq img --> ! <td> ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <td class="row1" width="{S_COL_WIDTH}" align="center" valign="top" class="catBottom"> ! <div align="center" valign="top"> ! <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> ! </div> ! <!-- ! <div align="center" valign="top"> ! <span class="genmed">{L_PIC_TITLE} :: {song_detail.SONG_TITLE}</span> ! </div> ! --> ! </td> ! </tr> ! <tr> ! <td class="row2" width="{S_COL_WIDTH}" height="25" align="center" valign="top" class="catBottom"><span class="genmed">{L_PIC_TITLE} :: {song_detail.SONG_TITLE}</span></td> ! </tr> ! </table> ! </td> ! <!-- ELSE --> ! <td> ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <td width="44%" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq media --> ! <SCRIPT LANGUAGE="JavaScript"> ! var WMP7; ! var Mac; ! var Win; ! var Unix; ! var Linux; ! ! Win = navigator.userAgent.indexOf("Win") > -1; ! Mac = navigator.userAgent.indexOf("Mac") > -1; ! Unix = navigator.appVersion.indexOf("X11") > -1; ! Linux = navigator.appVersion.indexOf("Linux") > -1; ! ! if (Mac) ! { ! ! 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.U_SONG}"'); ! document.write (' src="{song_detail.U_SONG}"'); ! document.write (' Name=MediaPlayer'); ! document.write (' ShowControls=1'); ! document.write (' ShowDisplay=1'); ! document.write (' ShowStatusBar=1'); ! document.write (' AUTOSTART=0'); ! document.write (' AutoSize=0'); ! document.write (' width="{song_detail.WIDTH}"'); ! document.write (' height="{song_detail.HEIGHT}">'); ! document.write (' </Embed>'); } ! ! if ( navigator.appName != "Netscape" ){ ! document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="70" height="300" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="0" filename="{song_detail.U_SONG}" src="{song_detail.U_SONG}" ></embed>'); } ! } ! ! ! if (Win) ! { ! if ( navigator.appName != "Netscape" ) ! { ! WMP7 = new ActiveXObject('WMPlayer.OCX'); ! } ! ! // Windows Media Player 7 Code ! if ( WMP7 ) ! { ! ! document.write (' <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="0">'); ! document.write ('<PARAM NAME="uiMode" VALUE="mini">'); ! document.write ('<PARAM NAME="width" VALUE="{song_detail.WIDTH}">'); ! 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.U_SONG}"'); ! document.write (' src="{song_detail.U_SONG}"'); ! document.write (' Name="MediaPlayer2"'); ! document.write (' ShowControls="1"'); ! document.write (' ShowDisplay="1"'); ! document.write (' ShowStatusBar="1"'); ! document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="0"'); ! document.write (' width="{song_detail.WIDTH}"'); ! document.write (' height="{song_detail.HEIGHT}">'); ! document.write (' </embed>'); ! ! document.write ('</OBJECT>'); ! ! } ! ! // Windows Media Player 6.4 Code ! else ! { ! ! //IE Code ! document.write (' <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"'); ! document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); ! document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="false">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); ! document.write ('<PARAM NAME="AutoSize" VALUE="0">'); ! document.write ('<PARAM NAME="width" VALUE="{song_detail.WIDTH}">'); ! document.write ('<PARAM NAME="height" VALUE="{song_detail.WIDTH}">'); ! ! //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.U_SONG}"'); ! document.write (' src="{song_detail.U_SONG}"'); ! document.write (' Name="MediaPlayer"'); ! document.write (' ShowControls="1"'); ! document.write (' ShowDisplay="1"'); ! document.write (' ShowStatusBar="1"'); ! document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="0"'); ! document.write (' width="{song_detail.WIDTH}"'); ! document.write (' height="{song_detail.HEIGHT}">'); ! document.write (' </embed>'); ! ! document.write ('</OBJECT>'); ! ! } ! } ! else ! { ! document.write(' <embed type="audio/mpeg" height="{song_detail.HEIGHT}" width="{song_detail.WIDTH}" AUTOSTART="0" filename="{song_detail.U_SONG}" src="{song_detail.U_SONG}" ></embed>'); ! } ! </SCRIPT> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq flash --> ! <EMBED src="{song_detail.U_SONG}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"> ! </EMBED> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq flashvideo --> ! <embed src="{song_detail.SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" flashvars=""> ! </embed> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq youtube --> ! <object width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> ! <param name="movie" value="{song_detail.SONG_URL}"></param> ! <param name="wmode" value="transparent"></param> ! <embed src="{song_detail.VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" flashvars=""> ! </embed> ! </object> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq ram --> ! <embed src="{song_detail.U_SONG}" align="center" ! width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" type="audio/x-pn-realaudio-plugin" console="cons" ! controls="ControlPanel" autostart="false"></embed> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq qt --> ! <object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> ! <param name="qtsrc" value="{song_detail.U_SONG}"> ! <param name="autoplay" value="false"> ! <param name="loop" value="false"> ! <param name="controller" value="true"> ! <param name="kioskmode" value="true"> ! <param name="cache" value="false"> ! <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.U_SONG}" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="false" kioskmode="true" cache="false"> ! ! </embed> ! </object> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq img --> ! <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> ! <!-- ENDIF --> ! ! </td> ! </tr> ! <tr> ! <td class="row2" width="{S_COL_WIDTH}" height="25" align="center" valign="top" class="catBottom"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></td> ! </tr> ! </table> ! </td> ! <!-- ENDIF --> <!-- END song_detail --> </tr> Index: music_index_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_index_body.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_index_body.tpl 5 Sep 2007 23:37:50 -0000 1.3 --- music_index_body.tpl 8 Sep 2007 13:29:03 -0000 1.4 *************** *** 77,81 **** <span class="forumlink"> <a href="{catrow.U_VIEW_CAT}" class="forumlink">{catrow.CAT_TITLE}</a></span><br /> <span class="genmed">{catrow.CAT_DESC}</span><br /> ! <span class="gensmall">{catrow.L_MODERATORS} {catrow.MODERATORS} {catrow.SUBCATS}</span> </td> <td class="row1" height="50" width="50%"> --- 77,81 ---- <span class="forumlink"> <a href="{catrow.U_VIEW_CAT}" class="forumlink">{catrow.CAT_TITLE}</a></span><br /> <span class="genmed">{catrow.CAT_DESC}</span><br /> ! <span class="gensmall">{catrow.L_MODERATORS} {catrow.MODERATORS} <!-- BEGIN subcat_link -->{subcat_link.SUBCATS}<!-- END subcat_link --></span> </td> <td class="row1" height="50" width="50%"> Index: music_media_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_media_cat_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_media_cat_body.tpl 5 Sep 2007 23:37:50 -0000 1.1 --- music_media_cat_body.tpl 8 Sep 2007 13:29:03 -0000 1.2 *************** *** 1,9 **** - <style type="text/css"> - <!-- - .shadow {color:#00aa00; filter: DropShadow(Color=#660000, OffX=3, OffY=3, Positive=1)} - img.shadow {color:#00aa00; filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=3, OffY=3, Color='gray', Positive='true')} - --> - </style> - <form action="{S_MUSIC_ACTION}" method="post"> <table width="100%" cellspacing="2" cellpadding="2" border="0"> --- 1,2 ---- *************** *** 28,59 **** </table> ! <table width="100%" cellpadding="1" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th width="{S_COL_WIDTH}" height="25" class="cat" align="center" colspan="{S_COLS}" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE} :: {L_ALL_CAT_PICS}</th> ! </tr> ! <!-- BEGIN no_songs --> ! <tr> ! <td class="row1" align="center" colspan="{S_COLS}" height="50"><span class="gen">{L_NO_SONGS}</span></td> ! </tr> ! <!-- END no_songs --> ! <!-- BEGIN songrow --> ! <tr> ! <!-- BEGIN songcol --> <td align="center" width="{S_COL_WIDTH}" class="row1"></td> ! <!-- END songcol --> ! </tr> ! <tr> ! <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq media --> ! <td width="31%" align="center" class="catBottom"> ! ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <th height="25" colspan="2" class="thTop"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></th> ! </tr> ! <tr> ! <td width="44%" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq media --> ! <SCRIPT LANGUAGE="JavaScript"> var WMP7; var Mac; --- 21,51 ---- </table> ! <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th class="thTop" height="25" align="center" colspan="7" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE}</th> ! </tr> ! <!-- BEGIN no_songs --> ! <tr> ! <td class="row1" align="center" colspan="{S_COLS}" height="50"><span class="gen">{L_NO_SONGS}</span></td> ! </tr> ! <!-- END no_songs --> ! <!-- BEGIN songrow --> ! <tr> ! <!-- BEGIN songcol --> <td align="center" width="{S_COL_WIDTH}" class="row1"></td> ! <!-- END songcol --> ! </tr> ! <tr> ! <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq media --> ! <td> ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <th height="25" colspan="7" class="thTop"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></th> ! </tr> ! <tr> ! <td width="44%" colspan="7" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq media --> ! <SCRIPT LANGUAGE="JavaScript"> var WMP7; var Mac; *************** *** 172,175 **** --- 164,186 ---- <!-- ENDIF --> + <!-- IF song_detail.S_ROW_TYPE eq flash --> + <EMBED src="{song_detail.U_SONG}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"> + </EMBED> + <!-- ENDIF --> + + <!-- IF song_detail.S_ROW_TYPE eq flashvideo --> + <embed src="{song_detail.SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> + </embed> + <!-- ENDIF --> + + <!-- IF song_detail.S_ROW_TYPE eq youtube --> + <object width="425" height="350"> + <param name="movie" value="{song_detail.SONG_URL}"></param> + <param name="wmode" value="transparent"></param> + <embed src="{song_detail.VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> + </embed> + </object> + <!-- ENDIF --> + <!-- IF song_detail.S_ROW_TYPE eq ram --> <embed src="{song_detail.U_SONG}" align="center" *************** *** 187,222 **** <param name="cache" value="false"> <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="false" kioskmode="true" cache="false"> </embed> </object> <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq flash --> ! <EMBED src="{song_detail.U_SONG}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"> ! </EMBED> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq flashvideo --> ! <embed src="{song_detail.SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> ! </embed> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq youtube --> ! <object width="425" height="350"> ! <param name="movie" value="{song_detail.SONG_URL}"></param> ! <param name="wmode" value="transparent"></param> ! <embed src="{song_detail.VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> ! </embed> ! </object> <!-- ENDIF --> ! </td> ! </tr> ! </table> ! ! </td> ! <!-- ENDIF --> ! <!-- END song_detail --> ! </tr> ! <!-- END songrow --> </table> <table width="100%" cellspacing="2" border="0" cellpadding="2"> --- 198,304 ---- <param name="cache" value="false"> <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="false" kioskmode="true" cache="false"> + </embed> </object> <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq img --> ! <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> <!-- ENDIF --> ! </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="catBottom" height="28"><span class="gen">{L_SONG_TITLE}</span></td> ! <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER} </span></td> ! <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED} </span></td> ! <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW} </span></td> ! <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING} </span></td> ! <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS} </span></td> ! <td width="5%" align="center" class="catBottom" height="28"> </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE} ! </span></td> ! <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td> ! <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td> ! <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td> ! <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td> ! <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td> ! <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR /> ! {songrow.song_detail.DELETE}<BR /> ! {songrow.song_detail.LOCK}<BR /> ! {songrow.song_detail.MOVE}</span></td> ! </tr> ! </table> ! </td> ! <!-- ELSE --> ! <td> ! <table width="100%" cellpadding="2" cellspacing="1" border="0"> ! <tr> ! <th height="25" colspan="7" class="thTop"><span class="genmed">{L_PIC_TITLE} :: {song_detail.SONG_TITLE}</span></th> ! </tr> ! <tr> ! <td class="row1" width="{S_COL_WIDTH}" colspan="7" align="center" valign="top" class="catBottom"> ! <div align="center" valign="top"> ! <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> ! </div> ! <!-- ! <div align="center" valign="top"> ! <span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span> ! </div> ! --> ! </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="catBottom" height="28"><span class="gen">{L_PIC_TITLE}</span></td> ! <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER} </span></td> ! <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED} </span></td> ! <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW} </span></td> ! <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING} </span></td> ! <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS} </span></td> ! <td width="5%" align="center" class="catBottom" height="28"> </td> ! </tr> ! <tr> ! <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE} ! </span></td> ! <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td> ! <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td> ! <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td> ! <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td> ! <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td> ! <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR /> ! {songrow.song_detail.DELETE}<BR /> ! {songrow.song_detail.LOCK}<BR /> ! {songrow.song_detail.MOVE}</span></td> ! </tr> ! </table> ! </td> ! <!-- ENDIF --> ! <!-- END song_detail --> ! </tr> ! <!-- END songrow --> ! <tr> ! <td class="catBottom" colspan="7" align="center" height="28"> <span class="gensmall">{L_SELECT_SORT_METHOD}: ! <select name="sort_method"> ! <option {SORT_TIME} value='song_time'>{L_TIME}</option> ! <option {SORT_SONG_TITLE} value='song_title'>{L_SONG_TITLE}</option> ! <option {SORT_SINGER} value='song_singer'>{L_SINGER}</option> ! <option {SORT_USERNAME} value='username'>{L_USERNAME}</option> ! <option {SORT_VIEW} value='song_view_count'>{L_VIEW}</option> ! {SORT_RATING_OPTION} ! {SORT_COMMENTS_OPTION} ! {SORT_NEW_COMMENT_OPTION} ! ! </select> ! {L_ORDER}: ! <select name="sort_order"> ! <option {SORT_ASC} value='ASC'>{L_ASC}</option> ! <option {SORT_DESC} value='DESC'>{L_DESC}</option> ! </select> ! ! <input type="submit" name="submit" value="{L_SORT}" class="liteoption" /> ! </span> </td> ! </tr> </table> <table width="100%" cellspacing="2" border="0" cellpadding="2"> |
|
From: OryNider <ory...@us...> - 2007-09-08 13:29:07
|
Update of /cvsroot/mxbb/mx_music/templates/subSilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1686/admin Modified Files: music_config_body.tpl Log Message: This will fix many bugs that commed with the new features. If you allready upgraded to 2.0.7 please upgrade manualy the database. :P Index: music_config_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/admin/music_config_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_config_body.tpl 1 Sep 2007 05:39:09 -0000 1.2 --- music_config_body.tpl 8 Sep 2007 13:29:02 -0000 1.3 *************** *** 9,12 **** --- 9,16 ---- </tr> <tr> + <td class="row1"><span class="genmed">{L_INDEX_SHOW_SUBCATS}</span></td> + <td class="row2"><span class="genmed"><input onchange="setChange();" type="radio" {INDEX_SHOW_SUBCATS_ENABLED} name="show_index_subcats" value="1" />{L_YES} <input onchange="setChange();" type="radio" {INDEX_SHOW_SUBCATS_DISABLED} name="show_index_subcats" value="0" />{L_NO}</span></td> + </tr> + <tr> <td class="row1" width="45%"><span class="genmed">{L_MAX_SONGS}</span></td> <td class="row2"><input class="post" type="text" maxlength="9" size="9" name="max_songs" value="{MAX_SONGS}" /></td> *************** *** 78,82 **** <tr> <td class="row1"><span class="genmed">IMG</span></td> ! <td class="row2"><span class="genmed"><input type="radio" {IMG_ENABLED} name="rm_allowed" value="1" />{L_YES} <input type="radio" {IMG_DISABLED} name="img_allowed" value="0" />{L_NO}</span></td> </tr> <tr> --- 82,86 ---- <tr> <td class="row1"><span class="genmed">IMG</span></td> ! <td class="row2"><span class="genmed"><input type="radio" {IMG_ENABLED} name="img_allowed" value="1" />{L_YES} <input type="radio" {IMG_DISABLED} name="img_allowed" value="0" />{L_NO}</span></td> </tr> <tr> *************** *** 93,96 **** --- 97,124 ---- </tr> <tr> + <td class="row1"><span class="genmed">{L_COLS_PER_PAGE}</span></td> + <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="cols_per_page" value="{COLS_PER_PAGE}" /></td> + </tr> + <tr> + <td class="row1"><span class="genmed">eXtreme Styles</span></td> + <td class="row2"><span class="genmed"><input type="radio" {XS_ENABLED} name="xs_enabled" value="1" />{L_YES} <input type="radio" {XS_DISABLED} name="xs_enabled" value="0" />{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="genmed">{L_ROWS_PER_PAGE_PIC}</span></td> + <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="rows_per_page_pic" value="{ROWS_PER_PAGE_PIC}" /></td> + </tr> + <tr> + <td class="row1"><span class="genmed">{L_COLS_PER_PAGE_PIC}</span></td> + <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="cols_per_page_pic" value="{COLS_PER_PAGE_PIC}" /></td> + </tr> + <tr> + <td class="row1"><span class="genmed">{L_ROWS_PER_PAGE_MEDIA}</span></td> + <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="rows_per_page_media" value="{ROWS_PER_PAGE_MEDIA}" /></td> + </tr> + <tr> + <td class="row1"><span class="genmed">{L_COLS_PER_PAGE_MEDIA}</span></td> + <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="cols_per_page_media" value="{COLS_PER_PAGE_MEDIA}" /></td> + </tr> + <tr> <td class="row1"><span class="genmed">{L_TOP}</span></td> <td class="row2"><input class="post" type="text" maxlength="2" size="2" name="top" value="{TOP}" /></td> |
|
From: OryNider <ory...@us...> - 2007-09-08 13:28:53
|
Update of /cvsroot/mxbb/mx_music/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1661/lang_romanian Modified Files: lang_admin_music.php lang_main_music.php Log Message: This will fix many bugs that commed with the new features. If you allready upgraded to 2.0.7 please upgrade manualy the database. :P Index: lang_main_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_romanian/lang_main_music.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_main_music.php 30 Aug 2007 03:52:32 -0000 1.4 --- lang_main_music.php 8 Sep 2007 13:28:47 -0000 1.5 *************** *** 29,32 **** --- 29,33 ---- $lang['Last_Song'] = 'Ultima melodie'; $lang['Public_Categories'] = 'Categorii publice'; + $lang['Music_sub_categories'] = 'Sub-categorii'; $lang['No_Songs'] = 'Nici o melodie'; $lang['Top_Songs'] = 'Top melodii'; *************** *** 44,47 **** --- 45,54 ---- $lang['Upload_Song'] = 'Uploadeazã melodie'; $lang['Song_Title'] = 'Numele melodiei'; + $lang['Pic_Title'] = 'Numele imaginii'; + + $lang['Category_pics'] = 'Vezi Imaginile din categorie'; + $lang['Images'] = 'Imagini'; + $lang['Category_songs'] = 'Vezi Videos ºi Media din categorie'; + $lang['Media'] = 'Media'; $lang['Edit_song'] = 'Editeazã'; Index: lang_admin_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_romanian/lang_admin_music.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_admin_music.php 30 Aug 2007 03:52:32 -0000 1.3 --- lang_admin_music.php 8 Sep 2007 13:28:47 -0000 1.4 *************** *** 29,32 **** --- 29,36 ---- $lang['Rows_per_page'] = 'Numãrul de rânduri'; $lang['Cols_per_page'] = 'Numãrul de coloane'; + $lang['Rows_per_page_music_pic_cat'] = 'Numãrul de rânduri în subcategorie virtualã de imagini'; + $lang['Cols_per_page_music_pic_cat'] = 'Numãrul de coloane în subcategorie virtualã de imagini'; + $lang['Rows_per_page_music_media_cat'] = 'Number of rows în subcategorie virtualã media'; + $lang['Cols_per_page_music_media_cat'] = 'Number of columns în subcategorie virtualã media'; $lang['Top'] = 'Numãrul de melodii pe lista Top Melodii'; $lang['Song_Desc_Max_Length'] = 'Lungimea maximã a versurilor/comentariilor melodiilor (bytes)'; *************** *** 41,44 **** --- 45,52 ---- $lang['Default_Sort_Order'] = 'Ordinea implicitã de sortare'; + //Index + $lang['Music_Index_Settings'] = 'Music Index'; + $lang['Show_Index_Subcats'] = 'Aratã subcategorii în index'; + // // Categories |
|
From: OryNider <ory...@us...> - 2007-09-08 13:28:53
|
Update of /cvsroot/mxbb/mx_music/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1661/lang_english Modified Files: lang_admin_music.php lang_main_music.php Log Message: This will fix many bugs that commed with the new features. If you allready upgraded to 2.0.7 please upgrade manualy the database. :P Index: lang_main_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_english/lang_main_music.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_main_music.php 30 Aug 2007 03:52:32 -0000 1.4 --- lang_main_music.php 8 Sep 2007 13:28:47 -0000 1.5 *************** *** 22,25 **** --- 22,26 ---- $lang['Last_Song'] = 'Last Song'; $lang['Public_Categories'] = 'Public Categories'; + $lang['Music_sub_categories'] = 'Sub-categories'; $lang['No_Songs'] = 'No Song'; $lang['Top_Songs'] = 'Top Songs'; *************** *** 37,40 **** --- 38,48 ---- $lang['Upload_Song'] = 'Upload Song'; $lang['Song_Title'] = 'Song Title'; + $lang['Pic_Title'] = 'Pic Title'; + + + $lang['Category_pics'] = 'View this category Images'; + $lang['Images'] = 'Images'; + $lang['Category_songs'] = 'View this category Songs and Videos'; + $lang['Media'] = 'Media'; $lang['Edit_song'] = 'Edit'; Index: lang_admin_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_english/lang_admin_music.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_admin_music.php 30 Aug 2007 03:52:32 -0000 1.3 --- lang_admin_music.php 8 Sep 2007 13:28:47 -0000 1.4 *************** *** 22,25 **** --- 22,29 ---- $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)'; *************** *** 34,37 **** --- 38,45 ---- $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 *************** *** 57,61 **** $lang['Category_changed_order'] = 'This category has been changed order successfully'; $lang['Create_music'] = 'Create new music'; ! $lang['Create_sub_music'] = 'Create sub-music'; // --- 65,69 ---- $lang['Category_changed_order'] = 'This category has been changed order successfully'; $lang['Create_music'] = 'Create new music'; ! $lang['Create_sub_music'] = 'Create sub-music'; // |
|
From: OryNider <ory...@us...> - 2007-09-08 13:28:38
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1601/includes Modified Files: music_cat.php music_comment.php music_comment_delete.php music_comment_edit.php music_download.php music_media_cat.php music_page.php music_pic_cat.php music_rss.php music_song.php music_upload.php Log Message: This will fix many bugs that commed with the new features. If you allready upgraded to 2.0.7 please upgrade manualy the database. :P Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_upload.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** music_upload.php 5 Sep 2007 23:37:48 -0000 1.5 --- music_upload.php 8 Sep 2007 13:28:29 -0000 1.6 *************** *** 552,556 **** --- 552,564 ---- } } + else + { + $song_filetype = substr($song_url, strlen($song_url) - 3, 3); + if( empty($song_filetype) ) + { + $song_filetype = ''; + } + } // -------------------------------- *************** *** 667,672 **** // -------------------------------- ! $sql = "INSERT INTO ". MUSIC_TABLE ." (song_filename, song_imagename, song_title, song_url, song_desc, song_singer, song_user_id, song_user_ip, song_username, song_time, song_cat_id, song_approval) ! VALUES ('$song_filename', '$song_imagename', '$song_title', '$song_url', '$song_desc', '$song_singer', '$song_user_id', '$song_user_ip', '$song_username', '$song_time', '$cat_id', '$song_approval')"; if( !$result = $db->sql_query($sql) ) { --- 675,680 ---- // -------------------------------- ! $sql = "INSERT INTO ". MUSIC_TABLE ." (song_filename, song_filetype, song_imagename, song_title, song_url, song_desc, song_singer, song_user_id, song_user_ip, song_username, song_time, song_cat_id, song_approval) ! VALUES ('$song_filename', '$song_filetype', '$song_imagename', '$song_title', '$song_url', '$song_desc', '$song_singer', '$song_user_id', '$song_user_ip', '$song_username', '$song_time', '$cat_id', '$song_approval')"; if( !$result = $db->sql_query($sql) ) { Index: music_pic_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_pic_cat.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_pic_cat.php 5 Sep 2007 23:37:49 -0000 1.1 --- music_pic_cat.php 8 Sep 2007 13:28:29 -0000 1.2 *************** *** 313,320 **** } - $music_config['cols_per_page'] = $music_config['rows_per_page']; // Added for ministry.ro ! //$music_config['rows_per_page'] = '20'; // Added for ministry.ro --- 313,320 ---- } // Added for ministry.ro ! $music_config['cols_per_page'] = $music_config['cols_per_page_pic']; ! $music_config['rows_per_page'] = $music_config['rows_per_page_pic'] ; // Added for ministry.ro *************** *** 451,454 **** --- 451,468 ---- } + if ( ($thissong['song_filetype'] == '') || ($song_filetype) && ($thissong['song_filetype'] != $song_filetype) ) + { + // + // Update the song filetype + // + $sql = "UPDATE " . MUSIC_TABLE . " + SET song_filetype = '" . $song_filetype . "' + WHERE song_id = '" . $song_id . "'"; + if ( !$db->sql_query($sql) ) + { + mx_message_die(GENERAL_ERROR, "Could not update song filetype.", '', __LINE__, __FILE__, $sql); + } + } + // // Media Center *************** *** 756,762 **** 'POSTER' => $song_poster, ! 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), --- 770,776 ---- 'POSTER' => $song_poster, ! 'WIDTH' => ( !empty($media_width) ? $media_width : '114' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '85' ), 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), *************** *** 778,788 **** 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', ! 'S_ROW_TYPE' => $row_type) ); } ! } ! ! //$total_media = count($switch_row_type == 'media'); ! //$total_images = count($switch_row_type == 'img'); $total_images = $total_songs; --- 792,801 ---- 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', ! 'S_ROW_TYPE' => $row_type, ! ! 'SWITCH_ROW_TYPE' => $switch_row_type) ); } ! }; $total_images = $total_songs; *************** *** 902,905 **** --- 915,919 ---- 'L_TIME' => $lang['Time'], 'L_SONG_TITLE' => $lang['Song_Title'], + 'L_PIC_TITLE' => $lang['Pic_Title'], 'L_SINGER' => $lang['Singer'], 'L_USERNAME' => $lang['Sort_Username'], *************** *** 931,936 **** 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), 'S_AUTH_LIST' => $auth_list) --- 945,950 ---- 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'WIDTH' => ( !empty($media_width) ? $media_width : '114' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '85' ), 'S_AUTH_LIST' => $auth_list) Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** music_cat.php 5 Sep 2007 23:37:46 -0000 1.7 --- music_cat.php 8 Sep 2007 13:28:29 -0000 1.8 *************** *** 448,451 **** --- 448,466 ---- } + if ( ($thissong['song_filetype'] == '') || ($song_filetype) && ($thissong['song_filetype'] != $song_filetype) ) + { + // + // Update the song filetype + // + $sql = "UPDATE " . MUSIC_TABLE . " + SET song_filetype = '" . $song_filetype . "' + WHERE song_id = '" . $song_id . "'"; + + if ( !$db->sql_query($sql) ) + { + mx_message_die(GENERAL_ERROR, "Could not update song filetype.", '', __LINE__, __FILE__, $sql); + } + } + // // Media Center *************** *** 722,725 **** --- 737,750 ---- } + switch ($row_type) + { + case 'img': + $switch_row_type = 'img'; + break; + + default: + $switch_row_type = 'media'; + } + $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); *************** *** 765,769 **** 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', ! 'S_ROW_TYPE' => $row_type) ); } --- 790,796 ---- 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', ! 'S_ROW_TYPE' => $row_type, ! ! 'SWITCH_ROW_TYPE' => $switch_row_type) ); } *************** *** 882,885 **** --- 909,913 ---- 'L_TIME' => $lang['Time'], 'L_SONG_TITLE' => $lang['Song_Title'], + 'L_PIC_TITLE' => $lang['Pic_Title'], 'L_SINGER' => $lang['Singer'], 'L_USERNAME' => $lang['Sort_Username'], Index: music_media_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_media_cat.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_media_cat.php 5 Sep 2007 23:37:48 -0000 1.1 --- music_media_cat.php 8 Sep 2007 13:28:29 -0000 1.2 *************** *** 315,318 **** --- 315,323 ---- } + // Added for ministry.ro + $music_config['cols_per_page'] = $music_config['cols_per_page_media']; + $music_config['rows_per_page'] = $music_config['rows_per_page_media'] ; + // Added for ministry.ro + $songs_per_page = $music_config['rows_per_page'] * $music_config['cols_per_page']; *************** *** 321,324 **** --- 326,331 ---- $limit_sql = ($start == 0) ? $songs_per_page : $start .','. $songs_per_page; + $limit_total_sql = ($start == 0) ? $total_songs : $start .','. $total_songs; + $song_approval_sql = 'AND s.song_approval = 1'; if ($thiscat['cat_approval'] != MUSIC_USER) *************** *** 330,334 **** } ! $sql = "SELECT s.song_id, s.song_title, s.song_desc, s.song_singer, s.song_user_id, s.song_user_ip, s.song_username, s.song_time, s.song_cat_id, s.song_view_count, s.song_lock, s.song_approval, 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 --- 337,341 ---- } ! $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 *************** *** 336,339 **** --- 343,349 ---- LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id WHERE s.song_cat_id = '$cat_id' $song_approval_sql + AND s.song_filetype NOT LIKE 'jpg' + AND s.song_filetype NOT LIKE 'gif' + AND s.song_filetype NOT LIKE 'png' GROUP BY s.song_id ORDER BY $sort_method $sort_order *************** *** 342,366 **** { mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql); } ! // ! // Update the music view counter ! // ! $sql = "UPDATE " . MUSIC_CAT_TABLE . " SET cat_views = cat_views + 1 WHERE cat_id = $cat_id"; ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not update music views.", '', __LINE__, __FILE__, $sql); ! } ! $songrow = array(); while( $row = $db->sql_fetchrow($result) ) { ! $songrow[] = $row; } ! for ($i = 0; $i < count($songrow); $i += $music_config['cols_per_page']) { $template->assign_block_vars('songrow', array()); --- 352,404 ---- { mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql); + } + + $songrow = array(); + + while( $row = $db->sql_fetchrow($result) ) + { + $songrow[] = $row; } ! // ! // Update the music view counter ! // ! $sql = "UPDATE " . MUSIC_CAT_TABLE . " SET cat_views = cat_views + 1 WHERE cat_id = $cat_id"; ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not update music views.", '', __LINE__, __FILE__, $sql); ! } ! $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_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id ! LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id ! WHERE s.song_cat_id = '$cat_id' $song_approval_sql ! AND s.song_filetype NOT LIKE 'jpg' ! AND s.song_filetype NOT LIKE 'gif' ! AND s.song_filetype NOT LIKE 'png' ! GROUP BY s.song_id ! ORDER BY $sort_method $sort_order ! LIMIT $limit_total_sql"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql); ! } ! ! $totalrow = array(); while( $row = $db->sql_fetchrow($result) ) { ! $totalrow[] = $row; } ! $total_per_page = count($songrow); ! ! $total_media = count($totalrow); ! ! for ($i = 0; $i < $total_per_page; $i += $music_config['cols_per_page']) { $template->assign_block_vars('songrow', array()); *************** *** 398,408 **** } - $template->assign_block_vars('songrow.songcol', array( - 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), - 'DESC' => $songrow[$j]['song_desc'], - 'APPROVAL' => $approval_link, - ) - ); - if( ($songrow[$j]['user_id'] == MUSIC_GUEST) or ($songrow[$j]['username'] == '') ) { --- 436,439 ---- *************** *** 447,450 **** --- 478,756 ---- } + if ( ($thissong['song_filetype'] == '') || ($song_filetype) && ($thissong['song_filetype'] != $song_filetype) ) + { + // + // Update the song filetype + // + $sql = "UPDATE " . MUSIC_TABLE . " + SET song_filetype = '" . $song_filetype . "' + WHERE song_id = '" . $song_id . "'"; + if ( !$db->sql_query($sql) ) + { + mx_message_die(GENERAL_ERROR, "Could not update song filetype.", '', __LINE__, __FILE__, $sql); + } + } + + // + // Media Center + // + if ( $song_filetype == 'swf' ) + { + $row_type = 'flash'; + } + else if ( $song_filetype == 'ram' ) + { + $row_type = 'ram'; + } + else if ( $song_filetype == '.rm' ) + { + $row_type = 'rm'; + } + else if ( $song_filetype == '.qt' ) + { + $row_type = 'qt'; + } + else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) + { + $row_type = 'img'; + } + else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) + { + $row_type = 'img'; + } + else if( ($song_filetype == 'pls') && !empty($thissong['song_url']) ) + { + $row_type = 'media'; + } + else if(!empty($thissong['song_url'])) + { + $host = explode("//", $thissong['song_url']); + $host = $host[1]; + $host = explode("/", $host); + $domain = $host[0]; + $counthost = count($host) - 1; + $docid2 = $host[$counthost]; + + // $domaintmp = explode(".", $domain, -1); // Php 5 only + // $sitename = implode(".", $domaintmp); + + if( !function_exists('mx_music_sitename') ) + { + function mx_music_sitename($domain) { + $domaintmp = explode(".", $domain); + + $y = count($domaintmp) - 1; + $r = ""; + for ($a = 0; $y > $a; $a++) { + $r .= ".".$domaintmp[$a]; + } + return $r; + } + } + + $sitename = substr(mx_music_sitename($domain), 1); + + if( !function_exists('mx_music_sitesufix') ) + { + function mx_music_sitesufix($domain) { + $domaintmp = explode(".", $domain); + + $y = count($domaintmp) - 1; + $r = $domaintmp[$y];; + return $r; + } + } + + $sitesufix = mx_music_sitesufix($domain); + + if (!empty($sitesufix) ) + { + if ($sitesufix == 'de') + { + $sitelngprefix = 'de.'; + } + else + { + $sitelngprefix = 'en.'; + } + } + else + { + $sitelngprefix = ''; + } + + if ($sitename == 'video.google') + { + $videoid['song_url'] = explode("-", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + $docid['song_url'] = explode("?", $thissong['song_url']); + + if (empty($docid['song_url'][1]) ) + { + $row_type = 'flashvideo'; + } + else + { + $row_type = 'youtube'; + } + } + else + { + $row_type = 'youtube'; + } + } + else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') ) + { + $videoid['song_url'] = explode("=", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + $row_type = 'flashvideo'; + } + else + { + $row_type = 'youtube'; + } + } + else if ( ($sitename == 'www.clipfish') || ($sitename == 'clipfish') ) + { + $thisvid['song_url'] = explode("videoid", $thissong['song_url']); + $videoid['song_url'] = explode("=", $thisvid['song_url'][1]); + + if (empty($videoid['song_url'][1]) ) + { + $row_type = 'flashvideo'; + } + else + { + $row_type = 'youtube'; + } + + } + else if ( ($sitename == 'www.myvideo') || ($sitename == 'myvideo') ) + { + if (empty($docid2) ) + { + $row_type = 'flashvideo'; + } + else + { + $row_type = 'youtube'; + } + } + else if ( ($sitename == 'de.sevenload') || ($sitename == 'sevenload') || ($sitename == 'page.sevenload') || ($sitename == 'www.sevenload') ) + { + $videoid['song_url'] = explode("=", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + if (empty($docid2) ) + { + $row_type = 'flashvideo'; + } + else + { + $row_type = 'youtube'; + } + } + else + { + $row_type = 'youtube'; + } + + } + else + { + $row_type = 'media'; + } + } + else + { + $row_type = 'media'; + } + + switch ($row_type) + { + case 'flash': + $switch_row_type = 'media'; + break; + + case 'ram': + $switch_row_type = 'media'; + break; + + case 'flashvideo': + $switch_row_type = 'media'; + break; + + case 'youtube': + $switch_row_type = 'media'; + break; + + case 'qt': + $switch_row_type = 'media'; + break; + + case 'media': + $switch_row_type = 'media'; + break; + + case 'img': + $switch_row_type = 'img'; + break; + + default: + $switch_row_type = 'other'; + } + + $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); + + $array_row_type[$j] = $switch_row_type; + + //print_r($array_row_type); + + if (!function_exists('countString')) + { + function countString($buffer, $string) + { + while ($value = current($buffer)) + { + if ($value == $string) + { + $total += 1; + } + next($buffer); + } + return $total; + } + } + + $total_images = $total_songs - $total_media; + + $total_pages = ceil( $total_songs / $songs_per_page ); + + $this_page = floor( $start / $songs_per_page ) + 1; + + for ($x = ($songs_per_page * $this_page) + 1; $x < ($songs_per_page * $this_page); $x++) + { + while($j = $x) + { + $total_page_media = countString($array_row_type, 'media'); + } + + if ($total_page_media == 0) + { + $template->assign_block_vars('no_songs', array()); + } + } + $template->assign_block_vars('songrow.songcol', array( + 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), + 'DESC' => $songrow[$j]['song_desc'], + 'APPROVAL' => $approval_link, + ) + ); + // // Media Center *************** *** 455,459 **** $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; - $row_type = 'flash'; } else if ( $song_filetype == 'ram' ) --- 761,764 ---- *************** *** 462,466 **** $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; - $row_type = 'ram'; } else if ( $song_filetype == '.rm' ) --- 767,770 ---- *************** *** 469,473 **** $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; - $row_type = 'rm'; } else if ( $song_filetype == '.qt' ) --- 773,776 ---- *************** *** 476,480 **** $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; - $row_type = 'qt'; } else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) --- 779,782 ---- *************** *** 482,486 **** $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; - $row_type = 'img'; $template->assign_block_vars('songrow.img', array( --- 784,787 ---- *************** *** 493,497 **** $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; - $row_type = 'img'; $template->assign_block_vars('songrow.img', array( --- 794,797 ---- *************** *** 506,510 **** $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; - $row_type = 'media'; } else if(!empty($thissong['song_url'])) --- 806,809 ---- *************** *** 579,583 **** $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); - $row_type = 'flashvideo'; } else --- 878,881 ---- *************** *** 587,591 **** $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Watch'] : 'Watch URL' ); - $row_type = 'youtube'; } } --- 885,888 ---- *************** *** 596,600 **** $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); - $row_type = 'youtube'; } } --- 893,896 ---- *************** *** 606,610 **** { $template->assign_block_vars('songrow.flashvideo', array()); - $row_type = 'flashvideo'; } else --- 902,905 ---- *************** *** 614,618 **** 'SONG_URL' => $thissong['song_url'] )); - $row_type = 'youtube'; } --- 909,912 ---- *************** *** 633,637 **** $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; - $row_type = 'flashvideo'; } else --- 927,930 ---- *************** *** 642,646 **** $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplayer.swf?as=0&videoid=' . $videoid['song_url'][1] : $url_download ); - $row_type = 'youtube'; } --- 935,938 ---- *************** *** 655,659 **** $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; - $row_type = 'flashvideo'; } else --- 947,950 ---- *************** *** 664,668 **** $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); - $row_type = 'youtube'; } } --- 955,958 ---- *************** *** 680,684 **** $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; - $row_type = 'flashvideo'; } else --- 970,973 ---- *************** *** 689,693 **** $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); - $row_type = 'youtube'; } } --- 978,981 ---- *************** *** 699,703 **** $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download ); - $row_type = 'youtube'; } --- 987,990 ---- *************** *** 709,713 **** $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; - $row_type = 'media'; } } --- 996,999 ---- *************** *** 718,756 **** $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; - $row_type = 'media'; - } - - switch ($row_type) - { - case 'flash': - $switch_row_type = 'media'; - break; - - case 'ram': - $switch_row_type = 'media'; - break; - - case 'flashvideo': - $switch_row_type = 'media'; - break; - - case 'youtube': - $switch_row_type = 'media'; - break; - - case 'qt': - $switch_row_type = 'media'; - break; - - case 'media': - $switch_row_type = 'media'; - break; - - case 'img': - $switch_row_type = 'img'; - break; - - default: - $switch_row_type = 'other'; } --- 1004,1007 ---- *************** *** 802,813 **** 'SWITCH_ROW_TYPE' => $switch_row_type) ); - - //$total_media = count($switch_row_type == 'media'); - //$total_images = count($switch_row_type == 'img'); } } - $total_media = $total_songs; - $template->assign_vars(array( 'PAGINATION' => generate_pagination(append_sid(this_mo_mxurl("music_mode=music_media_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_media, $songs_per_page, $start), --- 1053,1059 ---- *************** *** 924,927 **** --- 1170,1174 ---- 'L_TIME' => $lang['Time'], 'L_SONG_TITLE' => $lang['Song_Title'], + 'L_PIC_TITLE' => $lang['Pic_Title'], 'L_SINGER' => $lang['Singer'], 'L_USERNAME' => $lang['Sort_Username'], Index: music_song.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_song.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_song.php 5 Sep 2007 23:37:47 -0000 1.4 --- music_song.php 8 Sep 2007 13:28:29 -0000 1.5 *************** *** 60,63 **** --- 60,77 ---- } + if ( ($thissong['song_filetype'] == '') || ($song_filetype) && ($thissong['song_filetype'] != $song_filetype) ) + { + // + // Update the song filetype + // + $sql = "UPDATE " . MUSIC_TABLE . " + SET song_filetype = '" . $song_filetype . "' + WHERE song_id = '" . $song_id . "'"; + if ( !$db->sql_query($sql) ) + { + mx_message_die(GENERAL_ERROR, "Could not update song filetype.", '', __LINE__, __FILE__, $sql); + } + } + // ------------------------------------ |
|
From: OryNider <ory...@us...> - 2007-09-08 13:28:37
|
Update of /cvsroot/mxbb/mx_music/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1601/admin Modified Files: admin_music_cfg.php Log Message: This will fix many bugs that commed with the new features. If you allready upgraded to 2.0.7 please upgrade manualy the database. :P Index: admin_music_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cfg.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_music_cfg.php 1 Sep 2007 05:38:51 -0000 1.3 --- admin_music_cfg.php 8 Sep 2007 13:28:29 -0000 1.4 *************** *** 106,109 **** --- 106,123 ---- 'TOP' => $new['top'], + // eXtreme Styles + 'XS_ENABLED' => ($new['xs_enabled'] == 1) ? 'checked="checked"' : '', + 'XS_DISABLED' => ($new['xs_enabled'] == 0) ? 'checked="checked"' : '', + + 'ROWS_PER_PAGE_PIC' => $new['rows_per_page_pic'], + 'COLS_PER_PAGE_PIC' => $new['cols_per_page_pic'], + + 'ROWS_PER_PAGE_MEDIA' => $new['rows_per_page_media'], + 'COLS_PER_PAGE_MEDIA' => $new['cols_per_page_media'], + + // Index + 'INDEX_SHOW_SUBCATS_ENABLED' => ($new['show_index_subcats'] == 1) ? 'checked="checked"' : '', + 'INDEX_SHOW_SUBCATS_DISABLED' => ($new['show_index_subcats'] == 0) ? 'checked="checked"' : '', + // // Song image *************** *** 124,127 **** --- 138,142 ---- 'WMA_ENABLED' => ($new['wma_allowed'] == 1) ? 'checked="checked"' : '', 'WMA_DISABLED' => ($new['wma_allowed'] == 0) ? 'checked="checked"' : '', + // Media Center 'WMV_ENABLED' => ($new['wmv_allowed'] == 1) ? 'checked="checked"' : '', *************** *** 154,159 **** 'IMG_ENABLED' => ($new['img_allowed'] == 1) ? 'checked="checked"' : '', 'IMG_DISABLED' => ($new['img_allowed'] == 0) ? 'checked="checked"' : '', - // Media Center 'SONG_DESC_MAX_LENGTH' => $new['desc_length'], --- 169,174 ---- 'IMG_ENABLED' => ($new['img_allowed'] == 1) ? 'checked="checked"' : '', 'IMG_DISABLED' => ($new['img_allowed'] == 0) ? 'checked="checked"' : '', + // Media Center 'SONG_DESC_MAX_LENGTH' => $new['desc_length'], *************** *** 197,201 **** --- 212,225 ---- 'L_ROWS_PER_PAGE' => $lang['Rows_per_page'], 'L_COLS_PER_PAGE' => $lang['Cols_per_page'], + 'L_ROWS_PER_PAGE_PIC' => $lang['Rows_per_page_music_pic_cat'], + 'L_COLS_PER_PAGE_PIC' => $lang['Cols_per_page_music_pic_cat'], + 'L_ROWS_PER_PAGE_MEDIA' => $lang['Rows_per_page_music_media_cat'], + 'L_COLS_PER_PAGE_MEDIA' => $lang['Cols_per_page_music_media_cat'], 'L_TOP' => $lang['Top'], + + //Index + 'L_INDEX_SETTINGS' => $lang['Music_Index_Settings'], + 'L_INDEX_SHOW_SUBCATS' => $lang['Show_Index_Subcats'], + // // Lang Song image |
|
From: OryNider <ory...@us...> - 2007-09-08 13:28:34
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1601 Modified Files: db_install.php db_upgrade.php music.php Log Message: This will fix many bugs that commed with the new features. If you allready upgraded to 2.0.7 please upgrade manualy the database. :P Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_install.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** db_install.php 5 Sep 2007 23:37:44 -0000 1.6 --- db_install.php 8 Sep 2007 13:28:29 -0000 1.7 *************** *** 57,60 **** --- 57,61 ---- song_id int(11) UNSIGNED NOT NULL auto_increment, song_filename varchar(255) NOT NULL, + song_filetype varchar(255) NOT NULL, song_imagename varchar(255) NOT NULL, song_title varchar(255) NOT NULL, *************** *** 174,177 **** --- 175,184 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('index', '5')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('img_allowed', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('xs_enabled', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('show_index_subcats', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('rows_per_page_pic', '5')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('cols_per_page_pic', '5')"; + $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[] = "UPDATE " . $mx_table_prefix . "module" . " Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** music.php 5 Sep 2007 23:37:46 -0000 1.7 --- music.php 8 Sep 2007 13:28:29 -0000 1.8 *************** *** 188,204 **** if ($cat_id != 0) { ! $sql = "SELECT cat_id,cat_title FROM ". MUSIC_CAT_TABLE ." WHERE cat_id = $cat_id"; ! if ( $result = $db->sql_query($sql) ) ! { ! $row = $db->sql_fetchrow($result); ! ! $template->assign_vars(array( ! 'SUBCAT_NAV' => '-> <a class="nav" href="' . append_sid(this_mo_mxurl("c=" . $row['cat_id'])) . '">' . $row['cat_title'] . '</a>', ! ) ! ); ! } ! } $sql = "SELECT c.*, COUNT(s.song_id) AS count --- 188,207 ---- if ($cat_id != 0) { ! $sql = "SELECT cat_id,cat_title FROM ". MUSIC_CAT_TABLE ." WHERE cat_id = $cat_id"; ! if ( $result = $db->sql_query($sql) ) ! { ! $thiscat_parent = array(); ! $thiscat_parent = $db->sql_fetchrow($result); ! ! $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), ! 'SUBCAT_NAV' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>', ! 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], ! 'CAT_PARENT' => $thiscat_parent['cat_id']) ! ); ! } ! } $sql = "SELECT c.*, COUNT(s.song_id) AS count *************** *** 658,663 **** else { ! // this is a parent category ! $sc_sql = "SELECT * FROM ". MUSIC_CAT_TABLE ." WHERE cat_parent = " . $catrows[$i]['cat_id'] . " --- 661,666 ---- else { ! // this is a parent category ! $sc_sql = "SELECT * FROM ". MUSIC_CAT_TABLE ." WHERE cat_parent = " . $catrows[$i]['cat_id'] . " *************** *** 665,699 **** ORDER BY cat_order ASC"; ! if ( !($sc_result = $db->sql_query($sc_sql)) ) ! { message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sql); ! } ! $sql_count = "SELECT count(cat_id) as count FROM ". MUSIC_CAT_TABLE ." WHERE cat_parent = " . $catrows[$i]['cat_id']; ! if ( ($result_count = $db->sql_query($sql_count)) ) ! { $subcat_count = $db->sql_fetchrow($result_count); $subcat_count = $subcat_count['count'] . " sub catagories"; ! } ! else ! { $subcat_count = ""; ! } ! ! $subcats = "<br /><span class=\"gensmall\"><b>Sub-catagories:</b><br />"; ! while ( $subcatrow = $db->sql_fetchrow($sc_result) ) ! { ! $subcats .= " - <a class=\"gensmall\" href=\"" . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $subcatrow['cat_id'])) . "\">" . $subcatrow['cat_title'] . "</a><br />"; ! } ! $subcats .= "</span><br />"; ! $template->assign_block_vars('catrow', array( 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_index&c=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], ! 'SONGS' => $subcat_count, ! 'SUBCATS' => $subcats, 'CAT_VIEWS' => $catrows[$i]['cat_views'], 'L_MODERATORS' => $l_moderators, --- 668,701 ---- ORDER BY cat_order ASC"; ! if ( !($sc_result = $db->sql_query($sc_sql)) ) ! { message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sql); ! } ! $sql_count = "SELECT count(cat_id) as count FROM ". MUSIC_CAT_TABLE ." WHERE cat_parent = " . $catrows[$i]['cat_id']; ! if ( ($result_count = $db->sql_query($sql_count)) ) ! { $subcat_count = $db->sql_fetchrow($result_count); $subcat_count = $subcat_count['count'] . " sub catagories"; ! } ! else ! { $subcat_count = ""; ! } ! $subcats = '<br /><span class="gensmall"><b>' . $lang['Music_sub_categories'] . ':</b><br />'; ! while ( $subcatrow = $db->sql_fetchrow($sc_result) ) ! { ! $subcats .= ' - <a class="gensmall" href="' . append_sid(this_mo_mxurl('music_mode=music_cat&cat_id='. $subcatrow['cat_id'])) . '">' . $subcatrow['cat_title'] . '</a><br />'; ! } ! $subcats .= '</span><br />'; ! ! $template->assign_block_vars('catrow', array( 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_index&c=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], ! 'SONGS' => $subcat_count, 'CAT_VIEWS' => $catrows[$i]['cat_views'], 'L_MODERATORS' => $l_moderators, *************** *** 702,706 **** 'MODERATORS' => $moderators_list, 'LAST_SONG_INFO' => $last_song_info) ! ); } // ------------------------------------------ --- 704,716 ---- 'MODERATORS' => $moderators_list, 'LAST_SONG_INFO' => $last_song_info) ! ); ! ! if ($music_config['show_index_subcats'] == 1) ! { ! $template->assign_block_vars('catrow.subcat_link', array( ! 'L_SUBCATS' => $lang['Music_sub_categories'], ! 'SUBCATS' => $subcats) ! ); ! } } // ------------------------------------------ Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_upgrade.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** db_upgrade.php 30 Aug 2007 03:52:17 -0000 1.4 --- db_upgrade.php 8 Sep 2007 13:28:29 -0000 1.5 *************** *** 57,61 **** // validate before 2.07 // ! $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "music_config WHERE config_name = 'img_allowed'" ); if ( $db->sql_numrows( $result ) == 0 ) { --- 57,61 ---- // validate before 2.07 // ! $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "music_config WHERE config_name = 'xs_enabled'" ); if ( $db->sql_numrows( $result ) == 0 ) { *************** *** 83,88 **** $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', '300')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_height', '200')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('download', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('enable_integration', '1')"; --- 83,88 ---- $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')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('download', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('enable_integration', '1')"; *************** *** 95,102 **** --- 95,109 ---- $message .= "<b>Upgrading to v. 2.0.7...</b><br/><br/>"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('xs_enabled', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('img_allowed', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('show_index_subcats', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('rows_per_page_pic', '5')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('cols_per_page_pic', '5')"; + $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[] = "ALTER TABLE " . $mx_table_prefix . "music_cat ADD cat_parent mediumint(8) UNSIGNED NOT NULL DEFAULT '0' AFTER cat_id"; $sql[] = "ALTER TABLE " . $mx_table_prefix . "music_cat ADD cat_type tinyint NOT NULL DEFAULT '0' AFTER cat_parent"; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "music ADD song_filetype varchar(255) NOT NULL AFTER song_filename"; $sql[] = "UPDATE ". $mx_table_prefix ."music_config |
|
From: OryNider <ory...@us...> - 2007-09-08 13:28:34
|
Update of /cvsroot/mxbb/mx_music/music_box In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1601/music_box Modified Files: music_common.php music_integration.php Log Message: This will fix many bugs that commed with the new features. If you allready upgraded to 2.0.7 please upgrade manualy the database. :P Index: music_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/music_common.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_common.php 1 Sep 2007 05:38:52 -0000 1.4 --- music_common.php 8 Sep 2007 13:28:29 -0000 1.5 *************** *** 34,43 **** if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main_music.' . $phpEx ); $link_language='lang_english'; } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx ); $link_language='lang_' . $board_config['default_lang']; } --- 34,43 ---- if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx ) ) { ! include_once( $module_root_path . 'language/lang_english/lang_main_music.' . $phpEx ); $link_language='lang_english'; } else { ! include_once( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main_music.' . $phpEx ); $link_language='lang_' . $board_config['default_lang']; } Index: music_integration.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/music_integration.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_integration.php 1 Aug 2007 23:33:29 -0000 1.2 --- music_integration.php 8 Sep 2007 13:28:29 -0000 1.3 *************** *** 69,77 **** } ! function this_mo_portalurl($args = '') { global $mx_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block; ! if( $integration_enabled != "1" ) { $mxurl = $mx_root_path . 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args); --- 69,77 ---- } ! function this_mo_portalurl($args = '', $force_standalone_mode = false) { global $mx_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block; ! if( $force_standalone_mode || $integration_enabled != "1" ) { $mxurl = $mx_root_path . 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args); *************** *** 84,88 **** return $mxurl; } ! function this_mo_loginurl($args = '', $force_standalone_mode = false) { global $mx_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block; --- 84,88 ---- return $mxurl; } ! function this_mo_loginurl($args = '') { global $mx_root_path, $module_root_path, $page_id, $music_index, $phpEx, $integration_enabled, $is_block; *************** *** 100,103 **** --- 100,118 ---- return $mxurl; } + function this_mo_rssurl($args = '', $force_standalone_mode = false) + { + global $music_index, $phpEx; + + if( $force_standalone_mode ) + { + $mxurl = 'modules/mx_music/' . 'music.' . $phpEx . ($args == '' ? '' : '?' . $args); + } + else + { + $mxurl = 'index.' . $phpEx . '?page=' . $music_index . ($args == '' ? '' : '&' . $args); + + } + return $mxurl; + } // -------------------------------------------------------------------------------- // That's all Folks! |
Update of /cvsroot/mxbb/mx_music/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24024/templates/subSilver Modified Files: music_cat_body.tpl music_cat_xs.tpl music_index_body.tpl music_page_body.tpl Added Files: music_media_cat_body.tpl music_pic_cat_body.tpl Log Message: Index: music_page_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_page_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_page_body.tpl 1 Sep 2007 05:39:10 -0000 1.4 --- music_page_body.tpl 5 Sep 2007 23:37:50 -0000 1.5 *************** *** 176,180 **** <!-- BEGIN img --> ! <a href="javascript:void(0);" onClick="window.open('{SONG_URL}','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="{SONG_URL}" id="image" type="image" width="425" height="350" border="1"></a> <!-- END img --> --- 176,180 ---- <!-- BEGIN img --> ! <a href="javascript:void(0);" onClick="window.open('{SONG_FULL_URL}','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="{SONG_THUMB_URL}" id="image" type="image" width="425" height="350" border="1"></a> <!-- END img --> --- NEW FILE: music_media_cat_body.tpl --- <style type="text/css"> <!-- .shadow {color:#00aa00; filter: DropShadow(Color=#660000, OffX=3, OffY=3, Positive=1)} img.shadow {color:#00aa00; filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=3, OffY=3, Color='gray', Positive='true')} --> </style> <form action="{S_MUSIC_ACTION}" method="post"> <table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> <td valign="bottom" width="100%"><a class="maintitle" href="{U_VIEW_CAT}">{CAT_TITLE}</a><br /> <span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span></td> <td align="right" valign="bottom" nowrap="nowrap"><span class="nav">{PAGINATION}</span></td> </tr> </table> <table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> <td> <!-- BEGIN enable_soung_upload --> <a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a> <!-- END enable_soung_upload --> </td> <td class="nav" width="100%"> <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <!-- IF CAT_PARENT eq 0 --><!-- ELSE --><a href="{U_VIEW_CAT_PARENT}" class="nav">{CAT_PARENT_TITLE}</a> {NAV_SEP} <!-- ENDIF --><a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} {NAV_SEP} <a class="nav" href="{U_VIEW_CAT_VIRTUAL}">{CAT_TITLE_VIRTUAL}</a></span> </td> </tr> </table> <table width="100%" cellpadding="1" cellspacing="1" border="0" class="forumline"> <tr> <th width="{S_COL_WIDTH}" height="25" class="cat" align="center" colspan="{S_COLS}" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE} :: {L_ALL_CAT_PICS}</th> </tr> <!-- BEGIN no_songs --> <tr> <td class="row1" align="center" colspan="{S_COLS}" height="50"><span class="gen">{L_NO_SONGS}</span></td> </tr> <!-- END no_songs --> <!-- BEGIN songrow --> <tr> <!-- BEGIN songcol --> <td align="center" width="{S_COL_WIDTH}" class="row1"></td> <!-- END songcol --> </tr> <tr> <!-- BEGIN song_detail --> <!-- IF song_detail.SWITCH_ROW_TYPE eq media --> <td width="31%" align="center" class="catBottom"> <table width="100%" cellpadding="2" cellspacing="1" border="0"> <tr> <th height="25" colspan="2" class="thTop"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></th> </tr> <tr> <td width="44%" class="row1" align="center"> <!-- IF song_detail.S_ROW_TYPE eq media --> <SCRIPT LANGUAGE="JavaScript"> var WMP7; var Mac; var Win; var Unix; var Linux; Win = navigator.userAgent.indexOf("Win") > -1; Mac = navigator.userAgent.indexOf("Mac") > -1; Unix = navigator.appVersion.indexOf("X11") > -1; Linux = navigator.appVersion.indexOf("Linux") > -1; if (Mac) { 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.U_SONG}"'); document.write (' src="{song_detail.U_SONG}"'); document.write (' Name=MediaPlayer'); document.write (' ShowControls=1'); document.write (' ShowDisplay=1'); document.write (' ShowStatusBar=1'); document.write (' AUTOSTART=0'); document.write (' AutoSize=1'); document.write (' width="{song_detail.WIDTH}"'); document.write (' height="{song_detail.HEIGHT}">'); document.write (' </Embed>'); } if ( navigator.appName != "Netscape" ){ document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="70" height="300" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="0" filename="{song_detail.U_SONG}" src="{song_detail.U_SONG}" ></embed>'); } } if (Win) { if ( navigator.appName != "Netscape" ) { WMP7 = new ActiveXObject('WMPlayer.OCX'); } // Windows Media Player 7 Code if ( WMP7 ) { document.write (' <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"'); document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); document.write ('<PARAM NAME="AutoStart" VALUE="false">'); document.write ('<PARAM NAME="ShowControls" VALUE="1">'); document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); document.write ('<PARAM NAME="AutoSize" VALUE="1">'); document.write ('<PARAM NAME="uiMode" VALUE="mini">'); 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.U_SONG}"'); document.write (' src="{song_detail.U_SONG}"'); document.write (' Name="MediaPlayer2"'); document.write (' ShowControls="1"'); document.write (' ShowDisplay="1"'); document.write (' ShowStatusBar="1"'); document.write (' AUTOSTART="false"'); document.write (' AutoSize="1"'); document.write (' width="70"'); document.write (' height="300">'); document.write (' </embed>'); document.write ('</OBJECT>'); } // Windows Media Player 6.4 Code else { //IE Code document.write (' <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"'); document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); document.write ('<PARAM NAME="url" VALUE="{song_detail.U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{song_detail.U_SONG}">'); document.write ('<PARAM NAME="AutoStart" VALUE="false">'); document.write ('<PARAM NAME="ShowControls" VALUE="1">'); document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); document.write ('<PARAM NAME="AutoSize" VALUE="1">'); //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.U_SONG}"'); document.write (' src="{song_detail.U_SONG}"'); document.write (' Name="MediaPlayer"'); document.write (' ShowControls="1"'); document.write (' ShowDisplay="1"'); document.write (' ShowStatusBar="1"'); document.write (' AUTOSTART="false"'); document.write (' AutoSize="1"'); document.write (' width="{song_detail.WIDTH}"'); document.write (' height="{song_detail.HEIGHT}">'); document.write (' </embed>'); document.write ('</OBJECT>'); } } else { document.write(' <embed type="audio/mpeg" height="70" width="300" AUTOSTART="0" filename="{song_detail.U_SONG}" src="{song_detail.U_SONG}" ></embed>'); } </SCRIPT> <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq ram --> <embed src="{song_detail.U_SONG}" align="center" width="275" height="40" type="audio/x-pn-realaudio-plugin" console="cons" controls="ControlPanel" autostart="false"></embed> <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq qt --> <object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="377" height="212"> <param name="qtsrc" value="{song_detail.U_SONG}"> <param name="autoplay" value="false"> <param name="loop" value="false"> <param name="controller" value="true"> <param name="kioskmode" value="true"> <param name="cache" value="false"> <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="false" kioskmode="true" cache="false"> </embed> </object> <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq flash --> <EMBED src="{song_detail.U_SONG}" quality=high scale=noborder wmode=transparent bgcolor=#000000 TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"> </EMBED> <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq flashvideo --> <embed src="{song_detail.SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> </embed> <!-- ENDIF --> <!-- IF song_detail.S_ROW_TYPE eq youtube --> <object width="425" height="350"> <param name="movie" value="{song_detail.SONG_URL}"></param> <param name="wmode" value="transparent"></param> <embed src="{song_detail.VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> </embed> </object> <!-- ENDIF --> </td> </tr> </table> </td> <!-- ENDIF --> <!-- END song_detail --> </tr> <!-- END songrow --> </table> <table width="100%" cellspacing="2" border="0" cellpadding="2"> <tr> <td> <!-- BEGIN enable_soung_upload --> <a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a> <!-- END enable_soung_upload --> </td> <td class="nav" width="100%"> <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <!-- IF CAT_PARENT eq 0 --><!-- ELSE --><a href="{U_VIEW_CAT_PARENT}" class="nav">{CAT_PARENT_TITLE}</a> {NAV_SEP} <!-- ENDIF --><a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} {NAV_SEP} <a class="nav" href="{U_VIEW_CAT_VIRTUAL}">{CAT_TITLE_VIRTUAL}</a></span> </td> <td align="right" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /> <span class="nav">{PAGINATION}</span></td> </tr> <tr> <td colspan="3"><span class="nav">{PAGE_NUMBER}</span></td> </tr> </table> </form> <table width="100%" cellspacing="0" border="0" cellpadding="0"> <tr> <td align="right" class="gensmall" nowrap="nowrap">{MUSIC_JUMPBOX}</td> </tr> <tr> <td align="right" class="gensmall">{S_AUTH_LIST}</td> </tr> </table> <br clear="all" /> <!-- Do not remove my copyright notice and keep visible with its original content! --> {MUSIC_COPYRIGHT} Index: music_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_cat_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_cat_body.tpl 6 Jun 2007 20:40:28 -0000 1.1 --- music_cat_body.tpl 5 Sep 2007 23:37:49 -0000 1.2 *************** *** 16,20 **** </td> <td class="nav" width="100%"> ! <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> --- 16,20 ---- </td> <td class="nav" width="100%"> ! <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {U_NAV_CAT_PARENT} {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> *************** *** 91,95 **** </td> <td class="nav" width="100%"> ! <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> --- 91,95 ---- </td> <td class="nav" width="100%"> ! <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {U_NAV_CAT_PARENT} {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> --- NEW FILE: music_pic_cat_body.tpl --- <style type="text/css"> <!-- .shadow {color:#00aa00; filter: DropShadow(Color=#660000, OffX=3, OffY=3, Positive=1)} img.shadow {color:#00aa00; filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=3, OffY=3, Color='gray', Positive='true')} --> </style> <form action="{S_MUSIC_ACTION}" method="post"> <table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> <td valign="bottom" width="100%"><a class="maintitle" href="{U_VIEW_CAT}">{CAT_TITLE}</a><br /> <span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span></td> <td align="right" valign="bottom" nowrap="nowrap"><span class="nav">{PAGINATION}</span></td> </tr> </table> <table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> <td> <!-- BEGIN enable_soung_upload --> <a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a> <!-- END enable_soung_upload --> </td> <td class="nav" width="100%"> <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <!-- IF CAT_PARENT eq 0 --><!-- ELSE --><a href="{U_VIEW_CAT_PARENT}" class="nav">{CAT_PARENT_TITLE}</a> {NAV_SEP} <!-- ENDIF --><a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} {NAV_SEP} <a class="nav" href="{U_VIEW_CAT_VIRTUAL}">{CAT_TITLE_VIRTUAL}</a></span> </td> </tr> </table> <table width="100%" cellpadding="1" cellspacing="1" border="0" class="forumline"> <tr> <th width="{S_COL_WIDTH}" height="25" class="cat" align="center" colspan="{S_COLS}" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE} :: {L_ALL_CAT_PICS}</th> </tr> <!-- BEGIN no_songs --> <tr> <td class="row1" align="center" colspan="{S_COLS}" height="50"><span class="gen">{L_NO_SONGS}</span></td> </tr> <!-- END no_songs --> <!-- BEGIN songrow --> <tr> <!-- BEGIN songcol --> <td align="center" width="{S_COL_WIDTH}" class="row1"></td> <!-- END songcol --> </tr> <tr> <!-- BEGIN song_detail --> <!-- IF song_detail.S_ROW_TYPE eq img --> <td class="row1" width="{S_COL_WIDTH}" align="center" valign="top" class="catBottom"> <div align="center" valign="top"> <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> </div> <div align="center" valign="top"> <span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span> </div> </td> <!-- ENDIF --> <!-- END song_detail --> </tr> <!-- END songrow --> </table> <table width="100%" cellspacing="2" border="0" cellpadding="2"> <tr> <td> <!-- BEGIN enable_soung_upload --> <a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a> <!-- END enable_soung_upload --> </td> <td class="nav" width="100%"> <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <!-- IF CAT_PARENT eq 0 --><!-- ELSE --><a href="{U_VIEW_CAT_PARENT}" class="nav">{CAT_PARENT_TITLE}</a> {NAV_SEP} <!-- ENDIF --><a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} {NAV_SEP} <a class="nav" href="{U_VIEW_CAT_VIRTUAL}">{CAT_TITLE_VIRTUAL}</a></span> </td> <td align="right" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /> <span class="nav">{PAGINATION}</span></td> </tr> <tr> <td colspan="3"><span class="nav">{PAGE_NUMBER}</span></td> </tr> </table> </form> <table width="100%" cellspacing="0" border="0" cellpadding="0"> <tr> <td align="right" class="gensmall" nowrap="nowrap">{MUSIC_JUMPBOX}</td> </tr> <tr> <td align="right" class="gensmall">{S_AUTH_LIST}</td> </tr> </table> <br clear="all" /> <!-- Do not remove my copyright notice and keep visible with its original content! --> {MUSIC_COPYRIGHT} Index: music_index_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_index_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_index_body.tpl 30 Aug 2007 03:53:33 -0000 1.2 --- music_index_body.tpl 5 Sep 2007 23:37:50 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- </table> <table width="100%" cellpadding="1" cellspacing="1" border="0" class="forumline"> + <!-- BEGIN top_songs --> <tr> <th class="thTop" height="25" colspan="6" nowrap="nowrap">{L_TOP_SONGS} *************** *** 22,30 **** <td width="10%" class="catbottom" align="center"><span class="gen">{L_COMMENTS}</span></td> </tr> ! <!-- BEGIN no_songs --> ! <tr> ! <td class="row1" align="center" colspan="6" height="50"><span class="gen">{L_NO_SONGS}</span></td> ! </tr> ! <!-- END no_songs --> <!-- BEGIN top_row --> <!-- END top_row --> --- 23,27 ---- <td width="10%" class="catbottom" align="center"><span class="gen">{L_COMMENTS}</span></td> </tr> ! <!-- END top_songs --> <!-- BEGIN top_row --> <!-- END top_row --> *************** *** 40,44 **** <!-- END top_detail --> </tr> ! <!-- END top_songs --> <tr> <td class="catbottom" colspan="6" height="28" align="center"><span class="cattitle"> {L_SELECT_SORT_METHOD}: --- 37,41 ---- <!-- END top_detail --> </tr> ! <tr> <td class="catbottom" colspan="6" height="28" align="center"><span class="cattitle"> {L_SELECT_SORT_METHOD}: *************** *** 59,62 **** --- 56,60 ---- </span></td> </tr> + <!-- END top_songs --> </table> <br /> *************** *** 73,79 **** <!-- BEGIN catrow --> <tr> ! <td class="row1" height="50"><span class="forumlink"> <a href="{catrow.U_VIEW_CAT}" class="forumlink">{catrow.CAT_TITLE}</a><br /> ! </span> <span class="genmed">{catrow.CAT_DESC}<br /> ! </span><span class="gensmall">{catrow.L_MODERATORS} {catrow.MODERATORS} {catrow.SUBCATS}</span></td> <td class="row2" align="center"><span class="gensmall">{catrow.CAT_VIEWS}</span></td> <td class="row2" align="center"><span class="gensmall">{catrow.SONGS}</span></td> --- 71,91 ---- <!-- BEGIN catrow --> <tr> ! <td> ! <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumrow"> ! <tr> ! <td class="row1" height="50" width="50%"> ! <span class="forumlink"> <a href="{catrow.U_VIEW_CAT}" class="forumlink">{catrow.CAT_TITLE}</a></span><br /> ! <span class="genmed">{catrow.CAT_DESC}</span><br /> ! <span class="gensmall">{catrow.L_MODERATORS} {catrow.MODERATORS} {catrow.SUBCATS}</span> ! </td> ! <td class="row1" height="50" width="50%"> ! <!-- BEGIN virtual --> ! <span class="genmed"> <a href="{catrow.U_VIEW_PIC_CAT}" class="genmed">{catrow.L_ALL_CAT_PICS}</a></span><br /> ! <span class="genmed"> <a href="{catrow.U_VIEW_MEDIA_CAT}" class="genmed">{catrow.L_ALL_CAT_SONGS}</a></span><br /> ! <!-- END virtual --> ! </td> ! </tr> ! </table> ! </td> <td class="row2" align="center"><span class="gensmall">{catrow.CAT_VIEWS}</span></td> <td class="row2" align="center"><span class="gensmall">{catrow.SONGS}</span></td> Index: music_cat_xs.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_cat_xs.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** music_cat_xs.tpl 1 Sep 2007 05:39:10 -0000 1.5 --- music_cat_xs.tpl 5 Sep 2007 23:37:49 -0000 1.6 *************** *** 16,20 **** </td> <td class="nav" width="100%"> ! <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> --- 16,20 ---- </td> <td class="nav" width="100%"> ! <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {U_NAV_CAT_PARENT} {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> *************** *** 195,199 **** <!-- IF song_detail.S_ROW_TYPE eq img --> ! <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_URL is even -->{song_detail.SONG_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="<!-- IF song_detail.SONG_URL is even -->{song_detail.SONG_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" width="425" height="350" border="1"></a> <!-- ENDIF --> --- 195,199 ---- <!-- IF song_detail.S_ROW_TYPE eq img --> ! <a href="javascript:void(0);" onClick="window.open('<!-- IF song_detail.SONG_FULL_URL is even -->{song_detail.SONG_FULL_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->','','scrollbars=yes,resizable=no,width=810,height=610')"><img src="<!-- IF song_detail.SONG_THUMB_URL is even -->{song_detail.SONG_THUMB_URL}<!-- ELSE -->{song_detail.U_SONG}<!-- ENDIF -->" id="image" type="image" border="1"></a> <!-- ENDIF --> *************** *** 275,279 **** </td> <td class="nav" width="100%"> ! <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> --- 275,279 ---- </td> <td class="nav" width="100%"> ! <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {U_NAV_CAT_PARENT} {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> |
|
From: OryNider <ory...@us...> - 2007-09-05 23:38:20
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24024 Modified Files: db_install.php music.php Log Message: Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_install.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** db_install.php 30 Aug 2007 03:58:13 -0000 1.5 --- db_install.php 5 Sep 2007 23:37:44 -0000 1.6 *************** *** 167,176 **** $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', '300')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_height', '200')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('download', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('enable_integration', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('override_default_pages', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('index', '5')"; $sql[] = "UPDATE " . $mx_table_prefix . "module" . " --- 167,177 ---- $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')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('download', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('enable_integration', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('override_default_pages', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('index', '5')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('img_allowed', '1')"; $sql[] = "UPDATE " . $mx_table_prefix . "module" . " Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** music.php 2 Sep 2007 07:38:19 -0000 1.6 --- music.php 5 Sep 2007 23:37:46 -0000 1.7 *************** *** 106,109 **** --- 106,117 ---- include($module_root_path. 'includes/music_cat.'.$phpEx); } + else if ( $mode == 'music_pic_cat' ) + { + include($module_root_path. 'includes/music_pic_cat.'.$phpEx); + } + else if ( $mode == 'music_media_cat' ) + { + include($module_root_path. 'includes/music_media_cat.'.$phpEx); + } else if ( $mode == 'music_comment' ) { *************** *** 368,371 **** --- 376,381 ---- $template->assign_block_vars('catrow', array( 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $catrows[$i]['cat_id'])), + 'U_VIEW_PIC_CAT' => append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=". $catrows[$i]['cat_id'])), + 'U_VIEW_MEDIA_CAT' => append_sid(this_mo_mxurl("music_mode=music_media_cat&cat_id=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], *************** *** 373,379 **** --- 383,658 ---- 'CAT_VIEWS' => $catrows[$i]['cat_views'], 'L_MODERATORS' => $l_moderators, + 'L_ALL_CAT_PICS' => $lang['Category_pics'], + 'L_ALL_CAT_SONGS' => $lang['Category_songs'], 'MODERATORS' => $moderators_list, 'LAST_SONG_INFO' => $last_song_info) ); + + $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 + FROM ". MUSIC_TABLE ." AS s + LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id + LEFT JOIN ". MUSIC_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id + LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id + WHERE s.song_cat_id = '". $catrows[$i]['cat_id'] ."' $song_approval_sql + GROUP BY s.song_id"; + if( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, 'Could not query song information', '', __LINE__, __FILE__, $sql); + } + $itemrow = $db->sql_fetchrow($result); + + if ( $itemrow['song_url'] == '' ) + { + $song_filetype = substr($itemrow['song_filename'], strlen($itemrow['song_filename']) - 3, 3); + $song_filename = ( !empty($itemrow['song_filename']) ? $itemrow['song_filename'] : '' ); + } + else + { + $song_filetype = substr($itemrow['song_url'], strlen($itemrow['song_url']) - 3, 3); + $song_url = $itemrow['song_url']; + } + + // + // Media Center + // + if ( $song_filetype == 'swf' ) + { + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + $row_type = 'flash'; + } + else if ( $song_filetype == 'ram' ) + { + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + $row_type = 'ram'; + } + else if ( $song_filetype == '.rm' ) + { + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + $row_type = 'rm'; + } + else if ( $song_filetype == '.qt' ) + { + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + $row_type = 'qt'; + } + else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) + { + $url_download = !empty($itemrow['song_url']) ? $itemrow['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + $row_type = 'img'; + } + else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) + { + $url_download = !empty($itemrow['song_url']) ? $itemrow['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + $row_type = 'img'; + } + else if( ($song_filetype == 'pls') && !empty($itemrow['song_url']) ) + { + $url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); + $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); + $url_video = $url_download; + $row_type = 'media'; + } + else if(!empty($itemrow['song_url'])) + { + $host = explode("//", $itemrow['song_url']); + $host = $host[1]; + $host = explode("/", $host); + $domain = $host[0]; + $counthost = count($host) - 1; + $docid2 = $host[$counthost]; + + // $domaintmp = explode(".", $domain, -1); // Php 5 only + // $sitename = implode(".", $domaintmp); + + if( !function_exists('mx_music_sitename') ) + { + function mx_music_sitename($domain) { + $domaintmp = explode(".", $domain); + + $y = count($domaintmp) - 1; + $r = ""; + for ($a = 0; $y > $a; $a++) { + $r .= ".".$domaintmp[$a]; + } + return $r; + } + } + + $sitename = substr(mx_music_sitename($domain), 1); + + if( !function_exists('mx_music_sitesufix') ) + { + function mx_music_sitesufix($domain) { + $domaintmp = explode(".", $domain); + + $y = count($domaintmp) - 1; + $r = $domaintmp[$y];; + return $r; + } + } + + $sitesufix = mx_music_sitesufix($domain); + + if (!empty($sitesufix) ) + { + if ($sitesufix == 'de') + { + $sitelngprefix = 'de.'; + } + else + { + $sitelngprefix = 'en.'; + } + } + else + { + $sitelngprefix = ''; + } + + if ($sitename == 'video.google') + { + $videoid['song_url'] = explode("-", $itemrow['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + $docid['song_url'] = explode("?", $itemrow['song_url']); + + if (empty($docid['song_url'][1]) ) + { + $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $itemrow['song_url'] ); + $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $itemrow['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $row_type = 'flashvideo'; + } + else + { + $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $itemrow['song_url'] ); + $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $itemrow['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Watch'] : 'Watch URL' ); + $row_type = 'youtube'; + } + } + else + { + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?docId=-' . $videoid['song_url'][1] : $itemrow['song_url'] ); + $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $itemrow['song_url'] ); + $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); + $row_type = 'youtube'; + } + } + else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') ) + { + $videoid['song_url'] = explode("=", $itemrow['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + $row_type = 'flashvideo'; + } + else + { + $url_video = 'http://' . $domain . '/v/' . $videoid['song_url'][1]; + //$url_download = append_sid($itemrow['song_url']); + $row_type = 'youtube'; + } + + $url_download = append_sid($itemrow['song_url']); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); + } + else if ( ($sitename == 'www.clipfish') || ($sitename == 'clipfish') ) + { + $thisvid['song_url'] = explode("videoid", $itemrow['song_url']); + $videoid['song_url'] = explode("=", $thisvid['song_url'][1]); + + if (empty($videoid['song_url'][1]) ) + { + $url_download = append_sid($itemrow['song_url']); + $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); + $url_video = $url_download; + $row_type = 'flashvideo'; + } + else + { + $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player.php?videoid=' . $videoid['song_url'][1] : $itemrow['song_url'] ); + $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplayer.swf?as=0&videoid=' . $videoid['song_url'][1] : $url_download ); + $row_type = 'youtube'; + } + } + else if ( ($sitename == 'www.myvideo') || ($sitename == 'myvideo') ) + { + if (empty($docid2) ) + { + $url_download = append_sid($itemrow['song_url']); + $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); + $url_video = $url_download; + $row_type = 'flashvideo'; + } + else + { + $url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $itemrow['song_url'] ); + $lang['Downlowd'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); + $row_type = 'youtube'; + } + } + else if ( ($sitename == 'de.sevenload') || ($sitename == 'sevenload') || ($sitename == 'page.sevenload') || ($sitename == 'www.sevenload') ) + { + $videoid['song_url'] = explode("=", $itemrow['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + if (empty($docid2) ) + { + $url_download = append_sid($itemrow['song_url']); + $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); + $url_video = $url_download; + $row_type = 'flashvideo'; + } + else + { + $url_download = ( !empty($docid2) ? 'http://' . $sitelngprefix . 'sevenload.' . 'com' . '/videos/' . $docid2 : $itemrow['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); + $row_type = 'youtube'; + } + } + else + { + $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $sitelngprefix . 'sevenload.'. 'com' . '/videos/' . $videoid['song_url'][1] : $itemrow['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download ); + $row_type = 'youtube'; + } + } + else + { + $url_download = append_sid($itemrow['song_url']); + $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); + $url_video = $url_download; + $row_type = 'media'; + } + } + else + { + //$url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); + $url_video = $url_download; + $row_type = 'media'; + } + + if(!empty($template->xs_version)) + { + if ($row_type) + { + $template->assign_block_vars('catrow.virtual', array()); + } + } } else *************** *** 419,422 **** --- 698,703 ---- 'CAT_VIEWS' => $catrows[$i]['cat_views'], 'L_MODERATORS' => $l_moderators, + 'L_ALL_CAT_PICS' => $lang['Category_pics'], + 'L_ALL_CAT_SONGS' => $lang['Category_songs'], 'MODERATORS' => $moderators_list, 'LAST_SONG_INFO' => $last_song_info) *************** *** 540,544 **** // We may do query now // ! if ($allowed_cat != '') { $sql = "SELECT s.song_id, s.song_title, s.song_desc, s.song_singer, s.song_user_id, s.song_user_ip, s.song_username, s.song_time, s.song_cat_id, s.song_view_count, 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 --- 821,825 ---- // We may do query now // ! if ( ($allowed_cat != '') && ($music_config['top'] > '0') ) { $sql = "SELECT s.song_id, s.song_title, s.song_desc, s.song_singer, s.song_user_id, s.song_user_ip, s.song_username, s.song_time, s.song_cat_id, s.song_view_count, 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 *************** *** 653,657 **** } ! if ($allowed_cat != '') { $sql = "SELECT s.song_id, s.song_title, s.song_desc, s.song_singer, s.song_user_id, s.song_user_ip, s.song_username, s.song_time, s.song_cat_id, s.song_view_count, 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 --- 934,938 ---- } ! if ( ($allowed_cat != '') && ($music_config['top'] > '0') ) { $sql = "SELECT s.song_id, s.song_title, s.song_desc, s.song_singer, s.song_user_id, s.song_user_ip, s.song_username, s.song_time, s.song_cat_id, s.song_view_count, 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: OryNider <ory...@us...> - 2007-09-05 23:38:00
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24024/includes Modified Files: music_cat.php music_comment.php music_comment_delete.php music_comment_edit.php music_page.php music_rss.php music_song.php music_upload.php Added Files: music_media_cat.php music_pic_cat.php Log Message: Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_upload.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_upload.php 1 Sep 2007 05:38:52 -0000 1.4 --- music_upload.php 5 Sep 2007 23:37:48 -0000 1.5 *************** *** 584,605 **** if( empty($song_url) ) { ! $ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var'; ! if ( @$ini_val('open_basedir') != '' ) ! { ! if ( @phpversion() < '4.0.3' ) { ! mx_message_die(GENERAL_ERROR, 'open_basedir is set and your PHP version does not allow move_uploaded_file<br /><br />Please contact your server admin', '', __LINE__, __FILE__); } ! $move_file = 'move_uploaded_file'; ! } ! else ! { ! $move_file = 'copy'; ! } ! $move_file($filetmp, MUSIC_UPLOAD_PATH . $song_filename); ! @chmod(MUSIC_UPLOAD_PATH . $song_filename, 0777); } --- 584,606 ---- if( empty($song_url) ) { ! $ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var'; ! if ( @$ini_val('open_basedir') != '' ) { ! if ( @phpversion() < '4.0.3' ) ! { ! mx_message_die(GENERAL_ERROR, 'open_basedir is set and your PHP version does not allow move_uploaded_file<br /><br />Please contact your server admin', '', __LINE__, __FILE__); ! } ! ! $move_file = 'move_uploaded_file'; ! } ! else ! { ! $move_file = 'copy'; } ! $move_file($filetmp, MUSIC_UPLOAD_PATH . $song_filename); ! @chmod(MUSIC_UPLOAD_PATH . $song_filename, 0777); } Index: music_comment_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_comment_edit.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_comment_edit.php 1 Aug 2007 23:33:27 -0000 1.2 --- music_comment_edit.php 5 Sep 2007 23:37:47 -0000 1.3 *************** *** 15,51 **** } - // - // Let's include some stuff... - // - $phpEx = substr(strrchr(__FILE__, '.'), 1); - - if ( !defined('TEMPLATE_ROOT_PATH') ) - { - include_once($mx_root_path . 'common.' . $phpEx); - - // - // Start session management - // - $mx_user->init($user_ip, PAGE_INDEX); - // - // End session management - // - } - - - $music_root_path = $module_root_path . 'music_box/'; - - // - // Get general music information - // - if ( !$is_block ) - { - include($music_root_path . 'music_common.'.$phpEx); - } - else - { - include_once($music_root_path . 'music_common.'.$phpEx); - } - // ------------------------------------ // Check feature enabled --- 15,18 ---- --- NEW FILE: music_pic_cat.php --- <?php /** * * @package mxBB Portal Module - mx_music * @version $Id: music_pic_cat.php,v 1.1 2007/09/05 23:37:49 orynider Exp $ * @copyright (c) 2003 [ory...@rd..., OryNider] mxBB Development Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ //mxBB if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } // ------------------------------------ // Check the request // ------------------------------------ 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 { mx_message_die(GENERAL_ERROR, 'No categories specified'); } // // END check request // // ------------------------------------ // Get this cat info // ------------------------------------ $sql = "SELECT c.*, COUNT(s.song_id) AS count FROM ". MUSIC_CAT_TABLE ." AS c LEFT JOIN ". MUSIC_TABLE ." AS s ON c.cat_id = s.song_cat_id WHERE c.cat_id <> 0 GROUP BY c.cat_id ORDER BY cat_order"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql); } $thiscat = array(); // this category $catrows = array(); // all categories for jumpbox while( $row = $db->sql_fetchrow($result) ) { $music_user_access = music_user_access($row['cat_id'], $row, 1, 0, 0, 0, 0, 0); // VIEW if ($music_user_access['view'] == 1) { $catrows[] = $row; if( $row['cat_id'] == $cat_id ) { $thiscat = $row; $auth_data = music_user_access($cat_id, $row, 1, 1, 1, 1, 1, 1); // ALL $total_songs = $thiscat['count']; } } } if (empty($thiscat)) { mx_message_die(GENERAL_MESSAGE, $lang['Category_not_exist']); } $cat_parent = $thiscat['cat_parent']; if ($cat_parent != 0) { $sql = "SELECT cat_id,cat_title FROM ". MUSIC_CAT_TABLE ." WHERE cat_id = $cat_parent"; if ( $result = $db->sql_query($sql) ) { $thiscat_parent = array(); $thiscat_parent = $db->sql_fetchrow($result); $template->assign_vars(array( 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], 'CAT_PARENT' => $thiscat_parent['cat_id']) ); } } // // END cat info // // ------------------------------------ // Check permissions // ------------------------------------ if( !$auth_data['view'] ) { if (!$userdata['session_logged_in']) { mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_pic_cat&cat_id=$cat_id"), true)); } else { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); } } if ( $auth_data['upload'] ) { $enable_soung_upload_switch = true; $template->assign_block_vars('enable_soung_upload', array()); } // // END check permissions // // ------------------------------------ // Build Auth List // ------------------------------------ $auth_key = array_keys($auth_data); $auth_list = ''; for ($i = 0; $i < (count($auth_data) - 1); $i++) // ignore MODERATOR in this loop { // // we should skip a loop if RATE and COMMENT is disabled // if( ( ($music_config['rate'] == 0) and ($auth_key[$i] == 'rate') ) or ( ($music_config['comment'] == 0) and ($auth_key[$i] == 'comment') ) ) { continue; } $auth_list .= ($auth_data[$auth_key[$i]] == 1) ? $lang['Music_'. $auth_key[$i] .'_can'] : $lang['Music_'. $auth_key[$i] .'_cannot']; $auth_list .= '<br />'; } // add Moderator Control Panel here if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // // END Auth List // // ------------------------------------ // Build Moderators List // ------------------------------------ $grouprows = array(); $moderators_list = ''; 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"; if ( !$result = $db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) { $grouprows[] = $row; } if( count($grouprows) > 0 ) { for ($j = 0; $j < count($grouprows); $j++) { $group_link = '<a href="'. append_sid($phpbb_root_path . "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; } } } if( empty($moderators_list) ) { $moderators_list = $lang['None']; } // // END Moderator List // // ------------------------------------ // Build the thumbnail page // ------------------------------------ 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 { $start = 0; } if( isset($HTTP_GET_VARS['sort_method']) ) { switch ($HTTP_GET_VARS['sort_method']) { case 'song_time': $sort_method = 'song_time'; break; case 'song_title': $sort_method = 'song_title'; break; case 'song_singer': $sort_method = 'song_singer'; break; case 'username': $sort_method = 'username'; break; case 'song_view_count': $sort_method = 'song_view_count'; break; case 'rating': $sort_method = 'rating'; break; case 'comments': $sort_method = 'comments'; break; case 'new_comment': $sort_method = 'new_comment'; break; default: $sort_method = $music_config['sort_method']; } } else if( isset($HTTP_POST_VARS['sort_method']) ) { switch ($HTTP_POST_VARS['sort_method']) { case 'song_time': $sort_method = 'song_time'; break; case 'song_title': $sort_method = 'song_title'; break; case 'song_singer': $sort_method = 'song_singer'; break; case 'username': $sort_method = 'username'; break; case 'song_view_count': $sort_method = 'song_view_count'; break; case 'rating': $sort_method = 'rating'; break; case 'comments': $sort_method = 'comments'; break; case 'new_comment': $sort_method = 'new_comment'; break; default: $sort_method = $music_config['sort_method']; } } else { $sort_method = $music_config['sort_method']; } if( isset($HTTP_GET_VARS['sort_order']) ) { switch ($HTTP_GET_VARS['sort_order']) { case 'ASC': $sort_order = 'ASC'; break; case 'DESC': $sort_order = 'DESC'; break; default: $sort_order = $music_config['sort_order']; } } else if( isset($HTTP_POST_VARS['sort_order']) ) { switch ($HTTP_POST_VARS['sort_order']) { case 'ASC': $sort_order = 'ASC'; break; case 'DESC': $sort_order = 'DESC'; break; default: $sort_order = $music_config['sort_order']; } } else { $sort_order = $music_config['sort_order']; } $music_config['cols_per_page'] = $music_config['rows_per_page']; // Added for ministry.ro //$music_config['rows_per_page'] = '20'; // Added for ministry.ro $songs_per_page = $music_config['rows_per_page'] * $music_config['cols_per_page']; if ($total_songs > 0) { $limit_sql = ($start == 0) ? $songs_per_page : $start .','. $songs_per_page; $song_approval_sql = 'AND s.song_approval = 1'; if ($thiscat['cat_approval'] != MUSIC_USER) { if( ($userdata['user_level'] == ADMIN) or (($auth_data['moderator'] == 1) and ($thiscat['cat_approval'] == MUSIC_MOD)) ) { $song_approval_sql = ''; } } // // Update the music view counter // $sql = "UPDATE " . MUSIC_CAT_TABLE . " SET cat_views = cat_views + 1 WHERE cat_id = $cat_id"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, "Could not update music views.", '', __LINE__, __FILE__, $sql); } $sql = "SELECT s.song_id, s.song_title, s.song_desc, s.song_singer, s.song_user_id, s.song_user_ip, s.song_username, s.song_time, s.song_cat_id, s.song_view_count, s.song_lock, s.song_approval, 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_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id WHERE s.song_cat_id = '$cat_id' $song_approval_sql GROUP BY s.song_id ORDER BY $sort_method $sort_order LIMIT $limit_sql"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql); } $songrow = array(); while( $row = $db->sql_fetchrow($result) ) { $songrow[] = $row; } for ($i = 0; $i < count($songrow); $i += $music_config['cols_per_page']) { $template->assign_block_vars('songrow', array()); for ($j = $i; $j < ($i + $music_config['cols_per_page']); $j++) { if( $j >= count($songrow) ) { break; } if(!$songrow[$j]['rating']) { $songrow[$j]['rating'] = $lang['Not_rated']; } else { $songrow[$j]['rating'] = round($songrow[$j]['rating'], 2); } $approval_link = ''; if ($thiscat['cat_approval'] != MUSIC_USER) { if( ($userdata['user_level'] == ADMIN) or (($auth_data['moderator'] == 1) and ($thiscat['cat_approval'] == MUSIC_MOD)) ) { $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; $approval_link .= '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; $approval_link .= '</a>'; } } $template->assign_block_vars('songrow.songcol', array( 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, ) ); if( ($songrow[$j]['user_id'] == MUSIC_GUEST) or ($songrow[$j]['username'] == '') ) { $song_poster = ($songrow[$j]['song_username'] == '') ? $lang['Guest'] : $songrow[$j]['song_username']; } else { $song_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } // ------------------------------------ // Get this song info // ------------------------------------ $song_id = $songrow[$j]['song_id']; $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 FROM ". MUSIC_TABLE ." AS s LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id LEFT JOIN ". MUSIC_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id WHERE song_id = '$song_id' GROUP BY s.song_id"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query song information', '', __LINE__, __FILE__, $sql); } $thissong = $db->sql_fetchrow($result); $cat_id = $thissong['song_cat_id']; $user_id = $thissong['song_user_id']; if ( $thissong['song_url'] == '' ) { $song_filetype = substr($thissong['song_filename'], strlen($thissong['song_filename']) - 3, 3); $song_filename = ( !empty($thissong['song_filename']) ? $thissong['song_filename'] : '' ); } else { $song_filetype = substr($thissong['song_url'], strlen($thissong['song_url']) - 3, 3); $song_url = $thissong['song_url']; } // // Media Center // if ( $song_filetype == 'swf' ) { $template->assign_block_vars('songrow.flash', array()); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; } else if ( $song_filetype == 'ram' ) { $template->assign_block_vars('songrow.ram', array()); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; } else if ( $song_filetype == '.rm' ) { $template->assign_block_vars('songrow.rm', array()); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; } else if ( $song_filetype == '.qt' ) { $template->assign_block_vars('songrow.qt', array()); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; } else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; $template->assign_block_vars('songrow.img', array( 'VIDEO_URL' => $url_video, 'SONG_URL' => $url_video )); } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; $template->assign_block_vars('songrow.img', array( 'VIDEO_URL' => $url_video, 'SONG_URL' => $url_video )); } else if( ($song_filetype == 'pls') && !empty($thissong['song_url']) ) { $template->assign_block_vars('songrow.media', array()); $url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; $row_type = 'media'; } else if(!empty($thissong['song_url'])) { $host = explode("//", $thissong['song_url']); $host = $host[1]; $host = explode("/", $host); $domain = $host[0]; $counthost = count($host) - 1; $docid2 = $host[$counthost]; // $domaintmp = explode(".", $domain, -1); // Php 5 only // $sitename = implode(".", $domaintmp); if( !function_exists('mx_music_sitename') ) { function mx_music_sitename($domain) { $domaintmp = explode(".", $domain); $y = count($domaintmp) - 1; $r = ""; for ($a = 0; $y > $a; $a++) { $r .= ".".$domaintmp[$a]; } return $r; } } $sitename = substr(mx_music_sitename($domain), 1); if( !function_exists('mx_music_sitesufix') ) { function mx_music_sitesufix($domain) { $domaintmp = explode(".", $domain); $y = count($domaintmp) - 1; $r = $domaintmp[$y];; return $r; } } $sitesufix = mx_music_sitesufix($domain); if (!empty($sitesufix) ) { if ($sitesufix == 'de') { $sitelngprefix = 'de.'; } else { $sitelngprefix = 'en.'; } } else { $sitelngprefix = ''; } if ($sitename == 'video.google') { $videoid['song_url'] = explode("-", $thissong['song_url']); if (empty($videoid['song_url'][1]) ) { $docid['song_url'] = explode("?", $thissong['song_url']); if (empty($docid['song_url'][1]) ) { $template->assign_block_vars('songrow.flashvideo', array()); $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $row_type = 'flashvideo'; } else { $template->assign_block_vars('songrow.youtube', array()); $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Watch'] : 'Watch URL' ); $row_type = 'youtube'; } } else { $template->assign_block_vars('songrow.youtube', array()); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?docId=-' . $videoid['song_url'][1] : $thissong['song_url'] ); $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); $row_type = 'youtube'; } } else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') ) { $videoid['song_url'] = explode("=", $thissong['song_url']); if (empty($videoid['song_url'][1]) ) { $template->assign_block_vars('songrow.flashvideo', array()); $row_type = 'flashvideo'; } else { $template->assign_block_vars('songrow.youtube', array( 'VIDEO_URL' => 'http://' . $domain . '/v/' . $videoid['song_url'][1], 'SONG_URL' => $thissong['song_url'] )); $row_type = 'youtube'; } $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); } else if ( ($sitename == 'www.clipfish') || ($sitename == 'clipfish') ) { $thisvid['song_url'] = explode("videoid", $thissong['song_url']); $videoid['song_url'] = explode("=", $thisvid['song_url'][1]); if (empty($videoid['song_url'][1]) ) { $template->assign_block_vars('songrow.flashvideo', array()); $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; $row_type = 'flashvideo'; } else { $template->assign_block_vars('songrow.youtube', array()); $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player.php?videoid=' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplayer.swf?as=0&videoid=' . $videoid['song_url'][1] : $url_download ); $row_type = 'youtube'; } } else if ( ($sitename == 'www.myvideo') || ($sitename == 'myvideo') ) { if (empty($docid2) ) { $template->assign_block_vars('songrow.flashvideo', array()); $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; $row_type = 'flashvideo'; } else { $template->assign_block_vars('songrow.youtube', array()); $url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); $row_type = 'youtube'; } } else if ( ($sitename == 'de.sevenload') || ($sitename == 'sevenload') || ($sitename == 'page.sevenload') || ($sitename == 'www.sevenload') ) { $videoid['song_url'] = explode("=", $thissong['song_url']); if (empty($videoid['song_url'][1]) ) { if (empty($docid2) ) { $template->assign_block_vars('songrow.flashvideo', array()); $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; $row_type = 'flashvideo'; } else { $template->assign_block_vars('songrow.youtube', array()); $url_download = ( !empty($docid2) ? 'http://' . $sitelngprefix . 'sevenload.' . 'com' . '/videos/' . $docid2 : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); $row_type = 'youtube'; } } else { $template->assign_block_vars('songrow.youtube', array()); $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $sitelngprefix . 'sevenload.'. 'com' . '/videos/' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download ); $row_type = 'youtube'; } } else { $template->assign_block_vars('songrow.media', array()); $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; $row_type = 'media'; } } else { $template->assign_block_vars('songrow.media', array()); //$url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; $row_type = 'media'; } switch ($row_type) { case 'img': $switch_row_type = 'img'; break; default: $switch_row_type = 'media'; } $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); $template->assign_block_vars('songrow.song_detail', array( 'TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', 'U_SONG' => $url_song, 'SONG_TITLE' => $thissong['song_title'], 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)), 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=114", true)), 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => $url_video, 'SINGER' => $songrow[$j]['song_singer'], 'POSTER' => $song_poster, 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $songrow[$j]['song_id']) . '">' . $songrow[$j]['rating'] . '</a>')) : '', 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['comments'] . '</a>' ) : '', 'EDIT' => ( ( $auth_data['edit'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_edit&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Edit_song'] . '</a>' : '', 'DELETE' => ( ( $auth_data['delete'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_delete&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Delete_song'] . '</a>' : '', 'MOVE' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=move&song_id=". $songrow[$j]['song_id'])) .'">'. $lang['Move'] .'</a>' : '', 'LOCK' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', 'S_ROW_TYPE' => $row_type) ); } } //$total_media = count($switch_row_type == 'media'); //$total_images = count($switch_row_type == 'img'); $total_images = $total_songs; $template->assign_vars(array( 'PAGINATION' => generate_pagination(append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_images, $songs_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $songs_per_page ) + 1 ), ceil( $total_images / $songs_per_page )) ) ); } else { $template->assign_block_vars('no_songs', array()); } // // END thumbnails table // // ------------------------------------ // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ $music_jumpbox = '<form name="jumpbox" action="'. append_sid(this_mo_mxurl("music_mode=music_pic_cat")) .'" method="get">'; $music_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) { $music_jumpbox .= '<option value="'. $catrows[$i]['cat_id'] .'"'; $music_jumpbox .= ($catrows[$i]['cat_id'] == $cat_id) ? 'selected="selected"' : ''; $music_jumpbox .= '>' . $catrows[$i]['cat_title'] .'</option>'; } $music_jumpbox .= '</select>'; $music_jumpbox .= ' <input type="submit" class="liteoption" value="'. $lang['Go'] .'" />'; $music_jumpbox .= '<input type="hidden" name="sid" value="'. $userdata['session_id'] .'" />'; $music_jumpbox .= '</form>'; // // END build jumpbox // // ------------------------------------ // additional sorting options // ------------------------------------ $sort_rating_option = ''; $sort_comments_option = ''; if( $music_config['rate'] == 1 ) { $sort_rating_option = '<option value="rating" '; $sort_rating_option .= ($sort_method == 'rating') ? 'selected="selected"' : ''; $sort_rating_option .= '>' . $lang['Rating'] .'</option>'; } if( $music_config['comment'] == 1 ) { $sort_comments_option = '<option value="comments" '; $sort_comments_option .= ($sort_method == 'comments') ? 'selected="selected"' : ''; $sort_comments_option .= '>' . $lang['Comments'] .'</option>'; $sort_new_comment_option = '<option value="new_comment" '; $sort_new_comment_option .= ($sort_method == 'new_comment') ? 'selected="selected"' : ''; $sort_new_comment_option .= '>' . $lang['New_Comment'] .'</option>'; } // // Start output of page // $page_title = $lang['Music']; if ( !$is_block ) { include($mx_root_path . 'includes/page_header.'.$phpEx); } if(!empty($template->xs_version)) { $template->set_filenames(array( 'body' => 'music_pic_cat_body.tpl') ); } else { mx_message_die(GENERAL_ERROR, 'eXtreme Styles not installed', '', '', ''); } $template->assign_vars(array( 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], 'U_VIEW_CAT_VIRTUAL' => append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'CAT_TITLE_VIRTUAL' => $lang['Images'], 'L_MODERATORS' => $lang['Moderators'], 'MODERATORS' => $moderators_list, 'U_UPLOAD_SONG' => append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), 'UPLOAD_SONG_IMG' => $mx_images['upload_song'], 'L_UPLOAD_SONG' => $lang['Upload_Song'], 'L_CATEGORY' => $lang['Category'], 'L_ALL_CAT_PICS' => $lang['Category_pics'], 'L_NO_SONGS' => $lang['No_Songs'], 'S_COLS' => $music_config['cols_per_page'], 'S_COL_WIDTH' => (100/$music_config['cols_per_page']) . '%', 'L_VIEW' => $lang['View'], 'L_POSTER' => $lang['Poster'], 'L_POSTED' => $lang['Posted'], 'L_RATING' => $lang['Rating'], 'L_COMMENTS' => $lang['Comments'], 'MUSIC_JUMPBOX' => $music_jumpbox, 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], 'L_ORDER' => $lang['Order'], 'L_SORT' => $lang['Sort'], 'L_TIME' => $lang['Time'], 'L_SONG_TITLE' => $lang['Song_Title'], 'L_SINGER' => $lang['Singer'], 'L_USERNAME' => $lang['Sort_Username'], 'SORT_TIME' => ($sort_method == 'song_time') ? 'selected="selected"' : '', 'SORT_SONG_TITLE' => ($sort_method == 'song_title') ? 'selected="selected"' : '', 'SORT_SINGER' => ($sort_method == 'song_singer') ? 'selected="selected"' : '', 'SORT_USERNAME' => ($sort_method == 'song_user_id') ? 'selected="selected"' : '', 'SORT_VIEW' => ($sort_method == 'song_view_count') ? 'selected="selected"' : '', 'SORT_RATING_OPTION' => $sort_rating_option, 'SORT_COMMENTS_OPTION' => $sort_comments_option, 'SORT_NEW_COMMENT_OPTION' => $sort_new_comment_option, 'L_ASC' => $lang['Sort_Ascending'], 'L_DESC' => $lang['Sort_Descending'], 'SORT_ASC' => ($sort_order == 'ASC') ? 'selected="selected"' : '', 'SORT_DESC' => ($sort_order == 'DESC') ? 'selected="selected"' : '', 'NAV_SEP' => $lang['Nav_Separator'], 'NAV_DOT' => '•', 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], 'U_MUSIC' => append_sid(this_mo_mxurl()), 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), 'S_AUTH_LIST' => $auth_list) ); // // Generate the page // $template->pparse('body'); if ( !$is_block ) { include($mx_root_path . 'includes/page_tail.'.$phpEx); } // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | // +------------------------------------------------------+ // // That's all Folks! // -------------------- ?> Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** music_cat.php 1 Sep 2007 05:38:51 -0000 1.6 --- music_cat.php 5 Sep 2007 23:37:46 -0000 1.7 *************** *** 73,76 **** --- 73,97 ---- mx_message_die(GENERAL_MESSAGE, $lang['Category_not_exist']); } + + $cat_parent = $thiscat['cat_parent']; + + if ($cat_parent != 0) + { + $sql = "SELECT cat_id,cat_title + FROM ". MUSIC_CAT_TABLE ." + WHERE cat_id = $cat_parent"; + if ( $result = $db->sql_query($sql) ) + { + $thiscat_parent = array(); + $thiscat_parent = $db->sql_fetchrow($result); + + $template->assign_vars(array( + 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), + 'U_NAV_CAT_PARENT' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>', + 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], + 'CAT_PARENT' => $thiscat_parent['cat_id']) + ); + } + } // // END cat info *************** *** 701,705 **** } ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id)); $template->assign_block_vars('songrow.song_detail', array( --- 722,726 ---- } ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); $template->assign_block_vars('songrow.song_detail', array( *************** *** 710,714 **** 'SONG_TITLE' => $thissong['song_title'], ! 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id)), 'VIDEO_URL' => $url_video, --- 731,739 ---- 'SONG_TITLE' => $thissong['song_title'], ! 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)), ! ! 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : 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'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => $url_video, *************** *** 718,724 **** 'POSTER' => $song_poster, ! 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), --- 743,749 ---- 'POSTER' => $song_poster, ! 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), Index: music_comment_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_comment_delete.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_comment_delete.php 1 Aug 2007 23:33:27 -0000 1.2 --- music_comment_delete.php 5 Sep 2007 23:37:47 -0000 1.3 *************** *** 15,51 **** } - // - // Let's include some stuff... - // - $phpEx = substr(strrchr(__FILE__, '.'), 1); - - if ( !defined('TEMPLATE_ROOT_PATH') ) - { - include_once($mx_root_path . 'common.' . $phpEx); - - // - // Start session management - // - $mx_user->init($user_ip, PAGE_INDEX); - // - // End session management - // - } - - - $music_root_path = $module_root_path . 'music_box/'; - - // - // Get general music information - // - if ( !$is_block ) - { - include($music_root_path . 'music_common.'.$phpEx); - } - else - { - include_once($music_root_path . 'music_common.'.$phpEx); - } - // ------------------------------------ // Check feature enabled --- 15,18 ---- Index: music_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_rss.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_rss.php 2 Sep 2007 07:38:20 -0000 1.1 --- music_rss.php 5 Sep 2007 23:37:47 -0000 1.2 *************** *** 472,475 **** --- 472,479 ---- $url_comment = append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_comment&" . "song_id=" . $thissong['song_id'])); + $url_thumb_song = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $thissong['song_id'] . "&item_size=425", true)); + + $url_full_song = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $thissong['song_id'] . "&item_size=800", true)); + switch ($row_type) { *************** *** 500,504 **** case 'img': ! $html_code = '<a href="' . $url_page . '">' . '<img src="' . $url_song . '" border="1" vspace="2" hspace="2" align="left" width="425" height="350">' . '</a>'; $enclosure = 'url="' . $url_song . '" ' . 'type="image/png" length="1024000"'; break; --- 504,508 ---- case 'img': ! $html_code = '<a href="' . $url_page . '">' . '<img src="' . $url_thumb_song . '" border="1" vspace="2" hspace="2" align="left" width="425" height="350">' . '</a>'; $enclosure = 'url="' . $url_song . '" ' . 'type="image/png" length="1024000"'; break; --- NEW FILE: music_media_cat.php --- <?php /** * * @package mxBB Portal Module - mx_music * @version $Id: music_media_cat.php,v 1.1 2007/09/05 23:37:48 orynider Exp $ * @copyright (c) 2003 [ory...@rd..., OryNider] mxBB Development Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ //mxBB if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } $music_root_path = $module_root_path . 'music_box/'; // ------------------------------------ // Check the request // ------------------------------------ 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 { mx_message_die(GENERAL_ERROR, 'No categories specified'); } // // END check request // // ------------------------------------ // Get this cat info // ------------------------------------ $sql = "SELECT c.*, COUNT(s.song_id) AS count FROM ". MUSIC_CAT_TABLE ." AS c LEFT JOIN ". MUSIC_TABLE ." AS s ON c.cat_id = s.song_cat_id WHERE c.cat_id <> 0 GROUP BY c.cat_id ORDER BY cat_order"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql); } $thiscat = array(); // this category $catrows = array(); // all categories for jumpbox while( $row = $db->sql_fetchrow($result) ) { $music_user_access = music_user_access($row['cat_id'], $row, 1, 0, 0, 0, 0, 0); // VIEW if ($music_user_access['view'] == 1) { $catrows[] = $row; if( $row['cat_id'] == $cat_id ) { $thiscat = $row; $auth_data = music_user_access($cat_id, $row, 1, 1, 1, 1, 1, 1); // ALL $total_songs = $thiscat['count']; } } } if (empty($thiscat)) { mx_message_die(GENERAL_MESSAGE, $lang['Category_not_exist']); } $cat_parent = $thiscat['cat_parent']; if ($cat_parent != 0) { $sql = "SELECT cat_id,cat_title FROM ". MUSIC_CAT_TABLE ." WHERE cat_id = $cat_parent"; if ( $result = $db->sql_query($sql) ) { $thiscat_parent = array(); $thiscat_parent = $db->sql_fetchrow($result); $template->assign_vars(array( 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], 'CAT_PARENT' => $thiscat_parent['cat_id']) ); } } // // END cat info // // ------------------------------------ // Check permissions // ------------------------------------ if( !$auth_data['view'] ) { if (!$userdata['session_logged_in']) { mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_media_cat&cat_id=$cat_id"), true)); } else { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); } } if ( $auth_data['upload'] ) { $enable_soung_upload_switch = true; $template->assign_block_vars('enable_soung_upload', array()); } // // END check permissions // // ------------------------------------ // Build Auth List // ------------------------------------ $auth_key = array_keys($auth_data); $auth_list = ''; for ($i = 0; $i < (count($auth_data) - 1); $i++) // ignore MODERATOR in this loop { // // we should skip a loop if RATE and COMMENT is disabled // if( ( ($music_config['rate'] == 0) and ($auth_key[$i] == 'rate') ) or ( ($music_config['comment'] == 0) and ($auth_key[$i] == 'comment') ) ) { continue; } $auth_list .= ($auth_data[$auth_key[$i]] == 1) ? $lang['Music_'. $auth_key[$i] .'_can'] : $lang['Music_'. $auth_key[$i] .'_cannot']; $auth_list .= '<br />'; } // add Moderator Control Panel here if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // // END Auth List // // ------------------------------------ // Build Moderators List // ------------------------------------ $grouprows = array(); $moderators_list = ''; 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"; if ( !$result = $db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) { $grouprows[] = $row; } if( count($grouprows) > 0 ) { for ($j = 0; $j < count($grouprows); $j++) { $group_link = '<a href="'. append_sid($phpbb_root_path . "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; } } } if( empty($moderators_list) ) { $moderators_list = $lang['None']; } // // END Moderator List // // ------------------------------------ // Build the thumbnail page // ------------------------------------ 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 { $start = 0; } if( isset($HTTP_GET_VARS['sort_method']) ) { switch ($HTTP_GET_VARS['sort_method']) { case 'song_time': $sort_method = 'song_time'; break; case 'song_title': $sort_method = 'song_title'; break; case 'song_singer': $sort_method = 'song_singer'; break; case 'username': $sort_method = 'username'; break; case 'song_view_count': $sort_method = 'song_view_count'; break; case 'rating': $sort_method = 'rating'; break; case 'comments': $sort_method = 'comments'; break; case 'new_comment': $sort_method = 'new_comment'; break; default: $sort_method = $music_config['sort_method']; } } else if( isset($HTTP_POST_VARS['sort_method']) ) { switch ($HTTP_POST_VARS['sort_method']) { case 'song_time': $sort_method = 'song_time'; break; case 'song_title': $sort_method = 'song_title'; break; case 'song_singer': $sort_method = 'song_singer'; break; case 'username': $sort_method = 'username'; break; case 'song_view_count': $sort_method = 'song_view_count'; break; case 'rating': $sort_method = 'rating'; break; case 'comments': $sort_method = 'comments'; break; case 'new_comment': $sort_method = 'new_comment'; break; default: $sort_method = $music_config['sort_method']; } } else { $sort_method = $music_config['sort_method']; } if( isset($HTTP_GET_VARS['sort_order']) ) { switch ($HTTP_GET_VARS['sort_order']) { case 'ASC': $sort_order = 'ASC'; break; case 'DESC': $sort_order = 'DESC'; break; default: $sort_order = $music_config['sort_order']; } } else if( isset($HTTP_POST_VARS['sort_order']) ) { switch ($HTTP_POST_VARS['sort_order']) { case 'ASC': $sort_order = 'ASC'; break; case 'DESC': $sort_order = 'DESC'; break; default: $sort_order = $music_config['sort_order']; } } else { $sort_order = $music_config['sort_order']; } $songs_per_page = $music_config['rows_per_page'] * $music_config['cols_per_page']; if ($total_songs > 0) { $limit_sql = ($start == 0) ? $songs_per_page : $start .','. $songs_per_page; $song_approval_sql = 'AND s.song_approval = 1'; if ($thiscat['cat_approval'] != MUSIC_USER) { if( ($userdata['user_level'] == ADMIN) or (($auth_data['moderator'] == 1) and ($thiscat['cat_approval'] == MUSIC_MOD)) ) { $song_approval_sql = ''; } } $sql = "SELECT s.song_id, s.song_title, s.song_desc, s.song_singer, s.song_user_id, s.song_user_ip, s.song_username, s.song_time, s.song_cat_id, s.song_view_count, s.song_lock, s.song_approval, 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_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id WHERE s.song_cat_id = '$cat_id' $song_approval_sql GROUP BY s.song_id ORDER BY $sort_method $sort_order LIMIT $limit_sql"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql); } // // Update the music view counter // $sql = "UPDATE " . MUSIC_CAT_TABLE . " SET cat_views = cat_views + 1 WHERE cat_id = $cat_id"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, "Could not update music views.", '', __LINE__, __FILE__, $sql); } $songrow = array(); while( $row = $db->sql_fetchrow($result) ) { $songrow[] = $row; } for ($i = 0; $i < count($songrow); $i += $music_config['cols_per_page']) { $template->assign_block_vars('songrow', array()); for ($j = $i; $j < ($i + $music_config['cols_per_page']); $j++) { if( $j >= count($songrow) ) { break; } if(!$songrow[$j]['rating']) { $songrow[$j]['rating'] = $lang['Not_rated']; } else { $songrow[$j]['rating'] = round($songrow[$j]['rating'], 2); } $approval_link = ''; if ($thiscat['cat_approval'] != MUSIC_USER) { if( ($userdata['user_level'] == ADMIN) or (($auth_data['moderator'] == 1) and ($thiscat['cat_approval'] == MUSIC_MOD)) ) { $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; $approval_link .= '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; $approval_link .= '</a>'; } } $template->assign_block_vars('songrow.songcol', array( 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, ) ); if( ($songrow[$j]['user_id'] == MUSIC_GUEST) or ($songrow[$j]['username'] == '') ) { $song_poster = ($songrow[$j]['song_username'] == '') ? $lang['Guest'] : $songrow[$j]['song_username']; } else { $song_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } // ------------------------------------ // Get this song info // ------------------------------------ $song_id = $songrow[$j]['song_id']; $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 FROM ". MUSIC_TABLE ." AS s LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id LEFT JOIN ". MUSIC_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id WHERE song_id = '$song_id' GROUP BY s.song_id"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query song information', '', __LINE__, __FILE__, $sql); } $thissong = $db->sql_fetchrow($result); $cat_id = $thissong['song_cat_id']; $user_id = $thissong['song_user_id']; if ( $thissong['song_url'] == '' ) { $song_filetype = substr($thissong['song_filename'], strlen($thissong['song_filename']) - 3, 3); $song_filename = ( !empty($thissong['song_filename']) ? $thissong['song_filename'] : '' ); } else { $song_filetype = substr($thissong['song_url'], strlen($thissong['song_url']) - 3, 3); $song_url = $thissong['song_url']; } // // Media Center // if ( $song_filetype == 'swf' ) { $template->assign_block_vars('songrow.flash', array()); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; } else if ( $song_filetype == 'ram' ) { $template->assign_block_vars('songrow.ram', array()); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; } else if ( $song_filetype == '.rm' ) { $template->assign_block_vars('songrow.rm', array()); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; } else if ( $song_filetype == '.qt' ) { $template->assign_block_vars('songrow.qt', array()); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; } else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; $template->assign_block_vars('songrow.img', array( 'VIDEO_URL' => $url_video, 'SONG_URL' => $url_video )); } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; $template->assign_block_vars('songrow.img', array( 'VIDEO_URL' => $url_video, 'SONG_URL' => $url_video )); } else if( ($song_filetype == 'pls') && !empty($thissong['song_url']) ) { $template->assign_block_vars('songrow.media', array()); $url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; $row_type = 'media'; } else if(!empty($thissong['song_url'])) { $host = explode("//", $thissong['song_url']); $host = $host[1]; $host = explode("/", $host); $domain = $host[0]; $counthost = count($host) - 1; $docid2 = $host[$counthost]; // $domaintmp = explode(".", $domain, -1); // Php 5 only // $sitename = implode(".", $domaintmp); if( !function_exists('mx_music_sitename') ) { function mx_music_sitename($domain) { $domaintmp = explode(".", $domain); $y = count($domaintmp) - 1; $r = ""; for ($a = 0; $y > $a; $a++) { $r .= ".".$domaintmp[$a]; } return $r; } } $sitename = substr(mx_music_sitename($domain), 1); if( !function_exists('mx_music_sitesufix') ) { function mx_music_sitesufix($domain) { $domaintmp = explode(".", $domain); $y = count($domaintmp) - 1; $r = $domaintmp[$y];; return $r; } } $sitesufix = mx_music_sitesufix($domain); if (!empty($sitesufix) ) { if ($sitesufix == 'de') { $sitelngprefix = 'de.'; } else { $sitelngprefix = 'en.'; } } else { $sitelngprefix = ''; } if ($sitename == 'video.google') { $videoid['song_url'] = explode("-", $thissong['song_url']); if (empty($videoid['song_url'][1]) ) { $docid['song_url'] = explode("?", $thissong['song_url']); if (empty($docid['song_url'][1]) ) { $template->assign_block_vars('songrow.flashvideo', array()); $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $row_type = 'flashvideo'; } else { $template->assign_block_vars('songrow.youtube', array()); $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Watch'] : 'Watch URL' ); $row_type = 'youtube'; } } else { $template->assign_block_vars('songrow.youtube', array()); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?docId=-' . $videoid['song_url'][1] : $thissong['song_url'] ); $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); $row_type = 'youtube'; } } else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') ) { $videoid['song_url'] = explode("=", $thissong['song_url']); if (empty($videoid['song_url'][1]) ) { $template->assign_block_vars('songrow.flashvideo', array()); $row_type = 'flashvideo'; } else { $template->assign_block_vars('songrow.youtube', array( 'VIDEO_URL' => 'http://' . $domain . '/v/' . $videoid['song_url'][1], 'SONG_URL' => $thissong['song_url'] )); $row_type = 'youtube'; } $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); } else if ( ($sitename == 'www.clipfish') || ($sitename == 'clipfish') ) { $thisvid['song_url'] = explode("videoid", $thissong['song_url']); $videoid['song_url'] = explode("=", $thisvid['song_url'][1]); if (empty($videoid['song_url'][1]) ) { $template->assign_block_vars('songrow.flashvideo', array()); $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; $row_type = 'flashvideo'; } else { $template->assign_block_vars('songrow.youtube', array()); $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player.php?videoid=' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplayer.swf?as=0&videoid=' . $videoid['song_url'][1] : $url_download ); $row_type = 'youtube'; } } else if ( ($sitename == 'www.myvideo') || ($sitename == 'myvideo') ) { if (empty($docid2) ) { $template->assign_block_vars('songrow.flashvideo', array()); $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; $row_type = 'flashvideo'; } else { $template->assign_block_vars('songrow.youtube', array()); $url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); $row_type = 'youtube'; } } else if ( ($sitename == 'de.sevenload') || ($sitename == 'sevenload') || ($sitename... [truncated message content] |
|
From: Jon O. <jon...@us...> - 2007-09-05 06:47:02
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4049/admin Modified Files: Tag: core28x admin_mx_block_cp.php Log Message: Solved issues reported in the BT is commited. And: - template get_file update, backported from 2.9.x - removed blockCP block select, if not admin Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** admin_mx_block_cp.php 5 May 2007 20:12:54 -0000 1.16 --- admin_mx_block_cp.php 26 Aug 2007 19:06:40 -0000 1.16.2.1 *************** *** 189,192 **** --- 189,193 ---- $mx_dynamic_select = new mx_dynamic_select(); $mx_dynamic_select->generate($block_id, true); + $blockcptemplate->assign_block_vars('dynamic_select', array()); // |
|
From: Jon O. <jon...@us...> - 2007-09-04 19:17:06
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv928/lang_english Log Message: Directory /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_english added to the repository |
2 messages has been excluded from this view by a project administrator.
