OSDN Git Service

RecentChanges: Update
[pukiwiki/pukiwiki.git] / plugin / tracker.inc.php
index 086c57f..5f6f7c3 100644 (file)
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: tracker.inc.php,v 1.17 2003/11/03 15:08:25 arino Exp $
+// $Id: tracker.inc.php,v 1.22 2004/08/21 12:57:57 henoheno Exp $
 //
 
 // tracker_list¤Çɽ¼¨¤·¤Ê¤¤¥Ú¡¼¥¸Ì¾(Àµµ¬É½¸½¤Ç)
@@ -17,9 +17,9 @@ define('TRACKER_LIST_SHOW_ERROR_PAGE',TRUE);
 function plugin_tracker_convert()
 {
        global $script,$vars;
-       
+
        $base = $refer = $vars['page'];
-       
+
        $config_name = 'default';
        $form = 'form';
        $options = array();
@@ -31,32 +31,33 @@ function plugin_tracker_convert()
                        case 3:
                                $options = array_splice($args,2);
                        case 2:
-                               $_base = get_fullname($args[1],$base);
-                               if (is_pagename($_base))
-                               {
-                                       $base = $_base;
-                               }
+                               $args[1] = get_fullname($args[1],$base);
+                               $base = is_pagename($args[1]) ? $args[1] : $base;
                        case 1:
-                               $config_name = $args[0];
-                               list($config_name,$_form) = array_pad(explode('/',$config_name,2),2,$form);
+                               $config_name = ($args[0] != '') ? $args[0] : $config_name;
+                               list($config_name,$form) = array_pad(explode('/',$config_name,2),2,$form);
                }
        }
-       
+
        $config = new Config('plugin/tracker/'.$config_name);
-       
+
        if (!$config->read())
        {
                return "<p>config file '".htmlspecialchars($config_name)."' not found.</p>";
        }
-       
+
        $config->config_name = $config_name;
-       
+
        $fields = plugin_tracker_get_fields($base,$refer,$config);
-       
-       $form = is_page($config->page.'/'.$_form) ? $_form : $form;
-       $retval = convert_html(plugin_tracker_get_source($config->page.'/'.$form));
+
+       $form = $config->page.'/'.$form;
+       if (!is_page($form))
+       {
+               return "<p>config file '".make_pagelink($form)."' not found.</p>";
+       }
+       $retval = convert_html(plugin_tracker_get_source($form));
        $hiddens = '';
-       
+
        foreach (array_keys($fields) as $name)
        {
                $replace = $fields[$name]->get_tag();
@@ -79,9 +80,9 @@ EOD;
 function plugin_tracker_action()
 {
        global $script,$post,$vars,$now;
-       
+
        $config_name = array_key_exists('_config',$post) ? $post['_config'] : '';
-       
+
        $config = new Config('plugin/tracker/'.$config_name);
        if (!$config->read())
        {
@@ -89,9 +90,9 @@ function plugin_tracker_action()
        }
        $config->config_name = $config_name;
        $source = $config->page.'/page';
-       
+
        $refer = array_key_exists('_refer',$post) ? $post['_refer'] : $post['_base'];
-       
+
        if (!is_pagename($refer))
        {
                return array(
@@ -123,7 +124,7 @@ function plugin_tracker_action()
        {
                $page = $base;
        }
-       
+
        while (is_page($page))
        {
                $real = ++$num;
@@ -131,7 +132,7 @@ function plugin_tracker_action()
        }
        // ¥Ú¡¼¥¸¥Ç¡¼¥¿¤òÀ¸À®
        $postdata = plugin_tracker_get_source($source);
-       
+
        // µ¬Äê¤Î¥Ç¡¼¥¿
        $_post = array_merge($post,$_FILES);
        $_post['_date'] = $now;
@@ -139,14 +140,17 @@ function plugin_tracker_action()
        $_post['_name'] = $name;
        $_post['_real'] = $real;
        // $_post['_refer'] = $_post['refer'];
-       
+
        $fields = plugin_tracker_get_fields($page,$refer,$config);
-       
+
+       // Creating an empty page, before attaching files
+       touch(get_filename($page));
+
        foreach (array_keys($fields) as $key)
        {
                $value = array_key_exists($key,$_post) ?
                        $fields[$key]->format_value($_post[$key]) : '';
-               
+
                foreach (array_keys($postdata) as $num)
                {
                        if (trim($postdata[$num]) == '')
@@ -161,12 +165,12 @@ function plugin_tracker_action()
                        );
                }
        }
-       
-       // ½ñ¤­¹þ¤ß
-       page_write($page,join('',$postdata));
-       
+
+       // Writing page data, without touch
+       page_write($page, join('', $postdata), TRUE);
+
        $r_page = rawurlencode($page);
-       
+
        header("Location: $script?$r_page");
        exit;
 }
@@ -174,7 +178,7 @@ function plugin_tracker_action()
 function plugin_tracker_inline()
 {
        global $vars;
-       
+
        $args = func_get_args();
        if (count($args) < 3)
        {
@@ -182,16 +186,16 @@ function plugin_tracker_inline()
        }
        $body = array_pop($args);
        list($config_name,$field) = $args;
-       
+
        $config = new Config('plugin/tracker/'.$config_name);
-       
+
        if (!$config->read())
        {
                return "config file '".htmlspecialchars($config_name)."' not found.";
        }
-       
+
        $config->config_name = $config_name;
-       
+
        $fields = plugin_tracker_get_fields($vars['page'],$vars['page'],$config);
        $fields[$field]->default_value = $body;
        return $fields[$field]->get_tag();
@@ -201,7 +205,7 @@ function plugin_tracker_inline()
 function plugin_tracker_get_fields($base,$refer,&$config)
 {
        global $now,$_tracker_messages;
-       
+
        $fields = array();
        // Í½Ìó¸ì
        foreach (array(
@@ -219,7 +223,7 @@ function plugin_tracker_get_fields($base,$refer,&$config)
                $class = 'Tracker_field_'.$class;
                $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=>¥Ç¥Õ¥©¥ë¥ÈÃÍ
@@ -246,11 +250,11 @@ class Tracker_field
        var $config;
        var $data;
        var $sort_type = SORT_REGULAR;
-       
+
        function Tracker_field($field,$page,$refer,&$config)
        {
                global $post;
-               
+
                $this->name = $field[0];
                $this->title = $field[1];
                $this->values = explode(',',$field[3]);
@@ -283,7 +287,7 @@ class Tracker_field
 class Tracker_field_text extends Tracker_field
 {
        var $sort_type = SORT_STRING;
-       
+
        function get_tag()
        {
                $s_name = htmlspecialchars($this->name);
@@ -295,11 +299,11 @@ class Tracker_field_text extends Tracker_field
 class Tracker_field_page extends Tracker_field_text
 {
        var $sort_type = SORT_STRING;
-       
+
        function format_value($value)
        {
                global $WikiName;
-               
+
                $value = strip_bracket($value);
                if (is_pagename($value))
                {
@@ -315,7 +319,7 @@ class Tracker_field_real extends Tracker_field_text
 class Tracker_field_title extends Tracker_field_text
 {
        var $sort_type = SORT_STRING;
-       
+
        function format_cell($str)
        {
                make_heading($str);
@@ -325,7 +329,7 @@ class Tracker_field_title extends Tracker_field_text
 class Tracker_field_textarea extends Tracker_field
 {
        var $sort_type = SORT_STRING;
-       
+
        function get_tag()
        {
                $s_name = htmlspecialchars($this->name);
@@ -347,14 +351,14 @@ class Tracker_field_textarea extends Tracker_field
 class Tracker_field_format extends Tracker_field
 {
        var $sort_type = SORT_STRING;
-       
+
        var $styles = array();
        var $formats = array();
-       
+
        function Tracker_field_format($field,$page,$refer,&$config)
        {
                parent::Tracker_field($field,$page,$refer,$config);
-               
+
                foreach ($this->config->get($this->name) as $option)
                {
                        list($key,$style,$format) = array_pad(array_map(create_function('$a','return trim($a);'),$option),3,'');
@@ -365,7 +369,7 @@ class Tracker_field_format extends Tracker_field
                        if ($format != '')
                        {
                                $this->formats[$key] = $format;
-                       } 
+                       }
                }
        }
        function get_tag()
@@ -396,7 +400,7 @@ class Tracker_field_format extends Tracker_field
 class Tracker_field_file extends Tracker_field_format
 {
        var $sort_type = SORT_STRING;
-       
+
        function get_tag()
        {
                $s_name = htmlspecialchars($this->name);
@@ -421,7 +425,7 @@ class Tracker_field_file extends Tracker_field_format
 class Tracker_field_radio extends Tracker_field_format
 {
        var $sort_type = SORT_NUMERIC;
-       
+
        function get_tag()
        {
                $s_name = htmlspecialchars($this->name);
@@ -432,7 +436,7 @@ class Tracker_field_radio extends Tracker_field_format
                        $checked = trim($option[0]) == trim($this->default_value) ? ' checked="checked"' : '';
                        $retval .= "<input type=\"radio\" name=\"$s_name\" value=\"$s_option\"$checked />$s_option\n";
                }
-               
+
                return $retval;
        }
        function get_key($str)
@@ -452,7 +456,7 @@ class Tracker_field_radio extends Tracker_field_format
 class Tracker_field_select extends Tracker_field_radio
 {
        var $sort_type = SORT_NUMERIC;
-       
+
        function get_tag($empty=FALSE)
        {
                $s_name = htmlspecialchars($this->name);
@@ -473,14 +477,14 @@ class Tracker_field_select extends Tracker_field_radio
                        $retval .= " <option value=\"$s_option\"$selected>$s_option</option>\n";
                }
                $retval .= "</select>";
-               
+
                return $retval;
        }
 }
 class Tracker_field_checkbox extends Tracker_field_radio
 {
        var $sort_type = SORT_NUMERIC;
-       
+
        function get_tag($empty=FALSE)
        {
                $s_name = htmlspecialchars($this->name);
@@ -493,20 +497,20 @@ class Tracker_field_checkbox extends Tracker_field_radio
                                ' checked="checked"' : '';
                        $retval .= "<input type=\"checkbox\" name=\"{$s_name}[]\" value=\"$s_option\"$checked />$s_option\n";
                }
-               
+
                return $retval;
        }
 }
 class Tracker_field_hidden extends Tracker_field_radio
 {
        var $sort_type = SORT_NUMERIC;
-       
+
        function get_tag($empty=FALSE)
        {
                $s_name = htmlspecialchars($this->name);
                $s_default = htmlspecialchars($this->default_value);
                $retval = "<input type=\"hidden\" name=\"$s_name\" value=\"$s_default\" />\n";
-               
+
                return $retval;
        }
 }
@@ -518,7 +522,7 @@ class Tracker_field_submit extends Tracker_field
                $s_page = htmlspecialchars($this->page);
                $s_refer = htmlspecialchars($this->refer);
                $s_config = htmlspecialchars($this->config->config_name);
-               
+
                return <<<EOD
 <input type="submit" value="$s_title" />
 <input type="hidden" name="plugin" value="tracker" />
@@ -531,7 +535,7 @@ EOD;
 class Tracker_field_date extends Tracker_field
 {
        var $sort_type = SORT_NUMERIC;
-       
+
        function format_cell($timestamp)
        {
                return format_date($timestamp);
@@ -540,7 +544,7 @@ class Tracker_field_date extends Tracker_field
 class Tracker_field_past extends Tracker_field
 {
        var $sort_type = SORT_NUMERIC;
-       
+
        function format_cell($timestamp)
        {
                return get_passage($timestamp,FALSE);
@@ -555,12 +559,12 @@ class Tracker_field_past extends Tracker_field
 function plugin_tracker_list_convert()
 {
        global $vars;
-       
+
        $config = 'default';
        $page = $refer = $vars['page'];
        $field = '_page';
        $order = '';
-       $list = 'list'; 
+       $list = 'list';
        $limit = NULL;
        if (func_num_args())
        {
@@ -572,6 +576,7 @@ function plugin_tracker_list_convert()
                        case 3:
                                $order = $args[2];
                        case 2:
+                               $args[1] = get_fullname($args[1],$page);
                                $page = is_pagename($args[1]) ? $args[1] : $page;
                        case 1:
                                $config = ($args[0] != '') ? $args[0] : $config;
@@ -583,13 +588,13 @@ function plugin_tracker_list_convert()
 function plugin_tracker_list_action()
 {
        global $script,$vars,$_tracker_messages;
-       
+
        $page = $refer = $vars['refer'];
        $s_page = make_pagelink($page);
        $config = $vars['config'];
        $list = array_key_exists('list',$vars) ? $vars['list'] : 'list';
        $order = array_key_exists('order',$vars) ? $vars['order'] : '_real:SORT_DESC';
-               
+
        return array(
                'msg' => $_tracker_messages['msg_list'],
                'body'=> str_replace('$1',$s_page,$_tracker_messages['msg_back']).
@@ -599,12 +604,19 @@ function plugin_tracker_list_action()
 function plugin_tracker_getlist($page,$refer,$config_name,$list,$order='',$limit=NULL)
 {
        $config = new Config('plugin/tracker/'.$config_name);
-       
+
        if (!$config->read())
        {
                return "<p>config file '".htmlspecialchars($config_name)."' is not exist.";
        }
+
        $config->config_name = $config_name;
+
+       if (!is_page($config->page.'/'.$list))
+       {
+               return "<p>config file '".make_pagelink($config->page.'/'.$list)."' not found.</p>";
+       }
+
        $list = &new Tracker_list($page,$refer,$config,$list);
        $list->sort($order);
        return $list->toString($limit);
@@ -621,19 +633,19 @@ class Tracker_list
        var $pattern_fields;
        var $rows;
        var $order;
-       
+
        function Tracker_list($page,$refer,&$config,$list)
        {
                $this->page = $page;
                $this->config = &$config;
-               $this->list = is_page($config->page.'/'.$list) ? $list : 'list';
+               $this->list = $list;
                $this->fields = plugin_tracker_get_fields($page,$refer,$config);
-               
+
                $pattern = join('',plugin_tracker_get_source($config->page.'/page'));
                // ¥Ö¥í¥Ã¥¯¥×¥é¥°¥¤¥ó¤ò¥Õ¥£¡¼¥ë¥É¤ËÃÖ´¹
                // #comment¤Ê¤É¤ÇÁ°¸å¤Ëʸ»úÎó¤ÎÁý¸º¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¡¢[_block_xxx]¤ËµÛ¤¤¹þ¤Þ¤»¤ë¤è¤¦¤Ë¤¹¤ë
                $pattern = preg_replace('/^\#([^\(\s]+)(?:\((.*)\))?\s*$/m','[_block_$1]',$pattern);
-               
+
                // ¥Ñ¥¿¡¼¥ó¤òÀ¸À®
                $this->pattern = '';
                $this->pattern_fields = array();
@@ -668,13 +680,13 @@ class Tracker_list
        function add($page,$name)
        {
                static $moved = array();
-               
+
                // Ìµ¸Â¥ë¡¼¥×ËÉ»ß
                if (array_key_exists($name,$this->rows))
                {
                        return;
                }
-               
+
                $source = plugin_tracker_get_source($page);
                if (preg_match('/move\sto\s(.+)/',$source[0],$matches))
                {
@@ -687,7 +699,7 @@ class Tracker_list
                        return $this->add($page,$name);
                }
                $source = join('',preg_replace('/^(\*{1,3}.*)\[#[A-Za-z][\w-]+\](.*)$/','$1$2',$source));
-               
+
                // ¥Ç¥Õ¥©¥ë¥ÈÃÍ
                $this->rows[$name] = array(
                        '_page'  => "[[$page]]",
@@ -738,23 +750,25 @@ class Tracker_list
                        $this->order[$key] = $dir;
                }
                $keys = array();
-               $eval_arg = 'return array_multisort(';
+               $params = array();
                foreach ($this->order as $field=>$order)
                {
                        if (!array_key_exists($field,$names))
                        {
                                continue;
                        }
-                       $eval_arg .= '$keys['."'$field'],".
-                               $this->fields[$field]->sort_type.','.
-                               $order.',';
                        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;
+
                }
-               $eval_arg .= '$this->rows);';
-               eval($eval_arg);
+               $params[] = &$this->rows;
+
+               call_user_func_array('array_multisort',$params);
        }
        function replace_item($arr)
        {
@@ -787,7 +801,7 @@ class Tracker_list
        function replace_title($arr)
        {
                global $script;
-               
+
                $field = $sort = $arr[1];
                if ($sort == '_name' or $sort == '_page')
                {
@@ -800,13 +814,15 @@ class Tracker_list
                $dir = SORT_ASC;
                $arrow = '';
                $order = $this->order;
-               
+
                if (array_key_exists($sort,$order))
                {
+                       $index = array_flip(array_keys($order));
+                       $pos = 1 + $index[$sort];
                        $b_end = ($sort == array_shift(array_keys($order)));
                        $b_order = ($order[$sort] == SORT_ASC);
                        $dir = ($b_end xor $b_order) ? SORT_ASC : SORT_DESC;
-                       $arrow = $b_end ? ($b_order ? '&uarr;' : '&darr;') : '';
+                       $arrow = '&br;'.($b_order ? '&uarr;' : '&darr;')."($pos)";
                        unset($order[$sort]);
                }
                $title = $this->fields[$field]->title;
@@ -819,16 +835,16 @@ class Tracker_list
                        $_order[] = "$key:$value";
                }
                $r_order = rawurlencode(join(';',$_order));
-               
+
                return "[[$title$arrow>$script?plugin=tracker_list&refer=$r_page&config=$r_config&list=$r_list&order=$r_order]]";
        }
        function toString($limit=NULL)
        {
                global $_tracker_messages;
-               
+
                $source = '';
                $body = array();
-               
+
                if ($limit !== NULL and count($this->rows) > $limit)
                {
                        $source = str_replace(
@@ -857,7 +873,7 @@ class Tracker_list
                        if (!TRACKER_LIST_SHOW_ERROR_PAGE and !$row['_match'])
                        {
                                continue;
-                       } 
+                       }
                        $this->items = $row;
                        foreach ($body as $line)
                        {