phpwiki-checkins Mailing List for PhpWiki

Revision: 7720
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7720&view=rev
Author: vargenau
Date: 2010年10月22日 18:38:33 +0000 (2010年10月22日)
Log Message:
-----------
Remove rcs_id
Modified Paths:
--------------
 trunk/themes/fusionforge/templates/actionbar.tmpl
 trunk/themes/fusionforge/templates/blogform.tmpl
 trunk/themes/fusionforge/templates/body.tmpl
 trunk/themes/fusionforge/templates/bottom.tmpl
 trunk/themes/fusionforge/templates/browse-footer.tmpl
 trunk/themes/fusionforge/templates/browse.tmpl
 trunk/themes/fusionforge/templates/debug.tmpl
 trunk/themes/fusionforge/templates/editpage.tmpl
 trunk/themes/fusionforge/templates/html.tmpl
 trunk/themes/fusionforge/templates/login.tmpl
 trunk/themes/fusionforge/templates/navbar.tmpl
 trunk/themes/fusionforge/templates/pagelink.tmpl
 trunk/themes/fusionforge/templates/ratings.tmpl
 trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,8 +1,6 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
-?>
+// $Id$
 
-<?php 
 $curuserprefs = $user->getPreferences();
 $dbh = $request->getDbh();
 $isAdmin = $user->isAdmin();
@@ -19,7 +17,7 @@
 <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
 <td class="bold">
 <?php echo Button(array(),
- $isActionPage ? _("Action Page") : _("Page"), 
+ $isActionPage ? _("Action Page") : _("Page"),
 $talk->getParent(), array('title' => "Page")) ?>
 </td>
 <td class="spacer">&nbsp;</td>
@@ -85,7 +83,7 @@
 <td class="spacer">&nbsp;</td>
 <td><?php echo Button(array('action'=>'BackLinks'), _("Back Links"),$page->getName()) ?></td>
 
- <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> 
+ <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
 <?php if ($curuserprefs->get('pdfMenuItem')) { ?>
 <td class="spacer">&nbsp;</td>
 <td><?php echo Button("pdf") ?></td>
Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/blogform.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// rcs_id('$Id$');
+// $Id$
 ?>
 <div class="wikiblog wikiblog-form">
 <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
Modified: trunk/themes/fusionforge/templates/body.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/body.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/body.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
 ?>
 <table width="100%" cellpadding="0" cellspacing="0">
 <tr>
Modified: trunk/themes/fusionforge/templates/bottom.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/bottom.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/bottom.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
 ?>
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
 <?php if (defined('DEBUG') and DEBUG) { ?>
Modified: trunk/themes/fusionforge/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse-footer.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/browse-footer.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,4 +1,4 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
 ?>
 <p class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></p>
Modified: trunk/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/browse.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,7 +1,6 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php
+// $Id$
+
 $curuserprefs = $user->getPreferences();
 ?>
 
Modified: trunk/themes/fusionforge/templates/debug.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/debug.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/debug.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
 ?>
 <?php global $RUNTIMER; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
 ?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
 <p><strong><?php echo _("Preview only! Changes not saved.")?></strong>
@@ -17,7 +17,7 @@
 <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
 <?php } ?>
 <?php /*
- * FIXME: Hack! 
+ * FIXME: Hack!
 * The funky URL used for the form action parameter is bogus.
 * This is needed, otherwise the redirect to the real browser
 * page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
@@ -33,7 +33,7 @@
 <tr><td><?php echo $EDIT_TOOLBAR ?></td>
 <td align="right"><div id="editarea-size">
 <?php echo _("Size").':'?>
- <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> 
+ <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
 <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
 <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
 </div></td></tr></table>
@@ -44,12 +44,12 @@
 <table summary="Toolbar: Page editing options." class="toolbar" width="100%"
 cellpadding="0" cellspacing="0" border="0">
 <tr valign="middle">
- <td> 
+ <td>
 <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
 </td>
 <td align="center">
 <?php echo $PREVIEW_B ?>
- <?php if ($SAVE_B) { ?> 
+ <?php if ($SAVE_B) { ?>
 <?php echo $SEP?><?php echo $SAVE_B ?>
 <?php } ?>
 <?php echo $SEP?><?php echo $CHANGES_B ?>
Modified: trunk/themes/fusionforge/templates/html.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/html.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/html.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,7 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php
+// $Id$
 /*
 * No header for FusionForge (already provided)
 */
Modified: trunk/themes/fusionforge/templates/login.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/login.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/login.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
 ?>
 <?php if ($fail_message) { ?>
 <div class="error"><p><?php echo $fail_message?></p></div>
Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/navbar.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,7 +1,6 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php 
+// $Id$
+
 $curuserprefs = $user->getPreferences();
 $dbh = $request->getDbh();
 $username = $user->UserName();
Modified: trunk/themes/fusionforge/templates/pagelink.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/pagelink.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/pagelink.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,7 +1,6 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php
+// $Id$
+
 /**
 * Themable paging "|<< << - i/sum - >> >>|" links
 *
@@ -25,7 +24,7 @@
 <?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
 </td>
 <td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" align="right">
- <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK),_("Next >>")) : _(">>") ?> 
+ <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK),_("Next >>")) : _(">>") ?>
 &nbsp;
 <?php echo $NEXT ? HTML::a(array('href'=>$LAST_LINK),_(">>|")) : _(">>|") ?>
 </td>
Modified: trunk/themes/fusionforge/templates/ratings.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/ratings.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/ratings.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
+// $Id$
 ?>
 <?php if (!$WikiTheme->DUMP_MODE) {
 $loader = new WikiPluginLoader();
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl	2010年10月22日 09:30:47 UTC (rev 7719)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl	2010年10月22日 18:38:33 UTC (rev 7720)
@@ -1,7 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id$');
-?>
-<?php
+// $Id$'
 // Todo: Move the logic and code to the plugin
 // This is very experimental and the read-only part an ugly hack so far.
 foreach (explode(',','errmsg,isForm') as $var) {
@@ -9,7 +7,7 @@
 }
 
 $plugin = $request->getArg('pagename');
-if (isActionPage($request->getArg('pagename')) 
+if (isActionPage($request->getArg('pagename'))
 and $isForm and $plugin == _("PreferencesInfo")) {
 $isForm = false;
 }
@@ -130,44 +128,44 @@
 $SelectThemes = ''; $SelectLanguages = '';
 $SelectThemesDesc = ''; $SelectLanguagesDesc = '';
 if ( $isForm ) {
- $SelectOptions = HTML(); 
+ $SelectOptions = HTML();
 if (!empty($available_themes) and is_array($available_themes)) {
-	if (!$pref->get('theme') or $pref->get('theme') == THEME)
-	 $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
-	else
-	 $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
-	foreach ($available_themes as $theme) {
-	 if ($theme == $pref->get('theme') and $theme != THEME)
-		$SelectOptions->pushContent(selectedOption($theme));
-	 else
-		$SelectOptions->pushContent(unselectedOption($theme));
-	}
-	$SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
-				 $SelectOptions);
-	$SelectThemesDesc = _("Personal theme:");
+ if (!$pref->get('theme') or $pref->get('theme') == THEME)
+ $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+ else
+ $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+ foreach ($available_themes as $theme) {
+ if ($theme == $pref->get('theme') and $theme != THEME)
+ $SelectOptions->pushContent(selectedOption($theme));
+ else
+ $SelectOptions->pushContent(unselectedOption($theme));
+ }
+ $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
+ $SelectOptions);
+ $SelectThemesDesc = _("Personal theme:");
 }
- 
+
 $SelectOptions = HTML();
 if (!empty($available_languages) and is_array($available_languages)) {
-	if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
-	 $SelectOptions->pushContent(selectedOption("",_("<system language>")));
-	else
-	 $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
-	foreach ($available_languages as $lang) {
-	 if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
-		$SelectOptions->pushContent(selectedOption($lang));
-	 else
-		$SelectOptions->pushContent(unselectedOption($lang));
-	}
-	$SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
-					$SelectOptions);
-	$SelectLanguagesDesc = _("Personal language:");
+ if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
+ $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+ else
+ $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+ foreach ($available_languages as $lang) {
+ if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
+ $SelectOptions->pushContent(selectedOption($lang));
+ else
+ $SelectOptions->pushContent(unselectedOption($lang));
+ }
+ $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
+ $SelectOptions);
+ $SelectLanguagesDesc = _("Personal language:");
 } else {
-	if ($SelectThemes == '') {
-	 $appearance = false;
-	 $SelectThemesDesc = '';
-	 $SelectLanguagesDesc = '';
-	}
+ if ($SelectThemes == '') {
+ $appearance = false;
+ $SelectThemesDesc = '';
+ $SelectLanguagesDesc = '';
+ }
 }
 } else {
 $SelectThemesDesc = _("Personal theme:");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7719
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7719&view=rev
Author: vargenau
Date: 2010年10月22日 09:30:47 +0000 (2010年10月22日)
Log Message:
-----------
Allow swf
Modified Paths:
--------------
 trunk/g
 trunk/lib/plugin/UpLoad.php
Modified: trunk/g
===================================================================
--- trunk/g	2010年10月22日 08:26:31 UTC (rev 7718)
+++ trunk/g	2010年10月22日 09:30:47 UTC (rev 7719)
@@ -121,8 +121,8 @@
 // Dummy value
 define('ADMIN_PASSWD', 'xxx');
 
- // Allow ".svg" as extension
- define('INLINE_IMAGES', 'png|jpg|jpeg|gif|svg');
+ // Allow ".svg" and ".swf" as extensions
+ define('INLINE_IMAGES', 'png|jpg|jpeg|gif|svg|swf');
 
 // Allow <div> and <span> in wiki code
 define('ENABLE_MARKUP_DIVSPAN', true);
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2010年10月22日 08:26:31 UTC (rev 7718)
+++ trunk/lib/plugin/UpLoad.php	2010年10月22日 09:30:47 UTC (rev 7719)
@@ -132,7 +132,6 @@
 reg
 sc[frt]
 sh[bsm]?
-swf
 url
 vb[esx]?
 vxd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7718
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7718&view=rev
Author: vargenau
Date: 2010年10月22日 08:26:31 +0000 (2010年10月22日)
Log Message:
-----------
Do not print rateit widget
Modified Paths:
--------------
 trunk/themes/fusionforge/fusionforge-print-min.css
 trunk/themes/fusionforge/fusionforge-print.css
Modified: trunk/themes/fusionforge/fusionforge-print-min.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-print-min.css	2010年10月20日 16:36:22 UTC (rev 7717)
+++ trunk/themes/fusionforge/fusionforge-print-min.css	2010年10月22日 08:26:31 UTC (rev 7718)
@@ -1 +1 @@
-.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/fusionforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file
+.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}#rateit-widget-top{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/fusionforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file
Modified: trunk/themes/fusionforge/fusionforge-print.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-print.css	2010年10月20日 16:36:22 UTC (rev 7717)
+++ trunk/themes/fusionforge/fusionforge-print.css	2010年10月22日 08:26:31 UTC (rev 7718)
@@ -51,6 +51,9 @@
 /* Do not print main wiki browse banner */
 .browsebanner { display: none; }
 
+/* Do not print rateit widget */
+#rateit-widget-top { display: none; }
+
 /* Do not print date of last edition */
 .editdate { display: none; }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7717
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7717&view=rev
Author: vargenau
Date: 2010年10月20日 16:36:22 +0000 (2010年10月20日)
Log Message:
-----------
Allow {{ image.png}} (space before image name)
Modified Paths:
--------------
 trunk/lib/InlineParser.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2010年10月20日 16:19:40 UTC (rev 7716)
+++ trunk/lib/InlineParser.php	2010年10月20日 16:36:22 UTC (rev 7717)
@@ -2,7 +2,7 @@
 // rcs_id('$Id$');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
 * Copyright (C) 2004-2010 Reini Urban
- * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
 *
 * This file is part of PhpWiki.
 *
@@ -1021,6 +1021,7 @@
 function markup ($match) {
 
 $page = substr($match,2,-2);
+ $page = trim($page);
 
 // Check for predefined icons.
 $predefinedicons = array(":)" => "ic_smile.png",
@@ -1046,7 +1047,7 @@
 "(*y)" => "ic_yellowstar.png",
 );
 foreach ($predefinedicons as $ascii => $icon) {
- if (trim($page) == $ascii) {
+ if ($page == $ascii) {
 return LinkImage(DATA_PATH . "/themes/default/images/$icon", $page);
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7716
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7716&view=rev
Author: vargenau
Date: 2010年10月20日 16:19:40 +0000 (2010年10月20日)
Log Message:
-----------
Check file exists
Modified Paths:
--------------
 trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2010年10月14日 15:49:22 UTC (rev 7715)
+++ trunk/lib/stdlib.php	2010年10月20日 16:19:40 UTC (rev 7716)
@@ -649,9 +649,9 @@
 }
 $type = $img->getAttr('type');
 if (!$type) {
- // TODO: map extension to mime-types if type is not given and php < 4.3
- if (function_exists('mime_content_type'))
+ if (function_exists('mime_content_type') && file_exists($url)) {
 $type = mime_content_type($url);
+ }
 }
 $object = HTML::object(array_merge($img->_attr,
 array('type' => $type)), //'src' => $url
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7715
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7715&view=rev
Author: vargenau
Date: 2010年10月14日 15:49:22 +0000 (2010年10月14日)
Log Message:
-----------
Remove &
Modified Paths:
--------------
 trunk/lib/WikiUser/FusionForge.php
Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2010年10月11日 14:12:14 UTC (rev 7714)
+++ trunk/lib/WikiUser/FusionForge.php	2010年10月14日 15:49:22 UTC (rev 7715)
@@ -52,7 +52,7 @@
 if (session_loggedin()){
 
 // Get project object (if error => ANON)
- $project =& group_get_object($group_id);
+ $project = group_get_object($group_id);
 
 if (!$project || !is_object($project)) {
 $this->_level = WIKIAUTH_ANON;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7714
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7714&view=rev
Author: vargenau
Date: 2010年10月11日 14:12:14 +0000 (2010年10月11日)
Log Message:
-----------
Update path for Fusionforge
Modified Paths:
--------------
 trunk/themes/fusionforge/wikilens-min.js
 trunk/themes/fusionforge/wikilens.js
Modified: trunk/themes/fusionforge/wikilens-min.js
===================================================================
--- trunk/themes/fusionforge/wikilens-min.js	2010年10月08日 13:56:07 UTC (rev 7713)
+++ trunk/themes/fusionforge/wikilens-min.js	2010年10月11日 14:12:14 UTC (rev 7714)
@@ -1 +1 @@
-var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var canRate=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/plugins/wiki/themes/fusionforge/images/RateIt";var rateit_action="RateIt";var idTop="";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(canRate[a]){if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function displayRating2(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(k<=n){if(g<=(k*2)){e="Rp"}else{if(g<=(n*2)){e="R"}}}else{if(g<=(n*2)){e="Rp"}else{if(g<=(k*2)){e="Rm"}}}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating2(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j&&idTop==a){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating2(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a};
\ No newline at end of file
+var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var canRate=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/wiki/themes/fusionforge/images/RateIt";var rateit_action="RateIt";var idTop="";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(canRate[a]){if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function displayRating2(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(k<=n){if(g<=(k*2)){e="Rp"}else{if(g<=(n*2)){e="R"}}}else{if(g<=(n*2)){e="Rp"}else{if(g<=(k*2)){e="Rm"}}}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating2(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j&&idTop==a){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating2(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a};
\ No newline at end of file
Modified: trunk/themes/fusionforge/wikilens.js
===================================================================
--- trunk/themes/fusionforge/wikilens.js	2010年10月08日 13:56:07 UTC (rev 7713)
+++ trunk/themes/fusionforge/wikilens.js	2010年10月11日 14:12:14 UTC (rev 7714)
@@ -23,7 +23,7 @@
 var msg_rating_deleted = "Rating deleted!";
 
 //var rateit_imgsrc = '/phpwiki-cvs/themes/MonoBook/images/RateIt';
-var rateit_imgsrc = '/plugins/wiki/themes/fusionforge/images/RateIt';
+var rateit_imgsrc = '/wiki/themes/fusionforge/images/RateIt';
 var rateit_action = 'RateIt';
 var idTop = '';
 //
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7713
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7713&view=rev
Author: vargenau
Date: 2010年10月08日 13:56:07 +0000 (2010年10月08日)
Log Message:
-----------
Fix directory in Fusionforge
Modified Paths:
--------------
 trunk/wikiadmin.php
Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php	2010年10月08日 13:55:13 UTC (rev 7712)
+++ trunk/wikiadmin.php	2010年10月08日 13:56:07 UTC (rev 7713)
@@ -137,7 +137,7 @@
 print "<td>\n";
 print "<fieldset>\n";
 print "<legend>"._('Wiki Configuration')."</legend>\n";
- print "<form action=\"/plugins/wiki/wikiadmin.php\" method=\"post\">\n";
+ print "<form action=\"/wiki/wikiadmin.php\" method=\"post\">\n";
 print "<input type=\"hidden\" name=\"id\" value=\"$id\" />\n";
 print "<input type=\"hidden\" name=\"pluginname\" value=\"$pluginname\" />\n";
 print "<input type=\"hidden\" name=\"type\" value=\"admin_post\" />\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7712
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7712&view=rev
Author: vargenau
Date: 2010年10月08日 13:55:13 +0000 (2010年10月08日)
Log Message:
-----------
"gforge" dir renamed as "src" in Fusionforge
Modified Paths:
--------------
 trunk/doc/phpwiki.doxygen
Modified: trunk/doc/phpwiki.doxygen
===================================================================
--- trunk/doc/phpwiki.doxygen	2010年10月05日 16:08:35 UTC (rev 7711)
+++ trunk/doc/phpwiki.doxygen	2010年10月08日 13:55:13 UTC (rev 7712)
@@ -574,7 +574,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT = gforge/plugins/wiki/www/lib
+INPUT = src/plugins/wiki/www/lib
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7711
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7711&view=rev
Author: vargenau
Date: 2010年10月05日 16:08:35 +0000 (2010年10月05日)
Log Message:
-----------
Fix parsing problem: paragraph consisting only og "{{w.png}}{{w.png}}"
Modified Paths:
--------------
 trunk/lib/BlockParser.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2010年10月01日 11:45:58 UTC (rev 7710)
+++ trunk/lib/BlockParser.php	2010年10月05日 16:08:35 UTC (rev 7711)
@@ -1131,6 +1131,10 @@
 var $_re = '{{';
 
 function _match (&$input, $m) {
+ // If we find "}}", this is an inline template.
+ if (strpos($m->postmatch, "}}") !== false) {
+ return false;
+ }
 $pos = $input->getPos();
 $pi = $m->postmatch;
 if ($pi[0] == '{') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7710
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7710&view=rev
Author: vargenau
Date: 2010年10月01日 11:45:58 +0000 (2010年10月01日)
Log Message:
-----------
Set width to 100% for pagers
Modified Paths:
--------------
 trunk/lib/PageList.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2010年09月30日 15:48:54 UTC (rev 7709)
+++ trunk/lib/PageList.php	2010年10月01日 11:45:58 UTC (rev 7710)
@@ -195,7 +195,7 @@
 return $page_handle->get($this->_field);
 }
 }
- 
+
 function _getSortableValue ($page_handle, &$revision_handle) {
 $val = $this->_getValue($page_handle, $revision_handle);
 if ($this->_field == 'hits')
@@ -226,7 +226,7 @@
 $this->_getValue($pagelist, $page_handle, $revision_handle),
 HTML::raw(' '));
 }
- 
+
 function _getValue (&$pagelist, $page_handle, &$revision_handle) {
 if (!$revision_handle or (!$revision_handle->_data['%content']
 or $revision_handle->_data['%content'] === true)) {
@@ -239,7 +239,7 @@
 unset($revision_handle->_data['%content']);
 return $size;
 }
- 
+
 function _getSortableValue ($page_handle, &$revision_handle) {
 if (!$revision_handle)
 $revision_handle = $page_handle->getCurrentRevision(true);
@@ -358,7 +358,7 @@
 '»'.$this->search.'«');
 }
 }
- 
+
 function _getValue ($page_handle, &$revision_handle) {
 if (!$revision_handle or (!$revision_handle->_data['%content']
 or $revision_handle->_data['%content'] === true)) {
@@ -452,7 +452,7 @@
 else
 return $author;
 }
- 
+
 function _getSortableValue ($page_handle, &$revision_handle) {
 return _PageList_Column::_getValue($page_handle, $revision_handle);
 }
@@ -714,11 +714,11 @@
 'external' => null,
 );
 }
- 
+
 function pagingArgs() {
 return array('sortby','limit','paging','count','dosort');
 }
- 
+
 function clearArg($arg_name) {
 if (isset($this->_options[$arg_name]))
 unset($this->_options[$arg_name]);
@@ -804,7 +804,7 @@
 or (!empty($this->_excluded_pages)
 and in_array($page_handle->getName(), $this->_excluded_pages)))
 return; // exclude page.
- 
+
 // enforce view permission
 if (!mayAccessPage('view', $page_handle->getName()))
 return;
@@ -927,7 +927,7 @@
 function asXML() {
 return AsXML($this->getContent());
 }
- 
+
 /**
 * Handle sortby requests for the DB iterator and table header links.
 * Prefix the column with + or - like "+pagename","-mtime", ...
@@ -936,7 +936,7 @@
 * 'init' : unify with predefined order. "pagename" => "+pagename"
 * 'flip_order' : "mtime" => "+mtime" => "-mtime" ...
 * 'db' : "-pagename" => "pagename DESC"
- * 'check' : 
+ * 'check' :
 *
 * Now all columns are sortable. (patch by DanFr)
 * Some columns have native DB backend methods, some not.
@@ -1454,11 +1454,11 @@
 }
 return $tokens;
 }
- 
+
 // make a table given the caption
 function _generateTable($caption) {
 if (count($this->_sortby) > 0) $this->_sortPages();
- 
+
 // wikiadminutils hack. that's a way to pagelist non-pages
 $rows = isset($this->_rows) ? $this->_rows : array();
 $i = 0;
@@ -1582,7 +1582,7 @@
 $this->_options['limit']);
 if ($tokens) {
 $paging = Template("pagelink", $tokens);
- $out->pushContent(HTML::table(array('width'=>'50%'), $paging));
+ $out->pushContent(HTML::table(array('width'=>'100%'), $paging));
 }
 }
 
@@ -1614,7 +1614,7 @@
 $cols));
 return $out;
 }
- 
+
 // Ignore azhead if not sorted by pagename
 if (!empty($this->_options['azhead'])
 and strstr($this->sortby($this->_options['sortby'], 'init'), "pagename")
@@ -1693,7 +1693,7 @@
 }
 $out->pushContent($list);
 if ( $do_paging and $tokens ) {
- $out->pushContent(HTML::table($paging));
+ $out->pushContent(HTML::table(array('width'=>'100%'), $paging));
 }
 return $out;
 }
@@ -1734,7 +1734,7 @@
 }
 return $html;
 }
- 
+
 function _emptyList($caption) {
 $html = HTML();
 if ($caption) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.