* Enable old design #ref(filename,BrackettedBracketName)

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

diff --git a/plugin/newpage.inc.php b/plugin/newpage.inc.php
index 500bca6..55066d3 100644 (file)
--- a/plugin/newpage.inc.php
+++ b/plugin/newpage.inc.php
@@ -1,27 +1,30 @@
 <?php
-// $Id: newpage.inc.php,v 1.4 2002/11/29 00:09:01 panda Exp $
-
-function plugin_newpage_init()
-{
-  $_plugin_recent_messages = array(
-    '_msg_newpage' => '¥Ú¡¼¥¸¿·µ¬ºîÀ®'
-  );
-  set_plugin_messages($_plugin_recent_messages);
-}
+// $Id: newpage.inc.php,v 1.9 2004/07/31 03:09:20 henoheno Exp $
 
 function plugin_newpage_convert()
 {
-       global $script,$vars,$_btn_edit,$_msg_newpage;
-       
-       $ret = "<form action=\"$script\" method=\"post\">\n";
-       $ret.= "<div>\n";
-       $ret.= "<input type=\"hidden\" name=\"plugin\" value=\"newpage\" />\n";
-       $ret.= "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\" />\n";
-       $ret.= "$_msg_newpage: ";
-       $ret.= "<input type=\"text\" name=\"page\" size=\"30\" value=\"\" />\n";
-       $ret.= "<input type=\"submit\" value=\"$_btn_edit\" />\n";
-       $ret.= "</div>\n";
-       $ret.= "</form>\n";
+       global $script,$vars,$_btn_edit,$_msg_newpage,$BracketName;
+
+       $newpage = '';
+       if (func_num_args()) {
+               list($newpage) = func_get_args();
+       }
+       if (!preg_match("/^$BracketName$/",$newpage)) {
+               $newpage = '';
+       }
+       $s_page = htmlspecialchars(array_key_exists('refer',$vars) ? $vars['refer'] : $vars['page']);
+       $s_newpage = htmlspecialchars($newpage);
+       $ret = <<<EOD
+<form action="$script" method="post">
+ <div>
+  <input type="hidden" name="plugin" value="newpage" />
+  <input type="hidden" name="refer" value="$s_page" />
+  $_msg_newpage:
+  <input type="text" name="page" size="30" value="$s_newpage" />
+  <input type="submit" value="$_btn_edit" />
+ </div>
+</form>
+EOD;
 
        return $ret;
 }
@@ -29,30 +32,18 @@ function plugin_newpage_convert()
 function plugin_newpage_action()
 {
        global $vars,$script,$_btn_edit,$_msg_newpage;
-       
-       if(!$vars["page"]) {
-               $retvars["msg"] = $_msg_newpage;
-               $retvars["body"] = "<form action=\"$script\" method=\"post\">\n";
-               $retvars["body"].= "<div>\n";
-               $retvars["body"].= "<input type=\"hidden\" name=\"plugin\" value=\"newpage\" />\n";
-               $retvars["body"].= "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\" />\n";
-               $retvars["body"].= "$_msg_newpage: ";
-               $retvars["body"].= "<input type=\"text\" name=\"page\" size=\"30\" value=\"\" />\n";
-               $retvars["body"].= "<input type=\"submit\" value=\"$_btn_edit\" />\n";
-               $retvars["body"].= "</div>\n";
-               $retvars["body"].= "</form>\n";
 
+       if ($vars['page'] == '') {
+               $retvars['msg'] = $_msg_newpage;
+               $retvars['body'] = plugin_newpage_convert();
                return $retvars;
        }
-       
-       if(!preg_match("/^($BracketName)|($InterWikiName)$/",$vars["page"]))
-       {
-               $vars["page"] = "[[$vars[page]]]";
-       }
+       $page = strip_bracket($vars['page']);
+       $r_page = rawurlencode(array_key_exists('refer',$vars) ?
+               get_fullname($page,$vars['refer']) : $page);
+       $r_refer = rawurlencode($vars['refer']);
 
-       $wikiname = rawurlencode($vars["page"]);
-       
-       header("Location: $script?$wikiname");
+       header("Location: $script?cmd=read&page=$r_page&refer=$r_refer");
        die();
 }
 ?>