Tiki Wiki CMS Groupware

Revision: 45820
          http://sourceforge.net/p/tikiwiki/code/45820
Author:   robertplummer
Date:     2013-05-01 13:02:45 +0000 (Wed, 01 May 2013)
Log Message:
-----------
[ENH] Description updates

Modified Paths:
--------------
    trunk/lib/core/Feed/Abstract.php
    trunk/lib/core/Feed/ForwardLink/Metadata.php
    trunk/lib/core/Feed/ForwardLink/PageLookup.php
    trunk/lib/core/Feed/ForwardLink/Receive.php
    trunk/lib/core/Feed/ForwardLink/Search.php
    trunk/lib/core/Feed/ForwardLink/Send.php
    trunk/lib/core/Feed/ForwardLink.php
    trunk/lib/core/Feed/TextLink.php
    trunk/lib/wiki-plugins/wikiplugin_textlink.php

Modified: trunk/lib/core/Feed/Abstract.php
===================================================================
--- trunk/lib/core/Feed/Abstract.php	2013-05-01 10:41:05 UTC (rev 45819)
+++ trunk/lib/core/Feed/Abstract.php	2013-05-01 13:02:45 UTC (rev 45820)
@@ -5,6 +5,13 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
+// File name: Send.php
+// Required path: /lib/core/Feed/ForwardLink
+//
+// Programmer: Robert Plummer
+//
+// Purpose: The base class reused in ForwardLink, TextLink and others
+
 abstract class Feed_Abstract
 {
 	public $name = "";

Modified: trunk/lib/core/Feed/ForwardLink/Metadata.php
===================================================================
--- trunk/lib/core/Feed/ForwardLink/Metadata.php	2013-05-01 10:41:05 UTC (rev 45819)
+++ trunk/lib/core/Feed/ForwardLink/Metadata.php	2013-05-01 13:02:45 UTC (rev 45820)
@@ -5,6 +5,12 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
+// File name: Metadata.php
+// Required path: /lib/core/Feed/ForwardLink
+//
+// Programmer: Robert Plummer
+//
+// Purpose: Generates list of pages which have ForwardLink connections to a given page.
 
 class Feed_ForwardLink_Metadata
 {

Modified: trunk/lib/core/Feed/ForwardLink/PageLookup.php
===================================================================
--- trunk/lib/core/Feed/ForwardLink/PageLookup.php	2013-05-01 10:41:05 UTC (rev 45819)
+++ trunk/lib/core/Feed/ForwardLink/PageLookup.php	2013-05-01 13:02:45 UTC (rev 45820)
@@ -5,6 +5,13 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
+// File name: PageLookup.php
+// Required path: /lib/core/Feed/ForwardLink
+//
+// Programmer: Robert Plummer
+//
+// Purpose: Generates URI to reach destination for passed ForwardLink and redirects browser to that URI.
+
 class Feed_ForwardLink_PageLookup extends Feed_Abstract
 {
 	var $type = 'forwardlink';

Modified: trunk/lib/core/Feed/ForwardLink/Receive.php
===================================================================
--- trunk/lib/core/Feed/ForwardLink/Receive.php	2013-05-01 10:41:05 UTC (rev 45819)
+++ trunk/lib/core/Feed/ForwardLink/Receive.php	2013-05-01 13:02:45 UTC (rev 45820)
@@ -5,6 +5,13 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
+// File name: Receive.php
+// Required path: /lib/core/Feed/ForwardLink
+//
+// Programmer: Robert Plummer
+//
+// Purpose: Verify that incoming URI is requesting a ForwardLink destination on this site and redirect accordingly.
+
 Class Feed_ForwardLink_Receive extends Feed_Abstract
 {
 	var $type = "forwardlink";

Modified: trunk/lib/core/Feed/ForwardLink/Search.php
===================================================================
--- trunk/lib/core/Feed/ForwardLink/Search.php	2013-05-01 10:41:05 UTC (rev 45819)
+++ trunk/lib/core/Feed/ForwardLink/Search.php	2013-05-01 13:02:45 UTC (rev 45820)
@@ -5,6 +5,14 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
+// File name: Search.php
+// Required path: /lib/core/Feed/ForwardLink
+//
+// Programmer: Robert Plummer
+//
+// Purpose: Locate, highlight, and scroll to requested ForwardLink destination.  Add superscripted ForwardLink
+//          indicators wherever ForwardLinks exist within displayed page.
+
 class Feed_ForwardLink_Search
 {
 	var $type = "forwardlink";
@@ -31,16 +39,17 @@
 
 		if (empty($phrase)) return;
 
-		$newestRevision = self::findWikiRevision($phrase);
+        // if successful, will return an array with page, version, data, date, and phrase
+        $newestRevision = self::findWikiRevision($phrase);
 
 		if ($newestRevision == false) {
 			TikiLib::lib("header")->add_jq_onready(
 <<<JQ
 				$('<div />')
 					.html(
-						tr('This can happen if the page you are linking to has changed since you obtained the forwardlink or if the rights to see it are different that what you have set at the moment.') +
+						tr('This can happen if the page you are linking to has changed since you obtained the forwardlink or if the rights to see it are different from what you have set at the moment.') +
 						'&nbsp;&nbsp;' +
-						tr('If you are logged in, try loggin out and then recreate the forwardlink.')
+						tr('If you are logged in, try logging out and then recreate the forwardlink.')
 					)
 					.dialog({
 						title: tr('Phrase not found'),
@@ -65,12 +74,18 @@
 
 		$phrase = JisonParser_Phraser_Handler::superSanitize($phrase);
 
+        // This query will *ALWAYS* fail if the destination page had been created/edited *PRIOR* to applying the 'Simple Wiki Attributes' profile!
+        // Just recreate the destination page after having applied the profile in order to load it with the proper attributes.
 		$query = Tracker_Query::tracker('Wiki Attributes')
 			->byName()
 			->filterFieldByValueLike('Value', $phrase)
 			->render(false)
 			->getLast();
 
+        // TODO: consider adding a test on query failure in order to determine whether:
+        //       1) the phrase isn't found, or
+        //       2) the Simple Wiki Attributes profile wasn't in place at page-creation
+        // ...then display a more meaningful error message
 		if (empty($query)) return false; //couldn't find it
 
 		$query = end($query); //query has a key of itemId, we just need it's details

Modified: trunk/lib/core/Feed/ForwardLink/Send.php
===================================================================
--- trunk/lib/core/Feed/ForwardLink/Send.php	2013-05-01 10:41:05 UTC (rev 45819)
+++ trunk/lib/core/Feed/ForwardLink/Send.php	2013-05-01 13:02:45 UTC (rev 45820)
@@ -5,6 +5,13 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
+// File name: Send.php
+// Required path: /lib/core/Feed/ForwardLink
+//
+// Programmer: Robert Plummer
+//
+// Purpose: Send a textlink to a forwardlink
+
 Class Feed_ForwardLink_Send extends Feed_Abstract
 {
 	var $type = "forwardlink_protocol_send";

Modified: trunk/lib/core/Feed/ForwardLink.php
===================================================================
--- trunk/lib/core/Feed/ForwardLink.php	2013-05-01 10:41:05 UTC (rev 45819)
+++ trunk/lib/core/Feed/ForwardLink.php	2013-05-01 13:02:45 UTC (rev 45820)
@@ -5,6 +5,14 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
+// File name: ForwardLink.php
+// Required path: /lib/core/Feed
+//
+// Programmer: Robert Plummer
+//
+// Purpose: Inject ForwardLink UI components into Wiki editing screens.  Managed page's saved attributes per
+//          ForwardLink UI interaction.  Generates and presents ForwardLink text string to user.
+
 Class Feed_ForwardLink extends Feed_Abstract
 {
 	var $type = 'forwardlink';
@@ -49,6 +57,7 @@
 		$perms = Perms::get();
 
 		//check if profile is created
+        // TODO: implement this or similar checks in search.php to explain why phrase query fails -- 2013-04-09 LDG
 		$trackerId = TikiLib::lib('trk')->get_tracker_by_name('Wiki Attributes');
 		if ($trackerId < 1 && $perms->admin == 'y') {
 			TikiLib::lib('header')->add_jq_onready(

Modified: trunk/lib/core/Feed/TextLink.php
===================================================================
--- trunk/lib/core/Feed/TextLink.php	2013-05-01 10:41:05 UTC (rev 45819)
+++ trunk/lib/core/Feed/TextLink.php	2013-05-01 13:02:45 UTC (rev 45820)
@@ -5,6 +5,13 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
+// File name: TextLink.php
+// Required path: /lib/core/Feed
+//
+// Programmer: Robert Plummer
+//
+// Purpose: Adds TextLink UI to page.  Makes it so that sentences wrapped in a textlink are distinguished from the rest of the text in a page for the end user
+
 Class Feed_TextLink extends Feed_Abstract
 {
 	public $type = 'textlink';

Modified: trunk/lib/wiki-plugins/wikiplugin_textlink.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_textlink.php	2013-05-01 10:41:05 UTC (rev 45819)
+++ trunk/lib/wiki-plugins/wikiplugin_textlink.php	2013-05-01 13:02:45 UTC (rev 45820)
@@ -5,6 +5,13 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
+// File name: wikiplugin_textlink.php
+// Required path: /lib/wiki-plugins
+//
+// Programmer: Robert Plummer
+//
+// Purpose: Plugin that instantiates a textlink within a page
+
 function wikiplugin_textlink_info()
 {
 	return array(

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

Revision: 45842
          http://sourceforge.net/p/tikiwiki/code/45842
Author:   lphuberdeau
Date:     2013-05-02 15:28:39 +0000 (Thu, 02 May 2013)
Log Message:
-----------
[MOD]?\194?\160Adding support for result highlighting in elasticsearch

Modified Paths:
--------------
    trunk/lib/core/Search/Elastic/Index.php
    trunk/lib/core/Search/Elastic/QueryBuilder.php
    trunk/lib/test/core/Search/Elastic/IndexTest.php
    trunk/lib/test/core/Search/Elastic/QueryBuilderTest.php
    trunk/lib/test/core/Search/Index/LuceneTest.php

Added Paths:
-----------
    trunk/lib/core/Search/Elastic/ResultSet.php

Modified: trunk/lib/core/Search/Elastic/Index.php
===================================================================
--- trunk/lib/core/Search/Elastic/Index.php	2013-05-02 11:58:48 UTC (rev 45841)
+++ trunk/lib/core/Search/Elastic/Index.php	2013-05-02 15:28:39 UTC (rev 45842)
@@ -71,11 +71,19 @@
 
 		$entries = array_map(
 			function ($entry) {
-				return (array) $entry->_source;
+				$data = (array) $entry->_source;
+
+				if (isset($entry->highlight->contents)) {
+					$data['_highlight'] = implode('...', $entry->highlight->contents);
+				} else {
+					$data['_highlight'] = '';
+				}
+
+				return $data;
 			}, $hits->hits
 		);
 
-		$resultSet = new Search_ResultSet($entries, $hits->total, $resultStart, $resultCount);
+		$resultSet = new Search_Elastic_ResultSet($entries, $hits->total, $resultStart, $resultCount);
 
 		return $resultSet;
 	}

Modified: trunk/lib/core/Search/Elastic/QueryBuilder.php
===================================================================
--- trunk/lib/core/Search/Elastic/QueryBuilder.php	2013-05-02 11:58:48 UTC (rev 45841)
+++ trunk/lib/core/Search/Elastic/QueryBuilder.php	2013-05-02 15:28:39 UTC (rev 45842)
@@ -24,7 +24,16 @@
 	function build(Search_Expr_Interface $expr)
 	{
 		$query = $expr->traverse($this);
-		$query = array("query" => $query);
+		$query = array(
+			"query" => $query,
+			"highlight" => array(
+				"fields" => array(
+					'contents' => array(
+						"number_of_fragments" => 5,
+					),
+				),
+			),
+		);
 
 		return $query;
 	}

Added: trunk/lib/core/Search/Elastic/ResultSet.php
===================================================================
--- trunk/lib/core/Search/Elastic/ResultSet.php	                        (rev 0)
+++ trunk/lib/core/Search/Elastic/ResultSet.php	2013-05-02 15:28:39 UTC (rev 45842)
@@ -0,0 +1,15 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+// 
+// 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.
+// $Id$
+
+class Search_Elastic_ResultSet extends Search_ResultSet
+{
+	function highlight($content)
+	{
+		return $content['_highlight'];
+	}
+}
+


Property changes on: trunk/lib/core/Search/Elastic/ResultSet.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/test/core/Search/Elastic/IndexTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/IndexTest.php	2013-05-02 11:58:48 UTC (rev 45841)
+++ trunk/lib/test/core/Search/Elastic/IndexTest.php	2013-05-02 15:28:39 UTC (rev 45842)
@@ -30,5 +30,18 @@
 			$this->index->destroy();
 		}
 	}
+
+	function testIndexProvidesHighlightHelper()
+	{
+		$query = new Search_Query('foobar or hello');
+		$resultSet = $query->search($this->index);
+
+		$plugin = new Search_Formatter_Plugin_WikiTemplate('{display name=highlight}');
+		$formatter = new Search_Formatter($plugin);
+		$output = $formatter->format($resultSet);
+
+		$this->assertContains('<em>Hello</em>', $output);
+		$this->assertNotContains('<body>', $output);
+	}
 }
 

Modified: trunk/lib/test/core/Search/Elastic/QueryBuilderTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/QueryBuilderTest.php	2013-05-02 11:58:48 UTC (rev 45841)
+++ trunk/lib/test/core/Search/Elastic/QueryBuilderTest.php	2013-05-02 15:28:39 UTC (rev 45842)
@@ -22,12 +22,11 @@
 		$query = $builder->build(new Token('Hello', 'plaintext', 'contents', 1.5));
 
 		$this->assertEquals(
-			array("query" => array(
+			array(
 				"match" => array(
-						"contents" => array("query" => "hello", "boost" => 1.5),
-					),
-				)
-			), $query
+					"contents" => array("query" => "hello", "boost" => 1.5),
+				),
+			), $query['query']
 		);
 	}
 
@@ -45,12 +44,10 @@
 
 		$this->assertEquals(
 			array(
-				"query" => array(
 				"match" => array(
 						"contents" => array("query" => "hello", "boost" => 1.5),
-					),
-				)
-			), $query
+				),
+			), $query['query']
 		);
 	}
 
@@ -68,23 +65,23 @@
 		);
 
 		$this->assertEquals(
-			array("query" => array(
-			"bool" => array(
-				"should" => array(
-					array(
-						"match" => array(
-							"contents" => array("query" => "hello", "boost" => 1.5),
+			array(
+				"bool" => array(
+					"should" => array(
+						array(
+							"match" => array(
+								"contents" => array("query" => "hello", "boost" => 1.5),
+							),
 						),
-					),
-					array(
-						"match" => array(
-							"contents" => array("query" => "world", "boost" => 1.0),
+						array(
+							"match" => array(
+								"contents" => array("query" => "world", "boost" => 1.0),
+							),
 						),
 					),
+					"minimum_number_should_match" => 1,
 				),
-				"minimum_number_should_match" => 1,
-			),
-		)), $query
+			), $query['query']
 		);
 	}
 
@@ -103,23 +100,21 @@
 
 		$this->assertEquals(
 			array(
-				"query" => array(
-					"bool" => array(
-						"must" => array(
-							array(
-								"match" => array(
-									"contents" => array("query" => "hello", "boost" => 1.5),
-								),
+				"bool" => array(
+					"must" => array(
+						array(
+							"match" => array(
+								"contents" => array("query" => "hello", "boost" => 1.5),
 							),
-							array(
-								"match" => array(
-									"contents" => array("query" => "world", "boost" => 1.0),
-								),
+						),
+						array(
+							"match" => array(
+								"contents" => array("query" => "world", "boost" => 1.0),
 							),
 						),
 					),
-				)
-			), $query
+				),
+			), $query['query']
 		);
 	}
 
@@ -134,7 +129,7 @@
 		);
 
 		$this->assertEquals(
-			array("query" => array(
+			array(
 				"bool" => array(
 					"must_not" => array(
 						array(
@@ -144,8 +139,7 @@
 						),
 					),
 				),
-			)
-			), $query
+			), $query['query']
 		);
 	}
 
@@ -156,14 +150,13 @@
 		$query = $builder->build(new Token('Some entry', 'identifier', 'username', 1.5));
 
 		$this->assertEquals(
-			array("query" => array(
+			array(
 				"match" => array(
 					"username" => array(
 						"query" => "Some entry",
 					),
 				),
-				)
-			), $query
+			), $query['query']
 		);
 	}
 
@@ -174,7 +167,7 @@
 		$query = $builder->build(new Range('Hello', 'World', 'plaintext', 'title', 1.5));
 
 		$this->assertEquals(
-			array("query" => array(
+			array(
 				"range" => array(
 					"title" => array(
 						"from" => "hello",
@@ -183,7 +176,7 @@
 						"include_upper" => false,
 					),
 				),
-			)), $query
+			), $query['query']
 		);
 	}
 
@@ -194,15 +187,14 @@
 		$query = $builder->build(new Initial('Hello', 'plaintext', 'title', 1.5));
 
 		$this->assertEquals(
-			array("query" => array(
+			array(
 				"prefix" => array(
 					"title" => array(
 						"value" => "hello",
 						"boost" => 1.5,
-						),
 					),
-				)
-			), $query
+				),
+			), $query['query']
 		);
 	}
 }

Modified: trunk/lib/test/core/Search/Index/LuceneTest.php
===================================================================
--- trunk/lib/test/core/Search/Index/LuceneTest.php	2013-05-02 11:58:48 UTC (rev 45841)
+++ trunk/lib/test/core/Search/Index/LuceneTest.php	2013-05-02 15:28:39 UTC (rev 45842)
@@ -149,7 +149,6 @@
 
 	function testIndexProvidesHighlightHelper()
 	{
-		$this->markTestSkipped('TODO');
 		$query = new Search_Query('foobar or hello');
 		$resultSet = $query->search($this->index);
 

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

Revision: 45843
          http://sourceforge.net/p/tikiwiki/code/45843
Author:   lphuberdeau
Date:     2013-05-02 18:01:28 +0000 (Thu, 02 May 2013)
Log Message:
-----------
[MOD]?\194?\160Adding support for custom search result ordering in elasticsearch

Modified Paths:
--------------
    trunk/lib/core/Search/Elastic/Connection.php
    trunk/lib/core/Search/Elastic/Index.php
    trunk/lib/core/Search/Elastic/QueryBuilder.php
    trunk/lib/test/core/Search/Index/LuceneSortTest.php

Added Paths:
-----------
    trunk/lib/core/Search/Elastic/OrderBuilder.php
    trunk/lib/test/core/Search/Elastic/SortTest.php

Modified: trunk/lib/core/Search/Elastic/Connection.php
===================================================================
--- trunk/lib/core/Search/Elastic/Connection.php	2013-05-02 15:28:39 UTC (rev 45842)
+++ trunk/lib/core/Search/Elastic/Connection.php	2013-05-02 18:01:28 UTC (rev 45843)
@@ -57,26 +57,31 @@
 			"properties" => $mapping,
 		));
 
-		$this->put(
-			"/$index", json_encode(
-				array(
-					'analysis' => array(
-						'analyzer' => array(
-							'default' => array(
-								'tokenizer' => 'standard',
-								'filter' => array('standard', 'lowercase', 'asciifolding', 'tiki_stop', 'porterStem'),
+		try {
+			$this->put(
+				"/$index", json_encode(
+					array(
+						'analysis' => array(
+							'analyzer' => array(
+								'default' => array(
+									'tokenizer' => 'standard',
+									'filter' => array('standard', 'lowercase', 'asciifolding', 'tiki_stop', 'porterStem'),
+								),
 							),
-						),
-						'filter' => array(
-							'tiki_stop' => array(
-								'type' => 'stop',
-								'stopwords' => array ("a", "an", "and", "are", "as", "at", "be", "but", "by", "for", "if", "in", "into", "is", "it", "no", "not", "of", "on", "or", "s", "such", "t", "that", "the", "their", "then", "there", "these", "they", "this", "to", "was", "will", "with"),
+							'filter' => array(
+								'tiki_stop' => array(
+									'type' => 'stop',
+									'stopwords' => array ("a", "an", "and", "are", "as", "at", "be", "but", "by", "for", "if", "in", "into", "is", "it", "no", "not", "of", "on", "or", "s", "such", "t", "that", "the", "their", "then", "there", "these", "they", "this", "to", "was", "will", "with"),
+								),
 							),
 						),
-					),
+					)
 				)
-			)
-		);
+			);
+		} catch (Search_Elastic_Exception $e) {
+			// Index already exists: ignore
+		}
+
 		$result = $this->put("/$index/$type/_mapping", json_encode($data));
 
 		return $result;

Modified: trunk/lib/core/Search/Elastic/Index.php
===================================================================
--- trunk/lib/core/Search/Elastic/Index.php	2013-05-02 15:28:39 UTC (rev 45842)
+++ trunk/lib/core/Search/Elastic/Index.php	2013-05-02 18:01:28 UTC (rev 45843)
@@ -66,6 +66,19 @@
 		$builder = new Search_Elastic_QueryBuilder;
 		$query = $builder->build($expr);
 
+		$builder = new Search_Elastic_OrderBuilder;
+		$order = $builder->build($sortOrder);
+
+		$query = array_merge($query, $order, array(
+			"highlight" => array(
+				"fields" => array(
+					'contents' => array(
+						"number_of_fragments" => 5,
+					),
+				),
+			),
+		));
+
 		$result = $this->connection->search($this->index, $query, $resultStart, $resultCount);
 		$hits = $result->hits;
 

Added: trunk/lib/core/Search/Elastic/OrderBuilder.php
===================================================================
--- trunk/lib/core/Search/Elastic/OrderBuilder.php	                        (rev 0)
+++ trunk/lib/core/Search/Elastic/OrderBuilder.php	2013-05-02 18:01:28 UTC (rev 45843)
@@ -0,0 +1,38 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_OrderBuilder
+{
+	function build(Search_Query_Order $order)
+	{
+		$component = '_score';
+		$field = $order->getField();
+
+		if ($field !== Search_Query_Order::FIELD_SCORE) {
+			if ($order->getMode() == Search_Query_Order::MODE_NUMERIC) {
+				$component = array(
+					"_script" => array(
+						"script" => "doc['$field'].value * 1",
+						"type" => "number",
+						"order" => $order->getOrder(),
+					),
+				);
+			} else {
+				$component = array(
+					$field => $order->getOrder(),
+				);
+			}
+		}
+
+		return array(
+			"sort" => array(
+				$component,
+			),
+		);
+	}
+}
+


Property changes on: trunk/lib/core/Search/Elastic/OrderBuilder.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/core/Search/Elastic/QueryBuilder.php
===================================================================
--- trunk/lib/core/Search/Elastic/QueryBuilder.php	2013-05-02 15:28:39 UTC (rev 45842)
+++ trunk/lib/core/Search/Elastic/QueryBuilder.php	2013-05-02 18:01:28 UTC (rev 45843)
@@ -24,16 +24,7 @@
 	function build(Search_Expr_Interface $expr)
 	{
 		$query = $expr->traverse($this);
-		$query = array(
-			"query" => $query,
-			"highlight" => array(
-				"fields" => array(
-					'contents' => array(
-						"number_of_fragments" => 5,
-					),
-				),
-			),
-		);
+		$query = array("query" => $query);
 
 		return $query;
 	}

Added: trunk/lib/test/core/Search/Elastic/SortTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/SortTest.php	                        (rev 0)
+++ trunk/lib/test/core/Search/Elastic/SortTest.php	2013-05-02 18:01:28 UTC (rev 45843)
@@ -0,0 +1,34 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_SortTest extends Search_Index_LuceneSortTest
+{
+	function setUp()
+	{
+		static $count = 0;
+
+		$connection = new Search_Elastic_Connection('http://localhost:9200');
+
+		$status = $connection->getStatus();
+		if (! $status->ok) {
+			$this->markTestSkipped('ElasticSearch needs to be available on localhost:9200 for the test to run.');
+		}
+
+		$this->index = new Search_Elastic_Index($connection, 'test_index');
+		$this->index->destroy();
+
+		$this->populate($this->index);
+	}
+
+	function tearDown()
+	{
+		if ($this->index) {
+			$this->index->destroy();
+		}
+	}
+}
+


Property changes on: trunk/lib/test/core/Search/Elastic/SortTest.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/test/core/Search/Index/LuceneSortTest.php
===================================================================
--- trunk/lib/test/core/Search/Index/LuceneSortTest.php	2013-05-02 15:28:39 UTC (rev 45842)
+++ trunk/lib/test/core/Search/Index/LuceneSortTest.php	2013-05-02 18:01:28 UTC (rev 45843)
@@ -11,19 +11,23 @@
 class Search_Index_LuceneSortTest extends PHPUnit_Framework_TestCase
 {
 	private $dir;
-	private $index;
+	protected $index;
 
 	function setUp()
 	{
 		$this->dir = dirname(__FILE__) . '/test_index';
 		$this->tearDown();
 
-		$index = new Search_Index_Lucene($this->dir);
+		$this->index = new Search_Index_Lucene($this->dir);
+
+		$this->populate($this->index);
+	}
+
+	protected function populate($index)
+	{
 		$this->add($index, 'A', '1', 'Hello', 'foobar');
 		$this->add($index, 'B', '10', 'foobar', 'Hello');
 		$this->add($index, 'C', '2', 'Baz', 'Baz');
-
-		$this->index = $index;
 	}
 
 	function tearDown()
@@ -40,8 +44,6 @@
 			array('numeric_field_asc', 'ABC'),
 			array('text_field_asc', 'CBA'),
 			array('text_field_desc', 'ABC'),
-			array('text_field_nasc', 'ABC'),
-			array('text_field_ndesc', 'ABC'),
 		);
 	}
 

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

Revision: 45845
          http://sourceforge.net/p/tikiwiki/code/45845
Author:   lphuberdeau
Date:     2013-05-02 20:19:58 +0000 (Thu, 02 May 2013)
Log Message:
-----------
[MOD]?\194?\160Adding result pagination support for elastic search

Modified Paths:
--------------
    trunk/lib/core/Search/Elastic/Index.php
    trunk/lib/test/core/Search/Index/LucenePaginationTest.php

Added Paths:
-----------
    trunk/lib/test/core/Search/Elastic/PaginationTest.php

Modified: trunk/lib/core/Search/Elastic/Index.php
===================================================================
--- trunk/lib/core/Search/Elastic/Index.php	2013-05-02 19:54:23 UTC (rev 45844)
+++ trunk/lib/core/Search/Elastic/Index.php	2013-05-02 20:19:58 UTC (rev 45845)
@@ -70,6 +70,8 @@
 		$order = $builder->build($sortOrder);
 
 		$query = array_merge($query, $order, array(
+			"from" => $resultStart,
+			"size" => $resultCount,
 			"highlight" => array(
 				"fields" => array(
 					'contents' => array(

Added: trunk/lib/test/core/Search/Elastic/PaginationTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/PaginationTest.php	                        (rev 0)
+++ trunk/lib/test/core/Search/Elastic/PaginationTest.php	2013-05-02 20:19:58 UTC (rev 45845)
@@ -0,0 +1,32 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_PaginationTest extends Search_Index_LucenePaginationTest
+{
+	function setUp()
+	{
+		static $count = 0;
+
+		$connection = new Search_Elastic_Connection('http://localhost:9200');
+
+		$status = $connection->getStatus();
+		if (! $status->ok) {
+			$this->markTestSkipped('ElasticSearch needs to be available on localhost:9200 for the test to run.');
+		}
+
+		$this->index = new Search_Elastic_Index($connection, 'test_index');
+		$this->index->destroy();
+	}
+
+	function tearDown()
+	{
+		if ($this->index) {
+			$this->index->destroy();
+		}
+	}
+}
+


Property changes on: trunk/lib/test/core/Search/Elastic/PaginationTest.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/test/core/Search/Index/LucenePaginationTest.php
===================================================================
--- trunk/lib/test/core/Search/Index/LucenePaginationTest.php	2013-05-02 19:54:23 UTC (rev 45844)
+++ trunk/lib/test/core/Search/Index/LucenePaginationTest.php	2013-05-02 20:19:58 UTC (rev 45845)
@@ -7,7 +7,7 @@
 
 class Search_Index_LucenePaginationTest extends PHPUnit_Framework_TestCase
 {
-	private $index;
+	protected $index;
 	private $dir;
 
 	function setUp()
@@ -41,6 +41,7 @@
 		$this->addDocuments($count);
 
 		$query = new Search_Query;
+		$query->setOrder('object_id_nasc');
 		$query->filterType('article');
 		$query->setRange($from, $perPage);
 

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

Revision: 45847
          http://sourceforge.net/p/tikiwiki/code/45847
Author:   lphuberdeau
Date:     2013-05-02 20:46:56 +0000 (Thu, 02 May 2013)
Log Message:
-----------
[MOD] Adding test suite for incremental updates in elasticsearch - no magic required

Modified Paths:
--------------
    trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php

Added Paths:
-----------
    trunk/lib/core/Search/Elastic/IncrementalUpdateTest.php

Added: trunk/lib/core/Search/Elastic/IncrementalUpdateTest.php
===================================================================
--- trunk/lib/core/Search/Elastic/IncrementalUpdateTest.php	                        (rev 0)
+++ trunk/lib/core/Search/Elastic/IncrementalUpdateTest.php	2013-05-02 20:46:56 UTC (rev 45847)
@@ -0,0 +1,39 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_IncrementalUpdateTest extends Search_Index_LuceneIncrementalUpdateTest
+{
+	protected $index;
+
+	function setUp()
+	{
+		$this->index = $this->getIndex();
+		$this->index->destroy();
+
+		$this->populate($this->index);
+	}
+
+	protected function getIndex()
+	{
+		$connection = new Search_Elastic_Connection('http://localhost:9200');
+
+		$status = $connection->getStatus();
+		if (! $status->ok) {
+			$this->markTestSkipped('ElasticSearch needs to be available on localhost:9200 for the test to run.');
+		}
+
+		return new Search_Elastic_Index($connection, 'test_index');
+	}
+
+	function tearDown()
+	{
+		if ($this->index) {
+			$this->index->destroy();
+		}
+	}
+}
+


Property changes on: trunk/lib/core/Search/Elastic/IncrementalUpdateTest.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php
===================================================================
--- trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php	2013-05-02 20:31:58 UTC (rev 45846)
+++ trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php	2013-05-02 20:46:56 UTC (rev 45847)
@@ -17,7 +17,17 @@
 		$this->dir = dirname(__FILE__) . '/test_index';
 		$this->tearDown();
 
-		$index = new Search_Index_Lucene($this->dir);
+		$index = $this->getIndex();
+		$this->populate($index);
+	}
+
+	protected function getIndex()
+	{
+		return new Search_Index_Lucene($this->dir);
+	}
+
+	protected function populate($index)
+	{
 		$this->addDocument($index, 'wiki page', 'HomePage', 'Hello World');
 		$this->addDocument($index, 'wiki page', 'SomePage', 'No content yet.');
 	}
@@ -33,7 +43,7 @@
 		$query = new Search_Query;
 		$query->addObject('wiki page', 'NewPage');
 
-		$index = new Search_Index_Lucene($this->dir);
+		$index = $this->getIndex();
 		$query->invalidate($index);
 		$this->addDocument($index, 'wiki page', 'NewPage', 'Testing out');
 
@@ -47,7 +57,7 @@
 		$query = new Search_Query;
 		$query->addObject('wiki page', 'SomePage');
 
-		$index = new Search_Index_Lucene($this->dir);
+		$index = $this->getIndex();
 		$query->invalidate($index);
 		$this->addDocument($index, 'wiki page', 'SomePage', 'Foobar');
 

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

Revision: 45857
          http://sourceforge.net/p/tikiwiki/code/45857
Author:   sylvieg
Date:     2013-05-06 11:04:50 +0000 (Mon, 06 May 2013)
Log Message:
-----------
[ENH]option to show expire for an ingroup field

Modified Paths:
--------------
    trunk/lib/core/Tracker/Field/InGroup.php
    trunk/lib/userslib.php

Modified: trunk/lib/core/Tracker/Field/InGroup.php
===================================================================
--- trunk/lib/core/Tracker/Field/InGroup.php	2013-05-06 09:45:53 UTC (rev 45856)
+++ trunk/lib/core/Tracker/Field/InGroup.php	2013-05-06 11:04:50 UTC (rev 45857)
@@ -37,6 +37,7 @@
 						'options' => array(
 							'' => tr('Yes/No'),
 							'date' => tr('Join date'),
+							'expire'=>tr('Expiration date')
 						),
 					),
 				),
@@ -62,16 +63,18 @@
 		if (!empty($itemUser)) {
 			if (!isset($trklib->tracker_infocache['users_group'][$this->getOption(0)])) {
 				$userlib = TikiLib::lib('user');
-				$trklib->tracker_infocache['users_group'][$this->getOption(0)] = $userlib->get_users_created_group($this->getOption(0));
+				$trklib->tracker_infocache['users_group'][$this->getOption(0)] = $userlib->get_users_created_group($this->getOption(0), null, true);
 			}
 			if (isset($trklib->tracker_infocache['users_group'][$this->getOption(0)][$itemUser])) {
 				if ($this->getOption(1) == 'date') {
-					$value = $trklib->tracker_infocache['users_group'][$this->getOption(0)][$itemUser];
+					$value = $trklib->tracker_infocache['users_group'][$this->getOption(0)][$itemUser]['created'];
+				} elseif ($this->getOption(1) == 'expire') {
+					$value = $trklib->tracker_infocache['users_group'][$this->getOption(0)][$itemUser]['expire'];
 				} else {
 					$value = 'Yes';
 				}
 			} else {
-				if ($this->getOption(1) == 'date') {
+				if ($this->getOption(1) == 'date' || $this->getOption(1) == 'expire') {
 					$value = '';
 				} else {
 					$value = 'No';
@@ -79,7 +82,7 @@
 			}
 		}
 		
-		if ($this->getOption(1) === 'date') {
+		if ($this->getOption(1) === 'date' || $this->getOption(1) == 'expire') {
 			if (!empty($value)) {
 				return TikiLib::lib('tiki')->get_short_date($value);
 			}

Modified: trunk/lib/userslib.php
===================================================================
--- trunk/lib/userslib.php	2013-05-06 09:45:53 UTC (rev 45856)
+++ trunk/lib/userslib.php	2013-05-06 11:04:50 UTC (rev 45857)
@@ -7182,17 +7182,17 @@
 		return array('timestamp' => $timestamp, 'ratio_prorated_first_period' => $ratio_prorated_first_period);
 	}
 
-	function get_users_created_group($group, $user=null)
+	function get_users_created_group($group, $user=null, $with_expire=false)
 	{
 		if (!empty($user)) {
-			$query = 'SELECT `users_usergroups`.`created` FROM `users_usergroups`' .
-								' LEFT JOIN `users_users` on (`users_users`.`userId`=`users_usergroups`.`userId`)' .
-								' WHERE `groupName`=? AND `user`=?';
+			$query = 'SELECT uug.`created`,uug.`expire` FROM `users_usergroups` uug' .
+								' LEFT JOIN `users_users` on (`users_users`.`userId`=uug.`userId`)' .
+								' WHERE `groupName`=? AND `login`=?';
 
 			$bindvars = array($group, $user);
 		} else {
-			$query = 'SELECT `login`, `users_usergroups`.`created` FROM `users_usergroups`' .
-								' LEFT JOIN `users_users` on (`users_users`.`userId`=`users_usergroups`.`userId`)' .
+			$query = 'SELECT `login`, uug.`created`,uug.`expire` FROM `users_usergroups` uug' .
+								' LEFT JOIN `users_users` on (`users_users`.`userId`=uug.`userId`)' .
 								' WHERE `groupName`=?';
 
 			$bindvars = array($group);
@@ -7201,7 +7201,16 @@
 		$ret = array();
 
 		while ($res = $result->fetchRow()) {
-			$ret[$res['login']]= $res['created'];
+			if ($with_expire) {
+				$ret[$res['login']]['created'] = $res['created'];
+				if (empty($res['expire']))
+					$re = $this->get_group_info($group);
+					if ($re['expireAfter'] > 0) {
+						$res['expire'] = $res['created'] + ($re['expireAfter'] * 24*60*60);
+					}
+				$ret[$res['login']]['expire'] = $res['expire'];
+			} else
+				$ret[$res['login']]= $res['created'];
 		}
 
 		return $ret;

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

Revision: 45863
          http://sourceforge.net/p/tikiwiki/code/45863
Author:   lphuberdeau
Date:     2013-05-06 17:26:57 +0000 (Mon, 06 May 2013)
Log Message:
-----------
[MOD]?\194?\160Modify the document update interface to better accomodate different indexing techniques, add support for document deletion in elasticsearch

Modified Paths:
--------------
    trunk/lib/core/Search/Elastic/Connection.php
    trunk/lib/core/Search/Elastic/Index.php
    trunk/lib/core/Search/Index/Interface.php
    trunk/lib/core/Search/Index/Lucene.php
    trunk/lib/core/Search/Index/Memory.php
    trunk/lib/core/Search/Indexer.php
    trunk/lib/core/Search/Query.php
    trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php

Modified: trunk/lib/core/Search/Elastic/Connection.php
===================================================================
--- trunk/lib/core/Search/Elastic/Connection.php	2013-05-06 17:13:58 UTC (rev 45862)
+++ trunk/lib/core/Search/Elastic/Connection.php	2013-05-06 17:26:57 UTC (rev 45863)
@@ -50,6 +50,14 @@
 		return $this->put("/$index/$type/$id?refresh=true", json_encode($data));
 	}
 
+	function unindex($index, $type, $id)
+	{
+		$type = $this->simplifyType($type);
+		$id = rawurlencode($id);
+
+		return $this->delete("/$index/$type/$id?refresh=true");
+	}
+
 	function mapping($index, $type, array $mapping)
 	{
 		$type = $this->simplifyType($type);

Modified: trunk/lib/core/Search/Elastic/Index.php
===================================================================
--- trunk/lib/core/Search/Elastic/Index.php	2013-05-06 17:13:58 UTC (rev 45862)
+++ trunk/lib/core/Search/Elastic/Index.php	2013-05-06 17:26:57 UTC (rev 45863)
@@ -9,6 +9,7 @@
 {
 	private $connection;
 	private $index;
+	private $invalidateList = array();
 
 	function __construct(Search_Elastic_Connection $connection, $index)
 	{
@@ -27,6 +28,8 @@
 		$objectType = $data['object_type']->getValue($factory);
 		$objectId = $data['object_id']->getValue($factory);
 
+		unset($this->invalidateList[$objectType . ':' . $objectId]);
+
 		// Note: Sending the mapping on every request is not terribly efficient. Profiling required before the feature is production-ready
 		$mapping = array_map(
 			function ($entry) {
@@ -53,12 +56,25 @@
 		$this->connection->index($this->index, $objectType, $objectId, $data);
 	}
 
+	function endUpdate()
+	{
+		foreach ($this->invalidateList as $object) {
+			$this->connection->unindex($this->index, $object['object_type'], $object['object_id']);
+		}
+
+		$this->invalidateList = array();
+	}
+
 	function optimize()
 	{
 	}
 
-	function invalidateMultiple(Search_Expr_Interface $expr)
+	function invalidateMultiple(array $objectList)
 	{
+		foreach ($objectList as $object) {
+			$key = $object['object_type'] . ':' . $object['object_id'];
+			$this->invalidateList[$key] = $object;
+		}
 	}
 
 	function find(Search_Expr_Interface $expr, Search_Query_Order $sortOrder, $resultStart, $resultCount)

Modified: trunk/lib/core/Search/Index/Interface.php
===================================================================
--- trunk/lib/core/Search/Index/Interface.php	2013-05-06 17:13:58 UTC (rev 45862)
+++ trunk/lib/core/Search/Index/Interface.php	2013-05-06 17:26:57 UTC (rev 45863)
@@ -9,8 +9,10 @@
 {
 	function addDocument(array $document);
 
-	function invalidateMultiple(Search_Expr_Interface $query);
+	function invalidateMultiple(array $query);
 
+	function endUpdate();
+
 	function find(Search_Expr_Interface $query, Search_Query_Order $sortOrder, $resultStart, $resultCount);
 
 	function getTypeFactory();

Modified: trunk/lib/core/Search/Index/Lucene.php
===================================================================
--- trunk/lib/core/Search/Index/Lucene.php	2013-05-06 17:13:58 UTC (rev 45862)
+++ trunk/lib/core/Search/Index/Lucene.php	2013-05-06 17:26:57 UTC (rev 45863)
@@ -64,27 +64,36 @@
 		$this->getLucene()->addDocument($document);
 	}
 
+	function endUpdate()
+	{
+	}
+
 	function optimize()
 	{
 		$this->getLucene()->optimize();
 	}
 
-	function invalidateMultiple(Search_Expr_Interface $expr)
+	function invalidateMultiple(array $objectList)
 	{
-		$documents = array();
+		$expr = $this->buildExpr($objectList);
 
 		$lucene = $this->getLucene();
 		$query = $this->buildQuery($expr);
 		foreach ($lucene->find($query) as $hit) {
 			$document = $hit->getDocument();
-			$documents[] = array(
-				'object_type' => $document->object_type,
-				'object_id' => $document->object_id,
-			);
 			$lucene->delete($hit->id);
 		}
+	}
 
-		return $documents;
+	private function buildExpr(array $objectList)
+	{
+		$query = new Search_Query;
+		foreach ($objectList as $object) {
+			$object = (array) $object;
+			$query->addObject($object['object_type'], $object['object_id']);
+		}
+
+		return $query->getExpr();
 	}
 
 	function find(Search_Expr_Interface $query, Search_Query_Order $sortOrder, $resultStart, $resultCount)

Modified: trunk/lib/core/Search/Index/Memory.php
===================================================================
--- trunk/lib/core/Search/Index/Memory.php	2013-05-06 17:13:58 UTC (rev 45862)
+++ trunk/lib/core/Search/Index/Memory.php	2013-05-06 17:26:57 UTC (rev 45863)
@@ -18,11 +18,14 @@
 		$this->data[] = $data;
 	}
 
-	function invalidateMultiple(Search_Expr_Interface $query)
+	function endUpdate()
 	{
-		return array();
 	}
 
+	function invalidateMultiple(array $objectList)
+	{
+	}
+
 	function find(Search_Expr_Interface $query, Search_Query_Order $sortOrder, $resultStart, $resultCount)
 	{
 		$this->lastQuery = $query;

Modified: trunk/lib/core/Search/Indexer.php
===================================================================
--- trunk/lib/core/Search/Indexer.php	2013-05-06 17:13:58 UTC (rev 45862)
+++ trunk/lib/core/Search/Indexer.php	2013-05-06 17:26:57 UTC (rev 45863)
@@ -70,25 +70,15 @@
 		return $stat;
 	}
 
-	public function update($searchArgument)
+	public function update(array $objectList)
 	{
-		if (is_array($searchArgument)) {
-			$query = new Search_Query;
-			foreach ($searchArgument as $object) {
-				$obj2array=(array) $object;
-				$query->addObject($obj2array['object_type'], $obj2array['object_id']);
-			}
+		$this->searchIndex->invalidateMultiple($objectList);
 
-			$result = $query->invalidate($this->searchIndex);
-			$objectList = $searchArgument;
-		} elseif ($searchArgument instanceof Search_Query) {
-			$objectList = $searchArgument->invalidate($this->searchIndex);
+		foreach ($objectList as $object) {
+			$this->addDocument($object['object_type'], $object['object_id']);
 		}
 
-		foreach ($objectList as $object) {
-			$obj2array=(array) $object;
-			$this->addDocument($obj2array['object_type'], $obj2array['object_id']);
-		}
+		$this->searchIndex->endUpdate();
 	}
 
 	private function addDocument($objectType, $objectId)

Modified: trunk/lib/core/Search/Query.php
===================================================================
--- trunk/lib/core/Search/Query.php	2013-05-06 17:13:58 UTC (rev 45862)
+++ trunk/lib/core/Search/Query.php	2013-05-06 17:26:57 UTC (rev 45863)
@@ -194,9 +194,9 @@
 		return $index->find($this->expr, $sortOrder, $this->start, $this->count);
 	}
 
-	function invalidate(Search_Index_Interface $index)
+	function getExpr()
 	{
-		return $index->invalidateMultiple($this->expr);
+		return $this->expr;
 	}
 
 	private function parse($query)

Modified: trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php
===================================================================
--- trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php	2013-05-06 17:13:58 UTC (rev 45862)
+++ trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php	2013-05-06 17:26:57 UTC (rev 45863)
@@ -40,12 +40,15 @@
 
 	function testAddNewDocument()
 	{
-		$query = new Search_Query;
-		$query->addObject('wiki page', 'NewPage');
-
 		$index = $this->getIndex();
-		$query->invalidate($index);
+		$index->invalidateMultiple(array(
+			array(
+				'object_type' => 'wiki page',
+				'object_id' => 'NewPage',
+			),
+		));
 		$this->addDocument($index, 'wiki page', 'NewPage', 'Testing out');
+		$index->endUpdate();
 
 		$this->assertResultFound('out', $index);
 		$this->assertResultFound('content', $index);
@@ -54,17 +57,35 @@
 
 	function testReplaceDocument()
 	{
-		$query = new Search_Query;
-		$query->addObject('wiki page', 'SomePage');
-
 		$index = $this->getIndex();
-		$query->invalidate($index);
+		$index->invalidateMultiple(array(
+			array(
+				'object_type' => 'wiki page',
+				'object_id' => 'SomePage',
+			),
+		));
 		$this->addDocument($index, 'wiki page', 'SomePage', 'Foobar');
+		$index->endUpdate();
 
 		$this->assertResultFound('foobar', $index);
 		$this->assertResultFound('content', $index, 0);
 	}
 
+	function testRemoveDocument()
+	{
+		$index = $this->getIndex();
+		$index->invalidateMultiple(array(
+			array(
+				'object_type' => 'wiki page',
+				'object_id' => 'SomePage',
+			),
+		));
+		$index->endUpdate();
+
+		$this->assertResultFound('foobar', $index, 0);
+		$this->assertResultFound('content', $index, 0);
+	}
+
 	private function assertResultFound($word, $index, $count = 1)
 	{
 		$query = new Search_Query($word);

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

Revision: 45866
          http://sourceforge.net/p/tikiwiki/code/45866
Author:   lphuberdeau
Date:     2013-05-06 20:30:16 +0000 (Mon, 06 May 2013)
Log Message:
-----------
[MOD]?\194?\160Adding bulk indexing support, reducing network traffic for elasticsearch

Modified Paths:
--------------
    trunk/lib/core/Search/Elastic/Connection.php
    trunk/lib/core/Search/Elastic/Index.php
    trunk/lib/search/searchlib-unified.php
    trunk/lib/test/core/Search/Elastic/PaginationTest.php
    trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php

Added Paths:
-----------
    trunk/lib/core/Search/Elastic/BulkOperation.php
    trunk/lib/test/core/Search/Elastic/BulkIncrementalUpdateTest.php
    trunk/lib/test/core/Search/Elastic/BulkIndexingTest.php

Added: trunk/lib/core/Search/Elastic/BulkOperation.php
===================================================================
--- trunk/lib/core/Search/Elastic/BulkOperation.php	                        (rev 0)
+++ trunk/lib/core/Search/Elastic/BulkOperation.php	2013-05-06 20:30:16 UTC (rev 45866)
@@ -0,0 +1,67 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_BulkOperation
+{
+	private $count = 0;
+	private $limit;
+	private $callback;
+	private $buffer = '';
+
+	function __construct($limit, $callback)
+	{
+		$this->limit = max(10, (int) $limit);
+		$this->callback = $callback;
+	}
+
+	function flush()
+	{
+		if ($this->count > 0) {
+			$callback = $this->callback;
+			$callback($this->buffer);
+
+			$this->buffer = '';
+			$this->count = 0;
+		}
+	}
+
+	function index($index, $type, $id, array $data)
+	{
+		$this->append(array(
+			array('index' => array(
+				'_index' => $index,
+				'_type' => $type,
+				'_id' => $id,
+			)),
+			$data,
+		));
+	}
+
+	function unindex($index, $type, $id)
+	{
+		$this->append(array(
+			array('delete' => array(
+				'_index' => $index,
+				'_type' => $type,
+				'_id' => $id,
+			)),
+		));
+	}
+
+	private function append($lines)
+	{
+		$this->count += 1;
+		foreach ($lines as $line) {
+			$this->buffer .= json_encode($line) . "\n";
+		}
+		
+		if ($this->count >= $this->limit) {
+			$this->flush();
+		}
+	}
+}
+


Property changes on: trunk/lib/core/Search/Elastic/BulkOperation.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/core/Search/Elastic/Connection.php
===================================================================
--- trunk/lib/core/Search/Elastic/Connection.php	2013-05-06 18:05:39 UTC (rev 45865)
+++ trunk/lib/core/Search/Elastic/Connection.php	2013-05-06 20:30:16 UTC (rev 45866)
@@ -12,11 +12,26 @@
 
 	private $indices = array();
 
+	private $bulk;
+
 	function __construct($dsn)
 	{
 		$this->dsn = rtrim($dsn, '/');
 	}
 
+	function __destruct()
+	{
+		$this->flush();
+	}
+
+	function startBulk($size = 500)
+	{
+		$self = $this;
+		$this->bulk = new Search_Elastic_BulkOperation($size, function ($data) use ($self) {
+			$self->postBulk($data);
+		});
+	}
+
 	function getStatus()
 	{
 		try {
@@ -31,6 +46,8 @@
 
 	function deleteIndex($index)
 	{
+		$this->flush();
+
 		try {
 			unset($this->indices[$index]);
 			return $this->delete("/$index");
@@ -53,25 +70,42 @@
 	function index($index, $type, $id, array $data)
 	{
 		$this->dirty = true;
-
 		$type = $this->simplifyType($type);
-		$id = rawurlencode($id);
 
-		return $this->put("/$index/$type/$id", json_encode($data));
+		if ($this->bulk) {
+			$this->bulk->index($index, $type, $id, $data);
+		} else {
+			$id = rawurlencode($id);
+
+			return $this->put("/$index/$type/$id", json_encode($data));
+		}
 	}
 
 	function unindex($index, $type, $id)
 	{
 		$this->dirty = true;
-
 		$type = $this->simplifyType($type);
-		$id = rawurlencode($id);
 
-		return $this->delete("/$index/$type/$id");
+		if ($this->bulk) {
+			$this->bulk->unindex($index, $type, $id);
+		} else {
+			$id = rawurlencode($id);
+
+			return $this->delete("/$index/$type/$id");
+		}
 	}
 
+	function flush()
+	{
+		if ($this->bulk) {
+			$this->bulk->flush();
+		}
+	}
+
 	function refresh($index)
 	{
+		$this->flush();
+
 		$this->post("/$index/_refresh", '');
 		$this->dirty = false;
 	}
@@ -93,6 +127,11 @@
 		return $result;
 	}
 
+	function postBulk($data)
+	{
+		$this->post("/_bulk", $data);
+	}
+
 	private function createIndex($index)
 	{
 		try {

Modified: trunk/lib/core/Search/Elastic/Index.php
===================================================================
--- trunk/lib/core/Search/Elastic/Index.php	2013-05-06 18:05:39 UTC (rev 45865)
+++ trunk/lib/core/Search/Elastic/Index.php	2013-05-06 20:30:16 UTC (rev 45866)
@@ -74,6 +74,8 @@
 			$this->connection->unindex($this->index, $object['object_type'], $object['object_id']);
 		}
 
+		$this->connection->flush();
+
 		$this->invalidateList = array();
 	}
 

Modified: trunk/lib/search/searchlib-unified.php
===================================================================
--- trunk/lib/search/searchlib-unified.php	2013-05-06 18:05:39 UTC (rev 45865)
+++ trunk/lib/search/searchlib-unified.php	2013-05-06 20:30:16 UTC (rev 45866)
@@ -449,7 +449,10 @@
 	private function getElasticConnection()
 	{
 		global $prefs;
-		return new Search_Elastic_Connection($prefs['unified_elastic_url']);
+		$connection = new Search_Elastic_Connection($prefs['unified_elastic_url']);
+		$connection->startBulk();
+
+		return $connection;
 	}
 
     /**

Added: trunk/lib/test/core/Search/Elastic/BulkIncrementalUpdateTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/BulkIncrementalUpdateTest.php	                        (rev 0)
+++ trunk/lib/test/core/Search/Elastic/BulkIncrementalUpdateTest.php	2013-05-06 20:30:16 UTC (rev 45866)
@@ -0,0 +1,40 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_BulkIncrementalUpdateTest extends Search_Index_LuceneIncrementalUpdateTest
+{
+	protected $index;
+
+	function setUp()
+	{
+		$this->index = $this->getIndex();
+		$this->index->destroy();
+
+		$this->populate($this->index);
+	}
+
+	protected function getIndex()
+	{
+		$connection = new Search_Elastic_Connection('http://localhost:9200');
+		$connection->startBulk(100);
+
+		$status = $connection->getStatus();
+		if (! $status->ok) {
+			$this->markTestSkipped('ElasticSearch needs to be available on localhost:9200 for the test to run.');
+		}
+
+		return new Search_Elastic_Index($connection, 'test_index');
+	}
+
+	function tearDown()
+	{
+		if ($this->index) {
+			$this->index->destroy();
+		}
+	}
+}
+


Property changes on: trunk/lib/test/core/Search/Elastic/BulkIncrementalUpdateTest.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: trunk/lib/test/core/Search/Elastic/BulkIndexingTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/BulkIndexingTest.php	                        (rev 0)
+++ trunk/lib/test/core/Search/Elastic/BulkIndexingTest.php	2013-05-06 20:30:16 UTC (rev 45866)
@@ -0,0 +1,81 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_BulkIndexingTest extends PHPUnit_Framework_TestCase
+{
+	function testBasicBulk()
+	{
+		$parts = array();
+		$bulk = new Search_Elastic_BulkOperation(10, function ($data) use (& $parts) {
+			$parts[] = $data;
+		});
+
+		$bulk->index('test', 'foo', 1, array('a' => 1));
+		$bulk->index('test', 'foo', 2, array('a' => 2));
+		$bulk->index('test', 'foo', 3, array('a' => 3));
+		$bulk->unindex('test', 'bar', 4);
+		$bulk->flush();
+
+		$this->assertCount(1, $parts);
+
+		$this->assertContains(json_encode(array('a' => 3)) . "\n", $parts[0]);
+		$this->assertContains(json_encode(array('index' => array('_index' => 'test', '_type' => 'foo', '_id' => 2))) . "\n", $parts[0]);
+		$this->assertContains(json_encode(array('delete' => array('_index' => 'test', '_type' => 'bar', '_id' => 4))) . "\n", $parts[0]);
+	}
+
+	function testDoubleFlushHasNoImpact()
+	{
+		$parts = array();
+		$bulk = new Search_Elastic_BulkOperation(10, function ($data) use (& $parts) {
+			$parts[] = $data;
+		});
+
+		$bulk->index('test', 'foo', 1, array('a' => 1));
+		$bulk->index('test', 'foo', 2, array('a' => 2));
+		$bulk->index('test', 'foo', 3, array('a' => 3));
+		$bulk->unindex('test', 'bar', 4);
+		$bulk->flush();
+		$bulk->flush();
+
+		$this->assertCount(1, $parts);
+	}
+
+	function testAutomaticFlushWhenLimitReached()
+	{
+		$parts = array();
+		$bulk = new Search_Elastic_BulkOperation(10, function ($data) use (& $parts) {
+			$parts[] = $data;
+		});
+
+		foreach (range(1, 15) as $i) {
+			$bulk->index('test', 'foo', $i, array('a' => $i));
+		}
+
+		$bulk->flush();
+
+		$this->assertCount(2, $parts);
+	}
+
+	function testFlushOnLimit()
+	{
+		$parts = array();
+		$bulk = new Search_Elastic_BulkOperation(15, function ($data) use (& $parts) {
+			$parts[] = $data;
+		});
+
+		foreach (range(1, 45) as $i) {
+			$bulk->index('test', 'foo', $i, array('a' => $i));
+		}
+
+		$this->assertCount(3, $parts);
+
+		$bulk->flush(); // Does nothing
+
+		$this->assertCount(3, $parts);
+	}
+}
+


Property changes on: trunk/lib/test/core/Search/Elastic/BulkIndexingTest.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/test/core/Search/Elastic/PaginationTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/PaginationTest.php	2013-05-06 18:05:39 UTC (rev 45865)
+++ trunk/lib/test/core/Search/Elastic/PaginationTest.php	2013-05-06 20:30:16 UTC (rev 45866)
@@ -12,6 +12,7 @@
 		static $count = 0;
 
 		$connection = new Search_Elastic_Connection('http://localhost:9200');
+		$connection->startBulk(100);
 
 		$status = $connection->getStatus();
 		if (! $status->ok) {

Modified: trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php
===================================================================
--- trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php	2013-05-06 18:05:39 UTC (rev 45865)
+++ trunk/lib/test/core/Search/Index/LuceneIncrementalUpdateTest.php	2013-05-06 20:30:16 UTC (rev 45866)
@@ -30,6 +30,7 @@
 	{
 		$this->addDocument($index, 'wiki page', 'HomePage', 'Hello World');
 		$this->addDocument($index, 'wiki page', 'SomePage', 'No content yet.');
+		$index->endUpdate();
 	}
 
 	function tearDown()

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

Revision: 45925
          http://sourceforge.net/p/tikiwiki/code/45925
Author:   lphuberdeau
Date:     2013-05-13 16:47:35 +0000 (Mon, 13 May 2013)
Log Message:
-----------
[FIX] Support for flagged revisions (multi-document per id) for elasticsearch

Modified Paths:
--------------
    trunk/lib/core/Search/ContentSource/WikiSource.php
    trunk/lib/core/Search/Elastic/Index.php
    trunk/lib/wiki/flaggedrevisionlib.php

Modified: trunk/lib/core/Search/ContentSource/WikiSource.php
===================================================================
--- trunk/lib/core/Search/ContentSource/WikiSource.php	2013-05-13 16:01:18 UTC (rev 45924)
+++ trunk/lib/core/Search/ContentSource/WikiSource.php	2013-05-13 16:47:35 UTC (rev 45925)
@@ -39,6 +39,10 @@
 
 		$info = $this->tikilib->get_page_info($objectId, true, true);
 
+		if (! $info) {
+			return false;
+		}
+
 		$contributors = $wikilib->get_contributors($objectId, $info['user']);
 		if (! in_array($info['user'], $contributors)) {
 			$contributors[] = $info['user'];
@@ -46,7 +50,6 @@
 
 		$data = array(
 			'title' => $typeFactory->sortable($info['pageName']),
-			'hash' => $typeFactory->identifier($info['version']),
 			'language' => $typeFactory->identifier(empty($info['lang']) ? 'unknown' : $info['lang']),
 			'modification_date' => $typeFactory->timestamp($info['lastModif']),
 			'description' => $typeFactory->plaintext($info['description']),
@@ -56,6 +59,7 @@
 
 			'view_permission' => $typeFactory->identifier('tiki_p_view'),
 			'url' => $typeFactory->identifier($wikilib->sefurl($info['pageName'])),
+			'hash' => $typeFactory->identifier(''),
 		);
 
 		if ($this->quantifylib) {
@@ -79,6 +83,7 @@
 				$out[] = array_merge(
 					$data,
 					array(
+						'hash' => $typeFactory->identifier('latest'),
 						'title' => $typeFactory->sortable(tr('%0 (latest)', $info['pageName'])),
 						'view_permission' => $typeFactory->identifier('tiki_p_wiki_view_latest'),
 						'wiki_approval_state' => $typeFactory->identifier('pending'),
@@ -95,7 +100,6 @@
 					array(
 						'wiki_content' => $typeFactory->wikitext($versionInfo['data']),
 						'wiki_approval_state' => $typeFactory->identifier('approved'),
-						'hash' => $typeFactory->identifier($versionInfo['version']),
 					)
 				);
 			}

Modified: trunk/lib/core/Search/Elastic/Index.php
===================================================================
--- trunk/lib/core/Search/Elastic/Index.php	2013-05-13 16:01:18 UTC (rev 45924)
+++ trunk/lib/core/Search/Elastic/Index.php	2013-05-13 16:47:35 UTC (rev 45925)
@@ -30,8 +30,6 @@
 		$objectType = $data['object_type']->getValue($factory);
 		$objectId = $data['object_id']->getValue($factory);
 
-		unset($this->invalidateList[$objectType . ':' . $objectId]);
-
 		$this->generateMapping($objectType, $data);
 
 		$factory = $this->getTypeFactory();
@@ -42,6 +40,13 @@
 		);
 		$objectType = $data['object_type'];
 		$objectId = $data['object_id'];
+
+		if (! empty($data['hash'])) {
+			$objectId .= "~~{$data['hash']}";
+		}
+
+		unset($this->invalidateList[$objectType . ':' . $objectId]);
+
 		$this->connection->index($this->index, $objectType, $objectId, $data);
 	}
 

Modified: trunk/lib/wiki/flaggedrevisionlib.php
===================================================================
--- trunk/lib/wiki/flaggedrevisionlib.php	2013-05-13 16:01:18 UTC (rev 45924)
+++ trunk/lib/wiki/flaggedrevisionlib.php	2013-05-13 16:47:35 UTC (rev 45925)
@@ -16,6 +16,8 @@
 		$histlib = TikiLib::lib('hist');
 
 		if ($version_info = $histlib->get_version($pageName, $version)) {
+			$tx = TikiDb::get()->begin();
+
 			if ($prefs['feature_actionlog'] == 'y') {
 				$logslib = TikiLib::lib('logs');
 				$logslib->add_action(self::ACTION, $pageName, 'wiki page', "flag=$flag&version=$version&value=$value");
@@ -26,6 +28,8 @@
 
 			require_once('lib/search/refresh-functions.php');
 			refresh_index('pages', $pageName);
+			refresh_index('pages', "$pageName~~latest");
+			$tx->commit();
 
 			return true;
 		} else {

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

Revision: 45953
          http://sourceforge.net/p/tikiwiki/code/45953
Author:   sampaioprimo
Date:     2013-05-15 20:36:22 +0000 (Wed, 15 May 2013)
Log Message:
-----------
add wiki page structure notifications to daily reports

Modified Paths:
--------------
    trunk/lib/notifications/notificationemaillib.php

Added Paths:
-----------
    trunk/lib/core/Reports/Send/EmailBuilder/StructureAdd.php
    trunk/lib/core/Reports/Send/EmailBuilder/StructureMoveDown.php
    trunk/lib/core/Reports/Send/EmailBuilder/StructureMoveUp.php
    trunk/lib/core/Reports/Send/EmailBuilder/StructureRemove.php

Added: trunk/lib/core/Reports/Send/EmailBuilder/StructureAdd.php
===================================================================
--- trunk/lib/core/Reports/Send/EmailBuilder/StructureAdd.php	                        (rev 0)
+++ trunk/lib/core/Reports/Send/EmailBuilder/StructureAdd.php	2013-05-15 20:36:22 UTC (rev 45953)
@@ -0,0 +1,30 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+/**
+ * Class for structure_add events
+ */
+class Reports_Send_EmailBuilder_StructureAdd extends Reports_Send_EmailBuilder_Abstract
+{
+	public function getTitle()
+	{
+		return tr('Wiki pages added to a structure:');
+	}
+
+	public function getOutput(array $change)
+	{
+		$base_url = $change['data']['base_url'];
+
+		$output = tr(
+			"%0 added %1 wiki page to a structure",
+			"<u>{$change['user']}</u>",
+			"<a href='{$base_url}tiki-index.php?page={$change['data']['name']}'>{$change['data']['name']}</a>"
+		);
+
+		return $output;
+	}
+}

Added: trunk/lib/core/Reports/Send/EmailBuilder/StructureMoveDown.php
===================================================================
--- trunk/lib/core/Reports/Send/EmailBuilder/StructureMoveDown.php	                        (rev 0)
+++ trunk/lib/core/Reports/Send/EmailBuilder/StructureMoveDown.php	2013-05-15 20:36:22 UTC (rev 45953)
@@ -0,0 +1,27 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+/**
+ * Class for structure_move_down events
+ */
+class Reports_Send_EmailBuilder_StructureMoveDown extends Reports_Send_EmailBuilder_Abstract
+{
+	public function getTitle()
+	{
+		return tr('Wiki pages moved down in a structure tree:');
+	}
+
+	public function getOutput(array $change)
+	{
+		$output = tr(
+			"%0 moved a wiki page down in a structure tree",
+			"<u>{$change['user']}</u>"
+		);
+
+		return $output;
+	}
+}

Added: trunk/lib/core/Reports/Send/EmailBuilder/StructureMoveUp.php
===================================================================
--- trunk/lib/core/Reports/Send/EmailBuilder/StructureMoveUp.php	                        (rev 0)
+++ trunk/lib/core/Reports/Send/EmailBuilder/StructureMoveUp.php	2013-05-15 20:36:22 UTC (rev 45953)
@@ -0,0 +1,27 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+/**
+ * Class for structure_move_up events
+ */
+class Reports_Send_EmailBuilder_StructureMoveUp extends Reports_Send_EmailBuilder_Abstract
+{
+	public function getTitle()
+	{
+		return tr('Wiki pages moved up in a structure tree:');
+	}
+
+	public function getOutput(array $change)
+	{
+		$output = tr(
+			"%0 moved a wiki page up in a structure tree",
+			"<u>{$change['user']}</u>"
+		);
+
+		return $output;
+	}
+}

Added: trunk/lib/core/Reports/Send/EmailBuilder/StructureRemove.php
===================================================================
--- trunk/lib/core/Reports/Send/EmailBuilder/StructureRemove.php	                        (rev 0)
+++ trunk/lib/core/Reports/Send/EmailBuilder/StructureRemove.php	2013-05-15 20:36:22 UTC (rev 45953)
@@ -0,0 +1,30 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+/**
+ * Class for structure_remove events
+ */
+class Reports_Send_EmailBuilder_StructureRemove extends Reports_Send_EmailBuilder_Abstract
+{
+	public function getTitle()
+	{
+		return tr('Wiki pages removed from structure:');
+	}
+
+	public function getOutput(array $change)
+	{
+		$base_url = $change['data']['base_url'];
+
+		$output = tr(
+			"%0 removed %1 wiki page from a structure",
+			"<u>{$change['user']}</u>",
+			"<a href='{$base_url}tiki-index.php?page={$change['data']['name']}'>{$change['data']['name']}</a>"
+		);
+
+		return $output;
+	}
+}

Modified: trunk/lib/notifications/notificationemaillib.php
===================================================================
--- trunk/lib/notifications/notificationemaillib.php	2013-05-15 20:31:21 UTC (rev 45952)
+++ trunk/lib/notifications/notificationemaillib.php	2013-05-15 20:36:22 UTC (rev 45953)
@@ -679,12 +679,19 @@
 	global $tikilib, $smarty, $prefs;
 	global $structlib; include_once('lib/structures/structlib.php');
 
+	$params['event'] = 'structure_' . $params['action'];
+
 	if ($params['action'] == 'move_up' || $params['action'] == 'move_down') {
 		$nots = $structlib->get_watches('', $params['parent_id'], false);
 	} else {
 		$nots = $structlib->get_watches('', $params['page_ref_id']);
 	}
 
+	if ($prefs['feature_daily_report_watches'] == 'y') {
+		$reportsManager = Reports_Factory::build('Reports_Manager');
+		$reportsManager->addToCache($nots, $params);
+	}
+
 	if (!empty($nots)) {
 		$defaultLanguage = $prefs['site_language'];
 		$foo = parse_url($_SERVER["REQUEST_URI"]);

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

Revision: 45957
          http://sourceforge.net/p/tikiwiki/code/45957
Author:   lphuberdeau
Date:     2013-05-16 12:05:18 +0000 (Thu, 16 May 2013)
Log Message:
-----------
[FIX] Make the legacy array building for tracker options more resilient to ordering changes

Modified Paths:
--------------
    trunk/lib/core/Tracker/Options.php
    trunk/lib/test/bootstrap.php

Added Paths:
-----------
    trunk/lib/test/core/Tracker/
    trunk/lib/test/core/Tracker/OptionsTest.php

Modified: trunk/lib/core/Tracker/Options.php
===================================================================
--- trunk/lib/core/Tracker/Options.php	2013-05-16 02:37:20 UTC (rev 45956)
+++ trunk/lib/core/Tracker/Options.php	2013-05-16 12:05:18 UTC (rev 45957)
@@ -163,7 +163,8 @@
 	function buildOptionsArray()
 	{
 		$out = array();
-		foreach ($this->info as $key => $info) {
+		foreach ($this->getLegacySort() as $key) {
+			$info = $this->getParamDefinition($key);
 			$value = $this->getParam($key);
 			if (isset($info['count']) && $info['count'] == '*') {
 				$values = $value;
@@ -178,7 +179,21 @@
 			}
 		}
 		
-		return $v;
+		return $out;
 	}
+
+	private function getLegacySort()
+	{
+		$out = array();
+		foreach ($this->info['params'] as $key => $info) {
+			if (isset($info['legacy_index'])) {
+				$out[$key] = $info['legacy_index'];
+			}
+		}
+
+		asort($out);
+
+		return array_keys($out);
+	}
 }
 

Modified: trunk/lib/test/bootstrap.php
===================================================================
--- trunk/lib/test/bootstrap.php	2013-05-16 02:37:20 UTC (rev 45956)
+++ trunk/lib/test/bootstrap.php	2013-05-16 12:05:18 UTC (rev 45957)
@@ -53,6 +53,9 @@
 
 TikiDb::set(new TikiDb_Adodb($dbTiki));
 
+global $tikilib;
+require_once 'lib/tikilib.php';
+
 // update db if needed
 include_once ('installer/installlib.php');
 $installer = new Installer;
@@ -71,7 +74,6 @@
 require_once 'lib/init/smarty.php';
 $smarty->addPluginsDir('../smarty_tiki/');
 require_once 'lib/cache/cachelib.php';
-require_once 'lib/tikilib.php';
 require_once 'lib/wiki/wikilib.php';
 require_once 'lib/userslib.php';
 require_once 'lib/headerlib.php';
@@ -79,8 +81,6 @@
 require_once 'lib/init/initlib.php';
 require_once 'lib/tikiaccesslib.php';
 
-global $tikilib;
-$tikilib = new TikiLib;
 $userlib = new UsersLib;
 $_SESSION = array(
 		'u_info' => array(

Added: trunk/lib/test/core/Tracker/OptionsTest.php
===================================================================
--- trunk/lib/test/core/Tracker/OptionsTest.php	                        (rev 0)
+++ trunk/lib/test/core/Tracker/OptionsTest.php	2013-05-16 12:05:18 UTC (rev 45957)
@@ -0,0 +1,32 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Tracker_OptionsTest extends PHPUnit_Framework_TestCase
+{
+	function testBuildLegacyStringBuilder()
+	{
+		$options = Tracker_Options::fromSerialized(json_encode(array('a' => 3, 'b' => 2, 'c' => 1)), array(
+			'params' => array(
+				'a' => array(
+					'legacy_index' => 2,
+				),
+				'b' => array(
+					'legacy_index' => 1,
+				),
+				'c' => array(
+					'legacy_index' => 0,
+				),
+				'd' => array(
+					// No legacy
+				),
+			),
+		));
+
+		$this->assertEquals(array('1', '2', '3'), $options->buildOptionsArray());
+	}
+}
+


Property changes on: trunk/lib/test/core/Tracker/OptionsTest.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 45962
          http://sourceforge.net/p/tikiwiki/code/45962
Author:   lphuberdeau
Date:     2013-05-16 13:18:52 +0000 (Thu, 16 May 2013)
Log Message:
-----------
[MOD] Move the workspace related profile builders away to avoid confusion - they only work for a special kink of profile

Modified Paths:
--------------
    trunk/lib/core/Services/Workspace/Controller.php

Added Paths:
-----------
    trunk/lib/core/Services/Workspace/ProfileAnalyser.php
    trunk/lib/core/Services/Workspace/ProfileBuilder.php
    trunk/lib/test/core/Workspace/
    trunk/lib/test/core/Workspace/AnalyserTest.php
    trunk/lib/test/core/Workspace/BuilderTest.php

Removed Paths:
-------------
    trunk/lib/core/Tiki/Profile/Analyser.php
    trunk/lib/core/Tiki/Profile/Builder.php
    trunk/lib/test/core/Profile/AnalyserTest.php
    trunk/lib/test/core/Profile/BuilderTest.php

Modified: trunk/lib/core/Services/Workspace/Controller.php
===================================================================
--- trunk/lib/core/Services/Workspace/Controller.php	2013-05-16 12:59:25 UTC (rev 45961)
+++ trunk/lib/core/Services/Workspace/Controller.php	2013-05-16 13:18:52 UTC (rev 45962)
@@ -83,7 +83,7 @@
 
 		$id = null;
 		if ($input->name->text()) {
-			$builder = new Tiki_Profile_Builder;
+			$builder = new Services_Workspace_ProfileBuilder;
 			$builder->addGroup('Base', $builder->user('group'));
 			$builder->setManagingGroup('Base');
 			$builder->setPermissions(
@@ -159,7 +159,7 @@
 		}
 
 		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$builder = new Tiki_Profile_Builder;
+			$builder = new Services_Workspace_ProfileBuilder;
 
 			if ($prefs['feature_areas'] == 'y' && $input->area->int()) {
 				$builder->addObject(
@@ -204,7 +204,7 @@
 
 		$template = $this->utilities->getTemplate($input->id->int());
 		$profile = Tiki_Profile::fromString($template['definition']);
-		$analyser = new Tiki_Profile_Analyser($profile);
+		$analyser = new Services_Workspace_ProfileAnalyser($profile);
 
 		$hasArea = $analyser->contains(
 			array(

Copied: trunk/lib/core/Services/Workspace/ProfileAnalyser.php (from rev 45956, trunk/lib/core/Tiki/Profile/Analyser.php)
===================================================================
--- trunk/lib/core/Services/Workspace/ProfileAnalyser.php	                        (rev 0)
+++ trunk/lib/core/Services/Workspace/ProfileAnalyser.php	2013-05-16 13:18:52 UTC (rev 45962)
@@ -0,0 +1,161 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Services_Workspace_ProfileAnalyser
+{
+	private $profile;
+	private $builder;
+
+	function __construct(Tiki_Profile $profile)
+	{
+		$this->profile = $profile;
+		$this->builder = new Services_Workspace_ProfileBuilder;
+	}
+
+	function ref($name)
+	{
+		return $this->builder->ref($name);
+	}
+
+	function user($name)
+	{
+		return $this->builder->user($name);
+	}
+
+	function contains(array $conditions)
+	{
+		$objects = $this->profile->getObjects();
+
+		if (isset($conditions['type'])) {
+			$objects = array_filter(
+				$objects,
+				function ($object) use ($conditions)
+				{
+					return $conditions['type'] == $object->getType();
+				}
+			);
+			unset($conditions['type']);
+		}
+
+		if (isset($conditions['ref'])) {
+			$objects = array_filter(
+				$objects,
+				function ($object) use ($conditions)
+				{
+					return $conditions['ref'] === $object->getRef();
+				}
+			);
+			unset($conditions['ref']);
+		}
+
+		foreach ($conditions as $condition => $value) {
+			$objects = array_filter(
+				$objects,
+				function ($object) use ($condition, $value)
+				{
+					$data = $object->getData();
+					return isset($data[$condition]) && $data[$condition] === $value;
+				}
+			);
+		}
+
+		return count($objects) > 0;
+	}
+
+	/**
+	 * Provides group information using the permission details from a specific object.
+	 */
+	function getGroups($type, $object)
+	{
+		$out = array();
+
+		$groupMap = $this->profile->getGroupMap();
+		$permissions =  $this->profile->getPermissions();
+
+		foreach ($groupMap as $key => $name) {
+			$out[$key] = array(
+				'name' => $name,
+				'managing' => false,
+				'autojoin' => true,
+				'permissions' => array(),
+			);
+
+			if (isset($permissions[$key])) {
+				$related = $permissions[$key];
+				$out[$key]['managing'] = $this->isManagingGroup($related['objects']);
+				$out[$key]['autojoin'] = $this->isAutojoin($related['general']);
+				$out[$key]['permissions'] = $this->getObjectPermissions($related['objects'], $type, $object);
+			}
+		}
+
+		return $this->simplify($out);
+	}
+
+	function getObjects($type, $default = null)
+	{
+		$out = array();
+
+		foreach ($this->profile->getObjects() as $object) {
+			if ($object->getType() == $type) {
+				$out[] = $object->getData();
+			}
+		}
+
+		if (! count($out) && is_array($default)) {
+			$out[] = $default;
+		}
+
+		return $this->simplify($out);
+	}
+
+	private function simplify($data)
+	{
+		array_walk_recursive(
+			$data,
+			function (& $entry)
+			{
+				if (is_string($entry)) {
+					$entry = preg_replace('/\$profilerequest:(\w+)\$[^\$]*\$/', '{$1}', $entry);
+				}
+			}
+		);
+
+		return $data;
+	}
+
+	private function isManagingGroup($objects)
+	{
+		foreach ($objects as $o) {
+			if ($o['type'] == 'group' && in_array('group_add_member', $o['allow'])) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private function isAutojoin($general)
+	{
+		if (! isset($general['autojoin'])) {
+			return false;
+		}
+
+		return $general['autojoin'] === true || $general['autojoin'] === 'y';
+	}
+
+	private function getObjectPermissions($objects, $type, $object)
+	{
+		foreach ($objects as $o) {
+			if ($o['type'] == $type && $o['id'] == $object) {
+				return $o['allow'];
+			}
+		}
+
+		return array();
+	}
+}
+

Copied: trunk/lib/core/Services/Workspace/ProfileBuilder.php (from rev 45956, trunk/lib/core/Tiki/Profile/Builder.php)
===================================================================
--- trunk/lib/core/Services/Workspace/ProfileBuilder.php	                        (rev 0)
+++ trunk/lib/core/Services/Workspace/ProfileBuilder.php	2013-05-16 13:18:52 UTC (rev 45962)
@@ -0,0 +1,143 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Services_Workspace_ProfileBuilder
+{
+	private $objects = array();
+	private $groups = array();
+	private $autojoin = array();
+	private $permissions = array();
+	private $managingGroup;
+
+	function ref($name)
+	{
+		return '$' . $name;
+	}
+
+	function user($name)
+	{
+		return '$profilerequest:' . $name . '$undefined$';
+	}
+
+	function addObject($type, $ref, array $data)
+	{
+		if (isset($data['categories'])) {
+			$list = (array) $data['categories'];
+			unset($data['categories']);
+
+			$this->objects[] = array(
+				'type' => 'categorize',
+				'data' => array(
+					'type' => $type,
+					'object' => $this->ref($ref),
+					'categories' => $list,
+				),
+			);
+		}
+
+		$this->objects[] = array(
+			'type' => $type,
+			'ref' => $ref,
+			'data' => $data,
+		);
+	}
+
+	function addGroup($internalName, $fullName, $autojoin = false)
+	{
+		$this->groups[$internalName] = $fullName;
+		$this->autojoin[$internalName] = $autojoin;
+	}
+
+	function setPermissions($internalName, $type, $objectId, array $permissionList)
+	{
+		if (! isset($this->permissions[$internalName])) {
+			$this->permissions[$internalName] = array('objects' => array());
+		}
+
+		$this->permissions[$internalName]['objects'][] = array(
+			'type' => $type,
+			'id' => $objectId,
+			'allow' => $permissionList
+		);
+	}
+
+	function setManagingGroup($group)
+	{
+		$this->managingGroup = $group;
+	}
+
+	function getContent()
+	{
+		$builder = clone $this;
+
+		foreach (array_keys($this->groups) as $group) {
+			foreach (array_keys($this->groups) as $peer) {
+				if ($group == $this->managingGroup) {
+					$builder->setPermissions($group, 'group', $peer, array('group_view', 'group_view_members', 'group_add_member', 'group_remove_member'));
+				} else {
+					$builder->setPermissions($group, 'group', $peer, array('group_view', 'group_view_members'));
+				}
+			}
+		}
+
+		$data = array();
+
+		if (count($builder->objects)) {
+			$data['objects'] = $builder->objects;
+		}
+
+		if ($builder->groups) {
+			$data['mappings'] = array();
+			$data['permissions'] = array();
+			foreach ($builder->groups as $internal => $full) {
+				$groupDefinition = array(
+					'description' => $full,
+				);
+
+				if ($this->autojoin[$internal]) {
+					$groupDefinition['autojoin'] = 'y';
+				}
+
+				if (isset($builder->permissions[$internal])) {
+					$groupDefinition['objects'] = $builder->permissions[$internal]['objects'];
+				}
+
+				$data['mappings'][$internal] = $full;
+				$data['permissions'][$internal] = $groupDefinition;
+			}
+		}
+
+		$self = $this;
+		array_walk_recursive(
+			$data,
+			function (& $entry) use ($self)
+			{
+				if (is_string($entry)) {
+	 				$entry = preg_replace_callback(
+						'/\{(\w+)\}/',
+						function ($matches) use ($self)
+						{
+							return $self->user($matches[1]);
+						},
+						$entry
+					);
+				}
+			}
+		);
+
+		$yaml = Horde_Yaml::dump($data);
+		return <<<SYNTAX
+
+^The following profile was auto-generated. It may hurt your eyes when you try reading it.^
+{CODE(caption="YAML")}
+$yaml
+{CODE}
+
+SYNTAX;
+	}
+}
+

Deleted: trunk/lib/core/Tiki/Profile/Analyser.php
===================================================================
--- trunk/lib/core/Tiki/Profile/Analyser.php	2013-05-16 12:59:25 UTC (rev 45961)
+++ trunk/lib/core/Tiki/Profile/Analyser.php	2013-05-16 13:18:52 UTC (rev 45962)
@@ -1,161 +0,0 @@
-<?php
-// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
-//
-// 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.
-// $Id$
-
-class Tiki_Profile_Analyser
-{
-	private $profile;
-	private $builder;
-
-	function __construct(Tiki_Profile $profile)
-	{
-		$this->profile = $profile;
-		$this->builder = new Tiki_Profile_Builder;
-	}
-
-	function ref($name)
-	{
-		return $this->builder->ref($name);
-	}
-
-	function user($name)
-	{
-		return $this->builder->user($name);
-	}
-
-	function contains(array $conditions)
-	{
-		$objects = $this->profile->getObjects();
-
-		if (isset($conditions['type'])) {
-			$objects = array_filter(
-				$objects,
-				function ($object) use ($conditions)
-				{
-					return $conditions['type'] == $object->getType();
-				}
-			);
-			unset($conditions['type']);
-		}
-
-		if (isset($conditions['ref'])) {
-			$objects = array_filter(
-				$objects,
-				function ($object) use ($conditions)
-				{
-					return $conditions['ref'] === $object->getRef();
-				}
-			);
-			unset($conditions['ref']);
-		}
-
-		foreach ($conditions as $condition => $value) {
-			$objects = array_filter(
-				$objects,
-				function ($object) use ($condition, $value)
-				{
-					$data = $object->getData();
-					return isset($data[$condition]) && $data[$condition] === $value;
-				}
-			);
-		}
-
-		return count($objects) > 0;
-	}
-
-	/**
-	 * Provides group information using the permission details from a specific object.
-	 */
-	function getGroups($type, $object)
-	{
-		$out = array();
-
-		$groupMap = $this->profile->getGroupMap();
-		$permissions =  $this->profile->getPermissions();
-
-		foreach ($groupMap as $key => $name) {
-			$out[$key] = array(
-				'name' => $name,
-				'managing' => false,
-				'autojoin' => true,
-				'permissions' => array(),
-			);
-
-			if (isset($permissions[$key])) {
-				$related = $permissions[$key];
-				$out[$key]['managing'] = $this->isManagingGroup($related['objects']);
-				$out[$key]['autojoin'] = $this->isAutojoin($related['general']);
-				$out[$key]['permissions'] = $this->getObjectPermissions($related['objects'], $type, $object);
-			}
-		}
-
-		return $this->simplify($out);
-	}
-
-	function getObjects($type, $default = null)
-	{
-		$out = array();
-
-		foreach ($this->profile->getObjects() as $object) {
-			if ($object->getType() == $type) {
-				$out[] = $object->getData();
-			}
-		}
-
-		if (! count($out) && is_array($default)) {
-			$out[] = $default;
-		}
-
-		return $this->simplify($out);
-	}
-
-	private function simplify($data)
-	{
-		array_walk_recursive(
-			$data,
-			function (& $entry)
-			{
-				if (is_string($entry)) {
-					$entry = preg_replace('/\$profilerequest:(\w+)\$[^\$]*\$/', '{$1}', $entry);
-				}
-			}
-		);
-
-		return $data;
-	}
-
-	private function isManagingGroup($objects)
-	{
-		foreach ($objects as $o) {
-			if ($o['type'] == 'group' && in_array('group_add_member', $o['allow'])) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	private function isAutojoin($general)
-	{
-		if (! isset($general['autojoin'])) {
-			return false;
-		}
-
-		return $general['autojoin'] === true || $general['autojoin'] === 'y';
-	}
-
-	private function getObjectPermissions($objects, $type, $object)
-	{
-		foreach ($objects as $o) {
-			if ($o['type'] == $type && $o['id'] == $object) {
-				return $o['allow'];
-			}
-		}
-
-		return array();
-	}
-}
-

Deleted: trunk/lib/core/Tiki/Profile/Builder.php
===================================================================
--- trunk/lib/core/Tiki/Profile/Builder.php	2013-05-16 12:59:25 UTC (rev 45961)
+++ trunk/lib/core/Tiki/Profile/Builder.php	2013-05-16 13:18:52 UTC (rev 45962)
@@ -1,143 +0,0 @@
-<?php
-// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
-//
-// 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.
-// $Id$
-
-class Tiki_Profile_Builder
-{
-	private $objects = array();
-	private $groups = array();
-	private $autojoin = array();
-	private $permissions = array();
-	private $managingGroup;
-
-	function ref($name)
-	{
-		return '$' . $name;
-	}
-
-	function user($name)
-	{
-		return '$profilerequest:' . $name . '$undefined$';
-	}
-
-	function addObject($type, $ref, array $data)
-	{
-		if (isset($data['categories'])) {
-			$list = (array) $data['categories'];
-			unset($data['categories']);
-
-			$this->objects[] = array(
-				'type' => 'categorize',
-				'data' => array(
-					'type' => $type,
-					'object' => $this->ref($ref),
-					'categories' => $list,
-				),
-			);
-		}
-
-		$this->objects[] = array(
-			'type' => $type,
-			'ref' => $ref,
-			'data' => $data,
-		);
-	}
-
-	function addGroup($internalName, $fullName, $autojoin = false)
-	{
-		$this->groups[$internalName] = $fullName;
-		$this->autojoin[$internalName] = $autojoin;
-	}
-
-	function setPermissions($internalName, $type, $objectId, array $permissionList)
-	{
-		if (! isset($this->permissions[$internalName])) {
-			$this->permissions[$internalName] = array('objects' => array());
-		}
-
-		$this->permissions[$internalName]['objects'][] = array(
-			'type' => $type,
-			'id' => $objectId,
-			'allow' => $permissionList
-		);
-	}
-
-	function setManagingGroup($group)
-	{
-		$this->managingGroup = $group;
-	}
-
-	function getContent()
-	{
-		$builder = clone $this;
-
-		foreach (array_keys($this->groups) as $group) {
-			foreach (array_keys($this->groups) as $peer) {
-				if ($group == $this->managingGroup) {
-					$builder->setPermissions($group, 'group', $peer, array('group_view', 'group_view_members', 'group_add_member', 'group_remove_member'));
-				} else {
-					$builder->setPermissions($group, 'group', $peer, array('group_view', 'group_view_members'));
-				}
-			}
-		}
-
-		$data = array();
-
-		if (count($builder->objects)) {
-			$data['objects'] = $builder->objects;
-		}
-
-		if ($builder->groups) {
-			$data['mappings'] = array();
-			$data['permissions'] = array();
-			foreach ($builder->groups as $internal => $full) {
-				$groupDefinition = array(
-					'description' => $full,
-				);
-
-				if ($this->autojoin[$internal]) {
-					$groupDefinition['autojoin'] = 'y';
-				}
-
-				if (isset($builder->permissions[$internal])) {
-					$groupDefinition['objects'] = $builder->permissions[$internal]['objects'];
-				}
-
-				$data['mappings'][$internal] = $full;
-				$data['permissions'][$internal] = $groupDefinition;
-			}
-		}
-
-		$self = $this;
-		array_walk_recursive(
-			$data,
-			function (& $entry) use ($self)
-			{
-				if (is_string($entry)) {
-	 				$entry = preg_replace_callback(
-						'/\{(\w+)\}/',
-						function ($matches) use ($self)
-						{
-							return $self->user($matches[1]);
-						},
-						$entry
-					);
-				}
-			}
-		);
-
-		$yaml = Horde_Yaml::dump($data);
-		return <<<SYNTAX
-
-^The following profile was auto-generated. It may hurt your eyes when you try reading it.^
-{CODE(caption="YAML")}
-$yaml
-{CODE}
-
-SYNTAX;
-	}
-}
-

Deleted: trunk/lib/test/core/Profile/AnalyserTest.php
===================================================================
--- trunk/lib/test/core/Profile/AnalyserTest.php	2013-05-16 12:59:25 UTC (rev 45961)
+++ trunk/lib/test/core/Profile/AnalyserTest.php	2013-05-16 13:18:52 UTC (rev 45962)
@@ -1,92 +0,0 @@
-<?php
-
-class Profile_AnalyserTest extends PHPUnit_Framework_TestCase
-{
-	function testReadGroupList()
-	{
-		$builder = new Tiki_Profile_Builder;
-		$builder->addGroup('Base', $builder->user('group'));
-		$builder->addGroup('World', $builder->user('group') . ' World', true);
-		$builder->setManagingGroup('Base');
-		$builder->setPermissions(
-			'Base',
-			'category',
-			$builder->user('category'),
-			array(
-				'view',
-				'edit',
-			)
-		);
-		$builder->setPermissions(
-			'World',
-			'category',
-			$builder->user('category'),
-			array('view')
-		);
-
-		$profile = Tiki_Profile::fromString($builder->getContent());
-		$analyser = new Tiki_Profile_Analyser($profile);
-
-		$this->assertEquals(
-			array(
-				'Base' => array(
-					'name' => '{group}',
-					'managing' => true,
-					'autojoin' => false,
-					'permissions' => array('view', 'edit'),
-				),
-				'World' => array(
-					'name' => '{group} World',
-					'managing' => false,
-					'autojoin' => true,
-					'permissions' => array('view'),
-				),
-			), $analyser->getGroups('category', $analyser->user('category'))
-		);
-	}
-
-	function testGetObjects()
-	{
-		$builder = new Tiki_Profile_Builder;
-		$builder->addObject(
-			'wiki_page',
-			'foo',
-			array(
-				'name' => 'Foo',
-				'namespace' => $builder->user('namespace'),
-				'content' => 'Hello',
-				'categories' => $builder->user('category'),
-			)
-		);
-		$builder->addObject(
-			'wiki_page',
-			'bar',
-			array(
-				'name' => 'Bar',
-				'namespace' => $builder->user('namespace'),
-				'content' => 'World',
-				'categories' => $builder->user('category'),
-			)
-		);
-
-		$profile = Tiki_Profile::fromString($builder->getContent());
-		$analyser = new Tiki_Profile_Analyser($profile);
-
-		$this->assertEquals(
-			array(
-				array(
-					'name' => 'Foo',
-					'namespace' => '{namespace}',
-					'content' => 'Hello',
-				),
-				array(
-					'name' => 'Bar',
-					'namespace' => '{namespace}',
-					'content' => 'World',
-				),
-			),
-			$analyser->getObjects('wiki_page')
-		);
-	}
-}
-

Deleted: trunk/lib/test/core/Profile/BuilderTest.php
===================================================================
--- trunk/lib/test/core/Profile/BuilderTest.php	2013-05-16 12:59:25 UTC (rev 45961)
+++ trunk/lib/test/core/Profile/BuilderTest.php	2013-05-16 13:18:52 UTC (rev 45962)
@@ -1,172 +0,0 @@
-<?php
-
-class Profile_BuilderTest extends PHPUnit_Framework_TestCase
-{
-	function testBasicProfile()
-	{
-		$builder = new Tiki_Profile_Builder;
-
-		$expect = <<<EXPECT
----
-EXPECT;
-		$this->assertIs($expect, $builder->getContent());
-	}
-
-	function testAddObjects()
-	{
-		$builder = new Tiki_Profile_Builder;
-		$builder->addObject(
-			'wiki_page',
-			'foo',
-			array(
-				'name' => 'Foo',
-				'content' => 'Hello',
-			)
-		);
-		$builder->addObject(
-			'trackerfield',
-			'date',
-			array(
-				'tracker' => $builder->ref('tracker'),
-			)
-		);
-
-		$expect = <<<EXPECT
----
-objects: 
-  - 
-    type: wiki_page
-    ref: foo
-    data: 
-      name: Foo
-      content: Hello
-  - 
-    type: trackerfield
-    ref: date
-    data: 
-      tracker: \$tracker
-EXPECT;
-		$this->assertIs($expect, $builder->getContent());
-	}
-
-	function testGroups()
-	{
-		$builder = new Tiki_Profile_Builder;
-		$builder->addGroup('Base', $builder->user('group'));
-		$builder->addGroup('Viewer', $builder->user('group') . ' Viewer', true);
-		$builder->setManagingGroup('Base');
-
-		$expect = <<<EXPECT
----
-mappings: 
-  Base: \$profilerequest:group\$undefined\$
-  Viewer: \$profilerequest:group\$undefined\$ Viewer
-permissions: 
-  Base: 
-    description: \$profilerequest:group\$undefined\$
-    objects: 
-      - 
-        type: group
-        id: Base
-        allow: 
-          - group_view
-          - group_view_members
-          - group_add_member
-          - group_remove_member
-      - 
-        type: group
-        id: Viewer
-        allow: 
-          - group_view
-          - group_view_members
-          - group_add_member
-          - group_remove_member
-  Viewer: 
-    description: \$profilerequest:group\$undefined\$ Viewer
-    autojoin: y
-    objects: 
-      - 
-        type: group
-        id: Base
-        allow: 
-          - group_view
-          - group_view_members
-      - 
-        type: group
-        id: Viewer
-        allow: 
-          - group_view
-          - group_view_members
-EXPECT;
-		$this->assertIs($expect, $builder->getContent());
-	}
-
-	function testReplaceSimpleSyntax()
-	{
-		$builder = new Tiki_Profile_Builder;
-		$builder->addGroup('Base', '{group}');
-		$builder->setManagingGroup('Base');
-
-		$expect = <<<EXPECT
----
-mappings: 
-  Base: \$profilerequest:group\$undefined\$
-permissions: 
-  Base: 
-    description: \$profilerequest:group\$undefined\$
-    objects: 
-      - 
-        type: group
-        id: Base
-        allow: 
-          - group_view
-          - group_view_members
-          - group_add_member
-          - group_remove_member
-EXPECT;
-		$this->assertIs($expect, $builder->getContent());
-	}
-
-	function testAssignDefaultGroup()
-	{
-		$builder = new Tiki_Profile_Builder;
-		$builder->addObject(
-			'wiki_page',
-			'foo',
-			array(
-				'name' => 'Foo',
-				'content' => 'Hello',
-				'categories' => $builder->user('category'),
-			)
-		);
-
-		$expect = <<<EXPECT
----
-objects: 
-  - 
-    type: categorize
-    data: 
-      type: wiki_page
-      object: \$foo
-      categories: 
-        - \$profilerequest:category\$undefined\$
-  - 
-    type: wiki_page
-    ref: foo
-    data: 
-      name: Foo
-      content: Hello
-EXPECT;
-		$this->assertIs($expect, $builder->getContent());
-	}
-
-	private function assertIs($expect, $content)
-	{
-		$matches = WikiParser_PluginMatcher::match($content);
-
-		foreach ($matches as $plugin) {
-			$this->assertEquals(trim($expect), trim($plugin->getBody()));
-		}
-	}
-}
-

Copied: trunk/lib/test/core/Workspace/AnalyserTest.php (from rev 45956, trunk/lib/test/core/Profile/AnalyserTest.php)
===================================================================
--- trunk/lib/test/core/Workspace/AnalyserTest.php	                        (rev 0)
+++ trunk/lib/test/core/Workspace/AnalyserTest.php	2013-05-16 13:18:52 UTC (rev 45962)
@@ -0,0 +1,92 @@
+<?php
+
+class Profile_AnalyserTest extends PHPUnit_Framework_TestCase
+{
+	function testReadGroupList()
+	{
+		$builder = new Services_Workspace_ProfileBuilder;
+		$builder->addGroup('Base', $builder->user('group'));
+		$builder->addGroup('World', $builder->user('group') . ' World', true);
+		$builder->setManagingGroup('Base');
+		$builder->setPermissions(
+			'Base',
+			'category',
+			$builder->user('category'),
+			array(
+				'view',
+				'edit',
+			)
+		);
+		$builder->setPermissions(
+			'World',
+			'category',
+			$builder->user('category'),
+			array('view')
+		);
+
+		$profile = Tiki_Profile::fromString($builder->getContent());
+		$analyser = new Services_Workspace_ProfileAnalyser($profile);
+
+		$this->assertEquals(
+			array(
+				'Base' => array(
+					'name' => '{group}',
+					'managing' => true,
+					'autojoin' => false,
+					'permissions' => array('view', 'edit'),
+				),
+				'World' => array(
+					'name' => '{group} World',
+					'managing' => false,
+					'autojoin' => true,
+					'permissions' => array('view'),
+				),
+			), $analyser->getGroups('category', $analyser->user('category'))
+		);
+	}
+
+	function testGetObjects()
+	{
+		$builder = new Services_Workspace_ProfileBuilder;
+		$builder->addObject(
+			'wiki_page',
+			'foo',
+			array(
+				'name' => 'Foo',
+				'namespace' => $builder->user('namespace'),
+				'content' => 'Hello',
+				'categories' => $builder->user('category'),
+			)
+		);
+		$builder->addObject(
+			'wiki_page',
+			'bar',
+			array(
+				'name' => 'Bar',
+				'namespace' => $builder->user('namespace'),
+				'content' => 'World',
+				'categories' => $builder->user('category'),
+			)
+		);
+
+		$profile = Tiki_Profile::fromString($builder->getContent());
+		$analyser = new Services_Workspace_ProfileAnalyser($profile);
+
+		$this->assertEquals(
+			array(
+				array(
+					'name' => 'Foo',
+					'namespace' => '{namespace}',
+					'content' => 'Hello',
+				),
+				array(
+					'name' => 'Bar',
+					'namespace' => '{namespace}',
+					'content' => 'World',
+				),
+			),
+			$analyser->getObjects('wiki_page')
+		);
+	}
+}
+

Copied: trunk/lib/test/core/Workspace/BuilderTest.php (from rev 45956, trunk/lib/test/core/Profile/BuilderTest.php)
===================================================================
--- trunk/lib/test/core/Workspace/BuilderTest.php	                        (rev 0)
+++ trunk/lib/test/core/Workspace/BuilderTest.php	2013-05-16 13:18:52 UTC (rev 45962)
@@ -0,0 +1,172 @@
+<?php
+
+class Profile_BuilderTest extends PHPUnit_Framework_TestCase
+{
+	function testBasicProfile()
+	{
+		$builder = new Services_Workspace_ProfileBuilder;
+
+		$expect = <<<EXPECT
+---
+EXPECT;
+		$this->assertIs($expect, $builder->getContent());
+	}
+
+	function testAddObjects()
+	{
+		$builder = new Services_Workspace_ProfileBuilder;
+		$builder->addObject(
+			'wiki_page',
+			'foo',
+			array(
+				'name' => 'Foo',
+				'content' => 'Hello',
+			)
+		);
+		$builder->addObject(
+			'trackerfield',
+			'date',
+			array(
+				'tracker' => $builder->ref('tracker'),
+			)
+		);
+
+		$expect = <<<EXPECT
+---
+objects: 
+  - 
+    type: wiki_page
+    ref: foo
+    data: 
+      name: Foo
+      content: Hello
+  - 
+    type: trackerfield
+    ref: date
+    data: 
+      tracker: \$tracker
+EXPECT;
+		$this->assertIs($expect, $builder->getContent());
+	}
+
+	function testGroups()
+	{
+		$builder = new Services_Workspace_ProfileBuilder;
+		$builder->addGroup('Base', $builder->user('group'));
+		$builder->addGroup('Viewer', $builder->user('group') . ' Viewer', true);
+		$builder->setManagingGroup('Base');
+
+		$expect = <<<EXPECT
+---
+mappings: 
+  Base: \$profilerequest:group\$undefined\$
+  Viewer: \$profilerequest:group\$undefined\$ Viewer
+permissions: 
+  Base: 
+    description: \$profilerequest:group\$undefined\$
+    objects: 
+      - 
+        type: group
+        id: Base
+        allow: 
+          - group_view
+          - group_view_members
+          - group_add_member
+          - group_remove_member
+      - 
+        type: group
+        id: Viewer
+        allow: 
+          - group_view
+          - group_view_members
+          - group_add_member
+          - group_remove_member
+  Viewer: 
+    description: \$profilerequest:group\$undefined\$ Viewer
+    autojoin: y
+    objects: 
+      - 
+        type: group
+        id: Base
+        allow: 
+          - group_view
+          - group_view_members
+      - 
+        type: group
+        id: Viewer
+        allow: 
+          - group_view
+          - group_view_members
+EXPECT;
+		$this->assertIs($expect, $builder->getContent());
+	}
+
+	function testReplaceSimpleSyntax()
+	{
+		$builder = new Services_Workspace_ProfileBuilder;
+		$builder->addGroup('Base', '{group}');
+		$builder->setManagingGroup('Base');
+
+		$expect = <<<EXPECT
+---
+mappings: 
+  Base: \$profilerequest:group\$undefined\$
+permissions: 
+  Base: 
+    description: \$profilerequest:group\$undefined\$
+    objects: 
+      - 
+        type: group
+        id: Base
+        allow: 
+          - group_view
+          - group_view_members
+          - group_add_member
+          - group_remove_member
+EXPECT;
+		$this->assertIs($expect, $builder->getContent());
+	}
+
+	function testAssignDefaultGroup()
+	{
+		$builder = new Services_Workspace_ProfileBuilder;
+		$builder->addObject(
+			'wiki_page',
+			'foo',
+			array(
+				'name' => 'Foo',
+				'content' => 'Hello',
+				'categories' => $builder->user('category'),
+			)
+		);
+
+		$expect = <<<EXPECT
+---
+objects: 
+  - 
+    type: categorize
+    data: 
+      type: wiki_page
+      object: \$foo
+      categories: 
+        - \$profilerequest:category\$undefined\$
+  - 
+    type: wiki_page
+    ref: foo
+    data: 
+      name: Foo
+      content: Hello
+EXPECT;
+		$this->assertIs($expect, $builder->getContent());
+	}
+
+	private function assertIs($expect, $content)
+	{
+		$matches = WikiParser_PluginMatcher::match($content);
+
+		foreach ($matches as $plugin) {
+			$this->assertEquals(trim($expect), trim($plugin->getBody()));
+		}
+	}
+}
+

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

Revision: 46007
          http://sourceforge.net/p/tikiwiki/code/46007
Author:   lphuberdeau
Date:     2013-05-20 18:34:12 +0000 (Mon, 20 May 2013)
Log Message:
-----------
[MOD] Adding references to all plugins

Modified Paths:
--------------
    trunk/lib/core/Tiki/Profile/InstallHandler/WikiPage.php
    trunk/lib/core/Tiki/Profile/Installer.php
    trunk/lib/core/Tiki/Profile/Writer.php
    trunk/lib/wiki-plugins/wikiplugin_addfreetag.php
    trunk/lib/wiki-plugins/wikiplugin_addrelation.php
    trunk/lib/wiki-plugins/wikiplugin_addtocart.php
    trunk/lib/wiki-plugins/wikiplugin_addtogooglecal.php
    trunk/lib/wiki-plugins/wikiplugin_alink.php
    trunk/lib/wiki-plugins/wikiplugin_article.php
    trunk/lib/wiki-plugins/wikiplugin_articles.php
    trunk/lib/wiki-plugins/wikiplugin_attach.php
    trunk/lib/wiki-plugins/wikiplugin_author.php
    trunk/lib/wiki-plugins/wikiplugin_avatar.php
    trunk/lib/wiki-plugins/wikiplugin_backlinks.php
    trunk/lib/wiki-plugins/wikiplugin_bigbluebutton.php
    trunk/lib/wiki-plugins/wikiplugin_bloglist.php
    trunk/lib/wiki-plugins/wikiplugin_button.php
    trunk/lib/wiki-plugins/wikiplugin_calendar.php
    trunk/lib/wiki-plugins/wikiplugin_carousel.php
    trunk/lib/wiki-plugins/wikiplugin_category.php
    trunk/lib/wiki-plugins/wikiplugin_categorytransition.php
    trunk/lib/wiki-plugins/wikiplugin_chart.php
    trunk/lib/wiki-plugins/wikiplugin_colorbox.php
    trunk/lib/wiki-plugins/wikiplugin_comment.php
    trunk/lib/wiki-plugins/wikiplugin_convene.php
    trunk/lib/wiki-plugins/wikiplugin_customsearch.php
    trunk/lib/wiki-plugins/wikiplugin_datachannel.php
    trunk/lib/wiki-plugins/wikiplugin_dialog.php
    trunk/lib/wiki-plugins/wikiplugin_draw.php
    trunk/lib/wiki-plugins/wikiplugin_events.php
    trunk/lib/wiki-plugins/wikiplugin_favorite.php
    trunk/lib/wiki-plugins/wikiplugin_file.php
    trunk/lib/wiki-plugins/wikiplugin_files.php
    trunk/lib/wiki-plugins/wikiplugin_flash.php
    trunk/lib/wiki-plugins/wikiplugin_galleriffic.php
    trunk/lib/wiki-plugins/wikiplugin_groupmailcore.php
    trunk/lib/wiki-plugins/wikiplugin_hasbought.php
    trunk/lib/wiki-plugins/wikiplugin_img.php
    trunk/lib/wiki-plugins/wikiplugin_include.php
    trunk/lib/wiki-plugins/wikiplugin_invite.php
    trunk/lib/wiki-plugins/wikiplugin_lastmod.php
    trunk/lib/wiki-plugins/wikiplugin_listpages.php
    trunk/lib/wiki-plugins/wikiplugin_miniquiz.php
    trunk/lib/wiki-plugins/wikiplugin_objecthits.php
    trunk/lib/wiki-plugins/wikiplugin_objectlink.php
    trunk/lib/wiki-plugins/wikiplugin_pagetabs.php
    trunk/lib/wiki-plugins/wikiplugin_perspective.php
    trunk/lib/wiki-plugins/wikiplugin_poll.php
    trunk/lib/wiki-plugins/wikiplugin_prettytrackerviews.php
    trunk/lib/wiki-plugins/wikiplugin_redirect.php
    trunk/lib/wiki-plugins/wikiplugin_regex.php
    trunk/lib/wiki-plugins/wikiplugin_relations.php
    trunk/lib/wiki-plugins/wikiplugin_rss.php
    trunk/lib/wiki-plugins/wikiplugin_sf.php
    trunk/lib/wiki-plugins/wikiplugin_sheet.php
    trunk/lib/wiki-plugins/wikiplugin_stat.php
    trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php
    trunk/lib/wiki-plugins/wikiplugin_survey.php
    trunk/lib/wiki-plugins/wikiplugin_titlesearch.php
    trunk/lib/wiki-plugins/wikiplugin_toc.php
    trunk/lib/wiki-plugins/wikiplugin_tracker.php
    trunk/lib/wiki-plugins/wikiplugin_trackercalendar.php
    trunk/lib/wiki-plugins/wikiplugin_trackercomments.php
    trunk/lib/wiki-plugins/wikiplugin_trackerfilter.php
    trunk/lib/wiki-plugins/wikiplugin_trackeritemcopy.php
    trunk/lib/wiki-plugins/wikiplugin_trackeritemfield.php
    trunk/lib/wiki-plugins/wikiplugin_trackerlist.php
    trunk/lib/wiki-plugins/wikiplugin_trackerpasscode.php
    trunk/lib/wiki-plugins/wikiplugin_trackerprefill.php
    trunk/lib/wiki-plugins/wikiplugin_trackerquerytemplate.php
    trunk/lib/wiki-plugins/wikiplugin_trackerstat.php
    trunk/lib/wiki-plugins/wikiplugin_trackertimeline.php
    trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php
    trunk/lib/wiki-plugins/wikiplugin_transclude.php
    trunk/lib/wiki-plugins/wikiplugin_vote.php

Added Paths:
-----------
    trunk/lib/core/Tiki/Profile/WriterHelper.php

Modified: trunk/lib/core/Tiki/Profile/InstallHandler/WikiPage.php
===================================================================
--- trunk/lib/core/Tiki/Profile/InstallHandler/WikiPage.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/core/Tiki/Profile/InstallHandler/WikiPage.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -222,8 +222,7 @@
 			return false;
 		}
 
-		$content = self::exportWikiContent($writer, $info['data']);
-		$writer->writeExternal($page, $content);
+		$writer->writeExternal($page, $writer->getReference('wiki_content', $info['data']));
 		$writer->addObject('wiki_page', $page, array(
 			'name' => $page,
 			'content' => "wikicontent:$page",
@@ -233,48 +232,5 @@
 
 		return true;
 	}
+}
 
-	public static function exportWikiContent($writer, $content)
-	{
-		$tikilib = TikiLib::lib('tiki');
-		$parserlib = TikiLib::lib('parser');
-		$argumentParser = new WikiParser_PluginArgumentParser;
-		$matches = WikiParser_PluginMatcher::match($content);
-
-		$justReplace = false;
-		foreach ($matches as $match) {
-			if ($justReplaced) {
-				$justReplaced = false;
-				continue;
-			}
-
-			$pluginName = $match->getName();
-			$params = $argumentParser->parse($match->getArguments());
-			$params = preg_replace(array('/^"/', '/"$/'), '', $params);
-			$body = $match->getBody();
-
-			if ($info = $parserlib->plugin_info($pluginName)) {
-				foreach ($params as $paramName => & $paramValue) {
-					if (isset($info['params'][$paramName]['profile_reference'])) {
-						$paramInfo = $info['params'][$paramName];
-
-						if (isset($paramInfo['separator'])) {
-							$paramValue = $tikilib->multi_explode($paramInfo['separator'], $paramValue);
-						}
-
-						$paramValue = $writer->getReference($paramInfo['profile_reference'], $paramValue);
-
-						if (isset($paramInfo['separator'])) {
-							$paramValue = $tikilib->multi_implode($paramInfo['separator'], $paramValue);
-						}
-					}
-				}
-
-				$match->replaceWithPlugin($pluginName, $params, $body);
-				$justReplaced = true;
-			}
-		}
-
-		return $matches->getText();
-	}
-}

Modified: trunk/lib/core/Tiki/Profile/Installer.php
===================================================================
--- trunk/lib/core/Tiki/Profile/Installer.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/core/Tiki/Profile/Installer.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -52,6 +52,14 @@
 		'tracker_item' => 'trackeritem',
 	);
 
+	private static $typeMapInvert = array(
+		'wiki page' => 'wiki_page',
+		'wiki' => 'wiki_page',
+		'fgal' => 'file_gallery',
+		'trackeritem' => 'tracker_item',
+		'tracker item' => 'tracker_item',
+	);
+
 	private $userData = false;
 	private $debug = false;
 	
@@ -88,12 +96,27 @@
 	
 	public static function convertType( $type ) // {{{
 	{
-		if ( array_key_exists($type, self::$typeMap) )
+		if (isset(self::$typeMap[$type])) {
 			return self::$typeMap[$type];
-		else
+		} else {
 			return $type;
+		}
 	} // }}}
 
+	/**
+	 * Converts a Tiki object type to a profile object type.
+	 */
+	public static function convertTypeInvert( $type ) // {{{
+	{
+		$typeMap = self::$typeMapInvert;
+
+		if (isset($typeMap[$type])) {
+			return $typeMap[$type];
+		} else {
+			return $type;
+		}
+	} // }}}
+
 	public static function convertObject( $type, $id, $contextualizedInfo = array() ) // {{{
 	{
 		global $tikilib;

Modified: trunk/lib/core/Tiki/Profile/Writer.php
===================================================================
--- trunk/lib/core/Tiki/Profile/Writer.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/core/Tiki/Profile/Writer.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -93,17 +93,28 @@
 		}, $this->data['unknown_objects']);
 	}
 
-	function getReference($type, $id)
+	/**
+	 * Obtain the replacement string for the given type and id. Type can also be a callback
+	 * or a helper name for complex transformations that require parsing and are called through
+	 * the declarative interfaces (plugins, field types, preferences, ...). Extra parameters are
+	 * provided in those cases since the type may depend on other arguments.
+	 */
+	function getReference($type, $id, array $parameters = array())
 	{
 		// If we are provided with an anonymous function to handle special cases
 		if (is_callable($type)) {
-			return call_user_func($type, $this, $id);
+			return call_user_func($type, $this, $id, $parameters);
+		} elseif (method_exists('Tiki_Profile_WriterHelper', $type)) {
+			return Tiki_Profile_WriterHelper::$type($this, $id, $parameters);
 		}
 
+		// Let 'wiki page' or 'tracker item' be provided as type, no effect when profile types used
+		$type = Tiki_Profile_Installer::convertTypeInvert($type);
+
 		if (is_array($id)) {
 			$parent = $this;
 			return array_map(function ($value) use ($type, $parent) {
-				return $parent->getReference($type, $value);
+				return $parent->getReference($type, $value, $parameters);
 			}, $id);
 		}
 

Added: trunk/lib/core/Tiki/Profile/WriterHelper.php
===================================================================
--- trunk/lib/core/Tiki/Profile/WriterHelper.php	                        (rev 0)
+++ trunk/lib/core/Tiki/Profile/WriterHelper.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -0,0 +1,81 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Tiki_Profile_WriterHelper
+{
+	public static function type_colon_object(Tiki_Profile_Writer $writer, $object)
+	{
+		list($type, $id) = explode(':', $object, 2);
+		
+		return $type . ':' . $writer->getReference($type, $id);
+	}
+
+	public static function type_in_param(Tiki_Profile_Writer $writer, $id, array $params)
+	{
+		if (isset($params['objType'])) {
+			return $writer->getReference($params['objType'], $id);
+		} elseif (isset($params['objectType'])) {
+			return $writer->getReference($params['objectType'], $id);
+		} elseif (isset($params['type'])) {
+			return $writer->getReference($params['type'], $id);
+		} else {
+			return $id;
+		}
+	}
+
+	public static function wiki_content(Tiki_Profile_Writer $writer, $content)
+	{
+		$tikilib = TikiLib::lib('tiki');
+		$parserlib = TikiLib::lib('parser');
+		$argumentParser = new WikiParser_PluginArgumentParser;
+		$matches = WikiParser_PluginMatcher::match($content);
+
+		$justReplace = false;
+		foreach ($matches as $match) {
+			if ($justReplaced) {
+				$justReplaced = false;
+				continue;
+			}
+
+			$pluginName = $match->getName();
+			$params = $argumentParser->parse($match->getArguments());
+			$params = preg_replace(array('/^&quot;/', '/&quot;$/'), '', $params);
+			$body = $match->getBody();
+
+			if ($info = $parserlib->plugin_info($pluginName)) {
+				foreach ($params as $paramName => & $paramValue) {
+					if (isset($info['params'][$paramName]['profile_reference'])) {
+						$paramInfo = $info['params'][$paramName];
+
+						if (isset($paramInfo['separator'])) {
+							$paramValue = $tikilib->multi_explode($paramInfo['separator'], $paramValue);
+						}
+
+						$paramValue = $writer->getReference($paramInfo['profile_reference'], $paramValue, $params);
+
+						if (isset($paramInfo['separator'])) {
+							$paramValue = $tikilib->multi_implode($paramInfo['separator'], $paramValue);
+						}
+					}
+				}
+
+				$match->replaceWithPlugin($pluginName, $params, $body);
+				$justReplaced = true;
+			}
+		}
+
+		return $matches->getText();
+	}
+
+	public static function tracker_field_string(Tiki_Profile_Writer $writer, $value)
+	{
+		return preg_replace_callback('/(\d+)/', function ($args) use ($writer) {
+			return $writer->getReference('tracker_field', $args[1]);
+		}, $value);
+	}
+}
+


Property changes on: trunk/lib/core/Tiki/Profile/WriterHelper.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/wiki-plugins/wikiplugin_addfreetag.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_addfreetag.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_addfreetag.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -22,6 +22,7 @@
 				'filter' => 'text',
 				'default' => null,
 				'since' => '8.0',
+				'profile_reference' => 'type_colon_object',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_addrelation.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_addrelation.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_addrelation.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -32,6 +32,7 @@
 				'filter' => 'text',
 				'default' => null,
 				'since' => '8.0',
+				'profile_reference' => 'type_colon_object',
 			),
 			'target_object' => array(
 				'required' => false,
@@ -40,6 +41,7 @@
 				'filter' => 'text',
 				'default' => null,
 				'since' => '8.0',
+				'profile_reference' => 'type_colon_object',
 			),
 			'label_add' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_addtocart.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_addtocart.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_addtocart.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -22,14 +22,14 @@
 				'name' => tra('Product code'),
 				'description' => tra('Unique identifier for the product. Two products with the same code will be the same and the information used will be the one of the first in.'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'description' => array(
 				'required' => true,
 				'name' => tra('Description'),
 				'description' => tra('Label for the product in the cart.'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'producttype' => array(
 				'required' => false,
@@ -43,77 +43,77 @@
 				'name' => tra('Product Class'),
 				'description' => tra('The class the product belongs to, can be used to limit how gift cards are used'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'productbundle' => array(
 				'required' => false,
 				'name' => tra('Product Bundle'),
 				'description' => tra('The bundle the product belongs to, can be used to limit how gift cards are used, will automatically add other products in same class to cart'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'bundleclass' => array(
 				'required' => false,
 				'name' => tra('Bundle Class'),
 				'description' => tra('The class the bundle belongs to, can be used to limit how gift cards are used'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'price' => array(
 				'required' => true,
 				'name' => tra('Price'),
 				'description' => tra('The price to charge for the item.'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'href' => array(
 				'required' => false,
 				'name' => tra('Location'),
 				'description' => tra('URL of the product\'s information. The URL may be relative or absolute (begin with http://).'),
 				'filter' => 'url',
-				'default' => ''
+				'default' => '',
 			),
 			'label' => array(
 				'required' => false,
 				'name' => tra('Button label'),
 				'description' => tra('Text for the submit button. default: "Add to cart"'),
 				'filter' => 'text',
-				'default' => 'Add to cart'
+				'default' => 'Add to cart',
 			),
 			'eventcode' => array(
-                                'required' => false,
-                                'name' => tra('Associated event code'),
-                                'description' => tra('Unique identifier for the event that is associated to the product.'),
-                                'filter' => 'text',
-                                'default' => ''
-                        ),
+				'required' => false,
+				'name' => tra('Associated event code'),
+				'description' => tra('Unique identifier for the event that is associated to the product.'),
+				'filter' => 'text',
+				'default' => '',
+			),
 			'autocheckout' => array(
 				'required' => false,
 				'name' => tra('Automatically checkout'),
 				'description' => tra('Automatically checkout for purchase and send user to pay (this is disabled when there is already something in the cart)'),
 				'filter' => 'text',
-				'default' => 'n'
+				'default' => 'n',
 			),
 			'onbehalf' => array(
 				'required' => false,
 				'name' => tra('Buy on behalf of'),
 				'description' => tra('Allows the selection of user to make purchase on behalf of'),
 				'filter' => 'text',
-				'default' => 'n'
+				'default' => 'n',
 			),
 			'forceanon' => array(
 				'required' => false,
 				'name' => tra('Shop as anonymous always'),
 				'description' => tra('Add to cart as anonymous shopper even if logged in'),
 				'filter' => 'text',
-				'default' => 'n'
+				'default' => 'n',
 			),
 			'forwardafterfree' => array(
 				'required' => false,
 				'name' => tra('Forward to this URL after free purchase'),
 				'description' => tra('Forward to this URL after free purchase'),
 				'filter' => 'url',
-				'default' => ''
+				'default' => '',
 			),
 			'giftcertificate'=> array(
 				'required' => false,
@@ -125,28 +125,29 @@
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Yes'), 'value' => 'y'),
 					array('text' => tra('No'), 'value' => 'n')
-				)
+				),
 			),
 			'exchangeorderitemid' => array(
 				'required' => false,
 				'name' => tra('Order Item ID to exchange product'),
 				'description' => tra('Used in conjunction with exchange feature'),
 				'filter' => 'int',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 			'exchangetoproductid' => array(
 				'required' => false,
 				'name' => tra('Product ID to exchange to'),
 				'desctiption' => tra('Used in conjunction with exchange feature'),
 				'filter' => 'int',
-				'default' => ''
+				'default' => '',
 			),
 			'exchangeorderamount' => array(
 				'required' => false,
 				'name' => tra('Amount of new product to exchange for'),
 				'description' => tra('Should normally be set to the amount of products in the order being exchanged'),
 				'filter' => 'int',
-				'default' => 1
+				'default' => 1,
 			),
 			'ajaxaddtocart' => array(
 				'required' => false,
@@ -158,7 +159,7 @@
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Yes'), 'value' => 'y'),
 					array('text' => tra('No'), 'value' => 'n')
-				)
+				),
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_addtogooglecal.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_addtogooglecal.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_addtogooglecal.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -24,7 +24,8 @@
 				'filter' => 'digits', 
 				'default' => '',
 				'since' => '6.0', 
-	),
+				'profile_reference' => 'calendar',
+			),
 			'iconstyle' => array(
 				'required' => false,
 				'name' => tra('Icon Style'),

Modified: trunk/lib/wiki-plugins/wikiplugin_alink.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_alink.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_alink.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,14 +20,15 @@
 				'required' => true,
 				'name' => tra('Anchor Name'),
 				'description' => tra('The anchor name as defined in the ANAME plugin.'),
-				'default' => ''
+				'default' => '',
 			),
 			'pagename' => array(
 				'required' => false,
 				'name' => tra('Page Name'),
 				'description' => tra('The name of the wiki page containing the anchor. If empty, the anchor name will be searched for on the wiki page where the plugin is used.'),
 				'filter' => 'pagename',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_article.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_article.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_article.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,14 +20,15 @@
 				'name' => tra('Field'),
 				'description' => tra('The article field to display. Default field is Heading.'),
 				'filter' => 'word',
-				'default' => 'heading'
+				'default' => 'heading',
 			),
 			'Id' => array(
 				'required' => false,
 				'name' => tra('Article ID'),
 				'description' => tra('The article to display. If no value is provided, most recent article will be used.'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'article',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_articles.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_articles.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_articles.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -32,50 +32,53 @@
 				'name' => tra('Maximum Displayed'),
 				'description' => tra('The number of articles to display in the list (no max set by default)') . '. ' . tra('If Pagination is set to y (Yes), this will determine the amount of articles per page'),
 				'filter' => 'int',
-				'default' => -1
+				'default' => -1,
 			),
 			'topic' => array(
 				'required' => false,
 				'name' => tra('Topic Name Filter'),
 				'description' => tra('Filter the list of articles by topic. Example: ') . '[!]topic+topic+topic',
 				'filter' => 'striptags',
-				'default' => ''
+				'default' => '',
 			),
 			'topicId' => array(
 				'required' => false,
 				'name' => tra('Topic ID Filter'),
 				'description' => tra('Filter the list of articles by topic ID. Example: ') . '[!]topicId+topicId+topicId',
 				'filter' => 'striptags',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'article_topic',
 			),
 			'type' => array(
 				'required' => false,
 				'name' => tra('Type Filter'),
 				'description' => tra('Filter the list of articles by types. Example: ') . '[!]type+type+type',
 				'filter' => 'striptags',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'article_type',
 			),
 			'categId' => array(
 				'required' => false,
 				'name' => tra('Category ID'),
 				'description' => tra('List of category IDs, separated by |. Only articles in all these categories are listed'),
 				'filter' => 'digits',
+				'default' => '',
+				'profile_reference' => 'category',
 				'separator' => '|',
-				'default' => ''
 			),
 			'lang' => array(
 				'required' => false,
 				'name' => tra('Language'),
 				'description' => tra('List only articles in this language'),
 				'filter' => 'lang',
-				'default' => ''
+				'default' => '',
 			),
 			'sort' => array(
 				'required' => false,
 				'name' => tra('Sort order'),
 				'description' => tra('The column and order of the sort in columnName_asc or columnName_desc format. Defaults to "publishDate_desc" (other column examples are "title", "lang", "articleId", "authorName" & "topicName")').'. '.tra('Use random to have random items.'),
 				'filter' => 'word',
-				'default' => 'publishDate_desc'
+				'default' => 'publishDate_desc',
 			),
 			'order' => array(
 				'required' => false,
@@ -83,7 +86,7 @@
 				'description' => tra('List of ArticleId that must appear in this order if present'),
 				'filter' => 'digits',
 				'separator' => '|',
-				'default' => ''
+				'default' => '',
 			),
 			'articleId' => array(
 				'required' => false,
@@ -91,7 +94,8 @@
 				'description' => tra('List of ArticleId to display separated by |'),
 				'filter' => 'digits',
 				'separator' => '|',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'article',
 			),
 			'notArticleId' => array(
 				'required' => false,
@@ -99,7 +103,8 @@
 				'description' => tra('List of ArticleId that can not be displayed separated by |'),
 				'filter' => 'digits',
 				'separator' => '|',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'article',
 			),
 			'quiet' => array(
 				'required' => false,
@@ -110,7 +115,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Yes'), 'value' => 'y'),
-					array('text' => tra('No'), 'value' => 'n')
+					array('text' => tra('No'), 'value' => 'n'),
 				),
 			),
 			'titleonly' => array(
@@ -122,7 +127,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Yes'), 'value' => 'y'),
-					array('text' => tra('No'), 'value' => 'n')
+					array('text' => tra('No'), 'value' => 'n'),
 				),
 			),
 			'fullbody' => array(
@@ -134,7 +139,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Yes'), 'value' => 'y'),
-					array('text' => tra('No'), 'value' => 'n')
+					array('text' => tra('No'), 'value' => 'n'),
 				),
 			),
 			'start' => array(
@@ -142,21 +147,21 @@
 				'name' => tra('Starting Article'),
 				'description' => tra('The article number that the list should start with (starts with first article by default)') . '. ' . tra('This will not work if Pagination is used.'),
 				'filter' => 'int',
-				'default' => 0
+				'default' => 0,
 			),
 			'dateStart' => array(
 				'required' => false,
 				'name' => tra('Start Date'),
 				'description' => tra('Earliest date to select articles from.') . tra(' (YYYY-MM-DD)'),
 				'filter' => 'date',
-				'default' => ''
+				'default' => '',
 			),
 			'dateEnd' => array(
 				'required' => false,
 				'name' => tra('End date'),
 				'description' => tra('Latest date to select articles from.') . tra(' (YYYY-MM-DD)'),
 				'filter' => 'date',
-				'default' => ''
+				'default' => '',
 			),
 			'periodQuantity' => array(
 				'required' => false,
@@ -187,7 +192,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Yes'), 'value' => 'y'),
-					array('text' => tra('No'), 'value' => 'n')
+					array('text' => tra('No'), 'value' => 'n'),
 				),
 			),
 			'containerClass' => array(
@@ -195,7 +200,7 @@
 				'name' => tra('Container class'),
 				'description' => tra('CSS Class to add to the container DIV.article. (Default="wikiplugin_articles")'),
 				'filter' => 'striptags',
-				'default' => 'wikiplugin_articles'
+				'default' => 'wikiplugin_articles',
 			),
 			'largefirstimage' => array(
 				'required' => false,
@@ -206,14 +211,14 @@
 				'options' => array(
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Yes'), 'value' => 'y'),
-					array('text' => tra('No'), 'value' => 'n')
+					array('text' => tra('No'), 'value' => 'n'),
 				),
 			),
 			'urlparam' => array(
 				'required' => false,
 				'name' => tra('Additional URL Param to the link to read article'),
 				'filter' => 'striptags',
-				'default' => ''
+				'default' => '',
 			),
 			'actions' => array(
 				'required' => false,
@@ -227,7 +232,7 @@
 				'description' => tra('User or pipe separated list of two letter language codes for additional languages to display. List pages with no language or with a missing translation in one of the language'),
 				'filter' => 'alpha',
 				'separator' => '|',
-				'default' => ''
+				'default' => '',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_attach.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_attach.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_attach.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -19,19 +19,20 @@
 				'required' => false,
 				'name' => tra('Name'),
 				'description' => tra('File name of the attached file to link to. Either name, file, id or num can be used to identify a single attachment'),
-				'default' => ''
+				'default' => '',
 			),
 			'file' =>array(
 				'required' => false,
 				'name' => tra('File'),
 				'description' => tra('Same as name'),
-				'default' => ''
+				'default' => '',
 			),
 			'page' => array(
 				'required' => false,
 				'name' => tra('Page'),
 				'description' => tra('Name of the wiki page the file is attached to. If left empty when the plugin is used on a wiki page, this defaults to that wiki page.'),
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'showdesc' => array(
 				'required' => false,
@@ -41,7 +42,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 1), 
-					array('text' => tra('No'), 'value' => 0)
+					array('text' => tra('No'), 'value' => 0),
 				),
 			),
 			'bullets' => array(
@@ -52,7 +53,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 1), 
-					array('text' => tra('No'), 'value' => 0)
+					array('text' => tra('No'), 'value' => 0),
 				),
 			),
 			'image' =>array(
@@ -63,7 +64,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 1), 
-					array('text' => tra('No'), 'value' => 0)
+					array('text' => tra('No'), 'value' => 0),
 				),
 			),
 			'inline' =>array(
@@ -74,7 +75,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 1), 
-					array('text' => tra('No'), 'value' => 0)
+					array('text' => tra('No'), 'value' => 0),
 				),
 			),
 			'all' => array(
@@ -85,14 +86,14 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 1), 
-					array('text' => tra('No'), 'value' => 0)
+					array('text' => tra('No'), 'value' => 0),
 				),
 			),
 			'num' => array(
 				'required' => false,
 				'name' => tra('Order Number'),
 				'description' => tra('Identifies the attachment to link to by the order of the attachment in the list of attachments to a page instead of by file name or ID. Either name, file, id or num can be used to identify a single attachment.'),
-				'default' => ''
+				'default' => '',
 			),
 			'id' => array(
 				'required' => false,
@@ -107,7 +108,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 1), 
-					array('text' => tra('No'), 'value' => 0)
+					array('text' => tra('No'), 'value' => 0),
 				),
 			),
 			'icon' =>array(
@@ -118,7 +119,7 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 1), 
-					array('text' => tra('No'), 'value' => 0)
+					array('text' => tra('No'), 'value' => 0),
 				),
 			),
 

Modified: trunk/lib/wiki-plugins/wikiplugin_author.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_author.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_author.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,14 +20,14 @@
 				'name' => tra('User Name'),
 				'description' => tra('User name of the user who wrote the text.'),
 				'default' => '',
-				'filter' => 'username'
+				'filter' => 'username',
 			),
 			'deleted_by' => array(
 				'required' => false,
 				'name' => tra('Deleted by User'),
 				'description' => tra('User name of the user who deleted the text.'),
 				'default' => '',
-				'filter' => 'username'
+				'filter' => 'username',
 			),
 			'visible'	=> array(
 				'required'	=> false,

Modified: trunk/lib/wiki-plugins/wikiplugin_avatar.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_avatar.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_avatar.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -18,11 +18,9 @@
 			'page' => array(
 				'required' => false,
 				'name' => tra('Page'),
-				'description' => tra(
-					'The wiki page the avatar will link to. If empty and the user\'s information is public,
-					then the avatar will link automatically the that user\'s user information page'
-				),
-				'default' => ''
+				'description' => tra('The wiki page the avatar will link to. If empty and the user\'s information is public, then the avatar will link automatically the that user\'s user information page'),
+				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'float' => array(
 				'required' => false,
@@ -32,14 +30,14 @@
 				'options' => array(
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Right'), 'value' => 'right'),
-					array('text' => tra('Left'), 'value' => 'left')
+					array('text' => tra('Left'), 'value' => 'left'),
 				),
 			),
 			'fullsize' => array(
 				'required' => false,
 				'name' => tra('Show fullsize File Gallery image'),
 				'description' => tra('If fullsize images are stored in the File Gallery, show the full size one.'),
-				'default' => 'n'
+				'default' => 'n',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_backlinks.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_backlinks.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_backlinks.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -119,21 +119,25 @@
 				'name' => tra('Page'),
 				'description' => tra('The page links will point to. Default value is the current page.'),
 				'advanced' => true,
-				'default' => '[pagename]'
+				'default' => '[pagename]',
+				'profile_reference' => 'wiki_page',
 			),
 			'info' => array(
 				'required' => false,
 				'name' => tra('Displayed Information'),
 				'description' => tra('Pipe separated list of fields to display. ex: hits|user'),
 				'advanced' => true,
-				'default' => false
+				'separator' => '|',
+				'default' => false,
 			),
 			'exclude' => array(
 				'required' => false,
 				'name' => tra('Excluded pages'),
 				'description' => tra('Pipe separated list of pages to be excluded from the listing. ex: HomePage|Sandbox'),
 				'advanced' => true,
-				'default' => ''
+				'default' => '',
+				'separator' => '|',
+				'profile_reference' => 'wiki_page',
 			),
 			'include_self' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_bigbluebutton.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_bigbluebutton.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_bigbluebutton.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,42 +21,42 @@
 				'name' => tra('Meeting'),
 				'description' => tra('MeetingID for BigBlueButton. This is a 5 digit number, starting with a 7. Ex.: 77777 or 71111.'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'prefix' => array(
 				'required' => false,
 				'name' => tra('Anonymous prefix'),
 				'description' => tra('Unregistered users will get this token prepended to their name.'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'welcome' => array(
 				'required' => false,
 				'name' => tra('Welcome Message'),
 				'description' => tra('A message to be provided when someone enters the room.'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'number' => array(
 				'required' => false,
 				'name' => tra('Dial Number'),
 				'description' => tra('The phone-in support number to join from traditional phones.'),
 				'filter' => 'text',
-				'default' => ''
+				'default' => '',
 			),
 			'voicebridge' => array(
 				'required' => false,
 				'name' => tra('Voice Bridge'),
 				'description' => tra('Code to enter for phone attendees to join the room. Typically, the same 5 digits of the MeetingID.'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
 			),
 			'logout' => array(
 				'required' => false,
 				'name' => tra('Log-out URL'),
 				'description' => tra('URL to which the user will be redirected when logging out from BigBlueButton.'),
 				'filter' => 'url',
-				'default' => ''
+				'default' => '',
 			),
 			'recording' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_bloglist.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_bloglist.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_bloglist.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -19,20 +19,21 @@
 				'name' => tra('Blog ID'),
 				'description' => tra('The ID number of the blog on the site you wish to list posts from'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'blog',
 			),
 			'Items' => array(
 				'required' => false,
 				'name' => tra('Maximum Items'),
 				'description' => tra('Maximum number of entries to list (no maximum set by default)'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
 			),
 			'author' => array(
 				'required' => false,
 				'name' => tra('Author'),
 				'description' => tra('Only display posts created by this user (all posts listed by default)'),
-				'default' => ''
+				'default' => '',
 			),
 			'simpleList' => array(
 				'required' => false,
@@ -45,79 +46,79 @@
 					array('text' => tra('No'), 'value' => 'n')
 				),
 			),
-                        'charCount' => array(
-                                'required' => false,
-                                'name' => tra('Char Count'),
-                                'description' => tra('Number of characters to display if not a simple list. (defaults to all)'),
-                                'filter' => 'digits',
-                                'parent' => array('name' => 'simpleList', 'value' => 'n'),
-                                'default' => ''
-                        ),
-                        'wordBoundary' => array(
-                                'required' => false,
-                                'name' => tra('Word Boundary'),
-                                'description' => tra('If not a simple list and Char Count is non-zero, then marking this as yes will break on word boundaries only.'),
-                                'default' => 'y',
-                                'options' => array(
-                                        array('text' => tra('Yes'), 'value' => 'y'),
-                                        array('text' => tra('No'), 'value' => 'n')
-                                ),
-                                'parent' => array('name' => 'simpleList', 'value' => 'n'),
-                        ),
-                        'ellipsis' => array(
-                                'required' => false,
-                                'name' => tra('Ellipsis'),
-                                'description' => tra('If not a simple list and Char Count is non-zero, then marking this as yes will put ellipsis (...) at end of text (default=y).'),
-                                'default' => 'y',
-                                'options' => array(
-                                        array('text' => '', 'value' => ''),
-                                        array('text' => tra('Yes'), 'value' => 'y'),
-                                        array('text' => tra('No'), 'value' => 'n')
-                                ),
-                                'parent' => array('name' => 'simpleList', 'value' => 'n'),
-                        ),
-                        'more' => array(
-                                'required' => false,
-                                'name' => tra('More'),
-                                'description' => tra('If not a simple list and Char Count is non-zero, then marking this as yes will put a More link to the full entry (default=y).'),
-                                'default' => 'y',
-                                'options' => array(
-                                        array('text' => tra('Yes'), 'value' => 'y'),
-                                        array('text' => tra('No'), 'value' => 'n')
-                                ),
-                                'parent' => array('name' => 'simpleList', 'value' => 'n'),
-                        ),
-                        'showIcons' => array(
-                                'required' => false,
-                                'name' => tra('Show Icons'),
-                                'description' => tra('If not a simple list marking this as no will prevent the "edit" and "print" type icons from displaying (default=y)'),
-                                'default' => 'y',
-                                'options' => array(
+			'charCount' => array(
+				'required' => false,
+				'name' => tra('Char Count'),
+				'description' => tra('Number of characters to display if not a simple list. (defaults to all)'),
+				'filter' => 'digits',
+				'parent' => array('name' => 'simpleList', 'value' => 'n'),
+				'default' => '',
+			),
+			'wordBoundary' => array(
+				'required' => false,
+				'name' => tra('Word Boundary'),
+				'description' => tra('If not a simple list and Char Count is non-zero, then marking this as yes will break on word boundaries only.'),
+				'default' => 'y',
+				'options' => array(
 					array('text' => tra('Yes'), 'value' => 'y'),
-                                        array('text' => tra('No'), 'value' => 'n')
-                                ),
-                                'parent' => array('name' => 'simpleList', 'value' => 'n'),
-                        ),
+					array('text' => tra('No'), 'value' => 'n')
+				),
+				'parent' => array('name' => 'simpleList', 'value' => 'n'),
+			),
+			'ellipsis' => array(
+				'required' => false,
+				'name' => tra('Ellipsis'),
+				'description' => tra('If not a simple list and Char Count is non-zero, then marking this as yes will put ellipsis (...) at end of text (default=y).'),
+				'default' => 'y',
+				'options' => array(
+					array('text' => '', 'value' => ''),
+					array('text' => tra('Yes'), 'value' => 'y'),
+					array('text' => tra('No'), 'value' => 'n')
+				),
+				'parent' => array('name' => 'simpleList', 'value' => 'n'),
+			),
+			'more' => array(
+				'required' => false,
+				'name' => tra('More'),
+				'description' => tra('If not a simple list and Char Count is non-zero, then marking this as yes will put a More link to the full entry (default=y).'),
+				'default' => 'y',
+				'options' => array(
+					array('text' => tra('Yes'), 'value' => 'y'),
+					array('text' => tra('No'), 'value' => 'n')
+				),
+				'parent' => array('name' => 'simpleList', 'value' => 'n'),
+			),
+			'showIcons' => array(
+				'required' => false,
+				'name' => tra('Show Icons'),
+				'description' => tra('If not a simple list marking this as no will prevent the "edit" and "print" type icons from displaying (default=y)'),
+				'default' => 'y',
+				'options' => array(
+					array('text' => tra('Yes'), 'value' => 'y'),
+					array('text' => tra('No'), 'value' => 'n')
+				),
+				'parent' => array('name' => 'simpleList', 'value' => 'n'),
+			),
 			'dateStart' => array(
 				'required' => false,
 				'name' => tra('Start Date'),
 				'description' => tra('Earliest date to select posts from.') . ' (YYYY-MM-DD)',
 				'filter' => 'date',
-				'default' => ''
+				'default' => '',
 			),
 			'dateEnd' => array(
 				'required' => false,
 				'name' => tra('End Date'),
 				'description' => tra('Latest date to select posts from.') . ' (YYYY-MM-DD)',
 				'filter' => 'date',
-				'default' => ''
+				'default' => '',
 			),
 			'containerClass' => array(
 				'required' => false,
 				'name' => tra('Container Class'),
 				'description' => tra('CSS Class to add to the container DIV.article. (Default="wikiplugin_bloglist")'),
 				'filter' => 'striptags',
-				'default' => 'wikiplugin_bloglist'
+				'default' => 'wikiplugin_bloglist',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_button.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_button.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_button.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -26,11 +26,11 @@
 			),
 			'_class' => array(
 				'required' => false,
-                                'name' => tra('CSS Class'),
-                                'description' => tra('CSS class for the button'),
-                                'filter' => 'text',
-                                'default' => '',
-                        ),
+				'name' => tra('CSS Class'),
+				'description' => tra('CSS class for the button'),
+				'filter' => 'text',
+				'default' => '',
+			),
 			'_text' => array(
 				'required' => false,
 				'name' => tra('Label'),

Modified: trunk/lib/wiki-plugins/wikiplugin_calendar.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_calendar.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_calendar.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,6 +20,7 @@
 				'filter' => 'digits',
 				'separator' => ',',
 				'default' => '',
+				'profile_reference' => 'calendar',
 			),
 			'viewlist' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_carousel.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_carousel.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_carousel.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -23,6 +23,7 @@
 				'filter' => 'digits',
 				'accepted' => 'ID',
 				'default' => '',
+				'profile_reference' => 'file_gallery',
 			),
 			'sort_mode' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_category.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_category.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_category.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,6 +21,7 @@
 				'filter' => 'digits',
 				'separator' => '+',
 				'default' => '',
+				'profile_reference' => 'category',
 			),
 			'types' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_categorytransition.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_categorytransition.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_categorytransition.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -25,6 +25,7 @@
 				'description' => tra('Object ID'),
 				'filter' => 'text',
 				'default' => '',
+				'profile_reference' => 'type_in_param',
 			),
 			'redirect' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_chart.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_chart.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_chart.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -19,6 +19,7 @@
 				'required' => true,
 				'name' => tra('Sheet ID'),
 				'description' => tra('Data sheet ID'),
+				'profile_reference' => 'sheet',
 			),
 			'type' => array(
 				'required' => true,

Modified: trunk/lib/wiki-plugins/wikiplugin_colorbox.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_colorbox.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_colorbox.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -23,7 +23,8 @@
 				'filter' => 'digits',
 				'accepted' => 'ID',
 				'default' => '',
-				'since' => '5.0'
+				'since' => '5.0',
+				'profile_reference' => 'file_gallery',
 				),
 			'galId' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_comment.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_comment.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_comment.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -45,10 +45,12 @@
 				'description' => tra('Object ID'),
 				'filter' => 'int',
 				'default' => tr('The current wiki page you have added the plugin to'),
+				'profile_reference' => 'type_in_param',
 			),
 		)
 	);
 }
+
 function wikiplugin_comment($data, $params)
 {
 	global $smarty, $page;

Modified: trunk/lib/wiki-plugins/wikiplugin_convene.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_convene.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_convene.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -29,6 +29,7 @@
 				'description' => tra('ID number for the site calendar where to store the date for the events with maximum votes'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'calendar',
 			),
 			'minvotes' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_customsearch.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_customsearch.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_customsearch.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -23,6 +23,7 @@
 				'description' => tra('Wiki page where search user interface template is found'),
 				'filter' => 'pagename',
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'id' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_datachannel.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_datachannel.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_datachannel.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -25,13 +25,14 @@
 				'name' => tra('Channel Name'),
 				'description' => tra('Name of the channel as registered by the administrator.'),
 				'default' => '',
+				'profile_reference' => 'datachannel',
 			),
 			'returnURI' => array(
 				'required' => false,
 				'name' => tra('Return URL'),
 				'description' => tra('URL to go to after data channel has run. Defaults to current page.'),
 				'filter' => 'pagename',
-				'default' => '$_SERVER[\'HTTP_REFERER\']',
+				'default' => '',
 			),
 			'quietReturn' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_dialog.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_dialog.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_dialog.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -86,6 +86,7 @@
 				'description' => tra('Wiki page to use as dialog body.'),
 				'filter' => 'pagename',
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'openAction' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_draw.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_draw.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_draw.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -22,7 +22,8 @@
 				'filter' => 'digits',
 				'accepted' => ' ID number',
 				'default' => '',
-				'since' => '7.1'
+				'since' => '7.1',
+				'profile_reference' => 'file',
 			),
 			'width' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_events.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_events.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_events.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,6 +20,7 @@
 				'name' => tra('Calendar IDs'),
 				'description' => tra('ID numbers for the site calendars whose events are to be displayed, separated by vertical bars (|)'),
 				'default' => '',
+				'profile_reference' => 'calendar',
 			),
 			'maxdays' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_favorite.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_favorite.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_favorite.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -27,6 +27,7 @@
 				'description' => tra('Object ID'),
 				'filter' => 'text',
 				'default' => '',
+				'profile_reference' => 'type_in_param',
 			),
 		)
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_file.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_file.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_file.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -33,10 +33,7 @@
 			'name' => array(
 				'required' => true,
 				'name' => tra('Name'),
-				'description' => tra(
-					'Identify an attachment by entering its file name, which will show as a link to the file.
-					 If the page parameter is empty, it must be a file name of an attachment to the page where the plugin is used.'
-				),
+				'description' => tra('Identify an attachment by entering its file name, which will show as a link to the file. If the page parameter is empty, it must be a file name of an attachment to the page where the plugin is used.'),
 				'default' => '',
 				'parent' => array('name' => 'type', 'value' => 'attachment'),
 			),
@@ -55,6 +52,7 @@
 				'parent' => array('name' => 'type', 'value' => 'attachment'),
 				'default' => '',
 				'advanced' => true,
+				'profile_reference' => 'wiki_page',
 			),
 			'showdesc' => array(
 				'required' => false,
@@ -91,6 +89,7 @@
 				'filter' => 'digits',
 				'default' => '',
 				'parent' => array('name' => 'type', 'value' => 'gallery'),
+				'profile_reference' => 'file',
 			),
 			'date' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_files.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_files.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_files.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -23,6 +23,7 @@
 				'description' => tra('To list only files contained in these file galleries (multiple IDs separated by colon)'),
 				'default' => '',
 				'separator' => ':',
+				'profile_reference' => 'file_gallery',
 			),
 			'categId' => array(
 				'required' => false,
@@ -30,6 +31,7 @@
 				'description' => tra('To restrict files listed to those belonging to one or more categories. Enter a single category or ID or list of them separated by colon'),
 				'default' => '',
 				'advanced' => true,
+				'profile_reference' => 'category',
 			),
 			'fileId' => array(
 				'required' => false,
@@ -39,6 +41,7 @@
 				'area' => 'fgal_picker_id',
 				'default' => '',
 				'separator' => ':',
+				'profile_reference' => 'file',
 			),
 			'sort' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_flash.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_flash.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_flash.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -43,6 +43,7 @@
 				'description' => tra('Id of a file from a podcast gallery - will work only with podcast gallery'),
 				'parent' => array('name' => 'type', 'value' => 'fileId'),
 				'default' => '',
+				'profile_reference' => 'file',
 			),
 			'youtube' => array(
 				'required' => true,

Modified: trunk/lib/wiki-plugins/wikiplugin_galleriffic.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_galleriffic.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_galleriffic.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,6 +20,7 @@
 				'filter' => 'digits',
 				'accepted' => 'ID',
 				'default' => '',
+				'profile_reference' => 'file_gallery',
 			),
 			'sort_mode' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_groupmailcore.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_groupmailcore.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_groupmailcore.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,63 +20,71 @@
 				'required' => true,
 				'name' => tra('From Email'),
 				'description' => tra('Email address to report.'),
-				'default' => ''
+				'default' => '',
 			),
 			'trackerId' => array(
 				'required' => true,
 				'name' => tra('Tracker Id'),
 				'description' => tra('Id of GroupMail Logs tracker (set up in alias by profile).'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'fromFId' => array(
 				'required' => true,
 				'name' => tra('From Field Id'),
 				'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'operatorFId' => array(
 				'required' => true,
 				'name' => tra('Operator Field Id'),
 				'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'subjectFId' => array(
 				'required' => true,
 				'name' => tra('Subject Field Id'),
 				'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'messageFId' => array(
 				'required' => true,
 				'name' => tra('Message Field Id'),
 				'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'contentFId' => array(
 				'required' => true,
 				'name' => tra('Content Field Id'),
 				'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'accountFId' => array(
 				'required' => true,
 				'name' => tra('Account Field Id'),
 				'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'datetimeFId' => array(
 				'required' => true,
 				'name' => tra('Datetime Field Id'),
 				'description' => tra('Id of GroupMail Logs tracker field (usually set up in alias by profile).'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_hasbought.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_hasbought.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_hasbought.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -35,6 +35,7 @@
 				'description' => tra('Tracker from which to get passcode to check against'),
 				'filter' => 'text',
 				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'fieldId' => array(
 				'required' => true,
@@ -42,6 +43,7 @@
 				'description' => tra('Field ID from which to get passcode to check against'),
 				'filter' => 'text',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'itemId' => array(
 				'required' => true,
@@ -49,6 +51,7 @@
 				'description' => tra('Item ID from which to get passcode to check against'),
 				'filter' => 'text',
 				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_img.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_img.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_img.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -39,6 +39,7 @@
 				'filter' => 'striptags',
 				'default' => '',
 				'parent' => array('name' => 'type', 'value' => 'fileId'),
+				'profile_reference' => 'file',
 			),
 			'id' => array(
 				'required' => true,
@@ -74,6 +75,7 @@
 				'advanced' => true,
 				'default' => '',
 				'parent' => array('name' => 'type', 'value' => 'fgalId'),
+				'profile_reference' => 'file_gallery',
 			),
 			'attId' => array(
 				'required' => true,

Modified: trunk/lib/wiki-plugins/wikiplugin_include.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_include.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_include.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,6 +21,7 @@
 				'description' => tra('Wiki page name to include.'),
 				'filter' => 'pagename',
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'start' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_invite.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_invite.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_invite.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -29,6 +29,7 @@
 				'required' => false,
 				'name' => tra('Item ID'),
 				'description' => tra('Dropdown list will show the group related to this item ID (in group selector or creator field) by default'),
+				'profile_reference' => 'tracker_item',
 			),
 		)
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_lastmod.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_lastmod.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_lastmod.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -18,6 +18,7 @@
 				'required' => false,
 				'name' => tra('Page'),
 				'description' => tra('Page name to display information of. Default value is current page.'),
+				'profile_reference' => 'wiki_page',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_listpages.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_listpages.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_listpages.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -52,6 +52,7 @@
 				'description' => tra('If set to a category identifier, restrict the pages displayed to those in the specified category.').' ' . tra('Example value:') . ' 42. ' . tra('If set to a list of category identifiers separated by colons (:), restrict the pages to those in any of the specified categories.') . ' ' . tra('Example value:') . ' 1:2. ' . tra('If set to a list of category identifiers separated by plus signs (+), only display a page if it is in all of the specified categories.') . ' ' . tra('Example value:') . ' 1+2. ' .  tra('If set to a list of category identifiers separated by minus signs (-), only display a page if it is in the first specified category and not in any of the following categories.') . ' ' . tra('Example value:') . ' 1-2-3.', 
 				'filter' => 'striptags', 
 				'default' => '',
+				'profile_reference' => 'category',
 			),
 			'structHead' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_miniquiz.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_miniquiz.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_miniquiz.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,6 +20,7 @@
 				'name' => tra('Tracker ID'),
 				'description' => tra('Numeric value representing the miniquiz tracker ID'),
 				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_objecthits.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_objecthits.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_objecthits.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -19,6 +19,7 @@
 				'name' => tra('Object'),
 				'description' => tra('For a wiki page, the page name, for other object types: ID number + ? + object title'),
 				'default' => '',
+				'profile_reference' => 'type_in_param',
 			),
 			'type' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_objectlink.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_objectlink.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_objectlink.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -27,6 +27,7 @@
 				'name' => tra('Object ID'),
 				'description' => tra('The item to display'),
 				'filter' => 'text',
+				'profile_reference' => 'type_in_param',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_pagetabs.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_pagetabs.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_pagetabs.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -29,7 +29,9 @@
 				'name' => tra('Wiki page names'),
 				'description' => tra('The wiki pages you would like to use in this plugin, optional, separate with pipe "|".  Or a table with the class of "pagetabs" on the main page. On child pages use as a way to redirect to the parent.'),
 				'default' => '',
-				'filter' => 'striptags',
+				'separator' => '|',
+				'filter' => 'pagename',
+				'profile_reference' => 'wiki_page',
 			),
 		),
 	);
@@ -42,7 +44,7 @@
 	++$pagetabsindex;
 	extract($params, EXTR_SKIP);
 
-	$pages = json_encode(explode('|', $pages));
+	$pages = json_encode($pages);
 
 	$pageTabs = true;
 

Modified: trunk/lib/wiki-plugins/wikiplugin_perspective.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_perspective.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_perspective.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -19,15 +19,19 @@
 				'required' => false,
 				'name' => tra('Allowed Perspectives'),
 				'description' => tra('Pipe-separated list of identifiers of perspectives in which the block is shown.') . tra('Example value:') . '2|3|5',
-				'filter' => 'text',
-				'default' => ''
+				'filter' => 'digits',
+				'separator' => '|',
+				'default' => '',
+				'profile_reference' => 'perspective',
 			),
 			'notperspectives' => array(
 				'required' => false,
 				'name' => tra('Denied Perspectives'),
 				'description' => tra('Pipe-separated list of identifiers of perspectives in which the block is not shown.') . tra('Example value:') . '3|5|8',
-				'filter' => 'text',
-				'default' => ''
+				'filter' => 'digits',
+				'separator' => '|',
+				'default' => '',
+				'profile_reference' => 'perspective',
 			),
 		),
 	);
@@ -44,10 +48,10 @@
 	}
 
 	if (!empty($params['perspectives'])) {
-		$perspectives = explode('|', $params['perspectives']);
+		$perspectives = $params['perspectives'];
 	}
 	if (!empty($params['notperspectives'])) {
-		$notperspectives = explode('|', $params['notperspectives']);
+		$notperspectives = $params['notperspectives'];
 	}
 	if (empty($perspectives) && empty($notperspectives)) {
 		return '';

Modified: trunk/lib/wiki-plugins/wikiplugin_poll.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_poll.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_poll.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,7 +20,8 @@
 				'required' => true,
 				'name' => tra('Poll'),
 				'description' => tra('Numeric value representing the poll ID'),
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'poll',
 			),
 			'showtitle' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_prettytrackerviews.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_prettytrackerviews.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_prettytrackerviews.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -42,7 +42,8 @@
 				'required' => true,
 				'name' => tra('Item ID'),
 				'description' => tra('Set to ID of tracker item'),
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_redirect.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_redirect.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_redirect.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -22,6 +22,7 @@
 				'description' => tra('Wiki page name to redirect to.'),
 				'filter' => 'pagename',
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'url' => array(
 				'required' => false,
@@ -36,6 +37,7 @@
 				'description' => tra('The ID of a perspective to switch to (requires feature_perspective).'),
 				'filter' => 'int',
 				'default' => '',
+				'profile_reference' => 'perspective',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_regex.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_regex.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_regex.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,6 +21,7 @@
 				'name' => tra('Page name'),
 				'description' => tra('Name of page containing search and replace expressions separated by two colons. Example of syntax on that page: /search pattern/::replacement text'),
 				'default' => 'pageName',
+				'profile_reference' => 'wiki_page',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_relations.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_relations.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_relations.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -32,6 +32,7 @@
 				'filter' => 'text',
 				'default' => null,
 				'since' => '8.0',
+				'profile_reference' => 'type_colon_object',
 			),
 			'singlelist' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_rss.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_rss.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_rss.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -24,6 +24,7 @@
 				'filter' => 'int',
 				'description' => tra('List of feed IDs separated by colons. ex: feedId:feedId2'),
 				'default' => '',
+				'profile_reference' => 'rss',
 			),
 			'max' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_sf.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_sf.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_sf.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -30,6 +30,7 @@
 				'description' => tra('SourceForge tracker ID (shows as atid in the URL of a tracker item'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'itemid' => array(
 				'required' => true,
@@ -37,6 +38,7 @@
 				'description' => tra('SourceForge item ID (shows as aid in the URL of a tracker item'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 			'title' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_sheet.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_sheet.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_sheet.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -23,7 +23,8 @@
 				'filter' => 'digits',
 				'accepted' => 'Sheet ID number',
 				'default' => '',
-				'since' => ''
+				'since' => '',
+				'profile_reference' => 'sheet',
 			),
 			'url' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_stat.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_stat.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_stat.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -43,6 +43,7 @@
 				'required' => false,
 				'name' => tra('Parent ID'),
 				'description' => tra('Enter a tracker ID to restrict stats to that tracker (for use with trackeritems only).'),
+				'profile_reference' => 'tracker',
 			),
 			'lastday' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -22,6 +22,7 @@
 				'description' => tra('Identification number (nlId) of the Newsletter that you want to allow the users to subscribe to'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'newsletter',
 			),
 			'thanks' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_survey.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_survey.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_survey.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,12 +21,14 @@
 				'description' => tra('Id'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'survey',
 			),
 			'page' => array(
 				'required' => false,
 				'name' => tra('Page'),
 				'description' => tra('Wiki Page to redirect the user after his vote'),
 				'default' => 'tiki-list_surveys.php',
+				'profile_reference' => 'wiki_page',
 			),
 			'lang' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_titlesearch.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_titlesearch.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_titlesearch.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -38,6 +38,8 @@
 				'name' => tra('Exclude'),
 				'description' => tra('Pipe-separated list of page names to exclude from results.'),
 				'default' => '',
+				'separator' => '|',
+				'profile_reference' => 'wiki_page',
 			),
 			'noheader' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_toc.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_toc.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_toc.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -28,6 +28,7 @@
 				'required' => false,
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'structure',
 			),
 			'order' => array(
 				'name' => tra('Order'),
@@ -81,6 +82,7 @@
 				'description' => tra('By default, the table of contents for the current page will be displayed. Alternate page may be provided.'),
 				'required' => false,
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_tracker.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_tracker.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -22,12 +22,15 @@
 				'description' => tra('Numeric value representing the tracker ID'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'fields' => array(
 				'required' => false,
 				'name' => tra('Fields'),
 				'description' => tra('Colon-separated list of field IDs to be displayed. Example: 2:4:5  If empty, all fields will be shown'),
 				'default' => '',
+				'separator' => ':',
+				'profile_reference' => 'tracker_field',
 			),
 			'action' => array(
 				'required' => false,
@@ -66,7 +69,7 @@
 				'description' => tra('Indicate mandatory fields with an asterisk (shown by default).'),
 				'filter' => 'alpha',
 				'default' => 'y',
-						'options' => array(
+				'options' => array(
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Yes'), 'value' => 'y'),
 					array('text' => tra('No'), 'value' => 'n')
@@ -90,7 +93,7 @@
 				'description' => tra('Embedded'),
 				'filter' => 'alpha',
 				'default' => 'n',
-			'options' => array(
+				'options' => array(
 					array('text' => '', 'value' => ''),
 					array('text' => tra('Yes'), 'value' => 'y'),
 					array('text' => tra('No'), 'value' => 'n')
@@ -195,6 +198,7 @@
 				'description' => tra('ItemId allowing for editing an item'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 			'ignoreRequestItemId' => array(
 				'required' => false,
@@ -220,6 +224,7 @@
 				'description' => tra('Name of the wiki page containing the template to display the tracker items.'),
 				'filter' => 'pagename',
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'newstatus' => array(
 				'required' => false,
@@ -248,6 +253,7 @@
 				'filter' => 'digits',
 				'separator' => ':',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'autosavevalues' => array(
 				'required' => false,
@@ -264,6 +270,7 @@
 				'filter' => 'digits',
 				'separator' => ':',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'registration' => array(
 				'required' => false,
@@ -283,6 +290,7 @@
 				'description' => tra('Output result to a new wiki page with the name taken from the input for the specified fieldId'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'discarditem' => array(
 				'required' => false,
@@ -302,12 +310,15 @@
 				'description' => tra('Name of the wiki page containing the template to format the output to wiki page'),
 				'filter' => 'pagename',
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'fieldsfill' => array(
 				'required' => false,
 				'name' => tra('Multiple Fill Fields'),
 				'description' => tra('Colon-separated list of field IDs to be filled with multiple values, to create multiple items in one save. Example: 2:4:5  If empty, only one item will be created. Only for item creation'),
 				'default' => '',
+				'separator' => ':',
+				'profile_reference' => 'tracker_field',
 			),
 			'fieldsfillseparator' => array(
 				'required' => false,
@@ -544,7 +555,7 @@
 				} elseif (!empty($tpl)) {
 					$outf = $trklib->get_pretty_fieldIds($tpl, 'tpl', $outputPretty);
 				} elseif (!empty($fields)) {
-					$outf = preg_split('/ *: */', $fields);
+					$outf = $fields;
 				}
 				if (!empty($_REQUEST['autosavefields'])) {
 					$autosavefields = explode(':', $_REQUEST['autosavefields']);
@@ -610,7 +621,7 @@
 
 			// If we create multiple items, get field Ids, default values and separator
 			if (!empty($fieldsfill)) {
-				$fill_fields = preg_split('/ *: */', $fieldsfill);	// Allow for superfluous spaces and ignore them
+				$fill_fields = $fieldsfill;	// Allow for superfluous spaces and ignore them
 				$fill_flds = array('data' => array());
 				$fill_defaults = array();
 				$fill_flds_defaults = array();	// May be different from fill_defaults if some fields are not editable

Modified: trunk/lib/wiki-plugins/wikiplugin_trackercalendar.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackercalendar.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackercalendar.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -19,6 +19,7 @@
 				'required' => false,
 				'default' => 0,
 				'filter' => 'int',
+				'profile_reference' => 'tracker',
 			),
 			'begin' => array(
 				'name' => tr('Begin date field'),

Modified: trunk/lib/wiki-plugins/wikiplugin_trackercomments.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackercomments.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackercomments.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -20,6 +20,7 @@
 				'description' => tra('Numeric value representing the tracker ID'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'shownbitems' => array(
 				'required' => false,
@@ -27,7 +28,7 @@
 				'description' => tra('Determines whether the number of items will be shown (not shown by default)'),
 				'filter' => 'alpha',
 				'default' => '',
-			'options' => array(
+				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 'y'), 
 					array('text' => tra('No'), 'value' => 'n')

Modified: trunk/lib/wiki-plugins/wikiplugin_trackerfilter.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackerfilter.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackerfilter.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -9,13 +9,13 @@
 {
 	require_once 'lib/wiki-plugins/wikiplugin_trackerlist.php';
 	$list = wikiplugin_trackerlist_info();
-	$params = array_merge(
-		array(
-			'filters' => array(
+	$params = array_merge(array(
+		'filters' => array(
 			'required' => true,
 			'name' => tra('Filters'),
 			'description' => tra('The list of fields that can be used as filters along with their formats. The field number and format are separated by a / and multile fields are separated by ":". Format choices are: d - dropdown; r - radio buttons; m - multiple choice dropdown; c - checkbox; t - text with wild characters; T - exact text match; i - initials; sqlsearch - advanced search; >, <, >=, <= - greater than, less than, greater than or equal, less than or equal. Example:') . '2/d:4/r:5:(6:7)/sqlsearch',
-			'default' => ''
+			'default' => '',
+			'profile_reference' => 'tracker_field_string',
 		),
 		'action' => array(
 			'required' => false,
@@ -35,52 +35,51 @@
 				array('text' => tra('No'), 'value' => 'n')
 			)
 		),
-					'line' => array(
-						'required' => false,
-						'name' => tra('Line'),
-						'description' => tra('Displays all the filters on the same line (not shown on same line by default)'),
-						'filter' => 'alpha',
-						'default' => 'n',
-						'options' => array(
-							array('text' => '', 'value' => ''),
-							array('text' => tra('Yes'), 'value' => 'y'),
-							array('text' => tra('Yes with field label in dropdown'), 'value' => 'in'),
-							array('text' => tra('No'), 'value' => 'n')
-						)
-					),
-					'noflipflop' => array(
-						'required' => false,
-						'name' => tra('No Toggle'),
-						'description' => tra('The toggle button to show/hide filters will not be shown if set to y (Yes). Default is to show the toggle.'),
-						'filter' => 'alpha',
-						'default' => 'n',
-						'options' => array(
-							array('text' => '', 'value' => ''),
-							array('text' => tra('Yes'), 'value' => 'y'),
-							array('text' => tra('No'), 'value' => 'n')
-						)
-					),
-					'export_action' => array(
-						'required' => false,
-						'name' => tra('Export CSV.'),
-						'description' => tra('Label for an export button. Leave blank to show the usual "Filter" button instead.'),
-						'default' => '',
-						'advanced' => true,
-					),
-					'googlemapButtons' => array(
-						'required' => false,
-						'name' => tra('Google Map Buttons'),
-						'description' => tra('Display Mapview and Listview buttons'),
-						'filter' => 'alpha',
-						'default' => '',
-						'options' => array(
-							array('text' => '', 'value' => ''),
-							array('text' => tra('Yes'), 'value' => 'y'),
-							array('text' => tra('No'), 'value' => 'n')
-						)
-					)
-				), $list['params']
-	);
+		'line' => array(
+			'required' => false,
+			'name' => tra('Line'),
+			'description' => tra('Displays all the filters on the same line (not shown on same line by default)'),
+			'filter' => 'alpha',
+			'default' => 'n',
+			'options' => array(
+				array('text' => '', 'value' => ''),
+				array('text' => tra('Yes'), 'value' => 'y'),
+				array('text' => tra('Yes with field label in dropdown'), 'value' => 'in'),
+				array('text' => tra('No'), 'value' => 'n')
+			)
+		),
+		'noflipflop' => array(
+			'required' => false,
+			'name' => tra('No Toggle'),
+			'description' => tra('The toggle button to show/hide filters will not be shown if set to y (Yes). Default is to show the toggle.'),
+			'filter' => 'alpha',
+			'default' => 'n',
+			'options' => array(
+				array('text' => '', 'value' => ''),
+				array('text' => tra('Yes'), 'value' => 'y'),
+				array('text' => tra('No'), 'value' => 'n')
+			)
+		),
+		'export_action' => array(
+			'required' => false,
+			'name' => tra('Export CSV.'),
+			'description' => tra('Label for an export button. Leave blank to show the usual "Filter" button instead.'),
+			'default' => '',
+			'advanced' => true,
+		),
+		'googlemapButtons' => array(
+			'required' => false,
+			'name' => tra('Google Map Buttons'),
+			'description' => tra('Display Mapview and Listview buttons'),
+			'filter' => 'alpha',
+			'default' => '',
+			'options' => array(
+				array('text' => '', 'value' => ''),
+				array('text' => tra('Yes'), 'value' => 'y'),
+				array('text' => tra('No'), 'value' => 'n')
+			)
+		),
+	), $list['params']);
 
 	return array(
 		'name' => tra('Tracker Filter'),

Modified: trunk/lib/wiki-plugins/wikiplugin_trackeritemcopy.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackeritemcopy.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackeritemcopy.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -23,6 +23,7 @@
 				'filter' => 'text',
 				'default' => '',
 				'separator' => array(':'),
+				'profile_reference' => 'tracker',
 			),
 			'linkFieldIds' => array(
 				'required' => true,
@@ -31,6 +32,7 @@
 				'filter' => 'text',
 				'default' => '',
 				'separator' => array(':'),
+				'profile_reference' => 'tracker_field',
 			),
 			'copyFieldIds' => array(
 				'required' => true,
@@ -39,6 +41,7 @@
 				'filter' => 'text',
 				'default' => '',
 				'separator' => array('|', ':'),
+				'profile_reference' => 'tracker_field',
 			),
 			'updateFieldIds' => array(
 				'required' => false,
@@ -47,6 +50,7 @@
 				'filter' => 'text',
 				'default' => '',
 				'separator' => array('|', ':'),
+				'profile_reference' => 'tracker_field',
 			),
 			'updateFieldValues' => array(
 				'required' => false,
@@ -55,6 +59,7 @@
 				'filter' => 'text',
 				'default' => '',
 				'separator' => array('|', ':'),
+				'profile_reference' => 'tracker_field',
 			),
 			'itemId' => array(
 				'required' => false,
@@ -62,6 +67,7 @@
 				'description' => tra('ID of item to make copy of, otherwise input is asked for'),
 				'filter' => 'text',
 				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 			'copies_on_load' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_trackeritemfield.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackeritemfield.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackeritemfield.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,14 +21,16 @@
 				'name' => tra('Tracker ID'),
 				'description' => tra('Numeric value representing the tracker ID.'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'itemId' => array(
 				'required' => false,
 				'name' => tra('Item ID'),
 				'description' => tra('Numeric value representing the item ID. Default is the user tracker item for the current user.'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 			'fieldId' => array(
 				'required' => false,
@@ -36,6 +38,7 @@
 				'description' => tra('Numeric value representing the field ID displayed or tested'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'fields' => array(
 				'required' => false,
@@ -43,6 +46,8 @@
 				'description' => tra('Colon separated list of field IDs. Default is all fields'),
 				'default' => '',
 				'filter' => 'text',
+				'separator' => ':',
+				'profile_reference' => 'tracker_field',
 			),
 			'status' => array(
 				'required' => false,
@@ -58,7 +63,7 @@
 					array('text' => tra('Open & Pending'), 'value' => 'op'), 
 					array('text' => tra('Open & Closed'), 'value' => 'oc'), 
 					array('text' => tra('Pending & Closed'), 'value' => 'pc'), 
-					array('text' => tra('Open, Pending & Closed'), 'value' => 'opc')
+					array('text' => tra('Open, Pending & Closed'), 'value' => 'opc'),
 				)
 			),
 			'test' => array(
@@ -70,8 +75,8 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 1), 
-					array('text' => tra('No'), 'value' => 0)
-				)
+					array('text' => tra('No'), 'value' => 0),
+				),
 			),
 			'value' => array(
 				'required' => true,
@@ -181,7 +186,6 @@
 		$all_fields = $trklib->list_tracker_fields($trackerId, 0, -1);
 		$all_fields = $all_fields['data'];
 		if (!empty($fields)) {
-			$fields = explode(':', $fields);
 			foreach ($all_fields as $i=>$fopt) {
 				if (!in_array($fopt['fieldId'], $fields)) {
 					unset($all_fields[$i]);

Modified: trunk/lib/wiki-plugins/wikiplugin_trackerlist.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackerlist.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackerlist.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -265,6 +265,7 @@
 				'filter' => 'digits',
 				'separator' => ':',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'filtervalue' => array(
 				'required' => false,
@@ -350,6 +351,7 @@
 				'filter' => 'pagename',
 				'advanced' => true,
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'tplwiki' => array(
 				'required' => false,
@@ -358,6 +360,7 @@
 				'filter' => 'pagename',
 				'advanced' => true,
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'view_user' => array(
 				'required' => false,
@@ -372,6 +375,7 @@
 				'filter' => 'digits',
 				'separator' => ':',
 				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 			'ignoreRequestItemId' => array(
 				'required' => false,
@@ -443,6 +447,7 @@
 				'filter' => 'text',
 				'advanced' => true,
 				'default' => '',
+				'profile_reference' => 'tracker_field_string',
 			),
 			'silent' => array(
 				'required' => false,
@@ -562,6 +567,7 @@
 				'separator' => ':',
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'calendarviewmode' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_trackerpasscode.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackerpasscode.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackerpasscode.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -34,6 +34,7 @@
 				'description' => tra('Tracker from which to get passcode to check against'),
 				'filter' => 'text',
 				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'fieldId' => array(
 				'required' => true,
@@ -41,6 +42,7 @@
 				'description' => tra('Field ID from which to get passcode to check against'),
 				'filter' => 'text',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'itemId' => array(
 				'required' => true,
@@ -48,6 +50,7 @@
 				'description' => tra('Item ID from which to get passcode to check against'),
 				'filter' => 'text',
 				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_trackerprefill.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackerprefill.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackerprefill.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -19,6 +19,7 @@
 				'name' => tra('Page'),
 				'description' => tra('Tracker Page Name'),
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 			'label' => array(
 				'required' => false,
@@ -38,6 +39,7 @@
 				'description' => tra('Field ID for the first field'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'value1' => array(
 				'required' => true,
@@ -51,6 +53,7 @@
 				'description' => tra('Field ID for the second field'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'value2' => array(
 				'required' => false,
@@ -64,6 +67,7 @@
 				'description' => tra('Field ID for the third field'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'value3' => array(
 				'required' => false,
@@ -77,6 +81,7 @@
 				'description' => tra('Field ID for the fourth field'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'value4' => array(
 				'required' => false,
@@ -90,6 +95,7 @@
 				'description' => tra('Field ID for the fifth field'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'value5' => array(
 				'required' => false,
@@ -103,6 +109,7 @@
 				'description' => tra('Field ID for the sixth field'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'value6' => array(
 				'required' => false,
@@ -116,6 +123,7 @@
 				'description' => tra('Field ID for the seventh field'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'value7' => array(
 				'required' => false,
@@ -129,6 +137,7 @@
 				'description' => tra('Field ID for the eighth field'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'value8' => array(
 				'required' => false,

Modified: trunk/lib/wiki-plugins/wikiplugin_trackerquerytemplate.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackerquerytemplate.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackerquerytemplate.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,7 +21,8 @@
 				'required' => true,
 				'name' => tra('Tracker'),
 				'description' => tra('Name of the tracker you want to query.'),
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'debug' => array(
 				'required' => false,
@@ -61,12 +62,15 @@
 				'name' => tra('Tracker Item Id'),
 				'description' => tra('Item id of tracker item'),
 				'default' => '',
+				'profile_reference' => 'tracker_item',
 			),
 			'itemids' => array(
 				'required' => false,
 				'name' => tra('Tracker Item Ids'),
 				'description' => tra('Item id of tracker items, separated with comma'),
 				'default' => '',
+				'separator' => ',',
+				'profile_reference' => 'tracker_item',
 			),
 			'likefilters' => array(
 				'required' => false,
@@ -114,7 +118,7 @@
 	);
 
 	if (!empty($params['itemids'])) {
-		$itemIds = explode(',', $params['itemids']);
+		$itemIds = $params['itemids'];
 		unset($params['itemids']);
 		$newData = '';
 		foreach($itemIds as $itemId) {

Modified: trunk/lib/wiki-plugins/wikiplugin_trackerstat.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackerstat.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackerstat.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,12 +21,15 @@
 				'description' => tra('Numeric value representing the tracker ID'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'fields' => array(
 				'required' => true,
 				'name' => tra('Fields'),
 				'description' => tra('Colon-separated list of field IDs to be displayed. Example: 2:4:5'),
-				'default' => ''
+				'default' => '',
+				'separator' => ':',
+				'profile_reference' => 'tracker_field',
 			),
             'show_count' => array(
                 'required' => false,
@@ -37,8 +40,8 @@
                 'options' => array(
                     array('text' => '', 'value' => ''),
                     array('text' => tra('Yes'), 'value' => 'y'),
-                    array('text' => tra('No'), 'value' => 'n')
-                )
+                    array('text' => tra('No'), 'value' => 'n'),
+                ),
             ),
 			'show_percent' => array(
 				'required' => false,
@@ -49,8 +52,8 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 'y'), 
-					array('text' => tra('No'), 'value' => 'n')
-				)
+					array('text' => tra('No'), 'value' => 'n'),
+				),
 			),
 			'show_bar' => array(
 				'required' => false,
@@ -61,8 +64,8 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 'y'), 
-					array('text' => tra('No'), 'value' => 'n')
-				)
+					array('text' => tra('No'), 'value' => 'n'),
+				),
 			),
 			'status' => array(
 				'required' => false,
@@ -78,8 +81,8 @@
 					array('text' => tra('Open & Pending'), 'value' => 'op'), 
 					array('text' => tra('Open & Closed'), 'value' => 'oc'), 
 					array('text' => tra('Pending & Closed'), 'value' => 'pc'), 
-					array('text' => tra('Open, Pending & Closed'), 'value' => 'opc')
-				)
+					array('text' => tra('Open, Pending & Closed'), 'value' => 'opc'),
+				),
 			),
 			'show_link' => array(
 				'required' => false,
@@ -90,8 +93,8 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 'y'), 
-					array('text' => tra('No'), 'value' => 'n')
-				)
+					array('text' => tra('No'), 'value' => 'n'),
+				),
 			),
 			'show_lastmodif' => array(
 				'required' => false,
@@ -99,7 +102,7 @@
 				'description' => tra('Show last modification date of a tracker. Set to y to use site setting or use PHP\s format (www.php.net/strftime).'),
 				'filter' => 'text',
 				'default' => '',
-				'accepted' => tra('y to use the site setting for short date format. Otherwise, use PHP format (www.php.net/strftime), Example: "%A %d of %B, %Y"')
+				'accepted' => tra('y to use the site setting for short date format. Otherwise, use PHP format (www.php.net/strftime), Example: "%A %d of %B, %Y"'),
 			)
 		)
 	);
@@ -172,7 +175,7 @@
 		}
 	}
 	if (!empty($fields)) {
-		$listFields = explode(':', $fields);
+		$listFields = $fields;
 	} else {
 		foreach ($allFields['data'] as $f) {
 			$listFields[] = $f['fieldId'];

Modified: trunk/lib/wiki-plugins/wikiplugin_trackertimeline.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackertimeline.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackertimeline.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,6 +21,7 @@
 				'description' => tra('Numeric value representing the tracker ID'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'title' => array(
 				'required' => true,
@@ -41,14 +42,16 @@
 				'name' => tra('Start Date'),
 				'description' => tra('Tracker Field ID containing the element start date. The field must be a datetime/jscalendar field.'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'end' => array(
 				'required' => true,
 				'name' => tra('End Date'),
 				'description' => tra('Tracker Field ID containing the element end date. The field must be a datetime/jscalendar field.'),
 				'filter' => 'digits',
-				'default' => ''
+				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'group' => array(
 				'required' => true,
@@ -56,6 +59,7 @@
 				'description' => tra('Tracker Field ID containing the element\'s group. Elements of a same group are displayed on the same row.'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'lower' => array(
 				'required' => true,
@@ -139,6 +143,7 @@
 				'description' => tra('Tracker Field ID containing the page name for item details.'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 			'simile_timeline' => array(
 				'required' => false,
@@ -157,6 +162,7 @@
 				'description' => tra('Tracker Field ID containing in image.'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker_field',
 			),
 		)
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_trackertoggle.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -18,6 +18,7 @@
 				'name' => tra('Field ID'),
 				'description' => tra('Numeric value representing the field ID tested.'),
 				'filter' => 'digits',
+				'profile_reference' => 'tracker_field',
 			),
 			'value' => array(
 				'required' => true,
@@ -44,6 +45,7 @@
 				'description' => tra('Use the field of specific item. The URL param itemId is used if this parameter is not set.'),
 				'filter' => 'digits',
 				'default' => 0,
+				'profile_reference' => 'tracker_item',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_transclude.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_transclude.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_transclude.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,6 +21,7 @@
 				'name' => tra('Page Name'),
 				'description' => tra('Name of the wiki page to use as a template for the values.'),
 				'default' => '',
+				'profile_reference' => 'wiki_page',
 			),
 		),
 	);

Modified: trunk/lib/wiki-plugins/wikiplugin_vote.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_vote.php	2013-05-20 16:17:19 UTC (rev 46006)
+++ trunk/lib/wiki-plugins/wikiplugin_vote.php	2013-05-20 18:34:12 UTC (rev 46007)
@@ -21,12 +21,15 @@
 				'description' => tra('Numeric value representing the tracker ID'),
 				'filter' => 'digits',
 				'default' => '',
+				'profile_reference' => 'tracker',
 			),
 			'fields' => array(
 				'required' => true,
 				'name' => tra('Fields'),
 				'description' => tra('Colon-separated list of field IDs to be displayed. Example: 2:4:5'),
 				'default' => '',
+				'separator' => ':',
+				'profile_reference' => 'tracker_field',
 			),
 			'show_percent' => array(
 				'required' => false,
@@ -37,8 +40,8 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 'y'), 
-					array('text' => tra('No'), 'value' => 'n')
-				)
+					array('text' => tra('No'), 'value' => 'n'),
+				),
 			),
 			'show_bar' => array(
 				'required' => false,
@@ -49,8 +52,8 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 'y'), 
-					array('text' => tra('No'), 'value' => 'n')
-				)
+					array('text' => tra('No'), 'value' => 'n'),
+				),
 			),
 			'show_stat' => array(
 				'required' => false,
@@ -61,8 +64,8 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 'y'), 
-					array('text' => tra('No'), 'value' => 'n')
-				)
+					array('text' => tra('No'), 'value' => 'n'),
+				),
 			),
 			'show_stat_only_after' => array(
 				'required' => false,
@@ -73,8 +76,8 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 'y'), 
-					array('text' => tra('No'), 'value' => 'n')
-				)
+					array('text' => tra('No'), 'value' => 'n'),
+				),
 			),
 			'show_creator' => array(
 				'required' => false,
@@ -85,8 +88,8 @@
 				'options' => array(
 					array('text' => '', 'value' => ''), 
 					array('text' => tra('Yes'), 'value' => 'y'), 
-					array('text' => tra('No'), 'value' => 'n')
-				)
+					array('text' => tra('No'), 'value' => 'n'),
+				),
 			),
 			'status' => array(
 				'required' => false,
@@ -102,8 +105,8 @@
 					array('text' => tra('Open & Pending'), 'value' => 'op'), 
 					array('text' => tra('Open & Closed'), 'value' => 'oc'), 
 					array('text' => tra('Pending & Closed'), 'value' => 'pc'), 
-					array('text' => tra('Open, Pending & Closed'), 'value' => 'opc')
-				)
+					array('text' => tra('Open, Pending & Closed'), 'value' => 'opc'),
+				),
 			),
 			'float' => array(
 				'required' => false,
@@ -116,7 +119,7 @@
 					array('text' => tra('Left'), 'value' => 'left'), 
 					array('text' => tra('Right'), 'value' => 'right'),
 					array('text' => tra('None'), 'value' => 'none'),
-				)
+				),
 			),
 			'show_toggle' => array(

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 46031
          http://sourceforge.net/p/tikiwiki/code/46031
Author:   lphuberdeau
Date:     2013-05-24 14:52:48 +0000 (Fri, 24 May 2013)
Log Message:
-----------
[MOD] Allow plugins to specify how to export the body portion - handling of the filter plugins for list, listexecute and customsearch

Modified Paths:
--------------
    trunk/lib/core/Search/ContentSource/ArticleSource.php
    trunk/lib/core/Search/ContentSource/BlogPostSource.php
    trunk/lib/core/Search/ContentSource/FileSource.php
    trunk/lib/core/Search/ContentSource/ForumPostSource.php
    trunk/lib/core/Search/ContentSource/TrackerItemSource.php
    trunk/lib/core/Search/GlobalSource/CategorySource.php
    trunk/lib/core/Tiki/Profile/WriterHelper.php
    trunk/lib/core/WikiParser/PluginMatcher.php
    trunk/lib/search/searchlib-unified.php
    trunk/lib/wiki-plugins/wikiplugin_customsearch.php
    trunk/lib/wiki-plugins/wikiplugin_list.php
    trunk/lib/wiki-plugins/wikiplugin_listexecute.php

Added Paths:
-----------
    trunk/lib/core/Tiki/Profile/Writer/
    trunk/lib/core/Tiki/Profile/Writer/ReferenceProvider.php
    trunk/lib/core/Tiki/Profile/Writer/SearchFieldHelper.php

Modified: trunk/lib/core/Search/ContentSource/ArticleSource.php
===================================================================
--- trunk/lib/core/Search/ContentSource/ArticleSource.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/core/Search/ContentSource/ArticleSource.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -5,7 +5,7 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
-class Search_ContentSource_ArticleSource implements Search_ContentSource_Interface
+class Search_ContentSource_ArticleSource implements Search_ContentSource_Interface, Tiki_Profile_Writer_ReferenceProvider
 {
 	private $db;
 
@@ -14,6 +14,14 @@
 		$this->db = TikiDb::get();
 	}
 
+	function getReferenceMap()
+	{
+		return array(
+			'topic_id' => 'article_topic',
+			'article_type' => 'article_type',
+		);
+	}
+
 	function getDocuments()
 	{
 		return $this->db->table('tiki_articles')->fetchColumn('articleId', array());

Modified: trunk/lib/core/Search/ContentSource/BlogPostSource.php
===================================================================
--- trunk/lib/core/Search/ContentSource/BlogPostSource.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/core/Search/ContentSource/BlogPostSource.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -5,7 +5,7 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
-class Search_ContentSource_BlogPostSource implements Search_ContentSource_Interface
+class Search_ContentSource_BlogPostSource implements Search_ContentSource_Interface, Tiki_Profile_Writer_ReferenceProvider
 {
 	private $db;
 
@@ -14,6 +14,13 @@
 		$this->db = TikiDb::get();
 	}
 
+	function getReferenceMap()
+	{
+		return array(
+			'blog_id' => 'blog',
+		);
+	}
+
 	function getDocuments()
 	{
 		return $this->db->table('tiki_blog_posts')->fetchColumn('postId', array());

Modified: trunk/lib/core/Search/ContentSource/FileSource.php
===================================================================
--- trunk/lib/core/Search/ContentSource/FileSource.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/core/Search/ContentSource/FileSource.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -5,7 +5,7 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
-class Search_ContentSource_FileSource implements Search_ContentSource_Interface
+class Search_ContentSource_FileSource implements Search_ContentSource_Interface, Tiki_Profile_Writer_ReferenceProvider
 {
 	private $db;
 
@@ -14,6 +14,13 @@
 		$this->db = TikiDb::get();
 	}
 
+	function getReferenceMap()
+	{
+		return array(
+			'gallery_id' => 'file_gallery',
+		);
+	}
+
 	function getDocuments()
 	{
 		$files = $this->db->table('tiki_files');

Modified: trunk/lib/core/Search/ContentSource/ForumPostSource.php
===================================================================
--- trunk/lib/core/Search/ContentSource/ForumPostSource.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/core/Search/ContentSource/ForumPostSource.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -5,7 +5,7 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
-class Search_ContentSource_ForumPostSource implements Search_ContentSource_Interface
+class Search_ContentSource_ForumPostSource implements Search_ContentSource_Interface, Tiki_Profile_Writer_ReferenceProvider
 {
 	private $db;
 
@@ -14,6 +14,13 @@
 		$this->db = TikiDb::get();
 	}
 
+	function getReferenceMap()
+	{
+		return array(
+			'forum_id' => 'forum',
+		);
+	}
+
 	function getDocuments()
 	{
 		global $prefs;
@@ -57,6 +64,7 @@
 			'modification_date' => $typeFactory->timestamp($lastModification),
 			'contributors' => $typeFactory->multivalue(array_unique($author)),
 
+			'forum_id' => $comment['object'],
 			'post_content' => $typeFactory->wikitext($content),
 			'parent_thread_id' => $typeFactory->identifier($comment['parentId']),
 
@@ -77,6 +85,7 @@
 			'contributors',
 
 			'post_content',
+			'forum_id',
 			'parent_thread_id',
 
 			'parent_view_permission',

Modified: trunk/lib/core/Search/ContentSource/TrackerItemSource.php
===================================================================
--- trunk/lib/core/Search/ContentSource/TrackerItemSource.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/core/Search/ContentSource/TrackerItemSource.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -5,7 +5,7 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
-class Search_ContentSource_TrackerItemSource implements Search_ContentSource_Interface
+class Search_ContentSource_TrackerItemSource implements Search_ContentSource_Interface, Tiki_Profile_Writer_ReferenceProvider
 {
 	private $db;
 	private $trklib;
@@ -16,6 +16,13 @@
 		$this->trklib = TikiLib::lib('trk');
 	}
 
+	function getReferenceMap()
+	{
+		return array(
+			'tracker_id' => 'tracker',
+		);
+	}
+
 	function getDocuments()
 	{
 		return $this->db->table('tiki_tracker_items')->fetchColumn('itemId', array());

Modified: trunk/lib/core/Search/GlobalSource/CategorySource.php
===================================================================
--- trunk/lib/core/Search/GlobalSource/CategorySource.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/core/Search/GlobalSource/CategorySource.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -5,7 +5,7 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
-class Search_GlobalSource_CategorySource implements Search_GlobalSource_Interface
+class Search_GlobalSource_CategorySource implements Search_GlobalSource_Interface, Tiki_Profile_Writer_ReferenceProvider
 {
 	private $categlib;
 	private $parentCategories = array();
@@ -15,6 +15,14 @@
 		$this->categlib = TikiLib::lib('categ');
 	}
 
+	function getReferenceMap()
+	{
+		return array(
+			'categories' => 'category',
+			'deep_categories' => 'category',
+		);
+	}
+
 	function getProvidedFields()
 	{
 		return array('categories', 'deep_categories');

Added: trunk/lib/core/Tiki/Profile/Writer/ReferenceProvider.php
===================================================================
--- trunk/lib/core/Tiki/Profile/Writer/ReferenceProvider.php	                        (rev 0)
+++ trunk/lib/core/Tiki/Profile/Writer/ReferenceProvider.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -0,0 +1,12 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+// 
+// 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.
+// $Id$
+
+interface Tiki_Profile_Writer_ReferenceProvider
+{
+	function getReferenceMap();
+}
+


Property changes on: trunk/lib/core/Tiki/Profile/Writer/ReferenceProvider.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: trunk/lib/core/Tiki/Profile/Writer/SearchFieldHelper.php
===================================================================
--- trunk/lib/core/Tiki/Profile/Writer/SearchFieldHelper.php	                        (rev 0)
+++ trunk/lib/core/Tiki/Profile/Writer/SearchFieldHelper.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -0,0 +1,56 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Tiki_Profile_Writer_SearchFieldHelper
+{
+	private $mapping = array();
+
+	function addGlobalSource(Search_GlobalSource_Interface $source)
+	{
+		if ($source instanceof Tiki_Profile_Writer_ReferenceProvider) {
+			$this->mapping = array_merge($this->mapping, $source->getReferenceMap());
+		}
+	}
+
+	function addContentSource($objectType, Search_ContentSource_Interface $source)
+	{
+		$this->addGlobalSource($source);
+	}
+
+	function getTypeForField($field)
+	{
+		if (isset($this->mapping[$field])) {
+			return $this->mapping[$field];
+		}
+	}
+
+	function replaceFilterReferences(Tiki_Profile_Writer $writer, $args)
+	{
+		if (isset($args['categories'])) {
+			$args['categories'] = Tiki_Profile_WriterHelper::uniform_string('category', $writer, $args['categories']);
+		}
+
+		if (isset($args['deepcategories'])) {
+			$args['deepcategories'] = Tiki_Profile_WriterHelper::uniform_string('category', $writer, $args['deepcategories']);
+		}
+
+		if (isset($args['content'], $args['field'])) {
+			// Expect all fields to be compatible, use the first one
+			$field = reset(explode(',', $args['field']));
+			if ($type = $this->getTypeForField($field)) {
+				$args['content'] = Tiki_Profile_WriterHelper::uniform_string($type, $writer, $args['content']);
+			}
+		}
+
+		if (isset($args['relation'], $args['objecttype'])) {
+			$args['relation'] = Tiki_Profile_WriterHelper::uniform_string($args['objecttype'], $writer, $args['relation']);
+		}
+
+		return $args;
+	}
+}
+


Property changes on: trunk/lib/core/Tiki/Profile/Writer/SearchFieldHelper.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/core/Tiki/Profile/WriterHelper.php
===================================================================
--- trunk/lib/core/Tiki/Profile/WriterHelper.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/core/Tiki/Profile/WriterHelper.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -63,6 +63,10 @@
 					}
 				}
 
+				if (isset($info['profile_reference'])) {
+					$body = $writer->getReference($info['profile_reference'], $body);
+				}
+
 				$match->replaceWithPlugin($pluginName, $params, $body);
 				$justReplaced = true;
 			}
@@ -73,9 +77,42 @@
 
 	public static function tracker_field_string(Tiki_Profile_Writer $writer, $value)
 	{
-		return preg_replace_callback('/(\d+)/', function ($args) use ($writer) {
-			return $writer->getReference('tracker_field', $args[1]);
+		return self::uniform_string('tracker_field', $writer, $value);
+	}
+
+	public function uniform_string($type, Tiki_Profile_Writer $writer, $value)
+	{
+		return preg_replace_callback('/(\d+)/', function ($args) use ($writer, $type) {
+			return $writer->getReference($type, $args[1]);
 		}, $value);
 	}
+
+	public static function search_plugin_content(Tiki_Profile_Writer $writer, $content)
+	{
+		$searchlib = TikiLib::lib('unifiedsearch');
+		$dataSource = $searchlib->getProfileExportHelper();
+
+		$argumentParser = new WikiParser_PluginArgumentParser;
+		$matches = WikiParser_PluginMatcher::match($content);
+		
+		$justReplace = false;
+		foreach ($matches as $match) {
+			if ($justReplaced) {
+				$justReplaced = false;
+				continue;
+			}
+
+			$name = $match->getName();
+			$args = $argumentParser->parse($match->getArguments());
+			
+			if ($name === 'filter') {
+				$args = $dataSource->replaceFilterReferences($writer, $args);
+				$match->replaceWithPlugin('filter', $args, $match->getBody());
+				$justReplaced = true;
+			}
+		}
+
+		return $matches->getText();
+	}
 }
 

Modified: trunk/lib/core/WikiParser/PluginMatcher.php
===================================================================
--- trunk/lib/core/WikiParser/PluginMatcher.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/core/WikiParser/PluginMatcher.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -457,7 +457,7 @@
 		$this->matcher->performReplace($this, $string);
 	}
 
-	function replaceWithPlugin($name, $params, $body)
+	function replaceWithPlugin($name, $params, $content)
 	{
 		$hasBody = !empty($content) && !ctype_space($content);
 

Modified: trunk/lib/search/searchlib-unified.php
===================================================================
--- trunk/lib/search/searchlib-unified.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/search/searchlib-unified.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -468,6 +468,14 @@
 		return $dataSource;
 	}
 
+	function getProfileExportHelper()
+	{
+		$helper = new Tiki_Profile_Writer_SearchFieldHelper;
+		$this->addSources($helper);
+
+		return $helper;
+	}
+
     /**
      * @return Search_Query_WeightCalculator_Field
      */

Modified: trunk/lib/wiki-plugins/wikiplugin_customsearch.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_customsearch.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/wiki-plugins/wikiplugin_customsearch.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -14,6 +14,7 @@
 		'prefs' => array('wikiplugin_customsearch', 'wikiplugin_list', 'feature_ajax'),
 		'body' => tra('LIST plugin configuration information'),
 		'filter' => 'wikicontent',
+		'profile_reference' => 'search_plugin_content',
 		'icon' => 'img/icons/text_list_bullets.png',
 		'tags' => array('advanced'),
 		'params' => array(

Modified: trunk/lib/wiki-plugins/wikiplugin_list.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_list.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/wiki-plugins/wikiplugin_list.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -14,6 +14,7 @@
 		'prefs' => array('wikiplugin_list'),
 		'body' => tra('List configuration information'),
 		'filter' => 'wikicontent',
+		'profile_reference' => 'search_plugin_content',
 		'icon' => 'img/icons/text_list_bullets.png',
 		'tags' => array( 'basic' ),
 		'params' => array(

Modified: trunk/lib/wiki-plugins/wikiplugin_listexecute.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_listexecute.php	2013-05-24 13:25:49 UTC (rev 46030)
+++ trunk/lib/wiki-plugins/wikiplugin_listexecute.php	2013-05-24 14:52:48 UTC (rev 46031)
@@ -15,6 +15,7 @@
 		'body' => tra('List configuration information'),
 		'validate' => 'all',
 		'filter' => 'wikicontent',
+		'profile_reference' => 'search_plugin_content',
 		'icon' => 'img/icons/text_list_bullets.png',
 		'tags' => array( 'advanced' ),
 		'params' => array(

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

Revision: 46045
          http://sourceforge.net/p/tikiwiki/code/46045
Author:   arildb
Date:     2013-05-26 23:16:40 +0000 (Sun, 26 May 2013)
Log Message:
-----------
[NEW] Added web service for ContentTemplates

Modified Paths:
--------------
    trunk/lib/servicelib.php

Added Paths:
-----------
    trunk/lib/core/Services/ContentTemplate/
    trunk/lib/core/Services/ContentTemplate/Controller.php
    trunk/lib/core/Services/ContentTemplate/index.php

Added: trunk/lib/core/Services/ContentTemplate/Controller.php
===================================================================
--- trunk/lib/core/Services/ContentTemplate/Controller.php	                        (rev 0)
+++ trunk/lib/core/Services/ContentTemplate/Controller.php	2013-05-26 23:16:40 UTC (rev 46045)
@@ -0,0 +1,61 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Services_ContentTemplate_Controller
+{
+	function setUp()
+	{
+		global $prefs;
+
+		if ($prefs['feature_wiki_templates'] != 'y') {
+			throw new Services_Exception_Disabled('feature_wiki_templates');
+		}
+	}
+	
+	function action_list($input)
+	{
+		// Validate access
+		$access = TikiLib::lib('access');
+		$access->check_permission('tiki_p_use_content_templates');
+		
+		// Load the templates
+		require_once ('lib/templates/templateslib.php');
+		$templatesLib = new TemplatesLib();
+		
+		$section = 'wiki';
+		$offset = 0;
+		$maxRecords = -1;	
+		$sort_mode = 'name_asc';
+		$find = null;
+		
+		$contentTmpl = $templatesLib->list_templates($section, $offset, $maxRecords, $sort_mode, $find);
+		
+		// Build the result		
+		$result = array();
+		$name = "";
+		$content = "";
+		foreach ($contentTmpl['data'] as $val) {
+			if (count($contentTmpl) > 0) {
+				$templateId = $val['templateId'];
+				$templateData = $templatesLib->get_template($templateId);
+			
+				$name = $templateData['name'];
+				if (isset($templateData['content'])) {
+					$content = $templateData['content'];
+				}
+			}
+			$result[] = array('title' => $name,  'html'=> $content);
+		}
+
+		// Done
+		return array(
+			'data' => $result,
+			'cant' => count($result),
+			);
+	}
+}
+

Added: trunk/lib/core/Services/ContentTemplate/index.php
===================================================================
--- trunk/lib/core/Services/ContentTemplate/index.php	                        (rev 0)
+++ trunk/lib/core/Services/ContentTemplate/index.php	2013-05-26 23:16:40 UTC (rev 46045)
@@ -0,0 +1,10 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+// 
+// 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.
+// $Id$
+
+// This redirects to the sites root to prevent directory browsing
+header("location: ../../../../index.php");
+die;

Modified: trunk/lib/servicelib.php
===================================================================
--- trunk/lib/servicelib.php	2013-05-26 19:30:35 UTC (rev 46044)
+++ trunk/lib/servicelib.php	2013-05-26 23:16:40 UTC (rev 46045)
@@ -64,6 +64,7 @@
 			'report' => 'Services_Report_Controller',
 			'tracker_calendar' => 'Services_Tracker_CalendarController',
 			'search_customsearch' => 'Services_Search_CustomSearchController',
+			'contenttemplate'=>  'Services_ContentTemplate_Controller',
 			'tracker' => 'Services_Tracker_Controller',
 			'tracker_sync' => 'Services_Tracker_SyncController',
 			'tracker_todo' => 'Services_Tracker_TodoController',

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

Revision: 46099
          http://sourceforge.net/p/tikiwiki/code/46099
Author:   lphuberdeau
Date:     2013-05-30 15:19:51 +0000 (Thu, 30 May 2013)
Log Message:
-----------
[ENH] Let preferences at the default value be exported as a profile might want to reset the value

Modified Paths:
--------------
    trunk/lib/core/Tiki/Command/ProfileExport/Preference.php
    trunk/lib/prefslib.php

Modified: trunk/lib/core/Tiki/Command/ProfileExport/Preference.php
===================================================================
--- trunk/lib/core/Tiki/Command/ProfileExport/Preference.php	2013-05-30 14:52:31 UTC (rev 46098)
+++ trunk/lib/core/Tiki/Command/ProfileExport/Preference.php	2013-05-30 15:19:51 UTC (rev 46099)
@@ -39,7 +39,7 @@
 		if ($result) {
 			$writer->save();
 		} else {
-			$output->writeln("Preference not found or at default value: $preference");
+			$output->writeln("Preference not found: $preference");
 		}
 	}
 }

Modified: trunk/lib/prefslib.php
===================================================================
--- trunk/lib/prefslib.php	2013-05-30 14:52:31 UTC (rev 46098)
+++ trunk/lib/prefslib.php	2013-05-30 15:19:51 UTC (rev 46099)
@@ -863,10 +863,6 @@
 		global $prefs;
 
 		if ($info = $this->getPreference($preferenceName)) {
-			if (! $info['modified']) {
-				return false;
-			}
-
 			if (isset($info['profile_reference'])) {
 				$writer->setPreference($preferenceName, $writer->getReference($info['profile_reference'], $info['value']));
 

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

Revision: 46137
          http://sourceforge.net/p/tikiwiki/code/46137
Author:   arildb
Date:     2013-06-02 17:15:15 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
[FIX] IFrame plugin could not be edited, due to double quotes.
PluginMatcher did not properly decode the arguments. This fix affects all plugins.
Previous patch fro module encoding is removed.

Modified Paths:
--------------
    trunk/lib/core/WikiParser/PluginMatcher.php
    trunk/lib/parser/parserlib.php

Modified: trunk/lib/core/WikiParser/PluginMatcher.php
===================================================================
--- trunk/lib/core/WikiParser/PluginMatcher.php	2013-06-02 12:12:36 UTC (rev 46136)
+++ trunk/lib/core/WikiParser/PluginMatcher.php	2013-06-02 17:15:15 UTC (rev 46137)
@@ -406,7 +406,10 @@
 			return false;
 		}
 
-		$arguments = trim($this->matcher->getChunkFrom($this->nameEnd, $pos - $this->nameEnd), '() ');
+		// $arguments =    trim($this->matcher->getChunkFrom($this->nameEnd, $pos - $this->nameEnd), '() ');
+		$rawarguments = trim($this->matcher->getChunkFrom($this->nameEnd, $pos - $this->nameEnd), '() ');
+		// arguments can be html encoded. So, decode first
+		$arguments = html_entity_decode($rawarguments);
 		$this->arguments = trim($arguments);
 
 		if ($this->matchType == self::LEGACY) {

Modified: trunk/lib/parser/parserlib.php
===================================================================
--- trunk/lib/parser/parserlib.php	2013-06-02 12:12:36 UTC (rev 46136)
+++ trunk/lib/parser/parserlib.php	2013-06-02 17:15:15 UTC (rev 46137)
@@ -1014,9 +1014,11 @@
 					$ck_editor_plugin .= $argKey.'="'.implode($sep, $argValue).'" ';	// process array
 					$arg_str .= $argKey.'='.implode($sep, $argValue).'&';
 				} else {
+					/* Should not be needed now that the plugin arguments are decoded
 					if ($name === 'module') {	// failsafe double-quote prevention for module plugin
 						$argValue =  preg_replace('/^"(.*)"$/', '$1', $argValue);
 					}
+					*/
 					$ck_editor_plugin .= $argKey.'="'.$argValue.'" ';
 					$arg_str .= $argKey.'='.$argValue.'&';
 				}

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

Revision: 46204
          http://sourceforge.net/p/tikiwiki/code/46204
Author:   lphuberdeau
Date:     2013-06-06 16:17:45 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
[FIX]?\194?\160Detect identifier fields when building the index and make sure stemming does not apply during query building

Modified Paths:
--------------
    trunk/lib/core/Search/Elastic/Index.php
    trunk/lib/core/Search/Elastic/TypeFactory.php
    trunk/lib/core/Search/Query.php
    trunk/lib/core/Services/Search/CustomSearchController.php
    trunk/lib/prefs/unified.php
    trunk/lib/search/searchlib-unified.php
    trunk/lib/wiki-plugins/wikiplugin_list.php
    trunk/lib/wiki-plugins/wikiplugin_listexecute.php

Added Paths:
-----------
    trunk/lib/core/Search/Index/TypeAnalysisDecorator.php
    trunk/lib/core/Search/Type/MultivaluePlain.php

Modified: trunk/lib/core/Search/Elastic/Index.php
===================================================================
--- trunk/lib/core/Search/Elastic/Index.php	2013-06-06 15:56:18 UTC (rev 46203)
+++ trunk/lib/core/Search/Elastic/Index.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -60,7 +60,7 @@
 
 		$mapping = array_map(
 			function ($entry) {
-				if ($entry instanceof Search_Type_Whole) {
+				if ($entry instanceof Search_Type_Whole || $entry instanceof Search_Type_MultivaluePlain) {
 					return array(
 						"type" => "string",
 						"index" => "not_analyzed",

Modified: trunk/lib/core/Search/Elastic/TypeFactory.php
===================================================================
--- trunk/lib/core/Search/Elastic/TypeFactory.php	2013-06-06 15:56:18 UTC (rev 46203)
+++ trunk/lib/core/Search/Elastic/TypeFactory.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -33,7 +33,7 @@
 
 	function multivalue($values)
 	{
-		return new Search_Type_Whole(array_values((array) $values));
+		return new Search_Type_MultivaluePlain(array_values((array) $values));
 	}
 
 	function sortable($value)

Added: trunk/lib/core/Search/Index/TypeAnalysisDecorator.php
===================================================================
--- trunk/lib/core/Search/Index/TypeAnalysisDecorator.php	                        (rev 0)
+++ trunk/lib/core/Search/Index/TypeAnalysisDecorator.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -0,0 +1,59 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+// 
+// 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.
+// $Id$
+
+class Search_Index_TypeAnalysisDecorator implements Search_Index_Interface
+{
+	private $parent;
+	private $identifierClass;
+	private $mapping = array();
+
+	function __construct(Search_Index_Interface $index)
+	{
+		$this->parent = $index;
+		$this->identifierClass = get_class($index->getTypeFactory()->identifier(1));
+	}
+
+	function addDocument(array $document)
+	{
+		$new = array_diff_key($document, $this->mapping);
+		foreach ($new as $key => $value) {
+			$this->mapping[$key] = $value instanceof $this->identifierClass;
+		}
+		return $this->parent->addDocument($document);
+	}
+
+	function invalidateMultiple(array $query)
+	{
+		return $this->parent->invalidateMultiple($query);
+	}
+
+	function endUpdate()
+	{
+		return $this->parent->endUpdate();
+	}
+
+	function find(Search_Expr_Interface $query, Search_Query_Order $sortOrder, $resultStart, $resultCount)
+	{
+		return $this->parent->find($query, $sortOrder, $resultStart, $resultCount);
+	}
+
+	function getTypeFactory()
+	{
+		return $this->parent->getTypeFactory();
+	}
+
+	function optimize()
+	{
+		return $this->parent->optimize();
+	}
+
+	function getIdentifierFields()
+	{
+		return array_keys(array_filter($this->mapping));
+	}
+}
+


Property changes on: trunk/lib/core/Search/Index/TypeAnalysisDecorator.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/core/Search/Query.php
===================================================================
--- trunk/lib/core/Search/Query.php	2013-06-06 15:56:18 UTC (rev 46203)
+++ trunk/lib/core/Search/Query.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -13,6 +13,7 @@
 	private $start = 0;
 	private $count = 50;
 	private $weightCalculator = null;
+	private $identifierFields = null;
 
 	private $subQueries = array();
 
@@ -25,6 +26,11 @@
 		}
 	}
 
+	function setIdentifierFields(array $fields)
+	{
+		$this->identifierFields = $fields;
+	}
+
 	function addObject($type, $objectId)
 	{
 		if (is_null($this->objectList)) {
@@ -191,6 +197,15 @@
 			$this->expr->walk(array($this->weightCalculator, 'calculate'));
 		}
 
+		if ($this->identifierFields) {
+			$fields = $this->identifierFields;
+			$this->expr->walk(function (Search_Expr_Interface $expr) use ($fields) {
+				if (method_exists($expr, 'getField') && in_array($expr->getField(), $fields)) {
+					$expr->setType('identifier');
+				}
+			});
+		}
+
 		return $index->find($this->expr, $sortOrder, $this->start, $this->count);
 	}
 

Added: trunk/lib/core/Search/Type/MultivaluePlain.php
===================================================================
--- trunk/lib/core/Search/Type/MultivaluePlain.php	                        (rev 0)
+++ trunk/lib/core/Search/Type/MultivaluePlain.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -0,0 +1,21 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+// 
+// 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.
+// $Id$
+
+class Search_Type_MultivaluePlain implements Search_Type_Interface
+{
+	private $values;
+
+	function __construct(array $values)
+	{
+		$this->values = $values;
+	}
+
+	function getValue()
+	{
+		return $this->values;
+	}
+}


Property changes on: trunk/lib/core/Search/Type/MultivaluePlain.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/core/Services/Search/CustomSearchController.php
===================================================================
--- trunk/lib/core/Services/Search/CustomSearchController.php	2013-06-06 15:56:18 UTC (rev 46203)
+++ trunk/lib/core/Services/Search/CustomSearchController.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -140,7 +140,7 @@
 		}
 
 		$unifiedsearchlib = TikiLib::lib('unifiedsearch');
-		$query->setWeightCalculator($unifiedsearchlib->getWeightCalculator());
+		$unifiedsearchlib->initQuery($query); // Done after cache because permissions vary
 		$index = $unifiedsearchlib->getIndex();
 		$resultSet = $query->search($index);
 

Modified: trunk/lib/prefs/unified.php
===================================================================
--- trunk/lib/prefs/unified.php	2013-06-06 15:56:18 UTC (rev 46203)
+++ trunk/lib/prefs/unified.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -196,6 +196,14 @@
 			'size' => '20',
 			'default' => '',
 		),
+		'unified_identifier_fields' => array(
+			'name' => tr('Unified index identifier fields (Internal)'),
+			'description' => tr('Used to store the fields to be considered as identifiers. Overwritten after each index rebuild.'),
+			'hint' => tra('Do not change this value unless you know what you are doing.'),
+			'separator' => '',
+			'default' => array(),
+			'filter' => 'word',
+		),
 	);
 }
 

Modified: trunk/lib/search/searchlib-unified.php
===================================================================
--- trunk/lib/search/searchlib-unified.php	2013-06-06 15:56:18 UTC (rev 46203)
+++ trunk/lib/search/searchlib-unified.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -174,6 +174,7 @@
 		$tikilib = TikiLib::lib('tiki');
 		$access = TikiLib::lib('access');
 		$access->preventRedirect(true);
+		$index = new Search_Index_TypeAnalysisDecorator($index);
 		$indexer = $this->buildIndexer($index, $loggit);
 		$stat = $tikilib->allocate_extra(
 			'unified_rebuild',
@@ -183,6 +184,8 @@
 		);
 		$access->preventRedirect(false);
 
+		$tikilib->set_preference('unified_identifier_fields', $index->getIdentifierFields());
+
 		// Force destruction to clear locks
 		unset($indexer);
 		unset($index);
@@ -211,7 +214,6 @@
 			// Obtain the old index and destroy it after permanently replacing it.
 			$oldIndex = $this->getIndex();
 
-			$tikilib = TikiLib::lib('tiki');
 			$tikilib->set_preference('unified_elastic_index_current', $indexName);
 
 			if ($oldIndex) {
@@ -498,34 +500,32 @@
 		return new Search_Query_WeightCalculator_Field($weights);
 	}
 
-    /**
-     * @param array $filter
-     * @return Search_Query
-     */
-    function buildQuery(array $filter)
+	function initQuery(Search_Query $query)
 	{
-		$categlib = TikiLib::lib('categ');
+		global $prefs;
 
-		$query = new Search_Query;
 		$query->setWeightCalculator($this->getWeightCalculator());
+		$query->setIdentifierFields($prefs['unified_identifier_fields']);
 
 		if (! Perms::get()->admin) {
 			$query->filterPermissions(Perms::get()->getGroups());
 		}
-		$jail_query = '';
 
+		$categlib = TikiLib::lib('categ');
 		if ($jail = $categlib->get_jail()) {
-			$i = 0;
-			foreach ($jail as $cat) {
-				$i++;
-				$jail_query .= $cat;
-				if ($i < count($jail)) {
-					$jail_query .= ' or ';
-				}
-			}
-			$query->filterCategory($jail_query, true);
+			$query->filterCategory(implode(' or ', $jail), true);
 		}
+	}
 
+    /**
+     * @param array $filter
+     * @return Search_Query
+     */
+    function buildQuery(array $filter)
+	{
+		$query = new Search_Query;
+		$this->initQuery($query);
+
 		if (isset($filter['type']) && $filter['type']) {
 			$query->filterType($filter['type']);
 		}

Modified: trunk/lib/wiki-plugins/wikiplugin_list.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_list.php	2013-06-06 15:56:18 UTC (rev 46203)
+++ trunk/lib/wiki-plugins/wikiplugin_list.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -30,17 +30,13 @@
 	$output = null;
 
 	$query = new Search_Query;
-	$query->setWeightCalculator($unifiedsearchlib->getWeightCalculator());
+	$unifiedsearchlib->initQuery($query);
 
 	$matches = WikiParser_PluginMatcher::match($data);
 
 	$builder = new Search_Query_WikiBuilder($query);
 	$builder->apply($matches);
 
-	if (! Perms::get()->admin) {
-		$query->filterPermissions(Perms::get()->getGroups());
-	}
-
 	if (!empty($_REQUEST['sort_mode'])) {
 		$query->setOrder($_REQUEST['sort_mode']);
 	}

Modified: trunk/lib/wiki-plugins/wikiplugin_listexecute.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_listexecute.php	2013-06-06 15:56:18 UTC (rev 46203)
+++ trunk/lib/wiki-plugins/wikiplugin_listexecute.php	2013-06-06 16:17:45 UTC (rev 46204)
@@ -40,7 +40,7 @@
 	);
 
 	$query = new Search_Query;
-	$query->setWeightCalculator($unifiedsearchlib->getWeightCalculator());
+	$unifiedsearchlib->initQuery($query);
 
 	$matches = WikiParser_PluginMatcher::match($data);
 
@@ -59,10 +59,6 @@
 		}
 	}
 
-	if (! Perms::get()->admin) {
-		$query->filterPermissions(Perms::get()->getGroups());
-	}
-
 	if (!empty($_REQUEST['sort_mode'])) {
 		$query->setOrder($_REQUEST['sort_mode']);
 	}

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

Revision: 46219
          http://sourceforge.net/p/tikiwiki/code/46219
Author:   lphuberdeau
Date:     2013-06-06 19:28:27 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
[FIX] Multiple notices

Modified Paths:
--------------
    trunk/lib/core/Perms/ResolverFactory/CategoryFactory.php
    trunk/lib/core/Tracker/Options.php
    trunk/lib/images/gd.php
    trunk/lib/prefs/unified.php
    trunk/lib/search/searchlib-unified.php
    trunk/lib/sheet/grid.php
    trunk/lib/trackers/trackerlib.php
    trunk/lib/userprefs/userprefslib.php
    trunk/lib/wiki-plugins/wikiplugin_list.php

Modified: trunk/lib/core/Perms/ResolverFactory/CategoryFactory.php
===================================================================
--- trunk/lib/core/Perms/ResolverFactory/CategoryFactory.php	2013-06-06 18:46:29 UTC (rev 46218)
+++ trunk/lib/core/Perms/ResolverFactory/CategoryFactory.php	2013-06-06 19:28:27 UTC (rev 46219)
@@ -130,8 +130,12 @@
 		foreach ( $result as $row ) {
 			$category = (int) $row['categId'];
 			$object = $this->cleanObject($row['itemId']);
+
+			if (! isset($objects[$object])) {
+				continue; // Some DB corruption combined with MySQL strange casting causes notices
+			}
+
 			$key = $objects[$object];
-
 			$this->knownObjects[$key][] = $category;
 
 			if ( ! isset($this->knownCategories[$category]) ) {

Modified: trunk/lib/core/Tracker/Options.php
===================================================================
--- trunk/lib/core/Tracker/Options.php	2013-06-06 18:46:29 UTC (rev 46218)
+++ trunk/lib/core/Tracker/Options.php	2013-06-06 19:28:27 UTC (rev 46219)
@@ -168,7 +168,7 @@
 			$value = $this->getParam($key);
 			if (isset($info['count']) && $info['count'] == '*') {
 				$values = $value;
-			} elseif (isset($info['separator'])) {
+			} elseif (isset($info['separator']) && is_array($value)) {
 				$values = array(implode($info['separator'], $value));
 			} else {
 				$values = array($value);

Modified: trunk/lib/images/gd.php
===================================================================
--- trunk/lib/images/gd.php	2013-06-06 18:46:29 UTC (rev 46218)
+++ trunk/lib/images/gd.php	2013-06-06 19:28:27 UTC (rev 46219)
@@ -262,7 +262,7 @@
 			}
 		} else if ($this->height) {
 			return $this->height;
-		} else if ($this->filename) {
+		} else if ($this->filename && is_readable($this->filename)) {
 			list($this->width, $this->height, $type) = getimagesize($this->filename);
 			if ($this->height) {
 				return $this->height;
@@ -291,7 +291,7 @@
 			}
 		} else if ($this->width) {
 			return $this->width;
-		} else if ($this->filename) {
+		} else if ($this->filename && is_readable($this->filename)) {
 			list($this->width, $this->height, $type) = getimagesize($this->filename);
 			if ($this->width) {
 				return $this->width;

Modified: trunk/lib/prefs/unified.php
===================================================================
--- trunk/lib/prefs/unified.php	2013-06-06 18:46:29 UTC (rev 46218)
+++ trunk/lib/prefs/unified.php	2013-06-06 19:28:27 UTC (rev 46219)
@@ -207,8 +207,9 @@
 		'unified_identifier_fields' => array(
 			'name' => tr('Unified index identifier fields (Internal)'),
 			'description' => tr('Used to store the fields to be considered as identifiers. Overwritten after each index rebuild.'),
+			'type' => 'text',
 			'hint' => tra('Do not change this value unless you know what you are doing.'),
-			'separator' => '',
+			'separator' => ',',
 			'default' => array(),
 			'filter' => 'word',
 		),

Modified: trunk/lib/search/searchlib-unified.php
===================================================================
--- trunk/lib/search/searchlib-unified.php	2013-06-06 18:46:29 UTC (rev 46218)
+++ trunk/lib/search/searchlib-unified.php	2013-06-06 19:28:27 UTC (rev 46219)
@@ -89,6 +89,7 @@
      */
     function rebuildInProgress()
 	{
+		global $prefs;
 		if ($prefs['unified_engine'] == 'lucene') {
 			$tempName = $this->getIndexLocation() . '-new';
 			$new_exists = file_exists($this->getIndexLocation() . '-new');
@@ -104,6 +105,7 @@
 	 */
 	function stopRebuild()
 	{
+		global $prefs;
 		if ($prefs['unified_engine'] == 'lucene') {
 			$tempName = $this->getIndexLocation() . '-new';
 			$file_exists = file_exists($tempName);

Modified: trunk/lib/sheet/grid.php
===================================================================
--- trunk/lib/sheet/grid.php	2013-06-06 18:46:29 UTC (rev 46218)
+++ trunk/lib/sheet/grid.php	2013-06-06 19:28:27 UTC (rev 46219)
@@ -109,53 +109,53 @@
 	/**
 	 * Two dimensional array, grid containing the end values ([y][x])
 	 */
-	var $dataGrid;
+	public $dataGrid;
 
 	/**
 	 * Two dimensional array, grid containing the raw values ([y][x])
 	 */
-	var $calcGrid;
+	public $calcGrid;
 
 	/**
 	 * Two dimensional array, grid containing an associative arrays
 	 * with 'height' and 'width' values.
 	 */
-	var $cellInfo;
+	public $cellInfo;
 
 	/**
 	 * Row and column count once finalized.
 	 */
-	var $rowCount;
-	var $columnCount;
+	public $rowCount;
+	public $columnCount;
 
 	/**
 	 * Layout parameters.
 	 */
-	var $headerRow;
-	var $footerRow;
-	var $parseValues;
-	var $cssName;
+	public $headerRow;
+	public $footerRow;
+	public $parseValues;
+	public $cssName;
 
 	/**
 	 * Internal values.
 	 */
-	var $COLCHAR;
-	var $indexes;
-	var $lastIndex;
-	var $lastID;
+	public $COLCHAR;
+	public $indexes;
+	public $lastIndex;
+	public $lastID;
 
-	var $usedRow;
-	var $usedCol;
+	public $usedRow;
+	public $usedCol;
 
-	var $errorFlag;
+	public $errorFlag;
 
-	var $contributions;
-	var $id;
+	public $contributions;
+	public $id;
 
-	var $rangeBeginRow = -1;
-	var $rangeEndRow   = -1;
-	var $rangeBeginCol = -1;
-	var $rangeEndCol = -1;
+	public $rangeBeginRow = -1;
+	public $rangeEndRow   = -1;
+	public $rangeBeginCol = -1;
+	public $rangeEndCol = -1;
 
 	function getRangeBeginRow()
 	{
@@ -754,6 +754,11 @@
  */
 class TikiSheetDataHandler
 {
+	public $maxrows = 300;
+    public $maxcols = 26;
+    public $output = "";
+	public $cssName;
+
 	/** _load {{{2
 	 * Function called by import. The function must grab
 	 * the information from the data source and store it
@@ -762,10 +767,6 @@
 	 * @return true on success.
 	 * @abstract
 	 */
-	var $maxrows = 300;
-    var $maxcols = 26;
-    var $output = "";
-
 	function _load( &$sheet )
 	{
 		trigger_error( "Abstract method call. _load() not defined in " . get_class( $this ), E_USER_ERROR );
@@ -820,13 +821,13 @@
  */
 class TikiSheetSerializeHandler extends TikiSheetDataHandler
 {
-	var $file;
+	public $file;
 
 	/** Constructor {{{2
 	 * Initializes the the serializer on a file.
 	 * @param $file The file path to save or load from.
 	 */
-	function TikiSheetSerializeHandler( $file = "php://stdout", $inputEncoding = '', $outputEncoding = '' )
+	function __construct( $file = "php://stdout", $inputEncoding = '', $outputEncoding = '' )
 	{
 		$this->file = $file;
         $this->encoding = new Encoding ($inputEncoding, $outputEncoding);
@@ -910,14 +911,14 @@
  */
 class TikiSheetCSVHandler extends TikiSheetDataHandler
 {
-	var $file = 'php://stdout';
-	var $lineLen;
+	public $file = 'php://stdout';
+	public $lineLen;
 
 	/** Constructor {{{2
 	 * Initializes the the serializer on a file.
 	 * @param $file The file path to save or load from.
 	 */
-	function TikiSheetCSVHandler( $fileInfo, $inputEncoding = '', $outputEncoding = '', $lineLen = 1024 )
+	function __construct( $fileInfo, $inputEncoding = '', $outputEncoding = '', $lineLen = 1024 )
 	{
 		$this->lineLen = $lineLen;
 		$this->data = strip_tags( $fileInfo['data'] );
@@ -1020,14 +1021,14 @@
  */
 class TikiSheetTrackerHandler extends TikiSheetDataHandler
 {
-	var $file;
-	var $lineLen;
+	public $file;
+	public $lineLen;
 
 	/** Constructor {{{2
 	 * Initializes the the serializer on a file.
 	 * @param $file The file path to save or load from.
 	 */
-	function TikiSheetTrackerHandler( $trackerId )
+	function __construct( $trackerId )
 	{
 		global $tikilib;
 		$trklib = TikiLib::lib("trk");
@@ -1103,7 +1104,7 @@
  */
 class TikiSheetSimpleArrayHandler extends TikiSheetDataHandler
 {
-	var $values = array();
+	public $values = array();
 
 	function TikiSheetSimpleArrayHandler( $simpleArray = array() )
 	{
@@ -1180,14 +1181,14 @@
  */
 class TikiSheetCSVExcelHandler extends TikiSheetDataHandler
 {
-    var $file;
-    var $lineLen;
+    public $file;
+    public $lineLen;
 
     /** Constructor {{{2
      * Initializes the the serializer on a file.
      * @param $file The file path to save or load from.
      */
-    function TikiSheetCSVExcelHandler( $file = "php://stdout", $inputEncoding = '', $outputEncoding = '', $lineLen = 1024 )
+    function __construct( $file = "php://stdout", $inputEncoding = '', $outputEncoding = '', $lineLen = 1024 )
     {
         $this->file = $file;
         $this->lineLen = $lineLen;
@@ -1318,17 +1319,17 @@
  */
 class TikiSheetDatabaseHandler extends TikiSheetDataHandler
 {
-	var $id;
-	var $readDate;
-	var $rowCount;
-	var $columnCount;
+	public $id;
+	public $readDate;
+	public $rowCount;
+	public $columnCount;
 
 	/** Constructor {{{2
 	 * Assigns a sheet ID to the handler.
 	 * @param $id The ID of the sheet in the database.
 	 * @param $db The database link to use.
 	 */
-	function TikiSheetDatabaseHandler( $id , $date = null )
+	function __construct( $id , $date = null )
 	{
 		global $tikilib, $sheetlib;
 
@@ -1521,13 +1522,13 @@
  */
 class TikiSheetExcelHandler extends TikiSheetDataHandler
 {
-	var $file;
-	var $disabled = true;
+	public $file;
+	public $disabled = true;
 	/** Constructor {{{2
 	 * Initializes the the serializer on a file.
 	 * @param $file The file path to save or load from.
 	 */
-	function TikiSheetExcelHandler( $file = "php://stdout" , $inputEncoding = '', $outputEncoding = '' )
+	function __construct( $file = "php://stdout" , $inputEncoding = '', $outputEncoding = '' )
 	{
 		$this->file = $file;
         $this->encoding = new Encoding ($inputEncoding, $outputEncoding);
@@ -1647,7 +1648,7 @@
 	/** Constructor {{{2
 	 * Does nothing special.
 	 */
-	function TikiSheetOpenOfficeHandler( $file = "php://stdout" )
+	function __construct( $file = "php://stdout" )
 	{
 	}
 
@@ -1706,13 +1707,13 @@
  */
 class TikiSheetWikiTableHandler extends TikiSheetDataHandler
 {
-	var $pageName;
+	public $pageName;
 
 	/** Constructor {{{2
 	 * Initializes the the serializer on a wiki page
 	 * @param $file The name of the wiki page to perform actions on.
 	 */
-	function TikiSheetWikiTableHandler( $pageName )
+	function __construct( $pageName )
 	{
 		$this->pageName = $pageName;
 	}
@@ -1824,15 +1825,15 @@
  */
 class TikiSheetOutputHandler extends TikiSheetDataHandler
 {
-	var $heading;
-	var $parseOutput;
+	public $heading;
+	public $parseOutput;
 
 	/** Constructor {{{2
 	 * Identifies the caption of the table if it applies.
 	 * @param $heading 			The heading
 	 * @param $parseOutput		Parse wiki markup in cells if parseValues=y in sheet layout
 	 */
-	function TikiSheetOutputHandler( $heading = null, $parseOutput = true )
+	function __construct( $heading = null, $parseOutput = true )
 	{
 		$this->heading = $heading;
 		$this->parseOutput = $parseOutput;
@@ -2050,7 +2051,7 @@
 {
 	/** Constructor {{{2
 	 */
-	function TikiSheetLabeledOutputHandler()
+	function __construct()
 	{
 	}
 
@@ -2167,13 +2168,13 @@
 class TikiSheetHTMLTableHandler extends TikiSheetDataHandler
 {
 
-	var $data;
+	public $data;
 
 	/** Constructor {{{2
 	 * Initializes the the serializer on a wiki page
 	 * @param $file The name of the wiki page to perform actions on.
 	 */
-	function TikiSheetHTMLTableHandler( $inHtml )
+	function __construct( $inHtml )
 	{
 		$this->data = $inHtml;
 	}

Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php	2013-06-06 18:46:29 UTC (rev 46218)
+++ trunk/lib/trackers/trackerlib.php	2013-06-06 19:28:27 UTC (rev 46219)
@@ -2947,11 +2947,11 @@
 			$query = "select tif.`value` from `tiki_tracker_item_fields` tif, `tiki_tracker_items` i, `tiki_tracker_fields` tf where i.`itemId`=? and i.`itemId`=tif.`itemId` and tf.`fieldId`=tif.`fieldId` and tf.`isMain`=? ";
 		$result = $this->getOne($query, array( (int) $itemId, "y"));
 
-		if ($result{0} === '{') {
+		if (strlen($result) && $result{0} === '{') {
 			$result = json_decode($result, true);
 			if (isset($result[$prefs['language']])) {
 				return $result[$prefs['language']];
-			} else {
+			} elseif(is_array($result)) {
 				return reset($result);
 			}
 		}

Modified: trunk/lib/userprefs/userprefslib.php
===================================================================
--- trunk/lib/userprefs/userprefslib.php	2013-06-06 18:46:29 UTC (rev 46218)
+++ trunk/lib/userprefs/userprefslib.php	2013-06-06 19:28:27 UTC (rev 46219)
@@ -93,6 +93,11 @@
 
 		global $mimeextensions;
 		require_once('lib/mime/mimeextensions.php');
+
+		if (! isset($mimeextensions[$type])) {
+			return 'img/noavatar.png';
+		}
+
 		$ext = $mimeextensions[$type];
 		$hash = md5($user);
 		$image = "temp/public/{$tikidomainslash}avatar_{$hash}.$ext";

Modified: trunk/lib/wiki-plugins/wikiplugin_list.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_list.php	2013-06-06 18:46:29 UTC (rev 46218)
+++ trunk/lib/wiki-plugins/wikiplugin_list.php	2013-06-06 19:28:27 UTC (rev 46219)
@@ -41,7 +41,9 @@
 		$query->setOrder($_REQUEST['sort_mode']);
 	}
 
-	$index = $unifiedsearchlib->getIndex();
+	if (! $index = $unifiedsearchlib->getIndex()) {
+		return '';
+	}
 
 	$result = $query->search($index);
 

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

Revision: 46235
          http://sourceforge.net/p/tikiwiki/code/46235
Author:   lphuberdeau
Date:     2013-06-07 20:35:54 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
[FIX] Introduced by recent refactorings

Modified Paths:
--------------
    trunk/lib/core/Tracker/Options.php
    trunk/lib/trackers/trackerlib.php

Modified: trunk/lib/core/Tracker/Options.php
===================================================================
--- trunk/lib/core/Tracker/Options.php	2013-06-07 19:57:08 UTC (rev 46234)
+++ trunk/lib/core/Tracker/Options.php	2013-06-07 20:35:54 UTC (rev 46235)
@@ -133,6 +133,8 @@
 				return $def['default'];
 			}
 		}
+
+		return $default;
 	}
 
 	function getParamFromIndex($index, $default = false)
@@ -167,7 +169,7 @@
 			$info = $this->getParamDefinition($key);
 			$value = $this->getParam($key);
 			if (isset($info['count']) && $info['count'] == '*') {
-				$values = $value;
+				$values = (array) $value;
 			} elseif (isset($info['separator']) && is_array($value)) {
 				$values = array(implode($info['separator'], $value));
 			} else {

Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php	2013-06-07 19:57:08 UTC (rev 46234)
+++ trunk/lib/trackers/trackerlib.php	2013-06-07 20:35:54 UTC (rev 46235)
@@ -682,9 +682,11 @@
 	public function concat_item_from_fieldslist($trackerId,$itemId,$fieldsId,$status='o',$separator=' ')
 	{
 		$res='';
-		$sts = preg_split('/\|/', $fieldsId, -1, PREG_SPLIT_NO_EMPTY);
+		if (is_string($fieldsId)) {
+			$fieldsId = preg_split('/\|/', $fieldsId, -1, PREG_SPLIT_NO_EMPTY);
+		}
 		$definition = Tracker_Definition::get($trackerId);
-		foreach ($sts as $k => $field) {
+		foreach ($fieldsId as $k => $field) {
 			$myfield = $definition->getField($field);
 
 			$myfield['value'] = $this->get_item_value($trackerId, $itemId, $field);
@@ -699,9 +701,11 @@
 
 	public function concat_all_items_from_fieldslist($trackerId,$fieldsId,$status='o',$separator=' ')
 	{
-		$sts = preg_split('/\|/', $fieldsId, -1, PREG_SPLIT_NO_EMPTY);
+		if (is_string($fieldsId)) {
+			$fieldsId = preg_split('/\|/', $fieldsId, -1, PREG_SPLIT_NO_EMPTY);
+		}
 		$res = array();
-		foreach ($sts as $field) {
+		foreach ($fieldsId as $field) {
 			if ($myfield=$this->get_tracker_field($field)) {
 				$is_date=($myfield['type']=='f');
 				$is_trackerlink=($myfield['type']=='r');

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

Revision: 46260
          http://sourceforge.net/p/tikiwiki/code/46260
Author:   lphuberdeau
Date:     2013-06-10 15:24:55 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
[ENH] Obtaining datasource should be in formatting mode most of the time, elasticsearch results do not need a datasource as the data is provided in the results

Modified Paths:
--------------
    trunk/lib/search/searchlib-unified.php

Added Paths:
-----------
    trunk/lib/core/Search/Formatter/DataSource/Trusted.php

Added: trunk/lib/core/Search/Formatter/DataSource/Trusted.php
===================================================================
--- trunk/lib/core/Search/Formatter/DataSource/Trusted.php	                        (rev 0)
+++ trunk/lib/core/Search/Formatter/DataSource/Trusted.php	2013-06-10 15:24:55 UTC (rev 46260)
@@ -0,0 +1,26 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+// 
+// 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.
+// $Id$
+
+/**
+ * ElasticSearch provides the raw documents as part of the results, so no need to re-fetch the information.
+ */
+class Search_Formatter_DataSource_Trusted implements Search_Formatter_DataSource_Interface
+{
+	function addContentSource($type, Search_ContentSource_Interface $contentSource)
+	{
+	}
+
+	function addGlobalSource(Search_GlobalSource_Interface $globalSource)
+	{
+	}
+
+	function getInformation(Search_ResultSet $list, array $fields)
+	{
+		return $list;
+	}
+}
+


Property changes on: trunk/lib/core/Search/Formatter/DataSource/Trusted.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/search/searchlib-unified.php
===================================================================
--- trunk/lib/search/searchlib-unified.php	2013-06-10 14:41:22 UTC (rev 46259)
+++ trunk/lib/search/searchlib-unified.php	2013-06-10 15:24:55 UTC (rev 46260)
@@ -324,7 +324,7 @@
 	{
 		global $prefs;
 		$indexer = new Search_Indexer($index, $loggit);
-		$this->addSources($indexer);
+		$this->addSources($indexer, 'indexing');
 
 		if ($prefs['unified_tokenize_version_numbers'] == 'y') {
 			$indexer->addContentFilter(new Search_ContentFilter_VersionNumber);
@@ -464,8 +464,14 @@
      * @param string $mode
      * @return Search_Formatter_DataSource_Declarative
      */
-    function getDataSource($mode = 'indexing')
+    function getDataSource($mode = 'formatting')
 	{
+		global $prefs;
+
+		if ($mode === 'formatting' && $prefs['unified_engine'] === 'elastic') {
+			return new Search_Formatter_DataSource_Trusted;
+		}
+
 		$dataSource = new Search_Formatter_DataSource_Declarative;
 		$this->addSources($dataSource, $mode);
 
@@ -475,7 +481,7 @@
 	function getProfileExportHelper()
 	{
 		$helper = new Tiki_Profile_Writer_SearchFieldHelper;
-		$this->addSources($helper);
+		$this->addSources($helper, 'indexing'); // Need all fields, so use indexing
 
 		return $helper;
 	}

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

Revision: 46273
          http://sourceforge.net/p/tikiwiki/code/46273
Author:   lphuberdeau
Date:     2013-06-10 19:26:34 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
[NEW]?\194?\160Adding basic structure to support facet search in elasticsearch

Modified Paths:
--------------
    trunk/lib/core/Search/Elastic/Index.php
    trunk/lib/core/Search/Index/Interface.php
    trunk/lib/core/Search/Index/Lucene.php
    trunk/lib/core/Search/Index/Memory.php
    trunk/lib/core/Search/Query.php
    trunk/lib/core/Search/ResultSet.php

Added Paths:
-----------
    trunk/lib/core/Search/Elastic/FacetBuilder.php
    trunk/lib/core/Search/Elastic/FacetReader.php
    trunk/lib/core/Search/Query/Facet/
    trunk/lib/core/Search/Query/Facet/Interface.php
    trunk/lib/core/Search/Query/Facet/Term.php
    trunk/lib/core/Search/Query/Interface.php
    trunk/lib/core/Search/ResultSet/FacetFilter.php
    trunk/lib/test/core/Search/Elastic/FacetBuilderTest.php
    trunk/lib/test/core/Search/Elastic/FacetReaderTest.php
    trunk/lib/test/core/Search/Elastic/FacetTest.php

Added: trunk/lib/core/Search/Elastic/FacetBuilder.php
===================================================================
--- trunk/lib/core/Search/Elastic/FacetBuilder.php	                        (rev 0)
+++ trunk/lib/core/Search/Elastic/FacetBuilder.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -0,0 +1,33 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_FacetBuilder
+{
+	function build(array $facets)
+	{
+		if (empty($facets)) {
+			return array();
+		}
+
+		$out = array();
+		foreach ($facets as $facet) {
+			$out[$facet->getName()] = $this->buildFacet($facet);
+		}
+
+		return array(
+			'facets' => $out,
+		);
+	}
+
+	private function buildFacet(Search_Query_Facet_Interface $facet)
+	{
+		return array('terms' => array(
+			'field' => $facet->getField(),
+		));
+	}
+}
+


Property changes on: trunk/lib/core/Search/Elastic/FacetBuilder.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: trunk/lib/core/Search/Elastic/FacetReader.php
===================================================================
--- trunk/lib/core/Search/Elastic/FacetReader.php	                        (rev 0)
+++ trunk/lib/core/Search/Elastic/FacetReader.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -0,0 +1,41 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_FacetReader
+{
+	private $data;
+
+	function __construct(stdClass $data)
+	{
+		$this->data = $data;
+	}
+
+	function getFacetFilter(Search_Query_Facet_Interface $facet)
+	{
+		$facetName = $facet->getName();
+
+		if (! isset($this->data->facets->$facetName)) {
+			return null;
+		}
+
+		$entry = $this->data->facets->$facetName;
+
+		return new Search_ResultSet_FacetFilter($facet, $this->getFromTerms($entry));
+	}
+
+	private function getFromTerms($entry)
+	{
+		$out = array();
+
+		foreach ($entry->terms as $term) {
+			$out[] = array('value' => $term->term, 'count' => $term->count);
+		}
+
+		return $out;
+	}
+}
+


Property changes on: trunk/lib/core/Search/Elastic/FacetReader.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/core/Search/Elastic/Index.php
===================================================================
--- trunk/lib/core/Search/Elastic/Index.php	2013-06-10 19:20:01 UTC (rev 46272)
+++ trunk/lib/core/Search/Elastic/Index.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -96,17 +96,21 @@
 		}
 	}
 
-	function find(Search_Expr_Interface $expr, Search_Query_Order $sortOrder, $resultStart, $resultCount)
+	function find(Search_Query_Interface $query, $resultStart, $resultCount)
 	{
 		$builder = new Search_Elastic_QueryBuilder;
-		$query = $builder->build($expr);
+		$queryPart = $builder->build($query->getExpr());
 
 		$builder = new Search_Elastic_OrderBuilder;
-		$order = $builder->build($sortOrder);
+		$orderPart = $builder->build($query->getSortOrder());
 
-		$query = array_merge(
-			$query,
-			$order,
+		$builder = new Search_Elastic_FacetBuilder;
+		$facetPart = $builder->build($query->getFacets());
+
+		$fullQuery = array_merge(
+			$queryPart,
+			$orderPart,
+			$facetPart,
 			array(
 				"from" => $resultStart,
 				"size" => $resultCount,
@@ -120,7 +124,7 @@
 			)
 		);
 
-		$result = $this->connection->search($this->index, $query, $resultStart, $resultCount);
+		$result = $this->connection->search($this->index, $fullQuery, $resultStart, $resultCount);
 		$hits = $result->hits;
 
 		$entries = array_map(
@@ -139,6 +143,13 @@
 
 		$resultSet = new Search_Elastic_ResultSet($entries, $hits->total, $resultStart, $resultCount);
 
+		$reader = new Search_Elastic_FacetReader($result);
+		foreach ($query->getFacets() as $facet) {
+			if ($filter = $reader->getFacetFilter($facet)) {
+				$resultSet->addFacetFilter($filter);
+			}
+		}
+
 		return $resultSet;
 	}
 

Modified: trunk/lib/core/Search/Index/Interface.php
===================================================================
--- trunk/lib/core/Search/Index/Interface.php	2013-06-10 19:20:01 UTC (rev 46272)
+++ trunk/lib/core/Search/Index/Interface.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -13,7 +13,7 @@
 
 	function endUpdate();
 
-	function find(Search_Expr_Interface $query, Search_Query_Order $sortOrder, $resultStart, $resultCount);
+	function find(Search_Query_Interface $query, $resultStart, $resultCount);
 
 	function getTypeFactory();
 

Modified: trunk/lib/core/Search/Index/Lucene.php
===================================================================
--- trunk/lib/core/Search/Index/Lucene.php	2013-06-10 19:20:01 UTC (rev 46272)
+++ trunk/lib/core/Search/Index/Lucene.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -96,9 +96,10 @@
 		return $query->getExpr();
 	}
 
-	function find(Search_Expr_Interface $query, Search_Query_Order $sortOrder, $resultStart, $resultCount)
+	function find(Search_Query_Interface $query, $resultStart, $resultCount)
 	{
-		$data = $this->internalFind($query, $sortOrder);
+		$expr = $query->getExpr();
+		$data = $this->internalFind($expr, $query->getSortOrder());
 
 		$result = array_slice($data['result'], $resultStart, $resultCount);
 
@@ -106,7 +107,7 @@
 		$resultSet->setEstimate($data['count']);
 
 		if ($this->highlight) {
-			$resultSet->setHighlightHelper(new Search_Index_Lucene_HighlightHelper($query));
+			$resultSet->setHighlightHelper(new Search_Index_Lucene_HighlightHelper($expr));
 		} else {
 			$resultSet->setHighlightHelper(new Search_ResultSet_SnippetHelper);
 		}

Modified: trunk/lib/core/Search/Index/Memory.php
===================================================================
--- trunk/lib/core/Search/Index/Memory.php	2013-06-10 19:20:01 UTC (rev 46272)
+++ trunk/lib/core/Search/Index/Memory.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -26,10 +26,10 @@
 	{
 	}
 
-	function find(Search_Expr_Interface $query, Search_Query_Order $sortOrder, $resultStart, $resultCount)
+	function find(Search_Query_Interface $query, $resultStart, $resultCount)
 	{
-		$this->lastQuery = $query;
-		$this->lastOrder = $sortOrder;
+		$this->lastQuery = $query->getExpr();
+		$this->lastOrder = $query->getSortOrder();
 		$this->lastStart = $resultStart;
 		$this->lastCount = $resultCount;
 		return array();

Added: trunk/lib/core/Search/Query/Facet/Interface.php
===================================================================
--- trunk/lib/core/Search/Query/Facet/Interface.php	                        (rev 0)
+++ trunk/lib/core/Search/Query/Facet/Interface.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -0,0 +1,13 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+interface Search_Query_Facet_Interface
+{
+	function getName();
+	function getField();
+}
+


Property changes on: trunk/lib/core/Search/Query/Facet/Interface.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: trunk/lib/core/Search/Query/Facet/Term.php
===================================================================
--- trunk/lib/core/Search/Query/Facet/Term.php	                        (rev 0)
+++ trunk/lib/core/Search/Query/Facet/Term.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -0,0 +1,27 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Query_Facet_Term implements Search_Query_Facet_Interface
+{
+	private $field;
+
+	function __construct($field)
+	{
+		$this->field = $field;
+	}
+
+	function getName()
+	{
+		return $this->field;
+	}
+
+	function getField()
+	{
+		return $this->field;
+	}
+}
+


Property changes on: trunk/lib/core/Search/Query/Facet/Term.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: trunk/lib/core/Search/Query/Interface.php
===================================================================
--- trunk/lib/core/Search/Query/Interface.php	                        (rev 0)
+++ trunk/lib/core/Search/Query/Interface.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -0,0 +1,13 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+interface Search_Query_Interface
+{
+	function getExpr();
+	function getSortOrder();
+	function getFacets();
+}


Property changes on: trunk/lib/core/Search/Query/Interface.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/core/Search/Query.php
===================================================================
--- trunk/lib/core/Search/Query.php	2013-06-10 19:20:01 UTC (rev 46272)
+++ trunk/lib/core/Search/Query.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -5,7 +5,7 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 // $Id$
 
-class Search_Query
+class Search_Query implements Search_Query_Interface
 {
 	private $objectList;
 	private $expr;
@@ -16,6 +16,7 @@
 	private $identifierFields = null;
 
 	private $subQueries = array();
+	private $facets = array();
 
 	function __construct($query = null)
 	{
@@ -185,14 +186,17 @@
 		$this->weightCalculator = $calculator;
 	}
 
-	function search(Search_Index_Interface $index)
+	function getSortOrder()
 	{
 		if ($this->sortOrder) {
-			$sortOrder = $this->sortOrder;
+			return $this->sortOrder;
 		} else {
-			$sortOrder = Search_Query_Order::getDefault();
+			return Search_Query_Order::getDefault();
 		}
+	}
 
+	function search(Search_Index_Interface $index)
+	{
 		if ($this->weightCalculator) {
 			$this->expr->walk(array($this->weightCalculator, 'calculate'));
 		}
@@ -206,7 +210,7 @@
 			});
 		}
 
-		return $index->find($this->expr, $sortOrder, $this->start, $this->count);
+		return $index->find($this, $this->start, $this->count);
 	}
 
 	function getExpr()
@@ -259,4 +263,14 @@
 
 		return $this->subQueries[$name];
 	}
+
+	function requestFacet(Search_Query_Facet_Interface $facet)
+	{
+		$this->facets[] = $facet;
+	}
+
+	function getFacets()
+	{
+		return $this->facets;
+	}
 }

Added: trunk/lib/core/Search/ResultSet/FacetFilter.php
===================================================================
--- trunk/lib/core/Search/ResultSet/FacetFilter.php	                        (rev 0)
+++ trunk/lib/core/Search/ResultSet/FacetFilter.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -0,0 +1,24 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_ResultSet_FacetFilter
+{
+	private $facet;
+	private $data;
+
+	function __construct(Search_Query_Facet_Interface $facet, array $data)
+	{
+		$this->facet = $facet;
+		$this->data = $data;
+	}
+
+	function isFacet(Search_Query_Facet_Interface $facet)
+	{
+		return $this->facet->getName() === $facet->getName();
+	}
+}
+


Property changes on: trunk/lib/core/Search/ResultSet/FacetFilter.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: trunk/lib/core/Search/ResultSet.php
===================================================================
--- trunk/lib/core/Search/ResultSet.php	2013-06-10 19:20:01 UTC (rev 46272)
+++ trunk/lib/core/Search/ResultSet.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -13,6 +13,7 @@
 	private $maxRecords;
 
 	private $highlightHelper;
+	private $filters = array();
 
 	public static function create($list)
 	{
@@ -102,5 +103,19 @@
 	{
 		return $this->count > $this->offset + $this->maxRecords;
 	}
+
+	function getFacet(Search_Query_Facet_Interface $facet)
+	{
+		foreach ($this->filters as $filter) {
+			if ($filter->isFacet($facet)) {
+				return $filter;
+			}
+		}
+	}
+
+	function addFacetFilter(Search_ResultSet_FacetFilter $facet)
+	{
+		$this->filters[] = $facet;
+	}
 }
 

Added: trunk/lib/test/core/Search/Elastic/FacetBuilderTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/FacetBuilderTest.php	                        (rev 0)
+++ trunk/lib/test/core/Search/Elastic/FacetBuilderTest.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -0,0 +1,52 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_FacetBuilderTest extends PHPUnit_Framework_TestCase
+{
+	private $builder;
+
+	function setUp()
+	{
+		$this->builder = new Search_Elastic_FacetBuilder;
+	}
+
+	function testBuildNoFacet()
+	{
+		$this->assertEquals(array(), $this->builder->build(array()));
+	}
+
+	function testBuildSingleFacet()
+	{
+		$this->assertEquals(array(
+			'facets' => array(
+				'categories' => array(
+					'terms' => array('field' => 'categories'),
+				),
+			),
+		), $this->builder->build(array(
+			new Search_Query_Facet_Term('categories'),
+		)));
+	}
+
+	function testBuildMultipleFacets()
+	{
+		$this->assertEquals(array(
+			'facets' => array(
+				'categories' => array(
+					'terms' => array('field' => 'categories'),
+				),
+				'deep_categories' => array(
+					'terms' => array('field' => 'deep_categories'),
+				),
+			),
+		), $this->builder->build(array(
+			new Search_Query_Facet_Term('categories'),
+			new Search_Query_Facet_Term('deep_categories'),
+		)));
+	}
+}
+


Property changes on: trunk/lib/test/core/Search/Elastic/FacetBuilderTest.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: trunk/lib/test/core/Search/Elastic/FacetReaderTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/FacetReaderTest.php	                        (rev 0)
+++ trunk/lib/test/core/Search/Elastic/FacetReaderTest.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -0,0 +1,57 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_FacetReaderTest extends PHPUnit_Framework_TestCase
+{
+	private $reader;
+
+	function setUp()
+	{
+		$this->reader = new Search_Elastic_FacetReader((object) array(
+			'facets' => (object) array(
+				'categories' => (object) array(
+					'_type' => "terms",
+					'missing' => 0,
+					'total' => 7,
+					'other' => 0,
+					'terms' => array(
+						(object) array(
+							'term' => "1",
+							'count' => 3,
+						),
+						(object) array(
+							'term' => "2",
+							'count' => 2,
+						),
+						(object) array(
+							'term' => "3",
+							'count' => 1,
+						),
+					),
+				),
+			),
+		));
+	}
+
+	function testReadUnavailable()
+	{
+		$this->assertNull($this->reader->getFacetFilter(new Search_Query_Facet_Term('foobar')));
+	}
+
+	function testReadAvailable()
+	{
+		$facet = new Search_Query_Facet_Term('categories');
+		$expect = new Search_ResultSet_FacetFilter($facet, array(
+			array('value' => "1", 'count' => 3),
+			array('value' => "2", 'count' => 2),
+			array('value' => "3", 'count' => 1),
+		));
+
+		$this->assertEquals($expect, $this->reader->getFacetFilter($facet));
+	}
+}
+


Property changes on: trunk/lib/test/core/Search/Elastic/FacetReaderTest.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: trunk/lib/test/core/Search/Elastic/FacetTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/FacetTest.php	                        (rev 0)
+++ trunk/lib/test/core/Search/Elastic/FacetTest.php	2013-06-10 19:26:34 UTC (rev 46273)
@@ -0,0 +1,72 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id$
+
+class Search_Elastic_FacetTest extends PHPUnit_Framework_TestCase
+{
+	function setUp()
+	{
+		$connection = new Search_Elastic_Connection('http://localhost:9200');
+
+		$status = $connection->getStatus();
+		if (! $status->ok) {
+			$this->markTestSkipped('ElasticSearch needs to be available on localhost:9200 for the test to run.');
+		}
+
+		$this->index = new Search_Elastic_Index($connection, 'test_index');
+		$this->index->destroy();
+
+		$this->populate($this->index);
+	}
+
+	function tearDown()
+	{
+		if ($this->index) {
+			$this->index->destroy();
+		}
+	}
+
+	function testRequireFacet()
+	{
+		$facet = new Search_Query_Facet_Term('categories');
+
+		$query = new Search_Query;
+		$query->filterType('wiki page');
+		$query->requestFacet($facet);
+
+		$result = $query->search($this->index);
+		$values = $result->getFacet($facet);
+
+		$this->assertEquals(new Search_ResultSet_FacetFilter($facet, array(
+			array('value' => 1, 'count' => 3),
+			array('value' => 2, 'count' => 2),
+			array('value' => 'orphan', 'count' => 1),
+			array('value' => 3, 'count' => 1),
+		)), $values);
+	}
+
+	protected function populate($index)
+	{
+		$this->add($index, 'ABC', array(1, 2, 3));
+		$this->add($index, 'AB', array(1, 2));
+		$this->add($index, 'A', array(1));
+		$this->add($index, 'empty', array('orphan'));
+	}
+
+	private function add($index, $page, array $categories)
+	{
+		$typeFactory = $index->getTypeFactory();
+
+		$index->addDocument(
+			array(
+				'object_type' => $typeFactory->identifier('wiki page'),
+				'object_id' => $typeFactory->identifier($page),
+				'categories' => $typeFactory->multivalue($categories),
+			)
+		);
+	}
+}
+


Property changes on: trunk/lib/test/core/Search/Elastic/FacetTest.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 46287
          http://sourceforge.net/p/tikiwiki/code/46287
Author:   lphuberdeau
Date:     2013-06-12 12:30:31 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
[FIX] Broken interface, adding tests to validate

Modified Paths:
--------------
    trunk/lib/core/Search/Index/TypeAnalysisDecorator.php

Added Paths:
-----------
    trunk/lib/test/core/Search/Elastic/TypeAnalyzerTest.php
    trunk/lib/test/core/Search/Index/LuceneTypeAnalyzerTest.php

Modified: trunk/lib/core/Search/Index/TypeAnalysisDecorator.php
===================================================================
--- trunk/lib/core/Search/Index/TypeAnalysisDecorator.php	2013-06-12 12:14:24 UTC (rev 46286)
+++ trunk/lib/core/Search/Index/TypeAnalysisDecorator.php	2013-06-12 12:30:31 UTC (rev 46287)
@@ -36,9 +36,9 @@
 		return $this->parent->endUpdate();
 	}
 
-	function find(Search_Expr_Interface $query, Search_Query_Order $sortOrder, $resultStart, $resultCount)
+	function find(Search_Query_Interface $query, $resultStart, $resultCount)
 	{
-		return $this->parent->find($query, $sortOrder, $resultStart, $resultCount);
+		return $this->parent->find($query, $resultStart, $resultCount);
 	}
 
 	function getTypeFactory()

Added: trunk/lib/test/core/Search/Elastic/TypeAnalyzerTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/TypeAnalyzerTest.php	                        (rev 0)
+++ trunk/lib/test/core/Search/Elastic/TypeAnalyzerTest.php	2013-06-12 12:30:31 UTC (rev 46287)
@@ -0,0 +1,38 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id: BulkIncrementalUpdateTest.php 45866 2013-05-06 20:30:16Z lphuberdeau $
+
+class Search_Elastic_TypeAnalyzerTest extends Search_Index_LuceneTypeAnalyzerTest
+{
+	protected $index;
+
+	function setUp()
+	{
+		$this->index = $this->getIndex();
+		$this->index->destroy();
+	}
+
+	protected function getIndex()
+	{
+		$connection = new Search_Elastic_Connection('http://localhost:9200');
+		$connection->startBulk(100);
+
+		$status = $connection->getStatus();
+		if (! $status->ok) {
+			$this->markTestSkipped('ElasticSearch needs to be available on localhost:9200 for the test to run.');
+		}
+
+		return new Search_Elastic_Index($connection, 'test_index');
+	}
+
+	function tearDown()
+	{
+		if ($this->index) {
+			$this->index->destroy();
+		}
+	}
+}
+

Added: trunk/lib/test/core/Search/Index/LuceneTypeAnalyzerTest.php
===================================================================
--- trunk/lib/test/core/Search/Index/LuceneTypeAnalyzerTest.php	                        (rev 0)
+++ trunk/lib/test/core/Search/Index/LuceneTypeAnalyzerTest.php	2013-06-12 12:30:31 UTC (rev 46287)
@@ -0,0 +1,55 @@
+<?php
+// (c) Copyright 2002-2013 by authors of the Tiki Wiki CMS Groupware Project
+//
+// 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.
+// $Id: LuceneIncrementalUpdateTest.php 46131 2013-06-01 18:27:52Z changi67 $
+
+/**
+ * @group unit
+ */
+class Search_Index_LuceneTypeAnalyzerTest extends PHPUnit_Framework_TestCase
+{
+	private $dir;
+
+	function setUp()
+	{
+		$this->dir = dirname(__FILE__) . '/test_index';
+		$this->tearDown();
+	}
+
+	protected function getIndex()
+	{
+		return new Search_Index_Lucene($this->dir);
+	}
+
+	function tearDown()
+	{
+		$dir = escapeshellarg($this->dir);
+		`rm -Rf $dir`;
+	}
+
+	function testIdentifierTypes()
+	{
+		$index = $this->getIndex();
+		$typeFactory = $index->getTypeFactory();
+		$index = new Search_Index_TypeAnalysisDecorator($index);
+
+		$index->addDocument(
+			array(
+				'object_type' => $typeFactory->identifier('wiki page'),
+				'object_id' => $typeFactory->identifier('X'),
+				'a' => $typeFactory->plaintext('X'),
+				'b' => $typeFactory->wikitext('X'),
+				'c' => $typeFactory->timestamp('X'),
+				'd' => $typeFactory->identifier('X'),
+				'e' => $typeFactory->numeric('X'),
+				'f' => $typeFactory->multivalue('X'),
+				'g' => $typeFactory->sortable('X'),
+			)
+		);
+
+		$this->assertEquals(array('object_type', 'object_id', 'd', 'e'), $index->getIdentifierFields());
+	}
+}
+

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

Revision: 46291
          http://sourceforge.net/p/tikiwiki/code/46291
Author:   lphuberdeau
Date:     2013-06-12 15:10:36 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
[ENH] Flatten the AND and OR queries to reduce query size (1 and 2 and 3) becomes and(1, 2, 3) instead of and(1, and(2, 3))

Modified Paths:
--------------
    trunk/lib/core/Search/Elastic/QueryBuilder.php
    trunk/lib/test/core/Search/Elastic/QueryBuilderTest.php

Modified: trunk/lib/core/Search/Elastic/QueryBuilder.php
===================================================================
--- trunk/lib/core/Search/Elastic/QueryBuilder.php	2013-06-12 14:38:05 UTC (rev 46290)
+++ trunk/lib/core/Search/Elastic/QueryBuilder.php	2013-06-12 15:10:36 UTC (rev 46291)
@@ -36,24 +36,27 @@
 		} elseif (count($childNodes) === 1 && ($node instanceof AndX || $node instanceof OrX)) {
 			return reset($childNodes)->traverse($callback);
 		} elseif ($node instanceof OrX) {
+			$inner = array_map(
+				function ($expr) use ($callback) {
+					return $expr->traverse($callback);
+				}, $childNodes
+			);
+
 			return array(
 				'bool' => array(
-					'should' => array_map(
-						function ($expr) use ($callback) {
-							return $expr->traverse($callback);
-						}, $childNodes
-					),
+					'should' => $this->flatten($inner, 'should'),
 					"minimum_number_should_match" => 1,
 				),
 			);
 		} elseif ($node instanceof AndX) {
+			$inner = array_map(
+				function ($expr) use ($callback) {
+					return $expr->traverse($callback);
+				}, $childNodes
+			);
 			return array(
 				'bool' => array(
-					'must' => array_map(
-						function ($expr) use ($callback) {
-							return $expr->traverse($callback);
-						}, $childNodes
-					),
+					'must' => $this->flatten($inner, 'must'),
 				),
 			);
 		} elseif ($node instanceof NotX) {
@@ -87,6 +90,20 @@
 		}
 	}
 
+	private function flatten($list, $type)
+	{
+		$out = array();
+		foreach ($list as $entry) {
+			if (isset($entry['bool'][$type])) {
+				$out = array_merge($out, $entry['bool'][$type]);
+			} else {
+				$out[] = $entry;
+			}
+		}
+
+		return $out;
+	}
+
 	private function getTerm($node)
 	{
 		$value = $node->getValue($this->factory);

Modified: trunk/lib/test/core/Search/Elastic/QueryBuilderTest.php
===================================================================
--- trunk/lib/test/core/Search/Elastic/QueryBuilderTest.php	2013-06-12 14:38:05 UTC (rev 46290)
+++ trunk/lib/test/core/Search/Elastic/QueryBuilderTest.php	2013-06-12 15:10:36 UTC (rev 46291)
@@ -197,5 +197,115 @@
 			), $query['query']
 		);
 	}
+
+	function testFlattenOr()
+	{
+		$builder = new QueryBuilder;
+
+		$query = $builder->build(
+			new OrX(
+				array(
+					new OrX(
+						array(
+							new Token('Hello', 'plaintext', 'contents', 1.5),
+							new Token('World', 'plaintext', 'contents', 1.0),
+						)
+					),
+					new Token('Test', 'plaintext', 'contents', 1.0),
+				)
+			)
+		);
+
+		$this->assertEquals(
+			array(
+				"bool" => array(
+					"should" => array(
+						array(
+							"match" => array(
+								"contents" => array("query" => "hello", "boost" => 1.5),
+							),
+						),
+						array(
+							"match" => array(
+								"contents" => array("query" => "world", "boost" => 1.0),
+							),
+						),
+						array(
+							"match" => array(
+								"contents" => array("query" => "test", "boost" => 1.0),
+							),
+						),
+					),
+					"minimum_number_should_match" => 1,
+				),
+			), $query['query']
+		);
+	}
+
+	function testFlattenAnd()
+	{
+		$builder = new QueryBuilder;
+
+		$query = $builder->build(
+			new AndX(
+				array(
+					new OrX(
+						array(
+							new Token('Hello', 'plaintext', 'contents', 1.5),
+							new Token('World', 'plaintext', 'contents', 1.0),
+						)
+					),
+					new AndX(
+						array(
+							new Token('Hello', 'plaintext', 'contents', 1.5),
+							new Token('World', 'plaintext', 'contents', 1.0),
+						)
+					),
+					new Token('Test', 'plaintext', 'contents', 1.0),
+				)
+			)
+		);
+
+		$this->assertEquals(
+			array(
+				"bool" => array(
+					"must" => array(
+						array(
+							"bool" => array(
+								"should" => array(
+									array(
+										"match" => array(
+											"contents" => array("query" => "hello", "boost" => 1.5),
+										),
+									),
+									array(
+										"match" => array(
+											"contents" => array("query" => "world", "boost" => 1.0),
+										),
+									),
+								),
+								"minimum_number_should_match" => 1,
+							),
+						),
+						array(
+							"match" => array(
+								"contents" => array("query" => "hello", "boost" => 1.5),
+							),
+						),
+						array(
+							"match" => array(
+								"contents" => array("query" => "world", "boost" => 1.0),
+							),
+						),
+						array(
+							"match" => array(
+								"contents" => array("query" => "test", "boost" => 1.0),
+							),
+						),
+					),
+				),
+			), $query['query']
+		);
+	}
 }
 

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