From ae20607b9ad7cc9b007367701a0b2e181ea12836 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 23 Aug 2008 15:31:51 -0400
Subject: [PATCH] Remove includes/class_api_error.php and all of the places we
 require() it

---
 admin/automation.php         |  1 -
 admin/field.php              |  1 -
 admin/language.php           |  1 -
 admin/priority.php           |  1 -
 admin/resolution.php         |  1 -
 admin/severity.php           |  1 -
 admin/status.php             |  1 -
 admin/user.php               |  1 -
 admin/usergroup.php          |  1 -
 admin/userhelp.php           |  1 -
 attachment.php               |  1 -
 editcomment.php              |  1 -
 editreport.php               |  1 -
 includes/class_api_error.php | 96 ------------------------------------
 login.php                    |  1 -
 newreport.php                |  1 -
 register.php                 |  1 -
 search.php                   |  1 -
 userctrl.php                 |  1 -
 19 files changed, 114 deletions(-)
 delete mode 100644 includes/class_api_error.php

diff --git a/admin/automation.php b/admin/automation.php
index 99e4d07..e655940 100644
--- a/admin/automation.php
+++ b/admin/automation.php
@@ -22,7 +22,6 @@
 require_once('./global.php');
 require_once('./includes/api_automation.php');
 
-require_once('./includes/class_api_error.php');
 APIError(array(new API_Error_Handler($admin), 'admin_error'));
 
 NavLinks::fieldsPages();
diff --git a/admin/field.php b/admin/field.php
index d903c0e..c8d2a82 100644
--- a/admin/field.php
+++ b/admin/field.php
@@ -22,7 +22,6 @@
 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();
diff --git a/admin/language.php b/admin/language.php
index 9d945ec..c2799ea 100644
--- a/admin/language.php
+++ b/admin/language.php
@@ -22,7 +22,6 @@
 require_once('./global.php');
 require_once('./includes/api_language.php');
 
-require_once('./includes/class_api_error.php');
 APIError(array(new API_Error_Handler($admin), 'admin_error'));
 
 NavLinks::optionsPages();
diff --git a/admin/priority.php b/admin/priority.php
index 5439bf8..a938c2b 100755
--- a/admin/priority.php
+++ b/admin/priority.php
@@ -22,7 +22,6 @@
 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();
diff --git a/admin/resolution.php b/admin/resolution.php
index f616a2a..6eebab5 100755
--- a/admin/resolution.php
+++ b/admin/resolution.php
@@ -22,7 +22,6 @@
 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();
diff --git a/admin/severity.php b/admin/severity.php
index 390771d..cd84bb1 100755
--- a/admin/severity.php
+++ b/admin/severity.php
@@ -22,7 +22,6 @@
 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();
diff --git a/admin/status.php b/admin/status.php
index f2c07c8..9d1c56f 100755
--- a/admin/status.php
+++ b/admin/status.php
@@ -22,7 +22,6 @@
 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();
diff --git a/admin/user.php b/admin/user.php
index 0040f4b..012cc77 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -23,7 +23,6 @@ require_once('./global.php');
 require_once('./includes/api_user.php');
 require_once('./includes/class_sort.php');
 
-require_once('./includes/class_api_error.php');
 APIError(array(new API_Error_Handler($admin), 'admin_error'));
 
 NavLinks::usersPages();
diff --git a/admin/usergroup.php b/admin/usergroup.php
index 868dc17..e995b18 100755
--- a/admin/usergroup.php
+++ b/admin/usergroup.php
@@ -22,7 +22,6 @@
 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();
diff --git a/admin/userhelp.php b/admin/userhelp.php
index 8de6652..9e4d80e 100755
--- a/admin/userhelp.php
+++ b/admin/userhelp.php
@@ -23,7 +23,6 @@ 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();
diff --git a/attachment.php b/attachment.php
index e6e506c..91ea31d 100755
--- a/attachment.php
+++ b/attachment.php
@@ -29,7 +29,6 @@ define('SVN', '$Id$');
 $focus['showreport'] = 'focus';
 
 require_once('./global.php');
-require_once('./includes/class_api_error.php');
 require_once('./includes/class_notification.php');
 require_once('./includes/api_attachment.php');
 require_once('./includes/api_comment.php');
diff --git a/editcomment.php b/editcomment.php
index efdf329..7fd16a8 100644
--- a/editcomment.php
+++ b/editcomment.php
@@ -30,7 +30,6 @@ $focus['showreport'] = 'focus';
 require_once('./global.php');
 require_once('./includes/api_comment.php');
 
-require_once('./includes/class_api_error.php');
 
 $commentapi = new CommentAPI();
 $commentapi->set('commentid',	$input->in['commentid']);
diff --git a/editreport.php b/editreport.php
index ea84e93..ada44ad 100644
--- a/editreport.php
+++ b/editreport.php
@@ -29,7 +29,6 @@ require_once('./includes/class_notification.php');
 require_once('./includes/api_bug.php');
 require_once('./includes/api_comment.php');
 
-require_once('./includes/class_api_error.php');
 APIError(array(new API_Error_Handler($message), 'user_cumulative'));
 
 $bug = $db->queryFirst("
diff --git a/includes/class_api_error.php b/includes/class_api_error.php
deleted file mode 100644
index 9615c50..0000000
--- a/includes/class_api_error.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/*=====================================================================*\
-|| ###################################################################
-|| # Bugdar
-|| # Copyright ©2002-2007 Blue Static
-|| #
-|| # This program is free software; you can redistribute it and/or modify
-|| # it under the terms of the GNU General Public License as published by
-|| # the Free Software Foundation; version 2 of the License.
-|| #
-|| # This program is distributed in the hope that it will be useful, but
-|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-|| # more details.
-|| #
-|| # You should have received a copy of the GNU General Public License along
-|| # with this program; if not, write to the Free Software Foundation, Inc.,
-|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-|| ###################################################################
-\*=====================================================================*/
-
-/**
-* API Error Handler
-*
-* This class is used to catch different kinds of API errors and throw the
-* appropriate front-size error depending on the context. Unlike normal
-* handlers, this class can be both instantiated and used statically: check
-* the method documentation for more information.
-*
-* @author		Blue Static
-* @copyright	Copyright ©2002 - 2007, Blue Static
-* @version		$Revision$
-* @package		Bugdar
-* 
-*/
-class API_Error_Handler
-{
-	/**
-	* Instance of an object that can run erros
-	* @var	object
-	* @access	private
-	*/
-	var $object = null;
-	
-	// ###################################################################
-	/**
-	* Constructor: set the actionable object
-	*
-	* @access	public
-	*
-	* @param	object	Actionable object
-	*/
-	function API_Error_Handler(&$obj)
-	{
-		$this->object =& $obj;
-	}
-	
-	// ###################################################################
-	/**
-	* The user-end cumulative reporter requires that the class be
-	* instantiated. This collects messages in the set message reporting
-	* object, but never throws the error. It is the caller's responsibility
-	* to check for the presence of errors and to throw the front-end
-	* warning using the message object.
-	*
-	* @access	public
-	*
-	* @param	string	Error message
-	*/
-	function user_cumulative($error)
-	{
-		$this->object->addError($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);
-	}
-}
-
-/*=====================================================================*\
-|| ###################################################################
-|| # $HeadURL$
-|| # $Id$
-|| ###################################################################
-\*=====================================================================*/
-?>
\ No newline at end of file
diff --git a/login.php b/login.php
index 0d7bd7f..80af055 100755
--- a/login.php
+++ b/login.php
@@ -31,7 +31,6 @@ $focus['user'] = 'focus';
 
 require_once('./global.php');
 require_once('./includes/api_user.php');
-require_once('./includes/class_api_error.php');
 
 // ###################################################################
 
diff --git a/newreport.php b/newreport.php
index 02cc882..c339a2b 100755
--- a/newreport.php
+++ b/newreport.php
@@ -33,7 +33,6 @@ require_once('./includes/class_notification.php');
 require_once('./includes/api_bug.php');
 require_once('./includes/api_comment.php');
 
-require_once('./includes/class_api_error.php');
 
 $product = explode(',', $input->in['product']);
 if (!can_perform('cansubmitbugs', $product[0]))
diff --git a/register.php b/register.php
index c662ccf..550101e 100755
--- a/register.php
+++ b/register.php
@@ -30,7 +30,6 @@ $focus['user'] = 'focus';
 require_once('./global.php');
 require_once('./includes/api_user.php');
 
-require_once('./includes/class_api_error.php');
 APIError(array(new API_Error_Handler($message), 'user_cumulative'));
 
 // ###################################################################
diff --git a/search.php b/search.php
index 98d6801..e10608b 100644
--- a/search.php
+++ b/search.php
@@ -39,7 +39,6 @@ require_once('./includes/functions_product.php');
 require_once('./includes/class_sort.php');
 require_once('./includes/class_logging.php');
 require_once('./includes/api_bug.php');
-require_once('./includes/class_api_error.php');
 
 if (!can_perform('cansearch'))
 {
diff --git a/userctrl.php b/userctrl.php
index 3b02a13..2ab798c 100644
--- a/userctrl.php
+++ b/userctrl.php
@@ -30,7 +30,6 @@ define('SVN', '$Id$');
 $focus['user'] = 'focus';
 
 require_once('./global.php');
-require_once('./includes/class_api_error.php');
 require_once('./includes/api_user.php');
 
 if (!bugdar::$userinfo['userid'])
-- 
2.22.5