phpwiki-checkins Mailing List for PhpWiki

Revision: 8070
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8070&view=rev
Author: vargenau
Date: 2011年05月04日 19:12:16 +0000 (2011年5月04日)
Log Message:
-----------
Check "rev" is a positive integer
Modified Paths:
--------------
 trunk/lib/plugin/IncludePage.php
 trunk/lib/plugin/Template.php
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2011年05月04日 15:54:09 UTC (rev 8069)
+++ trunk/lib/plugin/IncludePage.php	2011年05月04日 19:12:16 UTC (rev 8070)
@@ -99,6 +99,9 @@
 
 $p = $dbi->getPage($page);
 if ($rev) {
+ if (!is_whole_number($rev) or !($rev>0)) {
+ return $this->error(_("Error: rev must be a positive integer."));
+ }
 $r = $p->getRevision($rev);
 if ((!$r) || ($r->hasDefaultContents())) {
 return $this->error(sprintf(_("%s: no such revision %d."),
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2011年05月04日 15:54:09 UTC (rev 8069)
+++ trunk/lib/plugin/Template.php	2011年05月04日 19:12:16 UTC (rev 8070)
@@ -137,6 +137,9 @@
 
 $p = $dbi->getPage($page);
 if ($args['rev']) {
+ if (!is_whole_number($args['rev']) or !($args['rev']>0)) {
+ return $this->error(_("Error: rev must be a positive integer."));
+ }
 $r = $p->getRevision($args['rev']);
 if ((!$r) || ($r->hasDefaultContents())) {
 return $this->error(sprintf(_("%s: no such revision %d."),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8069
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8069&view=rev
Author: vargenau
Date: 2011年05月04日 15:54:09 +0000 (2011年5月04日)
Log Message:
-----------
warning_msg --> information
Modified Paths:
--------------
 trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2011年05月04日 15:48:08 UTC (rev 8068)
+++ trunk/themes/fusionforge/themeinfo.php	2011年05月04日 15:54:09 UTC (rev 8069)
@@ -72,7 +72,7 @@
 if ($page->get('external')) {
 $external_msg = _("This page is external.");
 }
- echo $HTML->warning_msg(_("This project is shared with third-party users") .
+ echo $HTML->information(_("This project is shared with third-party users") .
 sprintf(_(" (non %s users)."), forge_get_config('company')) .
 (isset($external_msg) ? ' ' . $external_msg : ''));
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8068
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8068&view=rev
Author: vargenau
Date: 2011年05月04日 15:48:08 +0000 (2011年5月04日)
Log Message:
-----------
Fix order of arguments; use italics
Modified Paths:
--------------
 trunk/pgsrc/Help%2FCreateTocPlugin
Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin	2011年05月04日 15:42:28 UTC (rev 8067)
+++ trunk/pgsrc/Help%2FCreateTocPlugin	2011年05月04日 15:48:08 UTC (rev 8068)
@@ -1,4 +1,4 @@
-Date: 2010年9月21日 09:44:16 +0000
+Date: Wed, 4 May 2011 17:46:02 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -32,7 +32,7 @@
 | true
 |-
 | **firstlevelstyle**
-| Style of first level numbering: number, letter or roman.
+| Style of first level numbering: //number//, //letter// or //roman//.
 | number
 |-
 | **headers**
@@ -48,7 +48,7 @@
 | false
 |-
 | **liststyle**
-| List style: dl or ol or ul. Using ol is equivalent to with_counter=1.
+| List style: //dl// or //ol// or //ul//. Using //ol// is equivalent to //with_counter=1//.
 | dl
 |-
 | **noheader**
@@ -63,16 +63,16 @@
 | Table of Contents of which page?
 | current pagename
 |-
+| **position**
+| Where to display the Table of Contents: //full//, //left// or //right//.
+| full
+|-
 | **version**
-| page version
+| Page version
 | most recent version
 |-
-| **position**
-| Where to display the Table of Contents: full, left or right.
-| full
-|-
 | **width**
-| Width of Table of Contents (if position is left or right)
+| Width of Table of Contents (if position is //left// or //right//)
 | 200px
 |-
 | **with_counter**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8067
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8067&view=rev
Author: vargenau
Date: 2011年05月04日 15:42:28 +0000 (2011年5月04日)
Log Message:
-----------
Protect footer with FUSIONFORGE
Modified Paths:
--------------
 trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2011年05月04日 10:28:35 UTC (rev 8066)
+++ trunk/themes/fusionforge/themeinfo.php	2011年05月04日 15:42:28 UTC (rev 8067)
@@ -82,14 +82,17 @@
 }
 
 function footer() {
- global $HTML;
 
- $domain = textdomain(NULL);
- textdomain('fusionforge');
+ if (defined('FUSIONFORGE') and FUSIONFORGE) {
+ global $HTML;
 
- $HTML->footer(array());
+ $domain = textdomain(NULL);
+ textdomain('fusionforge');
 
- textdomain($domain);
+ $HTML->footer(array());
+
+ textdomain($domain);
+ }
 }
 
 function initGlobals() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8066
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8066&view=rev
Author: vargenau
Date: 2011年05月04日 10:28:35 +0000 (2011年5月04日)
Log Message:
-----------
Update CSS for Fusionforge
Modified Paths:
--------------
 trunk/themes/fusionforge/fusionforge.css
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2011年05月04日 10:27:44 UTC (rev 8065)
+++ trunk/themes/fusionforge/fusionforge.css	2011年05月04日 10:28:35 UTC (rev 8066)
@@ -47,6 +47,60 @@
 * General
 */
 
+body {
+	margin: 0 0 0 0;
+}
+
+form { margin: 0; }
+
+img { border: 0; vertical-align: middle; }
+
+body {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	color: #565c5e; /* Alcatel-Lucent grey */
+}
+
+h1 { font-size: 1.8em; }
+h2 { font-size: 1.6em; line-height:1.1em;}
+h3 { font-size: 1.2em; line-height:1.3em;}
+h4 { font-size: 1.0em; line-height:1.3em;}
+h5 { font-size: 0.8em; }
+h6 { font-size: 0.6em; }
+
+/* Titles in the page. */
+h1, .titlebar, .widget_titlebar {
+	background: url(/themes/alcatel-lucent/images/bgrd_hpage_header.gif) white;
+	background-position: bottom;
+	background-repeat: repeat-x;
+	padding-left: 10px;
+	padding-right: 10px;
+	padding-top: 4px;
+	padding-bottom: 6px;
+	border-top:1px solid #dddddd;
+	border-bottom:1px solid #dddddd;
+	vertical-align: middle;
+	font-family: 'trebuchet MS', Arial, Helvetica, sans-serif;
+	color: #554295; /* Alcatel-Lucent violet */
+	font-weight: normal;
+	font-size: 1.8em;
+	line-height: 1.3em;
+	text-align: left;
+	height: 24px;
+	margin-top: 4px;
+}
+
+/* Hack for the wiki that inserts an unneccessary </p> */
+.titlebar p {
+	color: #554295; /* Alcatel-Lucent violet */
+	font-size: 1em;
+	margin-bottom: 0;
+	margin-top: 0;
+}
+
+.titlebar a {
+	padding-left: 10px;
+}
+
 /* Because in some cases there is a <p> in nested lists */
 li p { margin:0; }
 
@@ -619,25 +673,95 @@
 
 /* Banners ============================================================ */
 
+p.success, p.feedback, p.warning, p.warning_msg, p.error, p.information,
+div.success, div.feedback, div.warning, div.warning_msg, div.error, div.information {
+ font-weight: bold;
+ font-size: 12px;
+ text-align: center;
+ border: 1px solid;
+ margin: 15px 0px;
+ padding: 10px 10px 10px 10px;
+}
+
+.success, .feedback {
+ border-color: green;
+ background-color: #DFF2BF;
+}
+.warning_msg, .warning {
+ border-color: orange;
+ background-color: #FEEFB3;
+}
+.error {
+ border-color: red;
+ background-color: #FFBABA;
+}
+.information {
+ border-color: blue;
+ background-color: #BDE5F8;
+}
+
+p.success, p.feedback, 
+p.warning, p.warning_msg, 
+p.error, 
+p.information,
+div.success, div.feedback, 
+div.warning, div.warning_msg, 
+div.error, 
+div.information {
+ text-align: left;
+ background-repeat: no-repeat;
+ background-position: 10px;
+ -moz-border-radius: 1em;
+ -webkit-border-radius: 1em;
+ border-radius: 1em;
+ padding: 10px 10px 10px 50px;
+}
+
+div.success, div.feedback,
+p.success, p.feedback {
+ color: #4F8A10;
+ background-image:url('/themes/base-alcatel-lucent/images/success.png');
+}
+div.feedback p, div.feedback li,
+div.success p, div.success li {
+ color: #4F8A10;
+}
+
+div.warning, div.warning_msg,
+p.warning, p.warning_msg {
+ color: #9F6000;
+ background-image: url('/themes/base-alcatel-lucent/images/warning.png');
+}
+div.warning p, div.warning_msg p,
+div.warning li, div.warning_msg li {
+ color: #9F6000;
+}
+
+div.error,
+p.error {
+ color: #D8000C;
+ background-image: url('/themes/base-alcatel-lucent/images/error.png');
+}
+div.error p,
+div.error li {
+ color: #D8000C;
+}
+
+div.information,
+p.information {
+ color: #00529B;
+ background-image: url('/themes/base-alcatel-lucent/images/info.png');
+}
+
 .error, .warning, .debug, .hint {
 font-weight: bold;
 font-size: 11px;
 text-align: left;
- border-width: 2px;
+ border-width: 1px;
 border-style: solid;
 padding: 0.5em;
 }
 
-.error {
- background-color: #ffc0cb; /* pink */
- border-color: red;
-}
-
-.warning {
- background-color: #ffd297; /* orange */
- border-color: #FFA500; /* orange */
-}
-
 .debug {
 background-color: white;
 border-color: #fff8dc; /* darker ivory */
@@ -648,13 +772,6 @@
 border-color: black;
 }
 
-p.error, p.warning, p.debug, p.hint,
-div.error div.warning, div.debug, div.hint {
- border-radius: 1em;
- -moz-border-radius: 1em;
- -webkit-border-radius: 1em;
-}
-
 span.error, span.warning, span.debug, span.hint {
 padding: 0;
 }
@@ -987,6 +1104,11 @@
 }
 
 /* Main wiki browse banner */
+
+.browsebanner {
+ clear: both;
+}
+
 .browsebanner table {
 width: 100%;
 background-color: #e9fbff;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8065
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8065&view=rev
Author: vargenau
Date: 2011年05月04日 10:27:44 +0000 (2011年5月04日)
Log Message:
-----------
Use <p> instaed of <div> for feedback
Modified Paths:
--------------
 trunk/lib/purgepage.php
 trunk/lib/removepage.php
Modified: trunk/lib/purgepage.php
===================================================================
--- trunk/lib/purgepage.php	2011年05月04日 10:23:50 UTC (rev 8064)
+++ trunk/lib/purgepage.php	2011年05月04日 10:27:44 UTC (rev 8065)
@@ -50,7 +50,7 @@
 $dbi = $request->getDbh();
 $dbi->purgePage($pagename);
 $dbi->touch();
- $html = HTML::div(array('class' => 'feedback'), fmt("Purged page '%s' successfully.", $pagename));
+ $html = HTML::p(array('class' => 'feedback'), fmt("Purged page '%s' successfully.", $pagename));
 }
 
 GeneratePage($html, _("Purge Page"));
Modified: trunk/lib/removepage.php
===================================================================
--- trunk/lib/removepage.php	2011年05月04日 10:23:50 UTC (rev 8064)
+++ trunk/lib/removepage.php	2011年05月04日 10:27:44 UTC (rev 8065)
@@ -50,7 +50,7 @@
 $dbi = $request->getDbh();
 $dbi->deletePage($pagename);
 $dbi->touch();
- $html = HTML::div(array('class' => 'feedback'), fmt("Removed page '%s' successfully.", $pagename));
+ $html = HTML::p(array('class' => 'feedback'), fmt("Removed page '%s' successfully.", $pagename));
 }
 
 GeneratePage($html, _("Remove Page"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8064
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8064&view=rev
Author: vargenau
Date: 2011年05月04日 10:23:50 +0000 (2011年5月04日)
Log Message:
-----------
ErrorHandler->_postponed_errors --> ErrorManager->_postponed_errors
Modified Paths:
--------------
 trunk/lib/MailNotify.php
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2011年05月04日 10:22:51 UTC (rev 8063)
+++ trunk/lib/MailNotify.php	2011年05月04日 10:23:50 UTC (rev 8064)
@@ -204,14 +204,15 @@
 $headers
 );
 if (MAILER_LOG and is_writable(MAILER_LOG)) {
+ global $ErrorManager;
+
 $f = fopen(MAILER_LOG, "a");
 fwrite($f, "\n\nX-MailSentOK: " . $ok ? 'OK' : 'FAILED');
- if (!$ok) {
- global $ErrorManager;
- // get last error message
- $last_err =
- $ErrorManager->_postponed_errors[count($ErrorHandler->_postponed_errors)-1];
- fwrite($f, "\nX-MailFailure: " . $last_err);
+
+ if (!$ok && isset($ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1])) {
+ // get last error message
+ $last_err = $ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1];
+ fwrite($f, "\nX-MailFailure: " . $last_err);
 }
 fwrite($f, "\nDate: " . CTime());
 fwrite($f, "\nSubject: $encoded_subject");
@@ -246,7 +247,7 @@
 
 global $request;
 
- if (@is_array($request->_deferredPageChangeNotification)) {
+ if (isset($request->_deferredPageChangeNotification)) {
 // collapse multiple changes (loaddir) into one email
 $request->_deferredPageChangeNotification[] =
 array($this->pagename, $this->emails, $this->userids);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8063
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8063&view=rev
Author: vargenau
Date: 2011年05月04日 10:22:51 +0000 (2011年5月04日)
Log Message:
-----------
Test 0 to be sure
Modified Paths:
--------------
 trunk/lib/WikiDB.php
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2011年05月04日 10:22:03 UTC (rev 8062)
+++ trunk/lib/WikiDB.php	2011年05月04日 10:22:51 UTC (rev 8063)
@@ -1077,8 +1077,9 @@
 $cache = &$this->_wikidb->_cache;
 $pagename = &$this->_pagename;
 
- if (! $version or $version == -1) // 0 or false
+ if ((!$version) or ($version == 0) or ($version == -1)) { // 0 or false
 return new WikiDB_PageRevision($this->_wikidb, $pagename, 0);
+ }
 
 assert($version > 0);
 $vdata = $cache->get_versiondata($pagename, $version, $need_content);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8062
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8062&view=rev
Author: vargenau
Date: 2011年05月04日 10:22:03 +0000 (2011年5月04日)
Log Message:
-----------
Check version is a positive integer; check firstlevelstyle is correct
Modified Paths:
--------------
 trunk/lib/plugin/CreateToc.php
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2011年05月04日 10:20:46 UTC (rev 8061)
+++ trunk/lib/plugin/CreateToc.php	2011年05月04日 10:22:03 UTC (rev 8062)
@@ -383,6 +383,11 @@
 if (($notoc) or ($liststyle == 'ol')) {
 $with_counter = 1;
 }
+ if ($firstlevelstyle and ($firstlevelstyle != 'number') 
+ and ($firstlevelstyle != 'letter')
+ and ($firstlevelstyle != 'roman')) {
+ return $this->error(_("Error: firstlevelstyle must be 'number', 'letter' or 'roman'"));
+ }
 
 // Check if page exists.
 if (!($dbi->isWikiPage($pagename))) {
@@ -398,6 +403,9 @@
 $page = $dbi->getPage($pagename);
 
 if ($version) {
+ if (!is_whole_number($version) or !($version>0)) {
+ return $this->error(_("Error: version must be a positive integer."));
+ }
 $r = $page->getRevision($version);
 if ((!$r) || ($r->hasDefaultContents())) {
 return $this->error(sprintf(_("%s: no such revision %d."),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8061
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8061&view=rev
Author: vargenau
Date: 2011年05月04日 10:20:46 +0000 (2011年5月04日)
Log Message:
-----------
New utility function: is_whole_number
Modified Paths:
--------------
 trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2011年04月27日 13:53:27 UTC (rev 8060)
+++ trunk/lib/stdlib.php	2011年05月04日 10:20:46 UTC (rev 8061)
@@ -97,6 +97,7 @@
 is_localhost($url)
 javascript_quote_string($s)
 isSerialized($s)
+ is_whole_number($var)
 parse_attributes($line)
 is_image ($filename)
 is_video ($filename)
@@ -2383,6 +2384,14 @@
 }
 
 /**
+ * Determine if a variable represents a whole number
+ */
+
+function is_whole_number($var) {
+ return (is_numeric($var) && (intval($var)==floatval($var)));
+}
+
+/**
 * Take a string and return an array of pairs (attribute name, attribute value)
 *
 * We allow attributes with or without double quotes (")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.