[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16193] trunk

[<lph...@us...>]

Revision: 16193
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16193&view=rev
Author:   lphuberdeau
Date:     2009-01-06 21:34:57 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
[MOD]?\194?\160Add WYSIWYCA to mind map (and fix it too)

Modified Paths:
--------------
    trunk/lib/tikilib.php
    trunk/lib/wiki-plugins/wikiplugin_flash.php
    trunk/tiki-mindmap.php

Modified: trunk/lib/tikilib.php
===================================================================
--- trunk/lib/tikilib.php	2009-01-06 21:10:47 UTC (rev 16192)
+++ trunk/lib/tikilib.php	2009-01-06 21:34:57 UTC (rev 16193)
@@ -5675,8 +5675,11 @@
 
 			// Make sure all arguments are declared
 			$params = $info['params'];
-			$args = array_intersect_key( $args, $params );
 
+			if( ! isset( $info['extraparams'] ) ) {
+				$args = array_intersect_key( $args, $params );
+			}
+
 			// Apply filters on values individually
 			foreach( $args as $argKey => &$argValue ) {
 				$filter = isset($params[$argKey]['filter']) ? TikiFilter::get($params[$argKey]['filter']) : $default;

Modified: trunk/lib/wiki-plugins/wikiplugin_flash.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_flash.php	2009-01-06 21:10:47 UTC (rev 16192)
+++ trunk/lib/wiki-plugins/wikiplugin_flash.php	2009-01-06 21:34:57 UTC (rev 16193)
@@ -15,6 +15,7 @@
 		'documentation' => 'PluginFlash',
 		'description' => tra('Displays a SWF on the wiki page'),
 		'prefs' => array('wikiplugin_flash'),
+		'extraparams' => true,
 		'params' => array(
 			'movie' => array(
 				'required' => true,

Modified: trunk/tiki-mindmap.php
===================================================================
--- trunk/tiki-mindmap.php	2009-01-06 21:10:47 UTC (rev 16192)
+++ trunk/tiki-mindmap.php	2009-01-06 21:34:57 UTC (rev 16193)
@@ -36,11 +36,14 @@
 
 	function populate_node( $node, $pageName, $remainingLevels = 3, $pages = array() )
 	{
-		global $wikilib;
+		global $wikilib, $tikilib, $user;
 		$child = $wikilib->wiki_get_neighbours( $pageName );
 		$child = array_diff( $child, $pages );
 
 		foreach( $child as $page ) {
+			if( ! $tikilib->user_has_perm_on_object( $user, $page, 'wiki page', 'tiki_p_view' ) )
+				continue;
+
 			$node->appendChild( $new = create_node( $node->ownerDocument, $page ) );
 
 			if( $remainingLevels != 0 )
@@ -68,6 +71,7 @@
 } // }}}
 
 $page = isset( $_REQUEST['page'] ) ? $_REQUEST['page'] : $prefs['wikiHomePage'];
+
 $ePage = urlencode( $page );
 
 $plugin = $tikilib->plugin_execute( 'flash', '', array(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.