|
From: Jon O. <jon...@us...> - 2005-10-24 20:18:18
|
Update of /cvsroot/mxbb/mx_profilecp/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692/modules/mx_profilecp/admin Modified Files: admin_board_extend.php admin_lang_extend.php admin_pcp_classesfields.php admin_pcp_tableslinked.php admin_pcp_userfields.php admin_pcp_usermaps.php admin_pcp_valueslist.php Log Message: replaced all message_die with mx_message_die Index: admin_pcp_userfields.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_userfields.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_userfields.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_userfields.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 273,277 **** if ( (!$result = $db->sql_query($sql)) || (!$row = $db->sql_fetchrow($result)) ) { ! message_die(CRITICAL_ERROR, 'Could not query users table informations', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result) ) --- 273,277 ---- if ( (!$result = $db->sql_query($sql)) || (!$row = $db->sql_fetchrow($result)) ) { ! mx_message_die(CRITICAL_ERROR, 'Could not query users table informations', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result) ) *************** *** 417,421 **** if ( (!$result = $db->sql_query($sql)) || (!$row = $db->sql_fetchrow($result)) ) { ! message_die(CRITICAL_ERROR, 'Could not query users table informations', '', __LINE__, __FILE__, $sql); } --- 417,421 ---- if ( (!$result = $db->sql_query($sql)) || (!$row = $db->sql_fetchrow($result)) ) { ! mx_message_die(CRITICAL_ERROR, 'Could not query users table informations', '', __LINE__, __FILE__, $sql); } *************** *** 702,706 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, $error_msg ); } --- 702,706 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, $error_msg ); } *************** *** 719,723 **** $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = empty($sql_result) ? sprintf( ( ($action == 'create') ? $lang['PCP_sql_field_created'] : $lang['PCP_sql_field_modified'] ), '<a href="' . $return_path . '" />', '</a>' ) : $sql_result; ! message_die( GENERAL_MESSAGE, $message ); } else --- 719,723 ---- $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = empty($sql_result) ? sprintf( ( ($action == 'create') ? $lang['PCP_sql_field_created'] : $lang['PCP_sql_field_modified'] ), '<a href="' . $return_path . '" />', '</a>' ) : $sql_result; ! mx_message_die( GENERAL_MESSAGE, $message ); } else *************** *** 731,735 **** if (!$sql_create && !$sql_modify) { ! message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_edit_not_allow']); } --- 731,735 ---- if (!$sql_create && !$sql_modify) { ! mx_message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_edit_not_allow']); } *************** *** 821,825 **** if (!$sql_delete) { ! message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_delete_not_allow']); } --- 821,825 ---- if (!$sql_delete) { ! mx_message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_delete_not_allow']); } *************** *** 828,832 **** $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = empty($sql_result) ? sprintf( $lang['PCP_sql_field_deleted'], '<a href="' . $return_path . '" />', '</a>' ) : $sql_result; ! message_die(GENERAL_MESSAGE, $message); } else --- 828,832 ---- $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = empty($sql_result) ? sprintf( $lang['PCP_sql_field_deleted'], '<a href="' . $return_path . '" />', '</a>' ) : $sql_result; ! mx_message_die(GENERAL_MESSAGE, $message); } else *************** *** 840,844 **** if (!$sql_delete) { ! message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_delete_not_allow']); } --- 840,844 ---- if (!$sql_delete) { ! mx_message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_delete_not_allow']); } *************** *** 980,984 **** // final message $message = $sql_res . ( empty($sql_res) ? '' : '<br /><br />') . $message; ! message_die(GENERAL_MESSAGE, $message); } else --- 980,984 ---- // final message $message = $sql_res . ( empty($sql_res) ? '' : '<br /><br />') . $message; ! mx_message_die(GENERAL_MESSAGE, $message); } else *************** *** 1156,1160 **** if ($error) { ! message_die(GENERAL_MESSAGE, $error_msg); } --- 1156,1160 ---- if ($error) { ! mx_message_die(GENERAL_MESSAGE, $error_msg); } *************** *** 1217,1221 **** $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = sprintf( ( empty($field) ? $lang['PCP_field_created'] : $lang['PCP_field_modified'] ), $sql_message, '<a href="' . $return_path . '"/>', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ($mode == 'edit') --- 1217,1221 ---- $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = sprintf( ( empty($field) ? $lang['PCP_field_created'] : $lang['PCP_field_modified'] ), $sql_message, '<a href="' . $return_path . '"/>', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ($mode == 'edit') Index: admin_pcp_classesfields.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_classesfields.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_classesfields.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_classesfields.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 229,233 **** $return_path = append_sid("./admin_pcp_classesfields.$phpEx"); $message = sprintf( $lang['PCP_classesfields_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) --- 229,233 ---- $return_path = append_sid("./admin_pcp_classesfields.$phpEx"); $message = sprintf( $lang['PCP_classesfields_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) *************** *** 273,277 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 273,277 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 312,316 **** $return_path = append_sid("./admin_pcp_classesfields.$phpEx"); $message = sprintf( ( empty($table) ? $lang['PCP_classesfields_created'] : $lang['PCP_classesfields_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else --- 312,316 ---- $return_path = append_sid("./admin_pcp_classesfields.$phpEx"); $message = sprintf( ( empty($table) ? $lang['PCP_classesfields_created'] : $lang['PCP_classesfields_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else Index: admin_lang_extend.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_lang_extend.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_lang_extend.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_lang_extend.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 525,529 **** // send message $pack_url = append_sid("./admin_lang_extend.$phpEx?mode=pack&pack=" . urlencode($pack_file) . "&level=" . urlencode(($level == 'normal') ? 'normal' : 'admin') ); ! message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_delete_done'], '<a href="' . $pack_url . '">', '</a>')); // back to the liset --- 525,529 ---- // send message $pack_url = append_sid("./admin_lang_extend.$phpEx?mode=pack&pack=" . urlencode($pack_file) . "&level=" . urlencode(($level == 'normal') ? 'normal' : 'admin') ); ! mx_message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_delete_done'], '<a href="' . $pack_url . '">', '</a>')); // back to the liset *************** *** 595,599 **** if ( $error ) { ! message_die(GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); exit; } --- 595,599 ---- if ( $error ) { ! mx_message_die(GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); exit; } *************** *** 615,619 **** $key_url = append_sid("./admin_lang_extend.$phpEx?mode=key&pack=" . urlencode($new_pack) . "&key=" . urlencode($new_main) . "&sub=" . urlencode($new_sub) . "&level=" . urlencode(($new_level == 'normal') ? 'normal' : 'admin') ); $pack_url = append_sid("./admin_lang_extend.$phpEx?mode=pack&pack=" . urlencode($new_pack) . "&level=" . urlencode(($new_level == 'normal') ? 'normal' : 'admin') ); ! message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_update_done'], '<a href="' . $key_url . '">','</a>', '<a href="' . $pack_url . '">', '</a>')); } else --- 615,619 ---- $key_url = append_sid("./admin_lang_extend.$phpEx?mode=key&pack=" . urlencode($new_pack) . "&key=" . urlencode($new_main) . "&sub=" . urlencode($new_sub) . "&level=" . urlencode(($new_level == 'normal') ? 'normal' : 'admin') ); $pack_url = append_sid("./admin_lang_extend.$phpEx?mode=pack&pack=" . urlencode($new_pack) . "&level=" . urlencode(($new_level == 'normal') ? 'normal' : 'admin') ); ! mx_message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_update_done'], '<a href="' . $key_url . '">','</a>', '<a href="' . $pack_url . '">', '</a>')); } else *************** *** 847,851 **** { $main_url = append_sid("./admin_lang_extend.$phpEx"); ! message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_search_no_words'], '<a href="' . $main_url . '">', '</a>') ); exit; } --- 847,851 ---- { $main_url = append_sid("./admin_lang_extend.$phpEx"); ! mx_message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_search_no_words'], '<a href="' . $main_url . '">', '</a>') ); exit; } Index: admin_pcp_usermaps.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_usermaps.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_usermaps.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_usermaps.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 897,901 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 897,901 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 1124,1128 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 1124,1128 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 1154,1158 **** $return_path = append_sid("./admin_pcp_usermaps.$phpEx" . (empty($parent_map) ? '' : "?map=$parent_map") ); $message = sprintf( $lang['PCP_usermaps_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) --- 1154,1158 ---- $return_path = append_sid("./admin_pcp_usermaps.$phpEx" . (empty($parent_map) ? '' : "?map=$parent_map") ); $message = sprintf( $lang['PCP_usermaps_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) *************** *** 1186,1190 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 1186,1190 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 1305,1309 **** $return_path = append_sid("./admin_pcp_usermaps.$phpEx?map=$full_name"); $message = sprintf( ( empty($map) ? $lang['PCP_usermaps_created'] : $lang['PCP_usermaps_modified']), '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else --- 1305,1309 ---- $return_path = append_sid("./admin_pcp_usermaps.$phpEx?map=$full_name"); $message = sprintf( ( empty($map) ? $lang['PCP_usermaps_created'] : $lang['PCP_usermaps_modified']), '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else Index: admin_board_extend.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_board_extend.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_board_extend.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_board_extend.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 215,219 **** // get the real value of board_config $sql = "SELECT * FROM " . CONFIG_TABLE; ! if ( !$result = $db->sql_query($sql) ) message_die(CRITICAL_ERROR, 'Could not query config information', '', __LINE__, __FILE__, $sql); $config = array(); while ($row = $db->sql_fetchrow($result)) --- 215,219 ---- // get the real value of board_config $sql = "SELECT * FROM " . CONFIG_TABLE; ! if ( !$result = $db->sql_query($sql) ) mx_message_die(CRITICAL_ERROR, 'Could not query config information', '', __LINE__, __FILE__, $sql); $config = array(); while ($row = $db->sql_fetchrow($result)) *************** *** 270,274 **** else { ! message_die(GENERAL_ERROR, 'Unknown type of config data : ' . $field_name, '', __LINE__, __FILE__, ''); } break; --- 270,274 ---- else { ! mx_message_die(GENERAL_ERROR, 'Unknown type of config data : ' . $field_name, '', __LINE__, __FILE__, ''); } break; *************** *** 277,281 **** { $message = $error_msg . '<br /><br />' . sprintf($lang['Click_return_config'], '<a href="' . append_sid("./admin_board_extend.$phpEx?menu=$menu_id&mod=$mod_id&msub=$sub_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("./index.$phpEx?pane=right") . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $message); } } --- 277,281 ---- { $message = $error_msg . '<br /><br />' . sprintf($lang['Click_return_config'], '<a href="' . append_sid("./admin_board_extend.$phpEx?menu=$menu_id&mod=$mod_id&msub=$sub_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("./index.$phpEx?pane=right") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } } *************** *** 294,298 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Failed to update general configuration for ' . $field_name, '', __LINE__, __FILE__, $sql); } } --- 294,298 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Failed to update general configuration for ' . $field_name, '', __LINE__, __FILE__, $sql); } } *************** *** 305,309 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Failed to update general configuration for ' . $field_name, '', __LINE__, __FILE__, $sql); } } --- 305,309 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Failed to update general configuration for ' . $field_name, '', __LINE__, __FILE__, $sql); } } *************** *** 312,316 **** // send an update message $message = $lang['Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_config'], '<a href="' . append_sid("./admin_board_extend.$phpEx?menu=$menu_id&mod=$mod_id&msub=$sub_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("./index.$phpEx?pane=right") . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $message); } --- 312,316 ---- // send an update message $message = $lang['Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_config'], '<a href="' . append_sid("./admin_board_extend.$phpEx?menu=$menu_id&mod=$mod_id&msub=$sub_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("./index.$phpEx?pane=right") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } Index: admin_pcp_tableslinked.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_tableslinked.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_tableslinked.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_tableslinked.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 163,167 **** $return_path = append_sid("./admin_pcp_tableslinked.$phpEx"); $message = sprintf( $lang['PCP_tableslinked_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) --- 163,167 ---- $return_path = append_sid("./admin_pcp_tableslinked.$phpEx"); $message = sprintf( $lang['PCP_tableslinked_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) *************** *** 200,204 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 200,204 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 239,243 **** $return_path = append_sid("./admin_pcp_tableslinked.$phpEx"); $message = sprintf( ( empty($table) ? $lang['PCP_tableslinked_created'] : $lang['PCP_tableslinked_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else --- 239,243 ---- $return_path = append_sid("./admin_pcp_tableslinked.$phpEx"); $message = sprintf( ( empty($table) ? $lang['PCP_tableslinked_created'] : $lang['PCP_tableslinked_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else Index: admin_pcp_valueslist.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_valueslist.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_valueslist.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_valueslist.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 272,276 **** $return_path = append_sid("./admin_pcp_valueslist.$phpEx"); $message = sprintf( $lang['PCP_valueslist_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) --- 272,276 ---- $return_path = append_sid("./admin_pcp_valueslist.$phpEx"); $message = sprintf( $lang['PCP_valueslist_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) *************** *** 309,313 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 309,313 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 352,356 **** $return_path = append_sid("./admin_pcp_valueslist.$phpEx"); $message = sprintf( ( empty($vlist) ? $lang['PCP_valueslist_created'] : $lang['PCP_valueslist_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else --- 352,356 ---- $return_path = append_sid("./admin_pcp_valueslist.$phpEx"); $message = sprintf( ( empty($vlist) ? $lang['PCP_valueslist_created'] : $lang['PCP_valueslist_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else |