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: OryNider <ory...@us...> - 2007-09-13 00:23:30
|
Update of /cvsroot/mxbb/mx_xs/templates/tpl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9715/tpl Log Message: Directory /cvsroot/mxbb/mx_xs/templates/tpl added to the repository |
|
From: OryNider <ory...@us...> - 2007-09-13 00:23:05
|
Update of /cvsroot/mxbb/mx_xs/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9322/lang_english Log Message: Directory /cvsroot/mxbb/mx_xs/language/lang_english added to the repository |
|
From: OryNider <ory...@us...> - 2007-09-13 00:22:14
|
Update of /cvsroot/mxbb/mx_xs/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9240/templates Log Message: Directory /cvsroot/mxbb/mx_xs/templates added to the repository |
|
From: OryNider <ory...@us...> - 2007-09-13 00:22:14
|
Update of /cvsroot/mxbb/mx_xs/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9240/includes Log Message: Directory /cvsroot/mxbb/mx_xs/includes added to the repository |
|
From: OryNider <ory...@us...> - 2007-09-13 00:22:14
|
Update of /cvsroot/mxbb/mx_xs/language In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9240/language Log Message: Directory /cvsroot/mxbb/mx_xs/language added to the repository |
|
From: OryNider <ory...@us...> - 2007-09-13 00:22:14
|
Update of /cvsroot/mxbb/mx_xs/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9240/admin Log Message: Directory /cvsroot/mxbb/mx_xs/admin added to the repository |
|
From: OryNider <ory...@us...> - 2007-09-13 00:22:14
|
Update of /cvsroot/mxbb/mx_xs/images In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9240/images Log Message: Directory /cvsroot/mxbb/mx_xs/images added to the repository |
|
From: OryNider <ory...@us...> - 2007-09-13 00:19:22
|
Update of /cvsroot/mxbb/mx_music/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7950/lang_romanian Added Files: Tag: core28x index.htm Log Message: update :P --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: OryNider <ory...@us...> - 2007-09-13 00:19:22
|
Update of /cvsroot/mxbb/mx_music/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7950/lang_english Added Files: Tag: core28x index.htm Log Message: update :P --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: OryNider <ory...@us...> - 2007-09-13 00:19:08
|
Update of /cvsroot/mxbb/mx_music/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7544/admin Modified Files: Tag: core28x admin_music_auth.php admin_music_cat.php admin_music_cfg.php admin_music_ext.php Added Files: Tag: core28x index.htm Log Message: update :P --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: OryNider <ory...@us...> - 2007-09-13 00:19:08
|
Update of /cvsroot/mxbb/mx_music/music_box In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7544/music_box Added Files: Tag: core28x index.htm music_player.swf Log Message: update :P --- NEW FILE: music_player.swf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: OryNider <ory...@us...> - 2007-09-13 00:19:08
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7544/includes Added Files: Tag: core28x index.htm Log Message: update :P --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: OryNider <ory...@us...> - 2007-09-13 00:14:06
|
Update of /cvsroot/mxbb/mx_smartor/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5517/includes Modified Files: Tag: core28x album_jupload.php Log Message: |
|
From: OryNider <ory...@us...> - 2007-09-13 00:14:06
|
Update of /cvsroot/mxbb/mx_smartor/album_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5517/album_mod Modified Files: Tag: core28x album_common.php album_constants.php Log Message: Index: album_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_constants.php,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** album_constants.php 7 Jun 2007 20:13:11 -0000 1.10 --- album_constants.php 13 Sep 2007 00:14:00 -0000 1.10.2.1 *************** *** 102,109 **** define('ALBUM_PRIVATE', 3); ! if( !defined('PAGE_ALBUM') ) ! { ! define('PAGE_ALBUM', -502); ! } // Path (trailing slash required) --- 102,115 ---- define('ALBUM_PRIVATE', 3); ! !defined('PAGE_ALBUM') ? define('PAGE_ALBUM', -502) : false; ! ! //Redefine some GD constants ! !defined('IMAGETYPE_PNG') ? define('IMAGETYPE_PNG', 3) : false; ! !defined('IMAGETYPE_JPEG') ? define('IMAGETYPE_JPEG', 2) : false; ! !defined('IMAGETYPE_GIF') ? define('IMAGETYPE_GIF', 1) : false; ! ! !defined('IMG_PNG') ? define('IMG_PNG', IMAGETYPE_PNG) : false; ! !defined('IMG_JPG') ? define('IMG_JPG', IMAGETYPE_JPEG) : false; ! !defined('IMG_GIF') ? define('IMG_GIF', IMAGETYPE_GIF) : false; // Path (trailing slash required) Index: album_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_common.php,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -C2 -d -r1.19 -r1.19.2.1 *** album_common.php 9 Aug 2007 13:16:53 -0000 1.19 --- album_common.php 13 Sep 2007 00:14:00 -0000 1.19.2.1 *************** *** 199,203 **** 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_USERNAME' => $lang['Username'], ! 'L_DESCRIPTION' => $lang['Description'], 'L_PIC_NAME' => $lang['Pic_Name'], 'L_NO_PICS' => $lang['No_Pics'], --- 199,203 ---- 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_USERNAME' => $lang['Username'], ! 'L_DESCRIPTION' => $lang['Description'], 'L_PIC_NAME' => $lang['Pic_Name'], 'L_NO_PICS' => $lang['No_Pics'], |
|
From: OryNider <ory...@us...> - 2007-09-13 00:14:06
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5517 Modified Files: Tag: core28x album.php Log Message: Index: album.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album.php,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** album.php 9 Aug 2007 13:16:52 -0000 1.17 --- album.php 13 Sep 2007 00:14:00 -0000 1.17.2.1 *************** *** 25,29 **** * -modified for mx_smartor by Mx Team * ! ******************************************************************/ // --- 25,29 ---- * -modified for mx_smartor by Mx Team * ! *******************************************************************/ // *************** *** 31,38 **** // //error_reporting( E_ALL ); if( !defined('IN_PORTAL') || !is_object($mx_block)) { - define( 'MXBB_MODULE', true ); define('IN_PORTAL', true); $mx_root_path = '../../'; --- 31,38 ---- // //error_reporting( E_ALL ); + //ini_set( 'display_errors', '1' ); if( !defined('IN_PORTAL') || !is_object($mx_block)) { define('IN_PORTAL', true); $mx_root_path = '../../'; *************** *** 66,71 **** else { - define( 'MXBB_MODULE', true ); - // // Read block Configuration --- 66,69 ---- |
|
From: OryNider <ory...@us...> - 2007-09-13 00:14:06
|
Update of /cvsroot/mxbb/mx_smartor/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5517/language/lang_english Modified Files: Tag: core28x lang_admin.php Log Message: Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/language/lang_english/lang_admin.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** lang_admin.php 9 Aug 2007 13:18:02 -0000 1.7 --- lang_admin.php 13 Sep 2007 00:14:01 -0000 1.7.2.1 *************** *** 29,34 **** $lang['Moderator_pics_limit'] = 'Pics limit per category for each moderator (-1 = unlimited)'; $lang['Pics_Approval'] = 'Pics Approval'; ! $lang['Rows_per_page'] = 'Number of rows on thumbnail page'; ! $lang['Cols_per_page'] = 'Number of columns on thumbnail page'; $lang['Thumbnail_quality'] = 'Thumbnail quality (1-100)'; $lang['Thumbnail_cache'] = 'Thumbnail cache'; --- 29,34 ---- $lang['Moderator_pics_limit'] = 'Pics limit per category for each moderator (-1 = unlimited)'; $lang['Pics_Approval'] = 'Pics Approval'; ! $lang['Rows_per_page'] = 'Number of rows on thumbnail page (in categories)'; ! $lang['Cols_per_page'] = 'Number of columns on thumbnail page (in categories)'; $lang['Thumbnail_quality'] = 'Thumbnail quality (1-100)'; $lang['Thumbnail_cache'] = 'Thumbnail cache'; *************** *** 180,185 **** $lang['SP_Display_most_viewed'] = 'Display most viewed pictures block'; $lang['SP_Display_random'] = 'Display random pictures block'; ! $lang['SP_Pic_row'] = 'Number of rows on thumbnail blocks'; ! $lang['SP_Pic_col'] = 'Number of columns on thumbnail blocks'; $lang['SP_Midthumb_use'] = 'Use mid-thumbnail'; $lang['SP_Midthumb_cache'] = 'Enable caching of mid-thumbnail'; --- 180,185 ---- $lang['SP_Display_most_viewed'] = 'Display most viewed pictures block'; $lang['SP_Display_random'] = 'Display random pictures block'; ! $lang['SP_Pic_row'] = 'Number of rows on thumbnail page (in index)'; ! $lang['SP_Pic_col'] = 'Number of columns on thumbnail page (in index)'; $lang['SP_Midthumb_use'] = 'Use mid-thumbnail'; $lang['SP_Midthumb_cache'] = 'Enable caching of mid-thumbnail'; |
|
From: OryNider <ory...@us...> - 2007-09-12 23:50:35
|
Update of /cvsroot/mxbb/mx_phpCA/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30102 Modified Files: Tag: core28x admin_ads_categ.php admin_ads_cfg.php admin_ads_ext.php Log Message: Index: admin_ads_categ.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/admin/admin_ads_categ.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_ads_categ.php 6 Jun 2007 22:24:28 -0000 1.1 --- admin_ads_categ.php 12 Sep 2007 23:50:29 -0000 1.1.2.1 *************** *** 1,22 **** <? ! /*************************************************************************** ! * admin_ads_categ.php ! * ------------------- ! * begin : Wednesday, Feb 15, 2006 ! * copyright : (C) 2006 Peter Mansion ! * email : su...@ph... ! * ! * $Id$ ! * ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ define('IN_PORTAL', 1); --- 1,11 ---- <? ! /** ! * ! * @package mxBB Portal Module - mx_phpCA ! * @version $Id$ ! * @copyright (c) 2002-2006 [Peter Mansion, su...@ph...] mxBB Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * ! */ define('IN_PORTAL', 1); *************** *** 105,109 **** if ( $db->sql_query($sql) ) { ! $message = $lang['category_creation_conf'] . "<br /><br />" . sprintf($lang['ads_click_return_categories'], "<a href=\"" . append_sid("admin_ads_categ.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); } --- 94,98 ---- if ( $db->sql_query($sql) ) { ! $message = $lang['category_creation_conf'] . "<br /><br />" . sprintf($lang['ads_click_return_categories'], "<a href=\"" . append_sid("admin_ads_categ.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); } Index: admin_ads_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/admin/admin_ads_ext.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_ads_ext.php 6 Jun 2007 22:24:29 -0000 1.1 --- admin_ads_ext.php 12 Sep 2007 23:50:29 -0000 1.1.2.1 *************** *** 85,89 **** if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['ads_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_ads_config'], "<a href=\"" . append_sid( "admin_ads_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 85,89 ---- if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['ads_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_ads_config'], "<a href=\"" . append_sid( "admin_ads_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } Index: admin_ads_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpCA/admin/admin_ads_cfg.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_ads_cfg.php 6 Jun 2007 22:24:29 -0000 1.1 --- admin_ads_cfg.php 12 Sep 2007 23:50:29 -0000 1.1.2.1 *************** *** 1,22 **** <? ! /*************************************************************************** ! * admin_ads_cfg.php ! * ------------------- ! * begin : Wednesday, Feb 15, 2006 ! * copyright : (C) 2006 Peter Mansion ! * email : su...@ph... ! * ! * $Id$ ! * ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ define('IN_PORTAL', 1); --- 1,11 ---- <? ! /** ! * ! * @package mxBB Portal Module - mx_phpCA ! * @version $Id$ ! * @copyright (c) 2002-2006 [Peter Mansion, su...@ph...] mxBB Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * ! */ define('IN_PORTAL', 1); *************** *** 94,98 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Config_updated'] . "<br /><br />" . sprintf($lang['ads_click_return_config'], "<a href=\"" . append_sid("admin_ads_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 83,87 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Config_updated'] . "<br /><br />" . sprintf($lang['ads_click_return_config'], "<a href=\"" . append_sid("admin_ads_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); |
Update of /cvsroot/mxbb/mx_music/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29638 Modified Files: Tag: core28x music_cat_xs.tpl music_index_body.tpl music_media_cat_body.tpl music_page_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.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** music_page_body.tpl 5 Sep 2007 23:37:50 -0000 1.5 --- music_page_body.tpl 12 Sep 2007 23:50:02 -0000 1.5.2.1 *************** *** 61,73 **** { ! 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="{U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{U_SONG}">'); document.write ('<PARAM NAME="AutoStart" VALUE="true">'); 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">'); --- 61,73 ---- { ! 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="{U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{U_SONG}">'); document.write ('<PARAM NAME="AutoStart" VALUE="true">'); 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">'); *************** *** 81,85 **** document.write (' ShowStatusBar="1"'); document.write (' AUTOSTART="true"'); ! document.write (' AutoSize="1"'); document.write (' width="70"'); document.write (' height="300">'); --- 81,85 ---- document.write (' ShowStatusBar="1"'); document.write (' AUTOSTART="true"'); ! document.write (' AutoSize="1"'); document.write (' width="70"'); document.write (' height="300">'); *************** *** 97,108 **** //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="{U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{U_SONG}">'); document.write ('<PARAM NAME="AutoStart" VALUE="true">'); document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); document.write ('<PARAM NAME="AutoSize" VALUE="1">'); --- 97,108 ---- //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="{U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{U_SONG}">'); document.write ('<PARAM NAME="AutoStart" VALUE="true">'); document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="ShowStatusBar" VALUE="1">'); document.write ('<PARAM NAME="AutoSize" VALUE="1">'); *************** *** 149,153 **** <!-- BEGIN youtube --> <object width="425" height="350"> ! <param name="movie" value="{SONG_URL}"></param> <param name="wmode" value="transparent"></param> <embed src="{VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> --- 149,153 ---- <!-- BEGIN youtube --> <object width="425" height="350"> ! <param name="movie" value="{VIDEO_URL}"></param> <param name="wmode" value="transparent"></param> <embed src="{VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> *************** *** 156,159 **** --- 156,177 ---- <!-- END youtube --> + <!-- BEGIN flv --> + <div id="flvplayer"> + <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" width="425" height="350" id="flvplayer" align="center"> + <param name="allowScriptAccess" value="always" /> + <param name="movie" value="{VIDEO_URL}" /> + <param name="loop" value="false" /> + <param name="menu" value="false" /> + <param name="quality" value="high" /> + <param name="allowfullscreen" value="true" /> + <param name="scale" value="noscale" /> + <param name="salign" value="lt" /> + <param name="bgcolor" value="000000" /> + <param name="flashvars" value="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" /> + <embed src="{VIDEO_URL}" flashvars="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="425" height="360" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> + </object> + </div> + <!-- END flv --> + <!-- BEGIN ram --> <embed src="{U_SONG}" align="center" Index: music_media_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_media_cat_body.tpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** music_media_cat_body.tpl 8 Sep 2007 13:29:03 -0000 1.2 --- music_media_cat_body.tpl 12 Sep 2007 23:50:02 -0000 1.2.2.1 *************** *** 38,42 **** <tr> <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq media --> <td> <table width="100%" cellpadding="2" cellspacing="1" border="0"> --- 38,42 ---- <tr> <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq MEDIA --> <td> <table width="100%" cellpadding="2" cellspacing="1" border="0"> *************** *** 45,195 **** </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"> <param name="loop" value="false"> --- 45,235 ---- </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.SONG_URL}"'); ! document.write (' src="{song_detail.SONG_URL}"'); ! 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="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="0" filename="{song_detail.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); } ! } ! 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.SONG_URL}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.SONG_URL}">'); ! 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.SONG_URL}"'); ! document.write (' src="{song_detail.SONG_URL}"'); ! 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.SONG_URL}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.SONG_URL}">'); ! 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.SONG_URL}"'); ! document.write (' src="{song_detail.SONG_URL}"'); ! 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.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); ! } ! </SCRIPT> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLASH --> ! <EMBED src="{song_detail.SONG_URL}" 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 --> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> ! <param name="allowScriptAccess" value="always" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="wmode" value="transparent" /> ! <param name="loop" value="false" /> ! <param name="menu" value="false" /> ! <param name="quality" value="high" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="noscale" /> ! <param name="salign" value="lt" /> ! <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" allowfullscreen="true"> ! </embed> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq YOUTUBE --> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="VideoPlayback" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> ! <param name="allowScriptAccess" value="always" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="wmode" value="transparent" /> ! <param name="loop" value="false" /> ! <param name="menu" value="false" /> ! <param name="quality" value="high" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="noscale" /> ! <param name="salign" value="lt" /> ! <embed src="{song_detail.VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" allowfullscreen="true"> ! </embed> ! </object> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLV --> ! <div id="flvplayer"> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="flvplayer" align="center"> ! <param name="allowScriptAccess" value="always" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="loop" value="false" /> ! <param name="menu" value="false" /> ! <param name="quality" value="high" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="noscale" /> ! <param name="salign" value="lt" /> ! <param name="bgcolor" value="000000" /> ! <param name="flashvars" value="file={song_detail.SONG_URL}&image={song_detail.U_IMG}&shuffleOnLoad=no" /> ! <embed src="{song_detail.VIDEO_URL}" flashvars="file={song_detail.SONG_URL}&image={song_detail.U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> ! </object> ! </div> ! <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq RAM --> ! <embed src="{song_detail.SONG_URL}" align="center" ! width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" type="audio/x-pn-realaudio-plugin" console="cons" ! controls="ControlPanel" autostart="false"></embed> ! <!-- ENDIF --> ! ! <!-- 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.SONG_URL}"> <param name="autoplay" value="false"> <param name="loop" value="false"> *************** *** 197,212 **** <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 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> --- 237,251 ---- <param name="kioskmode" value="true"> <param name="cache" value="false"> ! <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.SONG_URL}" 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.SONG_URL}<!-- 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.SONG_URL}<!-- 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> Index: music_pic_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_pic_cat_body.tpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** music_pic_cat_body.tpl 8 Sep 2007 13:29:03 -0000 1.2 --- music_pic_cat_body.tpl 12 Sep 2007 23:50:02 -0000 1.2.2.1 *************** *** 45,49 **** <tr> <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq img --> <td> <table width="100%" cellpadding="2" cellspacing="1" border="0"> --- 45,49 ---- <tr> <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq IMG --> <td> <table width="100%" cellpadding="2" cellspacing="1" border="0"> *************** *** 70,74 **** <tr> <td width="44%" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq media --> <SCRIPT LANGUAGE="JavaScript"> var WMP7; --- 70,74 ---- <tr> <td width="44%" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq MEDIA --> <SCRIPT LANGUAGE="JavaScript"> var WMP7; *************** *** 192,206 **** <!-- 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> --- 192,206 ---- <!-- 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> *************** *** 211,215 **** <!-- 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" --- 211,233 ---- <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLV --> ! <div id="flvplayer"> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="flvplayer" align="center"> ! <param name="allowScriptAccess" value="always" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="loop" value="false" /> ! <param name="menu" value="false" /> ! <param name="quality" value="high" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="noscale" /> ! <param name="salign" value="lt" /> ! <param name="bgcolor" value="000000" /> ! <param name="flashvars" value="file={song_detail.SONG_URL}&image={song_detail.U_IMG}&shuffleOnLoad=no" /> ! <embed src="{song_detail.VIDEO_URL}" flashvars="file={song_detail.SONG_URL}&image={song_detail.U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> ! </object> ! </div> ! <!-- 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" *************** *** 217,221 **** <!-- 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}"> --- 235,239 ---- <!-- 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}"> *************** *** 231,235 **** <!-- 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 --> --- 249,253 ---- <!-- 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 --> Index: music_index_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_index_body.tpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** music_index_body.tpl 8 Sep 2007 13:29:03 -0000 1.4 --- music_index_body.tpl 12 Sep 2007 23:50:01 -0000 1.4.2.1 *************** *** 80,87 **** </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> --- 80,90 ---- </td> <td class="row1" height="50" width="50%"> ! <!-- BEGIN virtualimagecat --> ! <span class="gensmall"> <a alt="images" href="{catrow.U_VIEW_PIC_CAT}">{catrow.L_ALL_CAT_PICS}</a></span> ! <!-- END virtualimagecat --> ! <!-- BEGIN virtualmediacat --> ! <br /> ! <span class="gensmall"> <a alt="videos" href="{catrow.U_VIEW_MEDIA_CAT}">{catrow.L_ALL_CAT_SONGS}</a></span> ! <!-- END virtualmediacat --> </td> </tr> *************** *** 94,98 **** <!-- END catrow --> <tr> ! <td class="catbottom" colspan="4" height="28"><span class="cattitle"></span></td> </tr> </table> --- 97,104 ---- <!-- END catrow --> <tr> ! <td class="catBottom" height="28" colspan="4"> ! <span class="gensmall"> </span><br /> ! <span class="gensmall"> <a target="_blank" alt="music_rss" href="{U_RSS}">{L_RSS}</a></span> ! </td> </tr> </table> Index: music_cat_xs.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_cat_xs.tpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** music_cat_xs.tpl 8 Sep 2007 13:29:03 -0000 1.7 --- music_cat_xs.tpl 12 Sep 2007 23:50:01 -0000 1.7.2.1 *************** *** 39,43 **** <tr> <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq img --> <td> <table width="100%" cellpadding="2" cellspacing="1" border="0"> --- 39,43 ---- <tr> <!-- BEGIN song_detail --> ! <!-- IF song_detail.SWITCH_ROW_TYPE eq IMG --> <td> <table width="100%" cellpadding="2" cellspacing="1" border="0"> *************** *** 48,52 **** <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> <!-- --- 48,52 ---- <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.SONG_URL}<!-- 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.SONG_URL}<!-- ENDIF -->" id="image" type="image" border="1"></a> </div> <!-- *************** *** 89,93 **** <tr> <td width="44%" colspan="7" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq media --> <SCRIPT LANGUAGE="JavaScript"> var WMP7; --- 89,93 ---- <tr> <td width="44%" colspan="7" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq MEDIA --> <SCRIPT LANGUAGE="JavaScript"> var WMP7; *************** *** 109,114 **** 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'); --- 109,114 ---- document.write (' <Embed id="wmp" name="wmp" type="audio/mpeg"'); document.write (' pluginspage="http://www.microsoft.com/windows/windowsmedia/"'); ! document.write (' filename="{song_detail.SONG_URL}"'); ! document.write (' src="{song_detail.SONG_URL}"'); document.write (' Name=MediaPlayer'); document.write (' ShowControls=1'); *************** *** 116,120 **** document.write (' ShowStatusBar=1'); document.write (' AUTOSTART=0'); ! document.write (' AutoSize=1'); document.write (' width="{song_detail.WIDTH}"'); document.write (' height="{song_detail.HEIGHT}">'); --- 116,120 ---- document.write (' ShowStatusBar=1'); document.write (' AUTOSTART=0'); ! document.write (' AutoSize=0'); document.write (' width="{song_detail.WIDTH}"'); document.write (' height="{song_detail.HEIGHT}">'); *************** *** 122,126 **** 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>'); } } --- 122,126 ---- if ( navigator.appName != "Netscape" ){ ! document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="0" filename="{song_detail.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); } } *************** *** 140,155 **** 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"'); --- 140,157 ---- 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.SONG_URL}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.SONG_URL}">'); 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.SONG_URL}"'); ! document.write (' src="{song_detail.SONG_URL}"'); document.write (' Name="MediaPlayer2"'); document.write (' ShowControls="1"'); *************** *** 157,163 **** document.write (' ShowStatusBar="1"'); document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="1"'); ! document.write (' width="70"'); ! document.write (' height="300">'); document.write (' </embed>'); --- 159,165 ---- 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>'); *************** *** 174,189 **** 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"'); --- 176,193 ---- 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.SONG_URL}">'); ! document.write ('<PARAM NAME="FileName" value="{song_detail.SONG_URL}">'); 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.SONG_URL}"'); ! document.write (' src="{song_detail.SONG_URL}"'); document.write (' Name="MediaPlayer"'); document.write (' ShowControls="1"'); *************** *** 191,195 **** document.write (' ShowStatusBar="1"'); document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="1"'); document.write (' width="{song_detail.WIDTH}"'); document.write (' height="{song_detail.HEIGHT}">'); --- 195,199 ---- document.write (' ShowStatusBar="1"'); document.write (' AUTOSTART="false"'); ! document.write (' AutoSize="0"'); document.write (' width="{song_detail.WIDTH}"'); document.write (' height="{song_detail.HEIGHT}">'); *************** *** 202,238 **** 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"> <param name="loop" value="false"> --- 206,278 ---- else { ! document.write(' <embed type="audio/mpeg" height="{song_detail.HEIGHT}" width="{song_detail.WIDTH}" AUTOSTART="0" filename="{song_detail.SONG_URL}" src="{song_detail.SONG_URL}" ></embed>'); } </SCRIPT> <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLASH --> ! <EMBED src="{song_detail.SONG_URL}" 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 --> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> ! <param name="allowScriptAccess" value="always" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="wmode" value="transparent" /> ! <param name="loop" value="false" /> ! <param name="menu" value="false" /> ! <param name="quality" value="high" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="noscale" /> ! <param name="salign" value="lt" /> ! <embed src="{song_detail.VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" allowfullscreen="true"> </embed> + </object> <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq YOUTUBE --> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="VideoPlayback" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}"> ! <param name="allowScriptAccess" value="always" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="wmode" value="transparent" /> ! <param name="loop" value="false" /> ! <param name="menu" value="false" /> ! <param name="quality" value="high" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="noscale" /> ! <param name="salign" value="lt" /> ! <embed src="{song_detail.VIDEO_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" allowfullscreen="true"> </embed> </object> <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq FLV --> ! <div id="flvplayer"> ! <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" id="flvplayer" align="center"> ! <param name="allowScriptAccess" value="always" /> ! <param name="movie" value="{song_detail.VIDEO_URL}" /> ! <param name="loop" value="false" /> ! <param name="menu" value="false" /> ! <param name="quality" value="high" /> ! <param name="allowfullscreen" value="true" /> ! <param name="scale" value="noscale" /> ! <param name="salign" value="lt" /> ! <param name="bgcolor" value="000000" /> ! <param name="flashvars" value="file={song_detail.SONG_URL}&image={song_detail.U_IMG}&shuffleOnLoad=no" /> ! <embed src="{song_detail.VIDEO_URL}" flashvars="file={song_detail.SONG_URL}&image={song_detail.U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> ! </object> ! </div> ! <!-- ENDIF --> ! ! <!-- IF song_detail.S_ROW_TYPE eq RAM --> ! <embed src="{song_detail.SONG_URL}" align="center" ! width="{song_detail.WIDTH}" height="{song_detail.HEIGHT}" type="audio/x-pn-realaudio-plugin" console="cons" controls="ControlPanel" autostart="false"></embed> <!-- ENDIF --> ! <!-- 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.SONG_URL}"> <param name="autoplay" value="false"> <param name="loop" value="false"> *************** *** 240,244 **** <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> --- 280,284 ---- <param name="kioskmode" value="true"> <param name="cache" value="false"> ! <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.SONG_URL}" 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> *************** *** 246,253 **** <!-- 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> --- 286,292 ---- <!-- 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.SONG_URL}<!-- 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.SONG_URL}<!-- ENDIF -->" id="image" type="image" border="1"></a> <!-- ENDIF --> </td> </tr> |
|
From: OryNider <ory...@us...> - 2007-09-12 23:50:05
|
Update of /cvsroot/mxbb/mx_music/templates/subSilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29638/admin Modified Files: Tag: core28x music_config_body.tpl Log Message: Index: music_config_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/admin/music_config_body.tpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** music_config_body.tpl 8 Sep 2007 13:29:02 -0000 1.3 --- music_config_body.tpl 12 Sep 2007 23:50:01 -0000 1.3.2.1 *************** *** 33,85 **** </tr> <tr> ! <td class="row1"><span class="genmed">MP3</span></td> <td class="row2"><span class="genmed"><input type="radio" {MP3_ENABLED} name="mp3_allowed" value="1" />{L_YES} <input type="radio" {MP3_DISABLED} name="mp3_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">WAV</span></td> <td class="row2"><span class="genmed"><input type="radio" {WAV_ENABLED} name="wav_allowed" value="1" />{L_YES} <input type="radio" {WAV_DISABLED} name="wav_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">WMA</span></td> <td class="row2"><span class="genmed"><input type="radio" {WMA_ENABLED} name="wma_allowed" value="1" />{L_YES} <input type="radio" {WMA_DISABLED} name="wma_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">WMV</span></td> <td class="row2"><span class="genmed"><input type="radio" {WMV_ENABLED} name="wmv_allowed" value="1" />{L_YES} <input type="radio" {WMV_DISABLED} name="wmv_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">MIDI</span></td> <td class="row2"><span class="genmed"><input type="radio" {MIDI_ENABLED} name="mid_allowed" value="1" />{L_YES} <input type="radio" {MIDI_DISABLED} name="mid_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">RAM</span></td> <td class="row2"><span class="genmed"><input type="radio" {RAM_ENABLED} name="ram_allowed" value="1" />{L_YES} <input type="radio" {RAM_DISABLED} name="ram_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">AU</span></td> <td class="row2"><span class="genmed"><input type="radio" {AU_ENABLED} name="au_allowed" value="1" />{L_YES} <input type="radio" {AU_DISABLED} name="au_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">MPEG</span></td> <td class="row2"><span class="genmed"><input type="radio" {MPEG_ENABLED} name="mpeg_allowed" value="1" />{L_YES} <input type="radio" {MPEG_DISABLED} name="mpeg_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">AVI</span></td> <td class="row2"><span class="genmed"><input type="radio" {AVI_ENABLED} name="avi_allowed" value="1" />{L_YES} <input type="radio" {AVI_DISABLED} name="avi_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">SWF</span></td> <td class="row2"><span class="genmed"><input type="radio" {SWF_ENABLED} name="swf_allowed" value="1" />{L_YES} <input type="radio" {SWF_DISABLED} name="swf_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">QT</span></td> <td class="row2"><span class="genmed"><input type="radio" {QT_ENABLED} name="qt_allowed" value="1" />{L_YES} <input type="radio" {QT_DISABLED} name="qt_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">RM</span></td> <td class="row2"><span class="genmed"><input type="radio" {RM_ENABLED} name="rm_allowed" value="1" />{L_YES} <input type="radio" {RM_DISABLED} name="rm_allowed" value="0" />{L_NO}</span></td> </tr> <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> --- 33,89 ---- </tr> <tr> ! <td class="row1"><span class="genmed">{L_MP3_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {MP3_ENABLED} name="mp3_allowed" value="1" />{L_YES} <input type="radio" {MP3_DISABLED} name="mp3_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_WAV_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {WAV_ENABLED} name="wav_allowed" value="1" />{L_YES} <input type="radio" {WAV_DISABLED} name="wav_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_WMA_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {WMA_ENABLED} name="wma_allowed" value="1" />{L_YES} <input type="radio" {WMA_DISABLED} name="wma_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_WMV_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {WMV_ENABLED} name="wmv_allowed" value="1" />{L_YES} <input type="radio" {WMV_DISABLED} name="wmv_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_MIDI_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {MIDI_ENABLED} name="mid_allowed" value="1" />{L_YES} <input type="radio" {MIDI_DISABLED} name="mid_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_RAM_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {RAM_ENABLED} name="ram_allowed" value="1" />{L_YES} <input type="radio" {RAM_DISABLED} name="ram_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_AU_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {AU_ENABLED} name="au_allowed" value="1" />{L_YES} <input type="radio" {AU_DISABLED} name="au_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_MPEG_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {MPEG_ENABLED} name="mpeg_allowed" value="1" />{L_YES} <input type="radio" {MPEG_DISABLED} name="mpeg_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_AVI_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {AVI_ENABLED} name="avi_allowed" value="1" />{L_YES} <input type="radio" {AVI_DISABLED} name="avi_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_SWF_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {SWF_ENABLED} name="swf_allowed" value="1" />{L_YES} <input type="radio" {SWF_DISABLED} name="swf_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_QT_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {QT_ENABLED} name="qt_allowed" value="1" />{L_YES} <input type="radio" {QT_DISABLED} name="qt_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_FLV_ALLOWED}</span></td> ! <td class="row2"><span class="genmed"><input type="radio" {FLV_ENABLED} name="flv_allowed" value="1" />{L_YES} <input type="radio" {FLV_DISABLED} name="flv_allowed" value="0" />{L_NO}</span></td> ! </tr> ! <tr> ! <td class="row1"><span class="genmed">{L_RM_ALLOWED}</span></td> <td class="row2"><span class="genmed"><input type="radio" {RM_ENABLED} name="rm_allowed" value="1" />{L_YES} <input type="radio" {RM_DISABLED} name="rm_allowed" value="0" />{L_NO}</span></td> </tr> <tr> ! <td class="row1"><span class="genmed">{L_IMG_ALLOWED}</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> |
|
From: OryNider <ory...@us...> - 2007-09-12 23:49:49
|
Update of /cvsroot/mxbb/mx_music/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29615/lang_romanian Modified Files: Tag: core28x lang_admin_music.php Log Message: Index: lang_admin_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_romanian/lang_admin_music.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** lang_admin_music.php 8 Sep 2007 13:28:47 -0000 1.4 --- lang_admin_music.php 12 Sep 2007 23:49:46 -0000 1.4.2.1 *************** *** 88,91 **** --- 88,107 ---- $lang['Comment'] = 'Comentariu'; + //Allowed File Types + $lang['MP3_allowed'] = 'MP3 Acceptatã'; + $lang['WAV_allowed'] = 'WAV Acceptatã'; + $lang['WMA_allowed'] = 'WMA Acceptatã'; + $lang['WMV_allowed'] = 'WMV Acceptatã'; + $lang['MIDI_allowed'] = 'MIDI Acceptatã'; + $lang['RAM_allowed'] = 'RAM Acceptatã'; + $lang['AU_allowed'] = 'AU Acceptatã'; + $lang['MPEG_allowed'] = 'MPEG Acceptatã'; + $lang['AVI_allowed'] = 'AVI Acceptatã'; + $lang['SWF_allowed'] = 'SWF Acceptatã'; + $lang['QT_allowed'] = 'QT Acceptatã'; + $lang['FLV_allowed'] = 'FLV Acceptatã'; + $lang['RM_allowed'] = 'RM Acceptatã'; + $lang['IMG_allowed'] = 'JPG, GIF and PNG Acceptate'; + // // Song Image |
|
From: OryNider <ory...@us...> - 2007-09-12 23:49:49
|
Update of /cvsroot/mxbb/mx_music/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29615/lang_english Modified Files: Tag: core28x lang_admin_music.php lang_main_music.php Log Message: Index: lang_main_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_english/lang_main_music.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** lang_main_music.php 8 Sep 2007 13:28:47 -0000 1.5 --- lang_main_music.php 12 Sep 2007 23:49:46 -0000 1.5.2.1 *************** *** 41,47 **** ! $lang['Category_pics'] = 'View this category Images'; $lang['Images'] = 'Images'; ! $lang['Category_songs'] = 'View this category Songs and Videos'; $lang['Media'] = 'Media'; --- 41,47 ---- ! $lang['Category_pics'] = 'Category Images'; $lang['Images'] = 'Images'; ! $lang['Category_songs'] = 'Category Media'; $lang['Media'] = 'Media'; Index: lang_admin_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_english/lang_admin_music.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** lang_admin_music.php 8 Sep 2007 13:28:47 -0000 1.4 --- lang_admin_music.php 12 Sep 2007 23:49:45 -0000 1.4.2.1 *************** *** 81,84 **** --- 81,100 ---- $lang['Comment'] = 'Comment'; + //Allowed File Types + $lang['MP3_allowed'] = 'MP3 Allowed'; + $lang['WAV_allowed'] = 'WAV Allowed'; + $lang['WMA_allowed'] = 'WMA Allowed'; + $lang['WMV_allowed'] = 'WMV Allowed'; + $lang['MIDI_allowed'] = 'MIDI Allowed'; + $lang['RAM_allowed'] = 'RAM Allowed'; + $lang['AU_allowed'] = 'AU Allowed'; + $lang['MPEG_allowed'] = 'MPEG Allowed'; + $lang['AVI_allowed'] = 'AVI Allowed'; + $lang['SWF_allowed'] = 'SWF Allowed'; + $lang['QT_allowed'] = 'QT Allowed'; + $lang['FLV_allowed'] = 'FLV Allowed'; + $lang['RM_allowed'] = 'RM Allowed'; + $lang['IMG_allowed'] = 'JPG, GIF and PNG Allowed'; + // // Song Image |
|
From: OryNider <ory...@us...> - 2007-09-12 23:49:21
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29553/includes Modified Files: Tag: core28x music_cat.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: Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_upload.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** music_upload.php 8 Sep 2007 13:28:29 -0000 1.6 --- music_upload.php 12 Sep 2007 23:49:16 -0000 1.6.2.1 *************** *** 252,255 **** --- 252,257 ---- 'S_SWF' => ($music_config['swf_allowed'] == 1) ? 'SWF,' : '', 'S_QT' => ($music_config['qt_allowed'] == 1) ? 'QT,' : '', + 'S_FLV' => ($music_config['flv_allowed'] == 1) ? 'FLV,' : '', + 'S_IMG' => ($music_config['img_allowed'] == 1) ? 'IMG,' : '', 'S_RM' => ($music_config['rm_allowed'] == 1) ? 'RM,' : '', // Media Center *************** *** 482,485 **** --- 484,497 ---- break; + case 'video/x-flv': + case 'video/flv': + case 'application/octet-stream': + if ($music_config['flv_allowed'] == 0) + { + mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); + } + $song_filetype = '.flv'; + break; + case 'audio/x-midi': case 'audio/mid': *************** *** 549,553 **** default: ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); } } --- 561,565 ---- default: ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type'] . ': ' . $filetype); } } Index: music_pic_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_pic_cat.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** music_pic_cat.php 8 Sep 2007 13:28:29 -0000 1.2 --- music_pic_cat.php 12 Sep 2007 23:49:16 -0000 1.2.2.1 *************** *** 440,443 **** --- 440,452 ---- $user_id = $thissong['song_user_id']; + if ( $thissong['song_imagename'] == '' ) + { + $img_id = $mx_images['no_image']; + } + else + { + $img_id = ($module_root_path . 'upload/song_image/' . $thissong['song_imagename']); + } + if ( $thissong['song_url'] == '' ) { *************** *** 496,509 **** $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' ) ) --- 505,522 ---- $row_type = 'qt'; } ! else if ( $song_filetype == 'flv' ) { ! /* ! if ( !is_object($mx_page) ) ! { ! $mx_page = new mx_page(); ! } ! $mx_page->add_footer_text( $music_root_path . 'music_player.js', true ); ! */ ! $template->assign_block_vars('songrow.flv', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); ! $url_video = $music_root_path . 'music_player.swf'; ! $row_type = 'flv'; } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) *************** *** 749,753 **** } ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); $template->assign_block_vars('songrow.song_detail', array( --- 762,773 ---- } ! if ( $song_filetype == 'flv' ) ! { ! $url_song = PORTAL_URL . MUSIC_UPLOAD_PATH . $thissong['song_filename']; ! } ! else ! { ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); ! } $template->assign_block_vars('songrow.song_detail', array( *************** *** 758,762 **** '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)), --- 778,782 ---- 'SONG_TITLE' => $thissong['song_title'], ! 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=114", true)), *************** *** 766,769 **** --- 786,791 ---- 'VIDEO_URL' => $url_video, + 'U_IMG' => append_sid("$img_id"), + 'SINGER' => $songrow[$j]['song_singer'], *************** *** 948,951 **** --- 970,982 ---- 'HEIGHT' => ( !empty($media_height) ? $media_height : '85' ), + 'FLASH' => 'flash', + 'RAM' => 'ram', + 'FLASHVIDEO' => 'flashvideo', + 'YOUTUBE' => 'youtube', + 'QT' => 'qt', + 'FLV' => 'flv', + 'IMG' => 'img', + 'MEDIA' => 'media', + 'S_AUTH_LIST' => $auth_list) ); Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** music_cat.php 8 Sep 2007 13:28:29 -0000 1.8 --- music_cat.php 12 Sep 2007 23:49:16 -0000 1.8.2.1 *************** *** 437,440 **** --- 437,449 ---- $user_id = $thissong['song_user_id']; + if ( $thissong['song_imagename'] == '' ) + { + $img_id = $mx_images['no_image']; + } + else + { + $img_id = ($module_root_path . 'upload/song_image/' . $thissong['song_imagename']); + } + if ( $thissong['song_url'] == '' ) { *************** *** 494,497 **** --- 503,521 ---- $row_type = 'qt'; } + else if ( $song_filetype == 'flv' ) + { + /* + if ( !is_object($mx_page) ) + { + $mx_page = new mx_page(); + } + $mx_page->add_footer_text( $music_root_path . 'music_player.js', true ); + */ + + $template->assign_block_vars('songrow.flv', array()); + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $music_root_path . 'music_player.swf'; + $row_type = 'flv'; + } else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { *************** *** 747,751 **** } ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); $template->assign_block_vars('songrow.song_detail', array( --- 771,782 ---- } ! if ( $song_filetype == 'flv' ) ! { ! $url_song = PORTAL_URL . MUSIC_UPLOAD_PATH . $thissong['song_filename']; ! } ! else ! { ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); ! } $template->assign_block_vars('songrow.song_detail', array( *************** *** 756,760 **** '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)), --- 787,791 ---- 'SONG_TITLE' => $thissong['song_title'], ! 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=425", true)), *************** *** 764,767 **** --- 795,800 ---- 'VIDEO_URL' => $url_video, + 'U_IMG' => append_sid("$img_id"), + 'SINGER' => $songrow[$j]['song_singer'], *************** *** 939,944 **** '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) --- 972,989 ---- 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! ! 'FLASH' => 'flash', ! 'RAM' => 'ram', ! 'FLASHVIDEO' => 'flashvideo', ! 'YOUTUBE' => 'youtube', ! 'QT' => 'qt', ! 'FLV' => 'flv', ! 'IMG' => 'img', ! 'MEDIA' => 'media', ! ! 'L_RSS' => ( !empty($lang['Rss_Feed']) ? $lang['Rss_Feed'] : 'RSS Feed' ), ! 'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss&cat_id=" . $cat_id . "&sid=" . $userdata['session_id'], true)), 'S_AUTH_LIST' => $auth_list) Index: music_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_rss.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** music_rss.php 8 Sep 2007 13:28:29 -0000 1.3 --- music_rss.php 12 Sep 2007 23:49:16 -0000 1.3.2.1 *************** *** 115,127 **** $no_limit=( isset($HTTP_GET_VARS['nolimit']) ) ? true : false; ! $sql = "SELECT c.*, COUNT(s.song_id) AS count FROM ". MUSIC_CAT_TABLE ." AS c LEFT JOIN ". MUSIC_TABLE ." AS s ON c.cat_id = s.song_cat_id ! WHERE cat_id <> 0 GROUP BY cat_id ORDER BY cat_order ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! die("Could not query categories list"); } --- 115,147 ---- $no_limit=( isset($HTTP_GET_VARS['nolimit']) ) ? true : false; ! $cat_id = $_POST['cat_id'] ? $_POST['cat_id'] : ( $_GET['cat_id'] ? $_GET['cat_id'] : 0 ); ! $cat_parent = $_POST['c'] ? $_POST['c'] : ( $_GET['c'] ? $_GET['c'] : 0 ); ! $cat_where = ($cat_id != 0) ? "cat_parent = $cat_parent" : "cat_id <> 0"; ! ! if ($cat_id != 0) ! { ! $sql = "SELECT c.*, COUNT(s.song_id) AS count ! FROM ". MUSIC_CAT_TABLE ." AS c ! LEFT JOIN ". MUSIC_TABLE ." AS s ON c.cat_id = s.song_cat_id ! WHERE cat_id = $cat_id ! GROUP BY cat_id ! ORDER BY cat_order ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! die("Could not query this category"); ! } ! } ! else ! { ! $sql = "SELECT c.*, COUNT(s.song_id) AS count FROM ". MUSIC_CAT_TABLE ." AS c LEFT JOIN ". MUSIC_TABLE ." AS s ON c.cat_id = s.song_cat_id ! WHERE $cat_where GROUP BY cat_id ORDER BY cat_order ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! die("Could not query categories list"); ! } } *************** *** 209,212 **** --- 229,241 ---- $thissong = $db->sql_fetchrow($result); + if ( $thissong['song_imagename'] == '' ) + { + $img_id = $mx_images['no_image']; + } + else + { + $img_id = ($module_root_path . 'upload/song_image/' . $thissong['song_imagename']); + } + if ( $thissong['song_url'] == '' ) { *************** *** 256,264 **** $row_type = 'qt'; } ! else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); ! $url_video = $url_download; ! $row_type = 'img'; } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) --- 285,302 ---- $row_type = 'qt'; } ! else if ( $song_filetype == 'flv' ) { ! /* ! if ( !is_object($mx_page) ) ! { ! $mx_page = new mx_page(); ! } ! $mx_page->add_footer_text( $music_root_path . 'music_player.js', true ); ! */ ! ! $template->assign_block_vars('songrow.flv', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); ! $url_video = $music_root_path . 'music_player.swf'; ! $row_type = 'flv'; } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) *************** *** 470,473 **** --- 508,512 ---- $url_page = append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_page&" . "song_id=" . $thissong['song_id'])); $url_song = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_song&" . "song_id=" . $thissong['song_id'], true)); + $url_flv = !empty($thissong['song_url']) ? $thissong['song_url'] : PORTAL_URL . MUSIC_UPLOAD_PATH . $thissong['song_filename']; $url_comment = append_sid(PORTAL_URL . this_mo_rssurl("music_mode=music_comment&" . "song_id=" . $thissong['song_id'])); *************** *** 489,499 **** case 'flashvideo': ! $html_code = '<embed src="' . $url_song . '" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""></embed>'; ! $enclosure = 'url="' . $url_video . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; break; case 'youtube': ! $html_code = '<embed src="' . $url_video . '" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""></embed>'; ! $enclosure = 'url="' . $url_video . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; break; --- 528,543 ---- case 'flashvideo': ! $html_code = '<embed src="' . $url_video . '" wmode="transparent" width="425" height="350" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />'; ! $enclosure = 'url="' . $url_song . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; break; case 'youtube': ! $html_code = '<embed src="' . $url_video . '" id="VideoPlayback" wmode="transparent" width="425" height="350" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />'; ! $enclosure = 'url="' . $url_song . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; ! break; ! ! case 'flv': ! $html_code = '<embed src="' . $url_video . '" flashvars="file=' . $url_flv . '&image=' . $img_id . '&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="425" height="350" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />'; ! $enclosure = 'url="' . $url_song . '" ' . 'type="application/x-shockwave-flash" length="1024000"'; break; *************** *** 504,508 **** case 'img': ! $html_code = '<a href="' . $url_page . '">' . '<img src="' . $url_thumb_song . '" border="1" vspace="2" hspace="2" align="left" width="425" height="350">' . '</a>'; $enclosure = 'url="' . $url_song . '" ' . 'type="image/png" length="1024000"'; break; --- 548,552 ---- case 'img': ! $html_code = '<a href="' . $url_page . '">' . '<img src="' . $url_thumb_song . '" border="1" vspace="2" hspace="2" align="left" width="425" height="350" />' . '</a>'; $enclosure = 'url="' . $url_song . '" ' . 'type="image/png" length="1024000"'; break; Index: music_media_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_media_cat.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** music_media_cat.php 8 Sep 2007 13:28:29 -0000 1.2 --- music_media_cat.php 12 Sep 2007 23:49:16 -0000 1.2.2.1 *************** *** 467,470 **** --- 467,479 ---- $user_id = $thissong['song_user_id']; + if ( $thissong['song_imagename'] == '' ) + { + $img_id = $mx_images['no_image']; + } + else + { + $img_id = ($module_root_path . 'upload/song_image/' . $thissong['song_imagename']); + } + if ( $thissong['song_url'] == '' ) { *************** *** 511,517 **** $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' ) ) --- 520,526 ---- $row_type = 'qt'; } ! else if ( $song_filetype == 'flv' ) { ! $row_type = 'flv'; } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) *************** *** 694,697 **** --- 703,710 ---- break; + case 'flv': + $switch_row_type = 'media'; + break; + case 'media': $switch_row_type = 'media'; *************** *** 780,783 **** --- 793,811 ---- $url_video = $url_download; } + else if ( $song_filetype == 'flv' ) + { + + /* + if ( !is_object($mx_page) ) + { + $mx_page = new mx_page(); + } + $mx_page->add_footer_text( $music_root_path . 'music_player.js', true ); + */ + + $template->assign_block_vars('songrow.flv', array()); + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $music_root_path . 'music_player.swf'; + } else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { *************** *** 1006,1010 **** } ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); $template->assign_block_vars('songrow.song_detail', array( --- 1034,1045 ---- } ! if ( $song_filetype == 'flv' ) ! { ! $url_song = PORTAL_URL . MUSIC_UPLOAD_PATH . $thissong['song_filename']; ! } ! else ! { ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); ! } $template->assign_block_vars('songrow.song_detail', array( *************** *** 1015,1019 **** '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)), --- 1050,1054 ---- 'SONG_TITLE' => $thissong['song_title'], ! 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=425", true)), *************** *** 1023,1026 **** --- 1058,1063 ---- 'VIDEO_URL' => $url_video, + 'U_IMG' => append_sid("$img_id"), + 'SINGER' => $songrow[$j]['song_singer'], *************** *** 1200,1205 **** '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) --- 1237,1251 ---- 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), ! 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! ! 'FLASH' => 'flash', ! 'RAM' => 'ram', ! 'FLASHVIDEO' => 'flashvideo', ! 'YOUTUBE' => 'youtube', ! 'QT' => 'qt', ! 'FLV' => 'flv', ! 'IMG' => 'img', ! 'MEDIA' => 'media', 'S_AUTH_LIST' => $auth_list) Index: music_song.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_song.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** music_song.php 8 Sep 2007 13:28:29 -0000 1.5 --- music_song.php 12 Sep 2007 23:49:16 -0000 1.5.2.1 *************** *** 203,206 **** --- 203,209 ---- $read_function = 'readfile'; break; + case '.flv': + $read_function = 'readfile'; + break; case 'ram': $read_function = 'readfile'; *************** *** 260,263 **** --- 263,269 ---- header('Content-type: video/quicktime'); break; + case 'flv': + header('Content-type: video/x-flv'); + break; case 'ram': header('Content-type: audio/x-pn-realaudio'); Index: music_download.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_download.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** music_download.php 8 Sep 2007 13:28:29 -0000 1.4 --- music_download.php 12 Sep 2007 23:49:16 -0000 1.4.2.1 *************** *** 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); - } - /* +---------------------------------------------------------- --- 15,21 ---- *************** *** 157,160 **** --- 127,133 ---- header('Content-type: video/quicktime'); break; + case 'flv': + header('Content-type: video/x-flv'); + break; case 'ram': header('Content-type: audio/x-pn-realaudio'); Index: music_page.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_page.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** music_page.php 8 Sep 2007 13:28:29 -0000 1.7 --- music_page.php 12 Sep 2007 23:49:16 -0000 1.7.2.1 *************** *** 137,141 **** else { ! $img_id = ( $song_image_path . $thissong['song_imagename'] ); } --- 137,141 ---- else { ! $img_id = $song_image_path . $thissong['song_imagename']; } *************** *** 288,301 **** $url_video = $url_download; } ! 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('img', array( ! 'VIDEO_URL' => $url_video, ! 'SONG_URL' => $url_video ! )); } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) --- 288,304 ---- $url_video = $url_download; } ! else if ( $song_filetype == 'flv' ) { ! /* ! if ( !is_object($mx_page) ) ! { ! $mx_page = new mx_page(); ! } ! $mx_page->add_footer_text( $music_root_path . 'music_player.js', true ); ! */ ! $template->assign_block_vars('flv', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); ! $url_video = $music_root_path . 'music_player.swf'; } else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) *************** *** 510,515 **** } ! //$url_song = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_song&song_id=' . $song_id); ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); $template->assign_vars(array( --- 513,524 ---- } ! if ( $song_filetype == 'flv' ) ! { ! $url_song = PORTAL_URL . MUSIC_UPLOAD_PATH . $thissong['song_filename']; ! } ! else ! { ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id, true)); ! } $template->assign_vars(array( *************** *** 517,521 **** 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), - //'U_SONG' => append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_song&song_id=' . $song_id), 'U_SONG' => $url_song, --- 526,529 ---- *************** *** 524,528 **** '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, true)), 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id . "&item_size=425", true)), --- 532,536 ---- 'SONG_TITLE' => $thissong['song_title'], ! 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id . "&item_size=425", true)), *************** *** 572,575 **** --- 580,592 ---- 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), + 'FLASH' => 'flash', + 'RAM' => 'ram', + 'FLASHVIDEO' => 'flashvideo', + 'YOUTUBE' => 'youtube', + 'QT' => 'qt', + 'FLV' => 'flv', + 'IMG' => 'img', + 'MEDIA' => 'media', + 'L_RATING' => $lang['Rating'], 'L_SONG_TITLE' => $lang['Song_Title'], |
|
From: OryNider <ory...@us...> - 2007-09-12 23:49:21
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29553 Modified Files: Tag: core28x db_install.php db_upgrade.php music.php music_center.pak Log Message: Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_install.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** db_install.php 8 Sep 2007 13:28:29 -0000 1.7 --- db_install.php 12 Sep 2007 23:49:16 -0000 1.7.2.1 *************** *** 175,178 **** --- 175,179 ---- $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 ('flv_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')"; Index: music_center.pak =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_center.pak,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** music_center.pak 1 Aug 2007 23:33:27 -0000 1.2 --- music_center.pak 12 Sep 2007 23:49:16 -0000 1.2.2.1 *************** *** 1,10 **** ! module=+:57=+:Music Center=+:modules/mx_music/=+:music_center=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:57=+:60=+:music_center=+:Music Center=+:music.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Music Center=+:Demo block=+:60=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:57=+:61=+:Music_list=+:Music toplists=+:music_lists.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Music Toplist=+:Demo block=+:61=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,10 ---- ! module=+:57=+:Media Center=+:modules/mx_music/=+:mxBB Media Center=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:57=+:60=+:music_center=+:Media Center=+:music.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Media Center=+:Demo block=+:60=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:57=+:61=+:Music_list=+:Media toplists=+:music_lists.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Media Toplist=+:Demo block=+:61=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** music.php 8 Sep 2007 13:28:29 -0000 1.8 --- music.php 12 Sep 2007 23:49:16 -0000 1.8.2.1 *************** *** 13,17 **** // //error_reporting( E_ALL ); ! //ini_set( 'display_errors', '1' ); --- 13,17 ---- // //error_reporting( E_ALL ); ! ini_set( 'display_errors', '1' ); *************** *** 20,23 **** --- 20,24 ---- define('IN_PORTAL', true); $mx_root_path = '../../'; + $module_root_path = $mx_root_path . 'modules/mx_music/'; // // Let's include some stuff... *************** *** 35,39 **** if( empty($block_id) ) { ! $sql = "SELECT * FROM " . BLOCK_TABLE . " WHERE block_title = 'Music Center' LIMIT 1"; if(!$result = $db->sql_query($sql)) { --- 36,40 ---- if( empty($block_id) ) { ! $sql = "SELECT * FROM " . BLOCK_TABLE . " WHERE block_title = 'Media Center' LIMIT 1"; if(!$result = $db->sql_query($sql)) { *************** *** 200,207 **** --- 201,216 ---- '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'], + 'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss&c=" . $thiscat_parent['cat_id'] . "&sid=" . $userdata['session_id'], true)), 'CAT_PARENT' => $thiscat_parent['cat_id']) ); } } + else + { + $template->assign_vars(array( + 'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss" . "&sid=" . $userdata['session_id'], true)) + )); + + } $sql = "SELECT c.*, COUNT(s.song_id) AS count *************** *** 398,659 **** 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()); } } --- 407,464 ---- 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 + 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"; if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query songs information', '', __LINE__, __FILE__, $sql); ! } ! $mediarow = array(); ! while( $row = $db->sql_fetchrow($result) ) { ! $mediarow[] = $row; } ! $total_media = count($mediarow); ! if(!empty($template->xs_version)) ! { ! if ($total_media > 0) { ! $template->assign_block_vars('catrow.virtualmediacat', array()); } } ! ! $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 songs information', '', __LINE__, __FILE__, $sql); ! } ! ! $totalrow = array(); ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! $totalrow[] = $row; } + $total_items = count($totalrow); + + $total_images = $total_items - $total_media; + if(!empty($template->xs_version)) { ! if ($total_images > 0) { ! $template->assign_block_vars('catrow.virtualimagecat', array()); } } *************** *** 1129,1132 **** --- 934,939 ---- 'SORT_NEW_COMMENT_OPTION' => $sort_new_comment_option, + 'L_RSS' => ( !empty($lang['Rss_Feed']) ? $lang['Rss_Feed'] : 'RSS Feed' ), + 'L_SORT' => $lang['Sort']) Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_upgrade.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** db_upgrade.php 8 Sep 2007 13:28:29 -0000 1.5 --- db_upgrade.php 12 Sep 2007 23:49:16 -0000 1.5.2.1 *************** *** 97,100 **** --- 97,101 ---- $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 ('flv_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')"; |
|
From: OryNider <ory...@us...> - 2007-09-12 23:49:20
|
Update of /cvsroot/mxbb/mx_music/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29553/admin Modified Files: Tag: core28x admin_music_auth.php admin_music_cat.php admin_music_cfg.php admin_music_ext.php Log Message: Index: admin_music_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_ext.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** admin_music_ext.php 1 Aug 2007 23:33:26 -0000 1.2 --- admin_music_ext.php 12 Sep 2007 23:49:16 -0000 1.2.2.1 *************** *** 85,89 **** if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['music_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_music_config'], "<a href=\"" . append_sid( "admin_music_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 85,89 ---- if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['music_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_music_config'], "<a href=\"" . append_sid( "admin_music_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } Index: admin_music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cat.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** admin_music_cat.php 30 Aug 2007 03:52:17 -0000 1.3 --- admin_music_cat.php 12 Sep 2007 23:49:16 -0000 1.3.2.1 *************** *** 358,362 **** // Return a message... ! $message = $lang['Category_changed_order'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); message_die(GENERAL_MESSAGE, $message); --- 358,362 ---- // Return a message... ! $message = $lang['Category_changed_order'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); message_die(GENERAL_MESSAGE, $message); Index: admin_music_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_auth.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** admin_music_auth.php 1 Aug 2007 23:33:26 -0000 1.2 --- admin_music_auth.php 12 Sep 2007 23:49:16 -0000 1.2.2.1 *************** *** 206,210 **** // okay, return a message... ! $message = $lang['Music_Auth_successfully'] . '<br /><br />' . sprintf($lang['Click_return_music_auth'], '<a href="' . append_sid("admin_music_auth.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'); message_die(GENERAL_MESSAGE, $message); --- 206,210 ---- // okay, return a message... ! $message = $lang['Music_Auth_successfully'] . '<br /><br />' . sprintf($lang['Click_return_music_auth'], '<a href="' . append_sid("admin_music_auth.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); message_die(GENERAL_MESSAGE, $message); Index: admin_music_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cfg.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** admin_music_cfg.php 8 Sep 2007 13:28:29 -0000 1.4 --- admin_music_cfg.php 12 Sep 2007 23:49:16 -0000 1.4.2.1 *************** *** 85,89 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Music_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_config'], "<a href=\"" . append_sid("admin_music_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); message_die(GENERAL_MESSAGE, $message); --- 85,89 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Music_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_config'], "<a href=\"" . append_sid("admin_music_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); message_die(GENERAL_MESSAGE, $message); *************** *** 164,167 **** --- 164,170 ---- 'QT_DISABLED' => ($new['qt_allowed'] == 0) ? 'checked="checked"' : '', + 'FLV_ENABLED' => ($new['flv_allowed'] == 1) ? 'checked="checked"' : '', + 'FLV_DISABLED' => ($new['flv_allowed'] == 0) ? 'checked="checked"' : '', + 'RM_ENABLED' => ($new['rm_allowed'] == 1) ? 'checked="checked"' : '', 'RM_DISABLED' => ($new['rm_allowed'] == 0) ? 'checked="checked"' : '', *************** *** 229,236 **** 'L_MAX_IMAGE_HEIGHT' => $lang['Max_image_height'], 'L_MP3_ALLOWED' => $lang['MP3_allowed'], 'L_WAV_ALLOWED' => $lang['WAV_allowed'], 'L_WMA_ALLOWED' => $lang['WMA_allowed'], - // Media Center 'L_WMV_ALLOWED' => $lang['WMV_allowed'], 'L_MIDI_ALLOWED' => $lang['MIDI_allowed'], --- 232,239 ---- 'L_MAX_IMAGE_HEIGHT' => $lang['Max_image_height'], + // Media Center Allowed FileTypes 'L_MP3_ALLOWED' => $lang['MP3_allowed'], 'L_WAV_ALLOWED' => $lang['WAV_allowed'], 'L_WMA_ALLOWED' => $lang['WMA_allowed'], 'L_WMV_ALLOWED' => $lang['WMV_allowed'], 'L_MIDI_ALLOWED' => $lang['MIDI_allowed'], *************** *** 241,247 **** 'L_SWF_ALLOWED' => $lang['SWF_allowed'], 'L_QT_ALLOWED' => $lang['QT_allowed'], 'L_RM_ALLOWED' => $lang['RM_allowed'], 'L_IMG_ALLOWED' => $lang['IMG_allowed'], ! // Media Center 'L_SONG_DESC_MAX_LENGTH' => $lang['Song_Desc_Max_Length'], 'L_HOTLINK_PREVENT' => $lang['Hotlink_prevent'], --- 244,252 ---- 'L_SWF_ALLOWED' => $lang['SWF_allowed'], 'L_QT_ALLOWED' => $lang['QT_allowed'], + 'L_FLV_ALLOWED' => $lang['FLV_allowed'], 'L_RM_ALLOWED' => $lang['RM_allowed'], 'L_IMG_ALLOWED' => $lang['IMG_allowed'], ! // Media Center Allowed FileTypes ! 'L_SONG_DESC_MAX_LENGTH' => $lang['Song_Desc_Max_Length'], 'L_HOTLINK_PREVENT' => $lang['Hotlink_prevent'], |
|
From: Jon O. <jon...@us...> - 2007-09-12 19:36:15
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16661 Modified Files: Tag: core28x mx_functions_style.php Added Files: Tag: core28x template.php Log Message: XS template.php part of CORE --- NEW FILE: template.php --- <?php /** * * @package mxBB Portal Module - mx_xs * @version $Id: template.php,v 1.18.2.2 2007/09/12 19:36:09 jonohlsson Exp $ * @copyright (c) 2002-2007 [CyberAlien, OryNider] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ /** * * Template class. By Nathan Codding of the phpBB group. * The interface was originally inspired by PHPLib templates, * and the template file formats are quite similar. * * eXtreme Styles mod/module by CyberAlien. [...2418 lines suppressed...] $list = explode('|', $str); for($i=0; $i<count($list); $i++) { $row = explode('=', $list[$i], 2); if(count($row) == 2) { $array[$row[0]] = $row[1]; } } return $array; } } function xs_switch($tpl, $name) { return (isset($tpl->_tpldata[$name.'.']) && count($tpl->_tpldata[$name.'.']) > 0); } ?> Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.17.2.2 retrieving revision 1.17.2.3 diff -C2 -d -r1.17.2.2 -r1.17.2.3 *** mx_functions_style.php 4 Sep 2007 18:49:07 -0000 1.17.2.2 --- mx_functions_style.php 12 Sep 2007 19:36:09 -0000 1.17.2.3 *************** *** 18,29 **** // Including phpBB version of the Template class // ! if( file_exists($mx_root_path . 'modules/mx_xs/includes/template.' . $phpEx) ) ! { ! include_once($mx_root_path . 'modules/mx_xs/includes/template.' . $phpEx); ! } ! else ! { ! include_once($phpbb_root_path . 'includes/template.' . $phpEx); ! } // --- 18,22 ---- // Including phpBB version of the Template class // ! include_once($phpbb_root_path . 'includes/template.' . $phpEx); // |
2 messages has been excluded from this view by a project administrator.
