cvs: pear /HTML_Progress/Progress DM.php UI.php
| From: | Laurent Laville | Date: | Wed, 05 May 2004 18:22:03 +0000 |
| Subject: | cvs: pear /HTML_Progress/Progress DM.php UI.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-19235@lists.php.net to get a copy of this message | ||
farell Wed May 5 14:22:03 2004 EDT
Modified files:
/pear/HTML_Progress/Progress DM.php UI.php
Log:
fixed returns error
http://cvs.php.net/diff.php/pear/HTML_Progress/Progress/DM.php?r1=1.2&r2=1.3&ty=u Index: pear/HTML_Progress/Progress/DM.php diff -u pear/HTML_Progress/Progress/DM.php:1.2 pear/HTML_Progress/Progress/DM.php:1.3 --- pear/HTML_Progress/Progress/DM.php:1.2 Sun Apr 18 09:29:45 2004 +++ pear/HTML_Progress/Progress/DM.php Wed May 5 14:22:03 2004 @@ -15,7 +15,7 @@ // | Author: Laurent Laville <pear@laurent-laville.org> | // +----------------------------------------------------------------------+ // -// $Id: DM.php,v 1.2 2004/04/18 13:29:45 farell Exp $ +// $Id: DM.php,v 1.3 2004/05/05 18:22:03 farell Exp $ /** * The HTML_Progress_DM class handles any mathematical issues @@ -128,21 +128,21 @@ /* int min, int max */ if (!is_int($args[0])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$min', 'was' => $args[0], 'expected' => 'integer', 'paramnum' => 1)); } elseif ($args[0] < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $args[0], 'expected' => 'positive', 'paramnum' => 1)); } elseif ($args[0] > $args[1]) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $args[0], 'expected' => 'less than $max = '.$args[1], @@ -152,14 +152,14 @@ if (!is_int($args[1])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$max', 'was' => $args[1], 'expected' => 'integer', 'paramnum' => 2)); } elseif ($args[1] < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$max', 'was' => $args[1], 'expected' => 'positive', @@ -171,21 +171,21 @@ /* int min, int max, int inc */ if (!is_int($args[0])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$min', 'was' => $args[0], 'expected' => 'integer', 'paramnum' => 1)); } elseif ($args[0] < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $args[0], 'expected' => 'positive', 'paramnum' => 1)); } elseif ($args[0] > $args[1]) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $args[0], 'expected' => 'less than $max = '.$args[1], @@ -194,14 +194,14 @@ $this->_minimum = $args[0]; if (!is_int($args[1])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$max', 'was' => $args[1], 'expected' => 'integer', 'paramnum' => 2)); } elseif ($args[1] < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$max', 'was' => $args[1], 'expected' => 'positive', @@ -210,14 +210,14 @@ $this->_maximum = $args[1]; if (!is_int($args[2])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$inc', 'was' => $args[2], 'expected' => 'integer', 'paramnum' => 3)); } elseif ($args[2] < 1) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$inc', 'was' => $args[2], 'expected' => 'greater than zero', @@ -259,21 +259,21 @@ function setMinimum($min) { if (!is_int($min)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$min', 'was' => gettype($min), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($min < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $min, 'expected' => 'positive', 'paramnum' => 1)); } elseif ($min > $this->getMaximum()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $min, 'expected' => 'less than $max = '.$this->getMaximum(), @@ -316,21 +316,21 @@ function setMaximum($max) { if (!is_int($max)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$max', 'was' => gettype($max), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($max < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$max', 'was' => $max, 'expected' => 'positive', 'paramnum' => 1)); } elseif ($max < $this->getMinimum()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$max', 'was' => $max, 'expected' => 'greater than $min = '.$this->getMinimum(), @@ -373,14 +373,14 @@ function setIncrement($inc) { if (!is_int($inc)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$inc', 'was' => gettype($inc), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($inc == 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$inc', 'was' => $inc, 'expected' => 'not equal zero', @@ -422,21 +422,21 @@ function setValue($val) { if (!is_int($val)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$val', 'was' => gettype($val), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($val < $this->getMinimum()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$val', 'was' => $val, 'expected' => 'greater than $min = '.$this->getMinimum(), 'paramnum' => 1)); } elseif ($val > $this->getMaximum()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$val', 'was' => $val, 'expected' => 'less than $max = '.$this->getMaximum(), http://cvs.php.net/diff.php/pear/HTML_Progress/Progress/UI.php?r1=1.3&r2=1.4&ty=u Index: pear/HTML_Progress/Progress/UI.php diff -u pear/HTML_Progress/Progress/UI.php:1.3 pear/HTML_Progress/Progress/UI.php:1.4 --- pear/HTML_Progress/Progress/UI.php:1.3 Sat May 1 12:41:45 2004 +++ pear/HTML_Progress/Progress/UI.php Wed May 5 14:22:03 2004 @@ -15,7 +15,7 @@ // | Author: Laurent Laville <pear@laurent-laville.org> | // +----------------------------------------------------------------------+ // -// $Id: UI.php,v 1.3 2004/05/01 16:41:45 farell Exp $ +// $Id: UI.php,v 1.4 2004/05/05 18:22:03 farell Exp $ /** * The HTML_Progress_UI class provides a basic look and feel @@ -216,14 +216,14 @@ case 1: /* int cell */ if (!is_int($args[0])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$cell', 'was' => $args[0], 'expected' => 'integer', 'paramnum' => 1)); } elseif ($args[0] < 1) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$cell', 'was' => $args[0], 'expected' => 'greater or equal 1', @@ -315,7 +315,7 @@ function setOrientation($orient) { if (!is_int($orient)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$orient', 'was' => gettype($orient), 'expected' => 'integer', @@ -325,7 +325,7 @@ ($orient != HTML_PROGRESS_BAR_VERTICAL) && ($orient != HTML_PROGRESS_POLYGONAL) && ($orient != HTML_PROGRESS_CIRCLE)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$orient', 'was' => $orient, 'expected' => HTML_PROGRESS_BAR_HORIZONTAL.' | '. @@ -385,14 +385,14 @@ function setFillWay($way) { if (!is_string($way)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$way', 'was' => gettype($way), 'expected' => 'string', 'paramnum' => 1)); } elseif ((strtolower($way) != 'natural') && (strtolower($way) != 'reverse')) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$way', 'was' => $way, 'expected' => 'natural | reverse', @@ -430,14 +430,14 @@ function setCellCount($cells) { if (!is_int($cells)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$cells', 'was' => gettype($cells), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($cells < 1) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$cells', 'was' => $cells, 'expected' => 'greater or equal 1', @@ -463,7 +463,7 @@ function getCellAttributes($asString = false) { if (!is_bool($asString)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$asString', 'was' => gettype($asString), 'expected' => 'boolean', @@ -522,21 +522,21 @@ { if (!is_null($cell)) { if (!is_int($cell)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$cell', 'was' => gettype($cell), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($cell < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$cell', 'was' => $cell, 'expected' => 'positive', 'paramnum' => 1)); } elseif ($cell > $this->getCellCount()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$cell', 'was' => $cell, 'expected' => 'less or equal '.$this->getCellCount(), @@ -587,21 +587,35 @@ function setCellCoordinates($xgrid, $ygrid, $coord = array()) { if (!is_int($xgrid)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$xgrid', 'was' => gettype($xgrid), 'expected' => 'integer', 'paramnum' => 1)); + } elseif ($xgrid < 3) { + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + array('var' => '$xgrid', + 'was' => $xgrid, + 'expected' => 'greater than 2', + 'paramnum' => 1)); + } elseif (!is_int($ygrid)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$ygrid', 'was' => gettype($ygrid), 'expected' => 'integer', 'paramnum' => 2)); + } elseif ($ygrid < 3) { + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + array('var' => '$ygrid', + 'was' => $ygrid, + 'expected' => 'greater than 2', + 'paramnum' => 2)); + } elseif (!is_array($coord)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$coord', 'was' => gettype($coord), 'expected' => 'array', @@ -614,21 +628,21 @@ } else { foreach ($coord as $id => $pos) { if (!is_array($pos)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$coord[,$pos]', 'was' => gettype($pos), 'expected' => 'array', 'paramnum' => 3)); } if ($pos[0] >= $ygrid) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$pos[0]', 'was' => $pos[0], 'expected' => 'coordinate less than grid height', 'paramnum' => 2)); } if ($pos[1] >= $xgrid) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$pos[1]', 'was' => $pos[1], 'expected' => 'coordinate less than grid width', @@ -661,7 +675,7 @@ function getBorderAttributes($asString = false) { if (!is_bool($asString)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$asString', 'was' => gettype($asString), 'expected' => 'boolean', @@ -718,7 +732,7 @@ function getStringAttributes($asString = false) { if (!is_bool($asString)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$asString', 'was' => gettype($asString), 'expected' => 'boolean', @@ -784,7 +798,7 @@ function getProgressAttributes($asString = false) { if (!is_bool($asString)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$asString', 'was' => gettype($asString), 'expected' => 'boolean', @@ -922,14 +936,14 @@ { if (!is_null($url)) { if (!is_string($url)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$url', 'was' => gettype($url), 'expected' => 'string', 'paramnum' => 1)); } elseif (!is_file($url) || $url == '.' || $url == '..') { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$url', 'was' => $url.' file does not exists', 'expected' => 'javascript file exists',
http://cvs.php.net/diff.php/pear/HTML_Progress/Progress/DM.php?r1=1.2&r2=1.3&ty=u Index: pear/HTML_Progress/Progress/DM.php diff -u pear/HTML_Progress/Progress/DM.php:1.2 pear/HTML_Progress/Progress/DM.php:1.3 --- pear/HTML_Progress/Progress/DM.php:1.2 Sun Apr 18 09:29:45 2004 +++ pear/HTML_Progress/Progress/DM.php Wed May 5 14:22:03 2004 @@ -15,7 +15,7 @@ // | Author: Laurent Laville <pear@laurent-laville.org> | // +----------------------------------------------------------------------+ // -// $Id: DM.php,v 1.2 2004/04/18 13:29:45 farell Exp $ +// $Id: DM.php,v 1.3 2004/05/05 18:22:03 farell Exp $ /** * The HTML_Progress_DM class handles any mathematical issues @@ -128,21 +128,21 @@ /* int min, int max */ if (!is_int($args[0])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$min', 'was' => $args[0], 'expected' => 'integer', 'paramnum' => 1)); } elseif ($args[0] < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $args[0], 'expected' => 'positive', 'paramnum' => 1)); } elseif ($args[0] > $args[1]) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $args[0], 'expected' => 'less than $max = '.$args[1], @@ -152,14 +152,14 @@ if (!is_int($args[1])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$max', 'was' => $args[1], 'expected' => 'integer', 'paramnum' => 2)); } elseif ($args[1] < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$max', 'was' => $args[1], 'expected' => 'positive', @@ -171,21 +171,21 @@ /* int min, int max, int inc */ if (!is_int($args[0])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$min', 'was' => $args[0], 'expected' => 'integer', 'paramnum' => 1)); } elseif ($args[0] < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $args[0], 'expected' => 'positive', 'paramnum' => 1)); } elseif ($args[0] > $args[1]) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $args[0], 'expected' => 'less than $max = '.$args[1], @@ -194,14 +194,14 @@ $this->_minimum = $args[0]; if (!is_int($args[1])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$max', 'was' => $args[1], 'expected' => 'integer', 'paramnum' => 2)); } elseif ($args[1] < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$max', 'was' => $args[1], 'expected' => 'positive', @@ -210,14 +210,14 @@ $this->_maximum = $args[1]; if (!is_int($args[2])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$inc', 'was' => $args[2], 'expected' => 'integer', 'paramnum' => 3)); } elseif ($args[2] < 1) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$inc', 'was' => $args[2], 'expected' => 'greater than zero', @@ -259,21 +259,21 @@ function setMinimum($min) { if (!is_int($min)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$min', 'was' => gettype($min), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($min < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $min, 'expected' => 'positive', 'paramnum' => 1)); } elseif ($min > $this->getMaximum()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$min', 'was' => $min, 'expected' => 'less than $max = '.$this->getMaximum(), @@ -316,21 +316,21 @@ function setMaximum($max) { if (!is_int($max)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$max', 'was' => gettype($max), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($max < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$max', 'was' => $max, 'expected' => 'positive', 'paramnum' => 1)); } elseif ($max < $this->getMinimum()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$max', 'was' => $max, 'expected' => 'greater than $min = '.$this->getMinimum(), @@ -373,14 +373,14 @@ function setIncrement($inc) { if (!is_int($inc)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$inc', 'was' => gettype($inc), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($inc == 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$inc', 'was' => $inc, 'expected' => 'not equal zero', @@ -422,21 +422,21 @@ function setValue($val) { if (!is_int($val)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$val', 'was' => gettype($val), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($val < $this->getMinimum()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$val', 'was' => $val, 'expected' => 'greater than $min = '.$this->getMinimum(), 'paramnum' => 1)); } elseif ($val > $this->getMaximum()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$val', 'was' => $val, 'expected' => 'less than $max = '.$this->getMaximum(), http://cvs.php.net/diff.php/pear/HTML_Progress/Progress/UI.php?r1=1.3&r2=1.4&ty=u Index: pear/HTML_Progress/Progress/UI.php diff -u pear/HTML_Progress/Progress/UI.php:1.3 pear/HTML_Progress/Progress/UI.php:1.4 --- pear/HTML_Progress/Progress/UI.php:1.3 Sat May 1 12:41:45 2004 +++ pear/HTML_Progress/Progress/UI.php Wed May 5 14:22:03 2004 @@ -15,7 +15,7 @@ // | Author: Laurent Laville <pear@laurent-laville.org> | // +----------------------------------------------------------------------+ // -// $Id: UI.php,v 1.3 2004/05/01 16:41:45 farell Exp $ +// $Id: UI.php,v 1.4 2004/05/05 18:22:03 farell Exp $ /** * The HTML_Progress_UI class provides a basic look and feel @@ -216,14 +216,14 @@ case 1: /* int cell */ if (!is_int($args[0])) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$cell', 'was' => $args[0], 'expected' => 'integer', 'paramnum' => 1)); } elseif ($args[0] < 1) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$cell', 'was' => $args[0], 'expected' => 'greater or equal 1', @@ -315,7 +315,7 @@ function setOrientation($orient) { if (!is_int($orient)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$orient', 'was' => gettype($orient), 'expected' => 'integer', @@ -325,7 +325,7 @@ ($orient != HTML_PROGRESS_BAR_VERTICAL) && ($orient != HTML_PROGRESS_POLYGONAL) && ($orient != HTML_PROGRESS_CIRCLE)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$orient', 'was' => $orient, 'expected' => HTML_PROGRESS_BAR_HORIZONTAL.' | '. @@ -385,14 +385,14 @@ function setFillWay($way) { if (!is_string($way)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$way', 'was' => gettype($way), 'expected' => 'string', 'paramnum' => 1)); } elseif ((strtolower($way) != 'natural') && (strtolower($way) != 'reverse')) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$way', 'was' => $way, 'expected' => 'natural | reverse', @@ -430,14 +430,14 @@ function setCellCount($cells) { if (!is_int($cells)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$cells', 'was' => gettype($cells), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($cells < 1) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$cells', 'was' => $cells, 'expected' => 'greater or equal 1', @@ -463,7 +463,7 @@ function getCellAttributes($asString = false) { if (!is_bool($asString)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$asString', 'was' => gettype($asString), 'expected' => 'boolean', @@ -522,21 +522,21 @@ { if (!is_null($cell)) { if (!is_int($cell)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$cell', 'was' => gettype($cell), 'expected' => 'integer', 'paramnum' => 1)); } elseif ($cell < 0) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$cell', 'was' => $cell, 'expected' => 'positive', 'paramnum' => 1)); } elseif ($cell > $this->getCellCount()) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$cell', 'was' => $cell, 'expected' => 'less or equal '.$this->getCellCount(), @@ -587,21 +587,35 @@ function setCellCoordinates($xgrid, $ygrid, $coord = array()) { if (!is_int($xgrid)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$xgrid', 'was' => gettype($xgrid), 'expected' => 'integer', 'paramnum' => 1)); + } elseif ($xgrid < 3) { + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + array('var' => '$xgrid', + 'was' => $xgrid, + 'expected' => 'greater than 2', + 'paramnum' => 1)); + } elseif (!is_int($ygrid)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$ygrid', 'was' => gettype($ygrid), 'expected' => 'integer', 'paramnum' => 2)); + } elseif ($ygrid < 3) { + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + array('var' => '$ygrid', + 'was' => $ygrid, + 'expected' => 'greater than 2', + 'paramnum' => 2)); + } elseif (!is_array($coord)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$coord', 'was' => gettype($coord), 'expected' => 'array', @@ -614,21 +628,21 @@ } else { foreach ($coord as $id => $pos) { if (!is_array($pos)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$coord[,$pos]', 'was' => gettype($pos), 'expected' => 'array', 'paramnum' => 3)); } if ($pos[0] >= $ygrid) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$pos[0]', 'was' => $pos[0], 'expected' => 'coordinate less than grid height', 'paramnum' => 2)); } if ($pos[1] >= $xgrid) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$pos[1]', 'was' => $pos[1], 'expected' => 'coordinate less than grid width', @@ -661,7 +675,7 @@ function getBorderAttributes($asString = false) { if (!is_bool($asString)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$asString', 'was' => gettype($asString), 'expected' => 'boolean', @@ -718,7 +732,7 @@ function getStringAttributes($asString = false) { if (!is_bool($asString)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$asString', 'was' => gettype($asString), 'expected' => 'boolean', @@ -784,7 +798,7 @@ function getProgressAttributes($asString = false) { if (!is_bool($asString)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$asString', 'was' => gettype($asString), 'expected' => 'boolean', @@ -922,14 +936,14 @@ { if (!is_null($url)) { if (!is_string($url)) { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'exception', array('var' => '$url', 'was' => gettype($url), 'expected' => 'string', 'paramnum' => 1)); } elseif (!is_file($url) || $url == '.' || $url == '..') { - HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', + return HTML_Progress::raiseError(HTML_PROGRESS_ERROR_INVALID_INPUT, 'error', array('var' => '$url', 'was' => $url.' file does not exists', 'expected' => 'javascript file exists',