BugTrack2/139: Correct. Deleted a first space at preview.

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

diff --git a/plugin/tracker.inc.php b/plugin/tracker.inc.php
index 507db39..4db7250 100644 (file)
--- a/plugin/tracker.inc.php
+++ b/plugin/tracker.inc.php
@@ -1,9 +1,8 @@
 <?php
-/////////////////////////////////////////////////
-// PukiWiki - Yet another WikiWikiWeb clone.
-//
-// $Id: tracker.inc.php,v 1.23 2004/10/09 08:25:29 henoheno Exp $
+// PukiWiki - Yet another WikiWikiWeb clone
+// $Id: tracker.inc.php,v 1.34 2005/11/28 17:48:30 teanan Exp $
 //
+// Issue tracker plugin (See Also bugtrack plugin)
 
 // tracker_list¤Çɽ¼¨¤·¤Ê¤¤¥Ú¡¼¥¸Ì¾(Àµµ¬É½¸½¤Ç)
 // 'SubMenu'¥Ú¡¼¥¸ ¤ª¤è¤Ó '/'¤ò´Þ¤à¥Ú¡¼¥¸¤ò½ü³°¤¹¤ë
@@ -18,6 +17,8 @@ function plugin_tracker_convert()
 {
        global $script,$vars;
 
+       if (PKWK_READONLY) return ''; // Show nothing
+
        $base = $refer = $vars['page'];
 
        $config_name = 'default';
@@ -79,7 +80,9 @@ EOD;
 }
 function plugin_tracker_action()
 {
-       global $script,$post,$vars,$now;
+       global $post, $vars, $now;
+
+       if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 
        $config_name = array_key_exists('_config',$post) ? $post['_config'] : '';
 
@@ -167,11 +170,12 @@ function plugin_tracker_action()
        }
 
        // Writing page data, without touch
-       page_write($page, join('', $postdata), TRUE);
+       page_write($page, join('', $postdata));
 
        $r_page = rawurlencode($page);
 
-       header("Location: $script?$r_page");
+       pkwk_headers_sent();
+       header('Location: ' . get_script_uri() . '?' . $r_page);
        exit;
 }
 /*
@@ -179,6 +183,8 @@ function plugin_tracker_inline()
 {
        global $vars;
 
+       if (PKWK_READONLY) return ''; // Show nothing
+
        $args = func_get_args();
        if (count($args) < 3)
        {
@@ -250,11 +256,14 @@ class Tracker_field
        var $config;
        var $data;
        var $sort_type = SORT_REGULAR;
+       var $id = 0;
 
        function Tracker_field($field,$page,$refer,&$config)
        {
                global $post;
+               static $id = 0;
 
+               $this->id = ++$id;
                $this->name = $field[0];
                $this->title = $field[1];
                $this->values = explode(',',$field[3]);
@@ -430,11 +439,16 @@ class Tracker_field_radio extends Tracker_field_format
        {
                $s_name = htmlspecialchars($this->name);
                $retval = '';
+               $id = 0;
                foreach ($this->config->get($this->name) as $option)
                {
                        $s_option = htmlspecialchars($option[0]);
                        $checked = trim($option[0]) == trim($this->default_value) ? ' checked="checked"' : '';
-                       $retval .= "<input type=\"radio\" name=\"$s_name\" value=\"$s_option\"$checked />$s_option\n";
+                       ++$id;
+                       $s_id = '_p_tracker_' . $s_name . '_' . $this->id . '_' . $id;
+                       $retval .= '<input type="radio" name="' .  $s_name . '" id="' . $s_id .
+                               '" value="' . $s_option . '"' . $checked . ' />' .
+                               '<label for="' . $s_id . '">' . $s_option . '</label>' . "\n";
                }
 
                return $retval;
@@ -490,12 +504,17 @@ class Tracker_field_checkbox extends Tracker_field_radio
                $s_name = htmlspecialchars($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]);
                        $checked = array_key_exists(trim($option[0]),$defaults) ?
                                ' checked="checked"' : '';
-                       $retval .= "<input type=\"checkbox\" name=\"{$s_name}[]\" value=\"$s_option\"$checked />$s_option\n";
+                       ++$id;
+                       $s_id = '_p_tracker_' . $s_name . '_' . $this->id . '_' . $id;
+                       $retval .= '<input type="checkbox" name="' . $s_name .
+                               '[]" id="' . $s_id . '" value="' . $s_option . '"' . $checked . ' />' .
+                               '<label for="' . $s_id . '">' . $s_option . '</label>' . "\n";
                }
 
                return $retval;
@@ -759,7 +778,7 @@ class Tracker_list
                        }
                        foreach ($this->rows as $row)
                        {
-                               $keys[$field][] = $this->fields[$field]->get_value($row[$field]);
+                               $keys[$field][] = isset($row[$field])? $this->fields[$field]->get_value($row[$field]) : '';
                        }
                        $params[] = $keys[$field];
                        $params[] = $this->fields[$field]->sort_type;
@@ -815,25 +834,28 @@ class Tracker_list
                $arrow = '';
                $order = $this->order;
 
-               if (array_key_exists($sort,$order))
+               if (is_array($order) && isset($order[$sort]))
                {
-                       $index = array_flip(array_keys($order));
+                       // BugTrack2/106: Only variables can be passed by reference from PHP 5.0.5
+                       $order_keys = array_keys($order); // with array_shift();
+
+                       $index = array_flip($order_keys);
                        $pos = 1 + $index[$sort];
-                       $b_end = ($sort == array_shift(array_keys($order)));
+                       $b_end = ($sort == array_shift($order_keys));
                        $b_order = ($order[$sort] == SORT_ASC);
                        $dir = ($b_end xor $b_order) ? SORT_ASC : SORT_DESC;
                        $arrow = '&br;'.($b_order ? '&uarr;' : '&darr;')."($pos)";
-                       unset($order[$sort]);
+
+                       unset($order[$sort], $order_keys);
                }
                $title = $this->fields[$field]->title;
                $r_page = rawurlencode($this->page);
                $r_config = rawurlencode($this->config->config_name);
                $r_list = rawurlencode($this->list);
                $_order = array("$sort:$dir");
-               foreach ($order as $key=>$value)
-               {
-                       $_order[] = "$key:$value";
-               }
+               if (is_array($order))
+                       foreach ($order as $key=>$value)
+                               $_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]]";