|
From: Jon O. <jon...@us...> - 2005-10-24 20:16:14
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1103/modules/mx_linkdb/linkdb/includes Modified Files: functions.php functions_linkdb.php functions_linkdb_field.php Log Message: replaced all message_die with mx_message_die Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions.php 1 Oct 2005 14:14:17 -0000 1.3 --- functions.php 24 Oct 2005 20:16:01 -0000 1.4 *************** *** 51,55 **** if ( !$db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Failed to update linkdb configuration for $config_name", "", __LINE__, __FILE__, $sql ); } --- 51,55 ---- if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Failed to update linkdb configuration for $config_name", "", __LINE__, __FILE__, $sql ); } *************** *** 61,65 **** if ( !$db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Failed to update linkdb configuration for $config_name", "", __LINE__, __FILE__, $sql ); } } --- 61,65 ---- if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Failed to update linkdb configuration for $config_name", "", __LINE__, __FILE__, $sql ); } } *************** *** 77,81 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt query linkdb configuration', '', __LINE__, __FILE__, $sql ); } --- 77,81 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt query linkdb configuration', '', __LINE__, __FILE__, $sql ); } *************** *** 111,115 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt rating info for the giving link', '', __LINE__, __FILE__, $sql ); } --- 111,115 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt rating info for the giving link', '', __LINE__, __FILE__, $sql ); } *************** *** 135,139 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query User id', '', __LINE__, __FILE__, $sql ); } --- 135,139 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query User id', '', __LINE__, __FILE__, $sql ); } *************** *** 144,153 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Update Votes Table Info', '', __LINE__, __FILE__, $sql ); } } else { ! message_die( GENERAL_MESSAGE, $lang['Rerror'] ); } --- 144,153 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Update Votes Table Info', '', __LINE__, __FILE__, $sql ); } } else { ! mx_message_die( GENERAL_MESSAGE, $lang['Rerror'] ); } Index: functions_linkdb_field.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_linkdb_field.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functions_linkdb_field.php 1 Oct 2005 14:14:17 -0000 1.2 --- functions_linkdb_field.php 24 Oct 2005 20:16:01 -0000 1.3 *************** *** 36,40 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query Custom field', '', __LINE__, __FILE__, $sql ); } --- 36,40 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query Custom field', '', __LINE__, __FILE__, $sql ); } *************** *** 51,55 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query Custom field', '', __LINE__, __FILE__, $sql ); } --- 51,55 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query Custom field', '', __LINE__, __FILE__, $sql ); } *************** *** 125,129 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not delete custom data', '', __LINE__, __FILE__, $sql ); } } --- 125,129 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete custom data', '', __LINE__, __FILE__, $sql ); } } *************** *** 332,341 **** if ( empty( $field_name ) ) { ! message_die( GENERAL_ERROR, $lang['Missing_field'] ); } if ( ( ( $field_type != INPUT && $field_type != TEXTAREA ) && empty( $data ) ) ) { ! message_die( GENERAL_ERROR, $lang['Missing_field'] ); } --- 332,341 ---- if ( empty( $field_name ) ) { ! mx_message_die( GENERAL_ERROR, $lang['Missing_field'] ); } if ( ( ( $field_type != INPUT && $field_type != TEXTAREA ) && empty( $data ) ) ) { ! mx_message_die( GENERAL_ERROR, $lang['Missing_field'] ); } *************** *** 347,351 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not add the new fields', '', __LINE__, __FILE__, $sql ); } --- 347,351 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not add the new fields', '', __LINE__, __FILE__, $sql ); } *************** *** 358,362 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not set the order for the giving field', '', __LINE__, __FILE__, $sql ); } } --- 358,362 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not set the order for the giving field', '', __LINE__, __FILE__, $sql ); } } *************** *** 369,373 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not update information for the giving field', '', __LINE__, __FILE__, $sql ); } } --- 369,373 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not update information for the giving field', '', __LINE__, __FILE__, $sql ); } } *************** *** 383,387 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not delete custom data', '', __LINE__, __FILE__, $sql ); } --- 383,387 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete custom data', '', __LINE__, __FILE__, $sql ); } *************** *** 391,395 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Could not delete the selected field', '', __LINE__, __FILE__, $sql ); } } --- 391,395 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete the selected field', '', __LINE__, __FILE__, $sql ); } } *************** *** 440,444 **** if ( !$db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not delete data from custom data table', '', __LINE__, __FILE__, $sql ); } --- 440,444 ---- if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete data from custom data table', '', __LINE__, __FILE__, $sql ); } *************** *** 450,454 **** if ( !$db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not add additional data', '', __LINE__, __FILE__, $sql ); } } --- 450,454 ---- if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not add additional data', '', __LINE__, __FILE__, $sql ); } } Index: functions_linkdb.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_linkdb.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functions_linkdb.php 1 Oct 2005 14:14:17 -0000 1.2 --- functions_linkdb.php 24 Oct 2005 20:16:01 -0000 1.3 *************** *** 128,132 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql ); } $cat_rowset = $db->sql_fetchrowset( $result ); --- 128,132 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql ); } $cat_rowset = $db->sql_fetchrowset( $result ); *************** *** 271,275 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql); } --- 271,275 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql); } *************** *** 290,294 **** if ( !($db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql); } } --- 290,294 ---- if ( !($db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql); } } *************** *** 317,321 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql ); } } --- 317,321 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql ); } } *************** *** 366,370 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql ); } --- 366,370 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql ); } *************** *** 381,385 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql ); } } --- 381,385 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql ); } } *************** *** 421,425 **** redirect( append_sid( "login.$phpEx?redirect=$redirect", true ) ); } ! message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' ); } --- 421,425 ---- redirect( append_sid( "login.$phpEx?redirect=$redirect", true ) ); } ! mx_message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' ); } *************** *** 508,512 **** if ( !( $result = $linkdb_functions->sql_query_limit( $sql, $linkdb_config['settings_link_page'], $start ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql ); } --- 508,512 ---- if ( !( $result = $linkdb_functions->sql_query_limit( $sql, $linkdb_config['settings_link_page'], $start ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql ); } *************** *** 526,530 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn\'t get number of file', '', __LINE__, __FILE__, $sql ); } --- 526,530 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t get number of file', '', __LINE__, __FILE__, $sql ); } *************** *** 716,720 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn\'t add a new category', '', __LINE__, __FILE__, $sql ); } } --- 716,720 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t add a new category', '', __LINE__, __FILE__, $sql ); } } *************** *** 727,731 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn\'t Edit this category', '', __LINE__, __FILE__, $sql ); } --- 727,731 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t Edit this category', '', __LINE__, __FILE__, $sql ); } *************** *** 783,787 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query Info', '', __LINE__, __FILE__, $sql ); } --- 783,787 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query Info', '', __LINE__, __FILE__, $sql ); } *************** *** 823,827 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt select files', '', __LINE__, __FILE__, $sql ); } --- 823,827 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt select files', '', __LINE__, __FILE__, $sql ); } *************** *** 842,846 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt select files', '', __LINE__, __FILE__, $sql ); } --- 842,846 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt select files', '', __LINE__, __FILE__, $sql ); } *************** *** 857,861 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt delete files', '', __LINE__, __FILE__, $sql ); } --- 857,861 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt delete files', '', __LINE__, __FILE__, $sql ); } *************** *** 867,871 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt delete custom data', '', __LINE__, __FILE__, $sql ); } --- 867,871 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt delete custom data', '', __LINE__, __FILE__, $sql ); } *************** *** 888,892 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt move files', '', __LINE__, __FILE__, $sql ); } $this->modified( true ); --- 888,892 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt move files', '', __LINE__, __FILE__, $sql ); } $this->modified( true ); *************** *** 908,912 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query Info', '', __LINE__, __FILE__, $sql ); } --- 908,912 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query Info', '', __LINE__, __FILE__, $sql ); } *************** *** 934,938 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt move Sub Category', '', __LINE__, __FILE__, $sql ); } $this->modified( true ); --- 934,938 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt move Sub Category', '', __LINE__, __FILE__, $sql ); } $this->modified( true ); *************** *** 951,955 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not get list of Categories', '', __LINE__, __FILE__, $sql ); } --- 951,955 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not get list of Categories', '', __LINE__, __FILE__, $sql ); } *************** *** 964,968 **** if ( !$db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not update order fields', '', __LINE__, __FILE__, $sql ); } $i += 10; --- 964,968 ---- if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not update order fields', '', __LINE__, __FILE__, $sql ); } $i += 10; *************** *** 983,987 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not change category order', '', __LINE__, __FILE__, $sql ); } --- 983,987 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not change category order', '', __LINE__, __FILE__, $sql ); } *************** *** 1003,1007 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql ); } --- 1003,1007 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query categories info', '', __LINE__, __FILE__, $sql ); } *************** *** 1012,1016 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql ); } if ( $init ) --- 1012,1016 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Query Files info', '', __LINE__, __FILE__, $sql ); } if ( $init ) *************** *** 1096,1100 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql ); } --- 1096,1100 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql ); } *************** *** 1123,1127 **** if ( !( $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql ); } $this->modified( true ); --- 1123,1127 ---- if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt Add the file information to the database', '', __LINE__, __FILE__, $sql ); } $this->modified( true ); |