BugTrack/2443 showrss plugin: Enable to show Japanese RSS feeds

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

diff --git a/plugin/lookup.inc.php b/plugin/lookup.inc.php
index 58a2ab7..15c2f79 100644 (file)
--- a/plugin/lookup.inc.php
+++ b/plugin/lookup.inc.php
@@ -1,37 +1,64 @@
-<?\r
-function plugin_lookup_convert()\r
-{\r
-       global $script,$vars;\r
-       \r
-       $args = func_get_args();\r
-       \r
-       if(func_num_args() < 2) return FALSE;\r
-       \r
-       $iwn = trim(strip_tags($args[0]));\r
-       $btn = trim(strip_tags($args[1]));\r
-       $default = trim(strip_tags($args[2]));\r
-       \r
-       $ret = "<form action=\"$script\" method=\"post\">\n";\r
-       $ret.= "<input type=\"hidden\" name=\"plugin\" value=\"lookup\">\n";\r
-       $ret.= "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n";\r
-       $ret.= "<input type=\"hidden\" name=\"inter\" value=\"$iwn\">\n";\r
-       $ret.= "$iwn:\n";\r
-       $ret.= "<input type=\"text\" name=\"page\" size=\"30\" value=\"$default\">\n";\r
-       $ret.= "<input type=\"submit\" value=\"$btn\">\n";\r
-       $ret.= "</form>\n";\r
-\r
-       return $ret;\r
-}\r
-function plugin_lookup_action()\r
-{\r
-       global $vars,$script;\r
-       \r
-       if(!$vars["inter"] || !$vars["page"]) return;\r
-       \r
-       $interwikiname = "[[".$vars["inter"].":".$vars["page"]."]]";\r
-       $interwikiname = rawurlencode($interwikiname);\r
-       \r
-       header("Location: $script?$interwikiname");\r
-       die();\r
-}\r
-?>\r
+<?php
+// PukiWiki - Yet another WikiWikiWeb clone.
+// lookup.inc.php
+// Copyright
+//   2002-2017 PukiWiki Development 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 $vars;
+       static $id = 0;
+
+       $num = func_num_args();
+       if ($num == 0 || $num > 3) return PLUGIN_LOOKUP_USAGE;
+
+       $args = func_get_args();
+       $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_base_uri();
+       $ret = <<<EOD
+<form action="$script" method="post">
+ <div>
+  <input type="hidden" name="plugin" value="lookup" />
+  <input type="hidden" name="refer"  value="$s_page" />
+  <input type="hidden" name="inter"  value="$interwiki" />
+  <label for="_p_lookup_$id">$interwiki:</label>
+  <input type="text" name="page" id="_p_lookup_$id" size="30" value="$default" />
+  <input type="submit" value="$button" />
+ </div>
+</form>
+EOD;
+       return $ret;
+}
+
+function plugin_lookup_action()
+{
+       global $post; // Deny GET method to avlid GET loop
+
+       $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'=>'');
+
+       $url = get_interwiki_url($inter, $page);
+       if ($url === FALSE) {
+               $msg = sprintf('InterWikiName "%s" not found', $inter);
+               $msg = htmlsc($msg);
+               return array('msg'=>'Not found', 'body'=>$msg);
+       }
+
+       pkwk_headers_sent();
+       header('Location: ' . $url); // Publish as GET method
+       exit;
+}