<?php
// PukiWiki - Yet another WikiWikiWeb clone
-// $Id: tracker.inc.php,v 1.33 2005/10/05 13:57:35 henoheno Exp $
+// 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)
-// tracker_list¤Çɽ¼¨¤·¤Ê¤¤¥Ú¡¼¥¸Ì¾(Àµµ¬É½¸½¤Ç)
-// 'SubMenu'¥Ú¡¼¥¸ ¤ª¤è¤Ó '/'¤ò´Þ¤à¥Ú¡¼¥¸¤ò½ü³°¤¹¤ë
+// tracker_listで表示しないページ名(正規表現で)
+// 'SubMenu'ページ および '/'を含むページを除外する
define('TRACKER_LIST_EXCLUDE_PATTERN','#^SubMenu$|/#');
-// À©¸Â¤·¤Ê¤¤¾ì¹ç¤Ï¤³¤Á¤é
+// 制限しない場合はこちら
//define('TRACKER_LIST_EXCLUDE_PATTERN','#(?!)#');
-// ¹àÌܤμè¤ê½Ð¤·¤Ë¼ºÇÔ¤·¤¿¥Ú¡¼¥¸¤ò°ìÍ÷¤Ëɽ¼¨¤¹¤ë
+// 項目の取り出しに失敗したページを一覧に表示する
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'];
if (!$config->read())
{
- return "<p>config file '".htmlspecialchars($config_name)."' not found.</p>";
+ return "<p>config file '".htmlsc($config_name)."' not found.</p>";
}
$config->config_name = $config_name;
$config = new Config('plugin/tracker/'.$config_name);
if (!$config->read())
{
- return "<p>config file '".htmlspecialchars($config_name)."' not found.</p>";
+ return "<p>config file '".htmlsc($config_name)."' not found.</p>";
}
$config->config_name = $config_name;
$source = $config->page.'/page';
{
return array(
'msg'=>'cannot write',
- 'body'=>'page name ('.htmlspecialchars($refer).') is not valid.'
+ 'body'=>'page name ('.htmlsc($refer).') is not valid.'
);
}
if (!is_page($source))
{
return array(
'msg'=>'cannot write',
- 'body'=>'page template ('.htmlspecialchars($source).') is not exist.'
+ 'body'=>'page template ('.htmlsc($source).') is not exist.'
);
}
- // ¥Ú¡¼¥¸Ì¾¤ò·èÄê
+ // ページ名を決定
$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;
- }
-
- while (is_page($page))
- {
- $real = ++$num;
- $page = "$base/$real";
+ return array(
+ 'msg'=>'cannot write',
+ 'body'=>'page name ('.htmlsc($base).') is not valid.'
+ );
}
- // ¥Ú¡¼¥¸¥Ç¡¼¥¿¤òÀ¸À®
+ $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);
- // µ¬Äê¤Î¥Ç¡¼¥¿
+ // è¦\8få®\9aã\81®ã\83\87ã\83¼ã\82¿
$_post = array_merge($post,$_FILES);
$_post['_date'] = $now;
$_post['_page'] = $page;
$fields = plugin_tracker_get_fields($page,$refer,$config);
+ check_editable($page, true, true);
// Creating an empty page, before attaching files
touch(get_filename($page));
// Writing page data, without touch
page_write($page, join('', $postdata));
-
- $r_page = rawurlencode($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()
{
if (!$config->read())
{
- return "config file '".htmlspecialchars($config_name)."' not found.";
+ return "config file '".htmlsc($config_name)."' not found.";
}
$config->config_name = $config_name;
return $fields[$field]->get_tag();
}
*/
-// ¥Õ¥£¡¼¥ë¥É¥ª¥Ö¥¸¥§¥¯¥È¤ò¹½ÃÛ¤¹¤ë
+// フィールドオブジェクトを構築する
function plugin_tracker_get_fields($base,$refer,&$config)
{
global $now,$_tracker_messages;
$fields = array();
- // ͽÌó¸ì
+ // 予約語
foreach (array(
- '_date'=>'text', // Åê¹ÆÆü»þ
- '_update'=>'date', // ºÇ½ª¹¹¿·
- '_past'=>'past', // ·Ð²á(passage)
- '_page'=>'page', // ¥Ú¡¼¥¸Ì¾
- '_name'=>'text', // »ØÄꤵ¤ì¤¿¥Ú¡¼¥¸Ì¾
- '_real'=>'real', // ¼ÂºÝ¤Î¥Ú¡¼¥¸Ì¾
- '_refer'=>'page', // »²¾È¸µ(¥Õ¥©¡¼¥à¤Î¤¢¤ë¥Ú¡¼¥¸)
- '_base'=>'page', // ´ð½à¥Ú¡¼¥¸
- '_submit'=>'submit' // Äɲåܥ¿¥ó
+ '_date'=>'text', // 投稿日時
+ '_update'=>'date', // 最終更新
+ '_past'=>'past', // 経過(passage)
+ '_page'=>'page', // ページ名
+ '_name'=>'text', // 指定されたページ名
+ '_real'=>'real', // 実際のページ名
+ '_refer'=>'page', // å\8f\82ç\85§å\85\83(ã\83\95ã\82©ã\83¼ã\83 ã\81®ã\81\82ã\82\8bã\83\9aã\83¼ã\82¸)
+ '_base'=>'page', // å\9fºæº\96ã\83\9aã\83¼ã\82¸
+ '_submit'=>'submit' // 追加ボタン
) 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)
{
- // 0=>¹àÌÜ̾ 1=>¸«½Ð¤· 2=>·Á¼° 3=>¥ª¥×¥·¥ç¥ó 4=>¥Ç¥Õ¥©¥ë¥ÈÃÍ
+ // 0=>項目名 1=>見出し 2=>形式 3=>オプション 4=>デフォルト値
$class = 'Tracker_field_'.$field[2];
if (!class_exists($class))
- { // ¥Ç¥Õ¥©¥ë¥È
+ { // デフォルト
$class = 'Tracker_field_text';
$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;
}
-// ¥Õ¥£¡¼¥ë¥É¥¯¥é¥¹
+// ã\83\95ã\82£ã\83¼ã\83«ã\83\89ã\82¯ã\83©ã\82¹
class Tracker_field
{
var $name;
function Tracker_field($field,$page,$refer,&$config)
{
+ $this->__construct($field, $page, $refer, $config);
+ }
+ function __construct($field,$page,$refer,&$config)
+ {
global $post;
static $id = 0;
function get_tag()
{
- $s_name = htmlspecialchars($this->name);
- $s_size = htmlspecialchars($this->values[0]);
- $s_value = htmlspecialchars($this->default_value);
+ $s_name = htmlsc($this->name);
+ $s_size = htmlsc($this->values[0]);
+ $s_value = htmlsc($this->default_value);
return "<input type=\"text\" name=\"$s_name\" size=\"$s_size\" value=\"$s_value\" />";
}
}
function get_tag()
{
- $s_name = htmlspecialchars($this->name);
- $s_cols = htmlspecialchars($this->values[0]);
- $s_rows = htmlspecialchars($this->values[1]);
- $s_value = htmlspecialchars($this->default_value);
+ $s_name = htmlsc($this->name);
+ $s_cols = htmlsc($this->values[0]);
+ $s_rows = htmlsc($this->values[1]);
+ $s_value = htmlsc($this->default_value);
return "<textarea name=\"$s_name\" cols=\"$s_cols\" rows=\"$s_rows\">$s_value</textarea>";
}
function format_cell($str)
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)
{
}
function get_tag()
{
- $s_name = htmlspecialchars($this->name);
- $s_size = htmlspecialchars($this->values[0]);
+ $s_name = htmlsc($this->name);
+ $s_size = htmlsc($this->values[0]);
return "<input type=\"text\" name=\"$s_name\" size=\"$s_size\" />";
}
function get_key($str)
function get_tag()
{
- $s_name = htmlspecialchars($this->name);
- $s_size = htmlspecialchars($this->values[0]);
+ $s_name = htmlsc($this->name);
+ $s_size = htmlsc($this->values[0]);
return "<input type=\"file\" name=\"$s_name\" size=\"$s_size\" />";
}
function format_value($str)
{
require_once(PLUGIN_DIR.'attach.inc.php');
$result = attach_upload($_FILES[$this->name],$this->page);
- if ($result['result']) // ¥¢¥Ã¥×¥í¡¼¥ÉÀ®¸ù
+ if ($result['result']) // アップロード成功
{
return parent::format_value($this->page.'/'.$_FILES[$this->name]['name']);
}
}
- // ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢¥¢¥Ã¥×¥í¡¼¥É¤Ë¼ºÇÔ
+ // ファイルが指定されていないか、アップロードに失敗
return parent::format_value('');
}
}
function get_tag()
{
- $s_name = htmlspecialchars($this->name);
+ $s_name = htmlsc($this->name);
$retval = '';
$id = 0;
foreach ($this->config->get($this->name) as $option)
{
- $s_option = htmlspecialchars($option[0]);
+ $s_option = htmlsc($option[0]);
$checked = trim($option[0]) == trim($this->default_value) ? ' checked="checked"' : '';
++$id;
$s_id = '_p_tracker_' . $s_name . '_' . $this->id . '_' . $id;
function get_tag($empty=FALSE)
{
- $s_name = htmlspecialchars($this->name);
+ $s_name = htmlsc($this->name);
$s_size = (array_key_exists(0,$this->values) and is_numeric($this->values[0])) ?
- ' size="'.htmlspecialchars($this->values[0]).'"' : '';
+ ' size="'.htmlsc($this->values[0]).'"' : '';
$s_multiple = (array_key_exists(1,$this->values) and strtolower($this->values[1]) == 'multiple') ?
' multiple="multiple"' : '';
$retval = "<select name=\"{$s_name}[]\"$s_size$s_multiple>\n";
$defaults = array_flip(preg_split('/\s*,\s*/',$this->default_value,-1,PREG_SPLIT_NO_EMPTY));
foreach ($this->config->get($this->name) as $option)
{
- $s_option = htmlspecialchars($option[0]);
+ $s_option = htmlsc($option[0]);
$selected = array_key_exists(trim($option[0]),$defaults) ? ' selected="selected"' : '';
$retval .= " <option value=\"$s_option\"$selected>$s_option</option>\n";
}
function get_tag($empty=FALSE)
{
- $s_name = htmlspecialchars($this->name);
+ $s_name = htmlsc($this->name);
$defaults = array_flip(preg_split('/\s*,\s*/',$this->default_value,-1,PREG_SPLIT_NO_EMPTY));
$retval = '';
$id = 0;
foreach ($this->config->get($this->name) as $option)
{
- $s_option = htmlspecialchars($option[0]);
+ $s_option = htmlsc($option[0]);
$checked = array_key_exists(trim($option[0]),$defaults) ?
' checked="checked"' : '';
++$id;
function get_tag($empty=FALSE)
{
- $s_name = htmlspecialchars($this->name);
- $s_default = htmlspecialchars($this->default_value);
+ $s_name = htmlsc($this->name);
+ $s_default = htmlsc($this->default_value);
$retval = "<input type=\"hidden\" name=\"$s_name\" value=\"$s_default\" />\n";
return $retval;
{
function get_tag()
{
- $s_title = htmlspecialchars($this->title);
- $s_page = htmlspecialchars($this->page);
- $s_refer = htmlspecialchars($this->refer);
- $s_config = htmlspecialchars($this->config->config_name);
+ $s_title = htmlsc($this->title);
+ $s_page = htmlsc($this->page);
+ $s_refer = htmlsc($this->refer);
+ $s_config = htmlsc($this->config->config_name);
return <<<EOD
<input type="submit" value="$s_title" />
}
}
///////////////////////////////////////////////////////////////////////////
-// °ìÍ÷ɽ¼¨
+// 一覧表示
function plugin_tracker_list_convert()
{
- global $vars;
+ global $vars, $_title_cannotread;
$config = 'default';
$page = $refer = $vars['page'];
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);
$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']).
if (!$config->read())
{
- return "<p>config file '".htmlspecialchars($config_name)."' is not exist.";
+ return "<p>config file '".htmlsc($config_name)."' is not exist.</p>";
}
$config->config_name = $config_name;
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);
}
-// °ìÍ÷¥¯¥é¥¹
+// ä¸\80覧ã\82¯ã\83©ã\82¹
class Tracker_list
{
var $page;
var $pattern_fields;
var $rows;
var $order;
+ var $sort_keys;
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;
$this->fields = plugin_tracker_get_fields($page,$refer,$config);
$pattern = join('',plugin_tracker_get_source($config->page.'/page'));
- // ¥Ö¥í¥Ã¥¯¥×¥é¥°¥¤¥ó¤ò¥Õ¥£¡¼¥ë¥É¤ËÃÖ´¹
- // #comment¤Ê¤É¤ÇÁ°¸å¤Ëʸ»úÎó¤ÎÁý¸º¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¡¢[_block_xxx]¤ËµÛ¤¤¹þ¤Þ¤»¤ë¤è¤¦¤Ë¤¹¤ë
+ // ブロックプラグインをフィールドに置換
+ // #commentなどで前後に文字列の増減があった場合に、[_block_xxx]に吸い込ませるようにする
$pattern = preg_replace('/^\#([^\(\s]+)(?:\((.*)\))?\s*$/m','[_block_$1]',$pattern);
- // ¥Ñ¥¿¡¼¥ó¤òÀ¸À®
+ // パターンを生成
$this->pattern = '';
$this->pattern_fields = array();
$pattern = preg_split('/\\\\\[(\w+)\\\\\]/',preg_quote($pattern,'/'),-1,PREG_SPLIT_DELIM_CAPTURE);
{
$field = array_shift($pattern);
$this->pattern_fields[] = $field;
- $this->pattern .= '(.*)';
+ $this->pattern .= '(.*?)';
}
}
- // ¥Ú¡¼¥¸¤ÎÎóµó¤È¼è¤ê¹þ¤ß
+ // ページの列挙と取り込み
$this->rows = array();
$pattern = "$page/";
$pattern_len = strlen($pattern);
{
static $moved = array();
- // ̵¸Â¥ë¡¼¥×ËÉ»ß
+ // 無限ループ防止
if (array_key_exists($name,$this->rows))
{
return;
}
$source = join('',preg_replace('/^(\*{1,3}.*)\[#[A-Za-z][\w-]+\](.*)$/','$1$2',$source));
- // ¥Ç¥Õ¥©¥ë¥ÈÃÍ
+ // デフォルト値
$this->rows[$name] = array(
'_page' => "[[$page]]",
'_refer' => $this->page,
}
}
}
+ function compare($a, $b)
+ {
+ foreach ($this->sort_keys as $sort_key)
+ {
+ $field = $sort_key['field'];
+ $dir = $sort_key['dir'];
+ $f = $this->fields[$field];
+ $sort_type = $f->sort_type;
+ $aVal = isset($a[$field]) ? $f->get_value($a[$field]) : '';
+ $bVal = isset($b[$field]) ? $f->get_value($b[$field]) : '';
+ $c = strnatcmp($aVal, $bVal) * ($dir === SORT_ASC ? 1 : -1);
+ if ($c === 0) continue;
+ return $c;
+ }
+ return 0;
+ }
function sort($order)
{
if ($order == '')
}
$this->order[$key] = $dir;
}
- $keys = array();
- $params = array();
+ $sort_keys = array();
foreach ($this->order as $field=>$order)
{
if (!array_key_exists($field,$names))
{
continue;
}
- foreach ($this->rows as $row)
- {
- $keys[$field][] = $this->fields[$field]->get_value($row[$field]);
- }
- $params[] = $keys[$field];
- $params[] = $this->fields[$field]->sort_type;
- $params[] = $order;
-
+ $sort_keys[] = array('field' => $field, 'dir' => $order);
}
- $params[] = &$this->rows;
-
- call_user_func_array('array_multisort',$params);
+ $this->sort_keys = $sort_keys;
+ usort($this->rows, array($this, 'compare'));
}
function replace_item($arr)
{
}
function replace_title($arr)
{
- global $script;
-
$field = $sort = $arr[1];
if ($sort == '_name' or $sort == '_page')
{
$_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)
{
if (trim($line) == '')
{
- $source .= $line;
+ // Ignore empty line
continue;
}
$this->pipe = ($line{0} == '|' or $line{0} == ':');
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;
}
-?>
OSDN Git Service
