BugTrack/452: 色名をチェックし、無効なときは$bodyのみを返すように

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

diff --git a/plugin/img.inc.php b/plugin/img.inc.php
index 59d77df..49e1fab 100644 (file)
--- a/plugin/img.inc.php
+++ b/plugin/img.inc.php
@@ -1,23 +1,40 @@
-<?
-// $Id: img.inc.php,v 1.4 2002/07/02 05:38:17 masui Exp $
+<?php
+/////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: img.inc.php,v 1.8 2003/05/29 08:25:35 arino Exp $
+//
+// ²èÁü¤òɽ¼¨

 function plugin_img_convert()
 {
 function plugin_img_convert()
 {

-       if(func_num_args()!=2) {
-               return;
+       if (func_num_args() != 2)
+       {
+               return FALSE;

        }
        $aryargs = func_get_args();
        $url = $aryargs[0];
        $align = strtoupper($aryargs[1]);
        }
        $aryargs = func_get_args();
        $url = $aryargs[0];
        $align = strtoupper($aryargs[1]);

-       if($align == 'R' || $align == 'RIGHT') {
+       if ($align == 'R' || $align == 'RIGHT')
+       {

                $align = 'right';
        }
                $align = 'right';
        }

-       else if($align == 'L' || $align == 'LEFT') {
+       else if ($align == 'L' || $align == 'LEFT')
+       {

                $align = 'left';
        }
                $align = 'left';
        }

-       else {
-               return "<br style=\"clear:both\">";
+       else
+       {
+               return '<div style="clear:both"></div>';

        }
        }

-       if(preg_match("/^http:\/\/(\S+?)(\.jpg|\.jpeg|\.gif|\.png)$/si", $url) == false) return;
-       return "<div style=\"float:$align;padding:.5em 1.5em .5em 1.5em\"><img src=\"$url\" alt=\"\" /></div>";
+       if (!is_url($url) or !preg_match('/\.(jpe?g|gif|png)$/i', $url))
+       {
+               return FALSE;
+       }
+       return <<<EOD
+
+<div style="float:$align;padding:.5em 1.5em .5em 1.5em">
+ <img src="$url" alt="" />
+</div>
+EOD;

 }
 ?>
 }
 ?>