Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0faacc3
Choose a base ref
...
head repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c125ed
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 2, 2012

  1. Fixes #14341: SOAP API is failing due to PHP errors that are ignored … 

    …by the web app.
    @vboctor
    vboctor committed Jun 2, 2012
    Copy the full SHA
    01b4a04 View commit details

  2. Cleanup SOAP error handler which contained dead code.

    @vboctor
    vboctor committed Jun 2, 2012
    Copy the full SHA
    4c125ed View commit details
Showing with 0 additions and 36 deletions.
  1. +0 −36 api/soap/mc_api.php
36 changes: 0 additions & 36 deletions api/soap/mc_api.php
View file
Original file line number Diff line number Diff line change
@@ -9,17 +9,6 @@
# set up error_handler() as the new default error handling function
set_error_handler( 'mc_error_handler' );

# override some MantisBT configurations
$g_show_detailed_errors = OFF;
$g_stop_on_errors = ON;
$g_display_errors = array(
E_WARNING => 'halt',
E_NOTICE => 'halt',
E_USER_ERROR => 'halt',
E_USER_WARNING => 'halt',
E_USER_NOTICE => 'halt',
);

/**
* Get the MantisConnect webservice version.
*/
@@ -337,14 +326,6 @@ function mci_get_time_tracking_from_note( $p_issue_id, $p_note) {
return db_minutes_to_hhmm($p_note['time_tracking']);
}

/**
* SECURITY NOTE: these globals are initialized here to prevent them
* being spoofed if register_globals is turned on
*/
$g_error_parameters = array();
$g_error_handled = false;
$g_error_proceed_url = null;

# Default error handler
#
# This handler will not receive E_ERROR, E_PARSE, E_CORE_*, or E_COMPILE_*
@@ -354,9 +335,6 @@ function mci_get_time_tracking_from_note( $p_issue_id, $p_note) {
# The others, being system errors, will come with a string in $p_error
#
function mc_error_handler( $p_type, $p_error, $p_file, $p_line, $p_context ) {
global $g_error_parameters, $g_error_handled, $g_error_proceed_url;
global $g_lang_overrides;
global $g_error_send_page_header;
global $l_oServer;

# check if errors were disabled with @ somewhere in this call chain
@@ -365,24 +343,13 @@ function mc_error_handler( $p_type, $p_error, $p_file, $p_line, $p_context ) {
return;
}

$t_lang_pushed = false;

# flush any language overrides to return to user's natural default
if( function_exists( 'db_is_connected' ) ) {
if( db_is_connected() ) {
lang_push( lang_get_default() );
$t_lang_pushed = true;
}
}

$t_short_file = basename( $p_file );
$t_method_array = config_get( 'display_errors' );
if( isset( $t_method_array[$p_type] ) ) {
$t_method = $t_method_array[$p_type];
} else {
$t_method = 'none';
}

# build an appropriate error string
switch( $p_type ) {
case E_WARNING:
@@ -402,19 +369,16 @@ function mc_error_handler( $p_type, $p_error, $p_file, $p_line, $p_context ) {
$t_error_description = error_string( $p_error );
break;
case E_USER_NOTICE:

# used for debugging
$t_error_type = 'DEBUG';
$t_error_description = $p_error;
break;
default:

#shouldn't happen, just display the error just in case
$t_error_type = '';
$t_error_description = $p_error;
}

$t_error_description = $t_error_description;
$t_error_stack = error_get_stack_trace();

error_log("[mantisconnect.php] Error Type: $t_error_type,\nError Description: $t_error_description\nStack Trace:\n$t_error_stack");