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

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

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

Revision: 7741
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7741&view=rev
Author:   vargenau
Date:     2010-11-23 18:18:50 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
Glue tabs; do not force white background

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

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2010-11-11 14:45:18 UTC (rev 7740)
+++ trunk/themes/fusionforge/fusionforge.css	2010-11-23 18:18:50 UTC (rev 7741)
@@ -49,9 +49,6 @@
 /* Hide the elements we put in just to get around NS4 bugs. */
 div.br { display: none; }
 
-/* This makes spacings in NS4 too big. */
-.toolbar, div.toolbar { margin: 0.5ex 0ex; }
-
 /* This breaks NS4, but is necessary for IE4. */
 div.wikitext { width: auto; }
 
@@ -118,11 +115,6 @@
 img.inlineimage { vertical-align: middle; }
 
 /**
- * Edit Page & View Source
- */
-/* color: inherit; and background: inherit; display as lime in NS4 */
-
-/**
  * Diff Output
  */
 .diff .prefix {
@@ -172,7 +164,6 @@
 div.wikitext {
   margin-top:    1ex;
   margin-bottom: 0.5ex;
-  background: white;
   padding-bottom: 1em;
   clear: both;
 }
@@ -938,7 +929,6 @@
 #content {
     margin: 0;
     padding: 1em 1em 1.5em 1em;
-    background: white;
     border: 1px solid #aaaaaa;
     line-height: 1.2em;
     position: relative;


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7740] trunk/lib/PageList.php

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

Revision: 7740
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7740&view=rev
Author:   rurban
Date:     2010-11-11 14:45:18 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
fix wrong explodePageList logic with *,*: union not intersection

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2010-11-10 16:51:32 UTC (rev 7739)
+++ trunk/lib/PageList.php	2010-11-11 14:45:18 UTC (rev 7740)
@@ -1040,7 +1040,7 @@
         // expand wildcards from list of all pages
         if (preg_match('/[\?\*]/', $input) or substr($input,0,1) == "^") {
             include_once("lib/TextSearchQuery.php");
-            $search = new TextSearchQuery(str_replace(",", " ", $input), true,
+            $search = new TextSearchQuery(str_replace(",", " or ", $input), true,
                                          (substr($input,0,1) == "^") ? 'posix' : 'glob');
             $dbi = $GLOBALS['request']->getDbh();
             $iter = $dbi->titleSearch($search, $sortby, $limit, $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:[7739] trunk/lib/loadsave.php

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

Revision: 7739
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7739&view=rev
Author:   vargenau
Date:     2010-11-10 16:51:32 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
Add <div> in Fusionforge theme to get valid XHTML

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2010-11-10 09:14:46 UTC (rev 7738)
+++ trunk/lib/loadsave.php	2010-11-10 16:51:32 UTC (rev 7739)
@@ -117,6 +117,7 @@
         echo "</div>\n";
         echo "</td></tr>\n";
         echo "</table>\n";
+        echo "</div>\n";
         echo "</td></tr>\n";
         echo "</table>\n";
     } else if (isa($WikiTheme, 'WikiTheme_Sidebar')


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

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

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

Revision: 7738
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7738&view=rev
Author:   rurban
Date:     2010-11-10 09:14:46 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
remove HTML from loadfile title, broke HTML

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2010-11-10 08:47:34 UTC (rev 7737)
+++ trunk/lib/loadsave.php	2010-11-10 09:14:46 UTC (rev 7738)
@@ -1475,11 +1475,8 @@
     $source = $request->getArg('source');
     $finder = new FileFinder;
     $source = $finder->slashifyPath($source);
-    $page = rawurldecode(basename($source));
-    StartLoadDump($request, fmt("Loading '%s'",
-    	HTML(dirname($source),
-             dirname($source) ? "/" : "",
-             WikiLink($page,'auto'))));
+    StartLoadDump($request, 
+    	sprintf(_("Loading '%s'"), $source));
     LoadAny($request, $source);
     EndLoadDump($request);
 }


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

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

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

Revision: 7737
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7737&view=rev
Author:   rurban
Date:     2010-11-10 08:47:34 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
support php-4.3.9, Red Hat Enterprise Linux ES release 4. We use that.

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

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2010-11-09 15:14:11 UTC (rev 7736)
+++ trunk/INSTALL	2010-11-10 08:47:34 UTC (rev 7737)
@@ -1,7 +1,8 @@
 REQUIREMENTS
 
-PhpWiki requires a web server with at least PHP version 4.3.10.
-PhpWiki was tested with 4.4.7 (centos4), 4.3.10, 4.4.9, 5.0.3,
+PhpWiki requires a web server with at least PHP version 4.3.9 
+(Red Hat Enterprise Linux ES release 4).
+PhpWiki was tested with 4.4.7 (centos4), 4.3.9, 4.3.10, 4.4.9, 5.0.3,
 5.1.6 (centos5), 5.2.10, 5.3.2, 5.3.3.
 
 All users of PHP are strongly encouraged to upgrade to PHP 5.2.14

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010-11-09 15:14:11 UTC (rev 7736)
+++ trunk/lib/main.php	2010-11-10 08:47:34 UTC (rev 7737)
@@ -1327,8 +1327,9 @@
 
 function main () {
 
-    if (version_compare(PHP_VERSION, '4.3.10', '<')) {
-        exit(_("Your PHP version is too old. You must have at least PHP 4.3.10"));
+    // latest supported: Red Hat Enterprise Linux ES release 4
+    if (version_compare(PHP_VERSION, '4.3.9', '<')) {
+        exit(_("Your PHP version is too old. You must have at least PHP 4.3.9"));
     }
 
     if ( !USE_DB_SESSION )


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

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

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

Revision: 7736
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7736&view=rev
Author:   vargenau
Date:     2010-11-09 15:14:11 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
new help page: Help%2FImages

Modified Paths:
--------------
    trunk/pgsrc/PhpWikiManual

Added Paths:
-----------
    trunk/pgsrc/Help%2FImages

Added: trunk/pgsrc/Help%2FImages
===================================================================
--- trunk/pgsrc/Help%2FImages	                        (rev 0)
+++ trunk/pgsrc/Help%2FImages	2010-11-09 15:14:11 UTC (rev 7736)
@@ -0,0 +1,106 @@
+Date: Tue,  9 Nov 2010 16:13:37 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+X-Rcs-Id: $Id: Help%2FRichTablePlugin 7682 2010-09-10 12:03:36Z vargenau $ 
+Content-Type: application/x-phpwiki;
+  pagename=Help%2FRichTablePlugin;
+  flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+You can easily **use images in the wiki**.
+
+== Uploaded images ==
+
+First, image files need to be uploaded in the wiki. For that purpose, you will use the 
+[[Help:UpLoadPlugin|UpLoad]] plugin.
+
+=== Toolbar ===
+
+Once the image is uploaded, the easiest way to insert it is to use the toolbar.
+
+Click on the {{/themes/default/images/ed_image.png}} icon and you will be shown a list
+of available images.
+
+Select an image and click //Insert//. The image will be inserted without options or alternative text.
+
+=== Syntax ===
+
+You give access to the uploaded image with the following syntax.
+
+{{{
+{{myimage.png}}
+}}}
+or
+{{{
+[[Upload:myimage.png]]
+}}}
+will inline the image.
+
+{{{
+{{myimage.png|this is the alt text for my image}}
+}}}
+inlines the image with an alternative text.
+
+{{{
+[[some link|{{myimage.png}}]] 
+}}}
+if you click on the image, will goto "some link"
+
+{{{
+[[some link|{{myimage.png|alt text}}]] 
+}}}
+same with alternative
+
+{{{
+[[http://example.com/|{{myimage.png}}]]
+}}}
+same as above: picture links to url
+
+{{{
+[[http://example.com/|{{myimage.png|alt text}}]]
+}}}
+same with alternative
+
+{{{
+Upload:myimage.png
+}}}
+shows a plain link
+
+{{{
+[[Upload:myimage.png | my image]]
+}}}
+shows the image under a link named "my image".
+
+For Mediawiki compatibility, the keyword {{{Upload:}}} can be replaced by {{{File:}}} or {{{Image:}}}.
+
+=== Options ===
+
+Using the {{{Upload:}}} syntax, options are allowed to change the appearance:
+{{{
+[[Upload:myimage.png size=40x25 align=center]]
+}}}
+
+Separate options by spaces. The allowed options are the following:
+* size: ''width "x" height'' or ''num + "%"''
+* align: ''string''
+* border: ''number''
+* hspace: ''number''
+* vspace: ''number''
+
+== URL images ==
+
+You can also use "external" images by providing a URL.
+
+In that case, you simply put the URL between double brackets:
+{{{
+[[http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/poweredby_phpwiki_51x31.png]]
+}}}
+will give:
+
+[[http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/poweredby_phpwiki_51x31.png]]
+
+<noinclude>
+----
+[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
+</noinclude>

Modified: trunk/pgsrc/PhpWikiManual
===================================================================
--- trunk/pgsrc/PhpWikiManual	2010-11-09 13:45:32 UTC (rev 7735)
+++ trunk/pgsrc/PhpWikiManual	2010-11-09 15:14:11 UTC (rev 7736)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue,  9 Nov 2010 16:13:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -17,6 +17,7 @@
 <<IncludePage page="Help/GoogleLink">>
 <<IncludePage page="Help/HowToUseWiki">>
 <<IncludePage page="FindPage">>
+<<IncludePage page="Help/Images">>
 <<IncludePage page="Help/Categories">>
 <<IncludePage page="Help/InterWiki">>
 <<IncludePage page="Help/LinkIcons">>


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7735] trunk/lib/plugin/MediawikiTable.php

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

Revision: 7735
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7735&view=rev
Author:   vargenau
Date:     2010-11-09 13:45:32 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
Parse caption

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

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2010-11-09 13:33:20 UTC (rev 7734)
+++ trunk/lib/plugin/MediawikiTable.php	2010-11-09 13:45:32 UTC (rev 7735)
@@ -177,7 +177,7 @@
                     $line=substr($line, $pospipe+1);
                 }
 
-                $caption->setContent(trim($line));
+                $caption->setContent(TransformInline(trim($line)));
             }
 
             if (((substr($line,0,1) == "|") or (substr($line,0,1) == "!")) and isset($row)) {


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7734] trunk/lib/plugin/MediawikiTable.php

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

Revision: 7734
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7734&view=rev
Author:   vargenau
Date:     2010-11-09 13:33:20 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
Multiple captions: the last one wins

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

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2010-11-09 13:25:11 UTC (rev 7733)
+++ trunk/lib/plugin/MediawikiTable.php	2010-11-09 13:33:20 UTC (rev 7734)
@@ -177,7 +177,7 @@
                     $line=substr($line, $pospipe+1);
                 }
 
-                $caption->pushContent(trim($line));
+                $caption->setContent(trim($line));
             }
 
             if (((substr($line,0,1) == "|") or (substr($line,0,1) == "!")) and isset($row)) {


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

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

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

Revision: 7733
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7733&view=rev
Author:   vargenau
Date:     2010-11-09 13:25:11 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
Add explanation about <thead>

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

Modified: trunk/pgsrc/Help%2FMediawikiTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FMediawikiTablePlugin	2010-11-09 13:20:16 UTC (rev 7732)
+++ trunk/pgsrc/Help%2FMediawikiTablePlugin	2010-11-09 13:25:11 UTC (rev 7733)
@@ -1,4 +1,4 @@
-Date: Mon,  8 Nov 2010 10:51:04 +0000
+Date: Tue,  9 Nov 2010 14:24:02 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -25,6 +25,9 @@
 You can also simply put the summary as an attribute to the table.
 The summary is necessary to be able to create accessible tables.
 
+If the first row of the table as made with header cells only, this row will be put in a //thead//.
+In that case, this row will be repeated on every page when printing the table.
+
 === HTML attributes ===
 
 {| class="bordered"


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7732] trunk/lib/plugin/MediawikiTable.php

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

Revision: 7732
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7732&view=rev
Author:   vargenau
Date:     2010-11-09 13:20:16 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
Better handling of <thead>

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

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2010-11-09 12:47:18 UTC (rev 7731)
+++ trunk/lib/plugin/MediawikiTable.php	2010-11-09 13:20:16 UTC (rev 7732)
@@ -76,8 +76,19 @@
         $argstr = str_replace("!!", "\n! ", $argstr);
 
         $lines = explode("\n", $argstr);
+
         $table = HTML::table();
+        $caption = HTML::caption();
+        $thead = HTML::thead();
+        $tbody = HTML::tbody();
 
+        // Do we need a <thead>?
+        // 0 = unknown
+        // 1 = inside (parsing cells)
+        // 2 = false (no thead, only tbody)
+        // 3 = true (there is a thead)
+        $theadstatus = 0;
+
         // We always generate an Id for the table.
         // This is convenient for tables of class "sortable".
         // If user provides an Id, the generated Id will be overwritten below.
@@ -104,7 +115,7 @@
             return HTML::raw('');
         }
 
-        foreach ($lines as $line){
+        foreach ($lines as $line) {
             if (substr($line,0,2) == "|}") {
                 // End of table
                 continue;
@@ -124,11 +135,9 @@
                         unset($cell);
                     }
                     if (!empty($row->_content)) {
-                        if (isset($thead)) {
+                        if ($theadstatus == 1) { // inside
+                            $theadstatus = 3; // true
                             $thead->pushContent($row);
-                            $table->pushContent($thead);
-                            unset($thead);
-                            $tbody = HTML::tbody();
                         } else {
                             $tbody->pushContent($row);
                         }
@@ -154,7 +163,6 @@
             // Table caption
             if (substr($line,0,2) == "|+") {
 
-                $caption = HTML::caption();
                 $line = substr($line,2);
                 $pospipe = strpos($line, "|");
                 $posbracket = strpos($line, "[");
@@ -170,7 +178,6 @@
                 }
 
                 $caption->pushContent(trim($line));
-                $table->pushContent($caption);
             }
 
             if (((substr($line,0,1) == "|") or (substr($line,0,1) == "!")) and isset($row)) {
@@ -186,11 +193,15 @@
                     $row->pushContent($cell);
                 }
                 if (substr($line,0,1) == "!") {
+                    if ($theadstatus == 0) { // unknown
+                        $theadstatus = 1; // inside
+                    }
                     $cell = HTML::th();   // Header
-                    $thead = HTML::thead();
                 } else {
+                    if ($theadstatus == 1) { // inside
+                        $theadstatus = 2; // false
+                    }
                     $cell = HTML::td();
-                    if (!isset($tbody)) $tbody = HTML::tbody();
                 }
                 $line = substr($line, 1);
 
@@ -252,11 +263,17 @@
             if (!empty($row->_content)) {
                 $tbody->pushContent($row);
             }
-            if (isset($tbody) && !empty($tbody->_content)) {
-                $table->pushContent($tbody);
-            }
         }
-        if (isset($table) && !empty($table->_content)) {
+        if (!empty($caption->_content)) {
+            $table->pushContent($caption);
+        }
+        if (!empty($thead->_content)) {
+            $table->pushContent($thead);
+        }
+        if (!empty($tbody->_content)) {
+            $table->pushContent($tbody);
+        }
+        if (!empty($table->_content)) {
             return $table;
         } else {
             return HTML::raw('');


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7731] trunk/lib/plugin/MediawikiTable.php

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

Revision: 7731
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7731&view=rev
Author:   vargenau
Date:     2010-11-09 12:47:18 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
Add "scope" as possible attribute

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

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2010-11-08 14:48:23 UTC (rev 7730)
+++ trunk/lib/plugin/MediawikiTable.php	2010-11-09 12:47:18 UTC (rev 7731)
@@ -213,7 +213,7 @@
                 if (($pospipe !== false) && (($posbracket === false) || ($posbracket > $pospipe)) && (($poscurly === false) || ($poscurly > $pospipe))) {
                     $attrs = parse_attributes(substr($line, 0, $pospipe));
                     foreach ($attrs as $key => $value) {
-                        if (in_array ($key, array("id", "class", "title", "style",
+                        if (in_array ($key, array("id", "class", "title", "style", "scope",
                                                   "colspan", "rowspan", "width", "height",
                                                   "bgcolor", "align", "valign"))) {
                             $cell->setAttr($key, $value);


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7730] trunk/INSTALL

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

Revision: 7730
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7730&view=rev
Author:   vargenau
Date:     2010-11-08 14:48:23 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Latest PHP: PHP 5.2.14 & PHP 5.3.3

Modified Paths:
--------------
    trunk/INSTALL

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2010-11-08 13:45:12 UTC (rev 7729)
+++ trunk/INSTALL	2010-11-08 14:48:23 UTC (rev 7730)
@@ -2,10 +2,10 @@
 
 PhpWiki requires a web server with at least PHP version 4.3.10.
 PhpWiki was tested with 4.4.7 (centos4), 4.3.10, 4.4.9, 5.0.3,
-5.1.6 (centos5), 5.2.10, 5.3, 6.0.
+5.1.6 (centos5), 5.2.10, 5.3.2, 5.3.3.
 
-All users of PHP are strongly encouraged to upgrade to PHP 5.2.13
-or PHP 5.3.2 that are the supported versions.
+All users of PHP are strongly encouraged to upgrade to PHP 5.2.14
+or PHP 5.3.3 that are the supported versions.
 Visit <http://www.php.net> for downloads and information.
 
 You need the Perl regular expressions package compiled in; this is the


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7729] trunk/lib/plugin/MediawikiTable.php

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

Revision: 7729
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7729&view=rev
Author:   vargenau
Date:     2010-11-08 13:45:12 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Use "explode" instead of "preg_split"

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

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2010-11-08 13:09:29 UTC (rev 7728)
+++ trunk/lib/plugin/MediawikiTable.php	2010-11-08 13:45:12 UTC (rev 7729)
@@ -75,7 +75,7 @@
         $argstr = str_replace("||", "\n| ", $argstr);
         $argstr = str_replace("!!", "\n! ", $argstr);
 
-        $lines = preg_split('/\n/', $argstr);
+        $lines = explode("\n", $argstr);
         $table = HTML::table();
 
         // We always generate an Id for the table.


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7728] trunk/lib/plugin/MediawikiTable.php

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

Revision: 7728
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7728&view=rev
Author:   vargenau
Date:     2010-11-08 13:09:29 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Allow extra "|-" anywhere

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

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2010-11-08 09:53:28 UTC (rev 7727)
+++ trunk/lib/plugin/MediawikiTable.php	2010-11-08 13:09:29 UTC (rev 7728)
@@ -123,13 +123,15 @@
                         $row->pushContent($cell);
                         unset($cell);
                     }
-                    if (isset($thead)) {
+                    if (!empty($row->_content)) {
+                        if (isset($thead)) {
                             $thead->pushContent($row);
                             $table->pushContent($thead);
                             unset($thead);
                             $tbody = HTML::tbody();
-                    } else {
+                        } else {
                             $tbody->pushContent($row);
+                        }
                     }
                 }
                 $row = HTML::tr();


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

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

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

Revision: 7727
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7727&view=rev
Author:   vargenau
Date:     2010-11-08 09:53:28 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
No comma between arguments (works, but not recommended)

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

Modified: trunk/pgsrc/Help%2FMediawikiTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FMediawikiTablePlugin	2010-11-05 15:02:12 UTC (rev 7726)
+++ trunk/pgsrc/Help%2FMediawikiTablePlugin	2010-11-08 09:53:28 UTC (rev 7727)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Mon,  8 Nov 2010 10:51:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -83,8 +83,8 @@
 |- style=height:100px
 | Cell I
 | **Cell II**,  in bold
-|align=right, width="100%" |Cell III
-|- bgcolor=#f0f0ff, align=center
+|align=right width="100%" |Cell III
+|- bgcolor=#f0f0ff align=center
 |Cell 1||Cell 2||Cell 3
 |}
 
@@ -101,8 +101,8 @@
 |- style=height:100px
 | Cell I
 | **Cell II**,  in bold
-|align=right, width="100%" |Cell III
-|- bgcolor=#f0f0ff, align=center
+|align=right width="100%" |Cell III
+|- bgcolor=#f0f0ff align=center
 |Cell 1||Cell 2||Cell 3
 |}
 }}}
@@ -121,7 +121,7 @@
 * One
 * Two
 * Three
-|- bgcolor=#f0f0ff, align=center
+|- bgcolor=#f0f0ff align=center
 |Current date || <<CurrentTime format=date>>
 |}
 
@@ -140,7 +140,7 @@
 * One
 * Two
 * Three
-|- bgcolor=#f0f0ff, align=center
+|- bgcolor=#f0f0ff align=center
 |Current date || <<CurrentTime format=date>>
 |}
 }}}


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

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

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

Revision: 7726
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7726&view=rev
Author:   vargenau
Date:     2010-11-05 15:02:12 +0000 (Fri, 05 Nov 2010)

Log Message:
-----------
Use empty alt for [[Upload:image.jpg]]

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2010-11-05 14:58:10 UTC (rev 7725)
+++ trunk/lib/InlineParser.php	2010-11-05 15:02:12 UTC (rev 7726)
@@ -479,7 +479,7 @@
         if (empty($label) and isImageLink($link)) {
             // if without label => inlined image [File:xx.gif]
             $imgurl = $intermap->link($link);
-            return LinkImage($imgurl->getAttr('href'), $link);
+            return LinkImage($imgurl->getAttr('href'));
         }
         return new Cached_InterwikiLink($link, $label);
     } else {


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

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

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

Revision: 7725
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7725&view=rev
Author:   vargenau
Date:     2010-11-05 14:58:10 +0000 (Fri, 05 Nov 2010)

Log Message:
-----------
Allow "upload:", "image:" and "file:". Remove spaces before and after ":", if any.

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2010-11-04 19:40:50 UTC (rev 7724)
+++ trunk/lib/InlineParser.php	2010-11-05 14:58:10 UTC (rev 7725)
@@ -354,12 +354,21 @@
 
     // Mediawiki compatibility: allow "Image:" and "File:"
     // as synonyms of "Upload:"
-    if (string_starts_with($rawlink, "Image:")) {
-        $rawlink = str_replace("Image:", "Upload:", $rawlink);
+    // Allow "upload:", "image:" and "file:" also
+    // Remove spaces before and after ":", if any
+    if (string_starts_with($rawlink, "Upload")) {
+        $rawlink = preg_replace("/^Upload\\s*:\\s*/", "Upload:", $rawlink);
+    } else if (string_starts_with($rawlink, "upload")) {
+        $rawlink = preg_replace("/^upload\\s*:\\s*/", "Upload:", $rawlink);
+    } else if (string_starts_with($rawlink, "Image")) {
+        $rawlink = preg_replace("/^Image\\s*:\\s*/", "Upload:", $rawlink);
+    } else if (string_starts_with($rawlink, "image")) {
+        $rawlink = preg_replace("/^image\\s*:\\s*/", "Upload:", $rawlink);
+    } else if (string_starts_with($rawlink, "File")) {
+        $rawlink = preg_replace("/^File\\s*:\\s*/", "Upload:", $rawlink);
+    } else if (string_starts_with($rawlink, "file")) {
+        $rawlink = preg_replace("/^file\\s*:\\s*/", "Upload:", $rawlink);
     }
-    if (string_starts_with($rawlink, "File:")) {
-        $rawlink = str_replace("File:", "Upload:", $rawlink);
-    }
 
     $label = UnWikiEscape($label);
     /*


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7724] trunk/lib/WikiUser/FusionForge.php

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

Revision: 7724
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7724&view=rev
Author:   vargenau
Date:     2010-11-04 19:40:50 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
Check getIsExternal exists

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

Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2010-11-04 18:20:41 UTC (rev 7723)
+++ trunk/lib/WikiUser/FusionForge.php	2010-11-04 19:40:50 UTC (rev 7724)
@@ -74,7 +74,7 @@
 
             if ($member) {
                 $this->_userid = $user->getRealName();
-                $this->_is_external = $user->getIsExternal();
+                $this->_is_external = method_exists($user, 'getIsExternal') && $user->getIsExternal();
                 if ($perm->isAdmin()) {
                     $this->_level = WIKIAUTH_ADMIN;
                 } else {


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

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

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

Revision: 7723
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7723&view=rev
Author:   vargenau
Date:     2010-11-04 18:20:41 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
Allow <br /> as well as <br>; allows spaces

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2010-11-02 20:45:12 UTC (rev 7722)
+++ trunk/lib/InlineParser.php	2010-11-04 18:20:41 UTC (rev 7723)
@@ -129,9 +129,9 @@
                 $match->regexp_ind += $prevMatch->regexp_ind + 1;
                 return $match;
             }
-          
+
         }
-      
+
         // Failed.  Look for match after current position.
         $repeat = sprintf('{%d,}?', $pos + 1);
         return $this->_match($text, $this->_regexps, $repeat);
@@ -170,7 +170,7 @@
 	    if (empty($matched)) return false;
         }
         $match = new RegexpSet_match;
-      
+
         // Optimization: if the matches are only "$" and another, then omit "$"
         if (! _INLINE_OPTIMIZATION or count($matched) > 2) {
             assert(!empty($repeat));
@@ -189,7 +189,7 @@
         } else {
             $match->regexp_ind = $regexp_ind;
         }
-      
+
         $match->postmatch = substr($text, strlen($m[0]));
         $match->prematch = $m[1];
         $match->match = $m[2];
@@ -270,7 +270,7 @@
     function getStartRegexp () {
         return $this->_start_regexp;
     }
-  
+
     /** Get the ending regexp for this rule.
      *
      * @param string $match The text which matched the starting regexp.
@@ -300,7 +300,7 @@
     function getMatchRegexp () {
         return ESCAPE_CHAR . '(?: [[:alnum:]]+ | .)';
     }
-  
+
     function markup ($match) {
         assert(strlen($match) >= 2);
         return substr($match, 1);
@@ -326,7 +326,7 @@
 
     // $bracketlink will start and end with brackets; in between will
     // be either a page name, a URL or both separated by a pipe.
-  
+
    $wikicreolesyntax = false;
 
    if (string_starts_with($bracketlink, "[[") or string_starts_with($bracketlink, "#[[")) {
@@ -405,7 +405,7 @@
             $label = LinkImage(getUploadDataPath() . $img, $alt);
         }
     } else
-  
+
     // [label|link]
     // If label looks like a url to an image or object, we want an image link.
     if (isImageLink($label)) {
@@ -448,7 +448,7 @@
     elseif (preg_match("/^ (\w+) (:[:=]) (.*) $/x", $link) and !isImageLink($link))
         return new Cached_SemanticLink($link, $label);
 
-    /* Do not store the link */  
+    /* Do not store the link */
     elseif (substr($link,0,1) == ':')
         return new Cached_WikiLink($link, $label);
 
@@ -504,7 +504,7 @@
 class Markup_bracketlink  extends SimpleMarkup
 {
     var $_match_regexp = "\\#? \\[ .*? [^]\\s] .*? \\]";
-  
+
     function markup ($match) {
         $link = LinkBracketLink($match);
         assert($link->isInlineElement());
@@ -523,7 +523,7 @@
 	$words = array_keys($this->suggestions);
         return "(?<= \W ) (?:" . join('|', $words) . ") (?= \W )";
     }
-  
+
     function markup ($match) {
     	if (empty($this->suggestions) or empty($this->suggestions[$match]))
     	    return $match;
@@ -553,7 +553,7 @@
     function getMatchRegexp () {
         return "(?<![[:alnum:]]) (?:" . ALLOWED_PROTOCOLS . ") : [^\s<>\"']+ (?<![ ,.?; \] \) ])";
     }
-  
+
     function markup ($match) {
         return new Cached_ExternalLink(UnWikiEscape($match));
     }
@@ -600,7 +600,7 @@
             return new Cached_WikiLink($match);
     }
 
-    // FIXME: there's probably a more useful place to put these two functions  
+    // FIXME: there's probably a more useful place to put these two functions
     function _isWikiUserPage ($page) {
         global $request;
         $dbi = $request->getDbh();
@@ -621,8 +621,7 @@
 
 class Markup_linebreak extends SimpleMarkup
 {
-    //var $_match_regexp = "(?: (?<! %) %%% (?! %) | <(?:br|BR)> | <(?:br|BR) \/> )";
-    var $_match_regexp = "(?: (?<! %) %%% (?! %) | \\\\\\\\ | <(?:br|BR)> )";
+    var $_match_regexp = "(?: (?<! %) %%% (?! %) | \\\\\\\\ | <\s*(?:br|BR)\s*> | <\s*(?:br|BR)\s*\/\s*> )";
 
     function markup ($match) {
         return HTML::br();
@@ -636,7 +635,7 @@
     function getEndRegexp ($match) {
         return "\\/\\/";
     }
- 
+
     function markup ($match, $body) {
         $tag = 'em';
         return new HtmlElement($tag, $body);
@@ -650,7 +649,7 @@
     function getEndRegexp ($match) {
         return "\\*\\*";
     }
- 
+
     function markup ($match, $body) {
         $tag = 'strong';
         return new HtmlElement($tag, $body);
@@ -664,7 +663,7 @@
     function getEndRegexp ($match) {
         return "\\#\\#";
     }
- 
+
     function markup ($match, $body) {
         $tag = 'tt';
         return new HtmlElement($tag, $body);
@@ -678,7 +677,7 @@
     function getEndRegexp ($match) {
         return "\\^\\^";
     }
- 
+
     function markup ($match, $body) {
         $tag = 'sup';
         return new HtmlElement($tag, $body);
@@ -692,7 +691,7 @@
     function getEndRegexp ($match) {
         return $match;
     }
- 
+
     function markup ($match, $body) {
         $tag = 'sub';
         return new HtmlElement($tag, $body);
@@ -706,7 +705,7 @@
     function getEndRegexp ($match) {
         return $match;
     }
-  
+
     function markup ($match, $body) {
         $tag = $match == "''" ? 'em' : 'strong';
         return new HtmlElement($tag, $body);
@@ -743,9 +742,9 @@
 	    $start[] = "(?<= { ) ${any} (?! } )";
 	    $start[] = "(?<= < ) ${any} (?! > )";
 	    $start[] = "(?<= \\( ) ${any} (?! \\) )";
-	  
+	
 	    $start = "(?:" . join('|', $start) . ")";
-	  
+	
 	    // Any of the above must be immediately followed by non-whitespace.
 	    $start_regexp = $start . "(?= \S)";
 	}
@@ -757,7 +756,7 @@
         $chr = preg_quote($match);
         return "(?<= \S | ^ ) (?<! $chr) $chr (?! $chr) (?= \s | [-)}>\"'\\/:.,;!? _*=] | $)";
     }
-  
+
     function markup ($match, $body) {
         switch ($match) {
         case '*': return new HtmlElement('b', $body);
@@ -775,7 +774,7 @@
     function getEndRegexp ($match) {
         return "<\\/" . substr($match, 1);
     }
-  
+
     function markup ($match, $body) {
         $tag = substr($match, 1, -1);
         return new HtmlElement($tag, $body);
@@ -794,7 +793,7 @@
     	    $tag = 'div';
         return "<\\/" . $tag . '>';
     }
-  
+
     function markup ($match, $body) {
     	if (substr($match,1,4) == 'span')
     	    $tag = 'span';
@@ -824,7 +823,7 @@
     	    $tag = 'acronym';
         return "<\\/" . $tag . '>';
     }
-  
+
     function markup ($match, $body) {
     	if (substr($match,1,4) == 'abbr')
     	    $tag = 'abbr';
@@ -851,7 +850,7 @@
     // %color=blue% blue text %% and back to normal
     var $_start_regexp = "%color=(?: [^%]*)%";
     var $_end_regexp = "%%";
-  
+
     function markup ($match, $body) {
     	$color = strtolower(substr($match, 7, -1));
 
@@ -1017,7 +1016,7 @@
 {
     // patch #1732793: allow \n, mult. {{ }} in one line, and single letters
     var $_match_regexp = '\{\{.*?\}\}';
-  
+
     function markup ($match) {
 
         $page = substr($match,2,-2);
@@ -1119,7 +1118,7 @@
             join('|', array_map('preg_quote', array_keys($this->_entities))) .
             ' )';
     }
- 
+
     function markup ($match) {
         return HTML::Raw($this->_entities[$match]);
     }
@@ -1127,7 +1126,7 @@
 
 class Markup_isonumchars  extends SimpleMarkup {
     var $_match_regexp = '\&\#\d{2,5};';
-  
+
     function markup ($match) {
         return HTML::Raw($match);
     }
@@ -1136,7 +1135,7 @@
 class Markup_isohexchars extends SimpleMarkup {
     // hexnums, like &#x00A4; <=> &curren;
     var $_match_regexp = '\&\#x[0-9a-fA-F]{2,4};';
-  
+
     function markup ($match) {
         return HTML::Raw($match);
     }
@@ -1148,7 +1147,7 @@
 {
     var $_regexps = array();
     var $_markup = array();
-  
+
     function InlineTransformer ($markup_types = false) {
         global $request;
 	// We need to extend the inline parsers by certain actions, like SearchHighlight,
@@ -1212,7 +1211,7 @@
         $this->_regexps[] = $regexp;
         $this->_markup[] = $markup;
     }
-      
+
     function parse (&$text, $end_regexps = array('$')) {
         $regexps = $this->_regexps;
 
@@ -1220,12 +1219,12 @@
         array_unshift($regexps, $end_regexps[0]);
         //array_push($regexps, $end_regexps[0]);
         $regexps = new RegexpSet($regexps);
-      
+
         $input = $text;
         $output = new XmlContent;
 
         $match = $regexps->match($input);
-      
+
         while ($match) {
             if ($match->regexp_ind == 0) {
                 // No start pattern found before end pattern.
@@ -1317,7 +1316,7 @@
     if (empty($trfm) or $action == 'SpellCheck') {
         $trfm = new InlineTransformer;
     }
-  
+
     if ($markup < 2.0) {
         $text = ConvertOldMarkup($text, 'inline');
     }
@@ -1330,7 +1329,7 @@
 
 function TransformLinks($text, $markup = 2.0, $basepage = false) {
     static $trfm;
-  
+
     if (empty($trfm)) {
         $trfm = new LinkTransformer;
     }
@@ -1338,7 +1337,7 @@
     if ($markup < 2.0) {
         $text = ConvertOldMarkup($text, 'links');
     }
-  
+
     if ($basepage) {
         return new CacheableMarkup($trfm->parse($text), $basepage);
     }
@@ -1350,7 +1349,7 @@
  */
 function TransformInlineNowiki($text, $markup = 2.0, $basepage=false) {
     static $trfm;
-  
+
     if (empty($trfm)) {
         $trfm = new NowikiTransformer;
     }
@@ -1366,5 +1365,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>


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

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

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

Revision: 7722
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7722&view=rev
Author:   vargenau
Date:     2010-11-02 20:45:12 +0000 (Tue, 02 Nov 2010)

Log Message:
-----------
Check getIsExternal exists

Modified Paths:
--------------
    trunk/g
    trunk/themes/fusionforge/themeinfo.php

Modified: trunk/g
===================================================================
--- trunk/g	2010-11-02 17:04:15 UTC (rev 7721)
+++ trunk/g	2010-11-02 20:45:12 UTC (rev 7722)
@@ -59,8 +59,9 @@
 
     $group_name = $project->getUnixName();
     $group_public_name = $project->getPublicName();
-    $is_external = $project->getIsExternal();
 
+    $is_external = method_exists($project, 'getIsExternal') && $project->getIsExternal();
+
     $wc = new WikiConfig($group_id);
 
     define('VIRTUAL_PATH', '/wiki/g/'.$group_name);

Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2010-11-02 17:04:15 UTC (rev 7721)
+++ trunk/themes/fusionforge/themeinfo.php	2010-11-02 20:45:12 UTC (rev 7722)
@@ -41,7 +41,7 @@
 
         // Display a warning banner for internal users when the wiki is opened
         // to external users.
-        if ($project->getIsExternal()) {
+        if (method_exists($project, 'getIsExternal') && $project->getIsExternal()) {
         	$external_user = false;
         	if (session_loggedin()) {
         		$user = session_get_user();


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7721] trunk/lib/plugin/MediawikiTable.php

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

Revision: 7721
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7721&view=rev
Author:   vargenau
Date:     2010-11-02 17:04:15 +0000 (Tue, 02 Nov 2010)

Log Message:
-----------
If user put and extra "|-" without cells just before "|}", we ignore it to get valid XHTML code

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

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2010-10-22 18:38:33 UTC (rev 7720)
+++ trunk/lib/plugin/MediawikiTable.php	2010-11-02 17:04:15 UTC (rev 7721)
@@ -3,7 +3,7 @@
 /*
  * Copyright (C) 2003 Sameer D. Sahasrabuddhe
  * Copyright (C) 2005 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -245,10 +245,20 @@
                 }
                 $row->pushContent($cell);
             }
-            $tbody->pushContent($row);
-            $table->pushContent($tbody);
+            // If user put and extra "|-" without cells just before "|}"
+            // we ignore it to get valid XHTML code
+            if (!empty($row->_content)) {
+                $tbody->pushContent($row);
+            }
+            if (isset($tbody) && !empty($tbody->_content)) {
+                $table->pushContent($tbody);
+            }
         }
-        return $table;
+        if (isset($table) && !empty($table->_content)) {
+            return $table;
+        } else {
+            return HTML::raw('');
+        }
     }
 }
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7720] trunk/themes/fusionforge/templates

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

Revision: 7720
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7720&view=rev
Author:   vargenau
Date:     2010-10-22 18:38:33 +0000 (Fri, 22 Oct 2010)

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.

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

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

Revision: 7719
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7719&view=rev
Author:   vargenau
Date:     2010-10-22 09:30:47 +0000 (Fri, 22 Oct 2010)

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.

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

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

Revision: 7718
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7718&view=rev
Author:   vargenau
Date:     2010-10-22 08:26:31 +0000 (Fri, 22 Oct 2010)

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.

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

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

Revision: 7717
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7717&view=rev
Author:   vargenau
Date:     2010-10-20 16:36:22 +0000 (Wed, 20 Oct 2010)

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.