href="...&ls=..." -> href="...&=...." by reimy

diff --git a/backup.php b/backup.php
index 12cf613..bf27468 100644 (file)
--- a/backup.php
+++ b/backup.php
@@ -1,6 +1,6 @@
 <?
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: backup.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+// $Id: backup.php,v 1.2 2002/06/21 12:33:29 masui Exp $
 /////////////////////////////////////////////////
 
 // ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Ç¡¼¥¿¤òºîÀ®¤¹¤ë
@@ -180,11 +180,11 @@ function get_backup_list($_page="")
                        $backupdate = "($ins_date $ins_week $ins_time)";
                        if(!$_page)
                        {
-                               $line["link"] .= "<li><a href=\"$script?cmd=backup&page=$page_url&age=$key\">$key $backupdate</a></li>\n";
+                               $line["link"] .= "<li><a href=\"$script?cmd=backup&amp;page=$page_url&amp;age=$key\">$key $backupdate</a></li>\n";
                        }
                        else
                        {
-                               $line["link"] .= "<li><a href=\"$script?cmd=backup&page=$page_url&age=$key\">$key $backupdate</a> [ <a href=\"$script?cmd=backup_diff&page=$page_url&age=$key\">$_msg_diff</a> | <a href=\"$script?cmd=backup_nowdiff&page=$page_url&age=$key\">$_msg_nowdiff</a> | <a href=\"$script?cmd=backup_source&page=$page_url&age=$key\">$_msg_source</a> ]</li>\n";
+                               $line["link"] .= "<li><a href=\"$script?cmd=backup&amp;page=$page_url&amp;age=$key\">$key $backupdate</a> [ <a href=\"$script?cmd=backup_diff&amp;page=$page_url&amp;age=$key\">$_msg_diff</a> | <a href=\"$script?cmd=backup_nowdiff&amp;page=$page_url&amp;age=$key\">$_msg_nowdiff</a> | <a href=\"$script?cmd=backup_source&amp;page=$page_url&amp;age=$key\">$_msg_source</a> ]</li>\n";
                        }
                }
                if(count($arybackups)) $line["link"] .= "</ul>";

diff --git a/html.php b/html.php
index 0c641d5..858417b 100644 (file)
--- a/html.php
+++ b/html.php
@@ -1,6 +1,6 @@
 <?
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: html.php,v 1.2 2002/06/21 10:42:40 masui Exp $
+// $Id: html.php,v 1.3 2002/06/21 12:33:29 masui Exp $
 /////////////////////////////////////////////////
 
 // ËÜʸ¤ò¥Ú¡¼¥¸Ì¾¤«¤é½ÐÎÏ
@@ -29,15 +29,15 @@ function catbody($title,$page,$body)
                $is_page = 1;
        }
 
-       $link_add = "$script?cmd=add&page=".rawurlencode($vars["page"]);
-       $link_edit = "$script?cmd=edit&page=".rawurlencode($vars["page"]);
-       $link_diff = "$script?cmd=diff&page=".rawurlencode($vars["page"]);
+       $link_add = "$script?cmd=add&amp;page=".rawurlencode($vars["page"]);
+       $link_edit = "$script?cmd=edit&amp;page=".rawurlencode($vars["page"]);
+       $link_diff = "$script?cmd=diff&amp;page=".rawurlencode($vars["page"]);
        $link_top = "$script?$defaultpage";
        $link_list = "$script?cmd=list";
        $link_filelist = "$script?cmd=filelist";
        $link_search = "$script?cmd=search";
        $link_whatsnew = "$script?$whatsnew";
-       $link_backup = "$script?cmd=backup&page=".rawurlencode($vars["page"]);
+       $link_backup = "$script?cmd=backup&amp;page=".rawurlencode($vars["page"]);
        $link_help = "$script?cmd=help";
 
        if(is_page($vars["page"]) && $is_page)
@@ -441,7 +441,7 @@ function edit_form($postdata,$page,$add=0)
        if($vars["help"] == "true")
                $help = $hr.catrule();
        else
-               $help = "<br>\n<ul><li><a href=\"$script?cmd=edit&help=true&page=".rawurlencode($page)."\">$_msg_help</a></ul></li>\n";
+               $help = "<br>\n<ul><li><a href=\"$script?cmd=edit&amp;help=true&amp;page=".rawurlencode($page)."\">$_msg_help</a></ul></li>\n";
 
        if($function_freeze)
                $str_freeze = '<input type="submit" name="freeze" value="'.$_btn_freeze.'" accesskey="f">';
@@ -690,7 +690,7 @@ function make_link($name)
                        return "<a href=\"$script?$percent_name\" $str_title>$page</a>";
                }
                else
-                       return "<span class=\"noexists\">$page<a href=\"$script?cmd=edit&page=$percent_name&refer=$refer\">?</a></span>";
+                       return "<span class=\"noexists\">$page<a href=\"$script?cmd=edit&amp;page=$percent_name&amp;refer=$refer\">?</a></span>";
        }
        else
        {
@@ -754,7 +754,7 @@ function make_search($page)
        //if(preg_match("/^$WikiName$/",$page))
        //      $name = preg_replace("/([A-Z][a-z]+)/","$1 ",$name);
 
-       return "<a href=\"$script?cmd=search&word=$url\">$name</a> ";
+       return "<a href=\"$script?cmd=search&amp;word=$url\">$name</a> ";
 }
 
 ?>

diff --git a/plugin/attach.inc.php b/plugin/attach.inc.php
index b4b3aac..3402d78 100644 (file)
--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -53,8 +53,8 @@ function plugin_attach_convert()
                                $counter = ' <small>' . chop($list[0]) . '·ï</small>';
                        }
                        
-                       $del = "[<a href=\"$script?plugin=attach&mode=confirm&delfile=${filename_url}&refer=${refername_url}\" title=\"".str_replace('$1',$filename,$_msg_delete)."\">$_btn_delete</a>]";
-                       $open = "<a href=\"$script?plugin=attach&openfile=${filename_url}&refer=${refername_url}\" title=\"$lastmod $file_size\">$icon$filename</a>$counter\n";
+                       $del = "[<a href=\"$script?plugin=attach&amp;mode=confirm&amp;delfile=${filename_url}&amp;refer=${refername_url}\" title=\"".str_replace('$1',$filename,$_msg_delete)."\">$_btn_delete</a>]";
+                       $open = "<a href=\"$script?plugin=attach&amp;openfile=${filename_url}&amp;refer=${refername_url}\" title=\"$lastmod $file_size\">$icon$filename</a>$counter\n";
                        
                        $into = "$open <small>$del</small>";
                        
@@ -83,7 +83,7 @@ function plugin_attach_convert()
                $ret.= "<input type=\"hidden\" name=\"plugin\" value=\"attach\">\n";
                $ret.= "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n";
                $ret.= "<input type=\"hidden\" name=\"max_file_size\" value=\"".MAX_FILESIZE."\">\n";
-               $ret.= "<small>[<a href=\"$script?plugin=attach&pcmd=list\">$_msg_attach_filelist</a>]</small><br>\n";
+               $ret.= "<small>[<a href=\"$script?plugin=attach&amp;pcmd=list\">$_msg_attach_filelist</a>]</small><br>\n";
                $ret.= "<small>".str_replace('$1',$max_size,$_msg_maxsize)."</small><br>\n";
                $ret.= "$_msg_attachfile: <input type=\"file\" name=\"attach_file\">\n";
                $ret.= "<input type=\"submit\" value=\"$_btn_upload\"><br>\n";
@@ -192,9 +192,9 @@ function plugin_attach_action()
                                
                                $lastmod = date("Y/m/d H:i:s",filemtime(UPLOAD_DIR.$file));
                                
-                               $del = "[<a href=\"$script?plugin=attach&mode=confirm&delfile=${filename_url}&refer=${pagename_url}\" title=\"".str_replace('$1',$filename,$_msg_delete)."\">$_btn_delete</a>]";
+                               $del = "[<a href=\"$script?plugin=attach&amp;mode=confirm&amp;delfile=${filename_url}&amp;refer=${pagename_url}\" title=\"".str_replace('$1',$filename,$_msg_delete)."\">$_btn_delete</a>]";
                                
-                               $open = "<a href=\"$script?plugin=attach&openfile=${filename_url}&refer=${pagename_url}\" title=\"$lastmod $file_size\">$filename</a>";
+                               $open = "<a href=\"$script?plugin=attach&amp;openfile=${filename_url}&amp;refer=${pagename_url}\" title=\"$lastmod $file_size\">$filename</a>";
 
                                $aryret[$pagename] .= "<li>$open <small>$del</small></li>\n";
                        }
@@ -224,7 +224,7 @@ function plugin_attach_action()
                $ret.= "<input type=\"hidden\" name=\"plugin\" value=\"attach\">\n";
                $ret.= "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n";
                $ret.= "<input type=\"hidden\" name=\"max_file_size\" value=\"".MAX_FILESIZE."\">\n";
-               $ret.= "<small>[<a href=\"$script?plugin=attach&pcmd=list\">$_msg_attach_filelist</a>]</small><br>\n";
+               $ret.= "<small>[<a href=\"$script?plugin=attach&amp;pcmd=list\">$_msg_attach_filelist</a>]</small><br>\n";
                $ret.= "<small>".str_replace('$1',$max_size,$_msg_maxsize)."</small><br>\n";
                $ret.= "$_msg_attachfile: <input type=\"file\" name=\"attach_file\">\n";
                $ret.= "<input type=\"submit\" value=\"$_btn_upload\"><br>\n";

diff --git a/plugin/calendar.inc.php b/plugin/calendar.inc.php
index 3e7926a..0ae7681 100644 (file)
--- a/plugin/calendar.inc.php
+++ b/plugin/calendar.inc.php
@@ -117,13 +117,13 @@ function plugin_calendar_convert()
                $page = "[[$prefix$dt]]";
                $page_url = rawurlencode("[[$prefix$dt]]");
                
-               if($cmd == "edit") $refer = "&refer=$page_url";
+               if($cmd == "edit") $refer = "&refer=$page_url";
                else               $refer = "";
                
                if($cmd == "read" && !is_page($page))
                        $link = "<b>$day</b>";
                else
-                       $link = "<a href=\"$script?cmd=$cmd&page=$page_url$refer\" title=\"$name\"><b>$day</b></a>";
+                       $link = "<a href=\"$script?cmd=$cmd&amp;page=$page_url$refer\" title=\"$name\"><b>$day</b></a>";
 
                if($fweek)
                {

diff --git a/plugin/calendar2.inc.php b/plugin/calendar2.inc.php
index 530dc4b..cfb5e86 100644 (file)
--- a/plugin/calendar2.inc.php
+++ b/plugin/calendar2.inc.php
@@ -113,7 +113,7 @@ function plugin_calendar2_convert()
   <tbody>
   <tr>
     <td align="middle" class="style_td_caltop" colspan="7" height="15">
-      <div align="center"><small><a href="'.$script.'?plugin=calendar2&file='.$prefix_.'&date='.$prev_date_str.'">&lt;&lt;</a> <b>'.$m_name.'</b> <a href="'.$script.'?plugin=calendar2&file='.$prefix_.'&date='.$next_date_str.'">&gt;&gt;</a></small></div>
+      <div align="center"><small><a href="'.$script.'?plugin=calendar2&amp;file='.$prefix_.'&amp;date='.$prev_date_str.'">&lt;&lt;</a> <b>'.$m_name.'</b> <a href="'.$script.'?plugin=calendar2&amp;file='.$prefix_.'&amp;date='.$next_date_str.'">&gt;&gt;</a></small></div>
     </td>
   </tr>
   <tr>
@@ -125,7 +125,7 @@ function plugin_calendar2_convert()
   <tbody>
   <tr>
     <td align="middle" class="style_td_caltop" colspan="7" height="15">
-      <div align="center"><small><a href="'.$script.'?plugin=calendar2&file='.$prefix_.'&date='.$prev_date_str.'">&lt;&lt;</a> <b>'.$m_name.'</b> <a href="'.$script.'?plugin=calendar2&file='.$prefix_.'&date='.$next_date_str.'">&gt;&gt;</a><br>[<a href="'.$script.'?'.$prefix_url.'">'.$pre.'</a>]</small></div>
+      <div align="center"><small><a href="'.$script.'?plugin=calendar2&amp;file='.$prefix_.'&amp;date='.$prev_date_str.'">&lt;&lt;</a> <b>'.$m_name.'</b> <a href="'.$script.'?plugin=calendar2&amp;file='.$prefix_.'&amp;date='.$next_date_str.'">&gt;&gt;</a><br>[<a href="'.$script.'?'.$prefix_url.'">'.$pre.'</a>]</small></div>
     </td>
   </tr>
   <tr>
@@ -149,13 +149,13 @@ function plugin_calendar2_convert()
                $page = "[[$prefix$dt]]";
                $page_url = rawurlencode("[[$prefix$dt]]");
                
-               if($cmd == "edit") $refer = "&refer=$page_url";
+               if($cmd == "edit") $refer = "&amp;refer=$page_url";
                else               $refer = "";
                
                if($cmd == "read" && !is_page($page))
-                       $link = "<small><a href=\"$script?cmd=$cmd&page=$page_url$refer\" title=\"$name\">$day</a></small>";
+                       $link = "<small><a href=\"$script?cmd=$cmd&amp;page=$page_url$refer\" title=\"$name\">$day</a></small>";
                else
-                       $link = "<a href=\"$script?cmd=$cmd&page=$page_url$refer\" title=\"$name\"><b>$day</b></a>";
+                       $link = "<a href=\"$script?cmd=$cmd&amp;page=$page_url$refer\" title=\"$name\"><b>$day</b></a>";
 
                if($fweek)
                {
@@ -206,7 +206,7 @@ function plugin_calendar2_convert()
        $page_url = rawurlencode($page);
        if(is_page($page)) {
                $str = convert_html(join("",file(get_filename(encode($page)))));
-               $str .= "<hr><small><a href=\"$script?cmd=edit&page=$page\">[¤³¤ÎÆüµ­¤òÊÔ½¸]</a></small>";
+               $str .= "<hr><small><a href=\"$script?cmd=edit&amp;page=$page\">[¤³¤ÎÆüµ­¤òÊÔ½¸]</a></small>";
        }
        else {
                $str = make_link(sprintf('[[%s%4d-%02d-%02d]]',$prefix, $today[year], $today[mon], $today[mday])).'¤Ï¶õ¤Ç¤¹¡£';

diff --git a/plugin/ls.inc.php b/plugin/ls.inc.php
index 6e149a3..ccf79e3 100644 (file)
--- a/plugin/ls.inc.php
+++ b/plugin/ls.inc.php
@@ -48,7 +48,7 @@ function plugin_ls_convert()
                        $url = rawurlencode($page);
                        $name = strip_bracket($page);
                        $title = $name ." " .get_pg_passage($page,false);
-                       $ls .= "<li><a href=\"$script?cmd=read&page=$url\" title=\"$title\">$name</a>$comment\n";
+                       $ls .= "<li><a href=\"$script?cmd=read&amp;page=$url\" title=\"$title\">$name</a>$comment\n";
                }
                closedir($dir);
        }

diff --git a/plugin/template.inc.php b/plugin/template.inc.php
index 08bf04d..6449639 100644 (file)
--- a/plugin/template.inc.php
+++ b/plugin/template.inc.php
@@ -34,7 +34,7 @@ function plugin_template_action()
                if($vars["help"] == "true")
                        $help = $hr.catrule();
                else
-                       $help = "<br>\n<ul><li><a href=\"$script?cmd=edit&help=true&page=".rawurlencode($page)."\">$_msg_help</a></ul></li>\n";
+                       $help = "<br>\n<ul><li><a href=\"$script?cmd=edit&amp;help=true&amp;page=".rawurlencode($page)."\">$_msg_help</a></ul></li>\n";
 
                if($function_freeze)
                        $str_freeze = '<input type="submit" name="freeze" value="'.$_btn_freeze.'" accesskey="f">';

diff --git a/plugin/yetlist.inc.php b/plugin/yetlist.inc.php
index 42cefc3..4095449 100644 (file)
--- a/plugin/yetlist.inc.php
+++ b/plugin/yetlist.inc.php
@@ -112,7 +112,7 @@ function plugin_yetlist_action()
                }
                $link_ref = trim($link_ref);
                
-               $ret["body"] .= "<li><a href=\"$script?cmd=edit&page=$url&refer=$refurl\">$wbn</a> <i>($link_ref)</i></li>\n";
+               $ret["body"] .= "<li><a href=\"$script?cmd=edit&amp;page=$url&amp;refer=$refurl\">$wbn</a> <i>($link_ref)</i></li>\n";
        }
 
 

diff --git a/pukiwiki.php b/pukiwiki.php
index 7d8ad50..330446c 100644 (file)
--- a/pukiwiki.php
+++ b/pukiwiki.php
@@ -26,7 +26,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
-// $Id: pukiwiki.php,v 1.2 2002/06/21 05:21:46 masui Exp $
+// $Id: pukiwiki.php,v 1.3 2002/06/21 12:33:29 masui Exp $
 /////////////////////////////////////////////////
 
 
@@ -98,7 +98,7 @@ else if(((arg_check("add") || arg_check("edit") || arg_check("preview")) && (is_
        $page = str_replace('$1',make_search($vars["page"]),$_title_cannotedit);
 
        if(is_freeze($vars["page"]))
-               $body .= "(<a href=\"$script?cmd=unfreeze&page=".rawurlencode($vars["page"])."\">$_msg_unfreeze</a>)";
+               $body .= "(<a href=\"$script?cmd=unfreeze&amp;page=".rawurlencode($vars["page"])."\">$_msg_unfreeze</a>)";
 }
 // ÄɲÃ
 else if(arg_check("add"))
@@ -464,22 +464,22 @@ else if($do_backup && arg_check("backup"))
 
                if(!arg_check("backup_diff") && is_page($get["page"]))
                {
-                       $link = str_replace('$1',"<a href=\"$script?cmd=backup_diff&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_diff</a>",$_msg_view);
+                       $link = str_replace('$1',"<a href=\"$script?cmd=backup_diff&amp;page=".rawurlencode($get["page"])."&amp;age=$get[age]\">$_msg_diff</a>",$_msg_view);
                        $body .= "<li>$link</li>\n";
                }
                if(!arg_check("backup_nowdiff") && is_page($get["page"]))
                {
-                       $link = str_replace('$1',"<a href=\"$script?cmd=backup_nowdiff&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_nowdiff</a>",$_msg_view);
+                       $link = str_replace('$1',"<a href=\"$script?cmd=backup_nowdiff&amp;page=".rawurlencode($get["page"])."&amp;age=$get[age]\">$_msg_nowdiff</a>",$_msg_view);
                        $body .= "<li>$link</li>\n";
                }
                if(!arg_check("backup_source"))
                {
-                       $link = str_replace('$1',"<a href=\"$script?cmd=backup_source&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_source</a>",$_msg_view);
+                       $link = str_replace('$1',"<a href=\"$script?cmd=backup_source&amp;page=".rawurlencode($get["page"])."&amp;age=$get[age]\">$_msg_source</a>",$_msg_view);
                        $body .= "<li>$link</li>\n";
                }
                if(arg_check("backup_diff") || arg_check("backup_source") || arg_check("backup_nowdiff"))
                {
-                       $link = str_replace('$1',"<a href=\"$script?cmd=backup&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_backup</a>",$_msg_view);
+                       $link = str_replace('$1',"<a href=\"$script?cmd=backup&amp;page=".rawurlencode($get["page"])."&amp;age=$get[age]\">$_msg_backup</a>",$_msg_view);
                        $body .= "<li>$link</li>\n";
                }
                
@@ -504,7 +504,7 @@ else if($do_backup && arg_check("backup"))
                        $ins_week = "(".$weeklabels[date("w",$val)].")";
                        $backupdate = "($ins_date $ins_week $ins_time)";
                        if($key != $get["age"])
-                               $body .= "<li><a href=\"$script?cmd=$get[cmd]&page=".rawurlencode($get["page"])."&age=$key\">$key $backupdate</a></li>\n";
+                               $body .= "<li><a href=\"$script?cmd=$get[cmd]&amp;page=".rawurlencode($get["page"])."&amp;age=$key\">$key $backupdate</a></li>\n";
                        else
                                $body .= "<li><i>$key $backupdate</i></li>\n";
                }