mantisbt/core error_api.php,1.34,1.35

Update of /cvsroot/mantisbt/mantisbt/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13753/core

Modified Files:
        error_api.php 
Log Message:
fix for  0004576: Simplify display options for error handler
added config $g_display_errors replacing $g_show_notices and $g_show_warnings


Index: error_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/error_api.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- error_api.php       22 Aug 2004 01:19:30 -0000      1.34
+++ error_api.php       21 Sep 2004 17:58:17 -0000      1.35
@@ -44,43 +44,35 @@
                lang_push( config_get ( 'default_language' ) );
                
                $t_short_file   = basename( $p_file );
-               $t_method               = 'none';
+               $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:
                                $t_error_type = 'SYSTEM WARNING';
                                $t_error_description = $p_error;
-                               if ( ON == config_get( 'show_warnings' ) ) {
-                                       $t_method = 'inline';
-                               }
                                break;
                        case E_NOTICE:
                                $t_error_type = 'SYSTEM NOTICE';
                                $t_error_description = $p_error;
-                               if ( ON == config_get( 'show_notices' ) ) {
-                                       $t_method = 'inline';
-                               }
                                break;
                        case E_USER_ERROR:
                                $t_error_type = "APPLICATION ERROR #$p_error";
                                $t_error_description = error_string( $p_error );
-                               $t_method = 'halt';
                                break;
                        case E_USER_WARNING:
                                $t_error_type = "APPLICATION WARNING #$p_error";
                                $t_error_description = error_string( $p_error );
-                               if ( ON == config_get( 'show_warnings' ) ) {
-                                       $t_method = 'inline';
-                               }
                                break;
                        case E_USER_NOTICE:
                                # used for debugging
                                $t_error_type = 'DEBUG';
                                $t_error_description = $p_error;
-                               if ( ON == config_get( 'show_notices' ) ) {
-                                       $t_method = 'inline';
-                               }
                                break;
                        default:
                                #shouldn't happen, just display the error just 
in case



-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php