big cleanup of wiki, removed unused tables, removed commented code, moved remaining wikilib class stuff to BitPage (finally), revived and cleaned up wiki graph stuff, added generic methods to get default settings for graphs (still requires some UI to set all defaults)

1 files changed, 34 insertions, 101 deletions

diff --git a/liberty_plugins/data.wikigraph.php b/liberty_plugins/data.wikigraph.php
index 5d0c301..44913ac 100644
--- a/liberty_plugins/data.wikigraph.php
+++ b/liberty_plugins/data.wikigraph.php
@@ -1,44 +1,29 @@
 <?php
 /**
- * @version  $Revision: 1.2 $
+ * @version  $Revision: 1.3 $
  * @package  liberty
  * @subpackage plugins_data
  */
-// +----------------------------------------------------------------------+
-// | Copyright (c) 2004, bitweaver.org
-// +----------------------------------------------------------------------+
-// | All Rights Reserved. See copyright.txt for details and a complete list of authors.
-// | Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
-// |
-// | For comments, please use phpdocu.sourceforge.net documentation standards!!!
-// | -> see http://phpdocu.sourceforge.net/
-// +----------------------------------------------------------------------+
-// | Author (TikiWiki): Unknown
-// | Reworked & Undoubtedly Screwed-Up for (Bitweaver)
-// | by: wolff_borg <wolff_borg@yahoo.com.au>
-// | Reworked from: wikiplugin_wikigraph.php - see deprecated code below
-// +----------------------------------------------------------------------+
-// $Id: data.wikigraph.php,v 1.2 2008/11/09 09:08:56 squareing Exp $
 /**
  * definitions
  */
 global $gBitSystem, $gLibertySystem;
 
 // only include this plugin if wiki is active and we have GraphViz
-if( $gBitSystem->isPackageActive( 'wiki' ) && @include_once( UTIL_PKG_PATH.'GraphViz.php' )) {
+if( @include_once( 'Image/GraphViz.php' )) {
 
 define( 'PLUGIN_GUID_DATAWIKIGRAPH', 'datawikigraph' );
 $pluginParams = array (
-	'tag' => 'WIKIGRAPH',
+	'tag'           => 'wikigraph',
 	'auto_activate' => FALSE,
 	'requires_pair' => TRUE,
 	'load_function' => 'data_wikigraph',
-	'title' => 'WikiGraph',
-	'help_page' => 'DataPluginWikiGraph',
-	'description' => tra("Inserts a graph for visual navigation. The graph shows the page and every page that can be reached from that page."),
+	'title'         => 'WikiGraph',
+	'help_page'     => 'DataPluginWikiGraph',
+	'description'   => tra( "Inserts a graph for visual navigation. The graph shows the page and every page that can be reached from that page." ),
 	'help_function' => 'data_wikigraph_help',
-	'syntax' => "{WIKIGRAPH level= title= nodesep= rankdir= bgcolor= size= fontsize= fontname= shap= nodestyle= nodecolor= nodefillcolor= nodewidth= nodeheight= edgecolor= edgestyle= }".tra("Wiki page name")."{WIKIGRAPH}",
-	'plugin_type' => DATA_PLUGIN
+	'syntax'        => "{wikigraph level= title= }".tra( "Wiki page name" )."{/wikigraph}",
+	'plugin_type'   => DATA_PLUGIN
 );
 $gLibertySystem->registerPlugin( PLUGIN_GUID_DATAWIKIGRAPH, $pluginParams );
 $gLibertySystem->registerDataTag( $pluginParams['tag'], PLUGIN_GUID_DATAWIKIGRAPH );
@@ -79,98 +64,46 @@ function data_wikigraph_help() {
 			.'</table>'
 		.tra( "Example: " )."{wikigraph level=1}Welcome{/wikigraph}";
 	return $help;
-
-	/*
-	// old help - needs to be fulle converted into new format
-	$back = tra("^__Parameter Syntax:__ ") . "~np~{WIKIGRAPH" . tra("(key=>value)}~/np~\n");
-	$back.= tra("Inserts a graph for visual navigation. The graph shows the page and every page that can be reached from that page. Each node in the graph can be clicked to navigate to the selected page. Unless a PageName is included between the  ") . "__~np~{WIKIGRAPH}~/np~__" . tra(" blocks, the graph will be created for the Current Page. __Note:__ This plugin requires the installation of ))GraphViz(( on the server.");
-	$back.= tra("||__::key::__ | __::value::__ | __::Comments::__\n");
-	$back.= "::level::" . tra(" | ::number:: | the number of levels that will be followed from the starting page. __Optional__ - can be omitted - the __Default = 0__ so only the links from the page will be displayed.\n");
-	$back.= "::title::" . tra(" | ::string:: |  the title of the graph. __Optional__ - can be omitted - the __Default = ~034~Wiki-Graph~034~__.\n");
-	$back.= "::nodesep::" . tra(" | ::inches:: | the minimum distance between two nodes at the same level.Use the format __1.2__ in inches. __Optional__ - can be omitted - the __Default = .1__.\n");
-	$back.= "::rankdir::" . tra(" | ::string:: | direction of graph layout. Can be Left to Right ") . "__LR__ or __RL__" . tra(" Right to Left. Vertical graphs can also be made using Top to Bottom ") . "__TB__ or __BT__" . tra(" Bottom to Top. __Optional__ - can be omitted - the __Default = ") . "TB__.\n";
-	$back.= "::bgcolor::" . tra(" | ::colorname or hex color:: | specifies the background color for the graph. HTML colors (#RRGGBB) can be used if preceeded by the character #. __Optional__ - can be omitted - the __Default = ~034~transparent~034~__.\n");
-	$back.= "::size::" . tra(" | ::inches:: | the width and height of the graph. Use the format __5,3__ in inches. If the graph is larger that the size it will be scaled down to fit. __Optional__ - can be omitted - the __Default = Unlimited__.\n");
-	$back.= "::fontsize::" . tra(" | ::points:: |  the font size in points - used in all text. __Optional__ - can be omitted - the __Default = 9__.\n");
-	$back.= "::fontname::" . tra(" | ::font name:: |  the name of the font used for the labels. It is better to use a font that is generally available, such as Times-Roman, Helvetica or Courier. __Optional__ - can be omitted - the __Default =  Helvetica__.\n");
-	$back.= "::shap::" . tra(" | ::value:: |  the shape of the nodes. Values can be") . "__a1 / box / circle / diamond / doublecircle / doubleoctagon / egg / ellipse / hexagon / house / invhouse / invtrapezium / invtriangle / Mcircle / Mdiamond / Msquare / octagon / parallelogram / pentagon / point / polygon / rect / rectangle / septagon / trapezium / triangle / tripleoctagon__." . tra(" __Optional__ - can be omitted - the __Default = ") . "box__.\n";
-	$back.= "::nodestyle::" . tra(" | ::value:: | the style used for creating the nodes. Values are: ") . "__dashed / dotted / solid / invis / bold / filled / diagonals / rounded__." . tra(" __Optional__ - can be omitted - the __Default = ") . "filled__.\n";
-	$back.= "::nodecolor::" . tra(" | ::colorname or hex-color:: | basic color for all graphics. HTML colors (#RRGGBB) can be used if preceeded by the character #. __Optional__ - can be omitted - the __Default = #aeaeae__ (a light gray).\n");
-	$back.= "::nodefillcolor::" . tra(" | ::colorname or hex-color:: | specifies the background color for the nodes. HTML colors (#RRGGBB) can be used if preceeded by the character #. __Optional__ - can be omitted - the __Default = #FFFFFF__ (White).\n");
-	$back.= "::nodewidth::" . tra(" | ::inches:: | width of the nodes. This is the initial, minimum width of a node. Use the format __1.2__ in inches. __Optional__ - can be omitted - the __Default = .1__.\n");
-	$back.= "::nodeheight::" . tra(" | ::inches:: | height of the nodes. This is the initial, minimum height of a node. Use the format __1.2__ in inches. __Optional__ - can be omitted - the __Default = .1__.\n");
-	$back.= "::edgecolor::" . tra(" | ::colorname or hex-color:: | specifies the color of the links. HTML colors (#RRGGBB) can be used if preceeded by the character #. __Optional__ - can be omitted - the __Default = #999999__ (a darker gray).\n");
-	$back.= "::edgestyle::" . tra(" | ::value:: | the shape of the arrow that points at the link. Values are: ") . "__normal / inv / dot / invdot / odot / invodot / none / tree / empty / invempty / diamond / ediamond / odiamond / crow / box / obox / open / halfopen__." . tra(" __Optional__ - can be omitted - the __Default = ") . "normal__.||^"; // This one may not be correct - this had a default of "solid" but the ArrowTypes given at http://www.research.att.com/~erg/graphviz/info/attrs.html#k:arrowType specify the default as "normal"
-	$back.= tra("^__Example:__ ") . "~np~{WIKIGRAPH(level=>0)}HomePage{WIKIGRAPH}~/np~^";
-	$back.= tra("^__Note 1:__ Plugin's are __case sensitive__. The Name of the plugin __MUST__ be UPPERCASE. The Key(s) are __always__ lowercase. Some Values are mixed-case but most require lowercase. When in doubt - look at the Example.\n");
-	$back.= tra("__Note 2:__ A listing of ColorNames can be found at ") . "<a class='wiki' target=" . '"_blank"' . " href='http://www.tikipro.org/wiki/index.php?page=Browser+ColorNames/'>" . tra("TikiPro</a>^");
-	$back.= tra("__Note 3:__ One useful place for obtaining HTML colors is ") . "<a class='wiki' target=" . '"_blank"' . " href='http://www.pagetutor.com/pagetutor/makapage/picker/'>" . tra("The Color Picker II</a>^");
-	 */
 }
 
-include_once( WIKI_PKG_PATH.'BitPage.php');
-
 function data_wikigraph( $pData, $pParams ) {
-	global $gContent;
-
-	$add = "";
+	global $gContent, $gBitThemes;
 	$ret = " ";
 
-	$ommit = array( 'title', 'data' );
-	foreach( $pParams as $param => $value ) {
-		if( !in_array( $param, $ommit ) && !is_numeric( $param ) ) {
-			$add .= "&amp;{$param}={$value}";
-		}
-	}
+	if( !empty( $gContent ) && is_object( $gContent )) {
+		$querystring = "";
 
-	if( empty( $title ) ) {
-		$title = "Wiki-Graph";
-	}
+		$title = ( !empty( $pParams['title'] ) ? $pParams['title'] : 'Wiki-Graph' );
+		unset( $pParams['title'] );
 
-	if( empty( $pData ) ) {
-		$pData = ( ( !is_object( $gContent ) || empty( $gContent->mInfo['title'] ) ) ? NULL : $gContent->mInfo['title'] );
-	}
+		foreach( $pParams as $param => $value ) {
+			$querystring .= "&amp;{$param}={$value}";
+		}
 
-	$level = isset( $level ) ? $level : "0";
+		if( empty( $pData ) ) {
+			$pData = (( is_object( $gContent ) || !empty( $gContent->mPageName )) ? $gContent->mPageName : NULL );
+		}
 
-	if( !empty( $pData ) ) {
-		$garg = array(
-			'att' => array(
-				'level'     => !empty( $level )  ? $level   : ".1",
-				'nodesep'   => isset( $nodesep ) ? $nodesep : ".1",
-				'rankdir'   => isset( $rankdir ) ? $rankdir : "LR",
-				'bgcolor'   => isset( $bgcolor ) ? $bgcolor : "transparent",
-				'size'      => isset( $size )    ? $size    : ""
-			),
-			'node' => array(
-				'fontsize'  => isset( $fontsize )      ? $fontsize      : "10",
-				'fontname'  => isset( $fontname )      ? $fontname      : "sans",
-				'shape'     => isset( $shape )         ? $shape         : "box",
-				'style'     => isset( $nodestyle )     ? $nodestyle     : "filled",
-				'color'     => isset( $nodecolor )     ? $nodecolor     : "#aaaaaa",
-				'fillcolor' => isset( $nodefillcolor ) ? $nodefillcolor : "#f5f5f5",
-				'width'     => isset( $nodewidth )     ? $nodewidth     : ".1",
-				'height'    => isset( $nodeheight )    ? $nodeheight    : ".1"
-			),
-			'edge' => array(
-				'color'     => isset( $edgecolor ) ? $edgecolor : "#aa8866",
-				'style'     => isset( $edgestyle ) ? $edgestyle : "solid"
-			)
-		);
+		if( !empty( $pData ) ) {
+			$params = array(
+				'graph' => $gBitThemes->getGraphvizGraphAttributes( $pParams ),
+				'node'  => $gBitThemes->getGraphvizNodeAttributes( $pParams ),
+				'edge'  => $gBitThemes->getGraphvizEdgeAttributes( $pParams ),
+			);
 
-		$mapname=md5(uniqid("."));
-		$ret = "<div align='center'><img border='0' src=\"".WIKI_PKG_URL."wiki_graph.php?page=".urlencode($pData)."{$add}\" alt='{$title}' usemap='#$mapname' />";
+			$mapname = md5( microtime() );
+			$mapdata = $gContent->linkStructureMap( $pData, ( isset( $pParams['level'] ) ? $pParams['level'] : 0 ), $params );
 
-		if( !empty( $pData ) && !empty( $garg ) ) {
-			$wikilib = new WikiLib();
-			$mapdata = $wikilib->get_graph_map( $pData, $level, $garg );
-			$mapdata = preg_replace( "/\n|\r/", '', $mapdata );
-			$ret .= "<map name='$mapname'>$mapdata</map>";
-			$ret .= "</div>";
+			$ret = "
+				<div align='center'>
+				<img border='0' src=\"".WIKI_PKG_URL."wiki_graph.php?page=".urlencode( $pData )."{$querystring}\" alt='{$title}' usemap='#$mapname' />
+				<map name='$mapname'>$mapdata</map>
+				</div>";
+			$ret = preg_replace( "/\n|\r/", '', $ret );
 		}
 	}
 	return $ret;
 }
 
-} // wiki package and graphviz check
+} // graphviz check
 ?>