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

[phpwiki-checkins] SF.net SVN: phpwiki:[8589] trunk/lib/InlineParser.php

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

Revision: 8589
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8589&view=rev
Author:   vargenau
Date:     2012-12-03 12:43:20 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Add "@" to avoid warning with "{{(*y)}}"

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2012-12-03 12:41:21 UTC (rev 8588)
+++ trunk/lib/InlineParser.php	2012-12-03 12:43:20 UTC (rev 8589)
@@ -1392,10 +1392,13 @@
 
     function _parse_markup_body($markup, $match, &$text, $end_regexps)
     {
-        if (isa($markup, 'SimpleMarkup'))
+        if (isa($markup, 'SimpleMarkup')) {
             return true; // Done. SimpleMarkup is simple.
+        }
 
-        if (!is_object($markup)) return false; // Some error: Should assert
+        if (!is_object($markup)) {
+           return false; // Some error: Should assert
+        }
         array_unshift($end_regexps, $markup->getEndRegexp($match));
 
         // Optimization: if no end pattern in text, we know the
@@ -1403,8 +1406,9 @@
         // e.g. when text is "*lots *of *start *delims *with
         // *no *matching *end *delims".
         $ends_pat = "/(?:" . join(").*(?:", $end_regexps) . ")/xs";
-        if (!preg_match($ends_pat, $text))
+        if (!@preg_match($ends_pat, $text)) { // Add "@" to avoid warning with "{{(*y)}}"
             return false;
+        }
         return $this->parse($text, $end_regexps);
     }
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8588] trunk/themes/Sidebar/sidebar.css

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

Revision: 8588
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8588&view=rev
Author:   vargenau
Date:     2012-12-03 12:41:21 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Optimize padding

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012-12-03 12:40:36 UTC (rev 8587)
+++ trunk/themes/Sidebar/sidebar.css	2012-12-03 12:41:21 UTC (rev 8588)
@@ -754,10 +754,6 @@
     border-left: 1px solid #494f5d;
     border-bottom: 1px solid #c6d2de;
     border-right: 1px solid #c6d2de;
-    padding-top: 1px;
-    padding-bottom: 1px;
-    padding-left: .125em;
-    padding-right: .125em;
     padding: 0;
     clear: both;
 }

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

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

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

Revision: 8587
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8587&view=rev
Author:   vargenau
Date:     2012-12-03 12:40:36 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
ini_set('pcre.backtrack_limit', 100000000);

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

Modified: trunk/g
===================================================================
--- trunk/g	2012-12-03 12:36:57 UTC (rev 8586)
+++ trunk/g	2012-12-03 12:40:36 UTC (rev 8587)
@@ -42,6 +42,7 @@
  */
 
 ini_set("memory_limit", "256M");
+ini_set('pcre.backtrack_limit', 100000000);
 
 // Disable compression, seems needed to get all the messages.
 $no_gz_buffer=true;

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

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

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

Revision: 8586
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8586&view=rev
Author:   vargenau
Date:     2012-12-03 12:36:57 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Add arguments

Modified Paths:
--------------
    trunk/pgsrc/Help%2FBlogJournalPlugin
    trunk/pgsrc/Help%2FPageTrailPlugin

Modified: trunk/pgsrc/Help%2FBlogJournalPlugin
===================================================================
--- trunk/pgsrc/Help%2FBlogJournalPlugin	2012-11-30 16:43:12 UTC (rev 8585)
+++ trunk/pgsrc/Help%2FBlogJournalPlugin	2012-12-03 12:36:57 UTC (rev 8586)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Apr 2012 18:14:27 +0000
+Date: Mon,  3 Dec 2012 13:36:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FBlogJournalPlugin;
@@ -12,7 +12,7 @@
 == Usage ==
 
 {{{
-<<BlogJournal>>
+<<BlogJournal arguments>>
 }}}
 
 == Arguments ==

Modified: trunk/pgsrc/Help%2FPageTrailPlugin
===================================================================
--- trunk/pgsrc/Help%2FPageTrailPlugin	2012-11-30 16:43:12 UTC (rev 8585)
+++ trunk/pgsrc/Help%2FPageTrailPlugin	2012-12-03 12:36:57 UTC (rev 8586)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 14:51:45 +0000
+Date: Mon,  3 Dec 2012 13:36:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageTrailPlugin;
@@ -14,7 +14,7 @@
 Typically add to some template at the top or at the bottom. See themes/blog.
 
 {{{
-<<PageTrail>>
+<<PageTrail arguments>>
 <<PageTrail numberlinks=5>>
 <<PageTrail invisible=1>>
 }}}

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

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

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

Revision: 8585
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8585&view=rev
Author:   vargenau
Date:     2012-11-30 16:43:12 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
relation does exist

Modified Paths:
--------------
    trunk/themes/MonoBook/main.css
    trunk/themes/Sidebar/sidebar.css
    trunk/themes/default/phpwiki.css

Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css	2012-11-30 16:31:16 UTC (rev 8584)
+++ trunk/themes/MonoBook/main.css	2012-11-30 16:43:12 UTC (rev 8585)
@@ -2029,18 +2029,6 @@
     /* font-weight: bold; */
 }
 
-.wiki relation, .named-wiki relation, .wiki attribute, .named-wiki attribute {
-    font-style: oblique;
-    /* font-weight: normal; */
-    font-weight: bold;
-}
-
-span.relation-symbol {
-    font-weight: bold;
-    font-family: monospace;
-    letter-spacing: 0.1em;
-}
-
 /* Action buttons */
 a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe,
 input.wikiaction, input.button, input.wikiadmin {

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012-11-30 16:31:16 UTC (rev 8584)
+++ trunk/themes/Sidebar/sidebar.css	2012-11-30 16:43:12 UTC (rev 8585)
@@ -2070,17 +2070,6 @@
     font-weight: normal;
 }
 
-.wiki relation, .named-wiki relation, .wiki attribute, .named-wiki attribute {
-    font-style: oblique;
-    font-weight: bold;
-}
-
-span.relation-symbol {
-    font-weight: bold;
-    font-family: monospace;
-    letter-spacing: 0.1em;
-}
-
 /* Action buttons */
 a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe,
 input.wikiaction, input.button, input.wikiadmin {

Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css	2012-11-30 16:31:16 UTC (rev 8584)
+++ trunk/themes/default/phpwiki.css	2012-11-30 16:43:12 UTC (rev 8585)
@@ -178,26 +178,12 @@
     font-weight: bold;
 }
 
-.wiki relation, .named-wiki relation, .wiki attribute, .named-wiki attribute {
-    font-style: oblique;
-    /* font-weight: normal; */
-    font-weight: bold;
-}
-
-span.relation-symbol {
-    font-weight: bold;
-    font-family: monospace;
-    letter-spacing: 0.1em;
-}
-
 /* Action buttons */
 a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe,
 input.wikiaction, input.button, input.wikiadmin {
     text-decoration: none;
     font-family: Arial, Helvetica, sans-serif;
-    /* don't wrap text buttons */
     white-space: nowrap;
-    /* font-size: inherit; */
 }
 
 a.wikiaction, a.wikiaction:visited, input.wikiaction, input.button {

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

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

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

Revision: 8584
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8584&view=rev
Author:   vargenau
Date:     2012-11-30 16:31:16 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Allow EditMetaData plugin

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012-11-30 16:28:33 UTC (rev 8583)
+++ trunk/lib/IniConfig.php	2012-11-30 16:31:16 UTC (rev 8584)
@@ -639,11 +639,11 @@
         // Add some some action pages depending on configuration
         if (DEBUG) {
             $ActionPages[] = 'DebugInfo';
-            $ActionPages[] = 'EditMetaData';
             $ActionPages[] = 'SpellCheck'; // SpellCheck does not work
         }
         $ActionPages[] = 'BlogArchives';
         $ActionPages[] = 'BlogJournal';
+        $ActionPages[] = 'EditMetaData';
         $ActionPages[] = 'InterWikiSearch';
         $ActionPages[] = 'LdapSearch';
         $ActionPages[] = 'PasswordReset';

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

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

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

Revision: 8583
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8583&view=rev
Author:   vargenau
Date:     2012-11-30 16:28:33 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Allow AddCommentPlugin in Fusionforge

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012-11-30 16:18:50 UTC (rev 8582)
+++ trunk/lib/IniConfig.php	2012-11-30 16:28:33 UTC (rev 8583)
@@ -656,6 +656,7 @@
     global $AllAllowedPlugins;
     $AllAllowedPlugins = $ActionPages;
     // Add plugins that have no corresponding action page
+    $AllAllowedPlugins[] = 'AddComment';
     $AllAllowedPlugins[] = 'AsciiMath';
     $AllAllowedPlugins[] = 'AsciiSVG';
     $AllAllowedPlugins[] = 'AtomFeed';
@@ -726,7 +727,6 @@
 
     // The FUSIONFORGE theme omits them
     if (!FUSIONFORGE) {
-        $AllAllowedPlugins[] = 'AddComment';
         $AllAllowedPlugins[] = 'AnalyseAccessLogSql';
         $AllAllowedPlugins[] = '_AuthInfo';
         $AllAllowedPlugins[] = '_BackendInfo';

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8582] trunk/themes/Sidebar/sidebar.css

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

Revision: 8582
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8582&view=rev
Author:   vargenau
Date:     2012-11-30 16:18:50 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Do not change color for QuestionMark

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012-11-30 16:00:13 UTC (rev 8581)
+++ trunk/themes/Sidebar/sidebar.css	2012-11-30 16:18:50 UTC (rev 8582)
@@ -1196,7 +1196,7 @@
     cursor: pointer;
     width: 64px;
     padding-left: 1px;
-    background-color: White;
+    background-color: white;
     border: 1px solid #2f6fab;
     text-transform: capitalize;
 }
@@ -2068,12 +2068,10 @@
 .wiki, .named-wiki {
     text-decoration: none;
     font-weight: normal;
-    /* font-weight: bold; */
 }
 
 .wiki relation, .named-wiki relation, .wiki attribute, .named-wiki attribute {
     font-style: oblique;
-    /* font-weight: normal; */
     font-weight: bold;
 }
 
@@ -2104,8 +2102,6 @@
 
 /* QuestionMark #600 */
 .wikiunknown a, .named-wikiunknown a {
-    color: #447;
-    background-color: #eee;
     text-decoration: none;
     font-weight: normal;
     font-size: smaller;
@@ -2122,7 +2118,6 @@
 }
 
 /* Interwiki links */
-/* .wikipage  { font-weight: bold; } */
 .wikipage {
     font-weight: normal;
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8581] trunk/themes/Sidebar/sidebar.css

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

Revision: 8581
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8581&view=rev
Author:   vargenau
Date:     2012-11-30 16:00:13 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
No bold for a:hover

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012-11-30 15:33:41 UTC (rev 8580)
+++ trunk/themes/Sidebar/sidebar.css	2012-11-30 16:00:13 UTC (rev 8581)
@@ -1081,7 +1081,6 @@
 #p-logo a:hover {
     display: block;
     height: 42px;
-    /*width: 12.2em;*/
     background-repeat: no-repeat;
     background-position: 35% 50% !important;
 }
@@ -1141,7 +1140,6 @@
 #p-navigation li.active a, #p-navigation li.active a:hover {
     text-decoration: none;
     display: inline;
-    font-weight: bold;
 }
 
 /*
@@ -1283,7 +1281,6 @@
     color: white;
     background-color: #005A99;
     padding-bottom: 0.2em;
-    font-weight: bold;
     text-decoration: none;
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8580] trunk/lib/plugin/SyntaxHighlighter.php

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

Revision: 8580
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8580&view=rev
Author:   vargenau
Date:     2012-11-30 15:33:41 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Better error message

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

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2012-11-30 15:31:50 UTC (rev 8579)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2012-11-30 15:33:41 UTC (rev 8580)
@@ -116,7 +116,8 @@
             return $this->error(sprintf(_("A required argument '%s' is missing."), 'syntax'));
         }
         if (empty($source)) {
-            return $this->error(fmt("empty source"));
+            return HTML::div(array('class' => "error"),
+                   "Please provide source code to SyntaxHighlighter plugin");
         }
         $args = "";
         if (defined('HIGHLIGHT_DATA_DIR')) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8579] trunk/lib/plugin/SearchHighlight.php

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

Revision: 8579
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8579&view=rev
Author:   vargenau
Date:     2012-11-30 15:31:50 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Avoid warning

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

Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php	2012-11-30 15:16:08 UTC (rev 8578)
+++ trunk/lib/plugin/SearchHighlight.php	2012-11-30 15:31:50 UTC (rev 8579)
@@ -62,8 +62,9 @@
         if (empty($args['s']) and isset($request->_searchhighlight)) {
             $args['s'] = $request->_searchhighlight['query'];
         }
-        if (empty($args['s']))
-            return '';
+        if (empty($args['s'])) {
+            return HTML();
+        }
         extract($args);
         $html = HTML();
         if (!$noheader and isset($request->_searchhighlight)) {

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

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

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

Revision: 8578
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8578&view=rev
Author:   vargenau
Date:     2012-11-30 15:16:08 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Better use method

Modified Paths:
--------------
    trunk/lib/plugin/NewPagesPerUser.php
    trunk/lib/plugin/PopularTags.php

Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php	2012-11-30 14:49:10 UTC (rev 8577)
+++ trunk/lib/plugin/NewPagesPerUser.php	2012-11-30 15:16:08 UTC (rev 8578)
@@ -31,6 +31,12 @@
 class WikiPlugin_NewPagesPerUser
     extends WikiPlugin
 {
+    private function cmp_by_count($a, $b)
+    {
+        if ($a['count'] == $b['count']) return 0;
+        return $a['count'] < $b['count'] ? 1 : -1;
+    }
+
     function getName()
     {
         return _("NewPagesPerUser");
@@ -101,7 +107,7 @@
         foreach ($pages as $monthname => $parr) {
             $html->pushContent(HTML::tr(HTML::td(array('colspan' => 2),
                 HTML::strong($parr['month']))));
-            uasort($parr['author'], 'cmp_by_count');
+            uasort($parr['author'], array($this, 'cmp_by_count'));
             foreach ($parr['author'] as $user => $authorarr) {
                 $count = $authorarr['count'];
                 $id = preg_replace("/ /", "_", 'pages-' . $monthname . '-' . $user);
@@ -136,12 +142,6 @@
     }
 }
 
-function cmp_by_count($a, $b)
-{
-    if ($a['count'] == $b['count']) return 0;
-    return $a['count'] < $b['count'] ? 1 : -1;
-}
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/PopularTags.php
===================================================================
--- trunk/lib/plugin/PopularTags.php	2012-11-30 14:49:10 UTC (rev 8577)
+++ trunk/lib/plugin/PopularTags.php	2012-11-30 15:16:08 UTC (rev 8578)
@@ -21,7 +21,7 @@
  */
 
 /* Usage:
- *   <<PopularTags >>
+ *   <<PopularTags>>
  */
 
 require_once 'lib/PageList.php';
@@ -29,6 +29,13 @@
 class WikiPlugin_PopularTags
     extends WikiPlugin
 {
+    // get list of categories sorted by number of backlinks
+    private function cmp_by_count($a, $b)
+    {
+        if ($a['count'] == $b['count']) return 0;
+        return $a['count'] < $b['count'] ? 1 : -1;
+    }
+
     function getName()
     {
         return _("PopularTags");
@@ -64,7 +71,7 @@
                 'count' => $pages->count());
         }
 
-        usort($bl, 'cmp_by_count');
+        usort($bl, array($this, 'cmp_by_count'));
         $html = HTML::ul();
         $i = 0;
         foreach ($bl as $b) {
@@ -83,13 +90,6 @@
     }
 }
 
-// get list of categories sorted by number of backlinks
-function cmp_by_count($a, $b)
-{
-    if ($a['count'] == $b['count']) return 0;
-    return $a['count'] < $b['count'] ? 1 : -1;
-}
-
 // 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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8577] trunk

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

Revision: 8577
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8577&view=rev
Author:   vargenau
Date:     2012-11-30 14:49:10 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
GRAPHVIZ_EXE /usr/bin/dot

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/plugin/GraphViz.php

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/config/config-default.ini	2012-11-30 14:49:10 UTC (rev 8577)
@@ -182,7 +182,7 @@
 ; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
 EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --webpage --format pdf14"
 BABYCART_PATH = /usr/local/bin/babycart
-; GRAPHVIZ_EXE = /usr/local/bin/dot
+; GRAPHVIZ_EXE = /usr/bin/dot
 
 PLUGIN_CACHED_DATABASE = file
 ; PLUGIN_CACHED_CACHE_DIR = /tmp/cache

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/config/config-dist.ini	2012-11-30 14:49:10 UTC (rev 8577)
@@ -1274,7 +1274,7 @@
 
 ; GraphViz plugin executable:
 ; http://www.graphviz.org/
-;GRAPHVIZ_EXE = /usr/local/bin/dot
+;GRAPHVIZ_EXE = /usr/bin/dot
 
 ; Default GD2 truetype font. For text2png, GraphViz, VisualWiki
 ; You might need the full path to the .ttf file

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/configurator.php	2012-11-30 14:49:10 UTC (rev 8577)
@@ -1644,7 +1644,7 @@
 $properties["RATEIT_IMGPREFIX"] =
     new _define_commented_optional('RATEIT_IMGPREFIX'); //BStar
 $properties["GRAPHVIZ_EXE"] =
-    new _define_commented_optional('GRAPHVIZ_EXE'); // /usr/local/bin/dot
+    new _define_commented_optional('GRAPHVIZ_EXE', "/usr/bin/dot");
 
 if (PHP_OS == "Darwin") // Mac OS X
     $ttfont = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/lib/plugin/GraphViz.php	2012-11-30 14:49:10 UTC (rev 8577)
@@ -56,7 +56,7 @@
         define('VISUALWIKIFONT', 'luximr');
 } else { // other os
     if (!defined("GRAPHVIZ_EXE"))
-        define('GRAPHVIZ_EXE', '/usr/local/bin/dot');
+        define('GRAPHVIZ_EXE', '/usr/bin/dot');
     // Name of the Truetypefont - Helvetica is probably easier to read
     if (!defined('VISUALWIKIFONT'))
         define('VISUALWIKIFONT', 'Helvetica');

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8576] trunk/themes/fusionforge/fusionforge.css

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

Revision: 8576
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8576&view=rev
Author:   vargenau
Date:     2012-11-29 17:42:12 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
white-space: nowrap for caption

Modified Paths:
--------------
    trunk/themes/fusionforge/fusionforge.css

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2012-11-29 17:41:30 UTC (rev 8575)
+++ trunk/themes/fusionforge/fusionforge.css	2012-11-29 17:42:12 UTC (rev 8576)
@@ -150,6 +150,7 @@
     caption-side: top;
     text-align: left;
     margin-bottom: .5ex;
+    white-space: nowrap;
 }
 
 /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8575] trunk/lib/plugin/FuzzyPages.php

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

Revision: 8575
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8575&view=rev
Author:   vargenau
Date:     2012-11-29 17:41:30 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Use CSS

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

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2012-11-29 17:40:59 UTC (rev 8574)
+++ trunk/lib/plugin/FuzzyPages.php	2012-11-29 17:41:30 UTC (rev 8575)
@@ -103,13 +103,12 @@
         else
             $link = $this->_searchterm;
         $caption = fmt("These page titles match fuzzy with '%s'", $link);
-        $table->pushContent(HTML::caption(array('align' => 'top'), $caption));
+        $table->pushContent(HTML::caption($caption));
     }
 
     function addTableHead(&$table)
     {
-        $row = HTML::tr(HTML::th(_("Name")),
-            HTML::th(array('align' => 'right'), _("Score")));
+        $row = HTML::tr(HTML::th(_("Name")), HTML::th(_("Score")));
 
         if (defined('DEBUG') && DEBUG && $this->debug) {
             $this->_pushDebugHeadingTDinto($row);
@@ -129,7 +128,7 @@
                 $score > HIGHLIGHT_ROWS_CUTOFF_SCORE
                     ? 'evenrow' : 'oddrow'),
                 HTML::td(WikiLink($found_pagename)),
-                HTML::td(array('align' => 'right'),
+                HTML::td(array('class' => 'align-right'),
                     round($score)));
 
             if (defined('DEBUG') && DEBUG && $this->debug) {
@@ -147,10 +146,7 @@
         if (empty($list)) {
             return HTML::p(fmt("No fuzzy matches with '%s'", $this->_searchterm));
         }
-        $table = HTML::table(array('cellpadding' => 2,
-            'cellspacing' => 1,
-            'border' => 0,
-            'class' => 'pagelist'));
+        $table = HTML::table(array('class' => 'pagelist'));
         $this->addTableCaption($table, $dbi);
         $this->addTableHead($table);
         $this->addTableBody($list, $table);
@@ -193,8 +189,8 @@
         $debug_metaphone = sprintf("(%s, %s)", metaphone($pagename),
             $this->_searchterm_metaphone);
 
-        $row->pushcontent(HTML::td(array('align' => 'center'), $debug_spelling),
-            HTML::td(array('align' => 'center'), $debug_sound),
+        $row->pushcontent(HTML::td(array('class' => 'align-center'), $debug_spelling),
+            HTML::td(array('class' => 'align-center'), $debug_sound),
             HTML::td($debug_metaphone));
     }
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8574] trunk/lib/plugin/NewPagesPerUser.php

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

Revision: 8574
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8574&view=rev
Author:   vargenau
Date:     2012-11-29 17:40:59 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Add function cmp_by_count

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

Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php	2012-11-29 14:59:43 UTC (rev 8573)
+++ trunk/lib/plugin/NewPagesPerUser.php	2012-11-29 17:40:59 UTC (rev 8574)
@@ -136,6 +136,12 @@
     }
 }
 
+function cmp_by_count($a, $b)
+{
+    if ($a['count'] == $b['count']) return 0;
+    return $a['count'] < $b['count'] ? 1 : -1;
+}
+
 // 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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8573] trunk/lib/plugin/WikiAdminSearchReplace.php

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

Revision: 8573
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8573&view=rev
Author:   vargenau
Date:     2012-11-29 14:59:43 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Avoid warning about "hi_content"

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

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2012-11-29 09:52:29 UTC (rev 8572)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2012-11-29 14:59:43 UTC (rev 8573)
@@ -172,7 +172,9 @@
         if ($next_action == 'verify') {
             $args['info'] = "checkbox,pagename";
         } else {
-            $args['info'] = "checkbox,pagename,hi_content,mtime,author";
+            // Avoid warning about "hi_content"
+            // $args['info'] = "checkbox,pagename,hi_content,mtime,author";
+            $args['info'] = "checkbox,pagename,mtime,author";
         }
         $pagelist = new PageList_Selectable
         ($args['info'], $args['exclude'],

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8572] trunk/lib/plugin/VisualWiki.php

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

Revision: 8572
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8572&view=rev
Author:   vargenau
Date:     2012-11-29 09:52:29 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Remove information put in Help%2FVisualWikiPlugin

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

Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2012-11-29 09:51:26 UTC (rev 8571)
+++ trunk/lib/plugin/VisualWiki.php	2012-11-29 09:52:29 UTC (rev 8572)
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2002 Johannes Große (Johannes Gro&szlig;e)
+ * Copyright (C) 2002 Johannes Große
  *
  * This file is part of PhpWiki.
  *
@@ -22,9 +22,6 @@
 
 /**
  * Produces graphical site map of PhpWiki
- * Example for an image map creating plugin. It produces a graphical
- * sitemap of PhpWiki by calling the <code>dot</code> commandline tool
- * from graphviz (http://www.graphviz.org).
  * @author Johannes Große
  * @version 0.9
  */
@@ -176,8 +173,6 @@
         /* => ($width, $height, $color, $shape, $text); */
     }
 
-    // ------------------------------------------------------------------------------------------
-
     /**
      * Returns an image containing a usage description of the plugin.
      * @return string image handle

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

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

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

Revision: 8571
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8571&view=rev
Author:   vargenau
Date:     2012-11-29 09:51:26 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Add arguments

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

Modified: trunk/pgsrc/Help%2FVisualWikiPlugin
===================================================================
--- trunk/pgsrc/Help%2FVisualWikiPlugin	2012-11-28 15:43:19 UTC (rev 8570)
+++ trunk/pgsrc/Help%2FVisualWikiPlugin	2012-11-29 09:51:26 UTC (rev 8571)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu, 29 Nov 2012 10:44:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FVisualWikiPlugin;
@@ -9,19 +9,93 @@
 
 The **~VisualWiki** [[Help:WikiPlugin|plugin]] produces a graphical site map of ~PhpWiki.
 
-It produces a graphical sitemap of ~PhpWiki by calling the <code>dot</code> commandline tool from Graphviz (http://www.graphviz.org).
+It produces a graphical sitemap of ~PhpWiki by calling the ##dot## commandline tool from Graphviz ([[http://www.graphviz.org]]).
 
 == Usage ==
 
 {{{
-<<VisualWiki>>
+<<VisualWiki arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+Arguments allowed only if VISUALWIKI_ALLOWOPTIONS is true.
 
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **imgtype**
+|
+| png
+|-
+| **width**
+|
+| false 
+|-
+| **height**
+|
+| false
+|-
+| **colorby**
+|
+| age
+|-
+| **fillnodes**
+|
+| off
+|-
+| **label**
+|
+| name
+|-
+| **shape**
+|
+| ellipse
+|-
+| **large_nb**
+|
+| 5
+|-
+| **recent_nb**
+|
+| 5
+|-
+| **refined_nb**
+|
+| 15
+|-
+| **backlink_nb**
+|
+| 5
+|-
+| **neighbour_list**
+|
+|
+|-
+| **exclude_list**
+|
+|
+|-
+| **include_list**
+|
+|
+|-
+| **fontsize**
+|
+| 9
+|-
+| **debug**
+|
+| false
+|-
+| **help**
+|
+| false
+|}
+
 == Example ==
 
 {{{
@@ -31,7 +105,7 @@
 <<VisualWiki>>
 
 == Author ==
-* Johannes Grosse
+* Johannes Große
 
 == See Also ==
 

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

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

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

Revision: 8570
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8570&view=rev
Author:   vargenau
Date:     2012-11-28 15:43:19 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
color=bright to be compatible between highlight version 2 and 3

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

Modified: trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
===================================================================
--- trunk/pgsrc/Help%2FSyntaxHighlighterPlugin	2012-11-28 11:04:40 UTC (rev 8569)
+++ trunk/pgsrc/Help%2FSyntaxHighlighterPlugin	2012-11-28 15:43:19 UTC (rev 8570)
@@ -1,4 +1,4 @@
-Date: Fri, 16 Dec 2011 12:51:22 +0000
+Date: Wed, 28 Nov 2012 16:42:00 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSyntaxHighlighterPlugin;
@@ -8,7 +8,7 @@
 Content-Transfer-Encoding: binary
 
 The **~SyntaxHighlighter** [[Help:WikiPlugin|plugin]] passes all its arguments through a C++
-highlighter called "highlight" (available at http://www.andre-simon.de/).
+highlighter called "highlight" (available at [[http://www.andre-simon.de]]).
 
 == Arguments ==
 
@@ -42,7 +42,7 @@
 == Example ==
 
 {{{
-<<SyntaxHighlighter syntax=c style=kr color=emacs
+<<SyntaxHighlighter syntax=c style=kr color=bright
  #include <stdio.h>
 
  int main() {
@@ -53,7 +53,7 @@
 
 will give:
 
-<<SyntaxHighlighter syntax=c style=kr color=emacs
+<<SyntaxHighlighter syntax=c style=kr color=bright
  #include <stdio.h>
 
  int main() {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8569] trunk/lib/plugin/PhpHighlight.php

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

Revision: 8569
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8569&view=rev
Author:   vargenau
Date:     2012-11-28 11:04:40 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Add error message: Please provide source code to PhpHighlight plugin

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

Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2012-11-28 10:48:55 UTC (rev 8568)
+++ trunk/lib/plugin/PhpHighlight.php	2012-11-28 11:04:40 UTC (rev 8569)
@@ -86,6 +86,10 @@
 
         extract($this->getArgs($argstr, $request));
         $source =& $this->source;
+        if (empty($source)) {
+            return HTML::div(array('class' => "error"),
+                   "Please provide source code to PhpHighlight plugin");
+        }
 
         $this->sanify_colors($string, $comment, $keyword, $bg, $default, $html);
         $this->set_colors($string, $comment, $keyword, $bg, $default, $html);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8568] trunk/lib/plugin/AsciiSVG.php

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

Revision: 8568
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8568&view=rev
Author:   vargenau
Date:     2012-11-28 10:48:55 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Add error message: Please provide SVG code to AsciiSVG plugin

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

Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php	2012-11-28 10:16:18 UTC (rev 8567)
+++ trunk/lib/plugin/AsciiSVG.php	2012-11-28 10:48:55 UTC (rev 8568)
@@ -56,8 +56,10 @@
     {
         global $WikiTheme;
         $args = $this->getArgs($argstr, $request);
-        if (empty($this->source))
-            return '';
+        if (empty($this->source)) {
+            return HTML::div(array('class' => "error"), 
+                   "Please provide SVG code to AsciiSVG plugin");
+        }
         $html = HTML();
         if (empty($WikiTheme->_asciiSVG)) {
             $js = JavaScript('', array

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8567] trunk/lib/plugin/SyntaxHighlighter.php

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

Revision: 8567
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8567&view=rev
Author:   vargenau
Date:     2012-11-28 10:16:18 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Reformat code

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

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2012-11-28 10:07:18 UTC (rev 8566)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2012-11-28 10:16:18 UTC (rev 8567)
@@ -115,39 +115,38 @@
         if (empty($syntax)) {
             return $this->error(sprintf(_("A required argument '%s' is missing."), 'syntax'));
         }
-        if (!empty($source)) {
-            $args = "";
-            if (defined('HIGHLIGHT_DATA_DIR')) {
-                $args .= " --data-dir " . HIGHLIGHT_DATA_DIR;
-            }
-            if ($number != 0) {
-                 $args .= " -l";
-            }
-            if ($wrap != 0) {
-                 $args .= " -V";
-            }
-            $html = HTML();
-            if (!empty($color) and !preg_match('/^[\w-]+$/', $color)) {
-                $html->pushContent($this->error(fmt("invalid %s ignored", 'color')));
-                $color = false;
-            }
-            if (!empty($color)) {
-                $args .= " --style $color --inline-css";
-            }
-            if (!empty($style)) {
-                $args .= " -F $style";
-            }
-            $commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax";
-            $code = $this->newFilterThroughCmd($source, $commandLine);
-            if (empty($code)) {
-                return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
-            }
-            $pre = HTML::pre(HTML::raw($code));
-            $html->pushContent($pre);
-            return HTML($html);
-        } else {
+        if (empty($source)) {
             return $this->error(fmt("empty source"));
         }
+        $args = "";
+        if (defined('HIGHLIGHT_DATA_DIR')) {
+            $args .= " --data-dir " . HIGHLIGHT_DATA_DIR;
+        }
+        if ($number != 0) {
+            $args .= " -l";
+        }
+        if ($wrap != 0) {
+            $args .= " -V";
+        }
+        $html = HTML();
+        if (!empty($color) and !preg_match('/^[\w-]+$/', $color)) {
+            $html->pushContent($this->error(fmt("invalid %s ignored", 'color')));
+            $color = false;
+        }
+        if (!empty($color)) {
+            $args .= " --style $color --inline-css";
+        }
+        if (!empty($style)) {
+            $args .= " -F $style";
+        }
+        $commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax";
+        $code = $this->newFilterThroughCmd($source, $commandLine);
+        if (empty($code)) {
+            return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
+        }
+        $pre = HTML::pre(HTML::raw($code));
+        $html->pushContent($pre);
+        return HTML($html);
     }
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8566] trunk/lib/plugin/SyntaxHighlighter.php

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

Revision: 8566
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8566&view=rev
Author:   vargenau
Date:     2012-11-28 10:07:18 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Always return something

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

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2012-11-28 10:01:17 UTC (rev 8565)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2012-11-28 10:07:18 UTC (rev 8566)
@@ -105,6 +105,7 @@
             }
             return $buf;
         }
+        return '';
     }
 
     function run($dbi, $argstr, &$request, $basepage)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8565] trunk/lib/plugin/SyntaxHighlighter.php

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

Revision: 8565
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8565&view=rev
Author:   vargenau
Date:     2012-11-28 10:01:17 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Unused return_value

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

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2012-11-28 09:55:05 UTC (rev 8564)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2012-11-28 10:01:17 UTC (rev 8565)
@@ -99,7 +99,7 @@
             fclose($pipes[2]);
             // It is important that you close any pipes before calling
             // proc_close in order to avoid a deadlock
-            $return_value = proc_close($process);
+            proc_close($process);
             if (empty($buf)) {
                 printXML($this->error($stderr));
             }

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