OSDN Git Service

BugTrack/2176 showrss: Fix character encoding issues etc.
[pukiwiki/pukiwiki.git] / plugin / tracker.inc.php
index fa56ea7..3c94911 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: tracker.inc.php,v 1.124 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C) 2003-2005, 2007 PukiWiki Developers Team
+// tracker.inc.php
+// 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'];
@@ -114,26 +115,37 @@ function plugin_tracker_action()
        }
        // ページ名を決定
        $base = $post['_base'];
-       $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))
+       if (!is_pagename($base))
        {
-               $page = $base;
+               return array(
+                       'msg'=>'cannot write',
+                       'body'=>'page name ('.htmlsc($base).') is not valid.'
+               );
        }
-
-       while (is_page($page))
-       {
-               $real = ++$num;
-               $page = "$base/$real";
+       $name = (array_key_exists('_name',$post)) ? $post['_name'] : '';
+       $_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);
@@ -148,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));
 
@@ -173,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()
 {
@@ -229,7 +268,7 @@ function plugin_tracker_get_fields($base,$refer,&$config)
                ) as $field=>$class)
        {
                $class = 'Tracker_field_'.$class;
-               $fields[$field] = &new $class(array($field,$_tracker_messages["btn$field"],'','20',''),$base,$refer,$config);
+               $fields[$field] = new $class(array($field,$_tracker_messages["btn$field"],'','20',''),$base,$refer,$config);
        }
 
        foreach ($config->get('fields') as $field)
@@ -242,7 +281,7 @@ function plugin_tracker_get_fields($base,$refer,&$config)
                        $field[2] = 'text';
                        $field[3] = '20';
                }
-               $fields[$field[0]] = &new $class($field,$base,$refer,$config);
+               $fields[$field[0]] = new $class($field,$base,$refer,$config);
        }
        return $fields;
 }
@@ -262,6 +301,10 @@ class Tracker_field
 
        function Tracker_field($field,$page,$refer,&$config)
        {
+               $this->__construct($field, $page, $refer, $config);
+       }
+       function __construct($field,$page,$refer,&$config)
+       {
                global $post;
                static $id = 0;
 
@@ -368,7 +411,11 @@ class Tracker_field_format extends Tracker_field
 
        function Tracker_field_format($field,$page,$refer,&$config)
        {
-               parent::Tracker_field($field,$page,$refer,$config);
+               $this->__construct($field, $page, $refer, $config);
+       }
+       function __construct($field,$page,$refer,&$config)
+       {
+               parent::__construct($field,$page,$refer,$config);
 
                foreach ($this->config->get($this->name) as $option)
                {
@@ -579,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'];
@@ -604,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);
@@ -616,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']).
@@ -638,7 +696,7 @@ function plugin_tracker_getlist($page,$refer,$config_name,$list,$order='',$limit
                return "<p>config file '".make_pagelink($config->page.'/'.$list)."' not found.</p>";
        }
 
-       $list = &new Tracker_list($page,$refer,$config,$list);
+       $list = new Tracker_list($page,$refer,$config,$list);
        $list->sort($order);
        return $list->toString($limit);
 }
@@ -658,6 +716,10 @@ class Tracker_list
 
        function Tracker_list($page,$refer,&$config,$list)
        {
+               $this->__construct($page, $refer, $config, $list);
+       }
+       function __construct($page,$refer,&$config,$list)
+       {
                $this->page = $page;
                $this->config = &$config;
                $this->list = $list;
@@ -679,7 +741,7 @@ class Tracker_list
                        {
                                $field = array_shift($pattern);
                                $this->pattern_fields[] = $field;
-                               $this->pattern .= '(.*)';
+                               $this->pattern .= '(.*?)';
                        }
                }
                // ページの列挙と取り込み
@@ -797,7 +859,7 @@ class Tracker_list
                        $sort_keys[] = array('field' => $field, 'dir' => $order);
                }
                $this->sort_keys = $sort_keys;
-               usort(&$this->rows, array($this, 'compare'));
+               usort($this->rows, array($this, 'compare'));
        }
        function replace_item($arr)
        {
@@ -829,8 +891,6 @@ class Tracker_list
        }
        function replace_title($arr)
        {
-               global $script;
-
                $field = $sort = $arr[1];
                if ($sort == '_name' or $sort == '_page')
                {
@@ -868,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)
@@ -911,7 +972,7 @@ class Tracker_list
                        {
                                if (trim($line) == '')
                                {
-                                       $source .= $line;
+                                       // Ignore empty line
                                        continue;
                                }
                                $this->pipe = ($line{0} == '|' or $line{0} == ':');
@@ -924,9 +985,11 @@ class Tracker_list
 function plugin_tracker_get_source($page)
 {
        $source = get_source($page);
-       // 見出しの固有ID部を削除
-       $source = preg_replace('/^(\*{1,3}.*)\[#[A-Za-z][\w-]+\](.*)$/m','$1$2',$source);
-       // #freezeを削除
-       return preg_replace('/^#freeze\s*$/im', '', $source);
+       // Delete anchor part of Headings (Example: "*Heading1 [#id] AAA" to "*Heading1 AAA")
+       $s2 = preg_replace('/^(\*{1,3}.*)\[#[A-Za-z][\w-]+\](.*)$/m','$1$2',$source);
+       // Delete #freeze
+       $s3 = preg_replace('/^#freeze\s*$/im', '', $s2);
+       // Delete #author line
+       $s4 = preg_replace('/^#author\b[^\r\n]*$/im', '', $s3);
+       return $s4;
 }
-