htmlsc(): Just sugar for htmlspecialchars(), and a foundation

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

diff --git a/plugin/lookup.inc.php b/plugin/lookup.inc.php
index 06e75aa..5030ba7 100644 (file)
--- a/plugin/lookup.inc.php
+++ b/plugin/lookup.inc.php
@@ -1,26 +1,32 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: lookup.inc.php,v 1.19 2005/02/27 09:36:31 henoheno Exp $
+// $Id: lookup.inc.php,v 1.23 2011/01/25 15:01:01 henoheno Exp $
+// Copyright (C)
+//   2002-2005 PukiWiki Developers Team
+//   2001-2002 Originally written by yu-ji
+// License: GPL v2 or (at your option) any later version
 //
 // InterWiki lookup plugin
 
 define('PLUGIN_LOOKUP_USAGE', '#lookup(interwikiname[,button_name[,default]])');
+
 function plugin_lookup_convert()
 {
-       global $script, $vars;
+       global $vars;
        static $id = 0;
 
        $num = func_num_args();
        if ($num == 0 || $num > 3) return PLUGIN_LOOKUP_USAGE;
 
        $args = func_get_args();
-       $interwiki = htmlspecialchars(trim($args[0]));
-       $button    = isset($args[1]) ? trim($args[1]) : '';
-       $button    = ($button != '') ? htmlspecialchars($button) : 'lookup';
-       $default   = ($num > 2) ? htmlspecialchars(trim($args[2])) : '';
-       $s_page    = htmlspecialchars($vars['page']);
+       $interwiki = htmlsc(trim($args[0]));
+       $button    = isset($args[1]) ? trim($args[1])         : '';
+       $button    = ($button != '') ? htmlsc($button)        : 'lookup';
+       $default   = ($num > 2)      ? htmlsc(trim($args[2])) : '';
+       $s_page    = htmlsc($vars['page']);
        ++$id;
 
+       $script = get_script_uri();
        $ret = <<<EOD
 <form action="$script" method="post">
  <div>
@@ -43,13 +49,13 @@ function plugin_lookup_action()
        $page  = isset($post['page'])  ? $post['page']  : '';
        $inter = isset($post['inter']) ? $post['inter'] : '';
        if ($page == '') return FALSE; // Do nothing
-       if ($inter == '') return array(msg=>'Invalid access', body=>'');
+       if ($inter == '') return array('msg'=>'Invalid access', 'body'=>'');
 
        $url = get_interwiki_url($inter, $page);
        if ($url === FALSE) {
                $msg = sprintf('InterWikiName "%s" not found', $inter);
-               $msg = htmlspecialchars($msg);
-               return array(msg=>'Not found', body=>$msg);
+               $msg = htmlsc($msg);
+               return array('msg'=>'Not found', 'body'=>$msg);
        }
 
        pkwk_headers_sent();