cvs: php4 /pear/PHPDoc index.php /pear/PHPDoc/core Phpdoc.php PhpdocArgvHandler.php PhpdocObject.php PhpdocSetupHandler.php /pear/PHPDoc/redist
IT.php ITX.php /pear/PHPDoc/xmlwriter PhpdocXMLWriter.php
| From: | Ulf Wendel | Date: | Sun, 03 Dec 2000 20:30:44 +0000 |
| Subject: | cvs: php4 /pear/PHPDoc index.php /pear/PHPDoc/core Phpdoc.php PhpdocArgvHandler.php PhpdocObject.php PhpdocSetupHandler.php /pear/PHPDoc/redist IT.php ITX.php /pear/PHPDoc/xmlwriter PhpdocXMLWriter.php |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2899@lists.php.net to get a copy of this message | ||
uw Sun Dec 3 12:30:44 2000 EDT
Modified files:
/php4/pear/PHPDoc index.php
/php4/pear/PHPDoc/core Phpdoc.php PhpdocArgvHandler.php
PhpdocObject.php PhpdocSetupHandler.php
/php4/pear/PHPDoc/redist IT.php ITX.php
/php4/pear/PHPDoc/xmlwriter PhpdocXMLWriter.php
Log:
- refined doc comments.
core/* does no longer cause warnings.
- added @package to the it/itx doc comment
Index: php4/pear/PHPDoc/index.php diff -u php4/pear/PHPDoc/index.php:1.1 php4/pear/PHPDoc/index.php:1.2 --- php4/pear/PHPDoc/index.php:1.1 Sun Oct 8 03:03:18 2000 +++ php4/pear/PHPDoc/index.php Sun Dec 3 12:30:42 2000 @@ -40,7 +40,7 @@ // Directory with include files define("PHPDOC_INCLUDE_DIR", "c:/www/apache/doc/"); // Important: set this to the Linebreak sign of your system! - define("LINEBREAK", "\r\n"); + define("PHPDOC_LINEBREAK", "\r\n"); // main PHPDoc Include File include("./prepend.php"); Index: php4/pear/PHPDoc/core/Phpdoc.php diff -u php4/pear/PHPDoc/core/Phpdoc.php:1.3 php4/pear/PHPDoc/core/Phpdoc.php:1.4 --- php4/pear/PHPDoc/core/Phpdoc.php:1.3 Sat Dec 2 16:37:58 2000 +++ php4/pear/PHPDoc/core/Phpdoc.php Sun Dec 3 12:30:42 2000 @@ -2,13 +2,15 @@ /** * Coordinates several Phpdoc Object to parse and render source files. * -* @access public +* @access public +* @version $Id: Phpdoc.php,v 1.4 2000/12/03 20:30:42 uw Exp $ */ class Phpdoc extends PhpdocSetupHandler { /** * Result from the indexer - * @var array $indexer + * + * @var array * @see render() */ var $indexer_result = array(); @@ -21,7 +23,7 @@ /** * Calls the command line handler if necessary. * - * @global $argc, $PHP_SELF + * @global array $argc, string $PHP_SELF */ function Phpdoc() { global $argc, $PHP_SELF; @@ -39,7 +41,6 @@ * @return bool $ok * @throws PhpdocError * @access public - * @see */ function parse() { Index: php4/pear/PHPDoc/core/PhpdocArgvHandler.php diff -u php4/pear/PHPDoc/core/PhpdocArgvHandler.php:1.1 php4/pear/PHPDoc/core/PhpdocArgvHandler.php:1.2 --- php4/pear/PHPDoc/core/PhpdocArgvHandler.php:1.1 Sun Oct 8 03:03:18 2000 +++ php4/pear/PHPDoc/core/PhpdocArgvHandler.php Sun Dec 3 12:30:42 2000 @@ -6,7 +6,7 @@ * Any help and comments are welcome... * * @author Ulf Wendel <ulf@redsys.de> -* @version 0.1alpha +* @version $Id: PhpdocArgvHandler.php,v 1.2 2000/12/03 20:30:42 uw Exp $ */ class PhpdocArgvHandler extends PhpdocObject { @@ -17,7 +17,7 @@ * the instructions. The array is indexed by the command line option e.g. "-h". * The array values hold a short message describing the usage of the option. * - * @var string $command + * @var array * @access private */ var $COMMANDS = array( @@ -142,7 +142,7 @@ * * @access private * @return string $help_msg Some instructions on available command line options - * @see handleArgv(), COMMANDS + * @see handleArgv(), $COMMANDS */ function getArgvHelpMessage() { Index: php4/pear/PHPDoc/core/PhpdocObject.php diff -u php4/pear/PHPDoc/core/PhpdocObject.php:1.1 php4/pear/PHPDoc/core/PhpdocObject.php:1.2 --- php4/pear/PHPDoc/core/PhpdocObject.php:1.1 Sun Oct 8 03:03:18 2000 +++ php4/pear/PHPDoc/core/PhpdocObject.php Sun Dec 3 12:30:42 2000 @@ -9,26 +9,42 @@ * class without any trouble. * * @author Ulf Wendel <ulf.wendel@phpdoc.de> -* @version 1.0beta +* @version $Id: PhpdocObject.php,v 1.2 2000/12/03 20:30:42 uw Exp $ * @package PHPDoc */ class PhpdocObject { - var $application = "PHPDoc"; - - var $warn; - /** - * Variable containing the latest exception object - * @var object exception $err + * Variable containing the latest exceptions. + * + * The way PHPDoc handles errors is a little different from the + * official PEAR way. PHPDoc methods do not return + * error objects but save them to the class variable $err and try + * to return a value that indicates that an error occured. + * + * @var array * @access public */ var $err = array(); + + /** + * Default applicationname for the generated HTML files. + * + * @var string + */ + var $application = "PHPDoc"; /** + * Use to save warnings. + * + * @var array + */ + var $warn; + + /** * Flag determining wheter to print some status messages or not (default: false) - * @var bool $flag_output - * @access privte + * + * @var boolean $flag_output * @see setFlagOutput() * @since 0.3 */ @@ -36,9 +52,10 @@ /** * Sets the output flag - if set to true out() and outl() print messages - * @param bool $flagOutput + * + * @param boolean $flagOutput * @access public - * @see flag_output, out(), outl() + * @see $flag_output, out(), outl() * @since 0.3 */ function setFlagOutput($flagOutput) { @@ -90,14 +107,14 @@ * @param string $title Optional title used in the HTML Table * @param mixed $data Optional array or object that you want to dump. * Fallback to $this. - * @param bool $userfunction Optional flag. If set to false userfunction + * @param boolean $userfunction Optional flag. If set to false userfunction * in an object are not shown (default). If set to * true, userfunctions are rendered * * @access public * @version 0.2 */ - function introspection($title="", $data = "", $userfunction=true) { + function introspection($title="", $data = "", $userfunction = true) { if (""==$data) $data = $this; Index: php4/pear/PHPDoc/core/PhpdocSetupHandler.php diff -u php4/pear/PHPDoc/core/PhpdocSetupHandler.php:1.4 php4/pear/PHPDoc/core/PhpdocSetupHandler.php:1.5 --- php4/pear/PHPDoc/core/PhpdocSetupHandler.php:1.4 Sat Dec 2 16:37:58 2000 +++ php4/pear/PHPDoc/core/PhpdocSetupHandler.php Sun Dec 3 12:30:42 2000 @@ -5,13 +5,14 @@ * This class provides all methods neccessary to "setup" Phpdoc and check the * current setup. * -* @version 0.2alpha +* @version $Id: PhpdocSetupHandler.php,v 1.5 2000/12/03 20:30:42 uw Exp $ * @author Ulf Wendel <ulf@redsys.de> */ class PhpdocSetupHandler extends PhpdocArgvHandler { /** * Name of the target directory. + * * @var string $target * @access private */ @@ -19,6 +20,7 @@ /** * Name of the application parsed + * * @var string $application * @see setApplication() */ @@ -26,44 +28,42 @@ /** * Basedir for all file operations + * * @var string $basedir - * @see setApplication(), setBasedir() + * @see setApplication() */ var $basedir = ""; /** - * Suffix for all rendered files in the application (not for the xml files) - * If you used an other file suffix than ".html" in you have to override this - * variable using setTargetFileSuffix() + * Suffix for all rendered files in the application (except for the xml files). + * * @var string targetFileSuffix * @see setTargetFileSuffix() */ - var $targetFileSuffix = ".html"; + var $targetFileSuffix = ".html"; /** * Suffix of all source code files in the application - * If you used other file suffixes than ".php" in you have to override this + * + * If you used other file suffixes than ".php" in you have to override this. + * * variable using setSourceFileSuffix() * @var array sourceFileSuffix * @see setSourceFileSuffix() */ - var $sourceFileSuffix = array ( "php" ); + var $sourceFileSuffix = array ( "php" ); /** * Directory with the php sources to parse. + * * @var string - * @see setSourceDir() + * @see setSourceDirectory() */ var $sourceDirectory = ""; /** - * Directory with the templates. - * @var string - * @see setTemplateDirectory() - */ - - /** * Sets the name of the directory with the source to scan. + * * @param string * @access public */ @@ -73,6 +73,7 @@ /** * Sets the name of the directory with the templates. + * * @param string * @access public */ @@ -102,13 +103,13 @@ /** * Suffix for all rendered files in the application (not for the xml files) + * * By default the the suffix is set to ".html". * * @param string $suffix string with the suffix - * @return bool $ok - * @access private - * @see targetFileSuffix - * @author Thomas Weinert <subjective@subjective.de> + * @return bool $ok + * @see $targetFileSuffix + * @author Thomas Weinert <subjective@subjective.de> */ function setTargetFileSuffix($suffix) { if ("" != $suffix && "." != $suffix[0]) { @@ -122,6 +123,7 @@ /** * Suffix of all source code files in the application + * * By default only files with the suffix ".php" are recognized as * php source code files and parsed. If you used other * suffixes such as ".inc" you have to tell phpdoc to parse @@ -130,8 +132,7 @@ * @param mixed $suffix string with one suffix or array of suffixes * @return bool $ok * @throws PhpdocError - * @access private - * @see sourceFileSuffix + * @see $sourceFileSuffix */ function setSourceFileSuffix($suffix) { if ( (!is_array($suffix) && "" == $suffix) || (is_array($suffix) && 0 == count($suffix)) ) { @@ -160,7 +161,7 @@ } if (!is_dir($target)) { - $ok = @mkdir($target, 0755); + $ok = mkdir($target, 0755); if (!$ok) { $this->err[] = new PhpdocError("setTarget(), can't create a directory '$target'.", __FILE__, __LINE__); return false; @@ -172,10 +173,8 @@ } // end func setTarget /** - * Checks the current status of the object. Are all necessary informations - * to start parsing available? - * @param array $errors - * @access private + * Checks the current status of the object. Are all necessary informations to start parsing available? + * @param mixed $errors * @return array $errors */ function checkStatus($errors = "") { Index: php4/pear/PHPDoc/redist/IT.php diff -u php4/pear/PHPDoc/redist/IT.php:1.3 php4/pear/PHPDoc/redist/IT.php:1.4 --- php4/pear/PHPDoc/redist/IT.php:1.3 Tue Oct 10 05:07:57 2000 +++ php4/pear/PHPDoc/redist/IT.php Sun Dec 3 12:30:42 2000 @@ -28,8 +28,9 @@ * $tpl->get(); * * @author Ulf Wendel <uw@netuse.de> -* @version 1.1 28/09/00 +* @version $Id: IT.php,v 1.4 2000/12/03 20:30:42 uw Exp $ * @access public +* @package PHPDoc */ class IntegratedTemplate { @@ -309,8 +310,8 @@ } - $outer = preg_replace($regs, $values, $this->blocklist[$block]); - $empty = (0==count($values)) ? true : false; + $outer = (0 == count($regs)) ? $this->blocklist[$block] : preg_replace($regs, $values, $this->blocklist[$block]); + $empty = (0 == count($values)) ? true : false; if (isset($this->blockinner[$block])) { Index: php4/pear/PHPDoc/redist/ITX.php diff -u php4/pear/PHPDoc/redist/ITX.php:1.1 php4/pear/PHPDoc/redist/ITX.php:1.2 --- php4/pear/PHPDoc/redist/ITX.php:1.1 Sun Oct 8 03:03:19 2000 +++ php4/pear/PHPDoc/redist/ITX.php Sun Dec 3 12:30:42 2000 @@ -13,7 +13,8 @@ * * @author Ulf Wendel <uw@netuse.de> * @access public -* @version 1.0 22/09/00 +* @version $ID: $ +* @package PHPDoc */ class IntegratedTemplateExtension extends IntegratedTemplate { Index: php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php diff -u php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php:1.1 php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php:1.2 --- php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php:1.1 Sun Oct 8 03:03:21 2000 +++ php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php Sun Dec 3 12:30:42 2000 @@ -7,7 +7,7 @@ * functions to handle attributes and hides file handling tasks. * * @author Ulf Wendel <ulf.wendel@phpdoc.de> -* @version 1.0 +* @version $Id: PhpdocXMLWriter.php,v 1.2 2000/12/03 20:30:42 uw Exp $ */ class PhpdocXMLWriter extends PhpdocObject { @@ -167,8 +167,8 @@ * @return string $value */ function xmlencode($value) { -# return preg_replace( array("@<@", "@>@", "@'@", '@"@', "@&@", "@".LINEBREAK."@", "@\n@", "@\r@"), array("<", ">", "'", """, "&", '
', '
', '
'), $value); - return utf8_encode(preg_replace( array("@<@", "@>@", "@'@", '@"@', "@&@", "@".LINEBREAK."@", "@\n@", "@\r@"), array("<", ">", "'", """, "&", '
', '
', '
'), $value)); +# return preg_replace( array("@<@", "@>@", "@'@", '@"@', "@&@", "@" . PHPDOC_LINEBREAK ."@", "@\n@", "@\r@"), array("<", ">", "'", """, "&", '
', '
', '
'), $value); + return utf8_encode(preg_replace( array("@<@", "@>@", "@'@", '@"@', "@&@", "@" . PHPDOC_LINEBREAK . "@", "@\n@", "@\r@"), array("<", ">", "'", """, "&", '
', '
', '
'), $value)); } // end func xmlencode } // end class PhpdocXMLWriter
Index: php4/pear/PHPDoc/index.php diff -u php4/pear/PHPDoc/index.php:1.1 php4/pear/PHPDoc/index.php:1.2 --- php4/pear/PHPDoc/index.php:1.1 Sun Oct 8 03:03:18 2000 +++ php4/pear/PHPDoc/index.php Sun Dec 3 12:30:42 2000 @@ -40,7 +40,7 @@ // Directory with include files define("PHPDOC_INCLUDE_DIR", "c:/www/apache/doc/"); // Important: set this to the Linebreak sign of your system! - define("LINEBREAK", "\r\n"); + define("PHPDOC_LINEBREAK", "\r\n"); // main PHPDoc Include File include("./prepend.php"); Index: php4/pear/PHPDoc/core/Phpdoc.php diff -u php4/pear/PHPDoc/core/Phpdoc.php:1.3 php4/pear/PHPDoc/core/Phpdoc.php:1.4 --- php4/pear/PHPDoc/core/Phpdoc.php:1.3 Sat Dec 2 16:37:58 2000 +++ php4/pear/PHPDoc/core/Phpdoc.php Sun Dec 3 12:30:42 2000 @@ -2,13 +2,15 @@ /** * Coordinates several Phpdoc Object to parse and render source files. * -* @access public +* @access public +* @version $Id: Phpdoc.php,v 1.4 2000/12/03 20:30:42 uw Exp $ */ class Phpdoc extends PhpdocSetupHandler { /** * Result from the indexer - * @var array $indexer + * + * @var array * @see render() */ var $indexer_result = array(); @@ -21,7 +23,7 @@ /** * Calls the command line handler if necessary. * - * @global $argc, $PHP_SELF + * @global array $argc, string $PHP_SELF */ function Phpdoc() { global $argc, $PHP_SELF; @@ -39,7 +41,6 @@ * @return bool $ok * @throws PhpdocError * @access public - * @see */ function parse() { Index: php4/pear/PHPDoc/core/PhpdocArgvHandler.php diff -u php4/pear/PHPDoc/core/PhpdocArgvHandler.php:1.1 php4/pear/PHPDoc/core/PhpdocArgvHandler.php:1.2 --- php4/pear/PHPDoc/core/PhpdocArgvHandler.php:1.1 Sun Oct 8 03:03:18 2000 +++ php4/pear/PHPDoc/core/PhpdocArgvHandler.php Sun Dec 3 12:30:42 2000 @@ -6,7 +6,7 @@ * Any help and comments are welcome... * * @author Ulf Wendel <ulf@redsys.de> -* @version 0.1alpha +* @version $Id: PhpdocArgvHandler.php,v 1.2 2000/12/03 20:30:42 uw Exp $ */ class PhpdocArgvHandler extends PhpdocObject { @@ -17,7 +17,7 @@ * the instructions. The array is indexed by the command line option e.g. "-h". * The array values hold a short message describing the usage of the option. * - * @var string $command + * @var array * @access private */ var $COMMANDS = array( @@ -142,7 +142,7 @@ * * @access private * @return string $help_msg Some instructions on available command line options - * @see handleArgv(), COMMANDS + * @see handleArgv(), $COMMANDS */ function getArgvHelpMessage() { Index: php4/pear/PHPDoc/core/PhpdocObject.php diff -u php4/pear/PHPDoc/core/PhpdocObject.php:1.1 php4/pear/PHPDoc/core/PhpdocObject.php:1.2 --- php4/pear/PHPDoc/core/PhpdocObject.php:1.1 Sun Oct 8 03:03:18 2000 +++ php4/pear/PHPDoc/core/PhpdocObject.php Sun Dec 3 12:30:42 2000 @@ -9,26 +9,42 @@ * class without any trouble. * * @author Ulf Wendel <ulf.wendel@phpdoc.de> -* @version 1.0beta +* @version $Id: PhpdocObject.php,v 1.2 2000/12/03 20:30:42 uw Exp $ * @package PHPDoc */ class PhpdocObject { - var $application = "PHPDoc"; - - var $warn; - /** - * Variable containing the latest exception object - * @var object exception $err + * Variable containing the latest exceptions. + * + * The way PHPDoc handles errors is a little different from the + * official PEAR way. PHPDoc methods do not return + * error objects but save them to the class variable $err and try + * to return a value that indicates that an error occured. + * + * @var array * @access public */ var $err = array(); + + /** + * Default applicationname for the generated HTML files. + * + * @var string + */ + var $application = "PHPDoc"; /** + * Use to save warnings. + * + * @var array + */ + var $warn; + + /** * Flag determining wheter to print some status messages or not (default: false) - * @var bool $flag_output - * @access privte + * + * @var boolean $flag_output * @see setFlagOutput() * @since 0.3 */ @@ -36,9 +52,10 @@ /** * Sets the output flag - if set to true out() and outl() print messages - * @param bool $flagOutput + * + * @param boolean $flagOutput * @access public - * @see flag_output, out(), outl() + * @see $flag_output, out(), outl() * @since 0.3 */ function setFlagOutput($flagOutput) { @@ -90,14 +107,14 @@ * @param string $title Optional title used in the HTML Table * @param mixed $data Optional array or object that you want to dump. * Fallback to $this. - * @param bool $userfunction Optional flag. If set to false userfunction + * @param boolean $userfunction Optional flag. If set to false userfunction * in an object are not shown (default). If set to * true, userfunctions are rendered * * @access public * @version 0.2 */ - function introspection($title="", $data = "", $userfunction=true) { + function introspection($title="", $data = "", $userfunction = true) { if (""==$data) $data = $this; Index: php4/pear/PHPDoc/core/PhpdocSetupHandler.php diff -u php4/pear/PHPDoc/core/PhpdocSetupHandler.php:1.4 php4/pear/PHPDoc/core/PhpdocSetupHandler.php:1.5 --- php4/pear/PHPDoc/core/PhpdocSetupHandler.php:1.4 Sat Dec 2 16:37:58 2000 +++ php4/pear/PHPDoc/core/PhpdocSetupHandler.php Sun Dec 3 12:30:42 2000 @@ -5,13 +5,14 @@ * This class provides all methods neccessary to "setup" Phpdoc and check the * current setup. * -* @version 0.2alpha +* @version $Id: PhpdocSetupHandler.php,v 1.5 2000/12/03 20:30:42 uw Exp $ * @author Ulf Wendel <ulf@redsys.de> */ class PhpdocSetupHandler extends PhpdocArgvHandler { /** * Name of the target directory. + * * @var string $target * @access private */ @@ -19,6 +20,7 @@ /** * Name of the application parsed + * * @var string $application * @see setApplication() */ @@ -26,44 +28,42 @@ /** * Basedir for all file operations + * * @var string $basedir - * @see setApplication(), setBasedir() + * @see setApplication() */ var $basedir = ""; /** - * Suffix for all rendered files in the application (not for the xml files) - * If you used an other file suffix than ".html" in you have to override this - * variable using setTargetFileSuffix() + * Suffix for all rendered files in the application (except for the xml files). + * * @var string targetFileSuffix * @see setTargetFileSuffix() */ - var $targetFileSuffix = ".html"; + var $targetFileSuffix = ".html"; /** * Suffix of all source code files in the application - * If you used other file suffixes than ".php" in you have to override this + * + * If you used other file suffixes than ".php" in you have to override this. + * * variable using setSourceFileSuffix() * @var array sourceFileSuffix * @see setSourceFileSuffix() */ - var $sourceFileSuffix = array ( "php" ); + var $sourceFileSuffix = array ( "php" ); /** * Directory with the php sources to parse. + * * @var string - * @see setSourceDir() + * @see setSourceDirectory() */ var $sourceDirectory = ""; /** - * Directory with the templates. - * @var string - * @see setTemplateDirectory() - */ - - /** * Sets the name of the directory with the source to scan. + * * @param string * @access public */ @@ -73,6 +73,7 @@ /** * Sets the name of the directory with the templates. + * * @param string * @access public */ @@ -102,13 +103,13 @@ /** * Suffix for all rendered files in the application (not for the xml files) + * * By default the the suffix is set to ".html". * * @param string $suffix string with the suffix - * @return bool $ok - * @access private - * @see targetFileSuffix - * @author Thomas Weinert <subjective@subjective.de> + * @return bool $ok + * @see $targetFileSuffix + * @author Thomas Weinert <subjective@subjective.de> */ function setTargetFileSuffix($suffix) { if ("" != $suffix && "." != $suffix[0]) { @@ -122,6 +123,7 @@ /** * Suffix of all source code files in the application + * * By default only files with the suffix ".php" are recognized as * php source code files and parsed. If you used other * suffixes such as ".inc" you have to tell phpdoc to parse @@ -130,8 +132,7 @@ * @param mixed $suffix string with one suffix or array of suffixes * @return bool $ok * @throws PhpdocError - * @access private - * @see sourceFileSuffix + * @see $sourceFileSuffix */ function setSourceFileSuffix($suffix) { if ( (!is_array($suffix) && "" == $suffix) || (is_array($suffix) && 0 == count($suffix)) ) { @@ -160,7 +161,7 @@ } if (!is_dir($target)) { - $ok = @mkdir($target, 0755); + $ok = mkdir($target, 0755); if (!$ok) { $this->err[] = new PhpdocError("setTarget(), can't create a directory '$target'.", __FILE__, __LINE__); return false; @@ -172,10 +173,8 @@ } // end func setTarget /** - * Checks the current status of the object. Are all necessary informations - * to start parsing available? - * @param array $errors - * @access private + * Checks the current status of the object. Are all necessary informations to start parsing available? + * @param mixed $errors * @return array $errors */ function checkStatus($errors = "") { Index: php4/pear/PHPDoc/redist/IT.php diff -u php4/pear/PHPDoc/redist/IT.php:1.3 php4/pear/PHPDoc/redist/IT.php:1.4 --- php4/pear/PHPDoc/redist/IT.php:1.3 Tue Oct 10 05:07:57 2000 +++ php4/pear/PHPDoc/redist/IT.php Sun Dec 3 12:30:42 2000 @@ -28,8 +28,9 @@ * $tpl->get(); * * @author Ulf Wendel <uw@netuse.de> -* @version 1.1 28/09/00 +* @version $Id: IT.php,v 1.4 2000/12/03 20:30:42 uw Exp $ * @access public +* @package PHPDoc */ class IntegratedTemplate { @@ -309,8 +310,8 @@ } - $outer = preg_replace($regs, $values, $this->blocklist[$block]); - $empty = (0==count($values)) ? true : false; + $outer = (0 == count($regs)) ? $this->blocklist[$block] : preg_replace($regs, $values, $this->blocklist[$block]); + $empty = (0 == count($values)) ? true : false; if (isset($this->blockinner[$block])) { Index: php4/pear/PHPDoc/redist/ITX.php diff -u php4/pear/PHPDoc/redist/ITX.php:1.1 php4/pear/PHPDoc/redist/ITX.php:1.2 --- php4/pear/PHPDoc/redist/ITX.php:1.1 Sun Oct 8 03:03:19 2000 +++ php4/pear/PHPDoc/redist/ITX.php Sun Dec 3 12:30:42 2000 @@ -13,7 +13,8 @@ * * @author Ulf Wendel <uw@netuse.de> * @access public -* @version 1.0 22/09/00 +* @version $ID: $ +* @package PHPDoc */ class IntegratedTemplateExtension extends IntegratedTemplate { Index: php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php diff -u php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php:1.1 php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php:1.2 --- php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php:1.1 Sun Oct 8 03:03:21 2000 +++ php4/pear/PHPDoc/xmlwriter/PhpdocXMLWriter.php Sun Dec 3 12:30:42 2000 @@ -7,7 +7,7 @@ * functions to handle attributes and hides file handling tasks. * * @author Ulf Wendel <ulf.wendel@phpdoc.de> -* @version 1.0 +* @version $Id: PhpdocXMLWriter.php,v 1.2 2000/12/03 20:30:42 uw Exp $ */ class PhpdocXMLWriter extends PhpdocObject { @@ -167,8 +167,8 @@ * @return string $value */ function xmlencode($value) { -# return preg_replace( array("@<@", "@>@", "@'@", '@"@', "@&@", "@".LINEBREAK."@", "@\n@", "@\r@"), array("<", ">", "'", """, "&", '
', '
', '
'), $value); - return utf8_encode(preg_replace( array("@<@", "@>@", "@'@", '@"@', "@&@", "@".LINEBREAK."@", "@\n@", "@\r@"), array("<", ">", "'", """, "&", '
', '
', '
'), $value)); +# return preg_replace( array("@<@", "@>@", "@'@", '@"@', "@&@", "@" . PHPDOC_LINEBREAK ."@", "@\n@", "@\r@"), array("<", ">", "'", """, "&", '
', '
', '
'), $value); + return utf8_encode(preg_replace( array("@<@", "@>@", "@'@", '@"@', "@&@", "@" . PHPDOC_LINEBREAK . "@", "@\n@", "@\r@"), array("<", ">", "'", """, "&", '
', '
', '
'), $value)); } // end func xmlencode } // end class PhpdocXMLWriter