Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2009-01-12 19:10:04
|
Revision: 6396
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6396&view=rev
Author: vargenau
Date: 2009-01-12 19:09:59 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
No need for a div, class template is not defined
Modified Paths:
--------------
trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2009-01-12 16:48:53 UTC (rev 6395)
+++ trunk/lib/plugin/Template.php 2009-01-12 19:09:59 UTC (rev 6396)
@@ -153,7 +153,8 @@
array_pop($included_pages);
- return HTML::div(array('class' => 'template'), $content);
+ return $content;
+ // return HTML::div(array('class' => 'template'), $content);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-19 22:38:09
|
Revision: 6419
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6419&view=rev
Author: vargenau
Date: 2009-01-19 22:08:41 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
Use TransformInline instead of TransformText if Template is single-line
Modified Paths:
--------------
trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2009-01-19 21:18:18 UTC (rev 6418)
+++ trunk/lib/plugin/Template.php 2009-01-19 22:08:41 UTC (rev 6419)
@@ -148,13 +148,19 @@
$this->doVariableExpansion($initial_content, $vars, $basepage, $request);
array_push($included_pages, $page);
- include_once('lib/BlockParser.php');
- $content = TransformText($initial_content, $r->get('markup'), $page);
+ // If content is single-line, call TransformInline, else call TransformText
+ if (preg_match("/\n/", $initial_content)) {
+ include_once('lib/BlockParser.php');
+ $content = TransformText($initial_content, $r->get('markup'), $page);
+ } else {
+ include_once('lib/InlineParser.php');
+ $content = TransformInline($initial_content, $r->get('markup'), $page);
+ }
+
array_pop($included_pages);
return $content;
- // return HTML::div(array('class' => 'template'), $content);
}
/**
@@ -209,38 +215,6 @@
}
};
-// $Log: not supported by cvs2svn $
-// Revision 1.10 2007/06/07 17:03:38 rurban
-// minor optimization: move explode("\n", $initial_content) to section code
-//
-// Revision 1.9 2007/03/04 14:09:13 rurban
-// silence missing page warning
-//
-// Revision 1.8 2007/01/25 07:42:29 rurban
-// Changed doVariableExpansion API. Uppercase default vars. Use str_replace.
-//
-// Revision 1.7 2007/01/04 16:42:41 rurban
-// Improve vars passing. Use new method allow_undeclared_arg to allow arbitrary args for the template. Fix doVariableExpansion: use a ref. Fix pagename. Put away \b in regex.
-//
-// Revision 1.6 2007/01/03 21:24:06 rurban
-// protect page in links. new doVariableExpansion() for CreatePage. preg_quote custom vars.
-//
-// Revision 1.5 2006/04/17 17:28:21 rurban
-// honor getWikiPageLinks change linkto=>relation
-//
-// Revision 1.4 2005/09/11 13:30:22 rurban
-// improve comments
-//
-// Revision 1.3 2005/09/10 20:43:19 rurban
-// support <noinclude>
-//
-// Revision 1.2 2005/09/10 20:07:16 rurban
-// fix BASE_URL
-//
-// Revision 1.1 2005/09/10 19:59:38 rurban
-// Parametrized page inclusion ala mediawiki
-//
-
// For emacs users
// Local Variables:
// mode: php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-01-22 17:03:50
|
Revision: 6429
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6429&view=rev
Author: vargenau
Date: 2009-01-22 17:03:37 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Trim carriage return
Modified Paths:
--------------
trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2009-01-21 15:35:18 UTC (rev 6428)
+++ trunk/lib/plugin/Template.php 2009-01-22 17:03:37 UTC (rev 6429)
@@ -150,6 +150,7 @@
array_push($included_pages, $page);
// If content is single-line, call TransformInline, else call TransformText
+ $initial_content = trim($initial_content, "\n");
if (preg_match("/\n/", $initial_content)) {
include_once('lib/BlockParser.php');
$content = TransformText($initial_content, $r->get('markup'), $page);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-04-18 16:12:11
|
Revision: 6781
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6781&view=rev
Author: vargenau
Date: 2009-04-18 16:12:07 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
Allow "Template:" and "Template/" prefix (Mediawiki compatibility)
Modified Paths:
--------------
trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2009-04-18 16:09:42 UTC (rev 6780)
+++ trunk/lib/plugin/Template.php 2009-04-18 16:12:07 UTC (rev 6781)
@@ -113,6 +113,15 @@
return $this->error(_("no page specified"));
}
+ // If "Template:$page" exists, use it
+ // else if "Template/$page" exists, use it
+ // else use "$page"
+ if ($dbi->isWikiPage("Template:" . $page)) {
+ $page = "Template:" . $page;
+ } elseif ($dbi->isWikiPage("Template/" . $page)) {
+ $page = "Template/" . $page;
+ }
+
// Protect from recursive inclusion. A page can include itself once
static $included_pages = array();
if (in_array($page, $included_pages)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-08-19 19:36:40
|
Revision: 7071
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7071&view=rev
Author: vargenau
Date: 2009-08-19 19:36:31 +0000 (Wed, 19 Aug 2009)
Log Message:
-----------
Handle redirect (like in IncludePage)
Modified Paths:
--------------
trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2009-08-19 19:35:29 UTC (rev 7070)
+++ trunk/lib/plugin/Template.php 2009-08-19 19:36:31 UTC (rev 7071)
@@ -147,6 +147,29 @@
}
$initial_content = $r->getPackedContent();
+ $content = $r->getContent();
+ // follow redirects
+ if ((preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\S+)\s*\?'.'>/',
+ implode("\n", $content), $m))
+ or (preg_match('/<<\s*RedirectTo\s+page=(\S+)\s*>>/',
+ implode("\n", $content), $m)))
+ {
+ // Strip quotes (simple or double) from page name if any
+ if ((string_starts_with($m[1], "'"))
+ or (string_starts_with($m[1], "\""))) {
+ $m[1] = substr($m[1], 1, -1);
+ }
+ // trap recursive redirects
+ if (in_array($m[1], $included_pages)) {
+ return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
+ $page.' => '.$m[1]));
+ }
+ $page = $m[1];
+ $p = $dbi->getPage($page);
+ $r = $p->getCurrentRevision();
+ $initial_content = $r->getPackedContent();
+ }
+
if ($args['section']) {
$c = explode("\n", $initial_content);
$c = extractSection($args['section'], $c, $page, $quiet, $args['sectionhead']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-02-15 15:10:32
|
Revision: 10997
http://sourceforge.net/p/phpwiki/code/10997
Author: vargenau
Date: 2022-02-15 15:10:30 +0000 (Tue, 15 Feb 2022)
Log Message:
-----------
lib/plugin/Template.php: get code closer to lib/plugin/IncludePage.php
Modified Paths:
--------------
trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2022-02-15 15:07:16 UTC (rev 10996)
+++ trunk/lib/plugin/Template.php 2022-02-15 15:10:30 UTC (rev 10997)
@@ -112,6 +112,7 @@
$args = $this->getArgs($argstr, $request);
$vars = $args['vars'] ? $args['vars'] : $this->vars;
$page = $args['page'];
+ $rev = $args['rev'];
if ($page) {
// Expand relative page names.
@@ -153,14 +154,14 @@
}
$p = $dbi->getPage($page);
- if ($args['rev']) {
- if (!is_whole_number($args['rev']) or !($args['rev'] > 0)) {
+ if ($rev) {
+ if (!is_whole_number($rev) or !($rev > 0)) {
return $this->error(_("Error: rev must be a positive integer."));
}
- $r = $p->getRevision($args['rev']);
+ $r = $p->getRevision($rev);
if ((!$r) || ($r->hasDefaultContents())) {
return $this->error(sprintf(_("%s: no such revision %d."),
- $page, $args['rev']));
+ $page, $rev));
}
} else {
$r = $p->getCurrentRevision();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-02-15 15:32:20
|
Revision: 10999
http://sourceforge.net/p/phpwiki/code/10999
Author: vargenau
Date: 2022-02-15 15:32:18 +0000 (Tue, 15 Feb 2022)
Log Message:
-----------
lib/plugin/Template.php: getWikiPageLinks returns links in the included page (as well as the included page)
Modified Paths:
--------------
trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2022-02-15 15:16:11 UTC (rev 10998)
+++ trunk/lib/plugin/Template.php 2022-02-15 15:32:18 UTC (rev 10999)
@@ -90,13 +90,22 @@
$args = $this->getArgs($argstr);
$page = isset($args['page']) ? $args['page'] : '';
if ($page) {
- // Expand relative page names.
+ global $request;
+ $dbi = $request->_dbi;
+ $page_handle = $dbi->getPage($page);
+ $links = $page_handle->getPageLinks();
+ $alllinks = array();
+ while ($link_handle = $links->next()) {
+ $linkname = $link_handle->getName();
+ $alllinks[] = array('linkto' => $linkname);
+ }
$page = new WikiPageName($page, $basepage);
}
- if (!$page or !$page->name)
- return false;
-
- return array(array('linkto' => $page->name));
+ if (!$page or !$page->name) {
+ return array();
+ }
+ $alllinks[] = array('linkto' => $page->name);
+ return $alllinks;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2022-02-15 16:58:08
|
Revision: 11001
http://sourceforge.net/p/phpwiki/code/11001
Author: vargenau
Date: 2022-02-15 16:58:07 +0000 (Tue, 15 Feb 2022)
Log Message:
-----------
lib/plugin/Template.php: simplify getWikiPageLinks
Modified Paths:
--------------
trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2022-02-15 16:55:31 UTC (rev 11000)
+++ trunk/lib/plugin/Template.php 2022-02-15 16:58:07 UTC (rev 11001)
@@ -84,23 +84,25 @@
return $name != 'action';
}
- // TODO: check if page can really be pulled from the args, or if it is just the basepage.
function getWikiPageLinks($argstr, $basepage)
{
$args = $this->getArgs($argstr);
$page = isset($args['page']) ? $args['page'] : '';
- if ($page) {
- global $request;
- $dbi = $request->_dbi;
- $page_handle = $dbi->getPage($page);
- $links = $page_handle->getPageLinks();
- $alllinks = array();
- while ($link_handle = $links->next()) {
- $linkname = $link_handle->getName();
- $alllinks[] = array('linkto' => $linkname);
- }
- $page = new WikiPageName($page, $basepage);
+
+ if (!$page) {
+ return array();
}
+
+ global $request;
+ $dbi = $request->_dbi;
+ $page_handle = $dbi->getPage($page);
+ $links = $page_handle->getPageLinks();
+ $alllinks = array();
+ while ($link_handle = $links->next()) {
+ $linkname = $link_handle->getName();
+ $alllinks[] = array('linkto' => $linkname);
+ }
+ $page = new WikiPageName($page, $basepage);
if (!$page or !$page->name) {
return array();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X