|
From: OryNider <ory...@us...> - 2008-01-29 07:49:01
|
Update of /cvsroot/mxbb/mx_music/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12751/admin Modified Files: admin_music_auth.php admin_music_cat.php admin_music_cfg.php admin_music_ext.php Log Message: This upgrade will make mx_music compatible with 2.9 Index: admin_music_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_ext.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_music_ext.php 21 Sep 2007 22:21:55 -0000 1.4 --- admin_music_ext.php 29 Jan 2008 07:48:55 -0000 1.5 *************** *** 85,89 **** if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['music_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_music_config'], "<a href=\"" . append_sid( "admin_music_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 85,89 ---- if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['music_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_music_config'], "<a href=\"" . mx_append_sid( "admin_music_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 114,118 **** $template->assign_vars( array( ! 'S_MUSIC_ACTION' => append_sid( "admin_music_ext.$phpEx" ), 'L_MUSIC_TITLE' => $lang['mx_music_admin'], --- 114,118 ---- $template->assign_vars( array( ! 'S_MUSIC_ACTION' => mx_append_sid( "admin_music_ext.$phpEx" ), 'L_MUSIC_TITLE' => $lang['mx_music_admin'], Index: admin_music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cat.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_music_cat.php 21 Sep 2007 22:21:55 -0000 1.5 --- admin_music_cat.php 29 Jan 2008 07:48:55 -0000 1.6 *************** *** 66,70 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get list of Categories', '', __LINE__, __FILE__, $sql); } --- 66,70 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get list of Categories', '', __LINE__, __FILE__, $sql); } *************** *** 78,82 **** if( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update order fields', '', __LINE__, __FILE__, $sql); } $i += 10; --- 78,82 ---- if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update order fields', '', __LINE__, __FILE__, $sql); } $i += 10; *************** *** 98,102 **** 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_cat.$phpEx"), 'L_MOVE_UP' => $lang['Move_up'], 'L_MOVE_DOWN' => $lang['Move_down'], --- 98,102 ---- 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_cat.$phpEx"), 'L_MOVE_UP' => $lang['Move_up'], 'L_MOVE_DOWN' => $lang['Move_down'], *************** *** 114,118 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) --- 114,118 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) *************** *** 127,131 **** $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>"; } --- 127,131 ---- $colspan = 1; $add_sc = "<td class=\"" . (($i % 2) ? 'row1' : 'row2') . "\" align=\"center\">" . ! "<form action=\"" . mx_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>"; } *************** *** 142,149 **** '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']), ! 'S_EDIT_ACTION' => append_sid("admin_music_cat.$phpEx?action=edit&cat_id=" . $catrow[$i]['cat_id']), ! 'S_DELETE_ACTION' => append_sid("admin_music_cat.$phpEx?action=delete&cat_id=" . $catrow[$i]['cat_id']) ) ); --- 142,149 ---- 'COLSPAN' => $colspan, 'ADD_SC' => $add_sc, ! 'S_MOVE_UP' => mx_append_sid("admin_music_cat.$phpEx?action=move&move=-15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_MOVE_DOWN' => mx_append_sid("admin_music_cat.$phpEx?action=move&move=15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_EDIT_ACTION' => mx_append_sid("admin_music_cat.$phpEx?action=edit&cat_id=" . $catrow[$i]['cat_id']), ! 'S_DELETE_ACTION' => mx_append_sid("admin_music_cat.$phpEx?action=delete&cat_id=" . $catrow[$i]['cat_id']) ) ); *************** *** 171,178 **** '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']) ) ); --- 171,178 ---- 'TITLE' => " " . $subcatrow['cat_title'], 'DESC' => " " . preg_replace("#\n#", "<br> ", $subcatrow['cat_desc']), ! 'S_MOVE_UP' => mx_append_sid("admin_music_cat.$phpEx?action=move&move=-15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_MOVE_UP' => mx_append_sid("admin_music_cat.$phpEx?action=move&move=15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_EDIT_ACTION' => mx_append_sid("admin_music_cat.$phpEx?action=edit&cat_id=" . $subcatrow['cat_id']), ! 'S_DELETE_ACTION' => mx_append_sid("admin_music_cat.$phpEx?action=delete&cat_id=" . $subcatrow['cat_id']) ) ); *************** *** 196,204 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } if( $db->sql_numrows($result) == 0 ) { ! message_die(GENERAL_ERROR, 'The requested category is not existed'); } $catrow = $db->sql_fetchrow($result); --- 196,204 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } if( $db->sql_numrows($result) == 0 ) { ! mx_message_die(GENERAL_ERROR, 'The requested category is not existed'); } $catrow = $db->sql_fetchrow($result); *************** *** 211,215 **** 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], --- 211,215 ---- 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], *************** *** 295,299 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } --- 295,299 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } *************** *** 313,317 **** if( $cat_found == FALSE ) { ! message_die(GENERAL_ERROR, 'The requested category is not existed'); } --- 313,317 ---- if( $cat_found == FALSE ) { ! mx_message_die(GENERAL_ERROR, 'The requested category is not existed'); } *************** *** 328,332 **** $template->assign_vars(array( ! 'S_MUSIC_ACTION' => append_sid("admin_music_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], --- 328,332 ---- $template->assign_vars(array( ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], *************** *** 352,356 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not change category order', '', __LINE__, __FILE__, $sql); } --- 352,356 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not change category order', '', __LINE__, __FILE__, $sql); } *************** *** 358,364 **** // Return a message... ! $message = $lang['Category_changed_order'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } } --- 358,364 ---- // Return a message... ! $message = $lang['Category_changed_order'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } } *************** *** 391,395 **** 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], --- 391,395 ---- 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], *************** *** 473,477 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 473,477 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 484,494 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not create new music Category', '', __LINE__, __FILE__, $sql); } // Return a message... ! $message = $lang['New_category_created'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } } --- 484,494 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not create new music Category', '', __LINE__, __FILE__, $sql); } // Return a message... ! $message = $lang['New_category_created'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } } *************** *** 513,523 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not update this music Category', '', __LINE__, __FILE__, $sql); } // Return a message... ! $message = $lang['Category_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } else if( $HTTP_POST_VARS['mode'] == 'delete' ) --- 513,523 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not update this music Category', '', __LINE__, __FILE__, $sql); } // Return a message... ! $message = $lang['Category_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } else if( $HTTP_POST_VARS['mode'] == 'delete' ) *************** *** 534,538 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music information', '', __LINE__, __FILE__, $sql); } $songrow = array(); --- 534,538 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music information', '', __LINE__, __FILE__, $sql); } $songrow = array(); *************** *** 558,562 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete Ratings information', '', __LINE__, __FILE__, $sql); } --- 558,562 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete Ratings information', '', __LINE__, __FILE__, $sql); } *************** *** 566,570 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete Comments information', '', __LINE__, __FILE__, $sql); } --- 566,570 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete Comments information', '', __LINE__, __FILE__, $sql); } *************** *** 574,578 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete song entries in the DB', '', __LINE__, __FILE__, $sql); } } --- 574,578 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete song entries in the DB', '', __LINE__, __FILE__, $sql); } } *************** *** 583,587 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql); } --- 583,587 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql); } *************** *** 590,596 **** // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } else // Move content... --- 590,596 ---- // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } else // Move content... *************** *** 601,605 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not update this Category content', '', __LINE__, __FILE__, $sql); } --- 601,605 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not update this Category content', '', __LINE__, __FILE__, $sql); } *************** *** 609,613 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql); } --- 609,613 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql); } *************** *** 616,622 **** // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } } --- 616,622 ---- // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } } Index: admin_music_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_auth.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_music_auth.php 21 Sep 2007 22:21:55 -0000 1.4 --- admin_music_auth.php 29 Jan 2008 07:48:55 -0000 1.5 *************** *** 61,65 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get Category list', '', __LINE__, __FILE__, $sql); } --- 61,65 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get Category list', '', __LINE__, __FILE__, $sql); } *************** *** 85,89 **** 'L_MUSIC_AUTH_EXPLAIN' => $lang['Music_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_auth.$phpEx"), 'L_LOOK_UP_CAT' => $lang['Look_up_Category']) ); --- 85,89 ---- 'L_MUSIC_AUTH_EXPLAIN' => $lang['Music_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_auth.$phpEx"), 'L_LOOK_UP_CAT' => $lang['Look_up_Category']) ); *************** *** 119,123 **** 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_auth.$phpEx?cat_id=$cat_id"), ) ); --- 119,123 ---- 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_auth.$phpEx?cat_id=$cat_id"), ) ); *************** *** 130,134 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql); } --- 130,134 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql); } *************** *** 144,148 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get Category information', '', __LINE__, __FILE__, $sql); } --- 144,148 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get Category information', '', __LINE__, __FILE__, $sql); } *************** *** 202,212 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update music config table', '', __LINE__, __FILE__, $sql); } // okay, return a message... ! $message = $lang['Music_Auth_successfully'] . '<br /><br />' . sprintf($lang['Click_return_music_auth'], '<a href="' . append_sid("admin_music_auth.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $message); } } --- 202,212 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update music config table', '', __LINE__, __FILE__, $sql); } // okay, return a message... ! $message = $lang['Music_Auth_successfully'] . '<br /><br />' . sprintf($lang['Click_return_music_auth'], '<a href="' . mx_append_sid("admin_music_auth.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } } Index: admin_music_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cfg.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_music_cfg.php 21 Sep 2007 22:21:55 -0000 1.7 --- admin_music_cfg.php 29 Jan 2008 07:48:55 -0000 1.8 *************** *** 59,63 **** if(!$result = $db->sql_query($sql)) { ! message_die(CRITICAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql); } else --- 59,63 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql); } else *************** *** 78,82 **** if( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Failed to update music configuration for $config_name", "", __LINE__, __FILE__, $sql); } } --- 78,82 ---- if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Failed to update music configuration for $config_name", "", __LINE__, __FILE__, $sql); } } *************** *** 85,91 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Music_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_config'], "<a href=\"" . append_sid("admin_music_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } } --- 85,91 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Music_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_config'], "<a href=\"" . mx_append_sid("admin_music_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } } *************** *** 98,102 **** 'L_MUSIC_CONFIG' => $lang['Music_config'], 'L_MUSIC_CONFIG_EXPLAIN' => $lang['Music_config_explain'], ! 'S_MUSIC_CONFIG_ACTION' => append_sid('admin_music_cfg.'.$phpEx), 'MAX_SONGS' => $new['max_songs'], --- 98,102 ---- 'L_MUSIC_CONFIG' => $lang['Music_config'], 'L_MUSIC_CONFIG_EXPLAIN' => $lang['Music_config_explain'], ! 'S_MUSIC_CONFIG_ACTION' => mx_append_sid('admin_music_cfg.'.$phpEx), 'MAX_SONGS' => $new['max_songs'], |