phpwiki-checkins Mailing List for PhpWiki

Revision: 7165
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7165&view=rev
Author: vargenau
Date: 2009年09月28日 12:58:52 +0000 (2009年9月28日)
Log Message:
-----------
Replace DEBUG with EXPERIMENTAL (DEBUG should add only debug, not unstable features)
Modified Paths:
--------------
 trunk/lib/plugin/WikiAdminRename.php
 trunk/lib/plugin/WikiAdminSetAcl.php
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2009年09月28日 12:56:08 UTC (rev 7164)
+++ trunk/lib/plugin/WikiAdminRename.php	2009年09月28日 12:58:52 UTC (rev 7165)
@@ -284,7 +284,7 @@
 $this->_tablePush($table, '', 
 $this->checkBox($post_args, 'icase', _("Case insensitive?")));
 }
-	if (DEBUG) // not yet stable
+	if (defined('EXPERIMENTAL') and EXPERIMENTAL) // not yet stable
 	 $this->_tablePush($table, '', 
 $this->checkBox($post_args, 'updatelinks', 
 _("Change pagename in all linked pages also?")));
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2009年09月28日 12:56:08 UTC (rev 7164)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2009年09月28日 12:58:52 UTC (rev 7165)
@@ -271,7 +271,7 @@
 //$header->pushContent(HTML::input(array('name' => 'admin_setacl[acl]',
 // 'value' => $post_args['acl'])));
 $header->pushContent(HTML::br());
- if (!empty($pages) and DEBUG) {
+ if (!empty($pages) and defined('EXPERIMENTAL') and EXPERIMENTAL) {
 $checkbox = HTML::input(array('type' => 'checkbox',
 'name' => 'admin_setacl[updatechildren]',
 'value' => 1));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7164
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7164&view=rev
Author: vargenau
Date: 2009年09月28日 12:56:08 +0000 (2009年9月28日)
Log Message:
-----------
Do not create DebugInfo in Gforge, even if DEBUG is active
Modified Paths:
--------------
 trunk/lib/IniConfig.php
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2009年09月28日 12:53:12 UTC (rev 7163)
+++ trunk/lib/IniConfig.php	2009年09月28日 12:56:08 UTC (rev 7164)
@@ -643,15 +643,15 @@
 .'RecentChangesMyPages:RecentEdits:RecentNewPages:'
 .'UserContribs');
 
- // Add some some action pages depending on configuration
- if (defined('DEBUG') and DEBUG) {
- $AllActionPages[] = 'DebugInfo';
- $AllActionPages[] = 'EditMetaData';
- $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work
- $AllActionPages[] = 'PhpWikiAdministration/Chmod';
- }
 // The GFORGE theme omits them
 if (!defined('GFORGE') or !GFORGE) {
+ // Add some some action pages depending on configuration
+ if (defined('DEBUG') and DEBUG) {
+ $AllActionPages[] = 'DebugInfo';
+ $AllActionPages[] = 'EditMetaData';
+ $AllActionPages[] = 'SpellCheck'; // SpellCheck does not work
+ $AllActionPages[] = 'PhpWikiAdministration/Chmod';
+ }
 $AllActionPages[] = 'InterWikiSearch';
 $AllActionPages[] = 'LdapSearch';
 $AllActionPages[] = 'PasswordReset';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7163
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7163&view=rev
Author: vargenau
Date: 2009年09月28日 12:53:12 +0000 (2009年9月28日)
Log Message:
-----------
Add CSS for legend
Modified Paths:
--------------
 trunk/themes/gforge/gforge.css
Modified: trunk/themes/gforge/gforge.css
===================================================================
--- trunk/themes/gforge/gforge.css	2009年09月26日 18:13:50 UTC (rev 7162)
+++ trunk/themes/gforge/gforge.css	2009年09月28日 12:53:12 UTC (rev 7163)
@@ -69,6 +69,11 @@
 background-color: #e0f3f7;
 }
 
+legend {
+ border: 1px solid #d8d8e7;
+ background-color: white;
+}
+
 /**
 * Wiki Forms
 * 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7162
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7162&view=rev
Author: vargenau
Date: 2009年09月26日 18:13:50 +0000 (2009年9月26日)
Log Message:
-----------
More Wikicreole syntax; repair numbered list
Modified Paths:
--------------
 trunk/pgsrc/Help%2FWikiPlugin
Modified: trunk/pgsrc/Help%2FWikiPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiPlugin	2009年09月26日 17:02:18 UTC (rev 7161)
+++ trunk/pgsrc/Help%2FWikiPlugin	2009年09月26日 18:13:50 UTC (rev 7162)
@@ -1,4 +1,4 @@
-Date: Mon, 1 Jun 2009 15:05:05 +0000
+Date: 2009年9月26日 19:20:54 +0000
 X-Rcs-Id: $Id$
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 Content-Type: application/x-phpwiki;
@@ -8,19 +8,19 @@
 charset=UTF-8
 Content-Transfer-Encoding: binary
 
-A *plugin* is some PHP code that:
-* lives in =phpwiki/lib/plugin/<pluginname>.php=
+A **plugin** is some PHP code that:
+* lives in ##phpwiki/lib/plugin/<pluginname>.php##
 * implements the ~WikiPlugin interface by extending that class.
 
 There are many plugins already distributed with ~PhpWiki. Simply look
-in the =lib/plugin= directory or see the [PluginManager] list or see all the
-[Help/*Plugin pages|phpwiki:TitleSearch?s=Help/*Plugin].
+in the ##lib/plugin## directory or see the [[PluginManager]] list or see all the
+[[phpwiki:TitleSearch?s=Help/*Plugin|Help/*Plugin pages]].
 
-To write your own, look at the [Help:HelloWorldPlugin] (~HelloWorld.php
+To write your own, look at the [[Help:HelloWorldPlugin]] (~HelloWorld.php
 in that directory), which is a minimal example of a plugin.
 Publish your self-written plugin at a new ~PhpWiki page with
-~PluginName + *Plugin* appended
-and add a link to [CategoryContributedPlugin | PhpWiki:CategoryContributedPlugin].
+~PluginName + **Plugin** appended
+and add a link to [[PhpWiki:CategoryContributedPlugin|CategoryContributedPlugin]].
 
 A ~WikiPlugin allows one to easily add new types of dynamic
 content (as well as other functionality) to wiki pages within ~PhpWiki.
@@ -31,7 +31,7 @@
 
 Note that you can NOT extend the markup syntax with a plugin, as in other wiki engines.
 
-(The old-style [MagicPhpWikiURLs|Help:MagicPhpWikiURLs] have been replaced by plugins
+(The old-style [[Help:MagicPhpWikiURLs|MagicPhpWikiURLs]] have been replaced by plugins
 entirely.)
 
 == Example
@@ -43,7 +43,7 @@
 }}}
 
 into a regular wiki-page. That particular example produces a list
-of the first 20 existing pages in 3 columns, via the PhpWiki:PageList
+of the first 20 existing pages in 3 columns, via the [[PhpWiki:PageList]]
 library.
 
 <<AllPages limit=20 cols=3>> 
@@ -55,29 +55,29 @@
 precedence:
 
 # The plugin invocation can specify the value for an argument, like so:
-{{{
+ {{{
 <?plugin BackLinks page=OtherPage ?>
-}}}
+ }}}
 
 # The argument can be specified via an HTTP query argument. This
 doesn't happen (is not allowed) unless the argument is mentioned in
 the plugin invocation:
 
-{{{
+ {{{
 <?plugin BackLinks page ?>
-}}}
+ }}}
 
 # Default values specified in the plugin invocation:
 
-{{{
+ {{{
 <?plugin BackLinks page||=OtherPage ?>
-}}}
+ }}}
 
 # The plugin must supply default values for each argument it uses.
 Such default args may be overriden by URL arguments like so:
-{{{
+ {{{
 BackLinks?page=ThisPage&sortby=-mtime
-}}}
+ }}}
 (The BackLinks plugin uses the current page as the default value for
 the *page* argument.)
 
@@ -104,7 +104,7 @@
 
 === Basic Plugin Types
 
-All these plugins derive from the ##WikiPlugin## class extending the
+All these plugins derive from the ##~WikiPlugin## class extending the
 run method,
 which returns a object tree of HTML objects, and may react on any
 provided arguments from the ~WikiPage (see the args below) or
@@ -113,15 +113,15 @@
 
 A basic plugin just needs the run() method, and optionally getName,
 getDescription, getVersion, getDefaultArguments. See the
-[Help:HelloWorldPlugin] for a short introduction.
+[[Help:HelloWorldPlugin]] for a short introduction.
 
- *plugin* reacts on its arguments and the request and displays
+ **plugin** reacts on its arguments and the request and displays
 arbitrary HTML.
 
- *plugin-form* is used to display a input type=text box for the
- default argument *s*.
+ **plugin-form** is used to display a input type=text box for the
+ default argument **s**.
 
- *plugin-list* is used as argument to provide a dynamic list of
+ **plugin-list** is used as argument to provide a dynamic list of
 pagenames.
 
 {{{
@@ -139,15 +139,15 @@
 ==== The box Method
 
 Themes based on the "sidebar" theme may use the box method of any
-plugin, which displays a *title*
-and a condensed *content* in a box.
+plugin, which displays a **title**
+and a condensed **content** in a box.
 
 ==== ~WikiPluginCached
 
 Plugins deriving from the class ~WikiPluginCached must also define
 the methods getPluginType(),
 optionally getExpire(), managesValidators(), and dependent of the
-getPluginType the methods to display the *possibly cached* result.
+getPluginType the methods to display the **possibly cached** result.
 
 getImage(), getMap() or getHtml(),
 
@@ -159,14 +159,14 @@
 
 === Action Pages
 
-The term *[ActionPage|Help:ActionPage]* refers to a page containing a plugin
+The term **[[Help:ActionPage|ActionPage]]** refers to a page containing a plugin
 invocation with the same or translated pluginname as the pagename.
-An *action* is together with the *pagename* argument the basic
+An **action** is together with the **pagename** argument the basic
 ~PhpWiki argument.
 It can both be GET or POST actions. Actions are untranslated, always
 English, pagenames can be localized.
 Basic (and old) actions are all lowercase, like edit, browse, remove, ...
-Newer actions in PhpWiki:CamelCase are invoked via plugins on their
+Newer actions in [[PhpWiki:CamelCase]] are invoked via plugins on their
 specific action page.
 
 We decoupled actions from plugins via action pages for the following
@@ -195,17 +195,17 @@
 
 == Existing Plugins
 
-See [PluginManager] for a detailed list. Most plugins should have their
-own description page as subpage of *Help/* with the name *Plugin*
+See [[PluginManager]] for a detailed list. Most plugins should have their
+own description page as subpage of **Help/** with the name **Plugin**
 appended.
 
 <?plugin BackLinks noheader=1 ?>
 
 == Contributed Plugins
 
-See PhpWiki:CategoryContributedPlugin.
+See [[PhpWiki:CategoryContributedPlugin]].
 
-<?plugin Backlinks page=CategoryContributedPlugin ?>
+<<Backlinks page=CategoryContributedPlugin >>
 
 -----
 [[PhpWikiDocumentation]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7161
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7161&view=rev
Author: vargenau
Date: 2009年09月26日 17:02:18 +0000 (2009年9月26日)
Log Message:
-----------
Wikicreole syntax
Modified Paths:
--------------
 trunk/pgsrc/Help%2FOldStyleTablePlugin
 trunk/pgsrc/Help%2FWikiPlugin
Modified: trunk/pgsrc/Help%2FOldStyleTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FOldStyleTablePlugin	2009年09月26日 17:01:09 UTC (rev 7160)
+++ trunk/pgsrc/Help%2FOldStyleTablePlugin	2009年09月26日 17:02:18 UTC (rev 7161)
@@ -1,4 +1,4 @@
-Date: Mon, 1 Jun 2009 15:05:05 +0000
+Date: 2009年8月11日 15:05:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -13,23 +13,23 @@
 
 == Usage
 
-<verbatim>
-<?plugin OldStyleTable caption="OldStyleTable" border||=2
+{{{
+<<OldStyleTable caption="OldStyleTable" border||=2
 ||^ *Name* |v *Cost* |v *Notes*
 | *First* | *Last*
 |> Jeff |< Dairiki |^ Cheap |< Not worth it
 |> Marco |< Polo | Cheaper |< Not available
-?>
-</verbatim>
+>>
+}}}
 
 will get you
 
-<?plugin OldStyleTable caption="OldStyleTable" border||=2
+<<OldStyleTable caption="OldStyleTable" border||=2
 ||^ *Name* |v *Cost* |v *Notes*
 | *First* | *Last*
 |> Jeff |< Dairiki |^ Cheap |< Not worth it
 |> Marco |< Polo | Cheaper |< Not available
-?>
+>>
 
 Note that multiple __|__s lead to spanned columns, and __v__s can be
 used to span rows. A __>__ generates a right justified column, __<__
Modified: trunk/pgsrc/Help%2FWikiPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiPlugin	2009年09月26日 17:01:09 UTC (rev 7160)
+++ trunk/pgsrc/Help%2FWikiPlugin	2009年09月26日 17:02:18 UTC (rev 7161)
@@ -39,14 +39,14 @@
 Currently, one invokes a plugin by putting something like:
 
 {{{
-<?plugin AllPages limit=20 cols=3 ?>
+<<AllPages limit=20 cols=3>> 
 }}}
 
 into a regular wiki-page. That particular example produces a list
 of the first 20 existing pages in 3 columns, via the PhpWiki:PageList
 library.
 
-<?plugin AllPages limit=20 cols=3 ?>
+<<AllPages limit=20 cols=3>> 
 
 == Details
 
@@ -55,29 +55,29 @@
 precedence:
 
 # The plugin invocation can specify the value for an argument, like so:
- {{{
+{{{
 <?plugin BackLinks page=OtherPage ?>
- }}}
+}}}
 
 # The argument can be specified via an HTTP query argument. This
 doesn't happen (is not allowed) unless the argument is mentioned in
 the plugin invocation:
 
- {{{
+{{{
 <?plugin BackLinks page ?>
- }}}
+}}}
 
 # Default values specified in the plugin invocation:
 
- {{{
+{{{
 <?plugin BackLinks page||=OtherPage ?>
- }}}
+}}}
 
 # The plugin must supply default values for each argument it uses.
 Such default args may be overriden by URL arguments like so:
- {{{
+{{{
 BackLinks?page=ThisPage&sortby=-mtime
- }}}
+}}}
 (The BackLinks plugin uses the current page as the default value for
 the *page* argument.)
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7160
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7160&view=rev
Author: vargenau
Date: 2009年09月26日 17:01:09 +0000 (2009年9月26日)
Log Message:
-----------
Valid XHTML code
Modified Paths:
--------------
 trunk/themes/default/templates/blogform.tmpl
Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl	2009年09月26日 16:57:28 UTC (rev 7159)
+++ trunk/themes/default/templates/blogform.tmpl	2009年09月26日 17:01:09 UTC (rev 7160)
@@ -12,7 +12,7 @@
 maxlength="256" name="edit[summary]" value="" />
 <?= $EDIT_TOOLBAR ?>
 <a name="editarea"></a>
- <textarea id="edit-content" class="edit-content" rows="8" style="width:540px"
+ <textarea id="edit-content" class="edit-content" rows="8" cols="68" style="width:540px"
 name="edit[content]"></textarea>
 <br />
 <input id="wikiblog-submit" type="submit" value="<?=_("Add Entry")?>"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7159
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7159&view=rev
Author: vargenau
Date: 2009年09月26日 16:57:28 +0000 (2009年9月26日)
Log Message:
-----------
Allow compact video syntax {{video.flv}} (like Wikicreole images)
Modified Paths:
--------------
 trunk/lib/BlockParser.php
 trunk/lib/InlineParser.php
 trunk/lib/stdlib.php
 trunk/pgsrc/Help%2FVideoPlugin
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2009年09月26日 16:51:39 UTC (rev 7158)
+++ trunk/lib/BlockParser.php	2009年09月26日 16:57:28 UTC (rev 7159)
@@ -1151,6 +1151,13 @@
 return true;
 }
 
+ // It's a video
+ if (is_video($imagename)) {
+ $pi = '<'.'?plugin Video file="' . $pi . '" ?>';
+ $this->_element = new Cached_PluginInvocation($pi);
+ return true;
+ }
+
 $pi = str_replace("\n", "", $pi);
 $vars = '';
 
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009年09月26日 16:51:39 UTC (rev 7158)
+++ trunk/lib/InlineParser.php	2009年09月26日 16:57:28 UTC (rev 7159)
@@ -1065,6 +1065,12 @@
 }
 }
 
+ // It's a video
+ if (is_video($imagename)) {
+ 	 $s = '<'.'?plugin Video file="' . $imagename . '" ?'.'>';
+	 return new Cached_PluginInvocation($s);
+ }
+
 $page = str_replace("\n", "", $page); 
 $vars = '';
 
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009年09月26日 16:51:39 UTC (rev 7158)
+++ trunk/lib/stdlib.php	2009年09月26日 16:57:28 UTC (rev 7159)
@@ -98,6 +98,7 @@
 isSerialized($s)
 parse_attributes($line)
 is_image ($filename)
+ is_video ($filename)
 compute_tablecell ($table, $i, $j, $imax, $jmax)
 
 function: LinkInterWikiLink($link, $linktext)
@@ -2457,6 +2458,16 @@
 }
 
 /**
+ * Returns true if the filename ends with an video suffix.
+ * Currently only FLV
+ */
+function is_video ($filename) {
+
+ return string_ends_with(strtolower($filename), ".flv");
+}
+
+
+/**
 * Compute cell in spreadsheet table
 * $table: two-dimensional table
 * $i and $j: indexes of cell to compute
Modified: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin	2009年09月26日 16:51:39 UTC (rev 7158)
+++ trunk/pgsrc/Help%2FVideoPlugin	2009年09月26日 16:57:28 UTC (rev 7159)
@@ -1,4 +1,4 @@
-Date: 2009年9月24日 10:54:37 +0000
+Date: 2009年9月26日 17:26:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -11,6 +11,8 @@
 The **~Video** [[Help:WikiPlugin|plugin]] allows to include video in a wiki page.
 Video file must be encoded in FLV format.
 
+The Video plugin can also be called withe the ~{~{video.flv~}~} syntax.
+
 == Arguments
 
 Use only one of ##url## or ##file## arguments at a time.
@@ -44,16 +46,21 @@
 
 == Example
 
-A video :
+A video:
 {{{
 <<Video url=http://a.video.server/a_video.flv>>
 }}}
 
-Another video :
+Another video:
 {{{
 <<Video file=another_video.flv>>
 }}}
 
+This is equivalent to:
+{{{
+{{another_video.flv}}
+}}}
+
 == Authors
 
 * Roger Guignard, Alcatel-Lucent
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7158
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7158&view=rev
Author: vargenau
Date: 2009年09月26日 16:51:39 +0000 (2009年9月26日)
Log Message:
-----------
htmlspecialchars_workaround unused
Modified Paths:
--------------
 trunk/lib/config.php
Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2009年09月24日 19:42:39 UTC (rev 7157)
+++ trunk/lib/config.php	2009年09月26日 16:51:39 UTC (rev 7158)
@@ -614,60 +614,6 @@
 	 . DATA_PATH . '/uploads/';
 }
 
-/**
- * htmlspecialchars doesn't support some special 8bit charsets, which we do want to support.
- * Well it just prints a warning which we could circumvent.
- * Note: unused, since php htmlspecialchars does the same, just prints a warning which we silence
- */
-/*
-function htmlspecialchars_workaround($str, $quote=ENT_COMPAT, $charset='iso-8859-1') {
- if (in_array(strtolower($charset), 
- array('iso-8859-2', 'iso8859-2', 'latin-2', 'latin2'))) 
- {
- if (! ($quote & ENT_NOQUOTES)) {
- $str = str_replace("\"", """,
- $str);
- }
- if ($quote & ENT_QUOTES) {
- $str = str_replace("\'", "'",
- $str);
- }
- return str_replace(array("<", ">", "&"),
- array("&lt;", "&gt;", "&amp;"), $str);
- }
- else {
- return htmlspecialchars($str, $quote, $charset);
- }
-}
-*/
-
-/**
- * htmlspecialchars doesn't support some special 8bit charsets, which we do want to support.
- * Well it just prints a warning which we could circumvent.
- * Note: unused, since php htmlspecialchars does the same, just prints a warning which we silence
- */
-/*
-function htmlspecialchars_workaround($str, $quote=ENT_COMPAT, $charset='iso-8859-1') {
- if (in_array(strtolower($charset), 
- array('iso-8859-2', 'iso8859-2', 'latin-2', 'latin2'))) 
- {
- if (! ($quote & ENT_NOQUOTES)) {
- $str = str_replace("\"", "&quot;",
- $str);
- }
- if ($quote & ENT_QUOTES) {
- $str = str_replace("\'", "&#039;",
- $str);
- }
- return str_replace(array("<", ">", "&"),
- array("&lt;", "&gt;", "&amp;"), $str);
- }
- else {
- return htmlspecialchars($str, $quote, $charset);
- }
-}
-*/
-
 // 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.

Revision: 7157
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7157&view=rev
Author: vargenau
Date: 2009年09月24日 19:42:39 +0000 (2009年9月24日)
Log Message:
-----------
Allow FLV as extension
Modified Paths:
--------------
 trunk/lib/plugin/UpLoad.php
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2009年09月24日 19:39:02 UTC (rev 7156)
+++ trunk/lib/plugin/UpLoad.php	2009年09月24日 19:42:39 UTC (rev 7157)
@@ -75,6 +75,7 @@
 diff
 doc
 docx
+flv
 gif
 h
 ics
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7156
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7156&view=rev
Author: vargenau
Date: 2009年09月24日 19:39:02 +0000 (2009年9月24日)
Log Message:
-----------
INLINE_IMAGES = "png|jpg|jpeg|gif"
Modified Paths:
--------------
 trunk/config/config-default.ini
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2009年09月24日 10:15:26 UTC (rev 7155)
+++ trunk/config/config-default.ini	2009年09月24日 19:39:02 UTC (rev 7156)
@@ -135,7 +135,7 @@
 DEFAULT_WIKI_PAGES = "ReleaseNotes:SandBox:PhpWiki:SteveWainstead"
 
 ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
-INLINE_IMAGES = "png|jpg|gif"
+INLINE_IMAGES = "png|jpg|jpeg|gif"
 WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
 SUBPAGE_SEPARATOR = "/"
 INTERWIKI_MAP_FILE = lib/interwiki.map
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7155
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7155&view=rev
Author: rurban
Date: 2009年09月24日 10:15:26 +0000 (2009年9月24日)
Log Message:
-----------
delete images
Removed Paths:
-------------
 trunk/themes/gforge/images/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7154
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7154&view=rev
Author: rurban
Date: 2009年09月24日 10:14:09 +0000 (2009年9月24日)
Log Message:
-----------
delete images
Removed Paths:
-------------
 trunk/themes/shamino_com/images/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7153
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7153&view=rev
Author: vargenau
Date: 2009年09月24日 09:01:07 +0000 (2009年9月24日)
Log Message:
-----------
New plugin to add video in wiki pages
Added Paths:
-----------
 trunk/lib/plugin/Video.php
 trunk/pgsrc/Help%2FVideoPlugin
 trunk/themes/default/flowplayer-3.1.3.swf
 trunk/themes/default/flowplayer.controls-3.1.3.swf
Added: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	 (rev 0)
+++ trunk/lib/plugin/Video.php	2009年09月24日 09:01:07 UTC (rev 7153)
@@ -0,0 +1,118 @@
+<?php // -*-php-*-
+rcs_id('$Id$');
+/*
+ * Copyright 2009 Roger Guignard and Marc-Etienne Vargenau, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The VideoPlugin ("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."
+ */
+
+class WikiPlugin_Video
+extends WikiPlugin
+{
+ function getName() {
+ return _("Video");
+ }
+
+ function getDescription() {
+ return _("Display video in Flash");
+ }
+
+ function getVersion() {
+ return preg_replace("/[Revision: $]/", '',
+ "\$Revision$");
+ }
+
+ function getDefaultArguments() {
+ return array('width' => 460,
+ 'height' => 320,
+ 'url' => '',
+ 'file' => '',
+ 'autoplay' => 'false'
+ );
+ }
+
+ function run($dbi, $argstr, &$request, $basepage) {
+
+ global $WikiTheme;
+ $args = $this->getArgs($argstr, $request);
+ extract($args);
+
+ $html = HTML();
+
+ $object = HTML::object(array('data' => SERVER_URL . $WikiTheme->_findData('flowplayer-3.1.3.swf'),
+ 'type' => "application/x-shockwave-flash",
+ 'width' => $width,
+ 'height' => $height));
+ 
+ $param = HTML::param(array('name' => "allowfullscreen",
+ 'value' => "true"));
+ $object->pushContent($param);
+ 
+ $param = HTML::param(array('name' => "allowscriptaccess",
+ 'value' => "false"));
+ $object->pushContent($param);
+ 
+ if (! $url && ! $file) {
+ return $this->error(_("Both 'url' or 'file' parameters missing."));
+ }
+ elseif ($url && $file) {
+ return $this->error(_("Choose only one of 'url' or 'page' parameters."));
+ }
+ elseif ($file) {
+ $url = SERVER_URL . getUploadDataPath() . '/' . $file;
+ }
+ $value = "config={'clip':{'url':'" . $url . "','autoPlay':" . $autoplay . "}}";
+ $param = HTML::param(array('name' => "flashvars",
+ 'value' => $value));
+ $object->pushContent($param);
+
+ $html->pushContent($object);
+
+ return $html;
+ }
+};
+
+// Local Variables:
+// mode: php
+// tab-width: 4
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>
Property changes on: trunk/lib/plugin/Video.php
___________________________________________________________________
Added: svn:keywords
 + Id Revision
Added: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin	 (rev 0)
+++ trunk/pgsrc/Help%2FVideoPlugin	2009年09月24日 09:01:07 UTC (rev 7153)
@@ -0,0 +1,65 @@
+Date: 2009年9月24日 10:54:37 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=Help%2FVideoPlugin;
+ flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+The **~Video** [[Help:WikiPlugin|plugin]] allows to include video in a wiki page.
+Video file must be encoded in FLV format.
+
+== Arguments
+
+Use only one of ##url## or ##file## arguments at a time.
+
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **url**
+| The url of a video file.
+| none
+|-
+| **file**
+| The name of a video file that has been uploaded.
+| none
+|-
+| **width**
+| The width of the video (in pixels).
+| 460
+|-
+| **height**
+| The height of the video (in pixels).
+| 320
+|-
+| **autoplay**
+| Auto play the video when page is displayed.
+| false
+|}
+
+== Example
+
+A video :
+{{{
+<<Video url=http://a.video.server/a_video.flv>>
+}}}
+
+Another video :
+{{{
+<<Video file=another_video.flv>>
+}}}
+
+== Authors
+
+* Roger Guignard, Alcatel-Lucent
+* Marc-Etienne Vargenau, Alcatel-Lucent
+
+<noinclude>
+----
+[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
+</noinclude>
Property changes on: trunk/pgsrc/Help%2FVideoPlugin
___________________________________________________________________
Added: svn:keywords
 + Id
Added: trunk/themes/default/flowplayer-3.1.3.swf
===================================================================
(Binary files differ)
Property changes on: trunk/themes/default/flowplayer-3.1.3.swf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: trunk/themes/default/flowplayer.controls-3.1.3.swf
===================================================================
(Binary files differ)
Property changes on: trunk/themes/default/flowplayer.controls-3.1.3.swf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7152
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7152&view=rev
Author: vargenau
Date: 2009年09月24日 08:42:27 +0000 (2009年9月24日)
Log Message:
-----------
Add svn:keywords Revision
Modified Paths:
--------------
 trunk/lib/plugin/DynamicIncludePage.php
 trunk/lib/plugin/IncludeTree.php
 trunk/lib/plugin/Processing.php
Property Changed:
----------------
 trunk/lib/plugin/DynamicIncludePage.php
 trunk/lib/plugin/IncludeTree.php
 trunk/lib/plugin/Processing.php
Modified: trunk/lib/plugin/DynamicIncludePage.php
===================================================================
--- trunk/lib/plugin/DynamicIncludePage.php	2009年09月23日 08:33:21 UTC (rev 7151)
+++ trunk/lib/plugin/DynamicIncludePage.php	2009年09月24日 08:42:27 UTC (rev 7152)
@@ -41,7 +41,7 @@
 
 function getVersion() {
 return preg_replace("/[Revision: $]/", '',
- "\$Revision: 6547 $");
+ "\$Revision$");
 }
 
 function getDefaultArguments() {
Property changes on: trunk/lib/plugin/DynamicIncludePage.php
___________________________________________________________________
Modified: svn:keywords
 - Id
 + Id Revision
Modified: trunk/lib/plugin/IncludeTree.php
===================================================================
--- trunk/lib/plugin/IncludeTree.php	2009年09月23日 08:33:21 UTC (rev 7151)
+++ trunk/lib/plugin/IncludeTree.php	2009年09月24日 08:42:27 UTC (rev 7152)
@@ -45,7 +45,7 @@
 
 function getVersion() {
 return preg_replace("/[Revision: $]/", '',
- "\$Revision: 6186 $");
+ "\$Revision$");
 }
 
 function getDefaultArguments() {
Property changes on: trunk/lib/plugin/IncludeTree.php
___________________________________________________________________
Modified: svn:keywords
 - Id
 + Id Revision
Modified: trunk/lib/plugin/Processing.php
===================================================================
--- trunk/lib/plugin/Processing.php	2009年09月23日 08:33:21 UTC (rev 7151)
+++ trunk/lib/plugin/Processing.php	2009年09月24日 08:42:27 UTC (rev 7152)
@@ -37,7 +37,7 @@
 
 function getVersion() {
 return preg_replace("/[Revision: $]/", '',
- "\$Revision: 6185 $");
+ "\$Revision$");
 }
 
 function getDefaultArguments() {
Property changes on: trunk/lib/plugin/Processing.php
___________________________________________________________________
Modified: svn:keywords
 - Id
 + Id Revision
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7151
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7151&view=rev
Author: vargenau
Date: 2009年09月23日 08:33:21 +0000 (2009年9月23日)
Log Message:
-----------
In Gforge "help" wiki, use Help/TextFormattingRules instead of TextFormattingRules when editing a page (previous check-in was wrong)
Modified Paths:
--------------
 trunk/lib/loadsave.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2009年09月22日 16:44:24 UTC (rev 7150)
+++ trunk/lib/loadsave.php	2009年09月23日 08:33:21 UTC (rev 7151)
@@ -1522,11 +1522,12 @@
 // Ensure that all mandatory pages are loaded
 $finder = new FileFinder;
 
- if (defined('GFORGE') and GFORGE) {
- if (defined('GFORGE') and GFORGE) {
+ if (! defined('GFORGE') or !GFORGE) {
+ $mandatory = explode(':','SandBox:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
+ } else if (WIKI_NAME == "help") {
+ $mandatory = explode(':','SandBox:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
+ } else {
 $mandatory = explode(':','SandBox:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
- } else {
- $mandatory = explode(':','SandBox:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
 }
 foreach (array_merge($mandatory,
 $GLOBALS['AllActionPages'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7150
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7150&view=rev
Author: vargenau
Date: 2009年09月22日 16:44:24 +0000 (2009年9月22日)
Log Message:
-----------
In Gforge "help" wiki, use Help/TextFormattingRules instead of TextFormattingRules when editing a page
Modified Paths:
--------------
 trunk/lib/loadsave.php
 trunk/themes/gforge/templates/editpage.tmpl
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2009年09月22日 12:57:43 UTC (rev 7149)
+++ trunk/lib/loadsave.php	2009年09月22日 16:44:24 UTC (rev 7150)
@@ -1523,6 +1523,7 @@
 $finder = new FileFinder;
 
 if (defined('GFORGE') and GFORGE) {
+ if (defined('GFORGE') and GFORGE) {
 $mandatory = explode(':','SandBox:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
 } else {
 $mandatory = explode(':','SandBox:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
Modified: trunk/themes/gforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/gforge/templates/editpage.tmpl	2009年09月22日 12:57:43 UTC (rev 7149)
+++ trunk/themes/gforge/templates/editpage.tmpl	2009年09月22日 16:44:24 UTC (rev 7150)
@@ -79,5 +79,9 @@
 <hr noshade="noshade" />
 
 <div class="wiki-edithelp">
+<?php if (WIKI_NAME == "help") { ?>
+<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+<?php } else { ?>
 <?plugin IncludePage page=_("TextFormattingRules") section=_("Synopsis") quiet=1?>
+<?php } ?>
 </div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7149
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7149&view=rev
Author: vargenau
Date: 2009年09月22日 12:57:43 +0000 (2009年9月22日)
Log Message:
-----------
Add fieldset
Modified Paths:
--------------
 trunk/lib/plugin/UserPreferences.php
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2009年09月22日 12:35:44 UTC (rev 7148)
+++ trunk/lib/plugin/UserPreferences.php	2009年09月22日 12:57:43 UTC (rev 7149)
@@ -2,6 +2,7 @@
 rcs_id('$Id$');
 /**
 Copyright (C) 2001,2002,2003,2004,2005 $ThePhpWikiProgrammingTeam
+ Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
 
 This file is part of PhpWiki.
 
@@ -109,7 +110,8 @@
 $args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
 return Template('userprefs', $args);
 } elseif ($delete and !$request->getArg('verify')) {
- return HTML::form(array('action' => $request->getPostURL(),
+ return HTML::fieldset(
+ HTML::form(array('action' => $request->getPostURL(),
 'method' => 'post'),
 HiddenInputs(array('verify' => 1)),
 HiddenInputs($request->getArgs()),
@@ -117,7 +119,7 @@
 HTML::p(Button('submit:delete', _("Yes"), 'delete'),
 HTML::Raw(' '),
 Button('cancel', _("Cancel")))
- );
+ ));
 } elseif ($rp = $request->getArg('pref')) {
 // replace only changed prefs in $pref with those from request
 if (!empty($rp['passwd']) and ($rp['passwd2'] != $rp['passwd'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7148
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7148&view=rev
Author: vargenau
Date: 2009年09月22日 12:35:44 +0000 (2009年9月22日)
Log Message:
-----------
Add Gforge menu items preferences and page notification per project
Modified Paths:
--------------
 trunk/lib/WikiUserNew.php
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2009年09月21日 12:20:37 UTC (rev 7147)
+++ trunk/lib/WikiUserNew.php	2009年09月22日 12:35:44 UTC (rev 7148)
@@ -1,6 +1,7 @@
 <?php //-*-php-*-
 rcs_id('$Id$');
 /* Copyright (C) 2004,2005,2006,2007,2009 $ThePhpWikiProgrammingTeam
+ * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
 *
 * This file is part of PhpWiki.
 * 
@@ -1920,6 +1921,8 @@
 */
 class UserPreferences
 {
+ var $notifyPagesAll;
+	
 function UserPreferences($saved_prefs = false) {
 // userid stored too, to ensure the prefs are being loaded for
 // the correct (currently signing in) userid if stored in a
@@ -1954,6 +1957,31 @@
 'googleLink' => new _UserPreference_bool(), // 1.3.10
 'doubleClickEdit' => new _UserPreference_bool(), // 1.3.11
 );
+
+ // This should be probably be done with $customUserPreferenceColumns
+ // For now, we use GFORGE define
+ if (defined('GFORGE') and GFORGE) {
+ $gforgeprefs = array(
+ 'pageTrail' => new _UserPreference_bool(),
+ 'diffMenuItem' => new _UserPreference_bool(),
+ 'pageInfoMenuItem' => new _UserPreference_bool(),
+ 'pdfMenuItem' => new _UserPreference_bool(),
+ 'lockMenuItem' => new _UserPreference_bool(),
+ 'chownMenuItem' => new _UserPreference_bool(),
+ 'setaclMenuItem' => new _UserPreference_bool(),
+ 'removeMenuItem' => new _UserPreference_bool(),
+ 'renameMenuItem' => new _UserPreference_bool(),
+ 'revertMenuItem' => new _UserPreference_bool(),
+ 'backLinksMenuItem' => new _UserPreference_bool(),
+ 'watchPageMenuItem' => new _UserPreference_bool(),
+ 'recentChangesMenuItem' => new _UserPreference_bool(),
+ 'randomPageMenuItem' => new _UserPreference_bool(),
+ 'likePagesMenuItem' => new _UserPreference_bool(),
+ 'specialPagesMenuItem' => new _UserPreference_bool(),
+ );
+ $this->_prefs = array_merge($this->_prefs, $gforgeprefs);
+ }
+
 // add custom theme-specific pref types:
 // FIXME: on theme changes the wiki_user session pref object will fail. 
 // We will silently ignore this.
@@ -2101,6 +2129,17 @@
 $prefs['passwd'] = $value;
 }
 }
+
+ if (defined('GFORGE') and GFORGE) {
+ // Merge current notifyPages with notifyPagesAll
+ // notifyPages are pages to notify in the current project
+ // while $notifyPagesAll is used to store all the monitored pages.
+ if (isset($prefs['notifyPages'])) {
+ $this->notifyPagesAll[PAGE_PREFIX] = $prefs['notifyPages'];
+ $prefs['notifyPages'] = @serialize($this->notifyPagesAll);
+ }
+ }
+
 return $this->pack($prefs);
 }
 
@@ -2139,6 +2178,21 @@
 $prefs[$name] = $packed_pref;
 }
 }
+ 
+ if (defined('GFORGE') and GFORGE) {
+ // Restore notifyPages from notifyPagesAll
+ // notifyPages are pages to notify in the current project
+ // while $notifyPagesAll is used to store all the monitored pages.
+ if (isset($prefs['notifyPages'])) {
+ $this->notifyPagesAll = $prefs['notifyPages'];
+ if (isset($this->notifyPagesAll[PAGE_PREFIX])) {
+ $prefs['notifyPages'] = $this->notifyPagesAll[PAGE_PREFIX];
+ } else {
+ $prefs['notifyPages'] = '';
+ }
+ }
+ }
+
 return $prefs;
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7147
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7147&view=rev
Author: vargenau
Date: 2009年09月21日 12:20:37 +0000 (2009年9月21日)
Log Message:
-----------
Partial revert: put renaming in page history
Modified Paths:
--------------
 trunk/lib/plugin/WikiAdminRename.php
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2009年09月21日 10:12:51 UTC (rev 7146)
+++ trunk/lib/plugin/WikiAdminRename.php	2009年09月21日 12:20:37 UTC (rev 7147)
@@ -89,6 +89,17 @@
 $ul->pushContent(HTML::li(fmt("Access denied to rename page '%s'.",
 WikiLink($name))));
 elseif ( $dbi->renamePage($name, $newname, $updatelinks)) {
+ /* not yet implemented for all backends */
+ $page = $dbi->getPage($newname);
+ $current = $page->getCurrentRevision();
+ $version = $current->getVersion();
+ $meta = $current->_data;
+ $text = $current->getPackedContent();
+ $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'"), $name, $newname);
+ $meta['is_minor_edit'] = 1;
+ $meta['author'] = $request->_user->UserName();
+ unset($meta['mtime']); // force new date
+ $page->save($text, $version + 1, $meta);
 if ($createredirect) {
 $page = $dbi->getPage($name);
 $text = "<<RedirectTo page=\"" . $newname . "\">>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7146
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7146&view=rev
Author: vargenau
Date: 2009年09月21日 10:12:51 +0000 (2009年9月21日)
Log Message:
-----------
ERROR_REPORTING not used; remove comments
Modified Paths:
--------------
 trunk/g
Modified: trunk/g
===================================================================
--- trunk/g	2009年09月20日 15:13:16 UTC (rev 7145)
+++ trunk/g	2009年09月21日 10:12:51 UTC (rev 7146)
@@ -81,7 +81,6 @@
 
 define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/');
 // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
- // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
 define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
 
 // Do not use a directory per user but only one (per project)
@@ -130,20 +129,7 @@
 
 // Disable WYSIWYG
 define('ENABLE_WYSIWYG', false);
-
- // Which backend? Might need to be seperately installed. See lib/WysiwygEdit/
- // Recommended is only Wikiwyg.
- //
- // Wikiwyg http://openjsan.org/doc/i/in/ingy/Wikiwyg/
- // tinymce http://tinymce.moxiecode.com/
- // FCKeditor http://fckeditor.net/
- // spaw http://sourceforge.net/projects/spaw
- // htmlarea3
- // htmlarea2
 define('WYSIWYG_BACKEND', 'tinymce');
- //
- // Store all WYSIWYG pages as HTML? Will loose most link and plugin options.
- // Not recommended, but presented here to test several WYSIWYG backends.
 define('WYSIWYG_DEFAULT_PAGETYPE_HTML', false);
 
 // Disable public pages
@@ -193,8 +179,6 @@
 
 define('DEFAULT_WIKI_PAGES', "");
 
- define('ERROR_REPORTING', E_ERROR);
-
 define('DBAUTH_AUTH_CHECK', "SELECT IF(passwd='\$password',1,0) as ok FROM plugin_wiki_pref WHERE userid='\$userid'");
 define('DBAUTH_AUTH_USER_EXISTS', "SELECT userid FROM plugin_wiki_pref WHERE userid='\$userid'");
 define('DBAUTH_AUTH_CREATE', "INSERT INTO plugin_wiki_pref (passwd,userid) VALUES ('\$password','\$userid')");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7145
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7145&view=rev
Author: vargenau
Date: 2009年09月20日 15:13:16 +0000 (2009年9月20日)
Log Message:
-----------
Wikicreole syntax
Modified Paths:
--------------
 trunk/lib/WikiPlugin.php
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2009年09月20日 15:03:32 UTC (rev 7144)
+++ trunk/lib/WikiPlugin.php	2009年09月20日 15:13:16 UTC (rev 7145)
@@ -411,13 +411,13 @@
 // provide a sample usage text for automatic edit-toolbar insertion
 function getUsage() {
 $args = $this->getDefaultArguments();
- $string = '<'.'?plugin '.$this->getName().' ';
+ $string = '<<'.$this->getName().' ';
 if ($args) {
 foreach ($args as $key => $value) {
 $string .= ($key."||=".(string)$value." ");
 }
 }
- return $string . '?'.'>';
+ return $string . '>>';
 }
 
 function getArgumentsDescription() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7144
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7144&view=rev
Author: vargenau
Date: 2009年09月20日 15:03:32 +0000 (2009年9月20日)
Log Message:
-----------
Wikicreole syntax
Modified Paths:
--------------
 trunk/lib/main.php
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2009年09月17日 14:12:58 UTC (rev 7143)
+++ trunk/lib/main.php	2009年09月20日 15:03:32 UTC (rev 7144)
@@ -1347,7 +1347,7 @@
 * Allow for disabling of markup cache.
 * (Mostly for debugging ... hopefully.)
 *
- * See also <?plugin WikiAdminUtils action=purge-cache ?>
+ * See also <<WikiAdminUtils action=purge-cache>>
 */
 if (!defined('WIKIDB_NOCACHE_MARKUP')) {
 if ($request->getArg('nocache')) // 1 or purge
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7143
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7143&view=rev
Author: vargenau
Date: 2009年09月17日 14:12:58 +0000 (2009年9月17日)
Log Message:
-----------
Encoding header was missing in mail subject
Modified Paths:
--------------
 trunk/lib/MailNotify.php
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2009年09月17日 10:50:20 UTC (rev 7142)
+++ trunk/lib/MailNotify.php	2009年09月17日 14:12:58 UTC (rev 7143)
@@ -450,11 +450,11 @@
 
 // Let us try quoted printable first
 if (function_exists('quoted_printable_encode')) { // PHP 5.3
- return quoted_printable_encode($subject);
+ return "=?UTF-8?Q?".quoted_printable_encode($subject)."?=";
 }
 
 // If not, encode in base64 (less human-readable)
- return base64_encode($subject);
+ return "=?UTF-8?B?".base64_encode($subject)."?=";
 }
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7142
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7142&view=rev
Author: rurban
Date: 2009年09月17日 10:50:20 +0000 (2009年9月17日)
Log Message:
-----------
fix last folderArrowPath change: missing /
Modified Paths:
--------------
 trunk/themes/default/ajax.js
Modified: trunk/themes/default/ajax.js
===================================================================
--- trunk/themes/default/ajax.js	2009年09月17日 10:26:37 UTC (rev 7141)
+++ trunk/themes/default/ajax.js	2009年09月17日 10:50:20 UTC (rev 7142)
@@ -43,7 +43,7 @@
 }
 if (img) {
 if (!folderArrowPath) folderArrowPath = stylepath + 'images/';
- img.src = folderArrowPath + 'folderArrowOpen.png';
+ img.src = folderArrowPath + '/folderArrowOpen.png';
 }
 }
 }
@@ -105,7 +105,7 @@
 //alert("showHideAsync "+uri+" "+id+"\nloading...");
 var img = document.getElementById(id+'-img');
 if (img)
- img.src = folderArrowPath + 'folderArrowLoading.gif';
+ img.src = folderArrowPath + '/folderArrowLoading.gif';
 cShowHide = new showHide(id)
 cShowHide.hXMLHttp.open( 'GET', uri, true )
 cShowHide.hXMLHttp.send( null )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7141
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7141&view=rev
Author: rurban
Date: 2009年09月17日 10:26:37 +0000 (2009年9月17日)
Log Message:
-----------
* stabilize RPC2.php usage on wrong mime types
* support action=rename&to=newpagename
Modified Paths:
--------------
 trunk/lib/main.php
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2009年09月17日 10:15:21 UTC (rev 7140)
+++ trunk/lib/main.php	2009年09月17日 10:26:37 UTC (rev 7141)
@@ -898,9 +898,10 @@
 return 'soap';
 // Detect XML-RPC requests.
 if ($this->isPost()
- && ($this->get('CONTENT_TYPE') == 'text/xml' 
- or $this->get('CONTENT_TYPE') == 'application/xml')
- && strstr($GLOBALS['HTTP_RAW_POST_DATA'], '<methodCall>')
+ && ((defined("WIKI_XMLRPC") and WIKI_XMLRPC)
+ or ($this->get('CONTENT_TYPE') == 'text/xml' 
+ or $this->get('CONTENT_TYPE') == 'application/xml')
+ && strstr($GLOBALS['HTTP_RAW_POST_DATA'], '<methodCall>'))
 )
 {
 return 'xmlrpc';
@@ -1057,9 +1058,15 @@
 if ($action) {
 if (!$this->getArg('s'))
 $this->setArg('s', $this->getArg('pagename'));
- $this->setArg('verify',1);
+ $this->setArg('verify', 1); // only for POST
 if ($this->getArg('action') != 'rename')
 $this->setArg('action', $action);
+ elseif($this->getArg('to') && empty($this->args['admin_rename'])) {
+ $this->args['admin_rename']
+ = array('from' => $this->getArg('s'),
+ 'to' => $this->getArg('to'),
+ 'action' => 'select');
+ }
 $this->actionpage($action);
 } else {
 trigger_error($page.": Cannot find action page", E_USER_WARNING);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.