BugTrack/2176 showrss: Fix character encoding issues etc.

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

diff --git a/plugin/tracker.inc.php b/plugin/tracker.inc.php
index 56ecc4e..3c94911 100644 (file)
--- a/plugin/tracker.inc.php
+++ b/plugin/tracker.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
 // tracker.inc.php
-// Copyright 2003-2016 PukiWiki Development Team
+// Copyright 2003-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Issue tracker plugin (See Also bugtrack plugin)
@@ -17,8 +17,9 @@ define('TRACKER_LIST_SHOW_ERROR_PAGE',TRUE);
 
 function plugin_tracker_convert()
 {
-       global $script,$vars;
+       global $vars;
 
+       $script = get_base_uri();
        if (PKWK_READONLY) return ''; // Show nothing
 
        $base = $refer = $vars['page'];
@@ -121,26 +122,30 @@ function plugin_tracker_action()
                        'body'=>'page name ('.htmlsc($base).') is not valid.'
                );
        }
-       $num = 0;
        $name = (array_key_exists('_name',$post)) ? $post['_name'] : '';
-       if (array_key_exists('_page',$post))
-       {
-               $page = $real = $post['_page'];
-       }
-       else
-       {
-               $real = is_pagename($name) ? $name : ++$num;
-               $page = get_fullname('./'.$real,$base);
-       }
-       if (!is_pagename($page))
-       {
-               $page = $base;
-       }
-
-       while (is_page($page))
-       {
-               $real = ++$num;
-               $page = "$base/$real";
+       $_page = (array_key_exists('_page',$post)) ? $post['_page'] : '';
+       if (is_pagename($_page)) {
+               // Create _page page if _page is in parameters
+               $page = $real = $_page;
+       } else if (is_pagename($name)) {
+               // Create "$base/$name" page if _name is in parameters
+               $real = $name;
+               $page = get_fullname('./' . $name, $base);
+       } else {
+               $page = '';
+       }
+       if (!is_pagename($page) || is_page($page)) {
+               // Need new page name => Get last article number + 1
+               $page_list = plugin_tracker_get_page_list($base, false);
+               usort($page_list, '_plugin_tracker_list_paganame_compare');
+               if (count($page_list) === 0) {
+                       $num = 1;
+               } else {
+                       $latest_page = $page_list[count($page_list) - 1]['name'];
+                       $num = intval(substr($latest_page, strlen($base) + 1)) + 1;
+               }
+               $real = '' . $num;
+               $page = $base . '/' . $num;
        }
        // ページデータを生成
        $postdata = plugin_tracker_get_source($source);
@@ -155,6 +160,7 @@ function plugin_tracker_action()
 
        $fields = plugin_tracker_get_fields($page,$refer,$config);
 
+       check_editable($page, true, true);
        // Creating an empty page, before attaching files
        touch(get_filename($page));
 
@@ -180,13 +186,39 @@ function plugin_tracker_action()
 
        // Writing page data, without touch
        page_write($page, join('', $postdata));
-
-       $r_page = pagename_urlencode($page);
-
        pkwk_headers_sent();
-       header('Location: ' . get_script_uri() . '?' . $r_page);
+       header('Location: ' . get_page_uri($page, PKWK_URI_ROOT));
        exit;
 }
+
+/**
+ * Page_list comparator
+ */
+function _plugin_tracker_list_paganame_compare($a, $b)
+{
+       return strnatcmp($a['name'], $b['name']);
+}
+
+/**
+ * Get page list for "$page/"
+ */
+function plugin_tracker_get_page_list($page, $needs_filetime) {
+       $page_list = array();
+       $pattern = $page . '/';
+       $pattern_len = strlen($pattern);
+       foreach (get_existpages() as $p) {
+               if (strncmp($p, $pattern, $pattern_len) === 0 && pkwk_ctype_digit(substr($p, $pattern_len))) {
+                       if ($needs_filetime) {
+                               $page_list[] = array('name'=>$p,'filetime'=>get_filetime($p));
+                       } else {
+                               $page_list[] = array('name'=>$p);
+                       }
+               }
+       }
+       return $page_list;
+}
+
+
 /*
 function plugin_tracker_inline()
 {
@@ -594,7 +626,7 @@ class Tracker_field_past extends Tracker_field
 // 一覧表示
 function plugin_tracker_list_convert()
 {
-       global $vars;
+       global $vars, $_title_cannotread;
 
        $config = 'default';
        $page = $refer = $vars['page'];
@@ -619,11 +651,15 @@ function plugin_tracker_list_convert()
                                list($config,$list) = array_pad(explode('/',$config,2),2,$list);
                }
        }
+       if (!is_page_readable($page)) {
+               $body = str_replace('$1', htmlsc($page), $_title_cannotread);
+               return $body;
+       }
        return plugin_tracker_getlist($page,$refer,$config,$list,$order,$limit);
 }
 function plugin_tracker_list_action()
 {
-       global $script,$vars,$_tracker_messages;
+       global $vars, $_tracker_messages, $_title_cannotread;
 
        $page = $refer = $vars['refer'];
        $s_page = make_pagelink($page);
@@ -631,6 +667,13 @@ function plugin_tracker_list_action()
        $list = array_key_exists('list',$vars) ? $vars['list'] : 'list';
        $order = array_key_exists('order',$vars) ? $vars['order'] : '_real:SORT_DESC';
 
+       if (!is_page_readable($page)) {
+               $body = str_replace('$1', htmlsc($page), $_title_cannotread);
+               return array(
+                       'msg' => $body,
+                       'body' => $body
+               );
+       }
        return array(
                'msg' => $_tracker_messages['msg_list'],
                'body'=> str_replace('$1',$s_page,$_tracker_messages['msg_back']).
@@ -848,8 +891,6 @@ class Tracker_list
        }
        function replace_title($arr)
        {
-               global $script;
-
                $field = $sort = $arr[1];
                if ($sort == '_name' or $sort == '_page')
                {
@@ -887,6 +928,7 @@ class Tracker_list
                                $_order[] = "$key:$value";
                $r_order = rawurlencode(join(';',$_order));
 
+               $script = get_base_uri(PKWK_URI_ABSOLUTE);
                return "[[$title$arrow>$script?plugin=tracker_list&refer=$r_page&config=$r_config&list=$r_list&order=$r_order]]";
        }
        function toString($limit=NULL)