cvs: pear /HTML_Progress/Progress model.php

farell Wed May 5 14:22:31 2004 EDT Modified files: /pear/HTML_Progress/Progress model.php Log: cleansweep on error management http://cvs.php.net/diff.php/pear/HTML_Progress/Progress/model.php?r1=1.2&r2=1.3&ty=u Index: pear/HTML_Progress/Progress/model.php diff -u pear/HTML_Progress/Progress/model.php:1.2 pear/HTML_Progress/Progress/model.php:1.3 --- pear/HTML_Progress/Progress/model.php:1.2 Sun Apr 18 09:29:45 2004 +++ pear/HTML_Progress/Progress/model.php Wed May 5 14:22:31 2004 @@ -15,7 +15,7 @@ // | Author: Laurent Laville <pear@laurent-laville.org> | // +----------------------------------------------------------------------+ // -// $Id: model.php,v 1.2 2004/04/18 13:29:45 farell Exp $ +// $Id: model.php,v 1.3 2004/05/05 18:22:31 farell Exp $ /** * The HTML_Progress_Model class provides an easy way to set look and feel @@ -29,7 +29,7 @@ * @license http://www.php.net/license/3_0.txt PHP License 3.0 */ -require_once ('Config.php'); +require_once 'Config.php'; class HTML_Progress_Model extends HTML_Progress_UI { @@ -55,30 +55,24 @@ */ function HTML_Progress_Model($file, $type) { - $this->_package = 'HTML_Progress_Model'; - $stack =& Error_Stack::singleton($this->_package); - $messages = HTML_Progress::_getErrorMessage(); - $stack->setErrorMessageTemplate($messages); - $stack->setDefaultLogger($this); + $this->_package = 'HTML_Progress'; if (!file_exists($file)) { - $trace = debug_backtrace(); - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$file', 'was' => $file, 'expected' => 'file exists', - 'paramnum' => 1), $trace); + 'paramnum' => 1)); } $conf = new Config(); if (!$conf->isConfigTypeRegistered($type)) { - $trace = debug_backtrace(); - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$type', 'was' => $type, 'expected' => implode (" | ", array_keys($GLOBALS['CONFIG_TYPES'])), - 'paramnum' => 2), $trace); + 'paramnum' => 2)); } $data = $conf->parseConfig($file, $type);