From: <var...@us...> - 2009-01-21 09:18:24
|
Revision: 6423 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6423&view=rev Author: vargenau Date: 2009-01-21 09:18:16 +0000 (Wed, 21 Jan 2009) Log Message: ----------- No div around plugin invocation Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2009-01-20 14:30:22 UTC (rev 6422) +++ trunk/lib/CachedMarkup.php 2009-01-21 09:18:16 UTC (rev 6423) @@ -767,35 +767,14 @@ function expand($basepage, &$markup) { $loader = $this->_getLoader(); - $xml = $loader->expandPI($this->_pi, $GLOBALS['request'], $markup, $basepage); - $div = HTML::div(array('class' => 'plugin')); - if (isset($this->name)) - $id = GenerateId($this->name . 'Plugin'); - - if (isset($this->_tightenable)) { - if ($this->_tightenable == 3) { - // We need a div here, it might contain a table - $span = HTML::div(array('class' => 'plugin'), $xml); - if (!empty($id)) - $span->setAttr('id', $id); - return $span; - } - $div->setInClass('tightenable'); - $div->setInClass('top', ($this->_tightenable & 1) != 0); - $div->setInClass('bottom', ($this->_tightenable & 2) != 0); - } - if (!empty($id)) - $div->setAttr('id', $id); - $div->pushContent($xml); - return $div; + return $xml; } function asString() { return $this->_pi; } - function getWikiPageLinks($basepage) { $loader = $this->_getLoader(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-01-21 10:43:25
|
Revision: 6426 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6426&view=rev Author: vargenau Date: 2009-01-21 10:43:22 +0000 (Wed, 21 Jan 2009) Log Message: ----------- Remove gzcompress because of single quote bug Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2009-01-21 10:32:50 UTC (rev 6425) +++ trunk/lib/CachedMarkup.php 2009-01-21 10:43:22 UTC (rev 6426) @@ -36,8 +36,12 @@ } function pack() { - if (function_exists('gzcompress')) - return gzcompress(serialize($this), 9); + // This causes a strange bug when a comment containing + // a single quote is entered in the Summary box: + // - the history is wrong (user and comment missing) + // - the table of contents plugin no longer works + // if (function_exists('gzcompress')) + // return gzcompress(serialize($this), 9); return serialize($this); // FIXME: probably should implement some sort of "compression" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-02-25 14:52:01
|
Revision: 6562 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6562&view=rev Author: vargenau Date: 2009-02-25 14:51:51 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Fix pack function for Gforge Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2009-02-25 14:11:28 UTC (rev 6561) +++ trunk/lib/CachedMarkup.php 2009-02-25 14:51:51 UTC (rev 6562) @@ -2,6 +2,7 @@ rcs_id('$Id$'); /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...> * Copyright (C) 2004-2008 $ThePhpWikiProgrammingTeam + * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -35,6 +36,17 @@ } function pack() { + + // Gforge hack + // This causes a strange bug when a comment containing + // a single quote is entered in the Summary box: + // - the history is wrong (user and comment missing) + // - the table of contents plugin no longer works + global $WikiTheme; + if (isa($WikiTheme, 'WikiTheme_gforge')) { + return serialize($this); + } + if (function_exists('gzcompress')) return gzcompress(serialize($this), 9); return serialize($this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-04-19 18:26:47
|
Revision: 6796 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6796&view=rev Author: vargenau Date: 2009-04-19 18:26:36 +0000 (Sun, 19 Apr 2009) Log Message: ----------- Fix WantedPages: interwikis should not appear Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2009-04-19 09:59:32 UTC (rev 6795) +++ trunk/lib/CachedMarkup.php 2009-04-19 18:26:36 UTC (rev 6796) @@ -691,13 +691,7 @@ } function getWikiPageLinks($basepage) { - if ($basepage == '') return false; - /* ":DontStoreLink" */ - if (substr($this->_link,0,1) == ':') return false; - /* store only links to valid pagenames */ - if ($link = $this->getPagename($basepage)) - return array(array('linkto' => $link, 'relation' => 0)); - else return false; // dont store external links + return false; // do not store external links } function _getName($basepage) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2009-06-04 11:35:15
|
Revision: 6870 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6870&view=rev Author: rurban Date: 2009-06-04 11:35:04 +0000 (Thu, 04 Jun 2009) Log Message: ----------- support :DontStoreLink Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2009-06-04 11:33:24 UTC (rev 6869) +++ trunk/lib/CachedMarkup.php 2009-06-04 11:35:04 UTC (rev 6870) @@ -243,7 +243,8 @@ { // give the content the chance to know about itself or even // to change itself $val = $item->expand($basepage, $this); - $val->printXML(); + if ($val) $val->printXML(); + else trigger_error("empty item $item"); } else { $item->printXML(); @@ -691,7 +692,13 @@ } function getWikiPageLinks($basepage) { - return false; // do not store external links + if ($basepage == '') return false; + /* ":DontStoreLink" */ + if (substr($this->_link,0,1) == ':') return false; + /* store only links to valid pagenames */ + if ($link = $this->getPagename($basepage)) + return array(array('linkto' => $link, 'relation' => 0)); + else return false; // dont store external links } function _getName($basepage) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-10-28 17:08:17
|
Revision: 7239 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7239&view=rev Author: vargenau Date: 2009-10-28 17:08:09 +0000 (Wed, 28 Oct 2009) Log Message: ----------- Use "error" class, "baduri" class does not exist Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2009-10-28 09:48:52 UTC (rev 7238) +++ trunk/lib/CachedMarkup.php 2009-10-28 17:08:09 UTC (rev 7239) @@ -532,9 +532,7 @@ function _expandurl($url) { $m = array(); if (!preg_match('/^ ([^:]+) (:[:=]) (.+) $/x', $url, $m)) { - return HTML::strong(array('class' => 'rawurl'), - HTML::u(array('class' => 'baduri'), - _("BAD semantic relation link"))); + return HTML::span(array('class' => 'error'), _("BAD semantic relation link")); } $this->_relation = urldecode($m[1]); $is_attribute = ($m[2] == ':='); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-02-10 13:43:22
|
Revision: 7300 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7300&view=rev Author: vargenau Date: 2010-02-10 13:43:16 +0000 (Wed, 10 Feb 2010) Log Message: ----------- Avoid error message in PHP 5.3 Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2010-02-09 17:30:15 UTC (rev 7299) +++ trunk/lib/CachedMarkup.php 2010-02-10 13:43:16 UTC (rev 7300) @@ -243,7 +243,7 @@ // to change itself $val = $item->expand($basepage, $this); if ($val) $val->printXML(); - else trigger_error("empty item $item"); + else trigger_error('empty item ' . print_r($item, true)); } else { $item->printXML(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-08 08:19:48
|
Revision: 7491 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7491&view=rev Author: rurban Date: 2010-06-08 08:19:42 +0000 (Tue, 08 Jun 2010) Log Message: ----------- less memory: Omit empty relation at getWikiPageLinks use the gforge hack on any gforge derived theme doc: clarify main::isActionPage Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2010-06-08 08:15:49 UTC (rev 7490) +++ trunk/lib/CachedMarkup.php 2010-06-08 08:19:42 UTC (rev 7491) @@ -1,7 +1,7 @@ <?php // rcs_id('$Id$'); /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...> - * Copyright (C) 2004-2008 $ThePhpWikiProgrammingTeam + * Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. @@ -42,7 +42,8 @@ // a single quote is entered in the Summary box: // - the history is wrong (user and comment missing) // - the table of contents plugin no longer works - if (defined('GFORGE') and GFORGE) { + global $WikiTheme; + if (isa($WikiTheme, 'WikiTheme_gforge')) { return serialize($this); } @@ -364,7 +365,7 @@ if ($basepage == '') return false; if (isset($this->_nolink)) return false; if ($link = $this->getPagename($basepage)) - return array(array('linkto' => $link, 'relation' => 0)); + return array(array('linkto' => $link)); else return false; } @@ -693,9 +694,12 @@ /* ":DontStoreLink" */ if (substr($this->_link,0,1) == ':') return false; /* store only links to valid pagenames */ - if ($link = $this->getPagename($basepage)) - return array(array('linkto' => $link, 'relation' => 0)); - else return false; // dont store external links + $dbi = $GLOBALS['request']->getDbh(); + if ($link = $this->getPagename($basepage) and $dbi->isWikiPage($link)) { + return array(array('linkto' => $link)); + } else { + return false; // dont store external links + } } function _getName($basepage) { @@ -751,6 +755,7 @@ /** * 1.3.13: Previously stored was only _pi. * A fresh generated cache has now ->name and ->args also. + * main::isActionPage only checks the raw content. */ class Cached_PluginInvocation extends Cached_DynamicContent { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-11-28 16:58:07
|
Revision: 8187 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8187&view=rev Author: vargenau Date: 2011-11-28 16:58:01 +0000 (Mon, 28 Nov 2011) Log Message: ----------- Fix indentation Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2011-11-28 15:13:31 UTC (rev 8186) +++ trunk/lib/CachedMarkup.php 2011-11-28 16:58:01 UTC (rev 8187) @@ -27,16 +27,15 @@ function CacheableMarkup($content, $basepage) { $this->_basepage = $basepage; - $this->_buf = ''; - $this->_content = array(); - $this->_append($content); - if ($this->_buf != '') - $this->_content[] = $this->_buf; - unset($this->_buf); + $this->_buf = ''; + $this->_content = array(); + $this->_append($content); + if ($this->_buf != '') + $this->_content[] = $this->_buf; + unset($this->_buf); } function pack() { - // FusionForge hack // This causes a strange bug when a comment containing // a single quote is entered in the Summary box: @@ -94,9 +93,9 @@ * @return array of hashes { linkto=>pagename, relation=>pagename } */ function getWikiPageLinks() { - $links = array(); - foreach ($this->_content as $item) { - if (!isa($item, 'Cached_DynamicContent')) + $links = array(); + foreach ($this->_content as $item) { + if (!isa($item, 'Cached_DynamicContent')) continue; if (!($item_links = $item->getWikiPageLinks($this->_basepage))) continue; @@ -104,8 +103,8 @@ } // array_unique has a bug with hashes! // set_links checks for duplicates, array_merge does not - //return array_unique($links); - return $links; + //return array_unique($links); + return $links; } /** Get link info. @@ -116,63 +115,63 @@ * Returns an array of hashes. */ function getLinkInfo() { - $link = array(); - foreach ($this->_content as $link) { - if (! isa($link, 'Cached_Link')) - continue; - $info = $link->getLinkInfo($this->_basepage); - $links[$info->href] = $info; + $link = array(); + foreach ($this->_content as $link) { + if (! isa($link, 'Cached_Link')) + continue; + $info = $link->getLinkInfo($this->_basepage); + $links[$info->href] = $info; + } + return array_values($links); } - return array_values($links); - } function _append($item) { - if (is_array($item)) { - foreach ($item as $subitem) - $this->_append($subitem); - } - elseif (!is_object($item)) { - $this->_buf .= $this->_quote((string) $item); - } - elseif (isa($item, 'Cached_DynamicContent')) { - if ($this->_buf) { - $this->_content[] = $this->_buf; - $this->_buf = ''; + if (is_array($item)) { + foreach ($item as $subitem) + $this->_append($subitem); } - $this->_content[] = $item; - } - elseif (isa($item, 'XmlElement')) { - if ($item->isEmpty()) { - $this->_buf .= $item->emptyTag(); + elseif (!is_object($item)) { + $this->_buf .= $this->_quote((string) $item); } - else { - $this->_buf .= $item->startTag(); - foreach ($item->getContent() as $subitem) - $this->_append($subitem); - $this->_buf .= "</$item->_tag>"; + elseif (isa($item, 'Cached_DynamicContent')) { + if ($this->_buf) { + $this->_content[] = $this->_buf; + $this->_buf = ''; + } + $this->_content[] = $item; + } + elseif (isa($item, 'XmlElement')) { + if ($item->isEmpty()) { + $this->_buf .= $item->emptyTag(); + } + else { + $this->_buf .= $item->startTag(); + foreach ($item->getContent() as $subitem) + $this->_append($subitem); + $this->_buf .= "</$item->_tag>"; if (!$this->getDescription() and $item->getTag() == 'p') { // performance: when is this really needed? $this->_glean_description($item->asString()); } + } + if (!$item->isInlineElement()) + $this->_buf .= "\n"; } - if (!$item->isInlineElement()) - $this->_buf .= "\n"; + elseif (isa($item, 'XmlContent')) { + foreach ($item->getContent() as $item) + $this->_append($item); + } + elseif (method_exists($item, 'asXML')) { + $this->_buf .= $item->asXML(); + } + elseif (method_exists($item, 'asString')) { + $this->_buf .= $this->_quote($item->asString()); + } + else { + $this->_buf .= sprintf("==Object(%s)==", get_class($item)); + } } - elseif (isa($item, 'XmlContent')) { - foreach ($item->getContent() as $item) - $this->_append($item); - } - elseif (method_exists($item, 'asXML')) { - $this->_buf .= $item->asXML(); - } - elseif (method_exists($item, 'asString')) { - $this->_buf .= $this->_quote($item->asString()); - } - else { - $this->_buf .= sprintf("==Object(%s)==", get_class($item)); - } - } function _glean_description($text) { static $two_sentences; @@ -206,10 +205,10 @@ } function asXML () { - $xml = ''; + $xml = ''; $basepage = $this->_basepage; - foreach ($this->_content as $item) { + foreach ($this->_content as $item) { if (is_string($item)) { $xml .= $item; } @@ -224,15 +223,15 @@ else { $xml .= $item->asXML(); } + } + return $xml; } - return $xml; - } function printXML () { $basepage = $this->_basepage; // _content might be changed from a plugin (CreateToc) - for ($i=0; $i < count($this->_content); $i++) { - $item = $this->_content[$i]; + for ($i=0; $i < count($this->_content); $i++) { + $item = $this->_content[$i]; if (is_string($item)) { print $item; } @@ -249,8 +248,8 @@ else { $item->printXML(); } + } } - } } /** @@ -262,7 +261,7 @@ class Cached_DynamicContent { function cache(&$cache) { - $cache[] = $this; + $cache[] = $this; } function expand($basepage, &$obj) { @@ -276,18 +275,18 @@ class XmlRpc_LinkInfo { function XmlRpc_LinkInfo($page, $type, $href, $relation = '') { - $this->page = $page; - $this->type = $type; - $this->href = $href; - $this->relation = $relation; - //$this->pageref = str_replace("/RPC2.php", "/index.php", $href); + $this->page = $page; + $this->type = $type; + $this->href = $href; + $this->relation = $relation; + //$this->pageref = str_replace("/RPC2.php", "/index.php", $href); } } class Cached_Link extends Cached_DynamicContent { function isInlineElement() { - return true; + return true; } /** Get link info (for XML-RPC support) @@ -296,17 +295,17 @@ * (See http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=WikiRPCInterface) */ function getLinkInfo($basepage) { - return new XmlRpc_LinkInfo($this->_getName($basepage), + return new XmlRpc_LinkInfo($this->_getName($basepage), $this->_getType(), $this->_getURL($basepage), $this->_getRelation($basepage)); } function _getURL($basepage) { - return $this->_url; + return $this->_url; } function __getRelation($basepage) { - return $this->_relation; + return $this->_relation; } } /* @@ -315,34 +314,34 @@ */ class Cached_InlinedImage extends Cached_DynamicContent { function isInlineElement() { - return true; + return true; } function _getURL($basepage) { - return $this->_url; + return $this->_url; } // TODO: fix interwiki inline links in case of static dumps function expand($basepage, &$markup) { - global $WikiTheme; + global $WikiTheme; $this->_basepage = $basepage; - $label = isset($this->_label) ? $this->_label : false; - if ($WikiTheme->DUMP_MODE) { + $label = isset($this->_label) ? $this->_label : false; + if ($WikiTheme->DUMP_MODE) { // In case of static dumps we need to check if we should // inline the image or not: external: keep link, internal: copy locally - return LinkImage($label); - } else { - return LinkImage($label); + return LinkImage($label); + } else { + return LinkImage($label); + } } - } } class Cached_WikiLink extends Cached_Link { function Cached_WikiLink ($page, $label = false, $anchor = false) { - $this->_page = $page; - /* ":DontStoreLink" */ - if (substr($this->_page,0,1) == ':') { - $this->_page = substr($this->_page,1); - $this->_nolink = true; + $this->_page = $page; + /* ":DontStoreLink" */ + if (substr($this->_page,0,1) == ':') { + $this->_page = substr($this->_page,1); + $this->_nolink = true; } if ($anchor) $this->_anchor = $anchor; @@ -357,13 +356,13 @@ function getPagename($basepage) { $page = new WikiPageName($this->_page, $basepage); - if ($page->isValid()) return $page->name; - else return false; + if ($page->isValid()) return $page->name; + else return false; } function getWikiPageLinks($basepage) { if ($basepage == '') return false; - if (isset($this->_nolink)) return false; + if (isset($this->_nolink)) return false; if ($link = $this->getPagename($basepage)) return array(array('linkto' => $link)); else @@ -371,41 +370,41 @@ } function _getName($basepage) { - return $this->getPagename($basepage); + return $this->getPagename($basepage); } function _getURL($basepage) { - return WikiURL($this->getPagename($basepage)); - //return WikiURL($this->getPagename($basepage), false, 'abs_url'); + return WikiURL($this->getPagename($basepage)); + //return WikiURL($this->getPagename($basepage), false, 'abs_url'); } function expand($basepage, &$markup) { - global $WikiTheme; + global $WikiTheme; $this->_basepage = $basepage; - $label = isset($this->_label) ? $this->_label : false; - $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; + $label = isset($this->_label) ? $this->_label : false; + $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; $page = new WikiPageName($this->_page, $basepage, $anchor); - if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) { - if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : $page->getName()); - } + if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) { + if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : $page->getName()); + } if ($page->isValid()) return WikiLink($page, 'auto', $label); - else return HTML($label); + else return HTML($label); } function asXML() { - global $WikiTheme; - $label = isset($this->_label) ? $this->_label : false; - $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; - //TODO: need basepage for subpages like /Remove (within CreateTOC) + global $WikiTheme; + $label = isset($this->_label) ? $this->_label : false; + $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; + //TODO: need basepage for subpages like /Remove (within CreateTOC) $page = new WikiPageName($this->_page, $this->_basepage, $anchor); - if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { - if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) - return $label ? $label : $page->getName(); + if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { + if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) + return $label ? $label : $page->getName(); + } + $link = WikiLink($page, 'auto', $label); + return $link->asXML(); } - $link = WikiLink($page, 'auto', $label); - return $link->asXML(); - } function asString() { if (isset($this->_label)) @@ -417,15 +416,15 @@ class Cached_WikiLinkIfKnown extends Cached_WikiLink { function Cached_WikiLinkIfKnown ($moniker) { - $this->_page = $moniker; + $this->_page = $moniker; } function expand($basepage, &$markup) { - global $WikiTheme; - if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { - if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : $page->getName()); - } + global $WikiTheme; + if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { + if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : $page->getName()); + } return WikiLink($this->_page, 'if_known'); } } @@ -433,8 +432,8 @@ class Cached_SpellCheck extends Cached_WikiLink { function Cached_SpellCheck ($word, $suggs) { - $this->_page = $word; - $this->suggestions = $suggs; + $this->_page = $word; + $this->suggestions = $suggs; } function expand($basepage, &$markup) { @@ -455,16 +454,16 @@ } function isInlineElement() { - return true; + return true; } function expand($basepage, &$markup) { global $WikiTheme; $label = isset($this->_label) ? $this->_label : false; - if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { - if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : $page->getName()); - } + if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { + if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : $page->getName()); + } return LinkPhpwikiURL($this->_url, $label, $basepage); } @@ -501,14 +500,14 @@ } function isInlineElement() { - return true; + return true; } function getPagename($basepage) { - if (!isset($this->_page)) return false; - $page = new WikiPageName($this->_page, $basepage); - if ($page->isValid()) return $page->name; - else return false; + if (!isset($this->_page)) return false; + $page = new WikiPageName($this->_page, $basepage); + if ($page->isValid()) return $page->name; + else return false; } /* Add relation to the link table. @@ -516,14 +515,14 @@ */ function getWikiPageLinks($basepage) { if ($basepage == '') return false; - if (!isset($this->_page) and isset($this->_attribute)) { + if (!isset($this->_page) and isset($this->_attribute)) { // An attribute: we store it in the basepage now, to fill the cache for page->save // TODO: side-effect free query $page = $GLOBALS['request']->getPage($basepage); $page->setAttribute($this->_relation, $this->_attribute); $this->_page = $basepage; return array(array('linkto' => '', 'relation' => $this->_relation)); - } + } if ($link = $this->getPagename($basepage)) return array(array('linkto' => $link, 'relation' => $this->_relation)); else @@ -535,50 +534,48 @@ if (!preg_match('/^ ([^:]+) (:[:=]) (.+) $/x', $url, $m)) { return HTML::span(array('class' => 'error'), _("BAD semantic relation link")); } - $this->_relation = urldecode($m[1]); + $this->_relation = urldecode($m[1]); $is_attribute = ($m[2] == ':='); if ($is_attribute) { $this->_attribute = urldecode($m[3]); - // since this stored in the markup cache, we are extra sensible - // not to store false empty stuff. - $units = new Units(); - if (!DISABLE_UNITS and !$units->errcode) - { - $this->_attribute_base = $units->Definition($this->_attribute); - $this->_unit = $units->baseunit($this->_attribute); - } + // since this stored in the markup cache, we are extra sensible + // not to store false empty stuff. + $units = new Units(); + if (!DISABLE_UNITS and !$units->errcode) { + $this->_attribute_base = $units->Definition($this->_attribute); + $this->_unit = $units->baseunit($this->_attribute); + } } else { - $this->_page = urldecode($m[3]); + $this->_page = urldecode($m[3]); } - return $m; + return $m; } function _expand($url, $label = false) { - global $WikiTheme; - $m = $this->_expandurl($url); + global $WikiTheme; + $m = $this->_expandurl($url); $class = 'wiki'; // do not link to the attribute value, but to the attribute $is_attribute = ($m[2] == ':='); - if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { - if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page)); - } - if ($is_attribute) - $title = isset($this->_attribute_base) - ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base) - : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute); - if ($label) { - return HTML::span - ( - HTML::a(array('href' => WikiURL($is_attribute ? $this->_relation : $this->_page), + if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { + if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page)); + } + if ($is_attribute) + $title = isset($this->_attribute_base) + ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base) + : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute); + if ($label) { + return HTML::span( + HTML::a(array('href' => WikiURL($is_attribute ? $this->_relation : $this->_page), 'class' => "wiki ".($is_attribute ? "attribute" : "relation"), 'title' => $is_attribute ? $title : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)), $label) ); - } elseif ($is_attribute) { - return HTML::span + } elseif ($is_attribute) { + return HTML::span ( HTML::a(array('href' => WikiURL($this->_relation), 'class' => "wiki attribute", @@ -623,8 +620,8 @@ class Cached_SearchHighlight extends Cached_DynamicContent { function Cached_SearchHighlight ($word, $engine) { - $this->_word = $word; - $this->engine = $engine; + $this->_word = $word; + $this->engine = $engine; } function expand($basepage, &$markup) { @@ -637,7 +634,7 @@ class Cached_ExternalLink extends Cached_Link { function Cached_ExternalLink($url, $label=false) { - $this->_url = $url; + $this->_url = $url; if ($label && $label != $url) $this->_label = $label; } @@ -647,15 +644,15 @@ } function _getName($basepage) { - $label = isset($this->_label) ? $this->_label : false; - return ($label and is_string($label)) ? $label : $this->_url; + $label = isset($this->_label) ? $this->_label : false; + return ($label and is_string($label)) ? $label : $this->_url; } function expand($basepage, &$markup) { global $request; - $label = isset($this->_label) ? $this->_label : false; - $link = LinkURL($this->_url, $label); + $label = isset($this->_label) ? $this->_label : false; + $link = LinkURL($this->_url, $label); if (GOOGLE_LINKS_NOFOLLOW) { // Ignores nofollow when the user who saved the page was authenticated. @@ -677,24 +674,24 @@ class Cached_InterwikiLink extends Cached_ExternalLink { function Cached_InterwikiLink($link, $label=false) { - $this->_link = $link; + $this->_link = $link; if ($label) $this->_label = $label; } function getPagename($basepage) { list ($moniker, $page) = explode (":", $this->_link, 2); - $page = new WikiPageName($page, $basepage); - if ($page->isValid()) return $page->name; - else return false; + $page = new WikiPageName($page, $basepage); + if ($page->isValid()) return $page->name; + else return false; } function getWikiPageLinks($basepage) { if ($basepage == '') return false; - /* ":DontStoreLink" */ - if (substr($this->_link,0,1) == ':') return false; - /* store only links to valid pagenames */ - $dbi = $GLOBALS['request']->getDbh(); + /* ":DontStoreLink" */ + if (substr($this->_link,0,1) == ':') return false; + /* store only links to valid pagenames */ + $dbi = $GLOBALS['request']->getDbh(); if ($link = $this->getPagename($basepage) and $dbi->isWikiPage($link)) { return array(array('linkto' => $link)); } else { @@ -703,8 +700,8 @@ } function _getName($basepage) { - $label = isset($this->_label) ? $this->_label : false; - return ($label and is_string($label)) ? $label : $this->_link; + $label = isset($this->_label) ? $this->_label : false; + return ($label and is_string($label)) ? $label : $this->_link; } /* there may be internal interwiki links also */ @@ -713,21 +710,21 @@ } function _getURL($basepage) { - $link = $this->expand($basepage, $this); - return $link->getAttr('href'); + $link = $this->expand($basepage, $this); + return $link->getAttr('href'); } function expand($basepage, &$markup) { - global $WikiTheme; - $intermap = getInterwikiMap(); - $label = isset($this->_label) ? $this->_label : false; - //FIXME: check Upload: inlined images - if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) { - if (!in_array($this->_link, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : $this->_link); + global $WikiTheme; + $intermap = getInterwikiMap(); + $label = isset($this->_label) ? $this->_label : false; + //FIXME: check Upload: inlined images + if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) { + if (!in_array($this->_link, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : $this->_link); + } + return $intermap->link($this->_link, $label); } - return $intermap->link($this->_link, $label); - } function asString() { if (isset($this->_label)) @@ -742,9 +739,9 @@ class Cached_UserLink extends Cached_WikiLink { function expand($basepage, &$markup) { $label = isset($this->_label) ? $this->_label : false; - $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; + $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; $page = new WikiPageName($this->_page, $basepage, $anchor); - $link = WikiLink($page, 'auto', $label); + $link = WikiLink($page, 'auto', $label); // $link = HTML::a(array('href' => $PageName)); $link->setContent(PossiblyGlueIconToText('wikiuser', $this->_page)); $link->setAttr('class', 'wikiuser'); @@ -760,8 +757,8 @@ class Cached_PluginInvocation extends Cached_DynamicContent { function Cached_PluginInvocation ($pi) { - $this->_pi = $pi; - $loader = $this->_getLoader(); + $this->_pi = $pi; + $loader = $this->_getLoader(); if (is_array($plugin_cmdline = $loader->parsePI($pi)) and $plugin_cmdline[1]) { $this->pi_name = $plugin_cmdline[0]; // plugin, plugin-form, plugin-list $this->name = $plugin_cmdline[1]->getName(); @@ -773,7 +770,7 @@ } function isInlineElement() { - return false; + return false; } function expand($basepage, &$markup) { @@ -795,9 +792,9 @@ function & _getLoader() { static $loader = false; - if (!$loader) { + if (!$loader) { include_once('lib/WikiPlugin.php'); - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader; } return $loader; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-06-19 13:30:09
|
Revision: 8821 http://sourceforge.net/p/phpwiki/code/8821 Author: vargenau Date: 2013-06-19 13:30:06 +0000 (Wed, 19 Jun 2013) Log Message: ----------- trigger_error only if DEBUG Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2013-06-19 13:28:34 UTC (rev 8820) +++ trunk/lib/CachedMarkup.php 2013-06-19 13:30:06 UTC (rev 8821) @@ -237,8 +237,13 @@ ) { // give the content the chance to know about itself or even // to change itself $val = $item->expand($basepage, $this); - if ($val) $val->printXML(); - else trigger_error('empty item ' . print_r($item, true)); + if ($val) { + $val->printXML(); + } else { + if (DEBUG) { + trigger_error('empty item ' . print_r($item, true)); + } + } } else { $item->printXML(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-08 15:54:23
|
Revision: 9286 http://sourceforge.net/p/phpwiki/code/9286 Author: vargenau Date: 2014-11-08 15:54:20 +0000 (Sat, 08 Nov 2014) Log Message: ----------- Add static; PHP Doc Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2014-11-08 15:34:07 UTC (rev 9285) +++ trunk/lib/CachedMarkup.php 2014-11-08 15:54:20 UTC (rev 9286) @@ -52,12 +52,12 @@ return gzcompress(serialize($this), 9); } - function unpack($packed) + static function unpack($packed) { if (!$packed) return false; - // ZLIB format has a five bit checksum in it's header. + // ZLIB format has a five bit checksum in its header. // Lets check for sanity. if (((ord($packed[0]) * 256 + ord($packed[1])) % 31 == 0) and (substr($packed, 0, 2) == "\037\213") @@ -109,6 +109,7 @@ */ function getLinkInfo() { + $links = array(); foreach ($this->_content as $link) { if (!is_a($link, 'Cached_Link')) continue; @@ -245,7 +246,6 @@ */ abstract class Cached_DynamicContent { - function cache(&$cache) { $cache[] = $this; @@ -273,6 +273,8 @@ abstract class Cached_Link extends Cached_DynamicContent { + public $_url; + public $_relation; function isInlineElement() { @@ -309,6 +311,9 @@ */ class Cached_InlinedImage extends Cached_DynamicContent { + public $_url; + public $_basepage; + function isInlineElement() { return true; @@ -338,7 +343,12 @@ class Cached_WikiLink extends Cached_Link { - function __construct($page, $label = false, $anchor = false) + /** + * @param string $page + * @param string $label + * @param string $anchor + */ + function __construct($page, $label = '', $anchor = '') { $this->_page = $page; /* ":DontStoreLink" */ @@ -361,14 +371,18 @@ function getPagename($basepage) { $page = new WikiPageName($this->_page, $basepage); - if ($page->isValid()) return $page->name; - else return false; + if ($page->isValid()) + return $page->name; + else + return false; } function getWikiPageLinks($basepage) { - if ($basepage == '') return false; - if (isset($this->_nolink)) return false; + if ($basepage == '') + return false; + if (isset($this->_nolink)) + return false; if ($link = $this->getPagename($basepage)) return array(array('linkto' => $link)); else @@ -462,6 +476,8 @@ class Cached_PhpwikiURL extends Cached_DynamicContent { + public $_page; + function __construct($url, $label) { $this->_url = $url; @@ -512,6 +528,9 @@ */ class Cached_SemanticLink extends Cached_WikiLink { + public $_attribute; + public $_attribute_base; + public $_unit; function __construct($url, $label = false) { @@ -581,7 +600,6 @@ { global $WikiTheme; $m = $this->_expandurl($url); - $class = 'wiki'; // do not link to the attribute value, but to the attribute $is_attribute = ($m[2] == ':='); if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { @@ -723,8 +741,11 @@ { list ($moniker, $page) = explode(":", $this->_link, 2); $page = new WikiPageName($page, $basepage); - if ($page->isValid()) return $page->name; - else return false; + if ($page->isValid()) { + return $page->name; + } else { + return false; + } } function getWikiPageLinks($basepage) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-11-21 14:54:42
|
Revision: 9359 http://sourceforge.net/p/phpwiki/code/9359 Author: vargenau Date: 2014-11-21 14:54:39 +0000 (Fri, 21 Nov 2014) Log Message: ----------- Remove function setTightness Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2014-11-21 11:46:38 UTC (rev 9358) +++ trunk/lib/CachedMarkup.php 2014-11-21 14:54:39 UTC (rev 9359) @@ -838,10 +838,6 @@ } } - function setTightness($top, $bottom) - { - } - function isInlineElement() { return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-24 15:21:26
|
Revision: 9557 http://sourceforge.net/p/phpwiki/code/9557 Author: vargenau Date: 2015-02-24 15:21:23 +0000 (Tue, 24 Feb 2015) Log Message: ----------- Avoid useless warning Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2015-02-20 16:51:20 UTC (rev 9556) +++ trunk/lib/CachedMarkup.php 2015-02-24 15:21:23 UTC (rev 9557) @@ -226,10 +226,6 @@ $val = $item->expand($basepage, $this); if ($val) { $val->printXML(); - } else { - if (DEBUG) { - trigger_error('empty item ' . print_r($item, true)); - } } } else { $item->printXML(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-03-02 17:20:52
|
Revision: 9584 http://sourceforge.net/p/phpwiki/code/9584 Author: vargenau Date: 2015-03-02 17:20:45 +0000 (Mon, 02 Mar 2015) Log Message: ----------- Remove unused function __getRelation Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2015-03-02 17:19:09 UTC (rev 9583) +++ trunk/lib/CachedMarkup.php 2015-03-02 17:20:45 UTC (rev 9584) @@ -25,7 +25,6 @@ class CacheableMarkup extends XmlContent { - function __construct($content, $basepage) { $this->_basepage = $basepage; @@ -294,11 +293,6 @@ { return $this->_url; } - - function __getRelation($basepage) - { - return $this->_relation; - } } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-01-07 09:21:47
|
Revision: 9754 http://sourceforge.net/p/phpwiki/code/9754 Author: vargenau Date: 2016-01-07 09:21:44 +0000 (Thu, 07 Jan 2016) Log Message: ----------- Use __construct Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2016-01-07 09:17:38 UTC (rev 9753) +++ trunk/lib/CachedMarkup.php 2016-01-07 09:21:44 UTC (rev 9754) @@ -256,7 +256,7 @@ class XmlRpc_LinkInfo { - function XmlRpc_LinkInfo($page, $type, $href, $relation = '') + function __construct($page, $type, $href, $relation = '') { $this->page = $page; $this->type = $type; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-12 10:03:21
|
Revision: 10499 http://sourceforge.net/p/phpwiki/code/10499 Author: vargenau Date: 2021-08-12 10:03:18 +0000 (Thu, 12 Aug 2021) Log Message: ----------- lib/CachedMarkup.php: function expand is public Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2021-08-11 19:08:06 UTC (rev 10498) +++ trunk/lib/CachedMarkup.php 2021-08-12 10:03:18 UTC (rev 10499) @@ -249,7 +249,7 @@ $cache[] = $this; } - abstract protected function expand($basepage, &$obj); + abstract function expand($basepage, &$markup); function getWikiPageLinks($basepage) { @@ -390,7 +390,6 @@ function _getURL($basepage) { return WikiURL($this->getPagename($basepage)); - //return WikiURL($this->getPagename($basepage), false, 'abs_url'); } function expand($basepage, &$markup) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-12 10:22:08
|
Revision: 10500 http://sourceforge.net/p/phpwiki/code/10500 Author: vargenau Date: 2021-08-12 10:22:07 +0000 (Thu, 12 Aug 2021) Log Message: ----------- Remove unnecessary local variables, spelling Modified Paths: -------------- trunk/lib/CachedMarkup.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2021-08-12 10:03:18 UTC (rev 10499) +++ trunk/lib/CachedMarkup.php 2021-08-12 10:22:07 UTC (rev 10500) @@ -60,7 +60,7 @@ return false; // ZLIB format has a five bit checksum in its header. - // Lets check for sanity. + // Let's check for sanity. if (((ord($packed[0]) * 256 + ord($packed[1])) % 31 == 0) and (substr($packed, 0, 2) == "\037\213") or (substr($packed, 0, 2) == "x\332") @@ -82,7 +82,7 @@ return false; } - /** Get names of wikipages linked to. + /** Get names of wiki pages linked to. * * @return array of hashes { linkto=>pagename, relation=>pagename } */ @@ -450,19 +450,18 @@ class Cached_SpellCheck extends Cached_WikiLink { - function __construct($word, $suggs) + function __construct($word, $suggestions) { $this->_page = $word; - $this->suggestions = $suggs; + $this->suggestions = $suggestions; } function expand($basepage, &$markup) { - $link = HTML::a(array('class' => 'spell-wrong', + return HTML::a(array('class' => 'spell-wrong', 'title' => 'SpellCheck: ' . join(', ', $this->suggestions), 'name' => $this->_page), $this->_page); - return $link; } } @@ -853,8 +852,7 @@ global $request; $loader = $this->_getLoader(); - $xml = $loader->expandPI($this->_pi, $request, $markup, $basepage); - return $xml; + return $loader->expandPI($this->_pi, $request, $markup, $basepage); } function asString() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |