From ee77eec0c4abc299f0bb713e63d71cb1233ecf58 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 22 Jul 2006 03:14:37 +0000 Subject: [PATCH] r925: Adding API error handling for the admin section --- admin/autoaction.php | 3 +++ admin/field.php | 3 +++ admin/priority.php | 3 +++ admin/resolution.php | 3 +++ admin/severity.php | 3 +++ admin/status.php | 3 +++ admin/user.php | 3 +++ admin/usergroup.php | 3 +++ admin/userhelp.php | 3 +++ includes/class_api_error.php | 28 +++++++++++++++++++++------- 10 files changed, 48 insertions(+), 7 deletions(-) diff --git a/admin/autoaction.php b/admin/autoaction.php index ac1111a..ccad148 100644 --- a/admin/autoaction.php +++ b/admin/autoaction.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_autoaction.php'); +require_once('./includes/class_api_error.php'); +APIError(array(new API_Error_Handler($admin), 'admin_error')); + NavLinks::fieldsPages(); $navigator->set_focus('tab', 'fields', null); diff --git a/admin/field.php b/admin/field.php index 55db768..8bb6456 100644 --- a/admin/field.php +++ b/admin/field.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_field.php'); +require_once('./includes/class_api_error.php'); +APIError(array(new API_Error_Handler($admin), 'admin_error')); + NavLinks::fieldsPages(); $navigator->set_focus('tab', 'fields', null); diff --git a/admin/priority.php b/admin/priority.php index ec87e98..e10fec3 100755 --- a/admin/priority.php +++ b/admin/priority.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_priority.php'); +require_once('./includes/class_api_error.php'); +APIError(array(new API_Error_Handler($admin), 'admin_error')); + NavLinks::fieldsPages(); $navigator->set_focus('tab', 'fields', null); diff --git a/admin/resolution.php b/admin/resolution.php index 0ca5699..39b1ca9 100755 --- a/admin/resolution.php +++ b/admin/resolution.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_resolution.php'); +require_once('./includes/class_api_error.php'); +APIError(array(new API_Error_Handler($admin), 'admin_error')); + NavLinks::fieldsPages(); $navigator->set_focus('tab', 'fields', null); diff --git a/admin/severity.php b/admin/severity.php index 8d1f96a..7f92fd6 100755 --- a/admin/severity.php +++ b/admin/severity.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_severity.php'); +require_once('./includes/class_api_error.php'); +APIError(array(new API_Error_Handler($admin), 'admin_error')); + NavLinks::fieldsPages(); $navigator->set_focus('tab', 'fields', null); diff --git a/admin/status.php b/admin/status.php index 3a86246..09ace54 100755 --- a/admin/status.php +++ b/admin/status.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_status.php'); +require_once('./includes/class_api_error.php'); +APIError(array(new API_Error_Handler($admin), 'admin_error')); + NavLinks::fieldsPages(); $navigator->set_focus('tab', 'fields', null); diff --git a/admin/user.php b/admin/user.php index d54b15c..ca01a4b 100644 --- a/admin/user.php +++ b/admin/user.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_user.php'); +require_once('./includes/class_api_error.php'); +APIError(array(new API_Error_Handler($admin), 'admin_error')); + NavLinks::usersPages(); $navigator->set_focus('tab', 'users', null); diff --git a/admin/usergroup.php b/admin/usergroup.php index ad4656d..68fe658 100755 --- a/admin/usergroup.php +++ b/admin/usergroup.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_usergroup.php'); +require_once('./includes/class_api_error.php'); +APIError(array(new API_Error_Handler($admin), 'admin_error')); + NavLinks::usersPages(); $navigator->set_focus('tab', 'users', null); diff --git a/admin/userhelp.php b/admin/userhelp.php index 77ac1c4..1219dd4 100755 --- a/admin/userhelp.php +++ b/admin/userhelp.php @@ -23,6 +23,9 @@ require_once('./global.php'); require_once('./includes/api_userhelp.php'); require_once('./includes/functions_datastore.php'); +require_once('./includes/class_api_error.php'); +APIError(array(new API_Error_Handler($admin), 'admin_error')); + NavLinks::optionsPages(); NavLinks::userhelpAdd(); $navigator->set_focus('tab', 'options', null); diff --git a/includes/class_api_error.php b/includes/class_api_error.php index 007622a..2a3cc4a 100644 --- a/includes/class_api_error.php +++ b/includes/class_api_error.php @@ -36,23 +36,23 @@ class API_Error_Handler { /** - * Instance of a user-end message reporting object + * Instance of an object that can run erros * @var object * @access private */ - var $message = null; + var $object = null; // ################################################################### /** - * Constructor: set the message reporter object + * Constructor: set the actionable object * * @access public * - * @param object Message reporting object + * @param object Actionable object */ - function API_Error_Handler(&$mobj) + function API_Error_Handler(&$obj) { - $this->message =& $mobj; + $this->object =& $obj; } // ################################################################### @@ -69,7 +69,21 @@ class API_Error_Handler */ function user_cumulative($error) { - $this->message->add_error($error); + $this->object->add_error($error); + } + + // ################################################################### + /** + * This calls the simple ISSO.Printer error message for the + * administrative-side errors. + * + * @access public + * + * @param string Error message + */ + function admin_error($error) + { + $this->object->error($error); } } -- 2.22.5