phpwiki-checkins Mailing List for PhpWiki

Revision: 8268
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8268&view=rev
Author: vargenau
Date: 2012年04月14日 16:59:41 +0000 (2012年4月14日)
Log Message:
-----------
Add brackets
Modified Paths:
--------------
 trunk/pgsrc/Help%2FAsciiMathPlugin
Modified: trunk/pgsrc/Help%2FAsciiMathPlugin
===================================================================
--- trunk/pgsrc/Help%2FAsciiMathPlugin	2012年04月13日 16:17:36 UTC (rev 8267)
+++ trunk/pgsrc/Help%2FAsciiMathPlugin	2012年04月14日 16:59:41 UTC (rev 8268)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: 2012年4月14日 18:58:46 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -32,7 +32,7 @@
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
-* Help:AsciiSVGPlugin
+* [[Help:AsciiSVGPlugin]]
 
 <noinclude>
 ----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8267
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8267&view=rev
Author: vargenau
Date: 2012年04月13日 16:17:36 +0000 (2012年4月13日)
Log Message:
-----------
Increase memory limit (page with huge history)
Modified Paths:
--------------
 trunk/g
Modified: trunk/g
===================================================================
--- trunk/g	2012年04月13日 16:15:30 UTC (rev 8266)
+++ trunk/g	2012年04月13日 16:17:36 UTC (rev 8267)
@@ -42,7 +42,7 @@
 * ALONE BASIS."
 */
 
-ini_set("memory_limit", "64M");
+ini_set("memory_limit", "256M");
 
 // Disable compression, seems needed to get all the messages.
 $no_gz_buffer=true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8266
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8266&view=rev
Author: vargenau
Date: 2012年04月13日 16:15:30 +0000 (2012年4月13日)
Log Message:
-----------
See Also
Modified Paths:
--------------
 trunk/pgsrc/Help%2FBlogArchivesPlugin
 trunk/pgsrc/Help%2FBlogJournalPlugin
 trunk/pgsrc/Help%2FWikiBlogPlugin
Modified: trunk/pgsrc/Help%2FBlogArchivesPlugin
===================================================================
--- trunk/pgsrc/Help%2FBlogArchivesPlugin	2012年04月13日 16:05:04 UTC (rev 8265)
+++ trunk/pgsrc/Help%2FBlogArchivesPlugin	2012年04月13日 16:15:30 UTC (rev 8266)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: 2012年4月13日 18:14:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -45,6 +45,8 @@
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
+* [[Help:WikiBlogPlugin]]
+* [[Help:BlogJournalPlugin]]
 
 <noinclude>
 ----
Modified: trunk/pgsrc/Help%2FBlogJournalPlugin
===================================================================
--- trunk/pgsrc/Help%2FBlogJournalPlugin	2012年04月13日 16:05:04 UTC (rev 8265)
+++ trunk/pgsrc/Help%2FBlogJournalPlugin	2012年04月13日 16:15:30 UTC (rev 8266)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: 2012年4月13日 18:14:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -49,6 +49,8 @@
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
+* [[Help:WikiBlogPlugin]]
+* [[Help:BlogArchivesPlugin]]
 
 <noinclude>
 ----
Modified: trunk/pgsrc/Help%2FWikiBlogPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiBlogPlugin	2012年04月13日 16:05:04 UTC (rev 8265)
+++ trunk/pgsrc/Help%2FWikiBlogPlugin	2012年04月13日 16:15:30 UTC (rev 8266)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: 2012年4月13日 18:14:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -10,8 +10,14 @@
 
 This simple [[Help:WikiPlugin|plugin]] allows blog-style entries on a page. Try making a few entries, and then look at [[RecentChanges]] to get an idea of how things work.
 
+== Example ==
+
 <<WikiBlog>>
 
+== See Also ==
+* [[Help:BlogJournalPlugin]]
+* [[Help:BlogArchivesPlugin]]
+
 <noinclude>
 ----
 [[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8265
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8265&view=rev
Author: vargenau
Date: 2012年04月13日 16:05:04 +0000 (2012年4月13日)
Log Message:
-----------
Spelling
Modified Paths:
--------------
 trunk/pgsrc/Help%2FFacebookLikePlugin
Modified: trunk/pgsrc/Help%2FFacebookLikePlugin
===================================================================
--- trunk/pgsrc/Help%2FFacebookLikePlugin	2012年04月12日 14:26:50 UTC (rev 8264)
+++ trunk/pgsrc/Help%2FFacebookLikePlugin	2012年04月13日 16:05:04 UTC (rev 8265)
@@ -1,4 +1,4 @@
-Date: 2011年1月13日 17:58:21 +0000
+Date: 2012年4月13日 18:04:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -8,12 +8,12 @@
 charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~FacebookLike** [[Help:WikiPlugin|plugin]] will include a "Facebook-like" button in your wiki page.
+The **~FacebookLike** [[Help:WikiPlugin|plugin]] will include a Facebook "Like" button in your wiki page.
 
 == Usage ==
 
 {{{
-<<FacebookLike arguments >>
+<<FacebookLike arguments>>
 }}}
 
 == Arguments ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8264
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8264&view=rev
Author: vargenau
Date: 2012年04月12日 14:26:50 +0000 (2012年4月12日)
Log Message:
-----------
Viewing wiki documents on FusionForge private projects
Modified Paths:
--------------
 trunk/g
Added Paths:
-----------
 trunk/view.php
Modified: trunk/g
===================================================================
--- trunk/g	2012年04月10日 12:37:58 UTC (rev 8263)
+++ trunk/g	2012年04月12日 14:26:50 UTC (rev 8264)
@@ -104,7 +104,11 @@
 
 define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/');
 // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
- define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
+ if ($project->isPublic()) {
+ define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
+ } else {
+ define('UPLOAD_DATA_PATH', '/wiki/view.php/'.WIKI_NAME.'/uploads/');
+ }
 
 // Do not use a directory per user but only one (per project)
 define('UPLOAD_USERDIR', false);
Added: trunk/view.php
===================================================================
--- trunk/view.php	 (rev 0)
+++ trunk/view.php	2012年04月12日 14:26:50 UTC (rev 8264)
@@ -0,0 +1,111 @@
+<?php
+/*
+ * Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Configuration File ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+$no_gz_buffer = true;
+
+require_once('../../env.inc.php');
+require_once $gfcommon.'include/pre.php';
+
+$sysdebug_enable = false;
+
+if (!$group_id || !$project) {
+ exit_no_group();
+} else if (!($project->usesPlugin("wiki"))) {
+ exit_disabled('home');
+}
+
+// If project is private, check membership.
+if (!$project->isPublic()) {
+ session_require_perm('project_read', $project->getID());
+}
+
+$arr = explode('/', urldecode(getStringFromServer('REQUEST_URI')));
+array_shift($arr);
+array_shift($arr);
+array_shift($arr);
+array_shift($arr);
+array_shift($arr);
+$path = join('/', $arr);
+
+$basepath = realpath('/opt/groups/'.$project->getUnixName().'/www/uploads/');
+$filepath = realpath($basepath.'/'.$path);
+$filename = basename($filepath);
+
+if (strncmp($basepath, $filepath, strlen($basepath)) !== 0) {
+ error_log("DEBUG: basepath=$basepath, filepath=$filepath");
+ exit_error('Invalid path: No access');
+}
+
+if ($filepath && is_file($filepath)) {
+ if (strstr($_SERVER['HTTP_USER_AGENT'], "MSIE")) {
+ # workaround for IE filename bug with multiple periods/ multiple dots in filename
+ # that adds square brackets to filename - eg. setup.abc.exe becomes setup[1].abc.exe
+ $filename = preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1);
+ }
+ $filename = str_replace('"', '', $filename);
+ header('Content-disposition: filename="'.$filename.'"');
+
+ if (function_exists('finfo_open')) {
+ $finfo = finfo_open(FILEINFO_MIME_TYPE);
+ $mimetype = finfo_file($finfo, $filepath);
+ } else {
+ $mimetype = 'application/octet-stream';
+ }
+ header("Content-type: $mimetype");
+
+ $length = filesize($filepath);
+ header("Content-length: $length");
+
+ readfile_chunked($filepath);
+
+} else {
+ header("HTTP/1.0 404 Not Found");
+ require_once $gfwww.'404.php';
+}
+
+// Local Variables:
+// mode: php
+// c-file-style: "bsd"
+// End:
+
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8263
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8263&view=rev
Author: vargenau
Date: 2012年04月10日 12:37:58 +0000 (2012年4月10日)
Log Message:
-----------
Use class "tt"
Modified Paths:
--------------
 trunk/lib/InlineParser.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2012年04月10日 12:17:12 UTC (rev 8262)
+++ trunk/lib/InlineParser.php	2012年04月10日 12:37:58 UTC (rev 8263)
@@ -686,8 +686,7 @@
 }
 
 function markup ($match, $body) {
- $tag = 'tt';
- return new HtmlElement($tag, $body);
+ return new HtmlElement('span', array('class' => 'tt'), $body);
 }
 }
 
@@ -795,7 +794,7 @@
 function markup ($match, $body) {
 switch ($match) {
 case '*': return new HtmlElement('b', $body);
- case '=': return new HtmlElement('tt', $body);
+ case '=': return new HtmlElement('span', array('class' => 'tt'), $body);
 case '_': return new HtmlElement('i', $body);
 }
 }
@@ -1031,7 +1030,7 @@
 
 function markup ($match) {
 // Remove {{{ and }}}
- return new HtmlElement('tt', substr($match, 3, -3));
+ return new HtmlElement('span', array('class' => 'tt'), substr($match, 3, -3));
 }
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8262
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8262&view=rev
Author: vargenau
Date: 2012年04月10日 12:17:12 +0000 (2012年4月10日)
Log Message:
-----------
Two new generic classes: tt and strike
Modified Paths:
--------------
 trunk/themes/Crao/crao.css
 trunk/themes/Hawaiian/Hawaiian.css
 trunk/themes/MacOSX/MacOSX.css
 trunk/themes/MonoBook/main.css
 trunk/themes/Portland/portland.css
 trunk/themes/Sidebar/sidebar.css
 trunk/themes/SpaceWiki/SpaceWiki.css
 trunk/themes/Wordpress/Wordpress.css
 trunk/themes/blog/Kubrick.css
 trunk/themes/default/phpwiki.css
 trunk/themes/shamino_com/shamino_com.css
Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/Crao/crao.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -64,6 +64,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/Hawaiian/Hawaiian.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -35,6 +35,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/MacOSX/MacOSX.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -61,6 +61,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/MonoBook/main.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -221,6 +221,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/Portland/portland.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -29,6 +29,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/Sidebar/sidebar.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -213,6 +213,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/SpaceWiki/SpaceWiki.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -50,6 +50,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/Wordpress/Wordpress.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -17,6 +17,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/blog/Kubrick.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -224,6 +224,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/default/phpwiki.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -33,6 +33,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
Modified: trunk/themes/shamino_com/shamino_com.css
===================================================================
--- trunk/themes/shamino_com/shamino_com.css	2012年04月06日 14:17:01 UTC (rev 8261)
+++ trunk/themes/shamino_com/shamino_com.css	2012年04月10日 12:17:12 UTC (rev 8262)
@@ -123,6 +123,9 @@
 
 /* generic classes ----------------------------------------------- */
 
+.tt { font-family: monospace; }
+.strike { text-decoration:line-through; }
+
 .align-left {text-align: left;}
 .align-right {text-align: right;}
 .align-center {text-align: center;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8261
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8261&view=rev
Author: vargenau
Date: 2012年04月06日 14:17:01 +0000 (2012年4月06日)
Log Message:
-----------
Add "Upload & Overwrite"
Modified Paths:
--------------
 trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2012年04月06日 14:15:45 UTC (rev 8260)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2012年04月06日 14:17:01 UTC (rev 8261)
@@ -1,4 +1,4 @@
-Date: Thu, 2 Feb 2012 11:32:20 +0000
+Date: Fri, 6 Apr 2012 16:16:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -75,6 +75,7 @@
 (client) machine.
 
 <<WikiForm action=upload>>
+<<WikiForm action=upload buttontext="Upload & Overwrite" overwrite=1>>
 
 === Load File ===
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8260
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8260&view=rev
Author: vargenau
Date: 2012年04月06日 14:15:45 +0000 (2012年4月06日)
Log Message:
-----------
Add "Upload & Overwrite"
Modified Paths:
--------------
 trunk/pgsrc/PhpWikiAdministration
Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration	2012年04月06日 14:03:51 UTC (rev 8259)
+++ trunk/pgsrc/PhpWikiAdministration	2012年04月06日 14:15:45 UTC (rev 8260)
@@ -1,4 +1,4 @@
-Date: 2012年1月11日 16:18:06 +0000
+Date: Fri, 6 Apr 2012 16:15:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -98,6 +98,7 @@
 (client) machine.
 
 <<WikiForm action=upload>>
+<<WikiForm action=upload buttontext="Upload & Overwrite" overwrite=1>>
 
 === Load File ===
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8259
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8259&view=rev
Author: vargenau
Date: 2012年04月06日 14:03:51 +0000 (2012年4月06日)
Log Message:
-----------
Let's make 'overwrite' argument work
Modified Paths:
--------------
 trunk/lib/plugin/WikiForm.php
Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php	2012年04月06日 13:16:56 UTC (rev 8258)
+++ trunk/lib/plugin/WikiForm.php	2012年04月06日 14:03:51 UTC (rev 8259)
@@ -52,6 +52,7 @@
 'class' => 'wikiadmin',
 'accept-charset' => $GLOBALS['charset']),
 HiddenInputs(array('action' => $action,
+ 'overwrite' => $overwrite,
 'pagename' => $basepage)));
 $input = array('type' => 'text',
 'value' => $default,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8258
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8258&view=rev
Author: vargenau
Date: 2012年04月06日 13:16:56 +0000 (2012年4月06日)
Log Message:
-----------
Fix "See Also"
Modified Paths:
--------------
 trunk/pgsrc/Help%2FWikiFormRichPlugin
Modified: trunk/pgsrc/Help%2FWikiFormRichPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiFormRichPlugin	2012年04月06日 13:14:38 UTC (rev 8257)
+++ trunk/pgsrc/Help%2FWikiFormRichPlugin	2012年04月06日 13:16:56 UTC (rev 8258)
@@ -1,4 +1,4 @@
-Date: Fri, 6 Apr 2012 15:12:47 +0000
+Date: Fri, 6 Apr 2012 15:16:31 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -220,7 +220,7 @@
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
-* [[Help:WikiFormRichPlugin]]
+* [[Help:WikiFormPlugin]]
 
 <noinclude>
 ----
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8257
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8257&view=rev
Author: vargenau
Date: 2012年04月06日 13:14:38 +0000 (2012年4月06日)
Log Message:
-----------
Update WikiFormPlugin documentation
Modified Paths:
--------------
 trunk/lib/plugin/WikiForm.php
 trunk/pgsrc/Help%2FWikiFormPlugin
 trunk/pgsrc/Help%2FWikiFormRichPlugin
Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php	2012年04月06日 12:40:29 UTC (rev 8256)
+++ trunk/lib/plugin/WikiForm.php	2012年04月06日 13:14:38 UTC (rev 8257)
@@ -37,8 +37,8 @@
 }
 
 function getDefaultArguments() {
- return array('action' => 'upload', // 'upload', 'loadfile', or
- // 'dumpserial'
+ return array('action' => 'upload', // 'upload', 'loadfile',
+ // 'dumphtml' or 'dumpserial'
 'default' => false,
 'buttontext' => false,
 'overwrite' => false,
Modified: trunk/pgsrc/Help%2FWikiFormPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiFormPlugin	2012年04月06日 12:40:29 UTC (rev 8256)
+++ trunk/pgsrc/Help%2FWikiFormPlugin	2012年04月06日 13:14:38 UTC (rev 8257)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: Fri, 6 Apr 2012 15:12:47 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -24,23 +24,26 @@
 ! Default value
 |-
 | **action**
-| upload, loadfile or dumpserial
+| upload, loadfile, dumphtml or dumpserial
 | upload
 |-
 | **default**
-|
-| false
+| Default value in the input box
+| //empty//
 |-
 | **buttontext**
-|
-| false
+| Text displayed on the button
+| if action=upload, Upload \\
+if action=loadfile, Load File \\
+if action=dumphtml, Dump Pages as XHTML \\
+if action=dumpserial, Dump Pages
 |-
 | **overwrite**
-|
+| When loading pages, force overwrite or not
 | false
 |-
 | **size**
-|
+| Size of the input box
 | 50
 |}
 
@@ -56,6 +59,7 @@
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
+* [[Help:WikiFormRichPlugin]]
 
 <noinclude>
 ----
Modified: trunk/pgsrc/Help%2FWikiFormRichPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiFormRichPlugin	2012年04月06日 12:40:29 UTC (rev 8256)
+++ trunk/pgsrc/Help%2FWikiFormRichPlugin	2012年04月06日 13:14:38 UTC (rev 8257)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: Fri, 6 Apr 2012 15:12:47 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -219,6 +219,9 @@
 == Author ==
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
+== See Also ==
+* [[Help:WikiFormRichPlugin]]
+
 <noinclude>
 ----
 [[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8256
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8256&view=rev
Author: vargenau
Date: 2012年04月06日 12:40:29 +0000 (2012年4月06日)
Log Message:
-----------
Avoid "lib/main.php:949 Notice[1024]: login: Unknown action"
Modified Paths:
--------------
 trunk/lib/plugin/WikiForm.php
Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php	2012年04月06日 12:37:55 UTC (rev 8255)
+++ trunk/lib/plugin/WikiForm.php	2012年04月06日 12:40:29 UTC (rev 8256)
@@ -66,12 +66,6 @@
 $buttontext = _("Load File");
 $class = false;
 break;
- case 'login':
- $input['name'] = 'source';
- if (!$buttontext)
- $buttontext = _("Sign In");
- $class = 'wikiadmin';
- break;
 case 'dumpserial':
 $input['name'] = 'directory';
 if (!$default)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8255
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8255&view=rev
Author: vargenau
Date: 2012年04月06日 12:37:55 +0000 (2012年4月06日)
Log Message:
-----------
WikiFormMore does not exist
Modified Paths:
--------------
 trunk/lib/plugin/WikiForm.php
Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php	2012年04月06日 12:25:00 UTC (rev 8254)
+++ trunk/lib/plugin/WikiForm.php	2012年04月06日 12:37:55 UTC (rev 8255)
@@ -24,8 +24,6 @@
 * This is a replacement for MagicPhpWikiURL forms.
 * Just a few old actions are supported, which where previously
 * encoded with the phpwiki: syntax.
- *
- * See WikiFormMore for the more generic version.
 */
 class WikiPlugin_WikiForm
 extends WikiPlugin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8254
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8254&view=rev
Author: vargenau
Date: 2012年04月06日 12:25:00 +0000 (2012年4月06日)
Log Message:
-----------
Add class "error" for error message
Modified Paths:
--------------
 trunk/lib/plugin/WikiForm.php
Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php	2012年03月28日 15:41:01 UTC (rev 8253)
+++ trunk/lib/plugin/WikiForm.php	2012年04月06日 12:25:00 UTC (rev 8254)
@@ -102,10 +102,9 @@
 $class = false; // local OS function, so use native OS button
 break;
 default:
- return HTML::p(fmt("WikiForm: %s: unknown action", $action));
+ return HTML::div(array('class' => "error"), fmt("WikiForm: %s: unknown action", $action));
 }
 
-
 $input = HTML::input($input);
 $input->addTooltip($buttontext);
 $button = Button('submit:', $buttontext, $class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.