Commit: 398acb9df44cd8b42a629d0ff75d028ee448a185 - pukiwiki (git)

Commit MetaInfo

• Revisión: 398acb9df44cd8b42a629d0ff75d028ee448a185 (tree)
• Tiempo: 2007-04-15 23:37:04
• Autor: henoheno <henoheno>
• Commiter: henoheno

Log Message

Simplify br. Beautify XHTML br. Show total counts at the bottom of the page (this is not the main function).

Cambiar Resumen

• modified: plugin/map.inc.php

Diferencia incremental

--- a/plugin/map.inc.php
+++ b/plugin/map.inc.php
@@ -1,18 +1,15 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: map.inc.php,v 1.14 2005/01/10 09:17:11 henoheno Exp $
+// $Id: map.inc.php,v 1.15 2007/04/15 14:37:04 henoheno Exp $
+// Copyright (C) 2002-2005, 2007 PukiWiki Developers Team
+// License: GPL v2 or (at your option) any later version
 //
-// Site map plugin
-
-/*
- * プラグイン map: サイトマップ(のようなもの)を表示
- * Usage : http://.../pukiwiki.php?plugin=map
- * パラメータ
- *   &refer=ページ名
- *     起点となるページを指定
- *   &reverse=true
- *     あるページがどこからリンクされているかを一覧。
-*/
+// Relation map plugin
+//
+// Usage :
+//   ?plugin=map&refer=pagename
+//   ?plugin=map&refer=pagename&reverse=true
+
 
 // Show $non_list files
 define('PLUGIN_MAP_SHOW_HIDDEN', 0); // 0, 1
@@ -23,28 +20,29 @@ function plugin_map_action()
 
 	$reverse = isset($vars['reverse']);
 	$refer   = isset($vars['refer']) ? $vars['refer'] : '';
-	if ($refer == '' || ! is_page($refer))
+	if ($refer == '' || ! is_page($refer)) {
 		$vars['refer'] = $refer = $defaultpage;
+	}
 
 	$retval['msg']  = $reverse ? 'Relation map (link from)' : 'Relation map, from $1';
-	$retval['body'] = '';
 
 	// Get pages
 	$pages = array_values(array_diff(get_existpages(), array($whatsnew)));
-	if (! PLUGIN_MAP_SHOW_HIDDEN)
+	if (! PLUGIN_MAP_SHOW_HIDDEN) {
 		$pages = array_diff($pages, preg_grep('/' . $non_list . '/', $pages));
+	}
 	if (empty($pages)) {
-		$retval['body'] = 'No pages.';
+		$retval['body'] = 'No page.';
 		return $retval;
-	} else {
-		$retval['body'] .= '<p>' . "\n" .  'Total: ' . count($pages) .
-			' page(s) on this site.' . "\n" . '</p>' . "\n";
 	}
 
+	$body = array();
+
 	// Generate a tree
 	$nodes = array();
-	foreach ($pages as $page)
+	foreach ($pages as $page) {
 		$nodes[$page] = & new MapNode($page, $reverse);
+	}
 
 	// Node not found: Because of filtererd by $non_list
 	if (! isset($nodes[$refer])) $vars['refer'] = $refer = $defaultpage;
@@ -53,41 +51,47 @@ function plugin_map_action()
 		$keys = array_keys($nodes);
 		sort($keys);
 		$alone = array();
-		$retval['body'] .= '<ul>' . "\n";
+		$body[] = '<ul>';
 		foreach ($keys as $page) {
 			if (! empty($nodes[$page]->rels)) {
-				$retval['body'] .= $nodes[$page]->toString($nodes, 1, $nodes[$page]->parent_id);
+				$body[] = $nodes[$page]->toString($nodes, 1, $nodes[$page]->parent_id);
 			} else {
 				$alone[] = $page;
 			}
 		}
-		$retval['body'] .= '</ul>' . "\n";
+		$body[] = '</ul>';
 		if (! empty($alone)) {
-			$retval['body'] .= '<hr />' . "\n" .
-				'<p>No link from anywhere in this site.</p>' . "\n";
-			$retval['body'] .= '<ul>' . "\n";
-			foreach ($alone as $page)
-				$retval['body'] .= $nodes[$page]->toString($nodes, 1, $nodes[$page]->parent_id);
-			$retval['body'] .= '</ul>' . "\n";
+			$body[] = '<hr />';
+			$body[] = '<p>No link from anywhere in this site.</p>';
+			$body[] = '<ul>';
+			foreach ($alone as $page) {
+				$body[] = $nodes[$page]->toString($nodes, 1, $nodes[$page]->parent_id);
+			}
+			$body[] = '</ul>';
 		}
 	} else {
 		$nodes[$refer]->chain($nodes);
-		$retval['body'] .= '<ul>' . "\n" . $nodes[$refer]->toString($nodes) . '</ul>' . "\n";
-		$retval['body'] .= '<hr />' . "\n" .
-			'<p>Not related from ' . htmlspecialchars($refer) . '</p>' . "\n";
+		$body[] = '<ul>';
+		$body[] = $nodes[$refer]->toString($nodes) . '</ul>';
+		$body[] = '<hr />';
+		$body[] = '<p>Not related from ' . htmlspecialchars($refer) . '</p>';
 		$keys = array_keys($nodes);
 		sort($keys);
-		$retval['body'] .= '<ul>' . "\n";
+		$body[] = '<ul>';
 		foreach ($keys as $page) {
 			if (! $nodes[$page]->done) {
 				$nodes[$page]->chain($nodes);
-				$retval['body'] .= $nodes[$page]->toString($nodes, 1, $nodes[$page]->parent_id);
+				$body[] = $nodes[$page]->toString($nodes, 1, $nodes[$page]->parent_id);
 			}
 		}
-		$retval['body'] .= '</ul>' . "\n";
+		$body[] = '</ul>';
 	}
+	
+	$body[] = '<hr />';
+	$body[] = '<p>Total: ' . count($pages) . ' page(s) on this site.</p>';
 
-	// 終了
+	
+	$retval['body'] = implode("\n", $body) . "\n";
 	return $retval;
 }
 
@@ -104,9 +108,14 @@ class MapNode
 
 	function MapNode($page, $reverse = FALSE)
 	{
-		global $script, $non_list;
+		global $non_list;
+		
+		static $script, $_hide_pattern, $id = 0;
 
-		static $id = 0;
+		if (! isset($script)) {
+			$script = get_script_uri();
+			$_hide_pattern = '/' . $non_list . '/';
+		}
 
 		$this->page    = $page;
 		$this->is_page = is_page($page);
@@ -114,7 +123,7 @@ class MapNode
 		$this->done    = ! $this->is_page;
 		$this->link    = make_pagelink($page);
 		$this->id      = ++$id;
-		$this->hide_pattern = '/' . $non_list . '/';
+		$this->hide_pattern = & $_hide_pattern;
 
 		$this->rels = $reverse ? $this->ref() : $this->rel();
 		$mark       = $reverse ? '' : '<sup>+</sup>';
@@ -125,8 +134,9 @@ class MapNode
 
 	function hide(& $pages)
 	{
-		if (! PLUGIN_MAP_SHOW_HIDDEN)
+		if (! PLUGIN_MAP_SHOW_HIDDEN) {
 			$pages = array_diff($pages, preg_grep($this->hide_pattern, $pages));
+		}
 		return $pages;
 	}
 
@@ -170,8 +180,9 @@ class MapNode
 			if ($nodes[$page]->parent_id == 0)
 				$nodes[$page]->parent_id = $this->id;
 		}
-		foreach ($this->rels as $page)
+		foreach ($this->rels as $page) {
 			$nodes[$page]->chain($nodes);
+		}
 	}
 
 	function toString(& $nodes, $level = 1, $parent_id = -1)
@@ -179,26 +190,33 @@ class MapNode
 		$indent = str_repeat(' ', $level);
 
 		if (! $this->is_page) {
-			return $indent . '<li>' . $this->link . '</li>' . "\n";
+			return $indent . '<li>' . $this->link . '</li>';
 		} else if ($this->parent_id != $parent_id) {
 			return $indent . '<li>' . $this->link .
-				'<a href="#rel_' . $this->id . '">...</a></li>' . "\n";
+				'<a href="#rel_' . $this->id . '">...</a></li>';
+		} else if (empty($this->rels)) {
+			return $indent . '<li>' . $this->mark . $this->link . '</li>';
 		}
-		$retval = $indent . '<li>' . $this->mark . $this->link . "\n";
-		if (! empty($this->rels)) {
-			$childs = array();
-			$level += 2;
-			foreach ($this->rels as $page)
-				if (isset($nodes[$page]) && $this->parent_id != $nodes[$page]->id)
-					$childs[] = $nodes[$page]->toString($nodes, $level, $this->id);
-
-			if (! empty($childs))
-				$retval .= $indent . ' <ul>' . "\n" .
-					join('', $childs) . $indent . ' </ul>' . "\n";
+
+		$retval = array();
+		$retval[] = $indent . '<li>' . $this->mark . $this->link;
+		$childs = array();
+		$level += 2;
+		foreach ($this->rels as $page) {
+			if (isset($nodes[$page]) && $this->parent_id != $nodes[$page]->id) {
+				$childs[] = $nodes[$page]->toString($nodes, $level, $this->id);
+			}
+		}
+		if (! empty($childs)) {
+			$retval[] = $indent . ' <ul>';
+			foreach(array_keys($childs) as $key){
+				$retval[] = & $childs[$key];
+			}
+			$retval[] = $indent . ' </ul>';
 		}
-		$retval .= $indent . '</li>' . "\n";
+		$retval[] = $indent . '</li>';
 
-		return $retval;
+		return implode("\n", $retval);
 	}
 }
 ?>