cvs: phd /include PhDHelper.class.php /themes/php phpdotnet.php phpweb.php

bjori Fri Aug 10 20:18:21 2007 UTC Modified files: /phd/themes/php phpweb.php phpdotnet.php /phd/include PhDHelper.class.php Log: - s/getContainer/getChildren/g - removed bogus code http://cvs.php.net/viewvc.cgi/phd/themes/php/phpweb.php?r1=1.3&r2=1.4&diff_format=u Index: phd/themes/php/phpweb.php diff -u phd/themes/php/phpweb.php:1.3 phd/themes/php/phpweb.php:1.4 --- phd/themes/php/phpweb.php:1.3 Fri Aug 10 20:16:14 2007 +++ phd/themes/php/phpweb.php Fri Aug 10 20:18:21 2007 @@ -1,5 +1,5 @@ <?php -/* $Id: phpweb.php,v 1.3 2007/08/10 20:16:14 bjori Exp $ */ +/* $Id: phpweb.php,v 1.4 2007/08/10 20:18:21 bjori Exp $ */ class phpweb extends phpdotnet implements PhDTheme { protected $streams = array(); @@ -39,8 +39,7 @@ public function header($id) { $toc = ""; $parent = PhDHelper::getParent($id); - foreach(PhDHelper::getContainer($parent) as $k => $v) { - if ($k == "parent") { continue; } + foreach(PhDHelper::getChildren($parent) as $k => $v) { $toc .= sprintf("array('%s.php', '%s'),\n", $k, addslashes(PhDHelper::getDescription($k, false))); } http://cvs.php.net/viewvc.cgi/phd/themes/php/phpdotnet.php?r1=1.2&r2=1.3&diff_format=u Index: phd/themes/php/phpdotnet.php diff -u phd/themes/php/phpdotnet.php:1.2 phd/themes/php/phpdotnet.php:1.3 --- phd/themes/php/phpdotnet.php:1.2 Fri Aug 10 20:16:14 2007 +++ phd/themes/php/phpdotnet.php Fri Aug 10 20:18:21 2007 @@ -1,5 +1,5 @@ <?php -/* $Id: phpdotnet.php,v 1.2 2007/08/10 20:16:14 bjori Exp $ */ +/* $Id: phpdotnet.php,v 1.3 2007/08/10 20:18:21 bjori Exp $ */ class phpdotnet extends PhDHelper { protected $elementmap = array( @@ -159,18 +159,16 @@ if ($open) { return "<div>"; } - $chunks = PhDHelper::getContainer($id); + $chunks = PhDHelper::getChildren($id); $content = ""; if (count($chunks) > 1) { $content = '<ul class="chunklist chunklist_'.$name.'">'; if ($name == "reference") { foreach($chunks as $chunkid => $junk) { - if ($chunkid == "parent") { continue; } $content .= sprintf('<li><a href="%s%s.%s">%s</a> — %s</li>', $this->chunked ? "" : "#", $chunkid, $this->ext, PhDHelper::getDescription($chunkid, false), PhDHelper::getDescription($chunkid, true)); } } else { foreach($chunks as $chunkid => $junk) { - if ($chunkid == "parent") { continue; } $content .= sprintf('<li><a href="%s%s.%s">%s</a></li>', $this->chunked ? "" : "#", $chunkid, $this->ext, PhDHelper::getDescription($chunkid, true)); } } http://cvs.php.net/viewvc.cgi/phd/include/PhDHelper.class.php?r1=1.3&r2=1.4&diff_format=u Index: phd/include/PhDHelper.class.php diff -u phd/include/PhDHelper.class.php:1.3 phd/include/PhDHelper.class.php:1.4 --- phd/include/PhDHelper.class.php:1.3 Fri Aug 10 20:16:14 2007 +++ phd/include/PhDHelper.class.php Fri Aug 10 20:18:21 2007 @@ -1,5 +1,5 @@ <?php -/* $Id: PhDHelper.class.php,v 1.3 2007/08/10 20:16:14 bjori Exp $ */ +/* $Id: PhDHelper.class.php,v 1.4 2007/08/10 20:18:21 bjori Exp $ */ class PhDHelper { private $IDs = array(); @@ -17,7 +17,7 @@ ($this->IDs[$id]["ldesc"] ? $this->IDs[$id]["ldesc"] : $this->IDs[$id]["sdesc"]) : ($this->IDs[$id]["sdesc"] ? $this->IDs[$id]["sdesc"] : $this->IDs[$id]["ldesc"]); } - final public function getContainer($id) { + final public function getChildren($id) { return $this->IDs[$id]["children"]; } final public function getParent($id) {