From 914aea83708a07184d89475bbe8044256b0bec0d Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 23 Sep 2006 19:37:48 +0000 Subject: [PATCH] Removed the second parameter in all trigger_error() calls becaues it is no longer supported in the errorHandler --- api.php | 20 ++++++++++---------- db.php | 10 +++++----- localize.php | 4 ++-- mail.php | 4 ++-- printer_css.php | 4 ++-- printer_navigation.php | 6 +++--- template.php | 8 ++++---- template_fs.php | 6 +++--- xml.php | 4 ++-- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/api.php b/api.php index 651bf4e..7a841e6 100644 --- a/api.php +++ b/api.php @@ -174,12 +174,12 @@ class API { if (!is_subclass_of($this, 'API')) { - trigger_error('Cannot instantiate the API module directly', E_USER_ERROR); + trigger_error('Cannot instantiate the API module directly'); } if (!is_object($registry)) { - trigger_error('The passed registry is not an object', E_USER_ERROR); + trigger_error('The passed registry is not an object'); } $this->registry =& $registry; @@ -203,7 +203,7 @@ class API if (!is_callable(APIError())) { - trigger_error('No APIError() handler has been set', E_USER_WARNING); + trigger_error('No APIError() handler has been set'); } call_user_func(APIError(), $message); @@ -240,7 +240,7 @@ class API { if (!isset($this->fields["$field"])) { - trigger_error('Field `' . $field . '` is not valid', E_USER_WARNING); + trigger_error('Field `' . $field . '` is not valid'); return; } @@ -290,7 +290,7 @@ class API { if (!$this->values["$field"]) { - trigger_error('The specified field `' . $field . '` for the condition could not be found as it is not set', E_USER_WARNING); + trigger_error('The specified field `' . $field . '` for the condition could not be found as it is not set'); continue; } @@ -310,7 +310,7 @@ class API { if (!$this->values["$name"]) { - trigger_error('Cannot determine condition from the REQ_AUTO field because it is not set', E_USER_WARNING); + trigger_error('Cannot determine condition from the REQ_AUTO field because it is not set'); continue; } @@ -320,7 +320,7 @@ class API if ($this->condition == '') { - trigger_error('No REQ_AUTO fields are present and therefore the condition cannot be created', E_USER_WARNING); + trigger_error('No REQ_AUTO fields are present and therefore the condition cannot be created'); } } } @@ -360,7 +360,7 @@ class API { if ($this->condition == '') { - trigger_error('Condition is empty: cannot fetch', E_USER_ERROR); + trigger_error('Condition is empty: cannot fetch'); } $this->run_action_method('pre_fetch'); @@ -437,7 +437,7 @@ class API { if ($this->condition == '') { - trigger_error('Condition is empty: cannot update', E_USER_ERROR); + trigger_error('Condition is empty: cannot update'); } $this->run_action_method('pre_update'); @@ -463,7 +463,7 @@ class API { if ($this->condition == '') { - trigger_error('Condition is empty: cannot delete', E_USER_ERROR); + trigger_error('Condition is empty: cannot delete'); } if ($runset) diff --git a/db.php b/db.php index dbd7b7b..6ed9564 100644 --- a/db.php +++ b/db.php @@ -144,7 +144,7 @@ class DB_Abstract if (!defined('ISSO_DB_LAYER')) { define('ISSO_DB_LAYER', get_class($this)); - trigger_error('ISSO_DB_LAYER was defined automatically by DB::init_as_package(). Define the constant yourself to remove this warning', E_USER_WARNING); + trigger_error('ISSO_DB_LAYER was defined automatically by DB::init_as_package(). Define the constant yourself to remove this warning'); } return 'db'; @@ -360,7 +360,7 @@ class DB_Abstract */ public function transaction_start() { - trigger_error('DB_Abstract::transaction_start() needs to be overridden when subclassed', E_USER_ERROR); + trigger_error('DB_Abstract::transaction_start() needs to be overridden when subclassed'); } // ################################################################### @@ -372,7 +372,7 @@ class DB_Abstract */ public function transaction_savepoint($name) { - trigger_error('DB_Abstract::transaction_savepoint() needs to be overridden when subclassed', E_USER_ERROR); + trigger_error('DB_Abstract::transaction_savepoint() needs to be overridden when subclassed'); } // ################################################################### @@ -384,7 +384,7 @@ class DB_Abstract */ public function transaction_rollback($name) { - trigger_error('DB_Abstract::transaction_rollback() needs to be overridden when subclassed', E_USER_ERROR); + trigger_error('DB_Abstract::transaction_rollback() needs to be overridden when subclassed'); } // ################################################################### @@ -394,7 +394,7 @@ class DB_Abstract */ public function transaction_commit($name) { - trigger_error('DB_Abstract::transaction_commit() needs to be overridden when subclassed', E_USER_ERROR); + trigger_error('DB_Abstract::transaction_commit() needs to be overridden when subclassed'); } // ################################################################### diff --git a/localize.php b/localize.php index 2d1ce61..cd5744a 100644 --- a/localize.php +++ b/localize.php @@ -130,7 +130,7 @@ class Localize return $this->lextable["$code"]; } - trigger_error('Lex code `' . $code . '` did not appear in the lex table', E_USER_ERROR); + trigger_error('Lex code `' . $code . '` did not appear in the lex table'); } // ################################################################### @@ -145,7 +145,7 @@ class Localize { if (isset($this->lextable["$code"])) { - trigger_error('Cannot set lex `' . $code . '` : value already exists', E_USER_ERROR); + trigger_error('Cannot set lex `' . $code . '` : value already exists'); } $this->lextable["$code"] = $value; diff --git a/mail.php b/mail.php index 40f4763..84ff139 100644 --- a/mail.php +++ b/mail.php @@ -142,7 +142,7 @@ class Mail { if (empty($value) AND $this->fields["$name"][0] == REQ_YES) { - trigger_error('Field ' . $name . ' cannot be empty', E_USER_ERROR); + trigger_error('Field ' . $name . ' cannot be empty'); } $this->registry->do_set($name, $value, 'mail'); @@ -225,7 +225,7 @@ class Mail $this->registry->check_isso_fields(get_class($this)); if (sizeof($this->to) < 1) { - trigger_error('You need at least one email address to send to', E_USER_ERROR); + trigger_error('You need at least one email address to send to'); return false; } diff --git a/printer_css.php b/printer_css.php index 6850c80..f571f5b 100644 --- a/printer_css.php +++ b/printer_css.php @@ -141,7 +141,7 @@ class Printer_CSS { if (isset($this->descriptors["$descriptor"])) { - trigger_error('The descriptor `' . $descriptor . '` already exists', E_USER_WARNING); + trigger_error('The descriptor `' . $descriptor . '` already exists'); return; } @@ -421,7 +421,7 @@ class Printer_CSS } else { - trigger_error('Printer_CSS::fetch_modified_link() needs to have the fetch_modified_link_hook( $descriptor , $property , $name ) defined', E_USER_ERROR); + trigger_error('Printer_CSS::fetch_modified_link() needs to have the fetch_modified_link_hook( $descriptor , $property , $name ) defined'); } } else diff --git a/printer_navigation.php b/printer_navigation.php index 5a18db2..3e7566f 100644 --- a/printer_navigation.php +++ b/printer_navigation.php @@ -154,7 +154,7 @@ class Printer_Navigation } else { - trigger_error('Invalid key for scope', E_USER_WARNING); + trigger_error('Invalid key for scope'); } } else if ($scope == 'link') @@ -165,12 +165,12 @@ class Printer_Navigation } else { - trigger_error('Invalid key for scope', E_USER_WARNING); + trigger_error('Invalid key for scope'); } } else { - trigger_error('Printer_Navigation::set_focus() only allows setting of focus for tab and link scopes', E_USER_ERROR); + trigger_error('Printer_Navigation::set_focus() only allows setting of focus for tab and link scopes'); } } diff --git a/template.php b/template.php index 4f3e289..278af76 100644 --- a/template.php +++ b/template.php @@ -186,7 +186,7 @@ class Template { if (sizeof($this->cache) > 0) { - trigger_error('You cannot cache templates more than once per initialization', E_USER_WARNING); + trigger_error('You cannot cache templates more than once per initialization'); } else { @@ -244,7 +244,7 @@ class Template if (empty($template)) { - trigger_error('There was no output to print', E_USER_ERROR); + trigger_error('There was no output to print'); exit; } @@ -262,7 +262,7 @@ class Template if ($this->doneflush) { - trigger_error('A template has already been sent to the output buffer', E_USER_ERROR); + trigger_error('A template has already been sent to the output buffer'); exit; } @@ -287,7 +287,7 @@ class Template } else { - trigger_error("The template '$name' could not be loaded", E_USER_ERROR); + trigger_error("The template '$name' could not be loaded"); exit; } } diff --git a/template_fs.php b/template_fs.php index e899ced..043632b 100644 --- a/template_fs.php +++ b/template_fs.php @@ -109,7 +109,7 @@ class Template_FS extends Template { if (sizeof($this->cache) > 0) { - trigger_error('You cannot cache templates more than once per initialization', E_USER_WARNING); + trigger_error('You cannot cache templates more than once per initialization'); } else { @@ -143,13 +143,13 @@ class Template_FS extends Template } else { - trigger_error("Could not load the template '$path'", E_USER_ERROR); + trigger_error("Could not load the template '$path'"); exit; } } else { - trigger_error("Could not load the template '$path'", E_USER_ERROR); + trigger_error("Could not load the template '$path'"); exit; } } diff --git a/xml.php b/xml.php index 39522b0..b3b6ea5 100644 --- a/xml.php +++ b/xml.php @@ -166,7 +166,7 @@ class XML $error['string'] = xml_error_string($error['code']); $error['line'] = xml_get_current_line_number($this->parser); $error['column'] = xml_get_current_column_number($this->parser); - trigger_error("XML Error: $error[string] at line $error[line] colunn $error[column]", E_USER_ERROR); + trigger_error("XML Error: $error[string] at line $error[line] colunn $error[column]"); exit; } @@ -252,7 +252,7 @@ class XML } else { - trigger_error('Could not find the function [' . $this->taghandler["$name"] . '()] for the XML tag "' . $name . '"', E_USER_ERROR); + trigger_error('Could not find the function [' . $this->taghandler["$name"] . '()] for the XML tag "' . $name . '"'); } } -- 2.22.5