phpwiki-checkins Mailing List for PhpWiki

Revision: 8708
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8708&view=rev
Author: vargenau
Date: 2012年12月29日 20:51:48 +0000 (2012年12月29日)
Log Message:
-----------
Use HTML list
Modified Paths:
--------------
 trunk/lib/plugin/RecentChanges.php
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2012年12月29日 20:26:09 UTC (rev 8707)
+++ trunk/lib/plugin/RecentChanges.php	2012年12月29日 20:51:48 UTC (rev 8708)
@@ -803,15 +803,14 @@
 include_once 'lib/InlineParser.php';
 $last_date = '';
 $first = true;
- $html = HTML();
+ $html = HTML::ul();
 $counter = 1;
- $sp = HTML::Raw("\n · ");
 while ($rev = $changes->next()) {
 // enforce view permission
 if (mayAccessPage('view', $rev->_pagename)) {
 if ($link = $this->pageLink($rev)) // some entries may be empty
 // (/Blog/.. interim pages)
- $html->pushContent($sp, $link, HTML::br());
+ $html->pushContent(HTML::li($link));
 if ($first)
 $this->setValidators($rev);
 $first = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8707
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8707&view=rev
Author: vargenau
Date: 2012年12月29日 20:26:09 +0000 (2012年12月29日)
Log Message:
-----------
Fix color
Modified Paths:
--------------
 trunk/themes/Sidebar/sidebar.css
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012年12月29日 20:13:29 UTC (rev 8706)
+++ trunk/themes/Sidebar/sidebar.css	2012年12月29日 20:26:09 UTC (rev 8707)
@@ -1213,7 +1213,6 @@
 z-index: 4;
 border: none;
 overflow: visible;
- color: black;
 line-height: 1.2em;
 }
 
@@ -1235,7 +1234,6 @@
 #p-personal ul {
 border: none;
 line-height: 1.5em;
- color: #2f6fab;
 padding: 0 1.5em 0 2em;
 margin: 0;
 text-align: right;
@@ -1250,7 +1248,7 @@
 border: none;
 padding: 0;
 display: inline;
- color: #2f6fab;
+ color: white;
 margin-left: 0.8em;
 line-height: 1.2em;
 background-image: none;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8706
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8706&view=rev
Author: vargenau
Date: 2012年12月29日 20:13:29 +0000 (2012年12月29日)
Log Message:
-----------
Use smart quotes
Modified Paths:
--------------
 trunk/pgsrc/Help%2FGoodStyle
Modified: trunk/pgsrc/Help%2FGoodStyle
===================================================================
--- trunk/pgsrc/Help%2FGoodStyle	2012年12月29日 19:58:05 UTC (rev 8705)
+++ trunk/pgsrc/Help%2FGoodStyle	2012年12月29日 20:13:29 UTC (rev 8706)
@@ -1,4 +1,4 @@
-Date: 2010年9月10日 13:46:13 +0000
+Date: 2012年12月29日 13:46:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FGoodStyle;
@@ -7,16 +7,16 @@
 charset=UTF-8
 Content-Transfer-Encoding: binary
 
-"Young writers often suppose that style is a garnish for the meat of
+"Young writers often suppose that style is a garnish for the meat of
 prose, a sauce by which a dull dish is made palatable. Style has no
 such separate entity; it is nondetachable, unfilterable. The beginner
 should approach style warily, realizing that it is himself he is
 approaching, no other; and he should begin by turning resolutely away
 from all devices that are popularly believed to indicate style--all
 mannerisms, tricks, adornments. The approach to style is by way of
-plainness, simplicity, orderliness, sincerity."
+plainness, simplicity, orderliness, sincerity."
 
---Strunk and White, "The Elements of Style"
+--Strunk and White, "The Elements of Style"
 
 //And thus an American textbook, typical required reading for
 10th-grade English students, unknowingly extols some virtues of
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8705
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8705&view=rev
Author: vargenau
Date: 2012年12月29日 19:58:05 +0000 (2012年12月29日)
Log Message:
-----------
format=printable does not exist
Modified Paths:
--------------
 trunk/TODO
 trunk/themes/MonoBook/templates/navbar.tmpl
 trunk/themes/Sidebar/templates/navbar.tmpl
Modified: trunk/TODO
===================================================================
--- trunk/TODO	2012年12月29日 19:43:02 UTC (rev 8704)
+++ trunk/TODO	2012年12月29日 19:58:05 UTC (rev 8705)
@@ -68,7 +68,6 @@
 * SQL textsearch with multiple words: AND 
 (the two new failing unit tests)
 * fix textsearch optimize with "word -word -word"
-* format=printable (?) for non js/dom
 
 OLDER TODO's:
 Maybe (probably defer):
Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2012年12月29日 19:43:02 UTC (rev 8704)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2012年12月29日 19:58:05 UTC (rev 8705)
@@ -57,15 +57,10 @@
 <?php if ($user->isSignedIn()) { ?>
 <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
 <?php } ?>
- <li>
 <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
 <script type="text/javascript"><!--
-document.write('<?php echo $PrintableLink ?>'); // -->
+document.write('<li><?php echo $PrintableLink ?></li>'); // -->
 </script>
-<noscript>
- <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?>
-</noscript>
-</li>
 <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { 
 // Do not display the pdf icon
 $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction');
@@ -77,4 +72,3 @@
 </div>
 </div>
 <!-- end of the left (by default at least) column -->
-
Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2012年12月29日 19:43:02 UTC (rev 8704)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2012年12月29日 19:58:05 UTC (rev 8705)
@@ -48,15 +48,10 @@
 <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
 <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
 <?php } ?>
- <li>
 <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
 <script type="text/javascript"><!--
-document.write('<?php echo $PrintableLink ?>'); // -->
+document.write('<li><?php echo $PrintableLink ?></li>'); // -->
 </script>
-<noscript>
- <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?>
-</noscript>
-</li>
 <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { 
 // Do not display the pdf icon
 $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8704
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8704&view=rev
Author: vargenau
Date: 2012年12月29日 19:43:02 +0000 (2012年12月29日)
Log Message:
-----------
Fix link colors
Modified Paths:
--------------
 trunk/themes/Sidebar/sidebar.css
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012年12月29日 11:01:56 UTC (rev 8703)
+++ trunk/themes/Sidebar/sidebar.css	2012年12月29日 19:43:02 UTC (rev 8704)
@@ -71,8 +71,6 @@
 
 a {
 text-decoration: none;
- color: #004ba6;
- background-image: none;
 }
 
 a:visited {
@@ -91,14 +89,6 @@
 color: #772233;
 }
 
-a.new, #p-personal a.new {
- color: #ba0000;
-}
-
-a.new:visited, #p-personal a.new:visited {
- color: #a55858;
-}
-
 img {
 border: 0;
 }
@@ -1294,10 +1284,6 @@
 text-transform: none;
 }
 
-#p-personal a.new {
- color: #ba0000;
-}
-
 /*
 ** the page-related actions- page/talk, edit etc
 */
@@ -1357,10 +1343,6 @@
 padding: 0 1em .2em;
 }
 
-#p-cactions .new a {
- color: #ba0000;
-}
-
 #p-cactions li a:hover {
 z-index: 3;
 text-decoration: none;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8703
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8703&view=rev
Author: vargenau
Date: 2012年12月29日 11:01:56 +0000 (2012年12月29日)
Log Message:
-----------
There is now a theme for discussion
Modified Paths:
--------------
 trunk/pgsrc/Help%2FWikiWikiWeb
Modified: trunk/pgsrc/Help%2FWikiWikiWeb
===================================================================
--- trunk/pgsrc/Help%2FWikiWikiWeb	2012年12月29日 10:56:02 UTC (rev 8702)
+++ trunk/pgsrc/Help%2FWikiWikiWeb	2012年12月29日 11:01:56 UTC (rev 8703)
@@ -1,4 +1,4 @@
-Date: 2011年1月25日 17:23:56 +0000
+Date: 2012年12月27日 17:23:56 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FWikiWikiWeb;
@@ -23,8 +23,7 @@
 //The Universe tends toward chaos. The Universe tends toward Wiki.//
 
 You can say hello on [[RecentVisitors]], or read about [[Help:HowToUseWiki|HowToUseWiki]] and
-[[Help:AddingPages|AddingPages]]. Currently this Wiki has no theme for discussion, so go
-ahead and play with it and have fun!!
+[[Help:AddingPages|AddingPages]]. So go ahead and play with it and have fun!!
 
 -- [[Help:Steve Wainstead|Steve Wainstead]].
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8702
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8702&view=rev
Author: vargenau
Date: 2012年12月29日 10:56:02 +0000 (2012年12月29日)
Log Message:
-----------
InterWikiSearch
Modified Paths:
--------------
 trunk/pgsrc/Help%2FInterWikiSearchPlugin
Modified: trunk/pgsrc/Help%2FInterWikiSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FInterWikiSearchPlugin	2012年12月29日 10:52:46 UTC (rev 8701)
+++ trunk/pgsrc/Help%2FInterWikiSearchPlugin	2012年12月29日 10:56:02 UTC (rev 8702)
@@ -1,4 +1,4 @@
-Date: Fri, 7 Dec 2012 14:58:45 +0000
+Date: 2012年12月27日 14:58:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FInterWikiSearchPlugin;
@@ -7,7 +7,7 @@
 charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~FullTextSearch** [[Help:WikiPlugin|plugin]] performs searches on ~InterWiki sites listed in InterWikiMap.
+The **~InterWikiSearch** [[Help:WikiPlugin|plugin]] performs searches on ~InterWiki sites listed in [[InterWikiMap]].
 
 == Usage ==
 {{{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8701
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8701&view=rev
Author: vargenau
Date: 2012年12月29日 10:52:46 +0000 (2012年12月29日)
Log Message:
-----------
Use smart quotes
Modified Paths:
--------------
 trunk/pgsrc/Help%2FFacebookLikePlugin
Modified: trunk/pgsrc/Help%2FFacebookLikePlugin
===================================================================
--- trunk/pgsrc/Help%2FFacebookLikePlugin	2012年12月29日 10:34:26 UTC (rev 8700)
+++ trunk/pgsrc/Help%2FFacebookLikePlugin	2012年12月29日 10:52:46 UTC (rev 8701)
@@ -1,4 +1,4 @@
-Date: Fri, 7 Dec 2012 14:58:45 +0000
+Date: 2012年12月27日 14:58:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FFacebookLikePlugin;
@@ -7,7 +7,7 @@
 charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~FacebookLike** [[Help:WikiPlugin|plugin]] will include a Facebook "Like" button in your wiki page.
+The **~FacebookLike** [[Help:WikiPlugin|plugin]] will include a Facebook "Like" button in your wiki page.
 
 == Usage ==
 
@@ -44,7 +44,7 @@
 | standard
 |-
 | **action**
-| 'like' 'recommend'
+| 'like' or 'recommend'
 | like
 |}
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8700
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8700&view=rev
Author: vargenau
Date: 2012年12月29日 10:34:26 +0000 (2012年12月29日)
Log Message:
-----------
Optimize border
Modified Paths:
--------------
 trunk/themes/MonoBook/commonPrint.css
Modified: trunk/themes/MonoBook/commonPrint.css
===================================================================
--- trunk/themes/MonoBook/commonPrint.css	2012年12月29日 10:16:49 UTC (rev 8699)
+++ trunk/themes/MonoBook/commonPrint.css	2012年12月29日 10:34:26 UTC (rev 8700)
@@ -96,7 +96,7 @@
 float: right;
 margin: 0;
 position: relative;
- border: 0.5em solid White;
+ border: solid white;
 border-width: 0.5em 0 0.8em 1.4em;
 }
 
@@ -108,7 +108,7 @@
 float: left;
 margin: 0.3em 0.5em 0.5em 0;
 position: relative;
- border: 0.5em solid White;
+ border: solid white;
 border-width: 0.5em 1.4em 0.8em 0;
 }
 
@@ -119,8 +119,7 @@
 /* thumbnails */
 div.thumb {
 margin-bottom: 0.5em;
- border-style: solid;
- border-color: White;
+ border: solid white;
 width: auto;
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8699
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8699&view=rev
Author: vargenau
Date: 2012年12月29日 10:16:49 +0000 (2012年12月29日)
Log Message:
-----------
Optimize padding
Modified Paths:
--------------
 trunk/themes/blog/Kubrick.css
Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2012年12月29日 10:11:38 UTC (rev 8698)
+++ trunk/themes/blog/Kubrick.css	2012年12月29日 10:16:49 UTC (rev 8699)
@@ -433,7 +433,7 @@
 /* local links (override above) */
 /*
 a.namedurl[href*="the.taoofmac.com"] {
- padding-right: 0px;
+ padding-right: 0;
 background: none;
 }
 */
@@ -481,7 +481,6 @@
 #editpage, #edit-content, .wiki-edithelp {
 /* top, right, bottom, left */
 padding: 0 0 20px 0;
- /*margin: 0px 0 0;*/
 width: 710px;
 overflow: visible;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8698
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8698&view=rev
Author: vargenau
Date: 2012年12月29日 10:11:38 +0000 (2012年12月29日)
Log Message:
-----------
Optimize padding
Modified Paths:
--------------
 trunk/themes/default/phpwiki-topbottombars.css
Modified: trunk/themes/default/phpwiki-topbottombars.css
===================================================================
--- trunk/themes/default/phpwiki-topbottombars.css	2012年12月27日 19:31:09 UTC (rev 8697)
+++ trunk/themes/default/phpwiki-topbottombars.css	2012年12月29日 10:11:38 UTC (rev 8698)
@@ -16,14 +16,10 @@
 div#header, div#footer {
 background: #FFFFF0; /* ivory */
 margin: 0;
- padding: 0;
 position: fixed;
 left: 0;
 right: 0;
- padding-top: 1ex;
- padding-bottom: 1ex;
- padding-left: 1em;
- padding-right: 1em;
+ padding: 1ex 1em;
 }
 
 hr.toolbar {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8697
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8697&view=rev
Author: vargenau
Date: 2012年12月27日 19:31:09 +0000 (2012年12月27日)
Log Message:
-----------
Remove unused
Modified Paths:
--------------
 trunk/lib/plugin/PasswordReset.php
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2012年12月27日 19:27:07 UTC (rev 8696)
+++ trunk/lib/plugin/PasswordReset.php	2012年12月27日 19:31:09 UTC (rev 8697)
@@ -94,7 +94,6 @@
 
 function doForm(&$request, $userid = '', $header = '', $footer = '')
 {
- $post_args = $request->getArg('admin_reset');
 if (!$header) {
 $header = HTML::p(_("Reset password of user: "),
 HTML::Raw(' '),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8696
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8696&view=rev
Author: vargenau
Date: 2012年12月27日 19:27:07 +0000 (2012年12月27日)
Log Message:
-----------
Remove unused class
Modified Paths:
--------------
 trunk/lib/WikiDB/adodb/readme.htm
Modified: trunk/lib/WikiDB/adodb/readme.htm
===================================================================
--- trunk/lib/WikiDB/adodb/readme.htm	2012年12月27日 19:20:56 UTC (rev 8695)
+++ trunk/lib/WikiDB/adodb/readme.htm	2012年12月27日 19:27:07 UTC (rev 8696)
@@ -7,7 +7,6 @@
 <!--
 body,td {font-family:Arial,Helvetica,sans-serif;font-size:11pt}
 pre {font-size:9pt}
- .toplink {font-size:8pt}
 -->
 </style>
 </head>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8695
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8695&view=rev
Author: vargenau
Date: 2012年12月27日 19:20:56 +0000 (2012年12月27日)
Log Message:
-----------
Fix return
Modified Paths:
--------------
 trunk/lib/plugin/PasswordReset.php
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2012年12月27日 18:07:00 UTC (rev 8694)
+++ trunk/lib/plugin/PasswordReset.php	2012年12月27日 19:20:56 UTC (rev 8695)
@@ -142,9 +142,11 @@
 }
 if ($userid and !empty($post_args['verify'])) {
 if ($user->isAdmin()) {
- return $this->doReset($userid);
+ $this->doReset($userid);
+ return '';
 } else {
- return $this->doEmail($request, $userid);
+ $this->doEmail($request, $userid);
+ return '';
 }
 } elseif (empty($post_args['verify'])) {
 //TODO: verify should check if the user exists, his prefs can be read/safed
@@ -161,7 +163,7 @@
 $alert = new Alert(_("Already logged in"),
 HTML(fmt("Changing passwords is done at "), WikiLink(_("UserPreferences"))));
 $alert->show();
- return;
+ return '';
 }
 $thisuser = WikiUser($userid);
 $prefs = $thisuser->getPreferences();
@@ -173,7 +175,7 @@
 fmt("You need to ask an Administrator to reset this password. See below: "),
 HTML::br(), WikiLink(ADMIN_USER)));
 $alert->show();
- return;
+ return '';
 }
 $verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified');
 if (!$verified)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8694
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8694&view=rev
Author: vargenau
Date: 2012年12月27日 18:07:00 +0000 (2012年12月27日)
Log Message:
-----------
Remove unreachable statement
Modified Paths:
--------------
 trunk/lib/plugin/FileInfo.php
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2012年12月27日 18:04:37 UTC (rev 8693)
+++ trunk/lib/plugin/FileInfo.php	2012年12月27日 18:07:00 UTC (rev 8694)
@@ -231,7 +231,6 @@
 if (function_exists('res_list_type') or loadPhpExtension('win32std'))
 return $this->exeversion_resopen($file);
 return exeversion_showver($file);
- return '';
 }
 
 // http://www.codeproject.com/dll/showver.asp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8693
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8693&view=rev
Author: vargenau
Date: 2012年12月27日 18:04:37 +0000 (2012年12月27日)
Log Message:
-----------
Indent code
Modified Paths:
--------------
 trunk/lib/plugin/LinkDatabase.php
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2012年12月27日 17:56:07 UTC (rev 8692)
+++ trunk/lib/plugin/LinkDatabase.php	2012年12月27日 18:04:37 UTC (rev 8693)
@@ -155,7 +155,11 @@
 echo "<!DOCTYPE GraphXML SYSTEM \"$dtd\">\n";
 echo "<GraphXML xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n";
 echo "<graph id=\"", MangleXmlIdentifier(WIKI_NAME), "\">\n";
- echo '<style><line tag="node" class="main" colour="#ffffff"/><line tag="node" class="child" colour="blue"/><line tag="node" class="relation" colour="green"/></style>', "\n\n";
+ echo '<style>';
+ echo '<line tag="node" class="main" colour="#ffffff"/>';
+ echo '<line tag="node" class="child" colour="blue"/>';
+ echo '<line tag="node" class="relation" colour="green"/>';
+ echo "</style>\n\n";
 while ($page = $pages->next()) {
 $pageid = MangleXmlIdentifier($page->getName());
 $pagename = $page->getName();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8692
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8692&view=rev
Author: vargenau
Date: 2012年12月27日 17:56:07 +0000 (2012年12月27日)
Log Message:
-----------
Remove commented code
Modified Paths:
--------------
 trunk/lib/wikilens/RatingsDb.php
Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php	2012年12月27日 11:05:49 UTC (rev 8691)
+++ trunk/lib/wikilens/RatingsDb.php	2012年12月27日 17:56:07 UTC (rev 8692)
@@ -641,130 +641,6 @@
 
 }
 
-/*
-class RatingsDB_backend_PearDB
-extends WikiDB_backend_PearDB {
- function get_rating($dimension=null, $rater=null, $ratee=null,
- $orderby=null, $pageinfo = "ratee") {
- $result = $this->_get_rating_result(
- $dimension, $rater, $ratee, $orderby, $pageinfo);
- return new WikiDB_backend_PearDB_generic_iter($this, $result);
- }
-
- function get_users_rated($dimension=null, $orderby=null) {
- $result = $this->_get_users_rated_result(
- $dimension, $orderby);
- return new WikiDB_backend_PearDB_generic_iter($this, $result);
- }
-
- function get_rating_page($dimension=null, $rater=null, $ratee=null,
- $orderby=null, $pageinfo = "ratee") {
- $result = $this->_get_rating_result(
- $dimension, $rater, $ratee, $orderby, $pageinfo);
- return new WikiDB_backend_PearDB_iter($this, $result);
- }
-
- function _get_rating_result($dimension=null, $rater=null, $ratee=null,
- $orderby=null, $pageinfo = "ratee") {
- // pageinfo must be 'rater' or 'ratee'
- if (($pageinfo != "ratee") && ($pageinfo != "rater"))
- return;
-
- $dbh = &$this->_dbh;
- extract($this->_table_names);
-
- $where = "WHERE r." . $pageinfo . "page = p.id";
- if (isset($dimension)) {
- $where .= " AND dimension=$dimension";
- }
- if (isset($rater)) {
- $raterid = $this->_get_pageid($rater, true);
- $where .= " AND raterpage=$raterid";
- }
- if (isset($ratee)) {
- if(is_array($ratee)){
- $where .= " AND (";
- for($i = 0; $i < count($ratee); $i++){
- $rateeid = $this->_get_pageid($ratee[$i], true);
- $where .= "rateepage=$rateeid";
- if($i != (count($ratee) - 1)){
- $where .= " OR ";
- }
- }
- $where .= ")";
- } else {
- $rateeid = $this->_get_pageid($ratee, true);
- $where .= " AND rateepage=$rateeid";
- }
- }
-
- $orderbyStr = "";
- if (isset($orderby)) {
- $orderbyStr = " ORDER BY " . $orderby;
- }
-
- $query = "SELECT *"
- . " FROM $rating_tbl r, $page_tbl p "
- . $where
- . $orderbyStr;
-
- $result = $dbh->query($query);
-
- return $result;
- }
-
- function _get_users_rated_result($dimension=null, $orderby=null) {
- $dbh = &$this->_dbh;
- extract($this->_table_names);
-
- $where = "WHERE p.id=r.raterpage";
- if (isset($dimension)) {
- $where .= " AND dimension=$dimension";
- }
- $orderbyStr = "";
- if (isset($orderby)) {
- $orderbyStr = " ORDER BY " . $orderby;
- }
-
- $query = "SELECT DISTINCT p.pagename"
- . " FROM $rating_tbl r, $page_tbl p "
- . $where
- . $orderbyStr;
-
- $result = $dbh->query($query);
-
- return $result;
- }
- function delete_rating($rater, $ratee, $dimension) {
- $dbh = &$this->_dbh;
- extract($this->_table_names);
-
- $this->lock();
- $raterid = $this->_get_pageid($rater, true);
- $rateeid = $this->_get_pageid($ratee, true);
-
- $dbh->query("DELETE FROM $rating_tbl WHERE raterpage=$raterid and rateepage=$rateeid and dimension=$dimension");
- $this->unlock();
- return true;
- }
-
- function rate($rater, $ratee, $rateeversion, $dimension, $rating, $isPrivate = 'no') {
- $dbh = &$this->_dbh;
- extract($this->_table_names);
-
- $this->lock();
- $raterid = $this->_get_pageid($rater, true);
- $rateeid = $this->_get_pageid($ratee, true);
-
- $dbh->query("DELETE FROM $rating_tbl WHERE raterpage=$raterid and rateepage=$rateeid and dimension=$dimension and isPrivate='$isPrivate'");
- // NOTE: Leave tstamp off the insert, and MySQL automatically updates it
- $dbh->query("INSERT INTO $rating_tbl (dimension, raterpage, rateepage, ratingvalue, rateeversion, isPrivate) VALUES ($dimension, $raterid, $rateeid, $rating, $rateeversion, '$isPrivate')");
- $this->unlock();
- return true;
- }
-}
-*/
-
 // Local Variables:
 // mode: php
 // tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8691
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8691&view=rev
Author: vargenau
Date: 2012年12月27日 11:05:49 +0000 (2012年12月27日)
Log Message:
-----------
Remove commented code
Modified Paths:
--------------
 trunk/lib/WikiUserNew.php
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012年12月27日 11:04:56 UTC (rev 8690)
+++ trunk/lib/WikiUserNew.php	2012年12月27日 11:05:49 UTC (rev 8691)
@@ -750,8 +750,7 @@
 * function too!).
 */
 if (!$UserName || $UserName == @$unboxedcookie['userid']) {
- $updated = $this->_prefs->updatePrefs($unboxedcookie);
- //$this->_prefs = new UserPreferences($unboxedcookie);
+ $this->_prefs->updatePrefs($unboxedcookie);
 $UserName = @$unboxedcookie['userid'];
 if (is_string($UserName) and (substr($UserName, 0, 2) != 's:'))
 $this->_userid = $UserName;
@@ -766,8 +765,7 @@
 if (!$UserName and ($cookie = $request->cookies->get_old("WIKI_PREF2"))) {
 if (!$unboxedcookie = $this->_prefs->retrieve($cookie)) {
 if (!$UserName || $UserName == $unboxedcookie['userid']) {
- $updated = $this->_prefs->updatePrefs($unboxedcookie);
- //$this->_prefs = new UserPreferences($unboxedcookie);
+ $this->_prefs->updatePrefs($unboxedcookie);
 $UserName = $unboxedcookie['userid'];
 if (is_string($UserName) and (substr($UserName, 0, 2) != 's:'))
 $this->_userid = $UserName;
@@ -816,7 +814,7 @@
 $updated = $this->_prefs->updatePrefs($prefs);
 $prefs =& $this->_prefs;
 } else {
- // update the prefs values from scratch. This could leed to unnecessary
+ // update the prefs values from scratch. This could lead to unnecessary
 // side-effects: duplicate emailVerified, ...
 $this->_prefs = new UserPreferences($prefs);
 $updated = true;
@@ -1183,8 +1181,7 @@
 if ($restored_from_page = $this->_prefs->retrieve
 ($this->_HomePagehandle->get('pref'))
 ) {
- $updated = $this->_prefs->updatePrefs($restored_from_page, 'init');
- //$this->_prefs = new UserPreferences($restored_from_page);
+ $this->_prefs->updatePrefs($restored_from_page, 'init');
 return $this->_prefs;
 }
 }
@@ -2285,74 +2282,6 @@
 }
 }
 
-/** TODO: new pref storage classes
- * These are currently user specific and should be rewritten to be pref specific.
- * i.e. $this == $user->_prefs
- */
-/*
-class CookieUserPreferences
-extends UserPreferences
-{
- function CookieUserPreferences ($saved_prefs = false) {
- //_AnonUser::_AnonUser('',$saved_prefs);
- UserPreferences::UserPreferences($saved_prefs);
- }
-}
-
-class PageUserPreferences
-extends UserPreferences
-{
- function PageUserPreferences ($saved_prefs = false) {
- UserPreferences::UserPreferences($saved_prefs);
- }
-}
-
-class PearDbUserPreferences
-extends UserPreferences
-{
- function PearDbUserPreferences ($saved_prefs = false) {
- UserPreferences::UserPreferences($saved_prefs);
- }
-}
-
-class AdoDbUserPreferences
-extends UserPreferences
-{
- function AdoDbUserPreferences ($saved_prefs = false) {
- UserPreferences::UserPreferences($saved_prefs);
- }
- function getPreferences() {
- // override the generic slow method here for efficiency
- _AnonUser::getPreferences();
- $this->getAuthDbh();
- if (isset($this->_select)) {
- $dbh = & $this->_auth_dbi;
- $rs = $dbh->Execute(sprintf($this->_select,$dbh->qstr($this->_userid)));
- if ($rs->EOF) {
- $rs->Close();
- } else {
- $prefs_blob = $rs->fields['pref_blob'];
- $rs->Close();
- if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
- $updated = $this->_prefs->updatePrefs($restored_from_db);
- //$this->_prefs = new UserPreferences($restored_from_db);
- return $this->_prefs;
- }
- }
- }
- if (empty($this->_prefs->_prefs) and $this->_HomePagehandle) {
- if ($restored_from_page = $this->_prefs->retrieve
- ($this->_HomePagehandle->get('pref'))) {
- $updated = $this->_prefs->updatePrefs($restored_from_page);
- //$this->_prefs = new UserPreferences($restored_from_page);
- return $this->_prefs;
- }
- }
- return $this->_prefs;
- }
-}
-*/
-
 // Local Variables:
 // mode: php
 // tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8690
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8690&view=rev
Author: vargenau
Date: 2012年12月27日 11:04:56 +0000 (2012年12月27日)
Log Message:
-----------
Remove PHP4 comment
Modified Paths:
--------------
 trunk/lib/WikiTheme.php
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012年12月27日 11:04:00 UTC (rev 8689)
+++ trunk/lib/WikiTheme.php	2012年12月27日 11:04:56 UTC (rev 8690)
@@ -552,10 +552,6 @@
 //
 ////////////////////////////////////////////////////////////////
 
- //FIXME: PHP 4.1 Warnings
- //lib/WikiTheme.php:84: Notice[8]: The call_user_method() function is deprecated,
- //use the call_user_func variety with the array(&$obj, "method") syntax instead
-
 function getFormatter($type, $format)
 {
 $method = strtolower("get${type}Formatter");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8689
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8689&view=rev
Author: vargenau
Date: 2012年12月27日 11:04:00 +0000 (2012年12月27日)
Log Message:
-----------
Remove PHP4
Modified Paths:
--------------
 trunk/lib/FileFinder.php
Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2012年12月27日 11:02:04 UTC (rev 8688)
+++ trunk/lib/FileFinder.php	2012年12月27日 11:04:00 UTC (rev 8689)
@@ -383,13 +383,9 @@
 {
 $this->FileFinder(array_merge(
 $path,
- array('/usr/share/php4',
- '/usr/share/php',
- '/usr/lib/php4',
+ array('/usr/share/php',
 '/usr/lib/php',
- '/usr/local/share/php4',
 '/usr/local/share/php',
- '/usr/local/lib/php4',
 '/usr/local/lib/php',
 '/System/Library/PHP',
 '/Apache/pear' // Windows
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8688
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8688&view=rev
Author: vargenau
Date: 2012年12月27日 11:02:04 +0000 (2012年12月27日)
Log Message:
-----------
Remove commented code
Modified Paths:
--------------
 trunk/lib/prepend.php
Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2012年12月27日 11:00:27 UTC (rev 8687)
+++ trunk/lib/prepend.php	2012年12月27日 11:02:04 UTC (rev 8688)
@@ -131,13 +131,6 @@
 }
 
 $RUNTIMER = new DebugTimer;
-/*
-if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
- error_reporting(E_ALL & ~E_STRICT); // exclude E_STRICT
-else
- error_reporting(E_ALL); // php4
-//echo " prepend: ", error_reporting();
-*/
 require_once(dirname(__FILE__) . '/ErrorManager.php');
 require_once(dirname(__FILE__) . '/WikiCallback.php');
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8687
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8687&view=rev
Author: vargenau
Date: 2012年12月27日 11:00:27 +0000 (2012年12月27日)
Log Message:
-----------
Remove unused variable
Modified Paths:
--------------
 trunk/lib/WikiUser/AdoDb.php
 trunk/lib/WikiUser/BogoLogin.php
 trunk/lib/WikiUser/OpenID.php
 trunk/lib/WikiUser/POP3.php
 trunk/lib/WikiUser/PdoDb.php
 trunk/lib/WikiUser/PearDb.php
Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2012年12月27日 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/AdoDb.php	2012年12月27日 11:00:27 UTC (rev 8687)
@@ -70,8 +70,7 @@
 $prefs_blob = @$rs->fields['prefs'];
 $rs->Close();
 if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
- $updated = $this->_prefs->updatePrefs($restored_from_db);
- //$this->_prefs = new UserPreferences($restored_from_db);
+ $this->_prefs->updatePrefs($restored_from_db);
 return $this->_prefs;
 }
 }
@@ -80,8 +79,7 @@
 if ($restored_from_page = $this->_prefs->retrieve
 ($this->_HomePagehandle->get('pref'))
 ) {
- $updated = $this->_prefs->updatePrefs($restored_from_page);
- //$this->_prefs = new UserPreferences($restored_from_page);
+ $this->_prefs->updatePrefs($restored_from_page);
 return $this->_prefs;
 }
 }
Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php	2012年12月27日 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/BogoLogin.php	2012年12月27日 11:00:27 UTC (rev 8687)
@@ -48,7 +48,7 @@
 if (isset($this->_prefs->_method) and $this->_prefs->_method == 'HomePage') {
 $user = new _PersonalPagePassUser($this->_userid, $this->_prefs);
 if ($user->checkPass($submitted_password)) {
- $user = UpgradeUser($this, $user);
+ UpgradeUser($this, $user);
 $this->_level = WIKIAUTH_USER;
 return $this->_level;
 } else {
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php	2012年12月27日 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/OpenID.php	2012年12月27日 11:00:27 UTC (rev 8687)
@@ -208,7 +208,6 @@
 
 function checkPass($password)
 {
- $userid = $this->_userid;
 if (!loadPhpExtension('openssl')) {
 trigger_error(
 sprintf(_("The PECL %s extension cannot be loaded."), "openssl")
Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php	2012年12月27日 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/POP3.php	2012年12月27日 11:00:27 UTC (rev 8687)
@@ -73,7 +73,7 @@
 // quit the connection
 fputs($fp, "quit\n");
 // Get the sayonara message
- $line = fgets($fp, 1024);
+ fgets($fp, 1024);
 fclose($fp);
 } else {
 trigger_error(_("Couldn't connect to %s", "POP3_AUTH_HOST " . $host . ':' . $port),
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2012年12月27日 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/PdoDb.php	2012年12月27日 11:00:27 UTC (rev 8687)
@@ -67,8 +67,7 @@
 $prefs = $db_result->fetch(PDO_FETCH_BOTH);
 $prefs_blob = @$prefs["prefs"];
 if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
- $updated = $this->_prefs->updatePrefs($restored_from_db);
- //$this->_prefs = new UserPreferences($restored_from_db);
+ $this->_prefs->updatePrefs($restored_from_db);
 return $this->_prefs;
 }
 }
@@ -76,8 +75,7 @@
 if ($restored_from_page = $this->_prefs->retrieve
 ($this->_HomePagehandle->get('pref'))
 ) {
- $updated = $this->_prefs->updatePrefs($restored_from_page);
- //$this->_prefs = new UserPreferences($restored_from_page);
+ $this->_prefs->updatePrefs($restored_from_page);
 return $this->_prefs;
 }
 }
@@ -210,7 +208,6 @@
 E_USER_WARNING);
 
 //NOTE: for auth_crypt_method='crypt' defined('ENCRYPTED_PASSWD',true) must be set
- $dbh = &$this->_auth_dbi;
 if ($this->_auth_crypt_method == 'crypt') {
 try {
 $this->_authselect->bindParam("userid", $this->_userid, PDO_PARAM_STR, 48);
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2012年12月27日 10:59:14 UTC (rev 8686)
+++ trunk/lib/WikiUser/PearDb.php	2012年12月27日 11:00:27 UTC (rev 8687)
@@ -65,8 +65,7 @@
 $prefs = $db_result->fetchRow();
 $prefs_blob = @$prefs["prefs"];
 if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
- $updated = $this->_prefs->updatePrefs($restored_from_db);
- //$this->_prefs = new UserPreferences($restored_from_db);
+ $this->_prefs->updatePrefs($restored_from_db);
 return $this->_prefs;
 }
 }
@@ -74,8 +73,7 @@
 if ($restored_from_page = $this->_prefs->retrieve
 ($this->_HomePagehandle->get('pref'))
 ) {
- $updated = $this->_prefs->updatePrefs($restored_from_page);
- //$this->_prefs = new UserPreferences($restored_from_page);
+ $this->_prefs->updatePrefs($restored_from_page);
 return $this->_prefs;
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8686
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8686&view=rev
Author: vargenau
Date: 2012年12月27日 10:59:14 +0000 (2012年12月27日)
Log Message:
-----------
Add return
Modified Paths:
--------------
 trunk/lib/WikiUser/LdapUpper.php
Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php	2012年12月27日 10:58:30 UTC (rev 8685)
+++ trunk/lib/WikiUser/LdapUpper.php	2012年12月27日 10:59:14 UTC (rev 8686)
@@ -44,6 +44,7 @@
 $this->_HomePagehandle->_pagename = $this->_userid;
 return strtoupper($this->_userid);
 }
+ return '';
 }
 
 function userExists()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8685
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8685&view=rev
Author: vargenau
Date: 2012年12月27日 10:58:30 +0000 (2012年12月27日)
Log Message:
-----------
Add return
Modified Paths:
--------------
 trunk/lib/WikiUser/HttpAuthUpper.php
Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php	2012年12月19日 20:19:09 UTC (rev 8684)
+++ trunk/lib/WikiUser/HttpAuthUpper.php	2012年12月27日 10:58:30 UTC (rev 8685)
@@ -60,6 +60,7 @@
 {
 return false;
 
+ /*
 header('WWW-Authenticate: Basic realm="' . WIKI_NAME . '"');
 header("Authorization: Basic " . base64_encode($userid . ":" . $passwd));
 if (!isset($_SERVER))
@@ -68,6 +69,7 @@
 $_SERVER['PHP_AUTH_USER'] = $userid;
 $_SERVER['PHP_AUTH_PW'] = $passwd;
 //$GLOBALS['request']->setStatus(200);
+ */
 }
 
 function logout()
@@ -116,6 +118,7 @@
 $this->_userid = strtoupper($this->_userid);
 return strtoupper($this->_userid);
 }
+ return '';
 }
 
 // force http auth authorization
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8684
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8684&view=rev
Author: vargenau
Date: 2012年12月19日 20:19:09 +0000 (2012年12月19日)
Log Message:
-----------
void printSimpleTrace
Modified Paths:
--------------
 trunk/lib/WikiDB.php
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2012年12月19日 13:53:05 UTC (rev 8683)
+++ trunk/lib/WikiDB.php	2012年12月19日 20:19:09 UTC (rev 8684)
@@ -711,7 +711,9 @@
 // returns the database specific resource type
 function genericSqlQuery($sql, $args = false)
 {
- echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
+ echo "<pre>";
+ printSimpleTrace(debug_backtrace());
+ echo "</pre>\n";
 trigger_error("no SQL database", E_USER_ERROR);
 return false;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.