phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[7042] trunk/g

[<var...@us...>]

Revision: 7042
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7042&view=rev
Author:   vargenau
Date:     2009-07-16 08:51:13 +0000 (Thu, 16 Jul 2009)

Log Message:
-----------
Use black list of extensions instead of white list

Modified Paths:
--------------
    trunk/g

Modified: trunk/g
===================================================================
--- trunk/g	2009-07-16 08:42:16 UTC (rev 7041)
+++ trunk/g	2009-07-16 08:51:13 UTC (rev 7042)
@@ -87,6 +87,9 @@
     // Do not use a directory per user but only one (per project)
     define('UPLOAD_USERDIR', false);
 
+    // Use black list of extensions instead of white list
+    define('DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', true);
+
     // GForge is UTF-8, so use the same.
     define('CHARSET', 'UTF-8');
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7041] trunk/lib/plugin/UpLoad.php

[<var...@us...>]

Revision: 7041
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7041&view=rev
Author:   vargenau
Date:     2009-07-16 08:42:16 +0000 (Thu, 16 Jul 2009)

Log Message:
-----------
Allow "ics" as extension

Modified Paths:
--------------
    trunk/lib/plugin/UpLoad.php

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2009-07-15 16:06:33 UTC (rev 7040)
+++ trunk/lib/plugin/UpLoad.php	2009-07-16 08:42:16 UTC (rev 7041)
@@ -77,6 +77,7 @@
 docx
 gif
 h
+ics
 ini
 jpeg
 jpg


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7040] trunk/lib/plugin/Processing.php

[<var...@us...>]

Revision: 7040
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7040&view=rev
Author:   vargenau
Date:     2009-07-15 16:06:33 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
svn propset svn:keywords Id

Modified Paths:
--------------
    trunk/lib/plugin/Processing.php

Property Changed:
----------------
    trunk/lib/plugin/Processing.php

Modified: trunk/lib/plugin/Processing.php
===================================================================
--- trunk/lib/plugin/Processing.php	2009-07-15 06:26:12 UTC (rev 7039)
+++ trunk/lib/plugin/Processing.php	2009-07-15 16:06:33 UTC (rev 7040)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: Processing.php 6185 2008-08-22 11:40:14Z vargenau $');
+rcs_id('$Id$');
 /*
 Copyright 2009 $ThePhpWikiProgrammingTeam
 


Property changes on: trunk/lib/plugin/Processing.php
___________________________________________________________________
Added: svn:keywords
   + Id


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7039] trunk/pgsrc/Help%2FPageHistoryPlugin

[<var...@us...>]

Revision: 7039
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7039&view=rev
Author:   vargenau
Date:     2009-07-15 06:26:12 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
Add description and arguments

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPageHistoryPlugin

Modified: trunk/pgsrc/Help%FPageHistoryPlugin
===================================================================
--- trunk/pgsrc/Help%2FPageHistoryPlugin	2009-07-14 23:14:04 UTC (rev 7038)
+++ trunk/pgsrc/Help%2FPageHistoryPlugin	2009-07-15 06:26:12 UTC (rev 7039)
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Wed, 15 Jul 2009 08:24:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -8,7 +8,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~PageHistory** [[Help:WikiPlugin|plugin]] lists history of a given page.
 
 == Usage
 {{{
@@ -17,8 +17,36 @@
 
 == Arguments
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **pagename**
+| The page to execute upon
+| current pagename
+|-
+| **days**
+| Number of days
+|
+|-
+| **show_minor**
+| Show minor modifications
+| true
+|-
+| **show_major**
+| Show major modifications
+| true
+|-
+| **limit**
+|
+|
+|-
+| **format**
+|
+|
+|}
 
 == Example
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7038] trunk/pgsrc

[<var...@us...>]

Revision: 7038
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7038&view=rev
Author:   vargenau
Date:     2009-07-14 23:14:04 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Wikicreole syntax for links

Modified Paths:
--------------
    trunk/pgsrc/Help%2FFrameIncludePlugin
    trunk/pgsrc/Help%2FLdapSearchPlugin
    trunk/pgsrc/Help%2FListPagesPlugin
    trunk/pgsrc/Help%2FMoreAboutMechanics
    trunk/pgsrc/Help%2FPagePermissions
    trunk/pgsrc/Help%2FPageTrailPlugin

Modified: trunk/pgsrc/Help%FFrameIncludePlugin
===================================================================
--- trunk/pgsrc/Help%2FFrameIncludePlugin	2009-07-14 23:01:58 UTC (rev 7037)
+++ trunk/pgsrc/Help%2FFrameIncludePlugin	2009-07-14 23:14:04 UTC (rev 7038)
@@ -1,4 +1,4 @@
-Date: Thu, 26 Mar 2009 11:34:32 +0000
+Date: Wed, 15 Jul 2009 01:12:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -10,7 +10,7 @@
 
 The **~FrameInclude** [[Help:WikiPlugin|plugin]] will create an HTML frame that will fill the entire display area of the page (that is, the whole area the user is allowed to edit). All other text will be discarded when the page is rendered (anything outside the call to plugin, that is). In the language of hypertext this is called //transclusion//.
 
-You might also be interested in the [IncludePage|Help:IncludePagePlugin] plugin.
+You might also be interested in the [[Help:IncludePagePlugin|IncludePage]] plugin.
 
 == Examples 
 

Modified: trunk/pgsrc/Help%FLdapSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FLdapSearchPlugin	2009-07-14 23:01:58 UTC (rev 7037)
+++ trunk/pgsrc/Help%2FLdapSearchPlugin	2009-07-14 23:14:04 UTC (rev 7038)
@@ -1,4 +1,4 @@
-Date: Thu, 26 Mar 2009 11:34:32 +0000
+Date: Wed, 15 Jul 2009 01:12:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -68,7 +68,7 @@
 >>
 
 == Author
-* [John Lines|PhpWiki:JohnLines]
+* [[PhpWiki:JohnLines|John Lines]]
 
 == See Also
 

Modified: trunk/pgsrc/Help%FListPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FListPagesPlugin	2009-07-14 23:01:58 UTC (rev 7037)
+++ trunk/pgsrc/Help%2FListPagesPlugin	2009-07-14 23:14:04 UTC (rev 7038)
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Wed, 15 Jul 2009 01:12:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -9,13 +9,13 @@
 Content-Transfer-Encoding: binary
 
 The **~ListPages** [[Help:WikiPlugin|plugin]] is the simplest plugin to explicitly list a set of pages with all available
-[pagelist|PhpWiki:PageList] options, mainly used for a wikilens theme to display ratings info
+[[PhpWiki:PageList|pagelist]] options, mainly used for a wikilens theme to display ratings info
 and recommendations.
 
-It can also be used with the [PhpWiki:PluginList] method to list a set of pages generated by
+It can also be used with the [[PhpWiki:PluginList]] method to list a set of pages generated by
 another plugin, and/or to exclude a set of pages generated by another plugin.
 
-See the [PhpWiki:PageList] options.
+See the [[PhpWiki:PageList]] options.
 
 == Usage
 

Modified: trunk/pgsrc/Help%FMoreAboutMechanics
===================================================================
--- trunk/pgsrc/Help%2FMoreAboutMechanics	2009-07-14 23:01:58 UTC (rev 7037)
+++ trunk/pgsrc/Help%2FMoreAboutMechanics	2009-07-14 23:14:04 UTC (rev 7038)
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Wed, 15 Jul 2009 01:12:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -34,7 +34,7 @@
 # http://theregister.co.uk/
 
 Combined with one namespace and a simple markup, a Wiki exhibits many
-of the characteristics of [WabiSabi|Help:WabiSabi].
+of the characteristics of [[Help:WabiSabi|WabiSabi]].
 
 ~PhpWiki is licensed under the GNU General Public license, which you
 should be able to see here: http://www.gnu.org/copyleft/gpl.txt.

Modified: trunk/pgsrc/Help%FPagePermissions
===================================================================
--- trunk/pgsrc/Help%2FPagePermissions	2009-07-14 23:01:58 UTC (rev 7037)
+++ trunk/pgsrc/Help%2FPagePermissions	2009-07-14 23:14:04 UTC (rev 7038)
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Wed, 15 Jul 2009 01:12:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -103,7 +103,7 @@
 
 === Action <=> Perm mapping
 
-Those perms are mapped to those actions. [ActionPages|Help:ActionPage] (plugins) check their access restrictions by themselves.
+Those perms are mapped to those actions. [[Help:ActionPage|Action Pages]] (plugins) check their access restrictions by themselves.
 
 list:
   _none, 'list' is checked for every pagename listed in PageList, to prevent from being listed in AllPages._

Modified: trunk/pgsrc/Help%FPageTrailPlugin
===================================================================
--- trunk/pgsrc/Help%2FPageTrailPlugin	2009-07-14 23:01:58 UTC (rev 7037)
+++ trunk/pgsrc/Help%2FPageTrailPlugin	2009-07-14 23:14:04 UTC (rev 7038)
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Wed, 15 Jul 2009 01:12:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -54,7 +54,7 @@
 <<PageTrail>>
 
 == Author
-* [Carsten Klapp|PhpWiki:CarstenKlapp]
+* [[PhpWiki:CarstenKlapp|Carsten Klapp]]
 
 == See Also
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7037] trunk/pgsrc/Help%2FRelatedChangesPlugin

[<var...@us...>]

Revision: 7037
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7037&view=rev
Author:   vargenau
Date:     2009-07-14 23:01:58 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Add description and arguments

Modified Paths:
--------------
    trunk/pgsrc/Help%2FRelatedChangesPlugin

Modified: trunk/pgsrc/Help%FRelatedChangesPlugin
===================================================================
--- trunk/pgsrc/Help%2FRelatedChangesPlugin	2009-07-14 22:41:13 UTC (rev 7036)
+++ trunk/pgsrc/Help%2FRelatedChangesPlugin	2009-07-14 23:01:58 UTC (rev 7037)
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Wed, 15 Jul 2009 01:01:24 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -8,17 +8,16 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~RelatedChanges** [[Help:WikiPlugin|plugin]] gives a list of changes on all pages which are linked to from this page.
 
 == Usage
 {{{
-<<RelatedChanges>>
+<<RelatedChanges arguments>>
 }}}
 
 == Arguments
 
-page _(default: current pagename)_:
-  The page to execute upon.
+The arguments are the same as for [[Help:RecentChanges|RecentChanges]] plugin.
 
 == Example
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7036] trunk/lib/loadsave.php

[<var...@us...>]

Revision: 7036
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7036&view=rev
Author:   vargenau
Date:     2009-07-14 22:41:13 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Add fieldset

Modified Paths:
--------------
    trunk/lib/loadsave.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2009-07-14 10:21:55 UTC (rev 7035)
+++ trunk/lib/loadsave.php	2009-07-14 22:41:13 UTC (rev 7036)
@@ -1094,19 +1094,17 @@
         return;
     }
     if (!$request->getArg('verify')) {
-        $mesg->pushContent(HTML::p(_("Are you sure?")),
+        $mesg->pushContent(HTML::p(fmt("Are you sure to revert %s to version $version?", WikiLink($pagename))),
                            HTML::form(array('action' => $request->getPostURL(),
                                             'method' => 'post'),
                                       HiddenInputs($request->getArgs(), false, array('verify')),
                                       HiddenInputs(array('verify' => 1)),
                                       Button('submit:verify', _("Yes"), 'button'),
                                       HTML::Raw(' '),
-                                      Button('submit:cancel', _("Cancel"), 'button')),
-                           HTML::hr());
+                                      Button('submit:cancel', _("Cancel"), 'button'))
+                           );
         $rev = $page->getRevision($version);
-        $html = HTML(HTML::p(fmt("Revert %s to version $version", WikiLink($pagename))), 
-                     $mesg,
-                     $rev->getTransformedContent()); 
+        $html = HTML(HTML::fieldset($mesg), HTML::hr(), $rev->getTransformedContent()); 
         $template = Template('browse', 
                              array('CONTENT' => $html));
         GeneratePage($template, $pagename, $rev);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7035] trunk/themes/MonoBook/main.css

[<var...@us...>]

Revision: 7035
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7035&view=rev
Author:   vargenau
Date:     2009-07-14 10:21:55 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
No need for a different color

Modified Paths:
--------------
    trunk/themes/MonoBook/main.css

Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css	2009-07-14 10:13:44 UTC (rev 7034)
+++ trunk/themes/MonoBook/main.css	2009-07-14 10:21:55 UTC (rev 7035)
@@ -90,13 +90,6 @@
 a.stub {
 	color: #772233;
 }
-a.new, #p-personal a.new {
-	color: #ba0000;
-}
-a.new:visited, #p-personal a.new:visited {
-	color: #a55858;
-}
-
 img {
 	border: none;
 	vertical-align: middle;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7034] trunk/lib

[<var...@us...>]

Revision: 7034
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7034&view=rev
Author:   vargenau
Date:     2009-07-14 10:13:44 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Default to UTF-8

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/lib/ziplib.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2009-07-14 10:05:45 UTC (rev 7033)
+++ trunk/lib/loadsave.php	2009-07-14 10:13:44 UTC (rev 7034)
@@ -1233,7 +1233,7 @@
         }
     }
     if (empty($pagehash['charset']))
-        $pagehash['charset'] = 'iso-8859-1';
+        $pagehash['charset'] = 'utf-8';
     // compare to target charset
     if (strtolower($pagehash['charset']) != strtolower($GLOBALS['charset'])) {
         $pageinfo['content'] = charset_convert($params['charset'], $GLOBALS['charset'], $pageinfo['content']);
@@ -1305,7 +1305,7 @@
         // plain old file
         $user = $request->getUser();
 
-        $file_charset = 'iso-8859-1';
+        $file_charset = 'utf-8';
         // compare to target charset
         if ($file_charset != strtolower($GLOBALS['charset'])) {
             $text = charset_convert($file_charset, $GLOBALS['charset'], $text);

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2009-07-14 10:05:45 UTC (rev 7033)
+++ trunk/lib/ziplib.php	2009-07-14 10:13:44 UTC (rev 7034)
@@ -876,7 +876,7 @@
         ExitWiki( sprintf("Unknown %s", 'encoding type: $encoding') );
 
     if (empty($params['charset']))
-        $params['charset'] = 'iso-8859-1';
+        $params['charset'] = 'utf-8';
 
     // compare to target charset
     if (strtolower($params['charset']) != strtolower($GLOBALS['charset'])) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7033] trunk/locale/ja/pgsrc

[<var...@us...>]

Revision: 7033
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7033&view=rev
Author:   vargenau
Date:     2009-07-14 10:05:45 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Convert to UTF-8

Added Paths:
-----------
    trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2
    trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8

Removed Paths:
-------------
    trunk/locale/ja/pgsrc/%A5%DA%A1%BC%A5%B8%B8%A1%BA%F7
    trunk/locale/ja/pgsrc/%A5%DB%A1%BC%A5%E0%A5%DA%A1%BC%A5%B8

Deleted: trunk/locale/ja/pgsrc/%A5%DA%A1%BC%A5%B8%B8%A1%BA%F7
===================================================================
--- trunk/locale/ja/pgsrc/%A5%DA%A1%BC%A5%B8%B8%A1%BA%F7	2009-07-14 08:27:20 UTC (rev 7032)
+++ trunk/locale/ja/pgsrc/%A5%DA%A1%BC%A5%B8%B8%A1%BA%F7	2009-07-14 10:05:45 UTC (rev 7033)
@@ -1,12 +0,0 @@
-Date: Sun,  5 Jul 2009 16:46:29 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
-Content-Type: application/x-phpwiki;
-  pagename=%A5%DA%A1%BC%A5%B8%B8%A1%BA%F7;
-  charset=utf-8
-Content-Transfer-Encoding: binary
-
-Here's a list of ページ検索 (recently changed pages) on this wiki. (See RecentEdits
-for all recent minor edits and changes).
-
---------
-<<RecentChanges days||=7 daylist=1,3,7,30,90,0 >>

Deleted: trunk/locale/ja/pgsrc/%A5%DB%A1%BC%A50.000000E-010%A5%DA%A1%BC%A5%B8
===================================================================
--- trunk/locale/ja/pgsrc/%A5%DB%A1%BC%A5%E0%A5%DA%A1%BC%A5%B8	2009-07-14 08:27:20 UTC (rev 7032)
+++ trunk/locale/ja/pgsrc/%A5%DB%A1%BC%A5%E0%A5%DA%A1%BC%A5%B8	2009-07-14 10:05:45 UTC (rev 7033)
@@ -1,8 +0,0 @@
-Date: Sat,  4 Jul 2009 17:26:03 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
-Content-Type: application/x-phpwiki;
-  pagename=%A5%DB%A1%BC%A5%E0%A5%DA%A1%BC%A5%B8;
-  charset=utf-8
-Content-Transfer-Encoding: binary
-
-ここに[ホームページ]を記述しまぃ

Copied: trunk/locale/ja/pgsrc/0.000000E-013                                                                                  %9A1.482922E-3153                                                                                  %BC0.000000E-013                                                                                 %B80.000000E-016%A4       %C1.482917E-3157%B4%A2 (from rev 7001, trunk/locale/ja/pgsrc/%A5%DA%A1%BC%A5%B8%B8%A1%BA%F7)
===================================================================
--- trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2	                        (rev 0)
+++ trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2	2009-07-14 10:05:45 UTC (rev 7033)
@@ -0,0 +1,12 @@
+Date: Sun,  5 Jul 2009 16:46:29 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
+Content-Type: application/x-phpwiki;
+  pagename=%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2;
+  charset=utf-8
+Content-Transfer-Encoding: binary
+
+Here's a list of ページ検索 (recently changed pages) on this wiki. (See RecentEdits
+for all recent minor edits and changes).
+
+--------
+<<RecentChanges days||=7 daylist=1,3,7,30,90,0 >>

Copied: trunk/locale/ja/pgsrc/0.000000E-013                                                                                  %9B1.482840E-3153                                                                                  %BC0.000000E-013                                                                                  %A00.000000E-013                                                                                  %9A1.482836E-3153                                                                                  %BC1.482937E-3153                                                                                 %B8 (from rev 7001, trunk/locale/ja/pgsrc/%A5%DB%A1%BC%A50.000000E-010%A5%DA%A1%BC%A5%B8)
===================================================================
--- trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8	                        (rev 0)
+++ trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8	2009-07-14 10:05:45 UTC (rev 7033)
@@ -0,0 +1,8 @@
+Date: Sat,  4 Jul 2009 17:26:03 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
+Content-Type: application/x-phpwiki;
+  pagename=%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8;
+  charset=utf-8
+Content-Transfer-Encoding: binary
+
+ここに[ホームページ]を記述しまぃ


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7032] trunk/lib/WikiUser/GForge.php

[<ru...@us...>]

Revision: 7032
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7032&view=rev
Author:   rurban
Date:     2009-07-14 08:27:20 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
whitespace only

Modified Paths:
--------------
    trunk/lib/WikiUser/GForge.php

Modified: trunk/lib/WikiUser/GForge.php
===================================================================
--- trunk/lib/WikiUser/GForge.php	2009-07-14 07:32:41 UTC (rev 7031)
+++ trunk/lib/WikiUser/GForge.php	2009-07-14 08:27:20 UTC (rev 7032)
@@ -9,7 +9,7 @@
  */
 class _GForgePassUser extends _PassUser {
 
-	var $_is_external = 0;
+    var $_is_external = 0;
 	
     function _GForgePassUser($UserName='',$prefs=false) {
         if ($prefs) $this->_prefs = $prefs;        
@@ -29,44 +29,44 @@
     function userExists() {
     	global $group_id;
 
-		// Mapping (phpWiki vs GForge) performed is:
-		//     ANON  for non logged or non member
-		//     USER  for member of the project.
-		//     ADMIN for member having admin rights
-		if (session_loggedin()){
+        // Mapping (phpWiki vs GForge) performed is:
+        //     ANON  for non logged or non member
+        //     USER  for member of the project.
+        //     ADMIN for member having admin rights
+        if (session_loggedin()){
 
-			// Get project object (if error => ANON)
-			$project =& group_get_object($group_id);
+            // Get project object (if error => ANON)
+            $project =& group_get_object($group_id);
 			
-			if (!$project || !is_object($project)) {
-		       	$this->_level = WIKIAUTH_ANON;
-				return false;
-			} elseif ($project->isError()) {
-		       	$this->_level = WIKIAUTH_ANON;
-				return false;
-			}
+            if (!$project || !is_object($project)) {
+                $this->_level = WIKIAUTH_ANON;
+                return false;
+            } elseif ($project->isError()) {
+                $this->_level = WIKIAUTH_ANON;
+                return false;
+            }
 
-			$member = false ;
-			$user = session_get_user();
-			$perm =& $project->getPermission($user);
-			if (!$perm || !is_object($perm)) {
-		       	$this->_level = WIKIAUTH_ANON;
-				return false;
-			} elseif (!$perm->isError()) {
-				$member = $perm->isMember();
-			}
+            $member = false ;
+            $user = session_get_user();
+            $perm =& $project->getPermission($user);
+            if (!$perm || !is_object($perm)) {
+                $this->_level = WIKIAUTH_ANON;
+                return false;
+            } elseif (!$perm->isError()) {
+                $member = $perm->isMember();
+            }
 
-			if ($member) {			
-				$this->_userid = $user->getRealName();
-				$this->_is_external = $user->getIsExternal();
-				if ($perm->isAdmin()) {
-					$this->_level = WIKIAUTH_ADMIN;
-				} else {
-        			$this->_level = WIKIAUTH_USER;
-				}
-        		return $this;
-        	}
-		}
+            if ($member) {			
+                $this->_userid = $user->getRealName();
+                $this->_is_external = $user->getIsExternal();
+                if ($perm->isAdmin()) {
+                    $this->_level = WIKIAUTH_ADMIN;
+                } else {
+                    $this->_level = WIKIAUTH_USER;
+                }
+                return $this;
+            }
+        }
        	$this->_level = WIKIAUTH_ANON;
        	return false;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7031] trunk/lib/WikiDB/backend/PearDB_pgsql.php

[<ru...@us...>]

Revision: 7031
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7031&view=rev
Author:   rurban
Date:     2009-07-14 07:32:41 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Postgresql not yet binary safe, still need to use BYTEA hack.

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB_pgsql.php

Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php	2009-07-14 07:29:48 UTC (rev 7030)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php	2009-07-14 07:32:41 UTC (rev 7031)
@@ -5,8 +5,8 @@
 require_once('lib/WikiDB/backend/PearDB.php');
 
 if (!defined("USE_BYTEA")) // see schemas/psql-initialize.sql
-    //define("USE_BYTEA", true);
-    define("USE_BYTEA", false);
+    define("USE_BYTEA", true);
+    //define("USE_BYTEA", false);
 
 /*
 Since 1.3.12 changed to use:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7030] trunk/lib/main.php

[<ru...@us...>]

Revision: 7030
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7030&view=rev
Author:   rurban
Date:     2009-07-14 07:29:48 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Performance: Speedup SetupWiki by setting the action loadfile

Modified Paths:
--------------
    trunk/lib/main.php

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2009-07-14 07:27:43 UTC (rev 7029)
+++ trunk/lib/main.php	2009-07-14 07:29:48 UTC (rev 7030)
@@ -161,6 +161,7 @@
             update_locale($user_lang);
             FindLocalizedButtonFile(".",'missing_ok','reinit');
         }
+        //if (empty($_lang->lang) and $GLOBALS['LANG'] != $_lang->default_value) ;
     }
 
     function initializeTheme ($when = 'default') {
@@ -745,6 +746,7 @@
             return;             // Homepage exists.
 
         include_once('lib/loadsave.php');
+        $this->setArg('action', 'loadfile');
         SetupWiki($this);
         $this->finish();        // NORETURN
     }
@@ -1363,10 +1365,6 @@
         $_PEAR_destructor_object_list = array();
     $request->possiblyDeflowerVirginWiki();
     
-// hack! define proper actions for these.
-//if (defined('WIKI_XMLRPC') and WIKI_XMLRPC) return;
-//if (defined('WIKI_SOAP')   and WIKI_SOAP)   return;
-
     $validators = array('wikiname' => WIKI_NAME,
                         'args'     => wikihash($request->getArgs()),
                         'prefs'    => wikihash($request->getPrefs()));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7029] trunk/lib/plugin/Processing.php

[<ru...@us...>]

Revision: 7029
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7029&view=rev
Author:   rurban
Date:     2009-07-14 07:27:43 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
support processing.js. See http://ejohn.org/blog/processingjs/

Added Paths:
-----------
    trunk/lib/plugin/Processing.php

Added: trunk/lib/plugin/Processing.php
===================================================================
--- trunk/lib/plugin/Processing.php	                        (rev 0)
+++ trunk/lib/plugin/Processing.php	2009-07-14 07:27:43 UTC (rev 7029)
@@ -0,0 +1,117 @@
+<?php // -*-php-*-
+rcs_id('$Id: Processing.php 6185 2008-08-22 11:40:14Z vargenau $');
+/*
+Copyright 2009 $ThePhpWikiProgrammingTeam
+
+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
+*/
+
+/** 
+ * Interface to http://ejohn.org/blog/processingjs/
+ * Syntax: http://ejohn.org/blog/overview-of-processing/
+ */
+class WikiPlugin_Processing
+extends WikiPlugin
+{
+    function getName() {
+        return _("Processing");
+    }
+
+    function getDescription() {
+        return _("Render inline Processing");
+    }
+
+    function getVersion() {
+        return preg_replace("/[Revision: $]/", '',
+                            "\$Revision: 6185 $");
+    }
+
+    function getDefaultArguments() {
+        return array('width'  => 200,
+                     'height' => 200,
+		     'script' => false, // one line script. not very likely
+		     'onmousemove' => false
+                     );
+    }
+    function handle_plugin_args_cruft(&$argstr, &$args) {
+        $this->source = $argstr;
+    }
+
+    function run($dbi, $argstr, &$request, $basepage) {
+        global $WikiTheme;
+        $args = $this->getArgs($argstr, $request);
+        if (empty($this->source))
+            return '';
+        $html = HTML();
+        if (empty($WikiTheme->_asciiSVG)) {
+            $js = JavaScript('', array
+                             ('src' => $WikiTheme->_findData('Processing.js')));
+            if (empty($WikiTheme->_headers_printed))
+                $WikiTheme->addMoreHeaders($js);
+            else
+                $html->pushContent($js);
+            $WikiTheme->_processing = 1; // prevent duplicates
+        }
+	// extract <script>
+	if (preg_match("/^(.*)<script>(.*)<\/script>/ism", $this->source, $m)) {
+	    $this->source = $m[1];
+	    $args['script'] = $m[2];
+	}
+	$embedargs = array('width'  => $args['width'],
+			   'height' => $args['height'],
+			   //'src'    => "d.svg",
+			   'script' => $this->source);
+	// additional onmousemove argument
+	if ($args['onmousemove']) $embedargs['onmousemove'] = $args['onmousemove'];
+        // we need script='data' and not script="data"
+        $embed = new Processing_HTML("embed", $embedargs);
+        $html->pushContent($embed);
+	if ($args['script']) $html->pushContent(JavaScript($args['script']));
+        return $html;
+    }
+};
+
+class Processing_HTML extends HtmlElement {
+    function startTag() {
+        $start = "<" . $this->_tag;
+	$this->_setClasses();
+        foreach ($this->_attr as $attr => $val) {
+            if (is_bool($val)) {
+                if (!$val)
+                    continue;
+                $val = $attr;
+            }
+            $qval = str_replace("\"", '&quot;', $this->_quote((string)$val));
+            if ($attr == 'script')
+		// note the ' not "
+                $start .= " $attr='$qval'";
+            else
+                $start .= " $attr=\"$qval\"";
+        }
+        $start .= ">";
+        return $start;
+    }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7028] trunk/lib/display.php

[<ru...@us...>]

Revision: 7028
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7028&view=rev
Author:   rurban
Date:     2009-07-14 07:25:43 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
During AJAX requests clear the AJAX format argument (for pagelist links, etc)

Modified Paths:
--------------
    trunk/lib/display.php

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2009-07-14 07:24:04 UTC (rev 7027)
+++ trunk/lib/display.php	2009-07-14 07:25:43 UTC (rev 7028)
@@ -87,6 +87,7 @@
 	$template = Template('browse', array('CONTENT' => $transformedContent));
 	GeneratePage($template, $pagetitle, $revision, $args);
     } elseif ($format == 'xml') {
+    	$request->setArg('format','');
 	$template = new Template('browse', $request,
                                  array('revision' => $revision,
                                        'CONTENT'  => $transformedContent,
@@ -138,10 +139,12 @@
 	    array_unshift($args['VALID_LINKS'], $pagename);
 	    $request->setArg('zipname', FilenameForPage($pagename).".zip");
 	    $request->setArg('pages', $args['VALID_LINKS']);
+	    $request->setArg('format','');
 	    MakeWikiZipHtml($request);
 	} // time-sorted RDF á la RecentChanges 
 	elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
             $args = $request->getArgs();
+            //$request->setArg('format','');
             if ($pagename == _("RecentChanges")) {
                 $template->printExpansion($args);
 	    } else {
@@ -150,7 +153,7 @@
                 return $plugin->format($plugin->getChanges($request->_dbi, $args), $args);
 	    }
 	} elseif ($format == 'json') { // for faster autocompletion on searches
-	    $req_args = $request->args;
+	    $req_args =& $request->args;
 	    unset($req_args['format']);
             $json = array('count' => count($pagelist->_pages),
                           'list'  => $args['VALID_LINKS'],
@@ -212,17 +215,20 @@
         echo "<","?xml version=\"1.0\" encoding=\"$charset\"?", ">\n";
         // DOCTYPE html needed to allow unencoded entities like &nbsp; without !CDATA[]
         echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',"\n";
 	if ($page->exists()) {
 	    header("Last-Modified: " . Rfc1123DateTime($revision->get('mtime')));
 	    $request->cacheControl();
+	    $request->setArg('format','');
             $page_content = $revision->getTransformedContent();
             $page_content->printXML();
+            $request->_is_buffering_output = false; // avoid wrong Content-Length with errors
             $request->finish();
         }
         else {
 	    $request->cacheControl();
             echo('<div style="display:none;" />');
+            $request->_is_buffering_output = false; // avoid wrong Content-Length with errors
             $request->finish();
             exit();
         }
@@ -369,9 +375,11 @@
 	$pagelist->addPage($page);
 	if ($format == 'pdf') {
 	    require_once("lib/pdf.php");
+	    $request->setArg('format','');
 	    ConvertAndDisplayPdfPageList($request, $pagelist);
 	// time-sorted rdf a la RecentChanges
 	} elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
+	    //$request->setArg('format','');
             if ($pagename == _("RecentChanges"))
                 $template->printExpansion($toks);
             else {    
@@ -389,6 +397,7 @@
 	    $rdf = new OwlWriter($request, $pagelist);
 	    $rdf->format();
 	} elseif ($format == 'json') { // include page content asynchronously
+	    $request->setArg('format','');
 	    if ($page->exists())
             	$content = $page_content->asXML();
             else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7027] trunk/lib/stdlib.php

[<ru...@us...>]

Revision: 7027
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7027&view=rev
Author:   rurban
Date:     2009-07-14 07:24:04 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Convenience: Silently allow spaces in inlines images, if:
* there's no other image attribute
* the path with space is found locally

Modified Paths:
--------------
    trunk/lib/stdlib.php

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009-07-14 07:14:18 UTC (rev 7026)
+++ trunk/lib/stdlib.php	2009-07-14 07:24:04 UTC (rev 7027)
@@ -431,6 +431,7 @@
                                      _("BAD URL -- remove all of <, >, \"")));
         return $link;
     }
+    // spaces in inline images must be %20 encoded!
     $link = HTML::img(array('src' => $url));
 
     // Extract attributes
@@ -444,7 +445,7 @@
             $link->setAttr($attr, $value);
         }
         // align = bottom|middle|top|left|right
-        if (($attr == "align")
+        elseif (($attr == "align")
           && (($value == "bottom")
             || ($value == "middle")
             || ($value == "top")
@@ -453,18 +454,18 @@
             $link->setAttr($attr, $value);
         }
         // These attributes take a number (pixels): border, hspace, vspace
-        if ((($attr == "border") || ($attr == "hspace") || ($attr == "vspace"))
+        elseif ((($attr == "border") || ($attr == "hspace") || ($attr == "vspace"))
            && (is_int($value))) {
             $link->setAttr($attr, $value);
         }
         // These attributes take a number (pixels) or a percentage: height, width
-        if ((($attr == "border") || ($attr == "hspace") || ($attr == "vspace"))
+        elseif ((($attr == "border") || ($attr == "hspace") || ($attr == "vspace"))
            && (preg_match('/\d+[%p]?x?/', $value))) {
             $link->setAttr($attr, $value);
         }
         // We allow size=50% and size=20x30
         // We replace this with "width" and "height" HTML attributes
-        if ($attr == "size") {
+        elseif ($attr == "size") {
             if (preg_match('/(\d+)%/', $value, $m)) {
                 $link->setAttr('width',$m[1]);
                 $link->setAttr('height',$m[1]);
@@ -472,8 +473,27 @@
                 $link->setAttr('width',$m[1]);
                 $link->setAttr('height',$m[2]);
             }
+        } 
+        else {
+            trigger_error(sprintf(_("Invalid image attribute %s %s=%s"),
+                                  $url, $attr, $value), E_USER_WARNING);
         }
     }
+    // Correct silently the most common error
+    if ($url != $ori_url and empty($arr) and !preg_match("/^http/",$url)) {
+	// space belongs to the path
+	$file = NormalizeLocalFileName($ori_url);
+        if (file_exists($file)) {
+             $link = HTML::img(array('src' => $ori_url));
+        } elseif (string_starts_with($ori_url, getUploadDataPath())) {
+             $file = substr($file, strlen(getUploadDataPath()));
+             $path = getUploadFilePath().$file;
+             if (file_exists($path)) {
+                 $link->setAttr('src', getUploadDataPath() . $file);
+                 $url = $ori_url;
+             }
+        }
+    }
     if (!$link->getAttr('alt')) {
         $link->setAttr('alt', $alt);
     }
@@ -512,7 +532,8 @@
                 $link->setAttr('src', rawurldecode($url));
             } elseif (string_starts_with($url, getUploadDataPath())) { // there
                 $file = substr($file, strlen(getUploadDataPath()));
-                $size = @getimagesize(getUploadFilePath().rawurldecode($file));
+                $path = getUploadFilePath().rawurldecode($file);
+                $size = @getimagesize($path);
                 $link->setAttr('src', getUploadDataPath() . rawurldecode($file));
             } else { // elsewhere
                 $size = @getimagesize($request->get('DOCUMENT_ROOT').urldecode($url));
@@ -2576,8 +2597,8 @@
 function strip_accents($text) {
     $res = utf8_decode($text);
     $res = strtr($res,
-		utf8_decode('àáâãäçèéêëìíîïñòóôõöùúûüýÿÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝ'),
-					'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY');
+                 utf8_decode('àáâãäçèéêëìíîïñòóôõöùúûüýÿÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝ'),
+                             'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY');
     return utf8_encode($res);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7026] trunk/lib/WikiUser/Facebook.php

[<ru...@us...>]

Revision: 7026
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7026&view=rev
Author:   rurban
Date:     2009-07-14 07:14:18 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
More Facebook connect work

Modified Paths:
--------------
    trunk/lib/WikiUser/Facebook.php

Modified: trunk/lib/WikiUser/Facebook.php
===================================================================
--- trunk/lib/WikiUser/Facebook.php	2009-07-14 07:12:58 UTC (rev 7025)
+++ trunk/lib/WikiUser/Facebook.php	2009-07-14 07:14:18 UTC (rev 7026)
@@ -26,18 +26,23 @@
         $web = new HttpClient("www.facebook.com", 80);
         if (DEBUG & _DEBUG_LOGIN) $web->setDebug(true);
         // collect cookies from http://www.facebook.com/login.php
-        $web->persist_cookies = true;
+        $web->persist_cookies = true;  
         $web->cookie_host = 'www.facebook.com';
         $firstlogin = $web->get("/login.php");
         if (!$firstlogin) {
-            trigger_error(_("Facebook connect failed with %d %s", $this->status, $this->errormsg),
-                          E_USER_WARNING);
+            if (DEBUG & (_DEBUG_LOGIN | _DEBUG_VERBOSE))
+                trigger_error(sprintf(_("Facebook connect failed with %d %s"), 
+                                      $web->status, $web->errormsg),
+                              E_USER_WARNING);
         }
         // Switch from http to https://login.facebook.com/login.php
         $web->port = 443;
+        $web->host = 'login.facebook.com';
         if (!($retval = $web->post("/login.php", array('user'=>$userid, 'pass'=>$password)))) {
-            trigger_error(_("Facebook login failed with %d %s", $web->status, $web->errormsg),
-                          E_USER_WARNING);
+            if (DEBUG & (_DEBUG_LOGIN | _DEBUG_VERBOSE))
+                trigger_error(sprintf(_("Facebook login failed with %d %s"),
+                                      $web->status, $web->errormsg),
+                              E_USER_WARNING);
         }
         $this->_authmethod = 'Facebook';
 	if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::checkPass => $retval",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7025] trunk/lib/WikiDB.php

[<ru...@us...>]

Revision: 7025
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7025&view=rev
Author:   rurban
Date:     2009-07-14 07:12:58 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Performance: Do not check RECENTCHANGESBOX cache on actions not using it

Modified Paths:
--------------
    trunk/lib/WikiDB.php

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2009-07-14 07:11:38 UTC (rev 7024)
+++ trunk/lib/WikiDB.php	2009-07-14 07:12:58 UTC (rev 7025)
@@ -1030,7 +1030,11 @@
             $newrevision->_transformedContent = $formatted;
         }
         // more pagechange callbacks: (in a hackish manner for now)
-        if (ENABLE_RECENTCHANGESBOX and empty($meta['is_minor_edit'])) {
+        if (ENABLE_RECENTCHANGESBOX 
+            and empty($meta['is_minor_edit'])
+            and !in_array($GLOBALS['request']->getArg('action'), 
+                          array('loadfile','upgrade')))
+        {
             require_once("lib/WikiPlugin.php");
             $w = new WikiPluginLoader;
             $p = $w->getPlugin("RecentChangesCached", false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7024] trunk/lib/HttpClient.php

[<ru...@us...>]

Revision: 7024
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7024&view=rev
Author:   rurban
Date:     2009-07-14 07:11:38 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Debugging: Warn about empty response

Modified Paths:
--------------
    trunk/lib/HttpClient.php

Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php	2009-07-14 07:10:47 UTC (rev 7023)
+++ trunk/lib/HttpClient.php	2009-07-14 07:11:38 UTC (rev 7024)
@@ -148,6 +148,10 @@
     	    if ($atStart) {
     	        // Deal with first line of returned data
     	        $atStart = false;
+    	        if ($line === false) {
+    	            $this->errormsg = "Empty ". $this->method. " response";
+    	            return false;
+    	        }    
     	        if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/', $line, $m)) {
     	            $this->errormsg = "Status code line invalid: ".htmlentities($line);
     	            $this->debug($this->errormsg);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7023] trunk/lib/IniConfig.php

[<ru...@us...>]

Revision: 7023
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7023&view=rev
Author:   rurban
Date:     2009-07-14 07:10:47 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Fix Windows gettext on non-english OS but english phpwiki: Only bindtextdomain on non-english

Modified Paths:
--------------
    trunk/lib/IniConfig.php

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2009-07-14 04:48:29 UTC (rev 7022)
+++ trunk/lib/IniConfig.php	2009-07-14 07:10:47 UTC (rev 7023)
@@ -828,26 +828,30 @@
         }
     }
     else {
-        // Working around really weird gettext problems: (4.3.2, 4.3.6 win)
-        // bindtextdomain() returns the current domain path.
-        // 1. If the script is not index.php but something like "de", on a different path
-        //    then bindtextdomain() fails, but after chdir to the correct path it will work okay.
-        // 2. But the weird error "Undefined variable: bindtextdomain" is generated then.
-        $bindtextdomain_path = FindFile("locale", false, true);
         $chback = 0;
-        if (isWindows())
-            $bindtextdomain_path = str_replace("/", "\\", $bindtextdomain_path);
-        $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path);
-        if (realpath($bindtextdomain_real) != realpath($bindtextdomain_path)) {
-            // this will happen with virtual_paths. chdir and try again.
-            chdir($bindtextdomain_path);
-            $chback = 1;
+    	if ($LANG != 'en') {
+
+            // Working around really weird gettext problems: (4.3.2, 4.3.6 win)
+            // bindtextdomain() in returns the current domain path.
+            // 1. If the script is not index.php but something like "de", on a different path
+            //    then bindtextdomain() fails, but after chdir to the correct path it will work okay.
+            // 2. But the weird error "Undefined variable: bindtextdomain" is generated then.
+            $bindtextdomain_path = FindFile("locale", false, true);
+            if (isWindows())
+                $bindtextdomain_path = str_replace("/", "\\", $bindtextdomain_path);
             $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path);
+            if (realpath($bindtextdomain_real) != realpath($bindtextdomain_path)) {
+                // this will happen with virtual_paths. chdir and try again.
+                chdir($bindtextdomain_path);
+                $chback = 1;
+                $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path);
+            }
         }
         // tell gettext not to use unicode. PHP >= 4.2.0. Thanks to Kai Krakow.
         if (defined('CHARSET') and function_exists('bind_textdomain_codeset'))
             @bind_textdomain_codeset("phpwiki", CHARSET);
-        textdomain("phpwiki");
+        if ($LANG != 'en')
+            textdomain("phpwiki");
         if ($chback) { // change back
             chdir($bindtextdomain_real . (isWindows() ? "\\.." : "/.."));
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7022] trunk/themes/MonoBook/templates/viewsource.tmpl

[<var...@us...>]

Revision: 7022
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7022&view=rev
Author:   vargenau
Date:     2009-07-14 04:48:29 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
svn propset svn:keywords Id

Modified Paths:
--------------
    trunk/themes/MonoBook/templates/viewsource.tmpl

Property Changed:
----------------
    trunk/themes/MonoBook/templates/viewsource.tmpl

Modified: trunk/themes/MonoBook/templates/viewsource.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/viewsource.tmpl	2009-07-14 04:43:26 UTC (rev 7021)
+++ trunk/themes/MonoBook/templates/viewsource.tmpl	2009-07-14 04:48:29 UTC (rev 7022)
@@ -1,5 +1,5 @@
 <?php // -*-html-*- ?>
-<!-- $Id: viewsource.tmpl,v 1.25 2007/01/02 13:29:14 rurban Exp $ -->
+<!-- $Id$ -->
 
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
   <p><strong><?=_("Note:")?></strong>


Property changes on: trunk/themes/MonoBook/templates/viewsource.tmpl
___________________________________________________________________
Added: svn:keywords
   + Id


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7021] trunk/lib/WikiUser/OpenID.php

[<var...@us...>]

Revision: 7021
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7021&view=rev
Author:   vargenau
Date:     2009-07-14 04:43:26 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Remove history

Modified Paths:
--------------
    trunk/lib/WikiUser/OpenID.php

Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php	2009-07-13 03:40:15 UTC (rev 7020)
+++ trunk/lib/WikiUser/OpenID.php	2009-07-14 04:43:26 UTC (rev 7021)
@@ -36,8 +36,6 @@
     }
 }
 
-// $Log: OpenID.php,v $
-
 // Local Variables:
 // mode: php
 // tab-width: 8
@@ -45,4 +43,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7020] trunk/pgsrc/Help%2FSemanticRelations

[<var...@us...>]

Revision: 7020
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7020&view=rev
Author:   vargenau
Date:     2009-07-13 03:40:15 +0000 (Mon, 13 Jul 2009)

Log Message:
-----------
Spelling, links

Modified Paths:
--------------
    trunk/pgsrc/Help%2FSemanticRelations

Modified: trunk/pgsrc/Help%FSemanticRelations
===================================================================
--- trunk/pgsrc/Help%2FSemanticRelations	2009-07-13 03:14:12 UTC (rev 7019)
+++ trunk/pgsrc/Help%2FSemanticRelations	2009-07-13 03:40:15 UTC (rev 7020)
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Mon, 13 Jul 2009 05:39:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -17,7 +17,7 @@
 * Support for using physical units of measurement in all numerical attributes, 
   without need for prior configuration.
 
-Relations can be searched for with regular experssions, attributes can be 
+Relations can be searched for with regular expressions, attributes can be 
 searched for with full mathematical expressions.
 
 The annotation data will be combined with annotations from the current
@@ -76,11 +76,11 @@
 
 == See Also
 
-See PhpWiki:SemanticWeb, 
-SemanticRelations, ListRelations, SemanticSearch, SemanticSearchAdvanced,
-[SemanticRelationsPlugin|Help:SemanticRelationsPlugin], [SemanticSearchPlugin|Help:SemanticSearchPlugin], 
-PhpWiki:ImportRdf, PhpWiki:ImportRdfs, PhpWiki:ImportOwl, 
-PhpWiki::ExportRdf, PhpWiki::ExportRdfs, PhpWiki::ExportOwl
+* [[PhpWiki:SemanticWeb]]
+* [[SemanticRelations]], [[ListRelations]], [[SemanticSearch]], [[SemanticSearchAdvanced]]
+* [[Help:SemanticRelationsPlugin|SemanticRelationsPlugin]], [[Help:SemanticSearchPlugin|SemanticSearchPlugin]]
+* [[PhpWiki:ImportRdf]], [[PhpWiki:ImportRdfs]], [[PhpWiki:ImportOwl]]
+* [[PhpWiki:ExportRdf]], [[PhpWiki:ExportRdfs]], [[PhpWiki:ExportOwl]]
 
 <noinclude>
 ----


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7019] trunk/themes/default/templates/actionbar.tmpl

[<var...@us...>]

Revision: 7019
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7019&view=rev
Author:   vargenau
Date:     2009-07-13 03:14:12 +0000 (Mon, 13 Jul 2009)

Log Message:
-----------
Revert: ActionButton is not defined in default theme

Modified Paths:
--------------
    trunk/themes/default/templates/actionbar.tmpl

Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl	2009-07-13 03:07:31 UTC (rev 7018)
+++ trunk/themes/default/templates/actionbar.tmpl	2009-07-13 03:14:12 UTC (rev 7019)
@@ -1,71 +1,67 @@
 <?php // -*-php-*-
 rcs_id('$Id$');
 ?>
-<?php
-  $dbh = $request->getDbh();
-  $isAdmin = $user->isAdmin();
-  $pagename = $page->getName();
-  $isActionPage = $request->_isActionPage($pagename, false);
-?>
-<div class="portlet" id="p-cactions">
-  <h5>Views</h5>
-  <ul>
-    <?php if ($request->getArg('action') != "") { ?>
-      <?= ActionButton("browse", _("View Page"), false, array('title' => "View the page [alt-c]")) ?>
-    <?php } else { ?>
-      <li class="selected"><a class="named-wiki" name="browse"><?= _("View Page") ?></a></li>
-    <?php } ?>
-    <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) {
-            $label = $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"); ?>
-      <?= ActionButton("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"), 
-		       false, array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving. [alt-e]")) ?>
-      <?php if (ENABLE_WYSIWYG) { ?>
-        <?= ActionButton(array("action" => "edit", "mode"=> "wysiwyg"), "Wysiwyg Editor", false, array('id' => 'btn-wysiwyg-edit')) ?>
+<?php if (!$WikiTheme->DUMP_MODE) { ?>
+<?php /* I would like not to have to use these tables, and managed to
+       * get this stuff to work more or less correctly using
+       * CSSs float:left; and float:right;.  However float:right; seems
+       * to cause MSIE4.01/NT to hang. 
+       * So, we use tables...  */ ?>
+<table summary="Toolbar 1: Page actions and user login."
+       width="100%" cellpadding="0" cellspacing="0" border="0">
+<tr valign="baseline">
+  <td>
+  <div id="actionbuttons">
+    <?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
+      <?= Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"), false, array('id'=>'btn-edit')) ?>
+      <? if (ENABLE_WYSIWYG) { ?>
+        <?=$SEP?><?= Button(array("action" => "edit", "mode"=> "wysiwyg"), "Wysiwyg Editor", false, array('id' => 'btn-wysiwyg-edit')) ?>
       <?php } ?>
     <?php } else { ?>
-      <?= ActionButton("viewsource", _("View Source")) ?>
+      <?= Button("viewsource", _("View Source")) ?>
     <?php } ?>
-    <?= ActionButton(_("PageHistory"),_("History"),false,array('title'=>"Past versions of this page. [alt-h]")) ?>
-    <?= ActionButton("diff") ?> 
-    <? if ( $user->isSignedIn() ) { ?>
-      <?= ActionButton("WatchPage", _("Watch"), false, 
-		       array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
+    <?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?>
+      <?=$SEP?><?= Button($page->get('locked') ? 'unlock' : 'lock') ?>
+    <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $page->getName())) { ?>
+      <?=$SEP?><?= Button('chown') ?>
+      <?=$SEP?><?= Button('setacl') ?>
+      <?=$SEP?><?= Button('rename') ?>
+    <?php }} ?>
+    <?php if ($revision and ($user->isAdmin() or mayAccessPage('remove', $page->getName()))) { ?>
+      <?=$SEP?><?= Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
+      <?=$SEP?><?= Button('remove') ?>
     <?php } ?>
-  </ul>
-</div>
-
-<?php if ($user->isSignedIn()) { ?>
-<div class="portlet" id="p-tbx">
-  <h5>Special Actions <?= $WikiTheme->folderArrow('p-tbx', 'Closed') ?></h5>
-  <div class="pBody" id="p-tbx-body" style="display:none;">
-  <ul>
-     <?php if ($isAdmin or mayAccessPage('edit', $pagename)) { ?>
-      <?= ActionButton('rename') ?>
-     <?php } ?>
-     <?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?>
-      <?= ActionButton('remove') ?>
-      <?= ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
-     <?php } ?>
-     <?php if ($isAdmin or mayAccessPage('change', $pagename)) { ?>
-      <?= ActionButton($page->get('locked') ? 'unlock' : 'lock') ?>
-      <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $pagename)) { ?>
-       <?= ActionButton('chown') ?>
-       <?= ActionButton('setacl') ?>
-     <?php }} ?>
-     <?= ActionButton(array('action'=>'PageInfo'), _("PageInfo"),$pagename) ?>
-     <?= ActionButton(_("AuthorHistory")) ?>
-     <?= ActionButton(_("PageHistory")) ?>
-     <?= ActionButton("diff") ?> 
-     <?php if ($isAdmin) { ?>
-      <?= ActionButton(_("PageDump")) ?>
-      <?php if (DEBUG & _DEBUG_SQL and USECACHE) {
-        $PurgeCache = Button(array('nocache' => 'purge'),
-                     _("PurgeHtmlCache"), $pagename);
-        $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?>
-        <?= $PurgeCache ?>
-      <?php } ?>
-    <?php } // isAdmin ?>
-  </ul>
+    <?=$SEP?><?= Button("PageHistory", _("PageHistory")) ?>
+    <?=$SEP?><?= Button("diff") ?> 
+    <?=$SEP?><?= Button("PageInfo", _("PageInfo")) ?>
+<?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> 
+    <!-- Buttons really only for debugging -->
+    <?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?>
+    <?=$SEP?><?= Button("PageDump", _("PageDump")) ?>
+<?php
+    if (DEBUG & _DEBUG_SQL and USECACHE) {
+      $PurgeCache = Button(array('nocache' => 'purge'),
+                     _("PurgeHtmlCache"), $page->getName());
+      $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
+?>
+      <?=$SEP?><?= $PurgeCache ?>
+<?php } ?>
+    <!-- End debugging buttons -->
+<?php } ?>
+<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> 
+      <?=$SEP?><?= Button("pdf","Pdf",'wikiclear',array('id'=>'btn-pdf')) ?>
+<?php } ?>
   </div>
-</div>
-<?php } //isSignedIn ?>
+  </td>
+<?php if (empty($NOSIGNIN)) { ?>
+<?php
+/* valign="top" is not ideal here but required to get reasonable alignment
+   with the other action buttons in some browsers, like OmniWeb and Safari
+   (therefore probably Konquorer too) */ ?>
+  <td align="right" valign="top">
+    <div id="signin"><?= Template('signin') ?></div>
+  </td>
+<?php } ?>
+</tr>
+</table>
+<?php } ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7018] trunk/themes/Sidebar

[<var...@us...>]

Revision: 7018
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7018&view=rev
Author:   vargenau
Date:     2009-07-13 03:07:31 +0000 (Mon, 13 Jul 2009)

Log Message:
-----------
Valid XHTML code

Modified Paths:
--------------
    trunk/themes/Sidebar/templates/logo.tmpl
    trunk/themes/Sidebar/templates/navbar.tmpl
    trunk/themes/Sidebar/themeinfo.php

Modified: trunk/themes/Sidebar/templates/logo.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/logo.tmpl	2009-07-13 02:54:20 UTC (rev 7017)
+++ trunk/themes/Sidebar/templates/logo.tmpl	2009-07-13 03:07:31 UTC (rev 7018)
@@ -2,4 +2,4 @@
 rcs_id('$Id$');
 ?>
 <div class="portlet" id="p-logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>" target="_top" title="Visit the Home Page [<?= $WikiTheme->tooltipAccessKeyPrefix() ?>-z]" accesskey="z"><span class="logo"><?= WIKI_NAME ?></span></a></div>
-<img id="img-logo-right" src="<?= $WikiTheme->_findData('images/wiki_stamp.png')?>" align="right" height="86" width="86" border="0">
+<img id="img-logo-right" src="<?= $WikiTheme->_findData('images/wiki_stamp.png')?>" alt="This is a WIKI! Edit every page" align="right" height="86" width="86" border="0" />

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2009-07-13 02:54:20 UTC (rev 7017)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2009-07-13 03:07:31 UTC (rev 7018)
@@ -33,7 +33,7 @@
   <div class="pBody">
 <?= Template("search",
              array('SEARCH_BEFORE' => ''/*HTML::h5(WikiLink(_("FindPage")))*/,
-		   'SEARCH_AFTER'  => HTML::Raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search">&nbsp;<input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search">'))) ?>
+		   'SEARCH_AFTER'  => HTML::Raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" />&nbsp;<input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?>
   </div>
 </div>
 

Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php	2009-07-13 02:54:20 UTC (rev 7017)
+++ trunk/themes/Sidebar/themeinfo.php	2009-07-13 03:07:31 UTC (rev 7018)
@@ -41,7 +41,8 @@
 	return HTML::img(array('id' => $id.'-img',
 	                       'src' => $png,
 			       //'align' => 'right',
-	                       'onClick' => "showHideFolder('$id')",
+	                       'onclick' => "showHideFolder('$id')",
+			       'alt'  => _("Click to hide/show"),
 			       'title'  => _("Click to hide/show")));
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.