|
From: Jon O. <jon...@us...> - 2005-10-24 20:16:14
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1103/modules/mx_linkdb/linkdb/modules Modified Files: link_category.php link_link.php link_rate.php link_search.php link_user_upload.php Log Message: replaced all message_die with mx_message_die Index: link_user_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_user_upload.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** link_user_upload.php 1 Oct 2005 14:14:17 -0000 1.2 --- link_user_upload.php 24 Oct 2005 20:16:01 -0000 1.3 *************** *** 60,64 **** ) ); ! message_die( GENERAL_MESSAGE, $message ); } --- 60,64 ---- ) ); ! mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 113,117 **** if ( !$admin_result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Could not query users table", "", __LINE__, __FILE__, $sql ); } --- 113,117 ---- if ( !$admin_result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Could not query users table", "", __LINE__, __FILE__, $sql ); } *************** *** 165,169 **** ) ); ! message_die( GENERAL_MESSAGE, $message ); } --- 165,169 ---- ) ); ! mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 206,210 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn\'t get file info', '', __LINE__, __FILE__, $sql ); } $link_info = $db->sql_fetchrow( $result ); --- 206,210 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info', '', __LINE__, __FILE__, $sql ); } $link_info = $db->sql_fetchrow( $result ); *************** *** 242,246 **** else { ! message_die( GENERAL_MESSAGE, 'Not allowed' ); } } --- 242,246 ---- else { ! mx_message_die( GENERAL_MESSAGE, 'Not allowed' ); } } *************** *** 316,320 **** if ( !$admin_result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Could not query users table", "", __LINE__, __FILE__, $sql ); } --- 316,320 ---- if ( !$admin_result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Could not query users table", "", __LINE__, __FILE__, $sql ); } *************** *** 339,343 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_MESSAGE, $lang['No_such_user'] ); } --- 339,343 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['No_such_user'] ); } *************** *** 356,360 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not find oldest privmsgs (inbox)', '', __LINE__, __FILE__, $sql ); } $old_privmsgs_id = $db->sql_fetchrow( $result ); --- 356,360 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not find oldest privmsgs (inbox)', '', __LINE__, __FILE__, $sql ); } $old_privmsgs_id = $db->sql_fetchrow( $result ); *************** *** 365,369 **** if ( !$db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)' . $sql, '', __LINE__, __FILE__, $sql ); } --- 365,369 ---- if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)' . $sql, '', __LINE__, __FILE__, $sql ); } *************** *** 372,376 **** if ( !$db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql ); } } --- 372,376 ---- if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql ); } } *************** *** 383,387 **** if ( !( $result = $db->sql_query( $sql_info, BEGIN_TRANSACTION ) ) ) { ! message_die( GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info ); } --- 383,387 ---- if ( !( $result = $db->sql_query( $sql_info, BEGIN_TRANSACTION ) ) ) { ! mx_message_die( GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info ); } *************** *** 395,399 **** if ( !$db->sql_query( $sql, END_TRANSACTION ) ) { ! message_die( GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info ); } --- 395,399 ---- if ( !$db->sql_query( $sql, END_TRANSACTION ) ) { ! mx_message_die( GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info ); } *************** *** 405,409 **** if ( !$status = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql ); } } --- 405,409 ---- if ( !$status = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql ); } } Index: link_link.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_link.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** link_link.php 1 Oct 2005 14:14:17 -0000 1.2 --- link_link.php 24 Oct 2005 20:16:01 -0000 1.3 *************** *** 47,51 **** else { ! message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); } --- 47,51 ---- else { ! mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); } *************** *** 57,61 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt select linkdb', '', __LINE__, __FILE__, $sql ); } --- 57,61 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt select linkdb', '', __LINE__, __FILE__, $sql ); } *************** *** 64,68 **** if ( !$file_data = $db->sql_fetchrow( $result ) ) { ! message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); } --- 64,68 ---- if ( !$file_data = $db->sql_fetchrow( $result ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); } *************** *** 82,86 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Update Files table', '', __LINE__, __FILE__, $sql ); } // } --- 82,86 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Update Files table', '', __LINE__, __FILE__, $sql ); } // } Index: link_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_search.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** link_search.php 1 Oct 2005 14:14:17 -0000 1.2 --- link_search.php 24 Oct 2005 20:16:01 -0000 1.3 *************** *** 135,139 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't obtain list of matching users (searching for: $search_author)", "", __LINE__, __FILE__, $sql ); } --- 135,139 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't obtain list of matching users (searching for: $search_author)", "", __LINE__, __FILE__, $sql ); } *************** *** 157,161 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not obtain matched links list', '', __LINE__, __FILE__, $sql ); } --- 157,161 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not obtain matched links list', '', __LINE__, __FILE__, $sql ); } *************** *** 169,173 **** if ( !$total_match_count = count( $search_ids ) ) { ! message_die( GENERAL_MESSAGE, $lang['No_search_match'] ); } } --- 169,173 ---- if ( !$total_match_count = count( $search_ids ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['No_search_match'] ); } } *************** *** 216,220 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not obtain matched links list', '', __LINE__, __FILE__, $sql ); } --- 216,220 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not obtain matched links list', '', __LINE__, __FILE__, $sql ); } *************** *** 309,313 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not obtain link ids', '', __LINE__, __FILE__, $sql ); } --- 309,313 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not obtain link ids', '', __LINE__, __FILE__, $sql ); } *************** *** 322,326 **** else { ! message_die( GENERAL_MESSAGE, $lang['No_search_match'] ); } --- 322,326 ---- else { ! mx_message_die( GENERAL_MESSAGE, $lang['No_search_match'] ); } *************** *** 347,351 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not delete old search id sessions', '', __LINE__, __FILE__, $sql ); } } --- 347,351 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete old search id sessions', '', __LINE__, __FILE__, $sql ); } } *************** *** 378,382 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not insert search results', '', __LINE__, __FILE__, $sql ); } } --- 378,382 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not insert search results', '', __LINE__, __FILE__, $sql ); } } *************** *** 393,397 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql ); } --- 393,397 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql ); } *************** *** 439,443 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql ); } --- 439,443 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql ); } *************** *** 535,539 **** else { ! message_die( GENERAL_MESSAGE, $lang['No_search_match'] ); } } --- 535,539 ---- else { ! mx_message_die( GENERAL_MESSAGE, $lang['No_search_match'] ); } } Index: link_category.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_category.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** link_category.php 1 Oct 2005 14:14:17 -0000 1.2 --- link_category.php 24 Oct 2005 20:16:01 -0000 1.3 *************** *** 49,53 **** else { ! message_die( GENERAL_MESSAGE, $lang['Cat_not_exist'] ); } --- 49,53 ---- else { ! mx_message_die( GENERAL_MESSAGE, $lang['Cat_not_exist'] ); } *************** *** 100,104 **** if ( !isset( $this->cat_rowset[$cat_id] ) ) { ! message_die( GENERAL_MESSAGE, $lang['Cat_not_exist'] ); } --- 100,104 ---- if ( !isset( $this->cat_rowset[$cat_id] ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['Cat_not_exist'] ); } Index: link_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_rate.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** link_rate.php 1 Oct 2005 14:14:17 -0000 1.2 --- link_rate.php 24 Oct 2005 20:16:01 -0000 1.3 *************** *** 44,48 **** if ( !$linkdb_config['allow_vote'] ) { ! message_die( GENERAL_MESSAGE, $lang['Not_allow_vote'] ); } --- 44,48 ---- if ( !$linkdb_config['allow_vote'] ) { ! mx_message_die( GENERAL_MESSAGE, $lang['Not_allow_vote'] ); } *************** *** 53,57 **** else { ! message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); } --- 53,57 ---- else { ! mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); } *************** *** 66,75 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query link info', '', __LINE__, __FILE__, $sql ); } if ( !$link_data = $db->sql_fetchrow( $result ) ) { ! message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); } --- 66,75 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query link info', '', __LINE__, __FILE__, $sql ); } if ( !$link_data = $db->sql_fetchrow( $result ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); } *************** *** 80,84 **** // $redirect = linkdb_this_mxurl("action=rate&link_id=$link_id"); // redirect(append_sid("login.$phpEx?redirect=" . $redirect, true)); ! message_die( GENERAL_MESSAGE, 'not logged in' ); } --- 80,84 ---- // $redirect = linkdb_this_mxurl("action=rate&link_id=$link_id"); // redirect(append_sid("login.$phpEx?redirect=" . $redirect, true)); ! mx_message_die( GENERAL_MESSAGE, 'not logged in' ); } *************** *** 108,112 **** if ( ( $rating <= 0 ) or ( $rating > 10 ) ) { ! message_die( GENERAL_ERROR, 'Bad submited value' ); } --- 108,112 ---- if ( ( $rating <= 0 ) or ( $rating > 10 ) ) { ! mx_message_die( GENERAL_ERROR, 'Bad submited value' ); } *************** *** 118,122 **** $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( linkdb_this_mxurl( 'action=rate&link_id=' . $link_id ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_forum'], '<a href="' . append_sid( 'index.' . $phpEx ) . '">', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else --- 118,122 ---- $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( linkdb_this_mxurl( 'action=rate&link_id=' . $link_id ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_forum'], '<a href="' . append_sid( 'index.' . $phpEx ) . '">', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else |