BugTrack2/176: Respect encoding as rss said (Base patched by matsuo2)

[pukiwiki/pukiwiki.git] / plugin / color.inc.php

diff --git a/plugin/color.inc.php b/plugin/color.inc.php
index b14e1c3..471b43d 100644 (file)
--- a/plugin/color.inc.php
+++ b/plugin/color.inc.php
@@ -1,48 +1,49 @@
 <?php
-/////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: color.inc.php,v 1.22 2005/06/16 15:04:08 henoheno Exp $
 //
-// $Id: color.inc.php,v 1.7 2003/09/03 04:25:32 arino Exp $
-//
+// Text color plugin
+
+// Allow CSS instead of <font> tag
+// NOTE: <font> tag become invalid from XHTML 1.1
+define('PLUGIN_COLOR_ALLOW_CSS', TRUE); // TRUE, FALSE
+
+// ----
+define('PLUGIN_COLOR_USAGE', '&color(foreground[,background]){text};');
+define('PLUGIN_COLOR_REGEX', '/^(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z-]+)$/i');
 
 function plugin_color_inline()
 {
-       if (func_num_args() == 3)
-       {
-               list($color,$bgcolor,$body) = func_get_args();
-               if ($body == '')
-               {
-                       $body = $bgcolor;
-                       $bgcolor = '';
-               }
-       }
-       else if (func_num_args() == 2)
-       {
+       global $pkwk_dtd;
+
+       $args = func_get_args();
+       $text = strip_autolink(array_pop($args)); // Already htmlspecialchars(text)
+
+       list($color, $bgcolor) = array_pad($args, 2, '');
+       if ($color != '' && $bgcolor != '' && $text == '') {
+               // Maybe the old style: '&color(foreground,text);'
+               $text    = htmlspecialchars($bgcolor);
                $bgcolor = '';
-               list($color,$body) = func_get_args();
        }
-       else
-       {
-               return FALSE;
-       }
-       
-       if ($color == '' or $body == '')
-       {
-               return FALSE;
-       }
-       if (!plugin_color_is_valid($color) or !plugin_color_is_valid($bgcolor))
-       {
-               return $body;
+       if (($color == '' && $bgcolor == '') || $text == '' || func_num_args() > 3)
+               return PLUGIN_COLOR_USAGE;
+
+       // Invalid color
+       foreach(array($color, $bgcolor) as $col){
+               if ($col != '' && ! preg_match(PLUGIN_COLOR_REGEX, $col))
+                       return '&color():Invalid color: ' . htmlspecialchars($col) . ';';
        }
-       
-       if ($bgcolor != '')
-       {
-               $color .= ';background-color:'.$bgcolor;
+
+       if (PLUGIN_COLOR_ALLOW_CSS === TRUE || ! isset($pkwk_dtd) || $pkwk_dtd == PKWK_DTD_XHTML_1_1) {
+               $delimiter = '';
+               if ($color != '' && $bgcolor != '') $delimiter = '; ';
+               if ($color   != '') $color   = 'color:' . $color;
+               if ($bgcolor != '') $bgcolor = 'background-color:' . $bgcolor;
+               return '<span style="' . $color . $delimiter . $bgcolor . '">' .
+                       $text . '</span>';
+       } else {
+               if ($bgcolor != '') return '&color(): bgcolor (with CSS) not allowed;';
+               return '<font color="' . $color . '">' . $text . '</font>';
        }
-       return "<span style=\"color:$color\">$body</span>";
-}
-function plugin_color_is_valid($color)
-{
-       return ($color == '') or preg_match('/^(#[0-9a-f]+|[\w-]+)/i',$color);
 }
 ?>