diff options
| -rw-r--r-- | pear/Makefile.in | 2 | ||||
| -rw-r--r-- | pear/PEAR_Error.php (renamed from pear/PEAR_ERROR.php) | 37 |
2 files changed, 25 insertions, 14 deletions
diff --git a/pear/Makefile.in b/pear/Makefile.in index e427a020cb..4fbdf6cf53 100644 --- a/pear/Makefile.in +++ b/pear/Makefile.in @@ -19,7 +19,7 @@ PEAR_FILES = \ DB/storage.php \ HTTP.php \ File/Find.php \ - PEAR_ERROR.php + PEAR_Error.php install-data-local: @if $(mkinstalldirs) $(peardir); then \ diff --git a/pear/PEAR_ERROR.php b/pear/PEAR_Error.php index 1c45bd23a0..7fa2218059 100644 --- a/pear/PEAR_ERROR.php +++ b/pear/PEAR_Error.php @@ -25,38 +25,49 @@ // This class is based on ideas from Ulf Wendel // -class PEAR_ERROR +class PEAR_Error { - var $CLASSNAME = ''; - var $ERROR_MESSAGE_PREFIX = ''; - var $ERROR_PREPEND = ''; - var $ERROR_APPEND = ''; + var $classname = ''; + var $error_message_prefix = ''; + var $error_prepend = ''; + var $error_append = ''; - var $DIE_ON_ERROR = ''; - var $AUTO_PRINT_ERROR = ''; + var $die_on_error = false; + var $auto_print_error = false; - var $LEVEL = 0; - var $TRIGGER_ERROR = false; + var $level = 0; + var $trigger_error = false; var $message = ''; var $file = ''; var $line = 0; - function PEAR_ERROR ($message, $file = __FILE__, $line = __LINE__) + /* + * constructor, set the basics... + */ + function PEAR_Error ($message, $file = __FILE__, $line = __LINE__) { $this->message = $message; $this->file = $file; $this->line = $line; } + /* + * string getMessage (void) + * Get the error message from an exception object. + */ function getMessage () { - return ($this->ERROR_PREPEND . $this->ERROR_MESSAGE_PREFIX . - $this->message . $this->ERROR_APPEND); + return ($this->error_prepend . $this->error_message_prefix . + $this->message . $this->error_append); } + /* + * string getType (void) + * Get the name of the exception. + */ function getType () { - return ($this->CLASSNAME); + return ($this->classname); } }
\ No newline at end of file |