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-08-30 03:53:51
|
Update of /cvsroot/mxbb/mx_music/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv952 Modified Files: music_cat_xs.tpl music_index_body.tpl music_page_body.tpl Log Message: This will add subcategories :D Index: music_page_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_page_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_page_body.tpl 28 Aug 2007 23:01:26 -0000 1.2 --- music_page_body.tpl 30 Aug 2007 03:53:33 -0000 1.3 *************** *** 176,180 **** <!-- BEGIN img --> ! <img src="{SONG_URL}" id="image" type="image" width="425" height="350" alt=""> <!-- END img --> --- 176,180 ---- <!-- BEGIN img --> ! <a href="javascript:void(0);" onClick="window.open('{song_detail.SONG_URL}','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="{song_detail.SONG_URL}" id="image" type="image" width="425" height="350" border="1"></a> <!-- END img --> Index: music_cat_xs.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_cat_xs.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_cat_xs.tpl 28 Aug 2007 23:01:26 -0000 1.3 --- music_cat_xs.tpl 30 Aug 2007 03:53:33 -0000 1.4 *************** *** 194,199 **** <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq img --> ! <img src="{song_detail.SONG_URL}" id="image" type="image" width="425" height="350" alt=""> <!-- ENDIF --> --- 194,199 ---- <!-- ENDIF --> ! <!-- IF song_detail.S_ROW_TYPE eq img --> ! <a href="javascript:void(0);" onClick="window.open('{song_detail.SONG_URL}','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="{song_detail.SONG_URL}" id="image" type="image" width="425" height="350" 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.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_index_body.tpl 6 Jun 2007 20:40:45 -0000 1.1 --- music_index_body.tpl 30 Aug 2007 03:53:33 -0000 1.2 *************** *** 7,11 **** <!-- END switch_user_logged_in --> {CURRENT_TIME}<br /> ! </span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a href="{U_MUSIC}" class="nav">{L_MUSIC}</a></span></td> </tr> </table> --- 7,11 ---- <!-- END switch_user_logged_in --> {CURRENT_TIME}<br /> ! </span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a href="{U_MUSIC}" class="nav">{L_MUSIC}</a> {SUBCAT_NAV}</span></td> </tr> </table> *************** *** 69,73 **** </tr> <tr> ! <td class="catLeft" colspan="4" height="28"><span class="cattitle">{L_PUBLIC_CATS}</span></td> </tr> <!-- BEGIN catrow --> --- 69,73 ---- </tr> <tr> ! <td class="catLeft" colspan="4" height="28"><span class="cattitle">{L_PUBLIC_CATS} {SUBCAT_NAV}</span></td> </tr> <!-- BEGIN catrow --> *************** *** 75,79 **** <td class="row1" height="50"><span class="forumlink"> <a href="{catrow.U_VIEW_CAT}" class="forumlink">{catrow.CAT_TITLE}</a><br /> </span> <span class="genmed">{catrow.CAT_DESC}<br /> ! </span><span class="gensmall">{catrow.L_MODERATORS} {catrow.MODERATORS}</span></td> <td class="row2" align="center"><span class="gensmall">{catrow.CAT_VIEWS}</span></td> <td class="row2" align="center"><span class="gensmall">{catrow.SONGS}</span></td> --- 75,79 ---- <td class="row1" height="50"><span class="forumlink"> <a href="{catrow.U_VIEW_CAT}" class="forumlink">{catrow.CAT_TITLE}</a><br /> </span> <span class="genmed">{catrow.CAT_DESC}<br /> ! </span><span class="gensmall">{catrow.L_MODERATORS} {catrow.MODERATORS} {catrow.SUBCATS}</span></td> <td class="row2" align="center"><span class="gensmall">{catrow.CAT_VIEWS}</span></td> <td class="row2" align="center"><span class="gensmall">{catrow.SONGS}</span></td> |
|
From: OryNider <ory...@us...> - 2007-08-30 03:53:51
|
Update of /cvsroot/mxbb/mx_music/templates/subSilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv952/admin Modified Files: music_cat_body.tpl music_cat_new_body.tpl Log Message: This will add subcategories :D Index: music_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/admin/music_cat_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_cat_body.tpl 6 Jun 2007 20:40:12 -0000 1.1 --- music_cat_body.tpl 30 Aug 2007 03:53:33 -0000 1.2 *************** *** 6,14 **** <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th class="thHead" height="25" colspan="4">{L_MUSIC_CAT_TITLE}</th> </tr> <!-- BEGIN catrow --> <tr> ! <td class="{catrow.COLOR}" width="60%" height="25"><span class="gen">{catrow.TITLE}<br /></span><span class="gensmall">{catrow.DESC}</span></td> <td class="{catrow.COLOR}" align="center"><span class="genmed"><a href="{catrow.S_MOVE_UP}">{L_MOVE_UP}</a><br /><a href="{catrow.S_MOVE_DOWN}">{L_MOVE_DOWN}</a></span></td> --- 6,15 ---- <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th class="thHead" height="25" colspan="5">{L_MUSIC_CAT_TITLE}</th> </tr> <!-- BEGIN catrow --> <tr> ! <td colspan="{catrow.COLSPAN}" class="{catrow.COLOR}" width="60%" height="25"><span class="gen">{catrow.TITLE}<br /></span><span class="gensmall">{catrow.DESC}</span></td> ! {catrow.ADD_SC} <td class="{catrow.COLOR}" align="center"><span class="genmed"><a href="{catrow.S_MOVE_UP}">{L_MOVE_UP}</a><br /><a href="{catrow.S_MOVE_DOWN}">{L_MOVE_DOWN}</a></span></td> *************** *** 20,24 **** <!-- END catrow --> <tr> ! <td class="catBottom" align="center" height="28" colspan="4"><input type="hidden" value="new" name="mode" /><input name="submit" type="submit" value="{L_CREATE_CATEGORY}" class="liteoption"></td> </tr> </table> --- 21,25 ---- <!-- END catrow --> <tr> ! <td class="catBottom" align="center" height="28" colspan="5"><form action="{S_MUSIC_ACTION}" method="post"><input type="hidden" value="new" name="mode" /><input name="submit" type="submit" value="{L_CREATE_MUSIC}" class="liteoption"></form><form action="{S_MUSIC_ACTION}&newcat" method="post"><input type="hidden" value="newcat" name="mode" /><input name="submit" type="submit" value="{L_CREATE_CATEGORY}" class="liteoption"></td> </tr> </table> Index: music_cat_new_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/admin/music_cat_new_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_cat_new_body.tpl 6 Jun 2007 20:40:16 -0000 1.1 --- music_cat_new_body.tpl 30 Aug 2007 03:53:33 -0000 1.2 *************** *** 4,7 **** --- 4,9 ---- <form action="{S_MUSIC_ACTION}" method="post"> + {CAT_PARENT} + {CAT_TYPE} <table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline"> <tr> |
|
From: OryNider <ory...@us...> - 2007-08-30 03:52:35
|
Update of /cvsroot/mxbb/mx_music/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv502/lang_romanian Modified Files: lang_admin_music.php lang_main_music.php Log Message: This will add subcategories :D Index: lang_main_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_romanian/lang_main_music.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_main_music.php 25 Aug 2007 03:36:07 -0000 1.3 --- lang_main_music.php 30 Aug 2007 03:52:32 -0000 1.4 *************** *** 45,60 **** $lang['Song_Title'] = 'Numele melodiei'; - $lang['Music_upload_can'] = '<b>Poþi</b> uploada noi melodii în aceastã categorie'; - $lang['Music_upload_cannot'] = '<b>Nu poþi</b> uploada noi melodii în aceastã categorie'; - $lang['Music_rate_can'] = '<b>Poþi</b> vota melodii în aceastã categorie'; - $lang['Music_rate_cannot'] = '<b>Nu poþi</b> vota melodii în aceastã categorie'; - $lang['Music_comment_can'] = '<b>Poþi</b> adãuga comentarii melodiilor din aceastã categorie'; - $lang['Music_comment_cannot'] = '<b>Nu poþi</b> adãuga comentarii melodiilor din aceastã categorie'; - $lang['Music_edit_can'] = '<b>Poþi</b> edita melodiile tale ºi comentariile acestora din aceastã categorie'; - $lang['Music_edit_cannot'] = '<b>Nu poþi</b> edita melodiile tale ºi comentariile acestora din aceastã categorie'; - $lang['Music_delete_can'] = '<b>Poþi</b> ºterge melodiile tale ºi comentariile acestora din aceastã categorie'; - $lang['Music_delete_cannot'] = '<b>Nu poþi</b> ºterge melodiile tale ºi comentariile din aceastã categorie'; - $lang['Music_moderate_can'] = '<b>Poþi</b> %smodera%s aceastã categorie'; - $lang['Edit_song'] = 'Editeazã'; $lang['Delete_song'] = 'ªterge'; --- 45,48 ---- *************** *** 160,169 **** // auth_key ! $lang['Music_view_can'] = 'You can view'; ! $lang['Music_view_cannot'] = 'You can view cannot'; ! $lang['Music_upload_can'] = 'You can upload'; ! $lang['Music_upload_cannot'] = 'You cannot upload'; ! $lang['Music_download_can'] = 'You can download'; ! $lang['Music_download_cannot'] = 'MYou cannot download'; ?> \ No newline at end of file --- 148,166 ---- // auth_key ! $lang['Music_view_can'] = '<b>Poþi</b> vizualiza melodii în aceastã categorie'; ! $lang['Music_view_cannot'] = '<b>Nu poþi</b> vizualiza melodii în aceastã categorie'; ! $lang['Music_upload_can'] = '<b>Poþi</b> uploada noi melodii în aceastã categorie'; ! $lang['Music_upload_cannot'] = '<b>Nu poþi</b> uploada noi melodii în aceastã categorie'; ! $lang['Music_download_can'] = '<b>Poþi</b> downloada melodii în aceastã categorie'; ! $lang['Music_download_cannot'] = '<b>Nu poþi</b> downloada melodii în aceastã categorie'; ! $lang['Music_rate_can'] = '<b>Poþi</b> vota melodii în aceastã categorie'; ! $lang['Music_rate_cannot'] = '<b>Nu poþi</b> vota melodii în aceastã categorie'; ! $lang['Music_comment_can'] = '<b>Poþi</b> adãuga comentarii melodiilor din aceastã categorie'; ! $lang['Music_comment_cannot'] = '<b>Nu poþi</b> adãuga comentarii melodiilor din aceastã categorie'; ! $lang['Music_edit_can'] = '<b>Poþi</b> edita melodiile tale ºi comentariile acestora din aceastã categorie'; ! $lang['Music_edit_cannot'] = '<b>Nu poþi</b> edita melodiile tale ºi comentariile acestora din aceastã categorie'; ! $lang['Music_delete_can'] = '<b>Poþi</b> ºterge melodiile tale ºi comentariile acestora din aceastã categorie'; ! $lang['Music_delete_cannot'] = '<b>Nu poþi</b> ºterge melodiile tale ºi comentariile din aceastã categorie'; ! $lang['Music_moderate_can'] = '<b>Poþi</b> %smodera%s aceastã categorie'; ?> \ No newline at end of file Index: lang_admin_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_romanian/lang_admin_music.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin_music.php 1 Aug 2007 23:34:36 -0000 1.2 --- lang_admin_music.php 30 Aug 2007 03:52:32 -0000 1.3 *************** *** 63,66 **** --- 63,68 ---- $lang['Category_deleted'] = 'Categoria a fost ºtearsã cu succes'; $lang['Category_changed_order'] = 'Categoria s-a mutat cu succes'; + $lang['Create_music'] = 'Create new music'; + $lang['Create_sub_music'] = 'Create sub-music'; // |
|
From: OryNider <ory...@us...> - 2007-08-30 03:52:35
|
Update of /cvsroot/mxbb/mx_music/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv502/lang_english Modified Files: lang_admin_music.php lang_main_music.php Log Message: This will add subcategories :D Index: lang_main_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_english/lang_main_music.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_main_music.php 25 Aug 2007 03:36:07 -0000 1.3 --- lang_main_music.php 30 Aug 2007 03:52:32 -0000 1.4 *************** *** 38,53 **** $lang['Song_Title'] = 'Song Title'; - $lang['Music_upload_can'] = 'You <b>can</b> upload new songs in this category'; - $lang['Music_upload_cannot'] = 'You <b>cannot</b> upload new songs in this category'; - $lang['Music_rate_can'] = 'You <b>can</b> rate songs in this category'; - $lang['Music_rate_cannot'] = 'You <b>cannot</b> rate songs in this category'; - $lang['Music_comment_can'] = 'You <b>can</b> post comments to songs in this category'; - $lang['Music_comment_cannot'] = 'You <b>cannot</b> post comments to songs in this category'; - $lang['Music_edit_can'] = 'You <b>can</b> edit your songs and comments in this category'; - $lang['Music_edit_cannot'] = 'You <b>cannot</b> edit your songs and comments in this category'; - $lang['Music_delete_can'] = 'You <b>can</b> delete your songs and comments in this category'; - $lang['Music_delete_cannot'] = 'You <b>cannot</b> delete your songs and comments in this category'; - $lang['Music_moderate_can'] = 'You <b>can</b> %smoderate%s this category'; - $lang['Edit_song'] = 'Edit'; $lang['Delete_song'] = 'Del'; --- 38,41 ---- *************** *** 154,163 **** // auth_key ! $lang['Music_view_can'] = 'You can view'; ! $lang['Music_view_cannot'] = 'You can view cannot'; ! $lang['Music_upload_can'] = 'You can upload'; ! $lang['Music_upload_cannot'] = 'You cannot upload'; ! $lang['Music_download_can'] = 'You can download'; ! $lang['Music_download_cannot'] = 'MYou cannot download'; ?> \ No newline at end of file --- 142,160 ---- // auth_key ! $lang['Music_view_can'] = 'You <b>can</b> view songs in this category'; ! $lang['Music_view_cannot'] = 'You <b>cannot</b> view songs in this category'; ! $lang['Music_download_can'] = 'You <b>can</b> download songs in this category'; ! $lang['Music_download_cannot'] = 'You <b>cannot</b> download songs in this category'; ! $lang['Music_upload_can'] = 'You <b>can</b> upload new songs in this category'; ! $lang['Music_upload_cannot'] = 'You <b>cannot</b> upload new songs in this category'; ! $lang['Music_rate_can'] = 'You <b>can</b> rate songs in this category'; ! $lang['Music_rate_cannot'] = 'You <b>cannot</b> rate songs in this category'; ! $lang['Music_comment_can'] = 'You <b>can</b> post comments to songs in this category'; ! $lang['Music_comment_cannot'] = 'You <b>cannot</b> post comments to songs in this category'; ! $lang['Music_edit_can'] = 'You <b>can</b> edit your songs and comments in this category'; ! $lang['Music_edit_cannot'] = 'You <b>cannot</b> edit your songs and comments in this category'; ! $lang['Music_delete_can'] = 'You <b>can</b> delete your songs and comments in this category'; ! $lang['Music_delete_cannot'] = 'You <b>cannot</b> delete your songs and comments in this category'; ! $lang['Music_moderate_can'] = 'You <b>can</b> %smoderate%s this category'; ?> \ No newline at end of file Index: lang_admin_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_english/lang_admin_music.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin_music.php 1 Aug 2007 23:34:36 -0000 1.2 --- lang_admin_music.php 30 Aug 2007 03:52:32 -0000 1.3 *************** *** 56,59 **** --- 56,61 ---- $lang['Category_deleted'] = 'This category has been deleted successfully'; $lang['Category_changed_order'] = 'This category has been changed order successfully'; + $lang['Create_music'] = 'Create new music'; + $lang['Create_sub_music'] = 'Create sub-music'; // |
|
From: OryNider <ory...@us...> - 2007-08-30 03:52:22
|
Update of /cvsroot/mxbb/mx_music/music_box In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv451/music_box Modified Files: music_common.php Log Message: This will add subcategories :D Index: music_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/music_common.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_common.php 1 Aug 2007 23:33:28 -0000 1.2 --- music_common.php 30 Aug 2007 03:52:17 -0000 1.3 *************** *** 47,54 **** // ********************************************************************** ! if ( file_exists( $module_root_path . "templates/" . $theme['template_name'] . $theme['template_name'] . ".cfg" ) ) { // ---------- ! include($module_root_path . "templates/" . $theme['template_name'] . $theme['template_name'] . ".cfg"); // ---------- } --- 47,54 ---- // ********************************************************************** ! if ( file_exists( $module_root_path . "templates/" . $theme['template_name'] . '/' . $theme['template_name'] . ".cfg" ) ) { // ---------- ! include($module_root_path . "templates/" . $theme['template_name'] . '/' . $theme['template_name'] . ".cfg"); // ---------- } |
|
From: OryNider <ory...@us...> - 2007-08-30 03:52:21
|
Update of /cvsroot/mxbb/mx_music/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv451/admin Modified Files: admin_music_cat.php Log Message: This will add subcategories :D Index: admin_music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cat.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_music_cat.php 1 Aug 2007 23:33:26 -0000 1.2 --- admin_music_cat.php 30 Aug 2007 03:52:17 -0000 1.3 *************** *** 104,107 **** --- 104,108 ---- 'L_DELETE' => $lang['Delete'], 'S_MODE' => 'new', + 'L_CREATE_MUSIC' => $lang['Create_music'], 'L_CREATE_CATEGORY' => $lang['Create_category']) ); *************** *** 109,112 **** --- 110,114 ---- $sql = "SELECT * FROM ". MUSIC_CAT_TABLE ." + WHERE cat_parent = 0 ORDER BY cat_order ASC"; if(!$result = $db->sql_query($sql)) *************** *** 121,128 **** --- 123,145 ---- for( $i = 0; $i < count($catrow); $i++ ) { + if ($catrow[$i]['cat_type'] != 0) + { + $colspan = 1; + $add_sc = "<td class=\"" . (($i % 2) ? 'row1' : 'row2') . "\" align=\"center\">" . + "<form action=\"" . append_sid("admin_music_cat.$phpEx") . "\" method=\"post\"><input type=\"hidden\" value=\"new\" name=\"mode\" /><input type=\"hidden\" value=\"" . $catrow[$i]['cat_id'] . "\" name=\"cat_parent\"><input name=\"submit\" type=\"submit\" value=\"" . $lang['Create_sub_music'] . "\" class=\"liteoption\">" . + "</form></td>"; + } + else + { + $colspan = 2; + $add_sc = ""; + } + $template->assign_block_vars('catrow', array( 'COLOR' => ($i % 2) ? 'row1' : 'row2', 'TITLE' => $catrow[$i]['cat_title'], 'DESC' => $catrow[$i]['cat_desc'], + 'COLSPAN' => $colspan, + 'ADD_SC' => $add_sc, 'S_MOVE_UP' => append_sid("admin_music_cat.$phpEx?action=move&move=-15&cat_id=" . $catrow[$i]['cat_id']), 'S_MOVE_DOWN' => append_sid("admin_music_cat.$phpEx?action=move&move=15&cat_id=" . $catrow[$i]['cat_id']), *************** *** 131,134 **** --- 148,182 ---- ) ); + + if ($catrow[$i]['cat_type'] != 0) + { + // this is a parent category + $sc_sql = "SELECT * + FROM ". MUSIC_CAT_TABLE ." + WHERE cat_parent = " . $catrow[$i]['cat_id'] . " + GROUP BY cat_id + ORDER BY cat_order ASC"; + + if ( !($sc_result = $db->sql_query($sc_sql)) ) + { + mx_message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sc_sql); + } + + while ($subcatrow = $db->sql_fetchrow($sc_result)) + { + $template->assign_block_vars('catrow', array( + 'COLSPAN' => 2, + 'ADD_SC' => '', + 'COLOR' => ($i % 2) ? 'row1' : 'row2', + 'TITLE' => " " . $subcatrow['cat_title'], + 'DESC' => " " . preg_replace("#\n#", "<br> ", $subcatrow['cat_desc']), + 'S_MOVE_UP' => append_sid("admin_music_cat.$phpEx?action=move&move=-15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), + 'S_MOVE_UP' => append_sid("admin_music_cat.$phpEx?action=move&move=15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), + 'S_EDIT_ACTION' => append_sid("admin_music_cat.$phpEx?action=edit&cat_id=" . $subcatrow['cat_id']), + 'S_DELETE_ACTION' => append_sid("admin_music_cat.$phpEx?action=delete&cat_id=" . $subcatrow['cat_id']) + ) + ); + } + } } *************** *** 316,322 **** } } ! else ! { ! if( $HTTP_POST_VARS['mode'] == 'new' ) { if( !isset($HTTP_POST_VARS['cat_title']) ) --- 364,370 ---- } } ! else ! { ! if(( $HTTP_POST_VARS['mode'] == 'new' ) || ($HTTP_POST_VARS['mode'] == 'newcat')) { if( !isset($HTTP_POST_VARS['cat_title']) ) *************** *** 326,329 **** --- 374,391 ---- ); + if ( !isset($HTTP_POST_VARS['cat_parent']) ) + { + $cat_parent = ""; + } + else + { + $cat_parent = "<input type=\"hidden\" value=\"" . $HTTP_POST_VARS['cat_parent'] . "\" name=\"cat_parent\">"; + } + + if ($HTTP_POST_VARS['mode'] == 'newcat') + { + $cat_type = "<input type=\"hidden\" value=\"1\" name=\"cat_type\">"; + } + $template->assign_vars(array( 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], *************** *** 364,367 **** --- 426,432 ---- 'S_ADMIN' => MUSIC_ADMIN, + 'CAT_PARENT' => $cat_parent, + 'CAT_TYPE' => $cat_type, + 'L_PANEL_TITLE' => $lang['Create_category']) ); *************** *** 374,377 **** --- 439,460 ---- { // Get posting variables + + if ( !isset($HTTP_POST_VARS['cat_parent']) ) + { + $cat_parent = 0; + } + else + { + $cat_parent = intval($HTTP_POST_VARS['cat_parent']); + } + if ( !isset($HTTP_POST_VARS['cat_type']) ) + { + $cat_type = 0; + } + else + { + $cat_type = 1; + } + $cat_title = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['cat_title']))); $cat_desc = str_replace("\'", "''", trim($HTTP_POST_VARS['cat_desc'])); *************** *** 397,402 **** // Here we insert a new row into the db ! $sql = "INSERT INTO ". MUSIC_CAT_TABLE ." (cat_title, cat_desc, cat_order, cat_view_level, cat_upload_level, cat_rate_level, cat_comment_level, cat_edit_level, cat_delete_level, cat_approval) ! VALUES ('$cat_title', '$cat_desc', '$cat_order', '$view_level', '$upload_level', '$rate_level', '$comment_level', '$edit_level', '$delete_level', '$cat_approval')"; if(!$result = $db->sql_query($sql)) { --- 480,485 ---- // Here we insert a new row into the db ! $sql = "INSERT INTO ". MUSIC_CAT_TABLE ." (cat_title, cat_desc, cat_order, cat_view_level, cat_upload_level, cat_rate_level, cat_comment_level, cat_edit_level, cat_delete_level, cat_approval, cat_parent, cat_type) ! VALUES ('$cat_title', '$cat_desc', '$cat_order', '$view_level', '$upload_level', '$rate_level', '$comment_level', '$edit_level', '$delete_level', '$cat_approval', $cat_parent, $cat_type)"; if(!$result = $db->sql_query($sql)) { |
|
From: OryNider <ory...@us...> - 2007-08-30 03:52:21
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv451 Modified Files: db_install.php db_upgrade.php music.php Log Message: This will add subcategories :D Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_install.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** db_install.php 25 Aug 2007 03:30:26 -0000 1.3 --- db_install.php 30 Aug 2007 03:52:17 -0000 1.4 *************** *** 108,111 **** --- 108,113 ---- $sql[] = "CREATE TABLE ". $mx_table_prefix . "music_cat ( cat_id mediumint(8) UNSIGNED NOT NULL auto_increment, + cat_parent mediumint(8) UNSIGNED NOT NULL DEFAULT '0', + cat_type tinyint NOT NULL DEFAULT '0', cat_title varchar(255) NOT NULL, cat_desc text, Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music.php 1 Aug 2007 23:33:26 -0000 1.2 --- music.php 30 Aug 2007 03:52:17 -0000 1.3 *************** *** 169,176 **** */ $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"; --- 169,195 ---- */ + $cat_id = $_POST['c'] ? $_POST['c'] : ( $_GET['c'] ? $_GET['c'] : 0 ); + $cat_where = "cat_parent = $cat_id"; + + if ($cat_id != 0) + { + $sql = "SELECT cat_id,cat_title + FROM ". MUSIC_CAT_TABLE ." + WHERE cat_id = $cat_id"; + if ( $result = $db->sql_query($sql) ) + { + $row = $db->sql_fetchrow($result); + + $template->assign_vars(array( + 'SUBCAT_NAV' => '-> <a class="nav" href="' . append_sid(this_mo_mxurl("c=" . $row['cat_id'])) . '">' . $row['cat_title'] . '</a>', + ) + ); + } + } + $sql = "SELECT c.*, COUNT(s.song_id) AS count 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"; *************** *** 251,343 **** // ------------------------------------------ ! if ($catrows[$i]['count'] == 0) ! { ! // ! // Oh, this category is empty ! // ! $last_song_info = $lang['No_Songs']; ! $u_last_song = ''; ! $last_song_title = ''; ! } ! else ! { ! // ---------------------------- ! // Check Song Approval ! // ---------------------------- ! ! if(($catrows[$i]['cat_approval'] == MUSIC_ADMIN) or ($catrows[$i]['cat_approval'] == MUSIC_MOD)) { ! $song_approval_sql = 'AND s.song_approval = 1'; // song Approval ON } else { ! $song_approval_sql = ''; // song Approval OFF ! } - // ---------------------------- - // OK, we may do a query now... - // ---------------------------- ! $sql = "SELECT s.song_id, s.song_title, s.song_singer, s.song_user_id, s.song_username, s.song_time, s.song_cat_id, u.user_id, u.username ! FROM ". MUSIC_TABLE ." AS s LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id ! WHERE s.song_cat_id = '". $catrows[$i]['cat_id'] ."' $song_approval_sql ! ORDER BY s.song_time DESC ! LIMIT 1"; ! if ( !$result = $db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not get last song information', '', __LINE__, __FILE__, $sql); ! } ! $lastrow = $db->sql_fetchrow($result); - // ---------------------------- - // Write the Date - // ---------------------------- ! $last_song_info = create_date($board_config['default_dateformat'], $lastrow['song_time'], $board_config['board_timezone']); ! $last_song_info .= '<br />'; - // ---------------------------- - // Write username of last poster - // ---------------------------- ! if( ($lastrow['user_id'] == MUSIC_GUEST) or ($lastrow['username'] == '') ) ! { ! $last_song_info .= ($lastrow['song_username'] == '') ? $lang['Guest'] : $lastrow['song_username']; ! } ! else ! { ! $last_song_info .= $lang['Poster'] .': <a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $lastrow['user_id']) .'">'. $lastrow['username'] .'</a>'; ! } - // ---------------------------- - // Write the last song's title. - // Truncate it if it's too long - // ---------------------------- ! if( !isset($music_config['last_song_title_length']) ) ! { ! $music_config['last_song_title_length'] = 25; ! } ! $lastrow['song_title'] = $lastrow['song_title']; ! if (strlen($lastrow['song_title']) > $music_config['last_song_title_length']) ! { ! $lastrow['song_title'] = substr($lastrow['song_title'], 0, $music_config['last_song_title_length']) . '...'; ! } ! $last_song_info .= '<br />'. $lang['Song_Title'] .': <a href="'; ! $last_song_info .= append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $lastrow['song_id'])) .'">' ; ! $last_song_info .= $lastrow['song_title'] .'</a>'; ! } ! // END of Last Song // ------------------------------------------ --- 270,407 ---- // ------------------------------------------ ! if ($catrows[$i]['cat_type'] == 0) ! { ! if ($catrows[$i]['count'] == 0) { ! // ! // Oh, this category is empty ! // ! $last_song_info = $lang['No_Songs']; ! $u_last_song = ''; ! $last_song_title = ''; } else { ! // ---------------------------- ! // Check Song Approval ! // ---------------------------- + if(($catrows[$i]['cat_approval'] == MUSIC_ADMIN) or ($catrows[$i]['cat_approval'] == MUSIC_MOD)) + { + $song_approval_sql = 'AND s.song_approval = 1'; // song Approval ON + } + else + { + $song_approval_sql = ''; // song Approval OFF + } ! // ---------------------------- ! // OK, we may do a query now... ! // ---------------------------- + $sql = "SELECT s.song_id, s.song_title, s.song_singer, s.song_user_id, s.song_username, s.song_time, s.song_cat_id, u.user_id, u.username + FROM ". MUSIC_TABLE ." AS s LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id + WHERE s.song_cat_id = '". $catrows[$i]['cat_id'] ."' $song_approval_sql + ORDER BY s.song_time DESC + LIMIT 1"; + if ( !$result = $db->sql_query($sql) ) + { + mx_message_die(GENERAL_ERROR, 'Could not get last song information', '', __LINE__, __FILE__, $sql); + } + $lastrow = $db->sql_fetchrow($result); ! // ---------------------------- ! // Write the Date ! // ---------------------------- ! $last_song_info = create_date($board_config['default_dateformat'], $lastrow['song_time'], $board_config['board_timezone']); + $last_song_info .= '<br />'; ! // ---------------------------- ! // Write username of last poster ! // ---------------------------- + if( ($lastrow['user_id'] == MUSIC_GUEST) or ($lastrow['username'] == '') ) + { + $last_song_info .= ($lastrow['song_username'] == '') ? $lang['Guest'] : $lastrow['song_username']; + } + else + { + $last_song_info .= $lang['Poster'] .': <a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $lastrow['user_id']) .'">'. $lastrow['username'] .'</a>'; + } ! // ---------------------------- ! // Write the last song's title. ! // Truncate it if it's too long ! // ---------------------------- ! if( !isset($music_config['last_song_title_length']) ) ! { ! $music_config['last_song_title_length'] = 25; ! } ! $lastrow['song_title'] = $lastrow['song_title']; ! if (strlen($lastrow['song_title']) > $music_config['last_song_title_length']) ! { ! $lastrow['song_title'] = substr($lastrow['song_title'], 0, $music_config['last_song_title_length']) . '...'; ! } ! $last_song_info .= '<br />'. $lang['Song_Title'] .': <a href="'; ! $last_song_info .= append_sid(this_mo_mxurl("music_mode=music_page&song_id=" . $lastrow['song_id'])) .'">' ; + $last_song_info .= $lastrow['song_title'] .'</a>'; + } + // END of Last Song + } + else + { + // this is a parent category + $sc_sql = "SELECT * + FROM ". MUSIC_CAT_TABLE ." + WHERE cat_parent = " . $catrows[$i]['cat_id'] . " + GROUP BY cat_id + ORDER BY cat_order ASC"; + + if ( !($sc_result = $db->sql_query($sc_sql)) ) + { + mx_message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sql); + } + + $sql_count = "SELECT count(cat_id) as count + FROM ". MUSIC_CAT_TABLE ." + WHERE cat_parent = " . $catrows[$i]['cat_id']; + if ( ($result_count = $db->sql_query($sql_count)) ) + { + $subcat_count = $db->sql_fetchrow($result_count); + $subcat_count = $subcat_count['count'] . " sub catagories"; + } + else + { + $subcat_count = ""; + } + + $subcats = "<br /><span class=\"gensmall\"><b>Sub-catagories:</b><br />"; + while ( $subcatrow = $db->sql_fetchrow($sc_result) ) + { + $subcats .= " - <a class=\"gensmall\" href=\"" . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $subcatrow['cat_id'])) . "\">" . $subcatrow['cat_title'] . "</a><br />"; + } + $subcats .= "</span><br />"; + + $template->assign_block_vars('catrow', array( + 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_index&c=". $catrows[$i]['cat_id'])), + 'CAT_TITLE' => $catrows[$i]['cat_title'], + 'CAT_DESC' => $catrows[$i]['cat_desc'], + 'SONGS' => $subcat_count, + 'SUBCATS' => $subcats, + ) + ); + } // ------------------------------------------ *************** *** 345,358 **** // ------------------------------------------ ! $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $catrows[$i]['cat_id'])), ! 'CAT_TITLE' => $catrows[$i]['cat_title'], ! 'CAT_DESC' => $catrows[$i]['cat_desc'], ! 'CAT_VIEWS' => $catrows[$i]['cat_views'], ! 'L_MODERATORS' => $l_moderators, ! 'MODERATORS' => $moderators_list, ! 'SONGS' => $catrows[$i]['count'], ! 'LAST_SONG_INFO' => $last_song_info) ! ); } // END of Categories Index --- 409,425 ---- // ------------------------------------------ ! if ($catrows[$i]['cat_type'] == 0) ! { ! $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $catrows[$i]['cat_id'])), ! 'CAT_TITLE' => $catrows[$i]['cat_title'], ! 'CAT_DESC' => $catrows[$i]['cat_desc'], ! 'CAT_VIEWS' => $catrows[$i]['cat_views'], ! 'L_MODERATORS' => $l_moderators, ! 'MODERATORS' => $moderators_list, ! 'SONGS' => $catrows[$i]['count'], ! 'LAST_SONG_INFO' => $last_song_info) ! ); ! } } // END of Categories Index Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_upgrade.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** db_upgrade.php 25 Aug 2007 03:30:26 -0000 1.3 --- db_upgrade.php 30 Aug 2007 03:52:17 -0000 1.4 *************** *** 43,46 **** --- 43,47 ---- // $upgrade_206 = 0; + $upgrade_207 = 0; // *************** *** 53,56 **** --- 54,66 ---- } + // + // validate before 2.07 + // + $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "music_config WHERE config_name = 'img_allowed'" ); + if ( $db->sql_numrows( $result ) == 0 ) + { + $upgrade_207 = 1; + } + $message = "<b>Upgrading!</b><br/><br/>"; *************** *** 71,77 **** $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('qt_allowed', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('rm_allowed', '1')"; ! $sql[] = "UPDATE ". $mx_table_prefix ."music_config ! SET config_value = '0.6' ! WHERE config_name = 'music_version'"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_size', '10240')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_width', '300')"; --- 81,85 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('qt_allowed', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('rm_allowed', '1')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_size', '10240')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('max_image_width', '300')"; *************** *** 82,85 **** --- 90,107 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('index', '5')"; } + + if ( $upgrade_207 == 1 ) + { + $message .= "<b>Upgrading to v. 2.0.7...</b><br/><br/>"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "music_config VALUES ('img_allowed', '1')"; + + $sql[] = "ALTER TABLE " . $mx_table_prefix . "music_cat ADD cat_parent mediumint(8) UNSIGNED NOT NULL DEFAULT '0' AFTER cat_id"; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "music_cat ADD cat_type tinyint NOT NULL DEFAULT '0' AFTER cat_parent"; + + $sql[] = "UPDATE ". $mx_table_prefix ."music_config + SET config_value = '0.7' + WHERE config_name = 'music_version'"; + } else { |
|
From: OryNider <ory...@us...> - 2007-08-30 03:49:19
|
Update of /cvsroot/mxbb/mx_radiocast/radiocast_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31127 Modified Files: radiocast_common.php Log Message: template cfg file load fix Index: radiocast_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/radiocast_mod/radiocast_common.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** radiocast_common.php 6 Jun 2007 23:03:58 -0000 1.1 --- radiocast_common.php 30 Aug 2007 03:49:01 -0000 1.2 *************** *** 47,54 **** // ********************************************************************** ! if ( file_exists( $module_root_path . "templates/" . $theme['template_name'] . $theme['template_name'] . ".cfg" ) ) { // ---------- ! include($module_root_path . "templates/" . $theme['template_name'] . $theme['template_name'] . ".cfg"); // ---------- } --- 47,54 ---- // ********************************************************************** ! if ( file_exists( $module_root_path . "templates/" . $theme['template_name'] . '/' . $theme['template_name'] . ".cfg" ) ) { // ---------- ! include($module_root_path . "templates/" . $theme['template_name'] . '/' . $theme['template_name'] . ".cfg"); // ---------- } |
|
From: OryNider <ory...@us...> - 2007-08-28 23:01:45
|
Update of /cvsroot/mxbb/mx_music/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25581 Modified Files: music_cat_xs.tpl music_page_body.tpl Log Message: Just in case the user add a url for a image. Index: music_page_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_page_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_page_body.tpl 6 Jun 2007 20:40:59 -0000 1.1 --- music_page_body.tpl 28 Aug 2007 23:01:26 -0000 1.2 *************** *** 175,178 **** --- 175,182 ---- <!-- END qt --> + <!-- BEGIN img --> + <img src="{SONG_URL}" id="image" type="image" width="425" height="350" alt=""> + <!-- END img --> + </td> <td rowspan="2" class="row1"><table width="90%" height="90%" border="0" align="center" cellpadding="3" cellspacing="2"> Index: music_cat_xs.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_cat_xs.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_cat_xs.tpl 25 Aug 2007 03:30:27 -0000 1.2 --- music_cat_xs.tpl 28 Aug 2007 23:01:26 -0000 1.3 *************** *** 193,196 **** --- 193,201 ---- </object> <!-- ENDIF --> + + <!-- IF song_detail.S_ROW_TYPE eq img --> + <img src="{song_detail.SONG_URL}" id="image" type="image" width="425" height="350" alt=""> + <!-- ENDIF --> + </td> </tr> |
|
From: OryNider <ory...@us...> - 2007-08-28 23:01:21
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25524 Modified Files: music_cat.php music_page.php Log Message: Just in case the user add a url for a image. Index: music_page.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_page.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_page.php 25 Aug 2007 00:15:14 -0000 1.3 --- music_page.php 28 Aug 2007 23:01:09 -0000 1.4 *************** *** 288,291 **** --- 288,297 ---- $url_video = $url_download; } + else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) + { + $template->assign_block_vars('img', array()); + $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; + } else if( ($song_filetype == 'pls') && !empty($thissong['song_url']) ) { Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_cat.php 25 Aug 2007 03:30:27 -0000 1.4 --- music_cat.php 28 Aug 2007 23:01:09 -0000 1.5 *************** *** 458,461 **** --- 458,468 ---- $row_type = 'qt'; } + else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) + { + $template->assign_block_vars('songrow.img', array()); + $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 == 'pls') && !empty($thissong['song_url']) ) { |
|
From: Jon O. <jon...@us...> - 2007-08-27 16:44:23
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4601 Modified Files: Tag: core28x mx_blockcp_admin_body.tpl Log Message: Solved issues reported in the BT is commited. And: - template get_file update, backported from 2.9.x - removed blockCP block select, if not admin Index: mx_blockcp_admin_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/mx_blockcp_admin_body.tpl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** mx_blockcp_admin_body.tpl 5 Sep 2006 19:22:04 -0000 1.9 --- mx_blockcp_admin_body.tpl 26 Aug 2007 19:07:09 -0000 1.9.2.1 *************** *** 1,5 **** ! <!-- dynamic_select --> <script type="text/javascript" src="{MX_DYN_PATH}modules/mx_shared/lib/DynamicOptionList_comp.js"></script> <script id="DYNAMIC_LIST"> window.onload = initDynamicOptionLists; var makeModule = new DynamicOptionList("module_id","function_id","block_id"); --- 1,6 ---- ! <!-- BEGIN dynamic_select --> <script type="text/javascript" src="{MX_DYN_PATH}modules/mx_shared/lib/DynamicOptionList_comp.js"></script> <script id="DYNAMIC_LIST"> + <!-- window.onload = initDynamicOptionLists; var makeModule = new DynamicOptionList("module_id","function_id","block_id"); *************** *** 7,11 **** --- 8,17 ---- {DYNAMIC_BLOCK_SETUP} {DYNAMIC_DEFAULT_SETUP} + // --> + </script> + <!-- END dynamic_select --> + <script language="javascript" type="text/javascript"> + <!-- function blockcp_getCookie(name) { *************** *** 204,209 **** } </script> - <!-- dynamic_select --> <!-- BEGIN mx_blockcp --> --- 210,215 ---- } + // --> </script> <!-- BEGIN mx_blockcp --> *************** *** 217,221 **** <p>{L_EXPLAIN}</p> ! <!-- dynamic_select --> <form name="DYNAMIC_LIST" method="post" action="{S_ACTION}"> <table width="100%" cellpadding="2" cellspacing="0" border="0"> --- 223,227 ---- <p>{L_EXPLAIN}</p> ! <!-- BEGIN dynamic_select --> <form name="DYNAMIC_LIST" method="post" action="{S_ACTION}"> <table width="100%" cellpadding="2" cellspacing="0" border="0"> *************** *** 255,259 **** </table> </form> ! <!-- dynamic_select --> {POST_PREVIEW_BOX} --- 261,265 ---- </table> </form> ! <!-- END dynamic_select --> {POST_PREVIEW_BOX} |
|
From: Jon O. <jon...@us...> - 2007-08-27 15:44:23
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4193 Modified Files: Tag: core28x mx_blockcp.php Log Message: Solved issues reported in the BT is commited. And: - template get_file update, backported from 2.9.x - removed blockCP block select, if not admin Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** mx_blockcp.php 5 May 2007 20:13:37 -0000 1.17 --- mx_blockcp.php 26 Aug 2007 19:06:56 -0000 1.17.2.1 *************** *** 213,218 **** // Load Dynamic Block Navigation // ! $mx_dynamic_select = new mx_dynamic_select(); ! $mx_dynamic_select->generate($block_id); // --- 213,222 ---- // Load Dynamic Block Navigation // ! if ($is_admin) ! { ! $mx_dynamic_select = new mx_dynamic_select(); ! $mx_dynamic_select->generate($block_id); ! $blockcptemplate->assign_block_vars('dynamic_select', array()); ! } // |
|
From: OryNider <ory...@us...> - 2007-08-27 15:11:05
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16004/includes Modified Files: music_cat.php Log Message: This will add a switch for mx_xs :P Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** music_cat.php 25 Aug 2007 00:15:14 -0000 1.3 --- music_cat.php 25 Aug 2007 03:30:27 -0000 1.4 *************** *** 9,13 **** */ ! // MX if ( !defined('IN_PORTAL') ) { --- 9,13 ---- */ ! //mxBB if ( !defined('IN_PORTAL') ) { *************** *** 17,25 **** $music_root_path = $module_root_path . 'music_box/'; - // - // Get general music information - // - include_once($music_root_path . 'music_common.'.$phpEx); - // ------------------------------------ // Check the request --- 17,20 ---- *************** *** 82,86 **** // - // ------------------------------------ // Check permissions --- 77,80 ---- *************** *** 97,100 **** --- 91,95 ---- } } + if ( $auth_data['upload'] ) { *************** *** 106,110 **** // - // ------------------------------------ // Build Auth List --- 101,104 ---- *************** *** 132,136 **** $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } - // // END Auth List --- 126,129 ---- *************** *** 183,187 **** // - // ------------------------------------ // Build the thumbnail page --- 176,179 ---- *************** *** 350,354 **** } - for ($i = 0; $i < count($songrow); $i += $music_config['cols_per_page']) { --- 342,345 ---- *************** *** 444,447 **** --- 435,439 ---- $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' ) *************** *** 450,453 **** --- 442,446 ---- $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' ) *************** *** 456,459 **** --- 449,453 ---- $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' ) *************** *** 462,465 **** --- 456,460 ---- $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 == 'pls') && !empty($thissong['song_url']) ) *************** *** 469,472 **** --- 464,468 ---- $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; + $row_type = 'media'; } else if(!empty($thissong['song_url'])) *************** *** 541,544 **** --- 537,541 ---- $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $row_type = 'flashvideo'; } else *************** *** 548,551 **** --- 545,549 ---- $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Watch'] : 'Watch URL' ); + $row_type = 'youtube'; } } *************** *** 556,559 **** --- 554,558 ---- $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); + $row_type = 'youtube'; } } *************** *** 565,568 **** --- 564,568 ---- { $template->assign_block_vars('songrow.flashvideo', array()); + $row_type = 'flashvideo'; } else *************** *** 572,575 **** --- 572,576 ---- 'SONG_URL' => $thissong['song_url'] )); + $row_type = 'youtube'; } *************** *** 590,593 **** --- 591,595 ---- $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; + $row_type = 'flashvideo'; } else *************** *** 598,601 **** --- 600,604 ---- $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'; } *************** *** 610,613 **** --- 613,617 ---- $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; + $row_type = 'flashvideo'; } else *************** *** 618,621 **** --- 622,626 ---- $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); + $row_type = 'youtube'; } } *************** *** 633,636 **** --- 638,642 ---- $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; + $row_type = 'flashvideo'; } else *************** *** 641,644 **** --- 647,651 ---- $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'; } } *************** *** 650,653 **** --- 657,661 ---- $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'; } *************** *** 659,662 **** --- 667,671 ---- $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; + $row_type = 'media'; } } *************** *** 667,670 **** --- 676,680 ---- $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; + $row_type = 'media'; } *************** *** 686,689 **** --- 696,703 ---- 'POSTER' => $song_poster, + 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), + + 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), + 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), *************** *** 702,707 **** 'LOCK' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '' ! ) ); } --- 716,722 ---- 'LOCK' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', ! ! 'S_ROW_TYPE' => $row_type) ); } *************** *** 722,726 **** // - // ------------------------------------ // Build Jumpbox - based on $catrows which was created at the top of this file --- 737,740 ---- *************** *** 742,746 **** // - // ------------------------------------ // additional sorting options --- 756,759 ---- *************** *** 766,771 **** } - - // // Start output of page --- 779,782 ---- *************** *** 777,783 **** } ! $template->set_filenames(array( ! 'body' => 'music_cat_body.tpl') ! ); $template->assign_vars(array( --- 788,803 ---- } ! if(empty($template->xs_version)) ! { ! $template->set_filenames(array( ! 'body' => 'music_cat_body.tpl') ! ); ! } ! else ! { ! $template->set_filenames(array( ! 'body' => 'music_cat_xs.tpl') ! ); ! } $template->assign_vars(array( *************** *** 805,809 **** 'L_COMMENTS' => $lang['Comments'], - 'MUSIC_JUMPBOX' => $music_jumpbox, --- 825,828 ---- *************** *** 845,852 **** 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), 'S_AUTH_LIST' => $auth_list) ); - // // Generate the page --- 864,873 ---- 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), + 'WIDTH' => ( !empty($media_width) ? $media_width : '228' ), + 'HEIGHT' => ( !empty($media_height) ? $media_height : '300' ), + 'S_AUTH_LIST' => $auth_list) ); // // Generate the page *************** *** 859,866 **** } - // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | // +------------------------------------------------------+ ?> \ No newline at end of file --- 880,889 ---- } // +------------------------------------------------------+ // | Powered by Music Online 2.0 (c) 2003 Cf Manager | // +------------------------------------------------------+ + // + // That's all Folks! + // -------------------- ?> \ No newline at end of file |
|
From: OryNider <ory...@us...> - 2007-08-27 15:10:38
|
Update of /cvsroot/mxbb/mx_glance In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10966 Modified Files: db_install.php db_upgrade.php mx_glance.php Log Message: topic status: hot or not, fix Index: mx_glance.php =================================================================== RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_glance.php 12 Aug 2007 18:46:01 -0000 1.8 --- mx_glance.php 25 Aug 2007 17:25:04 -0000 1.9 *************** *** 135,139 **** // MESSAGE TRACKING // if ( !isset($tracking_topics) && $recent_track ) $tracking_topics = $mx_request_vars->request($board_config['cookie_name'] . '_t', '', false, true); ! if ( !isset($tracking_topics) && $recent_track ) $tracking_topics = isset($_COOKIE[$board_config['cookie_name'] . '_t']) ? true : false; // CHECK FOR BAD WORDS --- 135,146 ---- // MESSAGE TRACKING // if ( !isset($tracking_topics) && $recent_track ) $tracking_topics = $mx_request_vars->request($board_config['cookie_name'] . '_t', '', false, true); ! if ( !isset($tracking_topics) && $recent_track ) ! { ! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); ! } ! else ! { ! $tracking_topics = array(); ! } // CHECK FOR BAD WORDS *************** *** 581,586 **** } ! $topic_poster = ($latest_news[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_news[$i]['author_username'] . '</span></a> '; $topic_poster_full = $topic_poster; } --- 588,598 ---- } ! $topic_autor_id = append_sid(PHPBB_URL . 'profile.php?mode=viewprofile&u=' . $latest_news[$i]['user_id']); ! $topic_autor = $latest_news[$i]['username']; ! ! $topic_poster = ($latest_news[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_news[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_news[$i]['author_username'] . '</span></a> '; $topic_poster_full = $topic_poster; + + $topic_replies = $latest_news[$i]['topic_replies']; } *************** *** 633,641 **** 'TOPIC_POSTER' => $topic_poster, 'TOPIC_VIEWS' => $latest_news[$i]['topic_views'], ! 'TOPIC_REPLIES' => $latest_news[$i]['topic_replies'], 'LAST_POSTER' => $last_poster, 'LAST_POSTER_COLOUR' => $last_poster_color, 'LAST_POSTER_FULL' => $last_poster_full, ! 'TOPIC_AUTHOR' => $topic_poster, 'TOPIC_AUTHOR_COLOUR' => $topic_poster_color, 'TOPIC_AUTHOR_FULL' => $topic_poster_full, --- 645,654 ---- 'TOPIC_POSTER' => $topic_poster, 'TOPIC_VIEWS' => $latest_news[$i]['topic_views'], ! 'TOPIC_REPLIES' => $topic_replies, 'LAST_POSTER' => $last_poster, 'LAST_POSTER_COLOUR' => $last_poster_color, 'LAST_POSTER_FULL' => $last_poster_full, ! 'TOPIC_AUTOR_ID' => $topic_autor_id, ! 'TOPIC_AUTHOR' => $topic_autor, 'TOPIC_AUTHOR_COLOUR' => $topic_poster_color, 'TOPIC_AUTHOR_FULL' => $topic_poster_full, *************** *** 849,854 **** } ! $topic_poster = ($latest_topics[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_topics[$i]['author_username'] . '</span></a> '; $topic_poster_full = $topic_poster; } --- 862,872 ---- } ! $topic_autor_id = append_sid(PHPBB_URL . 'profile.php?mode=viewprofile&u=' . $latest_topics[$i]['user_id']); ! $topic_autor = $latest_topics[$i]['username']; ! ! $topic_poster = ($latest_topics[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_topics[$i]['author_username'] . '</span></a> '; $topic_poster_full = $topic_poster; + + $topic_replies = $latest_topics[$i]['topic_replies']; } *************** *** 889,898 **** 'TOPIC_TITLE' => $latest_topics[$i]['topic_title'], 'TOPIC_VIEWS' => $latest_topics[$i]['topic_views'], ! 'TOPIC_REPLIES' => $latest_topics[$i]['topic_replies'], 'LAST_POST_TIME' => $last_post_time, 'LAST_POSTER' => $last_poster, 'LAST_POSTER_COLOUR' => $last_poster_color, 'LAST_POSTER_FULL' => $last_poster_full, ! 'TOPIC_AUTHOR' => $topic_poster, 'TOPIC_AUTHOR_COLOUR' => $topic_poster_color, 'TOPIC_AUTHOR_FULL' => $topic_poster_full, --- 907,917 ---- 'TOPIC_TITLE' => $latest_topics[$i]['topic_title'], 'TOPIC_VIEWS' => $latest_topics[$i]['topic_views'], ! 'TOPIC_REPLIES' => $topic_replies, 'LAST_POST_TIME' => $last_post_time, 'LAST_POSTER' => $last_poster, 'LAST_POSTER_COLOUR' => $last_poster_color, 'LAST_POSTER_FULL' => $last_poster_full, ! 'TOPIC_AUTOR_ID' => $topic_autor_id, ! 'TOPIC_AUTHOR' => $topic_autor, 'TOPIC_AUTHOR_COLOUR' => $topic_poster_color, 'TOPIC_AUTHOR_FULL' => $topic_poster_full, Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_glance/db_install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_install.php 12 Jun 2007 11:19:12 -0000 1.2 --- db_install.php 25 Aug 2007 17:25:03 -0000 1.3 *************** *** 31,35 **** } ! $mx_module_version = '2.3.4'; $mx_module_copy = 'mxBB <i> - At A Glance</i> module by blulegend, Jack Kan & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 31,35 ---- } ! $mx_module_version = '2.3.6'; $mx_module_copy = 'mxBB <i> - At A Glance</i> module by blulegend, Jack Kan & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_glance/db_upgrade.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_upgrade.php 12 Jun 2007 11:19:13 -0000 1.2 --- db_upgrade.php 25 Aug 2007 17:25:04 -0000 1.3 *************** *** 31,35 **** } ! $mx_module_version = '2.3.4'; $mx_module_copy = 'mxBB <i> - At A Glace</i> module by blulegend, Jack Kan & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 31,35 ---- } ! $mx_module_version = '2.3.6'; $mx_module_copy = 'mxBB <i> - At A Glace</i> module by blulegend, Jack Kan & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; |
|
From: Jon O. <jon...@us...> - 2007-08-27 15:10:34
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4049/includes Modified Files: Tag: core28x mx_functions_style.php Log Message: Solved issues reported in the BT is commited. And: - template get_file update, backported from 2.9.x - removed blockCP block select, if not admin Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** mx_functions_style.php 6 Aug 2007 22:40:07 -0000 1.17 --- mx_functions_style.php 26 Aug 2007 19:06:41 -0000 1.17.2.1 *************** *** 69,125 **** // ! // Look at mxBB-Module folder... // ! if( file_exists($module_root_path . 'templates/' . $style_path . $filename) ) ! { ! // ! // First check current template ! // ! $filename = $module_root_path . 'templates/' . $style_path . $filename; ! $this->module_template_path = 'templates/' . $style_path; ! } ! else if( file_exists($module_root_path . 'templates/subSilver/' . $filename) ) ! { ! // ! // Then check subSilver ! // ! $filename = $module_root_path . 'templates/subSilver/' . $filename; ! $this->module_template_path = 'templates/subSilver/'; ! } ! else if( file_exists($module_root_path . 'templates/' . $filename) ) { ! // ! // Finally check the tenmplate root (for compatibility with some old modules) ! // ! $filename = $module_root_path . 'templates/' . $filename; ! $this->module_template_path = 'templates/'; } // ! // Look at mxBB-Root folder... // ! else if( file_exists($mx_root_path . 'templates/' . $style_path . $filename) ) { // // First check current template // ! $filename = $mx_root_path . 'templates/' . $style_path . $filename; } ! else if( file_exists($mx_root_path . 'templates/subSilver/' . $filename) ) { // ! // Then check subSilver // ! $filename = $mx_root_path . 'templates/subSilver/' . $filename; } ! /* ! else if( file_exists($mx_root_path . 'templates/' . $filename) ) { // ! // Finally check the template root // ! $filename = $mx_root_path . 'templates/' . $filename; } - */ else if( file_exists( $this->root . '/' . $filename) ) { --- 69,140 ---- // ! // Look at mxBB-Module folder.........................................................................mxBB-module // ! if (!empty($module_root_path)) { ! $this->module_template_path = ''; ! if( file_exists($module_root_path . 'templates/' . $style_path . '/' . $filename) ) ! { ! // ! // First check current template ! // ! $filename = $module_root_path . 'templates/' . $style_path . '/' . $filename; ! $this->module_template_path = 'templates/' . $style_path . '/'; ! } ! else if( file_exists($module_root_path . 'templates/' . $mx_user->cloned_template_name . '/' . $filename) && !empty($mx_user->cloned_template_name)) ! { ! // ! // Then check Cloned template ! // ! $filename = $module_root_path . 'templates/' . $mx_user->cloned_template_name . '/' . $filename; ! $this->module_template_path = 'templates/' . $mx_user->cloned_template_name . '/'; ! } ! if( file_exists($module_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename) ) ! { ! // ! // Then check default template ! // ! $filename = $module_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename; ! $this->module_template_path = 'templates/' . $mx_user->default_template_name . '/'; ! } ! else if( file_exists($module_root_path . 'templates/' . $filename) ) ! { ! // ! // Finally check the template root (for compatibility with some old modules) ! // ! $filename = $module_root_path . 'templates/' . $filename; ! $this->module_template_path = 'templates/'; ! } ! ! if (!empty($this->module_template_path)) ! { ! return $filename; ! } } // ! // Look at mxBB-Root folder.........................................................................mxBB-Root // ! if( file_exists($mx_root_path . 'templates/' . $style_path . '/' . $filename) ) { // // First check current template // ! $filename = $mx_root_path . 'templates/' . $style_path . '/' . $filename; } ! else if( file_exists($mx_root_path . 'templates/' . $mx_user->cloned_template_name . '/' . $filename) && !empty($mx_user->cloned_template_name)) { // ! // Then check Cloned template // ! $filename = $mx_root_path . 'templates/' . $mx_user->cloned_template_name . '/' . $filename; } ! else if( file_exists($mx_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename) ) { // ! // Then check Cloned template // ! $filename = $mx_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename; } else if( file_exists( $this->root . '/' . $filename) ) { *************** *** 129,147 **** { // ! // Look at phpBB-Root folder... // ! if( file_exists($phpbb_root_path . 'templates/' . $style_path . $filename) ) { // // First check current template // ! $filename = $phpbb_root_path . 'templates/' . $style_path . $filename; } ! else if( file_exists($phpbb_root_path . 'templates/subSilver/' . $filename) ) { // ! // Then check subSilver // ! $filename = $phpbb_root_path . 'templates/subSilver/' . $filename; } else if( file_exists($phpbb_root_path . $this->root . '/' . $filename) ) --- 144,162 ---- { // ! // phpBB.........................................................................phpBB // ! if( file_exists($phpbb_root_path . 'templates/' . $style_path . '/' . $filename) ) { // // First check current template // ! $filename = $phpbb_root_path . 'templates/' . $style_path . '/' . $filename; } ! else if( file_exists($phpbb_root_path . 'templates/' . $mx_user->cloned_template_name . '/' . $filename) && !empty($mx_user->cloned_template_name)) { // ! // Then check Cloned // ! $filename = $phpbb_root_path . 'templates/' . $mx_user->cloned_template_name . '/' . $filename; } else if( file_exists($phpbb_root_path . $this->root . '/' . $filename) ) *************** *** 156,160 **** if( substr($filename, 0, 1) != '/' ) { ! $filename = ($rp_filename = phpbb_realpath($this->root . '/' . $filename)) ? $rp_filename : $filename; } } --- 171,175 ---- if( substr($filename, 0, 1) != '/' ) { ! $filename = ($rp_filename = phpBB2::phpbb_realpath($this->root . '/' . $filename)) ? $rp_filename : $filename; } } *************** *** 417,420 **** --- 432,441 ---- } + if (!$init_style) + { + $init_style = 1; + $init_override = 1; + } + // // Setup demo style *************** *** 681,684 **** --- 702,707 ---- $current_template_path = $module_root_path . $this->current_template_path; $cloned_template_path = $module_root_path . $this->cloned_current_template_path; + $default_template_path = $module_root_path . $this->default_current_template_path; + $template_name = $this->template_name; |
|
From: Jon O. <jon...@us...> - 2007-08-27 15:10:26
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4049 Modified Files: Tag: core28x login.php Log Message: Solved issues reported in the BT is commited. And: - template get_file update, backported from 2.9.x - removed blockCP block select, if not admin Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -C2 -d -r1.23 -r1.23.2.1 *** login.php 5 May 2007 20:12:57 -0000 1.23 --- login.php 26 Aug 2007 19:06:42 -0000 1.23.2.1 *************** *** 22,25 **** --- 22,30 ---- // + // Page selector + // + $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); + + // // Start session, user and style (template + theme) management // - populate $userdata, $lang, $theme, $images and initiate $template. *************** *** 27,30 **** --- 32,40 ---- $mx_user->init($user_ip, PAGE_LOGIN); + // + // Load and instatiate CORE (page) and block classes + // + $mx_page->init( $page_id ); + // session id check if (!empty($HTTP_POST_VARS['sid']) || !empty($HTTP_GET_VARS['sid'])) |
|
From: Jon O. <jon...@us...> - 2007-08-27 15:08:13
|
Update of /cvsroot/mxbb/core/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24800 Modified Files: Tag: core28x subSilver.cfg Log Message: Support for default template Index: subSilver.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/subSilver.cfg,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** subSilver.cfg 28 Apr 2007 19:44:00 -0000 1.7 --- subSilver.cfg 26 Aug 2007 19:40:33 -0000 1.7.2.1 *************** *** 58,67 **** | - these are very handy paths to ALL kind of phpBB/mxBB graphics \********************************************************************************/ ! $mx_images['mx_graphics']['general'] = $current_template_path . "/images"; ! $mx_images['mx_graphics']['page_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/page_icons" ) ? $current_template_path . "/images/page_icons" : $cloned_template_path . "/images/page_icons"; ! $mx_images['mx_graphics']['block_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/block_icons" ) ? $current_template_path . "/images/block_icons" : $cloned_template_path . "/images/block_icons"; ! $mx_images['mx_graphics']['menu_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/menu_icons" ) ? $current_template_path . "/images/menu_icons" : $cloned_template_path . "/images/menu_icons"; ! $mx_images['mx_graphics']['admin_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/admin_icons" ) ? $current_template_path . "/images/admin_icons" : $cloned_template_path . "/images/admin_icons"; ! $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : $cloned_template_path . "/images"; // --- 58,67 ---- | - these are very handy paths to ALL kind of phpBB/mxBB graphics \********************************************************************************/ ! $mx_images['mx_graphics']['general'] = file_exists( $mx_root_path . $current_template_path . "/images/logo.gif" ) ? $current_template_path . "/images" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/logo.gif" ) ? $cloned_template_path . "/images" : $default_template_path . "/images" ); ! $mx_images['mx_graphics']['page_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/page_icons" ) ? $current_template_path . "/images/page_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/page_icons" ) ? $cloned_template_path . "/images/page_icons" : $default_template_path . "/images/page_icons" ); ! $mx_images['mx_graphics']['block_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/block_icons" ) ? $current_template_path . "/images/block_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/block_icons" ) ? $cloned_template_path . "/images/block_icons" : $default_template_path . "/images/block_icons" ); ! $mx_images['mx_graphics']['menu_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/menu_icons" ) ? $current_template_path . "/images/menu_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/menu_icons" ) ? $cloned_template_path . "/images/menu_icons" : $default_template_path . "/images/menu_icons" ); ! $mx_images['mx_graphics']['admin_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/admin_icons" ) ? $current_template_path . "/images/admin_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/admin_icons" ) ? $cloned_template_path . "/images/admin_icons" : $default_template_path . "/images/admin_icons" ); ! $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); // |
|
From: Jon O. <jon...@us...> - 2007-08-27 15:07:46
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25270 Modified Files: Tag: core28x mysql_schema_upgrade_to_2.8.1.sql Log Message: removed portal_backend Index: mysql_schema_upgrade_to_2.8.1.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_upgrade_to_2.8.1.sql,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** mysql_schema_upgrade_to_2.8.1.sql 23 Jul 2007 21:36:43 -0000 1.4 --- mysql_schema_upgrade_to_2.8.1.sql 26 Aug 2007 19:41:24 -0000 1.4.2.1 *************** *** 31,34 **** # ALTER TABLE mx_table_portal ADD portal_backend varchar(255) default 'phpBB2' AFTER mod_rewrite; - ALTER TABLE mx_table_portal ADD portal_status smallint(2) NOT NULL default '1' AFTER portal_backend; ALTER TABLE mx_table_portal ADD disabled_message varchar(255) default 'We are currenty upgrading this site with latest mxBB software.' AFTER portal_status; --- 31,33 ---- |
|
From: OryNider <ory...@us...> - 2007-08-27 13:58:30
|
Update of /cvsroot/mxbb/mx_music/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18891/lang_english Modified Files: lang_main_music.php Log Message: some lang fixes... Index: lang_main_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_english/lang_main_music.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_main_music.php 1 Aug 2007 23:34:36 -0000 1.2 --- lang_main_music.php 25 Aug 2007 03:36:07 -0000 1.3 *************** *** 154,163 **** // auth_key ! $lang['Music_view_can'] = 'Music_view_can'; ! $lang['Music_view_cannot'] = 'Music_view_cannot'; ! $lang['Music_upload_can'] = 'Music_upload_can'; ! $lang['Music_upload_cannot'] = 'Music_upload_cannot'; ! $lang['Music_download_can'] = 'Music_download_can'; ! $lang['Music_download_cannot'] = 'Music_download_cannot'; ?> \ No newline at end of file --- 154,163 ---- // auth_key ! $lang['Music_view_can'] = 'You can view'; ! $lang['Music_view_cannot'] = 'You can view cannot'; ! $lang['Music_upload_can'] = 'You can upload'; ! $lang['Music_upload_cannot'] = 'You cannot upload'; ! $lang['Music_download_can'] = 'You can download'; ! $lang['Music_download_cannot'] = 'MYou cannot download'; ?> \ No newline at end of file |
|
From: OryNider <ory...@us...> - 2007-08-26 11:24:52
|
Update of /cvsroot/mxbb/mx_music/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16004/templates/subSilver Modified Files: music_cat_xs.tpl Log Message: This will add a switch for mx_xs :P Index: music_cat_xs.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/subSilver/music_cat_xs.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_cat_xs.tpl 25 Aug 2007 00:15:26 -0000 1.1 --- music_cat_xs.tpl 25 Aug 2007 03:30:27 -0000 1.2 *************** *** 38,42 **** <tr> <td width="44%" class="row1" align="center"> ! <!-- BEGIN media --> <SCRIPT LANGUAGE="JavaScript"> var WMP7; --- 38,42 ---- <tr> <td width="44%" class="row1" align="center"> ! <!-- IF song_detail.S_ROW_TYPE eq media --> <SCRIPT LANGUAGE="JavaScript"> var WMP7; *************** *** 154,170 **** } </SCRIPT> ! <!-- END media --> ! <!-- BEGIN 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> ! <!-- END flash --> ! <!-- BEGIN songrow.flashvideo --> <embed src="{song_detail.SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> </embed> ! <!-- END flashvideo --> ! <!-- BEGIN youtube --> <object width="425" height="350"> <param name="movie" value="{song_detail.SONG_URL}"></param> --- 154,170 ---- } </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> *************** *** 173,185 **** </embed> </object> ! <!-- END youtube --> ! <!-- BEGIN 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> ! <!-- END ram --> ! <!-- BEGIN 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}"> --- 173,185 ---- </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}"> *************** *** 192,196 **** </embed> </object> ! <!-- END qt --> </td> </tr> --- 192,196 ---- </embed> </object> ! <!-- ENDIF --> </td> </tr> |
|
From: OryNider <ory...@us...> - 2007-08-26 11:24:26
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16004 Modified Files: db_install.php db_upgrade.php release.txt Log Message: This will add a switch for mx_xs :P Index: release.txt =================================================================== RCS file: /cvsroot/mxbb/mx_music/release.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** release.txt 1 Aug 2007 23:33:27 -0000 1.3 --- release.txt 25 Aug 2007 03:30:26 -0000 1.4 *************** *** 3,7 **** [b][Authors]: Cf Manager, OryNider[/b] ! [b][Version]: 2.0.6 [/b] [b]Designed for mxBB Version: 2.8.0[/b] --- 3,7 ---- [b][Authors]: Cf Manager, OryNider[/b] ! [b][Version]: 2.0.7 [/b] [b]Designed for mxBB Version: 2.8.0[/b] Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_install.php 1 Aug 2007 23:33:26 -0000 1.2 --- db_install.php 25 Aug 2007 03:30:26 -0000 1.3 *************** *** 8,12 **** * */ ! ini_set( 'display_errors', '1' ); define( 'IN_PORTAL', true ); --- 8,12 ---- * */ ! define( 'IN_PORTAL', true ); *************** *** 33,37 **** } ! $mx_module_version = '2.0.6'; $mx_module_copy = 'mxBB <i> - Music Center</i> module by Cf Manager & <a href="http://www.mxbb.net" target="_blank">OryNider</a>'; --- 33,37 ---- } ! $mx_module_version = '2.0.7'; $mx_module_copy = 'mxBB <i> - Music Center</i> module by Cf Manager & <a href="http://www.mxbb.net" target="_blank">OryNider</a>'; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/db_upgrade.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_upgrade.php 1 Aug 2007 23:33:26 -0000 1.2 --- db_upgrade.php 25 Aug 2007 03:30:26 -0000 1.3 *************** *** 30,34 **** } ! $mx_module_version = '2.0.6'; $mx_module_copy = 'mxBB <i> - Music Center</i> module by Cf Manager & <a href="http://www.mxbb.net" target="_blank">OryNider</a>'; $sql = array(); --- 30,34 ---- } ! $mx_module_version = '2.0.7'; $mx_module_copy = 'mxBB <i> - Music Center</i> module by Cf Manager & <a href="http://www.mxbb.net" target="_blank">OryNider</a>'; $sql = array(); |
|
From: OryNider <ory...@us...> - 2007-08-26 11:24:16
|
Update of /cvsroot/mxbb/mx_music/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18891/lang_romanian Modified Files: lang_main_music.php Log Message: some lang fixes... Index: lang_main_music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/language/lang_romanian/lang_main_music.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_main_music.php 1 Aug 2007 23:34:36 -0000 1.2 --- lang_main_music.php 25 Aug 2007 03:36:07 -0000 1.3 *************** *** 160,169 **** // auth_key ! $lang['Music_view_can'] = 'Music_view_can'; ! $lang['Music_view_cannot'] = 'Music_view_cannot'; ! $lang['Music_upload_can'] = 'Music_upload_can'; ! $lang['Music_upload_cannot'] = 'Music_upload_cannot'; ! $lang['Music_download_can'] = 'Music_download_can'; ! $lang['Music_download_cannot'] = 'Music_download_cannot'; ?> \ No newline at end of file --- 160,169 ---- // auth_key ! $lang['Music_view_can'] = 'You can view'; ! $lang['Music_view_cannot'] = 'You can view cannot'; ! $lang['Music_upload_can'] = 'You can upload'; ! $lang['Music_upload_cannot'] = 'You cannot upload'; ! $lang['Music_download_can'] = 'You can download'; ! $lang['Music_download_cannot'] = 'MYou cannot download'; ?> \ No newline at end of file |
|
From: OryNider <ory...@us...> - 2007-08-25 00:15:45
|
Update of /cvsroot/mxbb/mx_music/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22457 Added Files: music_cat_xs.tpl Log Message: Added a more advanced category page that can be enabled manualy for now, and require mx_xs --- NEW FILE: music_cat_xs.tpl --- <form action="{S_MUSIC_ACTION}" method="post"> <table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> <td valign="bottom" width="100%"><a class="maintitle" href="{U_VIEW_CAT}">{CAT_TITLE}</a><br /> <span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span></td> <td align="right" valign="bottom" nowrap="nowrap"><span class="nav">{PAGINATION}</span></td> </tr> </table> <table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> <td> <!-- BEGIN enable_soung_upload --> <a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a> <!-- END enable_soung_upload --> </td> <td class="nav" width="100%"> <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> </tr> </table> <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> <th class="thTop" height="25" align="center" colspan="7" nowrap="nowrap">{L_CATEGORY} :: {CAT_TITLE}</th> </tr> <tr> <td width="31%" align="center" class="catBottom"> <!-- BEGIN songrow --> <!-- BEGIN song_detail --> <table width="100%" cellpadding="2" cellspacing="1" border="0"> <tr> <th height="25" colspan="2" class="thTop"><span class="genmed">{L_SONG_TITLE} :: {song_detail.SONG_TITLE}</span></th> </tr> <tr> <td width="44%" class="row1" align="center"> <!-- BEGIN 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> <!-- END media --> <!-- BEGIN 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> <!-- END flash --> <!-- BEGIN songrow.flashvideo --> <embed src="{song_detail.SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> </embed> <!-- END flashvideo --> <!-- BEGIN 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> <!-- END youtube --> <!-- BEGIN 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> <!-- END ram --> <!-- BEGIN qt --> <object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="377" height="212"> <param name="qtsrc" value="{song_detail.U_SONG}"> <param name="autoplay" value="false"> <param name="loop" value="false"> <param name="controller" value="true"> <param name="kioskmode" value="true"> <param name="cache" value="false"> <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{song_detail.U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="false" kioskmode="true" cache="false"> </embed> </object> <!-- END qt --> </td> </tr> </table> <!-- END song_detail --> </td> </tr> <tr> <td width="31%" align="center" class="catBottom"> <table width="100%" cellpadding="2" cellspacing="1" border="0"> <tr> <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SONG_TITLE} </span></td> <td width="15%" align="center" class="catBottom" height="28"><span class="gen">{L_SINGER} </span></td> <td width="25%" align="center" class="catBottom" height="28"><span class="gen">{L_POSTED} </span></td> <td width="6%" align="center" class="catBottom" height="28"><span class="gen">{L_VIEW} </span></td> <td width="8%" align="center" class="catBottom" height="28"><span class="gen">{L_RATING} </span></td> <td width="10%" align="center" class="catBottom" height="28"><span class="gen">{L_COMMENTS} </span></td> <td width="5%" align="center" class="catBottom" height="28"> </td> </tr> <!-- BEGIN no_songs --> <tr> <td class="row1" align="center" colspan="7" height="50"><span class="gen">{L_NO_SONGS}</span></td> </tr> <!-- END no_songs --> <tr> <!-- BEGIN songcol --> <!-- END songcol --> <!-- BEGIN song_detail --> <td width="31%" align="center" class="row2"><span class="genmed">{songrow.song_detail.TITLE}</span></td> <td width="15%" align="center" class="row1"><span class="genmed">{songrow.song_detail.SINGER}</span></td> <td width="25%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.POSTER}<BR>{songrow.song_detail.TIME}</span></td> <td width="6%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.VIEW}</span></td> <td width="8%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.RATING}</span></td> <td width="10%" align="center" class="row1"><span class="gensmall">{songrow.song_detail.COMMENTS}</span></td> <td width="5%" align="center" class="row2"><span class="gensmall">{songrow.song_detail.EDIT}<BR /> {songrow.song_detail.DELETE}<BR /> {songrow.song_detail.LOCK}<BR /> {songrow.song_detail.MOVE}</span></td> <!-- END song_detail --> </tr> <!-- END songrow --> </table> </td> </tr> <tr> <td class="catBottom" colspan="7" align="center" height="28"> <span class="gensmall">{L_SELECT_SORT_METHOD}: <select name="sort_method"> <option {SORT_TIME} value='song_time'>{L_TIME}</option> <option {SORT_SONG_TITLE} value='song_title'>{L_SONG_TITLE}</option> <option {SORT_SINGER} value='song_singer'>{L_SINGER}</option> <option {SORT_USERNAME} value='username'>{L_USERNAME}</option> <option {SORT_VIEW} value='song_view_count'>{L_VIEW}</option> {SORT_RATING_OPTION} {SORT_COMMENTS_OPTION} {SORT_NEW_COMMENT_OPTION} </select> {L_ORDER}: <select name="sort_order"> <option {SORT_ASC} value='ASC'>{L_ASC}</option> <option {SORT_DESC} value='DESC'>{L_DESC}</option> </select> <input type="submit" name="submit" value="{L_SORT}" class="liteoption" /> </span> </td> </tr> </table> <table width="100%" cellspacing="2" border="0" cellpadding="2"> <tr> <td> <!-- BEGIN enable_soung_upload --> <a href="{U_UPLOAD_SONG}"><img src="{UPLOAD_SONG_IMG}" border="0" alt="{L_UPLOAD_SONG}" title="{L_UPLOAD_SONG}" /></a> <!-- END enable_soung_upload --> </td> <td class="nav" width="100%"> <span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> {NAV_SEP} <a class="nav" href="{U_MUSIC}">{L_MUSIC}</a> {NAV_SEP} <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a> {NAV_CAT_DESC} </span> </td> <td align="right" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /> <span class="nav">{PAGINATION}</span></td> </tr> <tr> <td colspan="3"><span class="nav">{PAGE_NUMBER}</span></td> </tr> </table> </form> <table width="100%" cellspacing="0" border="0" cellpadding="0"> <tr> <td align="right" class="gensmall" nowrap="nowrap">{MUSIC_JUMPBOX}</td> </tr> <tr> <td align="right" class="gensmall">{S_AUTH_LIST}</td> </tr> </table> <br clear="all" /> <!-- Do not remove my copyright notice and keep visible with its original content! --> {MUSIC_COPYRIGHT} |
|
From: OryNider <ory...@us...> - 2007-08-25 00:15:23
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22425 Modified Files: music_cat.php music_edit.php music_page.php music_upload.php Log Message: Added a more advanced category page that can be enabled manualy for now, and require mx_xs Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_upload.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_upload.php 1 Aug 2007 23:33:28 -0000 1.2 --- music_upload.php 25 Aug 2007 00:15:14 -0000 1.3 *************** *** 15,53 **** } - // - // 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/'; $song_image_path = $module_root_path . 'upload/song_image/'; - // - // 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 ---- Index: music_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_edit.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_edit.php 1 Aug 2007 23:33:28 -0000 1.2 --- music_edit.php 25 Aug 2007 00:15:14 -0000 1.3 *************** *** 15,53 **** } - // - // 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/'; //Image Edit Added by OryNider $song_image_path = $module_root_path . 'upload/song_image/'; - // - // Get general music information - // - if ( !$is_block ) - { - include($music_root_path . 'music_common.'.$phpEx); - } - else - { - include_once($music_root_path . 'music_common.'.$phpEx); - } - // ------------------------------------ // Check the request --- 15,22 ---- Index: music_page.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_page.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_page.php 1 Aug 2007 23:33:28 -0000 1.2 --- music_page.php 25 Aug 2007 00:15:14 -0000 1.3 *************** *** 31,70 **** } - // - // 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/'; $song_image_path = $module_root_path . 'upload/song_image/'; $song_image_default = $mx_images['no_image']; // The default image - - // - // Get general music information - // - if ( !$is_block ) - { - include($music_root_path . 'music_common.'.$phpEx); - } - else - { - include_once($music_root_path . 'music_common.'.$phpEx); - } - // ------------------------------------ // Check the request --- 31,38 ---- *************** *** 323,327 **** { $template->assign_block_vars('media', array()); ! $url_download = append_sid($module_root_path . 'music.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; --- 291,295 ---- { $template->assign_block_vars('media', array()); ! $url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; *************** *** 515,524 **** { $template->assign_block_vars('media', array()); ! //$url_download = append_sid($module_root_path . 'music.' . $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; } ! //$url_song = append_sid($module_root_path . 'music.' . $phpEx . '?music_mode=music_song&song_id=' . $song_id); $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id)); --- 483,492 ---- { $template->assign_block_vars('media', array()); ! //$url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; } ! //$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)); *************** *** 527,531 **** 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), ! //'U_SONG' => append_sid($module_root_path . 'music.' . $phpEx . '?music_mode=music_song&song_id=' . $song_id), 'U_SONG' => $url_song, --- 495,499 ---- '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, Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** music_cat.php 1 Aug 2007 23:33:27 -0000 1.2 --- music_cat.php 25 Aug 2007 00:15:14 -0000 1.3 *************** *** 15,36 **** } - // - // 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/'; --- 15,18 ---- *************** *** 421,428 **** --- 403,689 ---- } + // ------------------------------------ + // Get this song info + // ------------------------------------ + + $song_id = $songrow[$j]['song_id']; + + $sql = "SELECT s.*, u.user_id, u.username, r.rate_song_id, AVG(r.rate_point) AS rating, COUNT(DISTINCT c.comment_id) AS comments + FROM ". MUSIC_TABLE ." AS s + LEFT JOIN ". USERS_TABLE ." AS u ON s.song_user_id = u.user_id + LEFT JOIN ". MUSIC_RATE_TABLE ." AS r ON s.song_id = r.rate_song_id + LEFT JOIN ". MUSIC_COMMENT_TABLE ." AS c ON s.song_id = c.comment_song_id + WHERE song_id = '$song_id' + GROUP BY s.song_id"; + if( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, 'Could not query song information', '', __LINE__, __FILE__, $sql); + } + $thissong = $db->sql_fetchrow($result); + + $cat_id = $thissong['song_cat_id']; + $user_id = $thissong['song_user_id']; + + if ( $thissong['song_url'] == '' ) + { + $song_filetype = substr($thissong['song_filename'], strlen($thissong['song_filename']) - 3, 3); + $song_filename = ( !empty($thissong['song_filename']) ? $thissong['song_filename'] : '' ); + } + else + { + $song_filetype = substr($thissong['song_url'], strlen($thissong['song_url']) - 3, 3); + $song_url = $thissong['song_url']; + } + + // + // Media Center + // + if ( $song_filetype == 'swf' ) + { + $template->assign_block_vars('songrow.flash', array()); + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + } + else if ( $song_filetype == 'ram' ) + { + $template->assign_block_vars('songrow.ram', array()); + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + } + else if ( $song_filetype == '.rm' ) + { + $template->assign_block_vars('songrow.rm', array()); + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + } + else if ( $song_filetype == '.qt' ) + { + $template->assign_block_vars('songrow.qt', array()); + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); + $url_video = $url_download; + } + else if( ($song_filetype == 'pls') && !empty($thissong['song_url']) ) + { + $template->assign_block_vars('songrow.media', array()); + $url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); + $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); + $url_video = $url_download; + } + else if(!empty($thissong['song_url'])) + { + $host = explode("//", $thissong['song_url']); + $host = $host[1]; + $host = explode("/", $host); + $domain = $host[0]; + $counthost = count($host) - 1; + $docid2 = $host[$counthost]; + + // $domaintmp = explode(".", $domain, -1); // Php 5 only + // $sitename = implode(".", $domaintmp); + + if( !function_exists('mx_music_sitename') ) + { + function mx_music_sitename($domain) { + $domaintmp = explode(".", $domain); + + $y = count($domaintmp) - 1; + $r = ""; + for ($a = 0; $y > $a; $a++) { + $r .= ".".$domaintmp[$a]; + } + return $r; + } + } + + $sitename = substr(mx_music_sitename($domain), 1); + + if( !function_exists('mx_music_sitesufix') ) + { + function mx_music_sitesufix($domain) { + $domaintmp = explode(".", $domain); + + $y = count($domaintmp) - 1; + $r = $domaintmp[$y];; + return $r; + } + } + + $sitesufix = mx_music_sitesufix($domain); + + if (!empty($sitesufix) ) + { + if ($sitesufix == 'de') + { + $sitelngprefix = 'de.'; + } + else + { + $sitelngprefix = 'en.'; + } + } + else + { + $sitelngprefix = ''; + } + + if ($sitename == 'video.google') + { + $videoid['song_url'] = explode("-", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + $docid['song_url'] = explode("?", $thissong['song_url']); + + if (empty($docid['song_url'][1]) ) + { + $template->assign_block_vars('songrow.flashvideo', array()); + $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); + $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + $url_video = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?' . $docid['song_url'][1] : $thissong['song_url'] ); + $url_download = ( !empty($docid['song_url'][1]) ? 'http://' . $domain . '/videoplay?' . $docid['song_url'][1] : $thissong['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Watch'] : 'Watch URL' ); + } + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/googleplayer.swf?docId=-' . $videoid['song_url'][1] : $thissong['song_url'] ); + $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplay?docid=-' . $videoid['song_url'][1] : $thissong['song_url'] ); + $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); + } + } + else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') ) + { + $videoid['song_url'] = explode("=", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + $template->assign_block_vars('songrow.flashvideo', array()); + } + else + { + $template->assign_block_vars('songrow.youtube', array( + 'VIDEO_URL' => 'http://' . $domain . '/v/' . $videoid['song_url'][1], + 'SONG_URL' => $thissong['song_url'] + )); + } + + $url_download = append_sid($thissong['song_url']); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/v/' . $videoid['song_url'][1] : $url_download ); + } + else if ( ($sitename == 'www.clipfish') || ($sitename == 'clipfish') ) + { + $thisvid['song_url'] = explode("videoid", $thissong['song_url']); + $videoid['song_url'] = explode("=", $thisvid['song_url'][1]); + + if (empty($videoid['song_url'][1]) ) + { + $template->assign_block_vars('songrow.flashvideo', array()); + + $url_download = append_sid($thissong['song_url']); + $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); + $url_video = $url_download; + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + + $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player.php?videoid=' . $videoid['song_url'][1] : $thissong['song_url'] ); + $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/videoplayer.swf?as=0&videoid=' . $videoid['song_url'][1] : $url_download ); + } + + } + else if ( ($sitename == 'www.myvideo') || ($sitename == 'myvideo') ) + { + if (empty($docid2) ) + { + $template->assign_block_vars('songrow.flashvideo', array()); + + $url_download = append_sid($thissong['song_url']); + $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); + $url_video = $url_download; + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + + $url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $thissong['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); + } + } + else if ( ($sitename == 'de.sevenload') || ($sitename == 'sevenload') || ($sitename == 'page.sevenload') || ($sitename == 'www.sevenload') ) + { + $videoid['song_url'] = explode("=", $thissong['song_url']); + + if (empty($videoid['song_url'][1]) ) + { + if (empty($docid2) ) + { + $template->assign_block_vars('songrow.flashvideo', array()); + + $url_download = append_sid($thissong['song_url']); + $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); + $url_video = $url_download; + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + + $url_download = ( !empty($docid2) ? 'http://' . $sitelngprefix . 'sevenload.' . 'com' . '/videos/' . $docid2 : $thissong['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); + } + } + else + { + $template->assign_block_vars('songrow.youtube', array()); + + $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $sitelngprefix . 'sevenload.'. 'com' . '/videos/' . $videoid['song_url'][1] : $thissong['song_url'] ); + $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); + $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download ); + } + + } + else + { + $template->assign_block_vars('songrow.media', array()); + $url_download = append_sid($thissong['song_url']); + $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); + $url_video = $url_download; + } + } + else + { + $template->assign_block_vars('songrow.media', array()); + //$url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); + $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); + $url_video = $url_download; + } + + $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $song_id)); + $template->assign_block_vars('songrow.song_detail', array( 'TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', + + 'U_SONG' => $url_song, + + 'SONG_TITLE' => $thissong['song_title'], + + 'SONG_URL' => $thissong['song_url'], + + 'VIDEO_URL' => $url_video, + 'SINGER' => $songrow[$j]['song_singer'], + 'POSTER' => $song_poster, + 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), |
|
From: OryNider <ory...@us...> - 2007-08-21 04:09:36
|
Update of /cvsroot/mxbb/mx_smartor/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15631 Modified Files: album_jupload.php Log Message: ... Index: album_jupload.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_jupload.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_jupload.php 7 Jun 2007 20:13:32 -0000 1.1 --- album_jupload.php 21 Aug 2007 04:09:24 -0000 1.2 *************** *** 21,25 **** - // Get general album information if (!isset($album_root_path) || empty($album_root_path)) { --- 21,24 ---- *************** *** 27,36 **** } - // // Get general album information // ! include_once($album_root_path . 'album_common.'.$phpEx); // ------------------------------------ --- 26,46 ---- } // // Get general album information // ! //include_once($album_root_path . 'album_common.'.$phpEx); + // Get $lang variable + if (!isset($lang['Click_return_album_index']) || empty($lang['Click_return_album_index'])) + { + if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) + { + include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); + } + else + { + include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); + } + } // ------------------------------------ *************** *** 266,269 **** --- 276,280 ---- $file_list[] = $target; } + session_start(); $_SESSION['file_list']= $file_list; |
2 messages has been excluded from this view by a project administrator.
