diff --git a/api/soap/mc_config_api.php b/api/soap/mc_config_api.php index 09aefbad58..e108fd0fb6 100644 --- a/api/soap/mc_config_api.php +++ b/api/soap/mc_config_api.php @@ -9,11 +9,11 @@ function mc_config_get_string( $p_username, $p_password, $p_config_var ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !mci_has_readonly_access( $t_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if( config_is_private( $p_config_var ) ) { diff --git a/api/soap/mc_file_api.php b/api/soap/mc_file_api.php index 6cc4c01d95..5138093f59 100644 --- a/api/soap/mc_file_api.php +++ b/api/soap/mc_file_api.php @@ -160,7 +160,7 @@ function mci_file_get( $p_file_id, $p_type, $p_user_id ) { WHERE id='$p_file_id'"; break; default: - return new soap_fault( 'Client', '', 'Access Denied' ); + return new soap_fault( 'Server', '', 'Invalid file type '.$p_type. ' .' ); } $result = db_query( $query ); @@ -184,16 +184,16 @@ function mci_file_get( $p_file_id, $p_type, $p_user_id ) { switch( $p_type ) { case 'bug': if( !mci_file_can_download_bug_attachments( $t_bug_id, $p_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } break; case 'doc': # Check if project documentation feature is enabled. if( OFF == config_get( 'enable_project_documentation' ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if( !access_has_project_level( config_get( 'view_proj_doc_threshold' ), $t_project_id, $p_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } break; } diff --git a/api/soap/mc_filter_api.php b/api/soap/mc_filter_api.php index 72324e4b10..d0ba84282e 100644 --- a/api/soap/mc_filter_api.php +++ b/api/soap/mc_filter_api.php @@ -17,10 +17,10 @@ function mc_filter_get( $p_username, $p_password, $p_project_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_result = array(); foreach( mci_filter_db_get_available_queries( $p_project_id, $t_user_id ) as $t_filter_row ) { @@ -50,10 +50,10 @@ function mc_filter_get_issues( $p_username, $p_password, $p_project_id, $p_filte $t_user_id = mci_check_login( $p_username, $p_password ); $t_lang = mci_get_user_lang( $t_user_id ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_page_count = 0; @@ -136,10 +136,10 @@ function mc_filter_get_issues( $p_username, $p_password, $p_project_id, $p_filte function mc_filter_get_issue_headers( $p_username, $p_password, $p_project_id, $p_filter_id, $p_page_number, $p_per_page ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_page_count = 0; diff --git a/api/soap/mc_issue_api.php b/api/soap/mc_issue_api.php index db23f69951..2f35dfa111 100644 --- a/api/soap/mc_issue_api.php +++ b/api/soap/mc_issue_api.php @@ -19,7 +19,7 @@ function mc_issue_exists( $p_username, $p_password, $p_issue_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !bug_exists( $p_issue_id ) ) { @@ -48,16 +48,16 @@ function mc_issue_get( $p_username, $p_password, $p_issue_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); $t_lang = mci_get_user_lang( $t_user_id ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !bug_exists( $p_issue_id ) ) { - return new soap_fault( 'Server', '', 'Issue does not exist' ); + return new soap_fault( 'Client', '', 'Issue does not exist.' ); } $t_project_id = bug_get_field( $p_issue_id, 'project_id' ); if( !mci_has_readonly_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_bug = bug_get( $p_issue_id, true ); @@ -128,7 +128,7 @@ function mci_issue_set_custom_fields( $p_issue_id, &$p_custom_fields, $p_log_ins $t_custom_field_id = mci_get_custom_field_id_from_objectref( $t_custom_field['field'] ); if( $t_custom_field_id == 0 ) { - return new soap_fault( 'Client', '', 'Custom field ' . $t_custom_field['field']['name'] . ' not found' ); + return new soap_fault( 'Client', '', 'Custom field ' . $t_custom_field['field']['name'] . ' not found.' ); } # skip if current user doesn't have login access. @@ -139,11 +139,11 @@ function mci_issue_set_custom_fields( $p_issue_id, &$p_custom_fields, $p_log_ins $t_value = $t_custom_field['value']; if( !custom_field_validate( $t_custom_field_id, $t_value ) ) { - return new soap_fault( 'Client', '', 'Invalid custom field value for field id ' . $t_custom_field_id ); + return new soap_fault( 'Client', '', 'Invalid custom field value for field id ' . $t_custom_field_id . ' .'); } if( !custom_field_set_value( $t_custom_field_id, $p_issue_id, $t_value, $p_log_insert ) ) { - return new soap_fault( 'Server', '', 'Unable to set custom field value for field id ' . $t_custom_field_id . ' to issue ' . $p_issue_id ); + return new soap_fault( 'Server', '', 'Unable to set custom field value for field id ' . $t_custom_field_id . ' to issue ' . $p_issue_id. ' .' ); } } } @@ -291,7 +291,7 @@ function mci_issue_get_notes( $p_issue_id ) { function mc_issue_get_biggest_id( $p_username, $p_password, $p_project_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_any = defined( 'META_FILTER_ANY' ) ? META_FILTER_ANY : 'any'; @@ -349,7 +349,7 @@ function mc_issue_get_biggest_id( $p_username, $p_password, $p_project_id ) { } if( !mci_has_readonly_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_rows = filter_get_bug_rows( $t_page_number, $t_per_page, $t_page_count, $t_bug_count, $t_filter, $t_project_id, $t_user_id ); @@ -371,7 +371,7 @@ function mc_issue_get_biggest_id( $p_username, $p_password, $p_project_id ) { function mc_issue_get_id_from_summary( $p_username, $p_password, $p_summary ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_bug_table = db_get_table( 'bug' ); @@ -410,7 +410,7 @@ function mc_issue_get_id_from_summary( $p_username, $p_password, $p_summary ) { function mc_issue_add( $p_username, $p_password, $p_issue ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_project = $p_issue['project']; @@ -418,7 +418,7 @@ function mc_issue_add( $p_username, $p_password, $p_issue ) { $t_project_id = mci_get_project_id( $t_project ); if( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_handler_id = isset( $p_issue['handler'] ) ? mci_get_user_id( $p_issue['handler'] ) : 0; @@ -443,7 +443,7 @@ function mc_issue_add( $p_username, $p_password, $p_issue ) { # Make sure that active user has access level required to specify a different reporter. $t_specify_reporter_access_level = config_get( 'mc_specify_reporter_on_add_access_level_threshold' ); if( !access_has_project_level( $t_specify_reporter_access_level, $t_project_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', "Active user does not have access level required to specify a different issue reporter." ); + return mci_soap_fault_access_denied( $t_user_id, "Active user does not have access level required to specify a different issue reporter" ); } } } @@ -452,12 +452,12 @@ function mc_issue_add( $p_username, $p_password, $p_issue ) { if( $t_project_id == 0 ) { return new soap_fault( 'Client', '', "Project '" . $t_project['name'] . "' does not exist." ); } else { - return new soap_fault( 'Client', '', "Project '$t_project_id' does not exist." ); + return new soap_fault( 'Client', '', "Project with id '" . $t_project_id . "' does not exist." ); } } if( !access_has_project_level( config_get( 'report_bug_threshold' ), $t_project_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', "User '$t_user_id' does not have access right to report issues." ); + return mci_soap_fault_access_denied( "User '$t_user_id' does not have access right to report issues" ); } #if ( !access_has_project_level( config_get( 'report_bug_threshold' ), $t_project_id ) || @@ -577,17 +577,17 @@ function mc_issue_add( $p_username, $p_password, $p_issue ) { function mc_issue_update( $p_username, $p_password, $p_issue_id, $p_issue ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !bug_exists( $p_issue_id ) ) { - return new soap_fault( 'Server', '', "Issue '$p_issue_id' does not exist." ); + return new soap_fault( 'Client', '', "Issue '$p_issue_id' does not exist." ); } $t_project_id = bug_get_field( $p_issue_id, 'project_id' ); if( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_project_id = mci_get_project_id( $p_issue['project'] ); @@ -615,12 +615,11 @@ function mc_issue_update( $p_username, $p_password, $p_issue_id, $p_issue ) { if( $t_project_id == 0 ) { return new soap_fault( 'Client', '', "Project '" . $t_project['name'] . "' does not exist." ); } - return new soap_fault( 'Client', '', "Project '$t_project_id' does not exist." ); } if( !access_has_bug_level( config_get( 'update_bug_threshold' ), $p_issue_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', "User '$t_user_id' does not have access right to report issues." ); + return mci_soap_fault_access_denied( $t_user_id, "Not enough rights to update issues" ); } if(( $t_handler_id != 0 ) && !user_exists( $t_handler_id ) ) { @@ -756,16 +755,16 @@ function mc_issue_update( $p_username, $p_password, $p_issue_id, $p_issue ) { function mc_issue_delete( $p_username, $p_password, $p_issue_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !bug_exists( $p_issue_id ) ) { - return new soap_fault( 'Server', '', "Issue '$p_issue_id' does not exist." ); + return new soap_fault( 'Client', '', "Issue '$p_issue_id' does not exist."); } $t_project_id = bug_get_field( $p_issue_id, 'project_id' ); if( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } return bug_delete( $p_issue_id ); @@ -783,15 +782,15 @@ function mc_issue_delete( $p_username, $p_password, $p_issue_id ) { function mc_issue_note_add( $p_username, $p_password, $p_issue_id, $p_note ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( (integer) $p_issue_id < 1 ) { - return new soap_fault( 'Client', '', "Invalid issue id '$p_issue_id'." ); + return new soap_fault( 'Client', '', "Invalid issue id '$p_issue_id'" ); } if( !bug_exists( $p_issue_id ) ) { - return new soap_fault( 'Client', '', "Issue '$p_issue_id' does not exist" ); + return new soap_fault( 'Client', '', "Issue '$p_issue_id' does not exist." ); } if ( !isset( $p_note['text'] ) || is_blank( $p_note['text'] ) ) { @@ -800,15 +799,15 @@ function mc_issue_note_add( $p_username, $p_password, $p_issue_id, $p_note ) { $t_project_id = bug_get_field( $p_issue_id, 'project_id' ); if( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if( !access_has_bug_level( config_get( 'add_bugnote_threshold' ), $p_issue_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', "User '$t_user_id' does not have access right to add notes to this issue." ); + return mci_soap_fault_access_denied( $t_user_id, "You do not have access rights to add notes to this issue" ); } if( bug_is_readonly( $p_issue_id ) ) { - return new soap_fault( 'Client', '', "Issue '$p_issue_id' is readonly." ); + return mci_soap_fault_access_denied( $t_user_id, "Issue '$p_issue_id' is readonly" ); } if( isset( $p_note['view_state'] ) ) { @@ -834,21 +833,21 @@ function mc_issue_note_add( $p_username, $p_password, $p_issue_id, $p_note ) { function mc_issue_note_delete( $p_username, $p_password, $p_issue_note_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( (integer) $p_issue_note_id < 1 ) { - return new soap_fault( 'Client', '', "Invalid issue note id '$p_issue_note_id'." ); + return new soap_fault( 'Client', '', "Invalid issue note id '$p_issue_note_id'."); } if( !bugnote_exists( $p_issue_note_id ) ) { - return new soap_fault( 'Server', '', "Issue note '$p_issue_note_id' does not exist." ); + return new soap_fault( 'Client', '', "Issue note '$p_issue_note_id' does not exist."); } $t_issue_id = bugnote_get_field( $p_issue_note_id, 'bug_id' ); $t_project_id = bug_get_field( $t_issue_id, 'project_id' ); if( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } return bugnote_delete( $p_issue_note_id ); @@ -869,17 +868,17 @@ function mc_issue_relationship_add( $p_username, $p_password, $p_issue_id, $p_re $t_rel_type = $p_relationship['type']; if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_project_id = bug_get_field( $p_issue_id, 'project_id' ); if( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } # user has access to update the bug... if( !access_has_bug_level( config_get( 'update_bug_threshold' ), $p_issue_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', "Active user does not have access level required to add a relationship to this issue." ); + return mci_soap_fault_access_denied( $t_user_id, "Active user does not have access level required to add a relationship to this issue" ); } # source and destination bugs are the same bug... @@ -894,12 +893,12 @@ function mc_issue_relationship_add( $p_username, $p_password, $p_issue_id, $p_re # bug is not read-only... if( bug_is_readonly( $p_issue_id ) ) { - return new soap_fault( 'Client', '', "Issue '$p_issue_id' is readonly." ); + return new mci_soap_fault_access_denied( $t_user_id, "Issue '$p_issue_id' is readonly" ); } # user can access to the related bug at least as viewer... if( !access_has_bug_level( VIEWER, $t_dest_issue_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', "The issue '$t_dest_issue_id' requires higher access level." ); + return mci_soap_fault_access_denied( $t_user_id, "The issue '$t_dest_issue_id' requires higher access level" ); } $t_old_id_relationship = relationship_same_type_exists( $p_issue_id, $t_dest_issue_id, $t_rel_type['id'] ); @@ -941,22 +940,22 @@ function mc_issue_relationship_delete( $p_username, $p_password, $p_issue_id, $p $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_project_id = bug_get_field( $p_issue_id, 'project_id' ); if( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } # user has access to update the bug... if( !access_has_bug_level( config_get( 'update_bug_threshold' ), $p_issue_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', "Active user does not have access level required to remove a relationship from this issue." ); + return mci_soap_fault_access_denied( $t_user_id , "Active user does not have access level required to remove a relationship from this issue." ); } # bug is not read-only... if( bug_is_readonly( $p_issue_id ) ) { - return new soap_fault( 'Client', '', "Issue '$p_issue_id' is readonly." ); + return mci_soap_fault_access_denied( $t_user_id , "Issue '$p_issue_id' is readonly." ); } # retrieve the destination bug of the relationship @@ -965,7 +964,7 @@ function mc_issue_relationship_delete( $p_username, $p_password, $p_issue_id, $p # user can access to the related bug at least as viewer, if it's exist... if( bug_exists( $t_dest_issue_id ) ) { if( !access_has_bug_level( VIEWER, $t_dest_issue_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', "The issue '$t_dest_issue_id' requires higher access level." ); + return mci_soap_fault_access_denied( $t_user_id , "The issue '$t_dest_issue_id' requires higher access level." ); } } @@ -1014,7 +1013,7 @@ function mc_issue_relationship_delete( $p_username, $p_password, $p_issue_id, $p function mc_issue_checkin( $p_username, $p_password, $p_issue_id, $p_comment, $p_fixed ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !bug_exists( $p_issue_id ) ) { @@ -1023,7 +1022,7 @@ function mc_issue_checkin( $p_username, $p_password, $p_issue_id, $p_comment, $p $t_project_id = bug_get_field( $p_issue_id, 'project_id' ); if( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } helper_call_custom_function( 'checkin', array( $p_issue_id, $p_comment, '', '', $p_fixed ) ); diff --git a/api/soap/mc_issue_attachment_api.php b/api/soap/mc_issue_attachment_api.php index c223893cac..8d06d069f5 100644 --- a/api/soap/mc_issue_attachment_api.php +++ b/api/soap/mc_issue_attachment_api.php @@ -19,7 +19,7 @@ function mc_issue_attachment_get( $p_username, $p_password, $p_issue_attachment_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_file = mci_file_get( $p_issue_attachment_id, 'bug', $t_user_id ); @@ -43,13 +43,13 @@ function mc_issue_attachment_get( $p_username, $p_password, $p_issue_attachment_ function mc_issue_attachment_add( $p_username, $p_password, $p_issue_id, $p_name, $p_file_type, $p_content ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !file_allow_bug_upload( $p_issue_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if( !access_has_bug_level( config_get( 'upload_bug_file_threshold' ), $p_issue_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } return mci_file_add( $p_issue_id, $p_name, base64_decode( $p_content ), $p_file_type, 'bug' ); } @@ -65,11 +65,11 @@ function mc_issue_attachment_add( $p_username, $p_password, $p_issue_id, $p_name function mc_issue_attachment_delete( $p_username, $p_password, $p_issue_attachment_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_bug_id = file_get_field( $p_issue_attachment_id, 'bug_id' ); if( !access_has_bug_level( config_get( 'update_bug_threshold' ), $t_bug_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } return file_delete( $p_issue_attachment_id, 'bug' ); } diff --git a/api/soap/mc_project_api.php b/api/soap/mc_project_api.php index b7da2dbe2e..e76042aa93 100644 --- a/api/soap/mc_project_api.php +++ b/api/soap/mc_project_api.php @@ -10,14 +10,14 @@ function mc_project_get_issues( $p_username, $p_password, $p_project_id, $p_page $t_user_id = mci_check_login( $p_username, $p_password ); $t_lang = mci_get_user_lang( $t_user_id ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !project_exists( $p_project_id ) ) { return new soap_fault( 'Client', '', "Project '$p_project_id' does not exist." ); } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_page_count = 0; @@ -85,11 +85,11 @@ function mc_project_get_issues( $p_username, $p_password, $p_project_id, $p_page function mc_projects_get_user_accessible( $p_username, $p_password ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !mci_has_readonly_access( $t_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_lang = mci_get_user_lang( $t_user_id ); @@ -125,7 +125,7 @@ function mc_project_get_categories( $p_username, $p_password, $p_project_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !project_exists( $p_project_id ) ) { @@ -133,7 +133,7 @@ function mc_project_get_categories( $p_username, $p_password, $p_project_id ) { } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_result = array(); @@ -156,7 +156,7 @@ function mc_project_get_versions( $p_username, $p_password, $p_project_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !project_exists( $p_project_id ) ) { @@ -164,7 +164,7 @@ function mc_project_get_versions( $p_username, $p_password, $p_project_id ) { } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_result = array(); @@ -194,7 +194,7 @@ function mc_project_get_released_versions( $p_username, $p_password, $p_project_ $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !project_exists( $p_project_id ) ) { @@ -202,7 +202,7 @@ function mc_project_get_released_versions( $p_username, $p_password, $p_project_ } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_result = array(); @@ -233,7 +233,7 @@ function mc_project_get_unreleased_versions( $p_username, $p_password, $p_projec $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !project_exists( $p_project_id ) ) { @@ -241,7 +241,7 @@ function mc_project_get_unreleased_versions( $p_username, $p_password, $p_projec } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_result = array(); @@ -272,7 +272,7 @@ function mc_project_version_add( $p_username, $p_password, $p_version ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied', 'Username/password combination was incorrect' ); + return mci_soap_fault_login_failed(); } $t_project_id = $p_version['project_id']; @@ -290,11 +290,11 @@ function mc_project_version_add( $p_username, $p_password, $p_version ) { } if ( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if ( !mci_has_access( config_get( 'manage_project_threshold' ), $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if ( is_blank( $t_name ) ) { @@ -339,7 +339,7 @@ function mc_project_version_update( $p_username, $p_password, $p_version_id, $p_ $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied', 'Username/password combination was incorrect' ); + return mci_soap_fault_login_failed(); } if( is_blank( $p_version_id ) ) { @@ -365,11 +365,11 @@ function mc_project_version_update( $p_username, $p_password, $p_version_id, $p_ } if ( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if ( !mci_has_access( config_get( 'manage_project_threshold' ), $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if ( is_blank( $t_name ) ) { @@ -411,7 +411,7 @@ function mc_project_version_delete( $p_username, $p_password, $p_version_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied', 'Username/password combination was incorrect' ); + return mci_soap_fault_login_failed(); } if( is_blank( $p_version_id ) ) { @@ -425,11 +425,11 @@ function mc_project_version_delete( $p_username, $p_password, $p_version_id ) { $t_project_id = version_get_field( $p_version_id, 'project_id' ); if( !mci_has_readwrite_access( $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if( !mci_has_access( config_get( 'manage_project_threshold' ), $t_user_id, $t_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } return version_remove( $p_version_id ); @@ -447,7 +447,7 @@ function mc_project_get_custom_fields( $p_username, $p_password, $p_project_id ) $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !project_exists( $p_project_id ) ) { @@ -455,7 +455,7 @@ function mc_project_get_custom_fields( $p_username, $p_password, $p_project_id ) } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_result = array(); @@ -503,12 +503,12 @@ function mc_project_get_custom_fields( $p_username, $p_password, $p_project_id ) function mc_project_get_attachments( $p_username, $p_password, $p_project_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } # Check if project documentation feature is enabled. if( OFF == config_get( 'enable_project_documentation' ) || !file_is_uploading_enabled() ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if( !project_exists( $p_project_id ) ) { @@ -516,7 +516,7 @@ function mc_project_get_attachments( $p_username, $p_password, $p_project_id ) { } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_project_file_table = db_get_table( 'project_file' ); @@ -609,11 +609,11 @@ function mci_project_as_array_by_id( $p_project_id ) { function mc_project_add( $p_username, $p_password, $p_project ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied', 'Username/password combination was incorrect' ); + return mci_soap_fault_login_failed(); } if( !mci_has_administrator_access( $t_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied', 'User does not have administrator access' ); + return mci_soap_fault_access_denied( $t_user_id ); } if ( !isset( $p_project['name'] ) ) { @@ -681,7 +681,7 @@ function mc_project_add( $p_username, $p_password, $p_project ) { function mc_project_delete( $p_username, $p_password, $p_project_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied', 'Username/password combination was incorrect' ); + return mci_soap_fault_login_failed(); } if( !project_exists( $p_project_id ) ) { @@ -689,7 +689,7 @@ function mc_project_delete( $p_username, $p_password, $p_project_id ) { } if( !mci_has_administrator_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied', 'User does not have administrator access' ); + return mci_soap_fault_access_denied( $t_user_id ); } return project_delete( $p_project_id ); @@ -698,14 +698,14 @@ function mc_project_delete( $p_username, $p_password, $p_project_id ) { function mc_project_get_issue_headers( $p_username, $p_password, $p_project_id, $p_page_number, $p_per_page ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } if( !project_exists( $p_project_id ) ) { return new soap_fault( 'Client', '', "Project '$p_project_id' does not exist." ); } if( !mci_has_readonly_access( $t_user_id, $p_project_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } $t_page_count = 0; @@ -758,7 +758,7 @@ function mc_project_get_users( $p_username, $p_password, $p_project_id, $p_acces $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_users = array(); diff --git a/api/soap/mc_project_attachment_api.php b/api/soap/mc_project_attachment_api.php index c3c9c18da4..3e00eeb51b 100644 --- a/api/soap/mc_project_attachment_api.php +++ b/api/soap/mc_project_attachment_api.php @@ -19,7 +19,7 @@ function mc_project_attachment_get( $p_username, $p_password, $p_project_attachment_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_file = mci_file_get( $p_project_attachment_id, 'doc', $t_user_id ); @@ -45,15 +45,15 @@ function mc_project_attachment_get( $p_username, $p_password, $p_project_attachm function mc_project_attachment_add( $p_username, $p_password, $p_project_id, $p_name, $p_title, $p_description, $p_file_type, $p_content ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } # Check if project documentation feature is enabled. if( OFF == config_get( 'enable_project_documentation' ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if( !access_has_project_level( config_get( 'upload_project_file_threshold' ), $p_project_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } if( is_blank( $p_title ) ) { return new soap_fault( 'Client', '', 'Title must not be empty.' ); @@ -72,11 +72,11 @@ function mc_project_attachment_add( $p_username, $p_password, $p_project_id, $p_ function mc_project_attachment_delete( $p_username, $p_password, $p_project_attachment_id ) { $t_user_id = mci_check_login( $p_username, $p_password ); if( $t_user_id === false ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_login_failed(); } $t_project_id = file_get_field( $p_project_attachment_id, 'project_id', 'project' ); if( !access_has_project_level( config_get( 'upload_project_file_threshold' ), $t_project_id, $t_user_id ) ) { - return new soap_fault( 'Client', '', 'Access Denied' ); + return mci_soap_fault_access_denied( $t_user_id ); } return file_delete( $p_project_attachment_id, 'project' ); }