From: Carsten K. <car...@us...> - 2002-02-21 08:53:00
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory usw-pr-cvs1:/tmp/cvs-serv7527 Modified Files: PageType.php Log Message: comments cleanup Index: PageType.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/PageType.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -2 -b -p -d -r1.8 -r1.9 --- PageType.php 19 Feb 2002 03:42:36 -0000 1.8 +++ PageType.php 21 Feb 2002 08:52:56 -0000 1.9 @@ -1,22 +1,22 @@ <?php rcs_id('$Id$'); /* -Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam + Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam -This file is part of PhpWiki. + This file is part of PhpWiki. -PhpWiki is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + PhpWiki is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -PhpWiki is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + PhpWiki is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with PhpWiki; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ + You should have received a copy of the GNU General Public License + along with PhpWiki; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ @@ -96,5 +96,7 @@ class PageType { function _defineSections() { - // section_id => ('css_class', $this->_section_function) + /** + * ... section_id => ('css_class', $this->_section_function) + */ $this->_divs = array('wikitext' => array('wikitext', $this->_extractText())); } @@ -128,5 +130,7 @@ class interWikiMapPageType extends PageT function _defineSections() { - // section_id => ('css_class', $this->_section_function) + /** + * section_id => ('css_class', $this->_section_function) + */ $this->_divs = array('interwikimap-header' => array('wikitext', $this->_extractStartText()), 'interwikimap' => array('wikitext', $this->_getMap()), @@ -135,10 +139,5 @@ class interWikiMapPageType extends PageT function _getMap() { - // plain text - // return TransformText("<verbatim>" . $this->_extractMap() . "</verbatim>", $this->markup); global $request; - // table with links - //return $this->_arrayToTable($this->_extractMap(), $request); - // let interwiki.php get the map include_once("lib/interwiki.php"); @@ -174,5 +173,5 @@ class interWikiMapPageType extends PageT function _extractStartText() { - // cut the map out of the text + // get the start block of text $v = strpos($this->_content, "<verbatim>"); if ($v) @@ -188,5 +187,5 @@ class interWikiMapPageType extends PageT function _extractEndText() { - // cut the map out of the text + // get the ending block of text $v = strpos($this->_content, "</verbatim>"); if ($v) { @@ -198,21 +197,4 @@ class interWikiMapPageType extends PageT } - /* - function _extractMap() { - if (preg_match('|^<verbatim>\n(.*)^</verbatim>|ms', - $this->_content['rawmarkup'], $m)) { - $maptext = $m[1]; - } - //return $maptext; - global $AllowedProtocols; - if (!preg_match_all("/^\s*(\S+)\s+(\S+)/m", - $maptext, $matches, PREG_SET_ORDER)) - return false; - foreach ($matches as $m) { - $map[$m[1]] = $m[2]; - } - return $map; - } - */ }; |