From ffe9d3e682545a705468b32cd1aa9f7eb07ab597 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 22 Jan 2008 14:24:02 +0000
Subject: [PATCH] Patch for RichTable.php: enrich syntax for attributes

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5964 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/RichTable.php     | 14 +++++++++++---
 pgsrc/Help%2FRichTablePlugin | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/plugin/RichTable.php b/lib/plugin/RichTable.php
index 437406e2d..c5dea5e6d 100644
--- a/lib/plugin/RichTable.php
+++ b/lib/plugin/RichTable.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: RichTable.php,v 1.7 2005-05-06 17:44:24 rurban Exp $');
+rcs_id('$Id: RichTable.php,v 1.8 2008-01-22 14:24:02 vargenau Exp $');
 /**
   RichTablePlugin
   A PhpWiki plugin that allows insertion of tables using a richer syntax.
@@ -46,7 +46,7 @@ extends WikiPlugin
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.7 $");
+                            "\$Revision: 1.8 $");
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
@@ -135,19 +135,27 @@ extends WikiPlugin
     }
 
     function _parse_attr($line) {
+        // We allow attributes with or without quotes (")
+        // border=1, cellpadding="5"
+        // style="font-family: sans-serif; border-top:1px solid #dddddd;
+        // What will not work is style with comma inside, e. g.
+        // style="font-family: Verdana, Arial, Helvetica, sans-serif"
         $attr_chunks = preg_split("/\s*,\s*/", strtolower($line));
         $options = array();
         foreach ($attr_chunks as $attr_pair) {
             if (empty($attr_pair)) continue;
             $key_val = preg_split("/\s*=\s*/", $attr_pair);
             if (!empty($key_val[1]))
-                $options[trim($key_val[0])] = trim($key_val[1]);
+                $options[trim($key_val[0])] = trim(str_replace("\"", "", $key_val[1]));
         }
         return $options;
     }
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.7  2005/05/06 17:44:24  rurban
+// silence undefined offset 1 msg
+//
 // Revision 1.6  2005/04/09 08:16:00  rurban
 // fix RichTablePlugin embedded plugin invocation. Bug #1044245
 //
diff --git a/pgsrc/Help%2FRichTablePlugin b/pgsrc/Help%2FRichTablePlugin
index 8f0a2f744..57f58ce42 100644
--- a/pgsrc/Help%2FRichTablePlugin
+++ b/pgsrc/Help%2FRichTablePlugin
@@ -1,9 +1,9 @@
 Date: Fri, 29 Dec 2006 18:57:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.8a)
-X-Rcs-Id: $Id: Help%2FRichTablePlugin,v 1.2 2007-01-02 13:25:07 rurban Exp $ 
+X-Rcs-Id: $Id: Help%2FRichTablePlugin,v 1.3 2008-01-22 14:24:02 vargenau Exp $ 
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRichTablePlugin;
-  pgsrc_version="2 $Revision: 1.2 $";
+  pgsrc_version="2 $Revision: 1.3 $";
   flags="";
   markup=2;
   charset=iso-8859-1
@@ -35,6 +35,16 @@ NEW: The plugin is now fixed so that the contents of each cell are individually
 * The source code sucks
 * The plugin can't nest itself yet. Thus nested tables are currently not possible.
 
+We allow attributes with or without quotes (")
+<verbatim>
+border=1, cellpadding="5"
+style="font-family: sans-serif; border-top:1px solid #dddddd;"
+</verbatim>
+What will not work is style with comma inside, e. g.
+<verbatim>
+style="font-family: Verdana, Arial, Helvetica, sans-serif"
+</verbatim>
+
 ! Example
 
 <?plugin RichTable
-- 
2.45.0