phpwiki-checkins Mailing List for PhpWiki

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv31375/themes/default/templates
Modified Files:
	debug.tmpl editpage.tmpl viewsource.tmpl wikiblog.tmpl 
Log Message:
Clean up <br clear="all" style="clear: both;" /> tags.
This rage was triggered by one in editpage.tmpl which used clear="both",
which is not valid HTML. Then I figured might as well use a class for them
and make them all consistent.
Index: debug.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/debug.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- debug.tmpl	21 Feb 2003 04:08:26 -0000	1.10
+++ debug.tmpl	27 Feb 2003 23:55:52 -0000	1.11
@@ -23,3 +23,3 @@
 </td></tr></table>
 <!-- This keeps the valid XHTML! icons from "hanging off the bottom of the screen" -->
-<br style="clear: both;" />
+<br clear="all" class="clear-floats" />
Index: editpage.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/editpage.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -2 -b -p -d -r1.37 -r1.38
--- editpage.tmpl	17 Feb 2003 06:08:25 -0000	1.37
+++ editpage.tmpl	27 Feb 2003 23:55:52 -0000	1.38
@@ -58,5 +58,5 @@ $s = $Theme->getButtonSeparator();
 accept-charset="<?=CHARSET?>">
 <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
- <br clear="both" />
+ <br clear="all" class="clear-floats" />
 <div id="editarea-size">
 <?=_("Edit Area Size:")?>
Index: viewsource.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/viewsource.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -2 -b -p -d -r1.21 -r1.22
--- viewsource.tmpl	26 Feb 2003 22:27:18 -0000	1.21
+++ viewsource.tmpl	27 Feb 2003 23:55:52 -0000	1.22
@@ -15,5 +15,5 @@
 <form method="post" action="<?=$request->getPostURL()?>" accept-charset="<?=CHARSET?>">
 <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
-<br clear="all" />
+<br clear="all" class="clear-floats" />
 <!-- wrap=virtual is not HTML4, but without it NS4 does not wrap long lines -->
 <textarea class="wikiedit"
Index: wikiblog.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/wikiblog.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- wikiblog.tmpl	21 Feb 2003 04:20:09 -0000	1.1
+++ wikiblog.tmpl	27 Feb 2003 23:55:52 -0000	1.2
@@ -28,5 +28,5 @@ if ($rev->get('mtime') != $BLOG_CTIME) {
 <strong class="floatleft"><?= WikiLink($page, 'known', $CDATE) ?></strong>
 <strong class="floatright"><?= WikiLink($BLOG_CREATOR, 'if_known') ?></strong>
- <br style="clear:both;" />
+ <br clear="all" class="clear-floats" />
 </div>
 <div class="wikiblog-body">
@@ -41,5 +41,5 @@ if ($rev->get('mtime') != $BLOG_CTIME) {
 <?= $buttons ?>
 <?= $modified ?>
- <br style="clear:both;" />
+ <br clear="all" class="clear-floats" />
 </div>
 <?php } ?>

Update of /cvsroot/phpwiki/phpwiki/themes/default
In directory sc8-pr-cvs1:/tmp/cvs-serv31375/themes/default
Modified Files:
	phpwiki.css 
Log Message:
Clean up <br clear="all" style="clear: both;" /> tags.
This rage was triggered by one in editpage.tmpl which used clear="both",
which is not valid HTML. Then I figured might as well use a class for them
and make them all consistent.
Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/phpwiki.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -2 -b -p -d -r1.13 -r1.14
--- phpwiki.css	24 Feb 2003 22:04:45 -0000	1.13
+++ phpwiki.css	27 Feb 2003 23:55:52 -0000	1.14
@@ -711,4 +711,9 @@ table.interwiki-map {
 }
 
+
+.clear-floats {
+ clear: both;
+}
+
 /* For emacs users
 *

Update of /cvsroot/phpwiki/phpwiki/themes/SpaceWiki
In directory sc8-pr-cvs1:/tmp/cvs-serv31375/themes/SpaceWiki
Modified Files:
	SpaceWiki.css 
Log Message:
Clean up <br clear="all" style="clear: both;" /> tags.
This rage was triggered by one in editpage.tmpl which used clear="both",
which is not valid HTML. Then I figured might as well use a class for them
and make them all consistent.
Index: SpaceWiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/SpaceWiki/SpaceWiki.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- SpaceWiki.css	8 Mar 2002 21:31:14 -0000	1.5
+++ SpaceWiki.css	27 Feb 2003 23:55:52 -0000	1.6
@@ -562,4 +562,7 @@ div.errors {
 }
 
+.clear-floats {
+ clear: both;
+}
 
 /* For emacs users

Update of /cvsroot/phpwiki/phpwiki/themes/Sidebar
In directory sc8-pr-cvs1:/tmp/cvs-serv31375/themes/Sidebar
Modified Files:
	sidebar.css 
Log Message:
Clean up <br clear="all" style="clear: both;" /> tags.
This rage was triggered by one in editpage.tmpl which used clear="both",
which is not valid HTML. Then I figured might as well use a class for them
and make them all consistent.
Index: sidebar.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Sidebar/sidebar.css,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -2 -b -p -d -r1.17 -r1.18
--- sidebar.css	7 Mar 2002 03:47:00 -0000	1.17
+++ sidebar.css	27 Feb 2003 23:55:51 -0000	1.18
@@ -201,4 +201,7 @@ div#xhtml-validator {
 }
 
+.clear-floats {
+ clear: both;
+}
 
 /* For emacs users

Update of /cvsroot/phpwiki/phpwiki/themes/Portland/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv31375/themes/Portland/templates
Modified Files:
	browse.tmpl 
Log Message:
Clean up <br clear="all" style="clear: both;" /> tags.
This rage was triggered by one in editpage.tmpl which used clear="both",
which is not valid HTML. Then I figured might as well use a class for them
and make them all consistent.
Index: browse.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/templates/browse.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- browse.tmpl	19 Feb 2002 01:32:37 -0000	1.5
+++ browse.tmpl	27 Feb 2003 23:55:51 -0000	1.6
@@ -4,5 +4,5 @@
 ?>
 
-<div class="br"><br clear="all" class="ignore" /></div>
+<br clear="all" class="clear-floats" />
 
 <?php if (! $revision->isCurrent()) { ?>

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX
In directory sc8-pr-cvs1:/tmp/cvs-serv31375/themes/MacOSX
Modified Files:
	MacOSX.css 
Log Message:
Clean up <br clear="all" style="clear: both;" /> tags.
This rage was triggered by one in editpage.tmpl which used clear="both",
which is not valid HTML. Then I figured might as well use a class for them
and make them all consistent.
Index: MacOSX.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MacOSX/MacOSX.css,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -2 -b -p -d -r1.30 -r1.31
--- MacOSX.css	29 Mar 2002 04:43:02 -0000	1.30
+++ MacOSX.css	27 Feb 2003 23:55:51 -0000	1.31
@@ -410,4 +410,7 @@ div.wiki-message {
 }
 
+.clear-floats {
+ clear: both;
+}
 
 /* For emacs users

Update of /cvsroot/phpwiki/phpwiki/themes/Hawaiian
In directory sc8-pr-cvs1:/tmp/cvs-serv31375/themes/Hawaiian
Modified Files:
	Hawaiian.css 
Log Message:
Clean up <br clear="all" style="clear: both;" /> tags.
This rage was triggered by one in editpage.tmpl which used clear="both",
which is not valid HTML. Then I figured might as well use a class for them
and make them all consistent.
Index: Hawaiian.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/Hawaiian.css,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -2 -b -p -d -r1.25 -r1.26
--- Hawaiian.css	8 Mar 2002 04:24:31 -0000	1.25
+++ Hawaiian.css	27 Feb 2003 23:55:51 -0000	1.26
@@ -402,4 +402,7 @@ div.errors {
 }
 
+.clear-floats {
+ clear: both;
+}
 
 /* For emacs users

Update of /cvsroot/phpwiki/phpwiki/themes/Portland
In directory sc8-pr-cvs1:/tmp/cvs-serv31375/themes/Portland
Modified Files:
	portland.css 
Log Message:
Clean up <br clear="all" style="clear: both;" /> tags.
This rage was triggered by one in editpage.tmpl which used clear="both",
which is not valid HTML. Then I figured might as well use a class for them
and make them all consistent.
Index: portland.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/portland.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- portland.css	8 Mar 2002 04:25:33 -0000	1.10
+++ portland.css	27 Feb 2003 23:55:51 -0000	1.11
@@ -24,4 +24,8 @@ input.numeric {
 }
 
+.clear-floats {
+ clear: both;
+}
+
 /* Mozilla RecentChanges Sidebar */
 body.sidebar {

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv15554/lib
Modified Files:
	RSSWriter091.php 
Log Message:
Fix my breakage of CSS and sidebar RecentChanges output.
Index: RSSWriter091.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/RSSWriter091.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- RSSWriter091.php	30 Oct 2002 23:19:04 -0000	1.6
+++ RSSWriter091.php	27 Feb 2003 23:23:38 -0000	1.7
@@ -99,7 +99,8 @@ extends _RecentChanges_RSSFormatter
 }
 
+ global $request;
+ $request->discardOutput();
 $rss->finish();
 printf("\n<!-- Generated by PhpWiki:\n%s-->\n", $GLOBALS['RCS_IDS']);
- global $request;
 $request->finish(); // NORETURN!!!!
 }

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv15554/lib/plugin
Modified Files:
	RecentChanges.php 
Log Message:
Fix my breakage of CSS and sidebar RecentChanges output.
Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -2 -b -p -d -r1.76 -r1.77
--- RecentChanges.php	27 Feb 2003 22:48:44 -0000	1.76
+++ RecentChanges.php	27 Feb 2003 23:23:38 -0000	1.77
@@ -422,4 +422,6 @@ extends _RecentChanges_HtmlFormatter
 $html = _RecentChanges_HtmlFormatter::format ($changes);
 $html = HTML::div(array('class' => 'wikitext'), $html);
+ global $request;
+ $request->discardOutput();
 
 printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
@@ -442,7 +444,4 @@ extends _RecentChanges_HtmlFormatter
 printf("</html>\n");
 
- flush();
-
- global $request;
 $request->finish(); // cut rest of page processing short
 }
@@ -464,4 +463,5 @@ extends _RecentChanges_Formatter
 
 function format ($changes) {
+ 
 include_once('lib/RssWriter.php');
 $rss = new RssWriter;
@@ -484,4 +484,6 @@ extends _RecentChanges_Formatter
 }
 
+ global $request;
+ $request->discardOutput();
 $rss->finish();
 printf("\n<!-- Generated by PhpWiki:\n%s-->\n", $GLOBALS['RCS_IDS']);
@@ -492,5 +494,4 @@ extends _RecentChanges_Formatter
 printf("\n<!-- PHP Warnings:\n%s-->\n", AsXML($errors));
 
- global $request; // FIXME
 $request->finish(); // NORETURN!!!!
 }
@@ -770,4 +771,7 @@ class DayButtonBar extends HtmlElement {
 
 // $Log$
+// Revision 1.77 2003年02月27日 23:23:38 dairiki
+// Fix my breakage of CSS and sidebar RecentChanges output.
+//
 // Revision 1.76 2003年02月27日 22:48:44 dairiki
 // Fixes invalid HTML generated by PageHistory plugin.

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv31703a/lib/plugin
Modified Files:
	PageHistory.php RecentChanges.php 
Log Message:
Fixes invalid HTML generated by PageHistory plugin.
(<noscript> is block-level and not allowed within <p>.)
Index: PageHistory.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PageHistory.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -2 -b -p -d -r1.26 -r1.27
--- PageHistory.php	27 Feb 2003 21:15:14 -0000	1.26
+++ PageHistory.php	27 Feb 2003 22:48:44 -0000	1.27
@@ -99,19 +99,15 @@ extends _RecentChanges_HtmlFormatter
 }
 
- function _javascript($script) {
- return HTML::script(array('language' => 'JavaScript',
- 'type' => 'text/javascript'),
- new RawXml("<!-- //\n$script\n// -->"));
- }
-
 function description() {
- // Doesn't work (PHP bug?): $desc = parent::description() . "\n";
 $button = HTML::input(array('type' => 'submit',
 'value' => _("compare revisions"),
 'class' => 'wikiaction'));
- return array(_RecentChanges_HtmlFormatter::description(), "\n",
- $this->_javascript(sprintf('document.write("%s");',
- _("Check any two boxes to compare revisions."))),
- HTML::noscript(fmt("Check any two boxes then %s.", $button)));
+
+ $js_desc = $no_js_desc = _RecentChanges_HtmlFormatter::description();
+
+ $js_desc->pushContent("\n", _("Check any two boxes to compare revisions."));
+ $no_js_desc->pushContent("\n", fmt("Check any two boxes then %s.", $button));
+
+ return IfJavaScript($js_desc, $no_js_desc);
 }
 
@@ -142,5 +138,5 @@ extends _RecentChanges_HtmlFormatter
 $html),
 "\n",
- $this->_javascript('
+ JavaScript('
 var diffCkBoxes = document.forms["diff-select"].elements["versions[]"];
 
@@ -324,4 +320,9 @@ extends WikiPlugin_RecentChanges
 
 // $Log$
+// Revision 1.27 2003年02月27日 22:48:44 dairiki
+// Fixes invalid HTML generated by PageHistory plugin.
+//
+// (<noscript> is block-level and not allowed within <p>.)
+//
 // Revision 1.26 2003年02月27日 21:15:14 dairiki
 // Javascript fix.
Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -2 -b -p -d -r1.75 -r1.76
--- RecentChanges.php	22 Feb 2003 21:39:05 -0000	1.75
+++ RecentChanges.php	27 Feb 2003 22:48:44 -0000	1.76
@@ -242,5 +242,5 @@ extends _RecentChanges_Formatter
 $desc = fmt("All %s are listed below.", $edits);
 }
- return $desc;
+ return HTML::p(false, $desc);
 }
 
@@ -271,8 +271,8 @@ extends _RecentChanges_Formatter
 ." \"$sidebarurl\",\"\");\n"
 ."}\n";
- $jsf = $this->_javascript($addsidebarjsfunc);
+ $jsf = JavaScript($addsidebarjsfunc);
 
 $addsidebarjsclick = " " . "<small style=\"font-weight:normal;\"><a href=\"javascript:addPanel();\">sidebar</a></small>";
- $jsc = $this->_javascript("if ((typeof window.sidebar == 'object') &&\n"
+ $jsc = JavaScript("if ((typeof window.sidebar == 'object') &&\n"
 ." (typeof window.sidebar.addPanel == 'function'))\n"
 ." {\n"
@@ -283,10 +283,4 @@ extends _RecentChanges_Formatter
 }
 
- function _javascript($script) {
- return HTML::script(array('language' => 'JavaScript',
- 'type' => 'text/javascript'),
- new RawXml("<!-- //\n$script\n// -->"));
- }
-
 function format ($changes) {
 include_once('lib/InlineParser.php');
@@ -294,5 +288,5 @@ extends _RecentChanges_Formatter
 $html = HTML(HTML::h2(false, $this->title()));
 if (($desc = $this->description()))
- $html->pushContent(HTML::p(false, $desc));
+ $html->pushContent($desc);
 
 if ($this->_args['daylist'])
@@ -776,4 +770,9 @@ class DayButtonBar extends HtmlElement {
 
 // $Log$
+// Revision 1.76 2003年02月27日 22:48:44 dairiki
+// Fixes invalid HTML generated by PageHistory plugin.
+//
+// (<noscript> is block-level and not allowed within <p>.)
+//
 // Revision 1.75 2003年02月22日 21:39:05 dairiki
 // Hackish fix for SF bug #622784.

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv30513/lib/plugin
Modified Files:
	Transclude.php 
Log Message:
New functions in HtmlElement:
JavaScript($js)
 Helper for generating javascript.
IfJavaScript($if_content, $else_content)
 Helper for generating
 <script>document.write('...')</script><noscript>...</noscript>
 constructs.
Index: Transclude.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Transclude.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- Transclude.php	25 Feb 2003 05:45:34 -0000	1.6
+++ Transclude.php	27 Feb 2003 22:47:27 -0000	1.7
@@ -127,5 +127,5 @@ extends WikiPlugin
 $seen = true;
 
- $script = '
+ return JavaScript('
 function adjust_iframe_height(frame) {
 var content = frame.contentDocument;
@@ -145,13 +145,20 @@ extends WikiPlugin
 adjust_iframe_height(f[i]);
 }, false);
- ';
-
- return HTML::script(array('language' => 'JavaScript',
- 'type' => 'text/javascript'),
- new RawXml("<!-- //\n$script\n// -->"));
+ ');
 }
 };
 
 // $Log$
+// Revision 1.7 2003年02月27日 22:47:27 dairiki
+// New functions in HtmlElement:
+//
+// JavaScript($js)
+// Helper for generating javascript.
+//
+// IfJavaScript($if_content, $else_content)
+// Helper for generating
+// <script>document.write('...')</script><noscript>...</noscript>
+// constructs.
+//
 // Revision 1.6 2003年02月25日 05:45:34 carstenklapp
 // Added "See: " in front of url, so for browsers that do not support

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv30513/lib
Modified Files:
	HtmlElement.php 
Log Message:
New functions in HtmlElement:
JavaScript($js)
 Helper for generating javascript.
IfJavaScript($if_content, $else_content)
 Helper for generating
 <script>document.write('...')</script><noscript>...</noscript>
 constructs.
Index: HtmlElement.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/HtmlElement.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -2 -b -p -d -r1.30 -r1.31
--- HtmlElement.php	17 Feb 2003 06:02:25 -0000	1.30
+++ HtmlElement.php	27 Feb 2003 22:47:26 -0000	1.31
@@ -441,6 +441,60 @@ function HiddenInputs ($query_args, $pfx
 }
 
+
+/** Generate a <script> tag containing javascript.
+ *
+ * @param string $js The javascript.
+ * @return HtmlElement A <script> element.
+ */
+function JavaScript($js) {
+ return HTML::script(array('language' => 'JavaScript',
+ 'type' => 'text/javascript'),
+ new RawXml("<!-- //\n${js}\n// -->"));
+}
+
+/** Conditionally display content based of whether javascript is supported.
+ *
+ * This conditionally (on the client side) displays one of two alternate
+ * contents depending on whether the client supports javascript.
+ *
+ * NOTE:
+ * The content you pass as arguments to this function must be block-level.
+ * (This is because the <noscript> tag is block-level.)
+ *
+ * @param mixed $if_content Content to display if the browser supports
+ * javascript.
+ *
+ * @param mixed $else_content Content to display if the browser does
+ * not support javascript.
+ *
+ * @return XmlContent
+ */
+function IfJavaScript($if_content = false, $else_content = false) {
+ $html = array();
+ if ($if_content) {
+ $xml = AsXML($if_content);
+ $js = sprintf('document.write("%s");',
+ addcslashes($xml, "0円..37円!@\\177円..377円"));
+ $html[] = JavaScript($js);
+ }
+ if ($else_content) {
+ $html[] = HTML::noscript(false, $else_content);
+ }
+ return HTML($html);
+}
+ 
 /**
 $Log$
+ Revision 1.31 2003年02月27日 22:47:26 dairiki
+ New functions in HtmlElement:
+
+ JavaScript($js)
+ Helper for generating javascript.
+
+ IfJavaScript($if_content, $else_content)
+ Helper for generating
+ <script>document.write('...')</script><noscript>...</noscript>
+ constructs.
+
 Revision 1.30 2003年02月17日 06:02:25 dairiki
 Remove functions HiddenGets() and HiddenPosts().

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv23372/lib/plugin
Modified Files:
	PageHistory.php 
Log Message:
Javascript fix.
Fix so that you can never have more than two checkboxes checked. (If this
happens, all but the current checkbox are unchecked.)
It used to be that one could view a PageHistory, check two boxes to view
a diff, then hit the back button. (The originally checked two boxes are
still checked at this point.) Checking a third box resulted in viewing
a diff between a quasi-random pair of versions selected from the three
which were selected. Now clicking the third box results in the first
two being unchecked.
Index: PageHistory.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PageHistory.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -2 -b -p -d -r1.25 -r1.26
--- PageHistory.php	17 Feb 2003 02:19:01 -0000	1.25
+++ PageHistory.php	27 Feb 2003 21:15:14 -0000	1.26
@@ -146,9 +146,13 @@ extends _RecentChanges_HtmlFormatter
 
 function diffCkBox_onclick() {
- // If two checkboxes are checked, submit form
- var nchecked = 0;
- for (i = 0; i < diffCkBoxes.length; i++)
- if (diffCkBoxes[i].checked && ++nchecked >= 2)
+ var nchecked = 0, box = diffCkBoxes;
+ for (i = 0; i < box.length; i++)
+ if (box[i].checked) nchecked++;
+ if (nchecked == 2)
 this.form.submit();
+ else if (nchecked > 2) {
+ for (i = 0; i < box.length; i++)
+ if (box[i] != this) box[i].checked = 0;
+ }
 }
 
@@ -320,4 +324,17 @@ extends WikiPlugin_RecentChanges
 
 // $Log$
+// Revision 1.26 2003年02月27日 21:15:14 dairiki
+// Javascript fix.
+//
+// Fix so that you can never have more than two checkboxes checked. (If this
+// happens, all but the current checkbox are unchecked.)
+//
+// It used to be that one could view a PageHistory, check two boxes to view
+// a diff, then hit the back button. (The originally checked two boxes are
+// still checked at this point.) Checking a third box resulted in viewing
+// a diff between a quasi-random pair of versions selected from the three
+// which were selected. Now clicking the third box results in the first
+// two being unchecked.
+//
 // Revision 1.25 2003年02月17日 02:19:01 dairiki
 // Fix so that PageHistory will work when the current revision

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv2101/lib/plugin
Modified Files:
	AllPages.php AllUsers.php 
Log Message:
Disable profiling output when DEBUG is defined but false.
Index: AllPages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/AllPages.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -2 -b -p -d -r1.16 -r1.17
--- AllPages.php	21 Feb 2003 04:08:26 -0000	1.16
+++ AllPages.php	27 Feb 2003 20:10:30 -0000	1.17
@@ -69,12 +69,9 @@ extends WikiPlugin
 $pagelist->_addColumn('version');
 
- if (defined('DEBUG'))
- $debug = true;
-
 $timer = new DebugTimer;
 
 $pagelist->addPages( $dbi->getAllPages($include_empty) );
 
- if ($debug) {
+ if (defined('DEBUG') and DEBUG) {
 return HTML($pagelist,
 HTML::p(fmt("Elapsed time: %s s", $timer->getStats())));
@@ -91,4 +88,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.17 2003年02月27日 20:10:30 dairiki
+// Disable profiling output when DEBUG is defined but false.
+//
 // Revision 1.16 2003年02月21日 04:08:26 dairiki
 // New class DebugTimer in prepend.php to help report timing.
Index: AllUsers.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/AllUsers.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- AllUsers.php	21 Feb 2003 04:08:26 -0000	1.5
+++ AllUsers.php	27 Feb 2003 20:10:31 -0000	1.6
@@ -77,7 +77,4 @@ extends WikiPlugin
 $pagelist->_addColumn('version');
 
- if (defined('DEBUG'))
- $debug = true;
-
 $timer = new DebugTimer;
 
@@ -88,5 +85,5 @@ extends WikiPlugin
 }
 
- if ($debug) {
+ if (defined('DEBUG') and DEBUG) {
 return HTML($pagelist,
 HTML::p(fmt("Elapsed time: %s s", $timer->getStats())));
@@ -103,4 +100,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.6 2003年02月27日 20:10:31 dairiki
+// Disable profiling output when DEBUG is defined but false.
+//
 // Revision 1.5 2003年02月21日 04:08:26 dairiki
 // New class DebugTimer in prepend.php to help report timing.

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv31093/lib
Modified Files:
	display.php 
Log Message:
Fix HTTP validator bug (Last-Modified times for pages with plugins
were wrong.)
Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -2 -b -p -d -r1.43 -r1.44
--- display.php	26 Feb 2003 22:27:19 -0000	1.43
+++ display.php	27 Feb 2003 20:02:47 -0000	1.44
@@ -151,5 +151,4 @@ function displayPage(&$request, $templat
 $revision->getTransformedContent());
 
- $request->checkValidators();
 
 $toks['TITLE'] = $pagetitle;
@@ -163,6 +162,8 @@ function displayPage(&$request, $templat
 
 $template->printExpansion($toks);
- flush();
 $page->increaseHitCount();
+
+ $request->checkValidators();
+ flush();
 }
 

Update of /cvsroot/phpwiki/phpwiki/themes/Portland
In directory sc8-pr-cvs1:/tmp/cvs-serv10273/themes/Portland
Modified Files:
	themeinfo.php 
Log Message:
Fixes from Todd Mokros for linkUnknownWikiWord in MacOSX and Portland themes.
Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/themeinfo.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -2 -b -p -d -r1.7 -r1.8
--- themeinfo.php	8 Mar 2002 20:31:13 -0000	1.7
+++ themeinfo.php	26 Feb 2003 23:59:48 -0000	1.8
@@ -10,5 +10,14 @@ require_once('lib/Theme.php');
 class Theme_Portland extends Theme {
 function linkUnknownWikiWord($wikiword, $linktext = '') {
- $url = WikiURL($wikiword, array('action' => 'edit'));
+ global $request;
+ if (isa($wikiword, 'WikiPageName')) {
+ $default_text = $wikiword->shortName;
+ $wikiword = $wikiword->name;
+ }
+ else {
+ $default_text = $wikiword;
+ }
+ 
+ $url = WikiURL($wikiword, array('action' => 'create'));
 $link = HTML::span(HTML::a(array('href' => $url), '?'));
 
@@ -18,7 +27,9 @@ class Theme_Portland extends Theme {
 }
 else {
- $link->unshiftContent(HTML::u($this->maybeSplitWikiWord($wikiword)));
+ $link->unshiftContent(HTML::u($this->maybeSplitWikiWord($default_text)));
 $link->setAttr('class', 'wikiunknown');
 }
+ if ($request->getArg('frame'))
+ $link->setAttr('target', '_top');
 
 return $link;

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX
In directory sc8-pr-cvs1:/tmp/cvs-serv10273/themes/MacOSX
Modified Files:
	themeinfo.php 
Log Message:
Fixes from Todd Mokros for linkUnknownWikiWord in MacOSX and Portland themes.
Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MacOSX/themeinfo.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -2 -b -p -d -r1.46 -r1.47
--- themeinfo.php	8 Mar 2002 20:31:14 -0000	1.46
+++ themeinfo.php	26 Feb 2003 23:59:47 -0000	1.47
@@ -56,7 +56,20 @@ class Theme_MacOSX extends Theme {
 
 function linkUnknownWikiWord($wikiword, $linktext = '') {
- $url = WikiURL($wikiword, array('action' => 'edit'));
+ global $request;
+
+ // Get rid of anchors on unknown wikiwords
+ if (isa($wikiword, 'WikiPageName')) {
+ $default_text = $wikiword->shortName;
+ $wikiword = $wikiword->name;
+ }
+ else {
+ $default_text = $wikiword;
+ }
+ 
+ $url = WikiURL($wikiword, array('action' => 'create'));
 //$link = HTML::span(HTML::a(array('href' => $url), '?'));
- $link = HTML::span($this->makeButton('?', $url));
+ $button = $this->makeButton('?', $url);
+ $button->addTooltip(sprintf(_("Create: %s"), $wikiword));
+ $link = HTML::span($button);
 
 
@@ -66,7 +79,9 @@ class Theme_MacOSX extends Theme {
 }
 else {
- $link->unshiftContent(HTML::u($this->maybeSplitWikiWord($wikiword)));
+ $link->unshiftContent(HTML::u($this->maybeSplitWikiWord($default_text)));
 $link->setAttr('class', 'wikiunknown');
 }
+ if ($request->getArg('frame'))
+ $link->setAttr('target', '_top');
 
 return $link;

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv3301/lib/plugin
Modified Files:
	FrameInclude.php 
Log Message:
Wups. Delete disused cruft.
Index: FrameInclude.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/FrameInclude.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -2 -b -p -d -r1.7 -r1.8
--- FrameInclude.php	26 Feb 2003 22:27:19 -0000	1.7
+++ FrameInclude.php	26 Feb 2003 22:32:06 -0000	1.8
@@ -116,4 +116,5 @@ extends WikiPlugin
 
 if (($which = $request->getArg('frame'))) {
+ // Generate specialized frame output (header, footer, etc...)
 $request->discardOutput();
 displayPage($request, new Template("frame-$which", $request));
@@ -121,4 +122,5 @@ extends WikiPlugin
 }
 
+ // Generate the outer frameset
 $frame = HTML::frame(array('name' => $name,
 'src' => $src,
@@ -144,73 +146,11 @@ extends WikiPlugin
 displayPage($request, new Template('frameset', $request, $tokens));
 $request->finish(); //noreturn
-
- 
- // pass FRAMEPARAMS directly to the Template call in Template.php:214
- // which goes right after <HEAD>
- $topuri = $request->getURLtoSelf(array('frame' => 'top'));
- $bottomuri = $request->getURLtoSelf(array('frame' => 'bottom'));
- $top = HTML::frame(array('name' => "top", "src" => $topuri));
- $bottom = HTML::frame(array('name' => "bottom", "src" => $bottomuri));
- //$bottom = "<frame name=\"bottom\" src=\"$bottomuri\" />";
-
- $content_opts = array('name' => $name, "src" => $src,
- 'frameborder' => $frameborder);
- // $content = "<frame name=\"$name\" src=\"$src\" frameborder=\"$frameborder\" ";
- if ($marginwidth)
- $content_opts['marginwidth'] = $marginwidth;
- if ($marginheight)
- $content_opts['marginheight'] = $marginheight;
- if ($noresize)
- $content_opts['noresize'] = "noresize";
- $content_opts['scrolling'] = $scrolling;
- $content = HTML::frame($content_opts);
-
- // include this into top.tmpl instead
- //$memo = HTML(HTML::p(array('class' => 'transclusion-title'),
- // fmt("Included frame from %s", $src)));
- if (isa($Theme, 'Theme_Sidebar')) {
- // left also.
- $lefturi = $request->getURLtoSelf(array('frame' => 'navbar'));
- $frameset = HTML::frameset(array('rows' => $rows));
- $frameset->pushContent($top);
- $colframeset = HTML::frameset(array('cols' => $cols));
- $colframeset->pushContent(HTML::frame(array('name' => "left",
- "src" => $lefturi)));
- $colframeset->pushContent($content);
- $frameset->pushContent($colframeset);
- $frameset->pushContent($bottom);
- } else {
- unset($args['cols']);
- // only top, body, bottom
- $frameset = HTML::frameset(array('rows' => $rows));
- $frameset->pushContent($top);
- $frameset->pushContent($content);
- $frameset->pushContent($bottom);
- }
-
- $tokens['FRAMESET'] = $frameset;
-
- $request->discardOutput();
- return printXML(new Template('frameset', $request, $tokens));
- $request->finish();
- }
-
- function _generateFrame(&$request, $content) {
- $request->discardOutput();
- $head = new Template('head', $request);
- printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
- echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml">';
- echo "</html>\n";
- $head->printExpansion();
- echo "<body>\n";
- printXML($content);
- echo "</body>\n";
- $request->finish();
 }
 };
 
 // $Log$
+// Revision 1.8 2003年02月26日 22:32:06 dairiki
+// Wups. Delete disused cruft.
+//
 // Revision 1.7 2003年02月26日 22:27:19 dairiki
 // Fix and refactor FrameInclude plugin (more or less).

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv31082/themes/default/templates
Modified Files:
	body.tmpl browse.tmpl frameset.tmpl head.tmpl html.tmpl 
	top.tmpl viewsource.tmpl 
Added Files:
	browse-footer.tmpl frame-footer.tmpl frame-header.tmpl 
Log Message:
Fix and refactor FrameInclude plugin (more or less).
(This should now generate valid HTML. Woohoo!)
The output when using the Sidebar theme is ugly enough that it should
be considered broken. (But the Sidebar theme appears pretty broken in
general right now.)
(Personal comment (not to be taken personally): I must say that I
remain unconvinced of the usefulness of this plugin.)
--- NEW FILE: browse-footer.tmpl ---
<?php // -*-html-*- ?>
<!-- $Id: browse-footer.tmpl,v 1.1 2003年02月26日 22:27:16 dairiki Exp $ -->
<hr class="printer" noshade="noshade" />
<p class="editdate"><?= $Theme->getLastModifiedMessage($revision) ?></p>
<?php
global $HIDE_TOOLBARS;
if (!$HIDE_TOOLBARS) {
?>
<hr class="toolbar" noshade="noshade" />
<div class="toolbar">
<?= Template('actionbar') ?>
</div>
<?php } ?>
<!-- RELATEDPAGES were here. -->
--- NEW FILE: frame-footer.tmpl ---
<?php // -*-html-*-
/* $Id: frame-footer.tmpl,v 1.1 2003年02月26日 22:27:17 dairiki Exp $
 *
 * This template is responsible mainly for the outer level <html> stuff.
 */
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<?= Template('head') ?>
<body>
<?= Template('browse-footer') ?>
<?= Template('bottom') ?>
</body>
</html>
--- NEW FILE: frame-header.tmpl ---
<?php // -*-html-*-
/* $Id: frame-header.tmpl,v 1.1 2003年02月26日 22:27:17 dairiki Exp $
 *
 * This template is responsible mainly for the outer level <html> stuff.
 */
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<?= Template('head') ?>
<body><?= Template('top') ?></body>
</html>
Index: body.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/body.tmpl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -2 -b -p -d -r1.30 -r1.31
--- body.tmpl	2 Sep 2002 14:36:58 -0000	1.30
+++ body.tmpl	26 Feb 2003 22:27:14 -0000	1.31
@@ -2,13 +2,8 @@
 <!-- $Id$ -->
 <body>
+<div id="header"> <!-- for top&bottom toolbars style sheet -->
 <?= Template('top') ?>
-<?php if (!empty($framesrc)) { ?>
-<p class="transclusion-title"><?=fmt("Included from %s:",$framesrc)?></p>
-<div class="transclusion">
-<?php } ?>
-<?= $CONTENT ?>
-<?php if (!empty($framesrc)) { ?>
 </div>
-<?php } ?>
+<?= $CONTENT ?>
 <?= Template('bottom') ?>
 </body>
Index: browse.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/browse.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -2 -b -p -d -r1.22 -r1.23
--- browse.tmpl	19 Feb 2002 23:00:26 -0000	1.22
+++ browse.tmpl	26 Feb 2003 22:27:16 -0000	1.23
@@ -11,14 +11,5 @@
 <?=$CONTENT?>
 
-<div id="actionbar" class="toolbar">
-<hr class="printer" noshade="noshade" />
-<p class="editdate"><?= $Theme->getLastModifiedMessage($revision) ?></p>
-<?php
-global $HIDE_TOOLBARS;
-if (!$HIDE_TOOLBARS) {
-?>
-<hr class="toolbar" noshade="noshade" />
-<?= Template('actionbar') ?>
-<?php } ?>
-<!-- RELATEDPAGES were here. -->
+<div id="footer"><!-- for top & bottom toolbars stylesheet -->
+<?=Template('browse-footer')?>
 </div>
Index: frameset.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/frameset.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- frameset.tmpl	2 Sep 2002 14:36:59 -0000	1.3
+++ frameset.tmpl	26 Feb 2003 22:27:17 -0000	1.4
@@ -3,9 +3,22 @@
 *
 * This template is used for the FrameInclude plugin.
- */ ?>
+ */
+
+$topurl = $request->getURLtoSelf(array('frame' => 'header'));
+$boturl = $request->getURLtoSelf(array('frame' => 'footer'));
+
+
+printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <?= Template('head') ?>
-<?=$FRAMESET?>
-<NOFRAME>
- <?= Template('body') ?>
-</NOFRAME>
+
+<frameset rows="<?=$ROWS?>">
+ <frame name="header" src="<?=$topurl?>" <?= $FRAMEARGS ?>/>
+ <?= $CONTENT_FRAME ?>
+ <frame name="footer" src="<?=$boturl?>" <?= $FRAMEARGS ?>/>
+ <noframes><?= Template('body') ?></noframes>
+</frameset>
 </html>
\ No newline at end of file
Index: head.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/head.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- head.tmpl	11 Jan 2003 22:29:47 -0000	1.6
+++ head.tmpl	26 Feb 2003 22:27:17 -0000	1.7
@@ -1,12 +1,3 @@
-<?php // -*-html-*-
-/* $Id$
- *
- * This template is responsible mainly for the outer level <html> stuff and the <head>.
- */
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?php // -*-html-*- ?>
 <head>
 <!-- $Id$ -->
@@ -115,4 +106,16 @@ printf("<?xml version=\"1.0\" encoding=\
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
 // $Log$
+// Revision 1.7 2003年02月26日 22:27:17 dairiki
+// Fix and refactor FrameInclude plugin (more or less).
+//
+// (This should now generate valid HTML. Woohoo!)
+//
+// The output when using the Sidebar theme is ugly enough that it should
+// be considered broken. (But the Sidebar theme appears pretty broken in
+// general right now.)
+//
+// (Personal comment (not to be taken personally): I must say that I
+// remain unconvinced of the usefulness of this plugin.)
+//
 // Revision 1.6 2003年01月11日 22:29:47 carstenklapp
 // Tweak redundant bookmark title when browsing a custom home page with
Index: html.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/html.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- html.tmpl	23 Aug 2002 18:29:34 -0000	1.1
+++ html.tmpl	26 Feb 2003 22:27:18 -0000	1.2
@@ -1,3 +1,12 @@
-<?php // -*-html-*- ?>
+<?php // -*-html-*-
+/* $Id$
+ *
+ * This template is responsible mainly for the outer level <html> stuff.
+ */
+printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <?= Template('head') ?>
 <?= Template('body') ?>
Index: top.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/top.tmpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -2 -b -p -d -r1.23 -r1.24
--- top.tmpl	15 Feb 2003 23:32:57 -0000	1.23
+++ top.tmpl	26 Feb 2003 22:27:18 -0000	1.24
@@ -1,5 +1,4 @@
 <?php // -*-html-*- ?>
 <!-- $Id$ -->
-<div id="navbar" class="toolbar">
 <?php
 global $HIDE_TOOLBARS;
@@ -14,15 +13,8 @@ if (!$HIDE_TOOLBARS) {
 
 <!-- The top navigation/search bar -->
-<?= Template('navbar') ?>
+<div class="toolbar"><?= Template('navbar') ?></div>
 <?php } ?>
+
 <!-- Page title -->
-<h1><?= $HEADER ?>
- <?php if ($REDIRECT_FROM) { ?>
- <span class="redirectfrom">(<?=$REDIRECT_FROM?>)</span>
- <?php } ?>
-</h1>
-</div>
-<?php if ($request->getArg('frame')) { ?>
-<!-- The included frame url for safety -->
-<p class="transclusion-title"><?fmt("Included frame from %s",$framesrc)?></p>
-<?php } ?>
+<h1><?= $HEADER ?></h1>
+
Index: viewsource.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/viewsource.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -2 -b -p -d -r1.20 -r1.21
--- viewsource.tmpl	26 Feb 2003 01:56:53 -0000	1.20
+++ viewsource.tmpl	26 Feb 2003 22:27:18 -0000	1.21
@@ -15,5 +15,5 @@
 <form method="post" action="<?=$request->getPostURL()?>" accept-charset="<?=CHARSET?>">
 <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
-<br clear="both" />
+<br clear="all" />
 <!-- wrap=virtual is not HTML4, but without it NS4 does not wrap long lines -->
 <textarea class="wikiedit"
@@ -24,11 +24,8 @@ readonly="readonly"
 wrap="virtual"><?= $PAGE_SOURCE ?></textarea>
 
-<div id="actionbar" class="toolbar">
-<hr class="printer" noshade="noshade" />
-<p class="editdate"><?= $Theme->getLastModifiedMessage($revision) ?></p>
-<hr class="toolbar" noshade="noshade" />
-<?= Template('actionbar') ?>
-<!-- RELATEDPAGES were here. -->
+<div id="footer"><!-- for top & bottom toolbars stylesheet -->
+<?=Template('browse-footer')?>
 </div>
+
 <?= HiddenInputs($request->getArgs()) ?>
 </form>

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv31082/lib
Modified Files:
	Template.php display.php 
Log Message:
Fix and refactor FrameInclude plugin (more or less).
(This should now generate valid HTML. Woohoo!)
The output when using the Sidebar theme is ugly enough that it should
be considered broken. (But the Sidebar theme appears pretty broken in
general right now.)
(Personal comment (not to be taken personally): I must say that I
remain unconvinced of the usefulness of this plugin.)
Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -2 -b -p -d -r1.48 -r1.49
--- Template.php	21 Feb 2003 22:58:58 -0000	1.48
+++ Template.php	26 Feb 2003 22:27:18 -0000	1.49
@@ -112,4 +112,6 @@ class Template
 global $Theme, $RCS_IDS;
 
+ 
+ 
 //$this->_dump_template();
 
@@ -209,12 +211,4 @@ function GeneratePage($content, $title, 
 $args['HEADER'] = $title;
 
- if ($frame = $request->getArg('frame')) {
- if ($frame == 'top') $args['framesrc'] = $request->getArg('framesrc');
- printXML(new Template('head', $request, $args));
- printXML(new Template($frame, $request, $args));
- $request->setArg('framesrc',false);
- return;
- }
-
 printXML(new Template('html', $request, $args));
 }
Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -2 -b -p -d -r1.42 -r1.43
--- display.php	21 Feb 2003 04:12:05 -0000	1.42
+++ display.php	26 Feb 2003 22:27:19 -0000	1.43
@@ -89,5 +89,5 @@ function actionPage(&$request, $action) 
 }
 
-function displayPage(&$request, $tmpl = 'browse') {
+function displayPage(&$request, $template=false) {
 $pagename = $request->getArg('pagename');
 $version = $request->getArg('version');
@@ -130,35 +130,37 @@ function displayPage(&$request, $tmpl = 
 $splitname);
 $pagetitle->addTooltip(sprintf(_("BackLinks for %s"), $pagename));
+ if ($request->getArg('frame'))
+ $pagetitle->setAttr('target', '_top');
 }
 
- $redirect_from = $request->getArg('redirectfrom');
- if ($redirect_from) {
- $redirect_from = fmt("Redirected from %s", RedirectorLink($redirect_from));
+ $pageheader = $pagetitle;
+ if (($redirect_from = $request->getArg('redirectfrom'))) {
+ $redirect_message = HTML::span(array('class' => 'redirectfrom'),
+ fmt("(Redirected from %s)",
+ RedirectorLink($redirect_from)));
+ $pageheader = HTML($pagetitle, $redirect_message);
 }
 
- //include_once('lib/BlockParser.php');
-
 $request->appendValidators(array('pagerev' => $revision->getVersion(),
 '%mtime' => $revision->get('mtime')));
 
- if ($frame = $request->getArg('frame')) {
- if (in_array($frame, array('body','browse','editpage')))
- $template = Template($frame, array('CONTENT' => $revision->getTransformedContent()));
- elseif ($frame == 'top')
- $template = Template($frame, array('framesrc' => $request->getArg('framesrc')));
- else
- $template = Template($frame);
- } else {
- $transformedContent = $revision->getTransformedContent();
- $template = Template('browse', array('CONTENT' => $transformedContent));
- }
-
+ // FIXME: should probably be in a template...
 header("Content-Type: text/html; charset=" . CHARSET); // FIXME: this gets done twice?
 
- GeneratePage($template, $pagetitle, $revision,
- array('ROBOTS_META'	=> 'index,follow',
- 'PAGE_DESCRIPTION' => GleanDescription($revision),
- 'REDIRECT_FROM' => $redirect_from));
+ $toks['CONTENT'] = new Template('browse', $request,
+ $revision->getTransformedContent());
+ 
 $request->checkValidators();
+ 
+ $toks['TITLE'] = $pagetitle;
+ $toks['HEADER'] = $pageheader;
+ $toks['revision'] = $revision;
+ $toks['ROBOTS_META'] = 'index,follow';
+ $toks['PAGE_DESCRIPTION'] = GleanDescription($revision);
+ 
+ if (!$template)
+ $template = new Template('html', $request);
+
+ $template->printExpansion($toks);
 flush();
 $page->increaseHitCount();

Update of /cvsroot/phpwiki/phpwiki/themes/default
In directory sc8-pr-cvs1:/tmp/cvs-serv31082/themes/default
Modified Files:
	phpwiki-topbottombars.css 
Log Message:
Fix and refactor FrameInclude plugin (more or less).
(This should now generate valid HTML. Woohoo!)
The output when using the Sidebar theme is ugly enough that it should
be considered broken. (But the Sidebar theme appears pretty broken in
general right now.)
(Personal comment (not to be taken personally): I must say that I
remain unconvinced of the usefulness of this plugin.)
Index: phpwiki-topbottombars.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/phpwiki-topbottombars.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- phpwiki-topbottombars.css	6 Mar 2002 02:21:16 -0000	1.1
+++ phpwiki-topbottombars.css	26 Feb 2003 22:27:13 -0000	1.2
@@ -20,5 +20,5 @@ body {
 * #navbar and #actionbar, such as in editpage and removepage
 */
-div#navbar, div#actionbar {
+div#header, div#footer {
 background: ivory;
 margin: 0px;
@@ -40,5 +40,5 @@ hr.toolbar {
 * Navbar
 */
-div#navbar {
+div#header {
 top: 0px;
 padding-top: 1.5ex;
@@ -53,5 +53,5 @@ div#navbuttons {
 * Actionbar
 */
-div#actionbar {
+div#footer {
 border-top: 1px solid #b2b2b2;
 /* kludge for Mozilla */

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1:/tmp/cvs-serv31082/lib/plugin
Modified Files:
	FrameInclude.php WikiAdminRemove.php 
Log Message:
Fix and refactor FrameInclude plugin (more or less).
(This should now generate valid HTML. Woohoo!)
The output when using the Sidebar theme is ugly enough that it should
be considered broken. (But the Sidebar theme appears pretty broken in
general right now.)
(Personal comment (not to be taken personally): I must say that I
remain unconvinced of the usefulness of this plugin.)
Index: FrameInclude.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/FrameInclude.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- FrameInclude.php	18 Jan 2003 21:41:01 -0000	1.6
+++ FrameInclude.php	26 Feb 2003 22:27:19 -0000	1.7
@@ -25,24 +25,19 @@ rcs_id('$Id$');
 *
 * Usage:
- * <?plugin-head FrameInclude src=http://www.internet-technology.de/fourwins_de.htm ?>
- * <?plugin-head FrameInclude page=OtherPage ?>
- * at the VERY BEGINNING in the content! Otherwise it will be ignored.
+ * <?plugin FrameInclude src=http://www.internet-technology.de/fourwins_de.htm ?>
+ * <?plugin FrameInclude page=OtherPage ?>
+ * at the VERY BEGINNING in the content!
 *
- * Author: Reini Urban <ru...@x-...>
+ * Author: Reini Urban <ru...@x-...>, rewrite by Jeff Dairiki <da...@da...>
 *
 * KNOWN ISSUES:
 *
 * This is a dirty hack into the whole system. To display the page as
- * frameset we must know in advance about the plugin existence.
- *
- * 1. Check the page content for the start string '<?plugin-head '
- * which we currently do.
- *
- * 2. We can buffer the output stream (which in certain cases is not
- doable).
+ * frameset we:
 *
- * 3. Redirect to a new page with the frameset only. ?frameset=pagename
- * $request->setArg('framesrc', $src);
- * $request->redirect('frameset', $request->getName());
+ * 1. Discard any output buffered so far.
+ * 2. Recursively call displayPage with magic arguments to generate
+ * the frameset (or individual frame contents.)
+ * 3. Exit early. (So this plugin is usually a no-return.)
 *
 * In any cases we can now serve only specific templates with the new
@@ -50,9 +45,4 @@ rcs_id('$Id$');
 * named "top") For the Sidebar theme (or derived from it) we provide
 * a left frame also, otherwise only top, content and bottom.
- *
- * This plugin doesn't return a typical html stream inside a <body>,
- * only a <frameset> which has to go before <body>, right after
- * <head>.
- *
 */
 class WikiPlugin_FrameInclude
@@ -77,8 +67,8 @@ extends WikiPlugin
 'name' => 'content', // name of our frame
 'title' => false,
- 'rows' => '10%,*,10%', // names: top, $name, bottom
- 'cols' => '10%,*', // names: left, $name
+ 'rows' => '18%,*,15%', // names: top, $name, bottom
+ 'cols' => '20%,*', // names: left, $name
 // only useful on Theme "Sidebar"
- 'frameborder' => 0,
+ 'frameborder' => 1,
 'marginwidth' => false,
 'marginheight' => false,
@@ -88,5 +78,5 @@ extends WikiPlugin
 }
 
- function run($dbi, $argstr, $request) {
+ function run($dbi, $argstr, &$request) {
 global $Theme;
 
@@ -94,20 +84,22 @@ extends WikiPlugin
 extract($args);
 
- if (!$src) {
- if (!$page) {
- return
- $this->error(sprintf(_("%s or %s parameter missing"),
- 'src', 'page'));
- } else {
+ if ($request->getArg('action') != 'browse')
+ return $this->disabled("(action != 'browse')");
+ if (! $request->isGetOrHead())
+ return $this->disabled("(method != 'GET')");
+ 
+ if (!$src and $page) {
 if ($page == $request->get('pagename')) {
- return
- $this->error(sprintf(_("recursive inclusion of page %s"),
+ return $this->error(sprintf(_("recursive inclusion of page %s"),
 $page));
 }
 $src = WikiURL($page);
 }
+ if (!$src) {
+ return $this->error(sprintf(_("%s or %s parameter missing"),
+ 'src', 'page'));
 }
 
- // How to normalize url's to compare against recursion?
+ // FIXME: How to normalize url's to compare against recursion?
 if ($src == $request->getURLtoSelf() ) {
 return $this->error(sprintf(_("recursive inclusion of url %s"),
@@ -115,4 +107,43 @@ extends WikiPlugin
 }
 
+ static $noframes = false;
+ if ($noframes) {
+ // Content for noframes version of page.
+ return HTML::p(fmt("See %s",
+ HTML::a(array('href' => $src), $src)));
+ }
+ $noframes = true;
+
+ if (($which = $request->getArg('frame'))) {
+ $request->discardOutput();
+ displayPage($request, new Template("frame-$which", $request));
+ $request->finish(); //noreturn
+ }
+ 
+ $frame = HTML::frame(array('name' => $name,
+ 'src' => $src,
+ 'title' => $title,
+ 'frameborder' => (int)$frameborder,
+ 'scrolling' => (string)$scrolling,
+ 'noresize' => (bool)$noresize,
+ ));
+ 
+ if ($marginwidth)
+ $frame->setArg('marginwidth', $marginwidth);
+ if ($marginheight)
+ $frame->setArg('marginheight', $marginheight);
+ 
+ $tokens = array('CONTENT_FRAME' => $frame,
+ 'ROWS' => $rows,
+ 'COLS' => $cols,
+ 'FRAMEARGS' => sprintf('frameborder="%d"', $frameborder),
+ );
+
+ // Produce the frameset.
+ $request->discardOutput();
+ displayPage($request, new Template('frameset', $request, $tokens));
+ $request->finish(); //noreturn
+
+ 
 // pass FRAMEPARAMS directly to the Template call in Template.php:214
 // which goes right after <HEAD>
@@ -157,10 +188,41 @@ extends WikiPlugin
 $frameset->pushContent($bottom);
 }
- $args['FRAMESET'] = $frameset;
- return printXML(new Template('frameset', $request, $args));
+
+ $tokens['FRAMESET'] = $frameset;
+
+ $request->discardOutput();
+ return printXML(new Template('frameset', $request, $tokens));
+ $request->finish();
+ }
+
+ function _generateFrame(&$request, $content) {
+ $request->discardOutput();
+ $head = new Template('head', $request);
+ printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
+ echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml">';
+ echo "</html>\n";
+ $head->printExpansion();
+ echo "<body>\n";
+ printXML($content);
+ echo "</body>\n";
+ $request->finish();
 }
 };
 
 // $Log$
+// Revision 1.7 2003年02月26日 22:27:19 dairiki
+// Fix and refactor FrameInclude plugin (more or less).
+//
+// (This should now generate valid HTML. Woohoo!)
+//
+// The output when using the Sidebar theme is ugly enough that it should
+// be considered broken. (But the Sidebar theme appears pretty broken in
+// general right now.)
+//
+// (Personal comment (not to be taken personally): I must say that I
+// remain unconvinced of the usefulness of this plugin.)
+//
 // Revision 1.6 2003年01月18日 21:41:01 carstenklapp
 // Code cleanup:
Index: WikiAdminRemove.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/WikiAdminRemove.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -2 -b -p -d -r1.8 -r1.9
--- WikiAdminRemove.php	17 Feb 2003 17:23:59 -0000	1.8
+++ WikiAdminRemove.php	26 Feb 2003 22:27:22 -0000	1.9
@@ -22,5 +22,4 @@ rcs_id('$Id$');
 
 /**
- * Displays a url in a seperate frame inside our body.
 * Usage: <?plugin WikiAdminRemove?>
 * Author: Reini Urban <ru...@x-...>
@@ -216,4 +215,16 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.9 2003年02月26日 22:27:22 dairiki
+// Fix and refactor FrameInclude plugin (more or less).
+//
+// (This should now generate valid HTML. Woohoo!)
+//
+// The output when using the Sidebar theme is ugly enough that it should
+// be considered broken. (But the Sidebar theme appears pretty broken in
+// general right now.)
+//
+// (Personal comment (not to be taken personally): I must say that I
+// remain unconvinced of the usefulness of this plugin.)
+//
 // Revision 1.8 2003年02月17日 17:23:59 dairiki
 // Disable plugin unless action='browse'.

Update of /cvsroot/phpwiki/phpwiki/themes/Sidebar/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv31082/themes/Sidebar/templates
Added Files:
	frame-footer.tmpl frame-header.tmpl frame-left.tmpl 
	frameset.tmpl 
Log Message:
Fix and refactor FrameInclude plugin (more or less).
(This should now generate valid HTML. Woohoo!)
The output when using the Sidebar theme is ugly enough that it should
be considered broken. (But the Sidebar theme appears pretty broken in
general right now.)
(Personal comment (not to be taken personally): I must say that I
remain unconvinced of the usefulness of this plugin.)
--- NEW FILE: frame-footer.tmpl ---
<?php // -*-html-*-
/* $Id: frame-footer.tmpl,v 1.1 2003年02月26日 22:27:11 dairiki Exp $
 *
 * This template is responsible mainly for the outer level <html> stuff.
 */
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<?= Template('head') ?>
<body>
<hr class="printer" noshade="noshade" />
<p class="editdate"><?= $Theme->getLastModifiedMessage($revision) ?></p>
<?= Template('bottom') ?>
</body>
</html>
--- NEW FILE: frame-header.tmpl ---
<?php // -*-html-*-
/* $Id: frame-header.tmpl,v 1.1 2003年02月26日 22:27:13 dairiki Exp $
 *
 * This template is responsible mainly for the outer level <html> stuff.
 */
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<?= Template('head') ?>
<body>
<div align="right" id="logo"><a class="wikilink" 
 href="<?=WikiURL(HOME_PAGE)?>" target="_top"
 ><img src="<?=$Theme->getImageURL('logo')?>" id="logo-img"
 border="0" alt="<?=fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>"
 align="right" /></a></div>
<!-- Page title -->
<h1><?= $HEADER ?></h1>
</body>
</html>
--- NEW FILE: frame-left.tmpl ---
<?php // -*-html-*-
/* $Id: frame-left.tmpl,v 1.1 2003年02月26日 22:27:13 dairiki Exp $
 *
 * This template is responsible mainly for the outer level <html> stuff.
 */
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<?= Template('head') ?>
<body>
<div class="toolbar"><?= Template('navbar') ?></div>
<div class="toolbar"><?= Template('actionbar') ?></div>
</body>
</html>
--- NEW FILE: frameset.tmpl ---
<?php // -*-html-*-
/* $Id: frameset.tmpl,v 1.1 2003年02月26日 22:27:13 dairiki Exp $
 *
 * This template is used for the FrameInclude plugin.
 */
$topurl = $request->getURLtoSelf(array('frame' => 'header'));
$boturl = $request->getURLtoSelf(array('frame' => 'footer'));
$lefturl = $request->getURLtoSelf(array('frame' => 'left'));
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<?= Template('head') ?>
<frameset rows="<?=$ROWS?>">
 <frame name="header" src="<?=$topurl?>" <?= $FRAMEARGS ?> />
 <frameset cols="<?=$COLS?>">
 <frame name="left" src="<?=$lefturl?>" <?= $FRAMEARGS ?> />
 <?= $CONTENT_FRAME ?>
 </frameset>
 <frame name="footer" src="<?=$boturl?>" <?= $FRAMEARGS ?> />
 <noframes><?= Template('body') ?></noframes>
</frameset>
</html>

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv5032/lib
Modified Files:
	BlockParser.php 
Log Message:
Patch from Todd Mokros:
This fixes "PHP Fatal error: Call to undefined function: gettag() in
lib/BlockParser.php", when including plugins in a list.
Index: BlockParser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/BlockParser.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -2 -b -p -d -r1.36 -r1.37
--- BlockParser.php	21 Feb 2003 05:09:24 -0000	1.36
+++ BlockParser.php	26 Feb 2003 17:17:52 -0000	1.37
@@ -419,5 +419,5 @@ class TightSubBlock extends SubBlock {
 if (count($this->_content) == 1) {
 $elem = $this->_content[0];
- if ($elem->getTag() == 'p') {
+ if (isa($elem, 'XmlElement') and $elem->getTag() == 'p') {
 assert($elem->getAttr('class') == 'tightenable top bottom');
 $this->setContent($elem->getContent());