BugTrack/2436 ESLint - Linting utility for JavaScript

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

diff --git a/plugin/article.inc.php b/plugin/article.inc.php
index bfcdb22..d077425 100644 (file)
--- a/plugin/article.inc.php
+++ b/plugin/article.inc.php
@@ -1,9 +1,11 @@
 <?php
-// $Id: article.inc.php,v 1.28 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2002-2005 PukiWiki Developers Team
+// PukiWiki - Yet another WikiWikiWeb clone
+// article.inc.php
+// Copyright
+//   2002-2017 PukiWiki Development Team
 //   2002      Originally written by OKAWARA,Satoshi <kawara@dml.co.jp>
 //             http://www.dml.co.jp/~kawara/pukiwiki/pukiwiki.php
+// License: GPL v2 or (at your option) any later version
 //
 // article: BBS-like plugin
 
@@ -45,11 +47,12 @@ $_plugin_article_mailto = array (
 
 function plugin_article_action()
 {
-       global $script, $post, $vars, $cols, $rows, $now;
+       global $post, $vars, $cols, $rows, $now;
        global $_title_collided, $_msg_collided, $_title_updated;
        global $_plugin_article_mailto, $_no_subject, $_no_name;
        global $_msg_article_mail_sender, $_msg_article_mail_page;
 
+       $script = get_base_uri();
        if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 
        if ($post['msg'] == '')
@@ -121,7 +124,7 @@ EOD;
                        $mailbody .= "\n\n" . '---' . "\n";
                        $mailbody .= $_msg_article_mail_sender . $post['name'] . ' (' . $now . ')' . "\n";
                        $mailbody .= $_msg_article_mail_page . $post['refer'] . "\n";
-                       $mailbody .= '   URL: ' . $script . '?' . pagename_urlencode($post['refer']) . "\n";
+                       $mailbody .= '   URL: ' . get_page_uri($post['refer'], PKWK_URI_ABSOLUTE) . "\n";
                        $mailbody = mb_convert_encoding($mailbody, 'JIS');
 
                        $mailaddheader = 'From: ' . PLUGIN_ARTICLE_MAIL_FROM;
@@ -142,10 +145,11 @@ EOD;
 
 function plugin_article_convert()
 {
-       global $script, $vars, $digest;
+       global $vars, $digest;
        global $_btn_article, $_btn_name, $_btn_subject;
        static $numbers = array();
 
+       $script = get_base_uri();
        if (PKWK_READONLY) return ''; // Show nothing
 
        if (! isset($numbers[$vars['page']])) $numbers[$vars['page']] = 0;
@@ -177,4 +181,3 @@ EOD;
 
        return $string;
 }
-