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

[<sylvieg@us...>]

Revision: 37438
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37438&view=rev
Author:   sylvieg
Date:     2011-09-19 22:33:51 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[ENH]menu: add a class for non cssmenu to be able to style with css and not only with jq + indent the the submenus for a structure menu to avoid confusion of sublevel + todo: indent also menu that have more than 3 levels or are complex

Modified Paths:
--------------
    trunk/lib/smarty_tiki/function.menu.php
    trunk/styles/layout/design.css
    trunk/templates/tiki-user_menu.tpl

Modified: trunk/lib/smarty_tiki/function.menu.php
===================================================================
--- trunk/lib/smarty_tiki/function.menu.php	2011-09-19 20:37:00 UTC (rev 37437)
+++ trunk/lib/smarty_tiki/function.menu.php	2011-09-19 22:33:51 UTC (rev 37438)
@@ -80,7 +80,7 @@
 		$channels = $structlib->build_subtree_toc($structureId);
 		$structure_info =  $structlib->s_get_page_info($structureId);
 		$channels = $structlib->to_menu($channels, $structure_info['pageName']);
-		$menu_info = array('type'=>'d', 'menuId'=> "s_$structureId");
+		$menu_info = array('type'=>'d', 'menuId'=> "s_$structureId", 'structure' => 'y');
 		//echo '<pre>'; print_r($channels); echo '</pre>';
 	} else {
 		$menu_info = $tikilib->get_menu($id);

Modified: trunk/styles/layout/design.css
===================================================================
--- trunk/styles/layout/design.css	2011-09-19 20:37:00 UTC (rev 37437)
+++ trunk/styles/layout/design.css	2011-09-19 22:33:51 UTC (rev 37438)
@@ -1611,5 +1611,12 @@
 	z-index: 9999;
 	text-align: center;
 }
+.structuremenu .menuSection {
+	margin-left: 6px;
+	border-left: 1px dotted gray;
+}
+.structuremenu .menuSection .option, .structuremenu .menuSection .optionline {
+	background: transparent url(../../img/icons2/h_trenner.gif) center left no-repeat; padding-left: 21px;
+}
 
 /* End of file */

Modified: trunk/templates/tiki-user_menu.tpl
===================================================================
--- trunk/templates/tiki-user_menu.tpl	2011-09-19 20:37:00 UTC (rev 37437)
+++ trunk/templates/tiki-user_menu.tpl	2011-09-19 22:33:51 UTC (rev 37438)
@@ -1,4 +1,5 @@
 {* $Id$ *}
+<div class="tikimenu{if $menu_info.structure eq 'y'} structuremenu{/if}">
 {assign var=opensec value='0'}
 {assign var=sep value=''}
 
@@ -117,4 +118,4 @@
 {/section}
 {assign var=opensec value=0}
 {/if}
-
+</div>

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

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

[<lphuberdeau@us...>]

Revision: 37437
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37437&view=rev
Author:   lphuberdeau
Date:     2011-09-19 20:37:00 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] applyPermissions for wiki render was mostly broken

Modified Paths:
--------------
    trunk/lib/userslib.php
    trunk/lib/wiki/renderlib.php
    trunk/templates/tiki-page_bar.tpl

Modified: trunk/lib/userslib.php
===================================================================
--- trunk/lib/userslib.php	2011-09-19 19:53:34 UTC (rev 37436)
+++ trunk/lib/userslib.php	2011-09-19 20:37:00 UTC (rev 37437)
@@ -2485,13 +2485,11 @@
 
 	function get_permission_names_for($type)
 	{
-		$raw = $this->get_raw_permissions();
+		$raw = $this->get_permissions(0, -1, 'permName_asc', '', 'wiki');
 		$out = array();
 
-		foreach ($raw as $permission) {
-			if ($permission['type'] == $type) {
-				$out[] = $permission['name'];
-			}
+		foreach ($raw['data'] as $permission) {
+			$out[] = $permission['name'];
 		}
 
 		return $out;

Modified: trunk/lib/wiki/renderlib.php
===================================================================
--- trunk/lib/wiki/renderlib.php	2011-09-19 19:53:34 UTC (rev 37436)
+++ trunk/lib/wiki/renderlib.php	2011-09-19 20:37:00 UTC (rev 37437)
@@ -62,7 +62,6 @@
 		$objectperms = Perms::get( array( 'type' => 'wiki page', 'object' => $this->page ) );
 
 		foreach( $permNames as $name ) {
-			$name = $name['permName'];
 			$this->setGlobal( $name, $objectperms->$name ? 'y' : 'n' );
 		}
 

Modified: trunk/templates/tiki-page_bar.tpl
===================================================================
--- trunk/templates/tiki-page_bar.tpl	2011-09-19 19:53:34 UTC (rev 37436)
+++ trunk/templates/tiki-page_bar.tpl	2011-09-19 20:37:00 UTC (rev 37437)
@@ -86,13 +86,10 @@
 
 				{* don't show comments if feature disabled or not enough rights *}
 
-				{if $prefs.feature_wiki_comments == 'y'
+				{if $prefs.feature_wiki_comments eq 'y'
 					&& ($prefs.wiki_comments_allow_per_page neq 'y' or $info.comments_enabled eq 'y')
-					&& $tiki_p_wiki_view_comments == 'y'
-					&& (($tiki_p_read_comments == 'y'
-					&& $comments_cant != 0)
-					|| $tiki_p_post_comments == 'y'
-					||$tiki_p_edit_comments == 'y')}
+					&& $tiki_p_wiki_view_comments eq 'y'
+					&& $tiki_p_read_comments eq 'y'}
 					<span class="button"><a id="comment-toggle" href="{service controller=comment action=list type="wiki page" objectId=$page}#comment-container">{tr}Comments{/tr}</a></span>
 					{jq}
 						$('#comment-toggle').comment_toggle();

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37436] trunk/lib/test/editlib/ ParseToWiki_CharacterTest.php

[<mlustenberg@us...>]

Revision: 37436
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37436&view=rev
Author:   mlustenberg
Date:     2011-09-19 19:53:34 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[ENH] Testing of EditLib (test linebreaks within color markup)

Modified Paths:
--------------
    trunk/lib/test/editlib/ParseToWiki_CharacterTest.php

Modified: trunk/lib/test/editlib/ParseToWiki_CharacterTest.php
===================================================================
--- trunk/lib/test/editlib/ParseToWiki_CharacterTest.php	2011-09-19 19:37:48 UTC (rev 37435)
+++ trunk/lib/test/editlib/ParseToWiki_CharacterTest.php	2011-09-19 19:53:34 UTC (rev 37436)
@@ -389,6 +389,17 @@
 		
 		$inData = '<span style="background:#0000FF;color:#FF0000;">color</span>';
 		$out = $this->el->parseToWiki($inData);
+		$this->assertEquals($ex, $out);		
+
+		
+		/*
+		 * line break
+		 */
+		$ex = '~~#FF0000,#0000FF:color text 1~~\n~~#FF0000,#0000FF:color text 2~~';
+
+		$inData = '<span style="color:rgb(255, 0, 0);background-color:rgb(0, 0, 255);">color text 1<br />color text 2</span>';
+		$out = $this->el->parseToWiki($inData);
+		$out = preg_replace('/\n/', '\n', $out); // fix LF encoding for comparison
 		$this->assertEquals($ex, $out);			
 	}
 	

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

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

[<mlustenberg@us...>]

Revision: 37435
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37435&view=rev
Author:   mlustenberg
Date:     2011-09-19 19:37:48 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] Visual Wiki: centerd and numberd headings were not converted correctly (the number was not replaces with a #)

Modified Paths:
--------------
    trunk/lib/test/editlib/ParseToWiki_TextTest.php
    trunk/lib/wiki/editlib.php

Modified: trunk/lib/test/editlib/ParseToWiki_TextTest.php
===================================================================
--- trunk/lib/test/editlib/ParseToWiki_TextTest.php	2011-09-19 19:33:37 UTC (rev 37434)
+++ trunk/lib/test/editlib/ParseToWiki_TextTest.php	2011-09-19 19:37:48 UTC (rev 37435)
@@ -245,7 +245,6 @@
 		/*
 		 * numbered
 		 */
-		$this->markTestIncomplete('Work in progress.');
 		$prefs['feature_use_three_colon_centertag'] = 'n';
 		$inData = '<h1 style="text-align: center;" class="showhide_heading" id="Heading">1. Heading</h1>';
 		$ex = '!#::Heading::';	

Modified: trunk/lib/wiki/editlib.php
===================================================================
--- trunk/lib/wiki/editlib.php	2011-09-19 19:33:37 UTC (rev 37434)
+++ trunk/lib/wiki/editlib.php	2011-09-19 19:37:48 UTC (rev 37435)
@@ -469,12 +469,18 @@
 
 	function parseToWiki( $inData ) {
 		
+		global $prefs;
+		
 		$parsed = $this->parse_html($inData);
 		$parsed = preg_replace('/\{img\(? src=.*?img\/smiles\/icon_([\w\-]*?)\..*\}/im','(:$1:)', $parsed);	// "unfix" smilies
 		$parsed = preg_replace('/&nbsp;/m',' ', $parsed);												// spaces
 		$parsed = preg_replace('/!(?:\d\.)+/', '!#', $parsed); // numbered headings
+		if ($prefs['feature_use_three_colon_centertag'] == 'y') { // numbered and centerd headings
+			$parsed = preg_replace('/!:::(?:\d\.)+ *(.*):::/', '!#:::\1:::', $parsed); 
+		} else {
+			$parsed = preg_replace('/!::(?:\d\.)+ *(.*)::/', '!#::\1::', $parsed); 
+		}
 		
-		
 		// Put back htmlentities as normal char
 		$parsed = htmlspecialchars_decode($parsed,ENT_QUOTES);
 		return $parsed;

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37434] trunk/lib/userslib.php

[<lphuberdeau@us...>]

Revision: 37434
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37434&view=rev
Author:   lphuberdeau
Date:     2011-09-19 19:33:37 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] Make the comment permissions available for object and category scope, rest of the code already supports it

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

Modified: trunk/lib/userslib.php
===================================================================
--- trunk/lib/userslib.php	2011-09-19 19:21:15 UTC (rev 37433)
+++ trunk/lib/userslib.php	2011-09-19 19:33:37 UTC (rev 37434)
@@ -2990,7 +2990,8 @@
 				'type' => 'comments',
 				'admin' => false,
 				'prefs' => array('feature_wiki_comments', 'feature_blogposts_comments', 'feature_file_galleries_comments', 'feature_image_galleries_comments', 'feature_article_comments', 'feature_faq_comments', 'feature_poll_comments', 'map_comments'),
-				'scope' => 'global',
+				'scope' => 'object',
+				'apply_to' => array('wiki', 'trackers', 'articles', 'blogs'),
 			),
 			array(
 				'name' => 'tiki_p_read_comments',
@@ -2999,7 +3000,8 @@
 				'type' => 'comments',
 				'admin' => false,
 				'prefs' => array('feature_wiki_comments', 'feature_blogposts_comments', 'feature_file_galleries_comments', 'feature_image_galleries_comments', 'feature_article_comments', 'feature_faq_comments', 'feature_poll_comments', 'map_comments'),
-				'scope' => 'global',
+				'scope' => 'object',
+				'apply_to' => array('wiki', 'trackers', 'articles', 'blogs'),
 			),
 			array(
 				'name' => 'tiki_p_admin_comments',
@@ -3008,7 +3010,8 @@
 				'type' => 'comments',
 				'admin' => true,
 				'prefs' => array('feature_wiki_comments', 'feature_blogposts_comments', 'feature_file_galleries_comments', 'feature_image_galleries_comments', 'feature_article_comments', 'feature_faq_comments', 'feature_poll_comments', 'map_comments'),
-				'scope' => 'global',
+				'scope' => 'object',
+				'apply_to' => array('wiki', 'trackers', 'articles', 'blogs'),
 			),
 			array(
 				'name' => 'tiki_p_edit_comments',
@@ -3017,7 +3020,8 @@
 				'type' => 'comments',
 				'admin' => false,
 				'prefs' => array('feature_wiki_comments', 'feature_blogposts_comments', 'feature_file_galleries_comments', 'feature_image_galleries_comments', 'feature_article_comments', 'feature_faq_comments', 'feature_poll_comments', 'map_comments'),
-				'scope' => 'global',
+				'scope' => 'object',
+				'apply_to' => array('wiki', 'trackers', 'articles', 'blogs'),
 			),
 			array(
 				'name' => 'tiki_p_remove_comments',
@@ -3026,7 +3030,8 @@
 				'type' => 'comments',
 				'admin' => false,
 				'prefs' => array('feature_wiki_comments', 'feature_blogposts_comments', 'feature_file_galleries_comments', 'feature_image_galleries_comments', 'feature_article_comments', 'feature_faq_comments', 'feature_poll_comments', 'map_comments'),
-				'scope' => 'global',
+				'scope' => 'object',
+				'apply_to' => array('wiki', 'trackers', 'articles', 'blogs'),
 			),
 			array(
 				'name' => 'tiki_p_vote_comments',
@@ -3035,7 +3040,8 @@
 				'type' => 'comments',
 				'admin' => false,
 				'prefs' => array('comments_vote'),
-				'scope' => 'global',
+				'scope' => 'object',
+				'apply_to' => array('wiki', 'trackers', 'articles', 'blogs'),
 			),
 			array(
 				'name' => 'tiki_p_admin_content_templates',

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37433] trunk/tiki-admin_categories.php

[<lphuberdeau@us...>]

Revision: 37433
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37433&view=rev
Author:   lphuberdeau
Date:     2011-09-19 19:21:15 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] Perm type for category is category, not all, meaning that only permissions that can actually be assigned to a category will be listed

Modified Paths:
--------------
    trunk/tiki-admin_categories.php

Modified: trunk/tiki-admin_categories.php
===================================================================
--- trunk/tiki-admin_categories.php	2011-09-19 19:16:21 UTC (rev 37432)
+++ trunk/tiki-admin_categories.php	2011-09-19 19:21:15 UTC (rev 37433)
@@ -291,7 +291,7 @@
 			$title = tra('Assign Permissions');
 			$icon = 'key';
 		}
-		$data .= '<a href="tiki-objectpermissions.php?objectType=category&amp;objectId=' . $category['categId'] . '&amp;objectName=' . urlencode($category['name']) . '&amp;permType=all">' . smarty_function_icon(array('_id'=>$icon, 'alt'=>$title), $smarty) . '</a>';
+		$data .= '<a href="tiki-objectpermissions.php?objectType=category&amp;objectId=' . $category['categId'] . '&amp;objectName=' . urlencode($category['name']) . '&amp;permType=category">' . smarty_function_icon(array('_id'=>$icon, 'alt'=>$title), $smarty) . '</a>';
 	}
 	
 	$data .= '<a class="catname" href="tiki-admin_categories.php?parentId=' . $category["categId"] . '">' . htmlspecialchars($category['name']) .'</a> ';

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37432] trunk/lib/test/editlib

[<mlustenberg@us...>]

Revision: 37432
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37432&view=rev
Author:   mlustenberg
Date:     2011-09-19 19:16:21 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[ENH] More tests for EditLib (need to fix numbered and centerd headings)

Modified Paths:
--------------
    trunk/lib/test/editlib/ParseToWiki_TextTest.php
    trunk/lib/test/editlib/ParseToWysiwyg_TextTest.php

Modified: trunk/lib/test/editlib/ParseToWiki_TextTest.php
===================================================================
--- trunk/lib/test/editlib/ParseToWiki_TextTest.php	2011-09-19 18:58:41 UTC (rev 37431)
+++ trunk/lib/test/editlib/ParseToWiki_TextTest.php	2011-09-19 19:16:21 UTC (rev 37432)
@@ -218,6 +218,48 @@
 	}
 	
 	
+	/** 
+	 * Centered headings must use style attribute
+	 */
+	function testCenterdHeadings() {
+		
+		global $prefs;
+		
+		
+		#
+		# unnumbered
+		#
+		$prefs['feature_use_three_colon_centertag'] = 'n';
+		$inData = '<h1 style="text-align: center;" class="showhide_heading" id="Heading">Heading</h1>';
+		$ex = '!::Heading::';
+		$out = trim( $this->el->parseToWiki($inData) );
+		$this->assertEquals($ex, $out);
+		
+		$prefs['feature_use_three_colon_centertag'] = 'y';
+		$inData = '<h1 style="text-align: center;" class="showhide_heading" id="Heading">Heading</h1>';
+		$ex = '!:::Heading:::';
+		$out = trim( $this->el->parseToWiki($inData) );
+		$this->assertEquals($ex, $out);
+		
+		
+		/*
+		 * numbered
+		 */
+		$this->markTestIncomplete('Work in progress.');
+		$prefs['feature_use_three_colon_centertag'] = 'n';
+		$inData = '<h1 style="text-align: center;" class="showhide_heading" id="Heading">1. Heading</h1>';
+		$ex = '!#::Heading::';	
+		$out = trim( $this->el->parseToWiki($inData) );
+		$this->assertEquals($ex, $out);		
+		
+		$prefs['feature_use_three_colon_centertag'] = 'y';
+		$inData = '<h1 style="text-align: center;" class="showhide_heading" id="Heading">1. Heading</h1>';
+		$ex = '!#:::Heading:::';	
+		$out = trim( $this->el->parseToWiki($inData) );
+		$this->assertEquals($ex, $out);				
+	}	
+	
+	
 	/**
 	 * Headings 1-6
 	 */

Modified: trunk/lib/test/editlib/ParseToWysiwyg_TextTest.php
===================================================================
--- trunk/lib/test/editlib/ParseToWysiwyg_TextTest.php	2011-09-19 18:58:41 UTC (rev 37431)
+++ trunk/lib/test/editlib/ParseToWysiwyg_TextTest.php	2011-09-19 19:16:21 UTC (rev 37432)
@@ -137,6 +137,45 @@
 	}	
 	
 	
+	/** 
+	 * Centered headings must use style attribute
+	 */
+	function testCenterdHeadings() {
+		global $prefs;
+		
+		#
+		# unnumbered
+		#
+		$prefs['feature_use_three_colon_centertag'] = 'n';		
+		$inData = '!::Heading::';
+		$ex = '<h1 style="text-align: center;" class="showhide_heading" id="Heading">Heading</h1>';
+		$out = trim( $this->el->parseToWysiwyg($inData) );
+		$this->assertEquals($ex, $out);
+		
+		$prefs['feature_use_three_colon_centertag'] = 'y';		
+		$inData = '!:::Heading:::';
+		$ex = '<h1 style="text-align: center;" class="showhide_heading" id="Heading">Heading</h1>';
+		$out = trim( $this->el->parseToWysiwyg($inData) );
+		$this->assertEquals($ex, $out);
+		
+		
+		/*
+		 * numbered
+		 */
+		$prefs['feature_use_three_colon_centertag'] = 'n';		
+		$inData = '!#::Heading::';
+		$ex = '<h1 style="text-align: center;" class="showhide_heading" id="Heading">1. Heading</h1>';
+		$out = trim( $this->el->parseToWysiwyg($inData) );
+		$this->assertEquals($ex, $out);
+		
+		$prefs['feature_use_three_colon_centertag'] = 'y';		
+		$inData = '!#:::Heading:::';
+		$ex = '<h1 style="text-align: center;" class="showhide_heading" id="Heading">1. Heading</h1>';
+		$out = trim( $this->el->parseToWysiwyg($inData) );
+		$this->assertEquals($ex, $out);
+	}
+	
+	
 	/**
 	 * Headings 1-6
 	 */

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37431] trunk/lib/parser/parserlib.php

[<mlustenberg@us...>]

Revision: 37431
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37431&view=rev
Author:   mlustenberg
Date:     2011-09-19 18:58:41 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[MOD] Use the <h#> style attribute to center headings instead of a nested <div>. 
This improves how numbered and centered headings are displayed and simplifies the implementation of the Visual Wiki.

Modified Paths:
--------------
    trunk/lib/parser/parserlib.php

Modified: trunk/lib/parser/parserlib.php
===================================================================
--- trunk/lib/parser/parserlib.php	2011-09-19 18:54:14 UTC (rev 37430)
+++ trunk/lib/parser/parserlib.php	2011-09-19 18:58:41 UTC (rev 37431)
@@ -2500,10 +2500,15 @@
 							$button = '';
 						}
 
+						// replace <div> with <h> style attribute
+						$do_center = 0;
+						$title_text = preg_replace('/<div style="text-align: center;">(.*)<\/div>/', '\1', $title_text, 1, $do_center);
+						$style = $do_center ? ' style="text-align: center;"' : '';
+
 						if ( $prefs['feature_wiki_show_hide_before'] == 'y' ) {
-							$line = $button.'<h'.($hdrlevel).' class="showhide_heading" id="'.$thisid.'">'.$aclose.' '.$title_text.'</h'.($hdrlevel).'>'.$aclose2;
+							$line = $button.'<h'.($hdrlevel).$style.' class="showhide_heading" id="'.$thisid.'">'.$aclose.' '.$title_text.'</h'.($hdrlevel).'>'.$aclose2;
 						} else {
-							$line = $button.'<h'.($hdrlevel).' class="showhide_heading" id="'.$thisid.'">'.$title_text.'</h'.($hdrlevel).'>'.$aclose.$aclose2;
+							$line = $button.'<h'.($hdrlevel).$style.' class="showhide_heading" id="'.$thisid.'">'.$title_text.'</h'.($hdrlevel).'>'.$aclose.$aclose2;
 						}
 					} elseif (!strcmp($line, $prefs['wiki_page_separator'])) {
 						// Close open paragraph, lists, and div's

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37430] trunk/tiki-admin_categories.php

[<chealer@us...>]

Revision: 37430
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37430&view=rev
Author:   chealer
Date:     2011-09-19 18:54:14 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] typo

Modified Paths:
--------------
    trunk/tiki-admin_categories.php

Modified: trunk/tiki-admin_categories.php
===================================================================
--- trunk/tiki-admin_categories.php	2011-09-19 18:35:34 UTC (rev 37429)
+++ trunk/tiki-admin_categories.php	2011-09-19 18:54:14 UTC (rev 37430)
@@ -283,7 +283,7 @@
 	$data = '<a href="tiki-admin_categories.php?parentId=' . $category['parentId'] . '&amp;categId=' . $category['categId'] . '" title="' . tra('Edit') . '">' . smarty_function_icon(array('_id'=>'page_edit'), $smarty) . '</a>';
 	$data .= '<a href="tiki-admin_categories.php?parentId=' . $category['parentId'] . '&amp;removeCat=' . $category['categId'] . '" title="' . tra('Delete') . '">' . smarty_function_icon(array('_id'=>'cross'), $smarty) . '</a>';
 
-	if ($tiki_p_asdmin_categories == 'y') {
+	if ($tiki_p_admin_categories == 'y') {
 		if ($userlib->object_has_one_permission($category['categId'], 'category')) {
 			$title = tra('Edit permissions for this category');
 			$icon = 'key_active';

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37429] branches/experimental/innodb

[<lphuberdeau@us...>]

Revision: 37429
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37429&view=rev
Author:   lphuberdeau
Date:     2011-09-19 18:35:34 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[MRG] Automatic merge, trunk 37368 to 37426

Modified Paths:
--------------
    branches/experimental/innodb/css/admin.css
    branches/experimental/innodb/lang/de/language.php
    branches/experimental/innodb/lang/fr/language.php
    branches/experimental/innodb/lib/core/Tracker/Definition.php
    branches/experimental/innodb/lib/core/Tracker/Field/Numeric.php
    branches/experimental/innodb/lib/core/Tracker/Item.php
    branches/experimental/innodb/lib/jquery_tiki/tiki-jquery.js
    branches/experimental/innodb/lib/modules/modlib.php
    branches/experimental/innodb/lib/parser/parser_template.php
    branches/experimental/innodb/lib/prefs/feature.php
    branches/experimental/innodb/lib/sheet/grid.php
    branches/experimental/innodb/lib/smarty_tiki/modifier.money_format.php
    branches/experimental/innodb/lib/smarty_tiki/modifier.number_format.php
    branches/experimental/innodb/lib/test/editlib/ParseToWiki_TextTest.php
    branches/experimental/innodb/lib/tikiaccesslib.php
    branches/experimental/innodb/lib/toolbars/toolbarslib.php
    branches/experimental/innodb/lib/trackers/trackerlib.php
    branches/experimental/innodb/lib/trackers/trackerquerylib.php
    branches/experimental/innodb/lib/userslib.php
    branches/experimental/innodb/lib/wiki/editlib.php
    branches/experimental/innodb/lib/wiki-plugins/wikiplugin_tabs.php
    branches/experimental/innodb/lib/wiki-plugins/wikiplugin_tracker.php
    branches/experimental/innodb/lib/wiki-plugins/wikiplugin_trackeritemcopy.php
    branches/experimental/innodb/modules/mod-func-change_category.php
    branches/experimental/innodb/modules/mod-func-last_podcasts.php
    branches/experimental/innodb/modules/mod-func-since_last_visit_new.php
    branches/experimental/innodb/templates/admin/include_list_sections.tpl
    branches/experimental/innodb/templates/tiki-accounting.tpl
    branches/experimental/innodb/templates/tiki-accounting_account_list.tpl
    branches/experimental/innodb/templates/tiki-accounting_account_view.tpl
    branches/experimental/innodb/templates/tiki-accounting_accounts_csv.tpl
    branches/experimental/innodb/templates/tiki-accounting_books.tpl
    branches/experimental/innodb/templates/tiki-accounting_cancel.tpl
    branches/experimental/innodb/templates/tiki-accounting_journal.tpl
    branches/experimental/innodb/templates/tiki-accounting_journal_csv.tpl
    branches/experimental/innodb/templates/tiki-accounting_stacklist.tpl
    branches/experimental/innodb/templates/tiki-admin_banning.tpl
    branches/experimental/innodb/templates/tiki-admin_categories.tpl
    branches/experimental/innodb/templates/tiki-list_comments.tpl
    branches/experimental/innodb/templates/tiki-searchresults.tpl
    branches/experimental/innodb/templates/tiki-view_tracker.tpl
    branches/experimental/innodb/templates/tiki-view_tracker_item.tpl
    branches/experimental/innodb/templates/tracker_pretty_item.tpl
    branches/experimental/innodb/templates/wiki-plugins/wikiplugin_tabs.tpl
    branches/experimental/innodb/tiki-admin_banning.php
    branches/experimental/innodb/tiki-admin_categories.php
    branches/experimental/innodb/tiki-edit_invoice.php
    branches/experimental/innodb/tiki-list_comments.php
    branches/experimental/innodb/tiki-list_invoice_clients.php
    branches/experimental/innodb/tiki-list_invoices.php
    branches/experimental/innodb/tiki-tracker_export_join.php
    branches/experimental/innodb/tiki-tracker_reports.php
    branches/experimental/innodb/tiki-view_invoice.php
    branches/experimental/innodb/tiki-view_tracker.php
    branches/experimental/innodb/tiki-view_tracker_item.php

Added Paths:
-----------
    branches/experimental/innodb/lib/core/Tracker/Field/Currency.php
    branches/experimental/innodb/lib/test/editlib/ParseToWiki_ListTest.php
    branches/experimental/innodb/lib/test/editlib/ParseToWysiwyg_ListTest.php
    branches/experimental/innodb/pics/icons/ban_remove.png
    branches/experimental/innodb/templates/trackeroutput/currency.tpl

Removed Paths:
-------------
    branches/experimental/innodb/lib/smarty_tiki/modifier.currency.php

Property Changed:
----------------
    branches/experimental/innodb/
    branches/experimental/innodb/lib/payment/behavior/cancel_membership_extension.php
    branches/experimental/innodb/lib/test/TestableTikiLib.php
    branches/experimental/innodb/lib/test/TikiLib/LibTest.php
    branches/experimental/innodb/lib/test/TikiLib/TestableTikiLibTest.php
    branches/experimental/innodb/lib/test/reporstlib/ReportsLibTest.php


Property changes on: branches/experimental/innodb
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409,33409
/branches/7.x:33633-36216,36238,36257,36453
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/foreign-storage:34822-34895
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal:31497
/branches/proposals/4.x:24005
/trunk:37262-37368
   + /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409,33409
/branches/7.x:33633-36216,36238,36257,36453
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/foreign-storage:34822-34895
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal:31497
/branches/proposals/4.x:24005
/trunk:37262-37426

Modified: branches/experimental/innodb/css/admin.css
===================================================================
--- branches/experimental/innodb/css/admin.css	2011-09-19 18:34:33 UTC (rev 37428)
+++ branches/experimental/innodb/css/admin.css	2011-09-19 18:35:34 UTC (rev 37429)
@@ -1,8 +1,8 @@
 /* $Id$ */
 
 a.admbox {
-	height: 100px;
-	width: 100px;
+	height: 98px;
+	width: 98px;
 	text-align: center;
 	vertical-align: middle;
 	overflow: hidden;

Modified: branches/experimental/innodb/lang/de/language.php
===================================================================
--- branches/experimental/innodb/lang/de/language.php	2011-09-19 18:34:33 UTC (rev 37428)
+++ branches/experimental/innodb/lang/de/language.php	2011-09-19 18:35:34 UTC (rev 37429)
@@ -418,8 +418,8 @@
 "You are not permitted to remove someone else's post!" => "Keine Erlaubnis zum Löschen von Beiträgen anderer Benutzer!",
 "No forum indicated" => "Kein Forum angegeben",
 "You do not have permission to edit messages %0" => "Du hast nicht die Berechtigung die Nachrichten von %0 zu bearbeiten",
-// "Wrong file type, expected %0" => "Wrong file type, expected %0",
-// "You do not have permission to view/edit this file" => "You do not have permission to view/edit this file",
+"Wrong file type, expected %0" => "Falscher Dateityp. Erwartet wurde %0",
+"You do not have permission to view/edit this file" => "Du hast keine Berechtigung diese Datei anzusehen/zu bearbeiten",
 "Saving.." => "Speichere..",
 "rss feed disabled" => "RSS Feed nicht aktiv",
 "You do not have permission to edit this blog" => "Zugriff verweigert.Du kannst diesen Blog nicht bearbeiten",
@@ -522,7 +522,7 @@
 "You have to provide a word" => "Es muß ein Wort angegeben werden",
 "Are you sure you want to delete this Custom Module" => "Bist Du sicher, dass Du dieses benutzerdefinierte Modul löschen willst",
 "Module" => "Modul",
-// "Appearance" => "Appearance",
+"Appearance" => "Erscheidungsbild",
 "Visibility" => "Sichtbarkeit",
 "Cannot create or update module: You need to specify a name to the module" => "Kann kein Modul erstellen/aktualiseren: Du musst einen Namen für das Modul angeben",
 "Cannot create or update module: You cannot leave the data field empty" => "Kann kein Modul erstellen/aktualiseren: Du darfst das Datenfeld nicht leer lassen",
@@ -644,9 +644,9 @@
 "Payment canceled" => "Bezahlung abgebrochen",
 "Admin Directory" => "Linkverzeichnis verwalten",
 "TOP" => "TOP",
-// "Are you sure you want to permanently remove the submitted article with identifier %0" => "Are you sure you want to permanently remove the submitted article with identifier %0",
-// "Are you sure you want to permanently remove these %0 submitted articles" => "Are you sure you want to permanently remove these %0 submitted articles",
-// "Are you sure you want to approve these %0 submitted articles" => "Are you sure you want to approve these %0 submitted articles",
+"Are you sure you want to permanently remove the submitted article with identifier %0" => "Bist Du sicher, dass Du den eingerechten Artikel mit der ID %0 dauerhaft löschen willst",
+"Are you sure you want to permanently remove these %0 submitted articles" => "Bist Du sicher, dass Du diese %0 eingereichten Artikel dauerhaft löschen willst",
+"Are you sure you want to approve these %0 submitted articles" => "Are you sure you want to approve these %0 submitted articles",
 "System" => "System",
 "System Gallery" => "Systemgalerie",
 "No gallery indicated" => "Keine Galerie angegeben",
@@ -687,7 +687,7 @@
 "Unknown formatting rule '%0' for '%1'" => "Unbekannte Formatierungsregel '%0' für '%1'",
 "%0 (latest)" => "%0 (letzten)",
 "User Subscription" => "Benutzerabonnement",
-// "Allows registered users to subscribe themselves to a tracker item. The item should ideally only be editable by the creator or administrators. Prepend the maximum amount of subscribers to the field value if such a limit is desired" => "Allows registered users to subscribe themselves to a tracker item. The item should ideally only be editable by the creator or administrators. Prepend the maximum amount of subscribers to the field value if such a limit is desired",
+"Allows registered users to subscribe themselves to a tracker item. The item should ideally only be editable by the creator or administrators. Prepend the maximum amount of subscribers to the field value if such a limit is desired" => "Erlaubt es registrierten Benutzern einen Trackereintrag zu abonnieren. Der Eintrag sollte idealerweise nur durch den Ersteller oder eunen Administrator bearbeitbar sein. Hänge die maximale Anzahl von Abonnenten an den Feldwert hinten an, wenn eine solche Beschränkung gewünscht ist",
 "Items List" => "Objektliste",
 "Displays a list of field values from another tracker that has a relation with this tracker" => "Zeigt eine Liste mit Feldwerten aus einem anderen Tracker, der eine Verbindung mit diesem Tracker hat",
 "Tracker ID" => "Tracker ID",
@@ -860,7 +860,7 @@
 "Cannot write to this file" => "Kann diese Datei nicht schreiben",
 "URL" => "URL",
 "Creates a link to a specified URL" => "Erstellt einen Link zu einer angegebene URL",
-// "How the URL should be rendered" => "How the URL should be rendered",
+"How the URL should be rendered" => "Wie eine URL behandelt werden soll",
 "Plain" => "flach",
 "Language" => "Sprache",
 "Assign a language to the tracker item to enable multilingual trackers" => "Weise dem Tracker-Eintrag eine Sprache zu um mehrsprachige Tracker zu aktivieren",
@@ -894,15 +894,15 @@
 "Display text to allow new items to be added - e.g. \"Add item...\" (requires jQuery-UI)" => "Anzuzeigender Text, wenn neue Objekte hinzugefügt werden, z.B. \"Füge Objekt ... hinzu\" (erfordert jQuery-UI)",
 "Add Item Template Page" => "Füge Objekt Vorlagenseite hinzu",
 "Wiki page to use as a Pretty Tracker template" => "Wiki Seite für die Vorlage für schönen Tracker",
-// "Preselect item based on value in this field" => "Preselect item based on value in this field",
-// "Preselect item based on value in specified field ID of item being edited" => "Preselect item based on value in specified field ID of item being edited",
-// "Preselect based on value in this remote field" => "Preselect based on value in this remote field",
-// "Match preselect item with this field ID in tracker that is being linked to" => "Match preselect item with this field ID in tracker that is being linked to",
-// "Preselection matching method" => "Preselection matching method",
-// "Method to use to match fields for preselection purposes" => "Method to use to match fields for preselection purposes",
+"Preselect item based on value in this field" => "Vorausgewählter Eintrag, basierend auf dem Wert in diesem Feld",
+"Preselect item based on value in specified field ID of item being edited" => "Vorausgewählter Eintrag, basierend auf dem Wert in einem angegebenen Feld (ID) eines bearbeiteten Eintrags",
+"Preselect based on value in this remote field" => "Vorausgewählter Eintrag, basierend auf einem Ziel-Feld",
+"Match preselect item with this field ID in tracker that is being linked to" => "Gleiche vorausgewähltes Eintrag mit dieser Feld-ID im Tracker ab, der verlinkt ist",
+"Preselection matching method" => "Methode für Abgleich für vorausgewählten Eintrag",
+"Method to use to match fields for preselection purposes" => "Zu benutzende Methode für den Feldabgleich zum Zweck der Vorauswahl",
 "Exact Match" => "Exakte Übereinstimmung",
-// "Field here is part of field there" => "Field here is part of field there",
-// "Match domain, used for URL fields" => "Match domain, used for URL fields",
+"Field here is part of field there" => "Das Feld hier ist Teil des Feldes dort",
+"Match domain, used for URL fields" => "Gleiche Domäne ab. Für URL-Felder zu benutzen",
 "Page Selector" => "Seitenauswahl",
 "Allows a selection from the list of pages" => "Erlaubt eine Auswahl aus einer Liste von Seiten",
 "Will auto-assign the creator of the item" => "Fügt automatisch den Ersteller eines Eintrages hinzu",
@@ -946,7 +946,7 @@
 "Thousand separator" => "Tausendertrennzeichen",
 "Currency Field" => "Währungsfeld",
 "Computed Field" => "Berechnetes Feld",
-// "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type" => "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type",
+"Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type" => "Erstellt einen berechneten Wert, basierend auf nummerischen Feldwerten. Du solltest erwägen hierfür einen Webdienst oder Javaskript zu benutzen (anstelle dieses Typs)",
 "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field" => "Diese Funktion ist noch in Benutzung um rückwärtige Kompatibilität sicherzustellen. Auch wenn hiermit keine Fehler verbunden sind, kann es als Überträger für Attacken benutzten werden, die hohen Schaden verursachen. Ein Webdienst-Feld oder benutzerdefinierter Javaskript ist anstelle dieses Feldes empfohlen",
 "Formula" => "Formel",
 "The formula to be computed supporting various operators (+ - * / and parenthesis), references to other field made using the field id preceeded by #" => "Die zu berechnende Formel mit verschiedenen Operatoren (+ - * / und Klammern). Verweise auf andere Felder werden mit der Feld-ID und einem vorangestellten # erstellt",
@@ -1031,19 +1031,19 @@
 "Set" => "Ok",
 "Plugin disabled" => "Plugin deaktiviert",
 "Feature disabled" => "Funktion deaktiviert",
-// "Reserved to administrators during development" => "Reserved to administrators during development",
-// "Tiki not connected. Please click \"Send Info\" to join in" => "Tiki not connected. Please click \"Send Info\" to join in",
-// "Something went wrong. Tiki Connect is still experimental. Please try again" => "Something went wrong. Tiki Connect is still experimental. Please try again",
-// "registration" => "registration",
-// "confirmation" => "confirmation",
-// "Connect Feature disabled" => "Connect Feature disabled",
-// "Connect Server Mode disabled" => "Connect Server Mode disabled",
-// "Please confirm you want to participate in Tiki Connect" => "Please confirm you want to participate in Tiki Connect",
-// "Welcome to Tiki Connect, please click \"Send Info\" when you want to make a connection" => "Welcome to Tiki Connect, please click \"Send Info\" when you want to make a connection",
-// "Something went wrong on the server. Tiki Connect is still experimental" => "Something went wrong on the server. Tiki Connect is still experimental",
-// "Captcha code problem" => "Captcha code problem",
-// "Connect data received, thanks" => "Connect data received, thanks",
-// "Your Tiki is not registered here yet, please try again" => "Your Tiki is not registered here yet, please try again",
+"Reserved to administrators during development" => "Reserviert für Administratoren während der Entwicklung",
+"Tiki not connected. Please click \"Send Info\" to join in" => "Tiki ist nicht verbunden. Klicke auf \"Sende Info\" um mitzumachen",
+"Something went wrong. Tiki Connect is still experimental. Please try again" => "Etwas ist fehlgeschlagen. Tiki Connect ist immer noch experimentell. Versuche es bitte erneut",
+"registration" => "Registrierung",
+"confirmation" => "Bestätigung",
+"Connect Feature disabled" => "Connect-Funktion deaktiviert",
+"Connect Server Mode disabled" => "Connect-Server-Modus deaktiviert",
+"Please confirm you want to participate in Tiki Connect" => "Bitte bestätige, dass Du an Tiki Connect teilnehmen möchtest",
+"Welcome to Tiki Connect, please click \"Send Info\" when you want to make a connection" => "Willkommen bei Tiki Connect. Klicke bitte auf \"Sende Info\", wenn Du einen Verbindung herstellen willst",
+"Something went wrong on the server. Tiki Connect is still experimental" => "Etwas ist auf dem Server fehlgeschlagen. Tiki Connect ist immer noch experimentell",
+"Captcha code problem" => "Captcha-Code-Problem",
+"Connect data received, thanks" => "Connect-Daten erhalten. Danke",
+"Your Tiki is not registered here yet, please try again" => "Deine Tiki ist hier noch nicht registriert. Versuche es bitte nochmals",
 "Object has no language and cannot be translated" => "Objekt hat keine Sprache und kann nicht übersetzt werden",
 "Feature Disabled" => "Funktion deaktiviert",
 "Translation not supported for the specified object type" => "Übersetzung ist für den angegebenen Objekttyp nicht verfügbar",
@@ -1060,8 +1060,8 @@
 "Reserved to tracker administrators" => "Für Tracker-Administratoren reserviert",
 "Type does not exist" => "Typ existiert nicht",
 "Not allowed to view the tracker" => "Es ist nicht erlaubt, Tracker anzusehen",
-// "Tracker contains no listed field, no meaningful information will be provided in the default list" => "Tracker contains no listed field, no meaningful information will be provided in the default list",
-// "Tracker contains no field in the title, no link will be generated" => "Tracker contains no field in the title, no link will be generated",
+"Tracker contains no listed field, no meaningful information will be provided in the default list" => "Tracker enthält kein aufgelistetes Feld. Es werden keine sinnvollen Daten in der Standardliste ausgegeben",
+"Tracker contains no field in the title, no link will be generated" => "Tracker enthält kein Feld im Titel. Es wird kein Link erstellt",
 "Captcha" => "Captcha",
 "Distinct" => "Verschieden",
 "Page Name" => "Seitenname",
@@ -1069,30 +1069,30 @@
 "Regular Expression (Pattern)" => "Regulärer Ausdruck (Muster)",
 "User Name" => "Benutzername",
 "Invalid data provided" => "Ungültige Daten",
-// "Not allowed to export" => "Not allowed to export",
-// "No valid field selected for export" => "No valid field selected for export",
-// "File upload failed" => "File upload failed",
-// "Uploaded file could not be read" => "Uploaded file could not be read",
+"Not allowed to export" => "Exportieren ist nicht erlaubt",
+"No valid field selected for export" => "Kein gültiges Feld für den Export gewählt",
+"File upload failed" => "Hochladen der Datei ist fehlgeschlagen",
+"Uploaded file could not be read" => "Hochgeladene Datei konnte nicht gelesen werden",
 "Last Modification" => "Letzte Änderung",
 "Filename" => "Dateiname",
 "Creation date" => "Erstelldatum",
 "Views" => "Ansichten",
 "Comment" => "Kommentar",
-// "File size" => "File size",
+"File size" => "Dateigröße",
 "Version" => "Version",
-// "File type" => "File type",
-// "Long description" => "Long description",
+"File type" => "Dateityp",
+"Long description" => "Lange Beschreibung",
 "User" => "Benutzer",
 "Field does not exist in tracker" => "Feld existiert nicht im Tracker",
 "Remote Source" => "Remote Quelle",
 "Automatically generated field for synchronized trackers. Contains the itemId of the remote item" => "Automatisch erstelltes Feld für synchronisierte Tracker. Enthält die Eintrag-ID des Remote-Eintrags",
 "Tracker does not exist" => "Tracker existiert nicht",
 "Tracker is not synchronized with a remote source" => "Der Tracker ist nicht mit der Remote-Quelle synchronisiert",
-// "Operation reserved for tracker administrators" => "Operation reserved for tracker administrators",
+"Operation reserved for tracker administrators" => "Operation ist für Tracker-Administratoren reserviert",
 "Field Required" => "Feld erforderlich",
 "Feature disabled: %0" => "Deaktivierte Funktion: %0",
 "\"%0\" already exists" => "\"%0\" existiert bereits",
-// "Not found" => "Not found",
+"Not found" => "Nicht gefunden",
 "Permission Denied" => "Zugriff verweigert",
 "Invalid data" => "Falsche Daten",
 "Controller not found (%0)" => "Kontroller nicht gefunden (%0)",
@@ -1259,8 +1259,8 @@
 "Multi-domain Configuration" => "Multi-domain Konfiguration",
 "Comma-separated values mapping the domain name to the perspective ID" => "Komma-separierte Werte mit dem der Domänenname auf die entsprechende Perspektiven-ID abgebildet wird",
 "One domain per line. Comma separated with perspective ID. Ex.: tiki.org,1" => "Eine Domain pro Zeile. Perspektiven werden durch Komme getrennt. Bsp.: tiki.org,1",
-// "Switch domain when switching perspective" => "Switch domain when switching perspective",
-// "Remember that different domains have different login sessions and even in the case of subdomains you need to have an understanding of session cookies to make it work" => "Remember that different domains have different login sessions and even in the case of subdomains you need to have an understanding of session cookies to make it work",
+"Switch domain when switching perspective" => "Schalte Domäne um wenn die Perspektive umgeschaltet wird",
+"Remember that different domains have different login sessions and even in the case of subdomains you need to have an understanding of session cookies to make it work" => "Bedenke, dass verschiedene Domänen verschiedene Login-Sitzungen haben. Selbst bei Subdomänen musst Du mit session cookies umgehen können, damit es funktioniert",
 "Default number per page" => "Standardanzahl pro Seite",
 "Default ordering" => "Standardsortierung",
 "Newest first" => "Neueste zuerst",
@@ -1353,8 +1353,8 @@
 "URL to go to when clicking on a username" => "Angesteuerte URL, wenn Benutzername geklickt wird",
 "Default" => "Standard",
 "Use %user% for login name and %userId% for userId)" => "Benutze %user% für den Loginnamen und %userId% für die BenutzerID)",
-// "Forgot password" => "Forgot password",
-// "Users can request to reset password. They will receive a link by email" => "Users can request to reset password. They will receive a link by email",
+"Forgot password" => "Passwort vergessen",
+"Users can request to reset password. They will receive a link by email" => "Benutzer können die Zurücksetzung des Passworts anfordern. Sie erhalten einen Link per Email",
 "Each group can have its theme" => "Jede Gruppe kann ihr eigenes Theme benutzen",
 "Site title" => "Site-Titel",
 "Subtitle" => "Untertitel",
@@ -1422,7 +1422,7 @@
 "Set Forum homepage first" => "Zuerst ist die Forumseite einzustellen",
 "Forum" => "Forum",
 "Custom home" => "Angepasstes Home",
-// "Since passwords are encrypted, it's not possible to tell the user what the password is. It's only possible to change it" => "Since passwords are encrypted, it's not possible to tell the user what the password is. It's only possible to change it",
+"Since passwords are encrypted, it's not possible to tell the user what the password is. It's only possible to change it" => "Weil Passwörter verschlüsselt sind, können diese dem Benutzer nicht mitgeteilt werden. Nur ÄNderungen der Passwörter sind möglich",
 "Validate user's email server" => "Validiere E-Mail-Server des Benutzers",
 "The group will be named identical to the user's username" => "The Benutzergruppe erhält den Namen des neuen Benutzers",
 "User's choice" => "Benutzerwahl",
@@ -1764,8 +1764,8 @@
 "Last post" => "Neuester Eintrag",
 "Hide titles for forum threads" => "Verstecke Titel für Forumthreads",
 "Most titles are left untouched because they are a direct reply to the parent thread. This feature hides the title altogether from the forms and display" => "Die meissten Titel bleiben unverändert, da sie in direkter Antwort auf den vorherigen Forumseintrag erfolgen. Diese Einstellung versteckt die Titel in Formularen und in der Anzeige",
-// "Force title in reply" => "Force title in reply",
-// "Shows a blank title box and requires it to be filled before submission of forum post" => "Shows a blank title box and requires it to be filled before submission of forum post",
+"Force title in reply" => "Erzwinge Titel in Antwort",
+"Shows a blank title box and requires it to be filled before submission of forum post" => "Zeigt eine leere Titel-Box, die ausgefüllt werden muss, bevor ein Forumeintrag eingereicht werden kann",
 "Do not prefix messages titles by 'Re: '" => "Entferne Präfix 'Re: ' bzw. 'Aw:' von Nachrichtentiteln",
 "Creation Date (asc)" => "Erstellungsdatum (aufsteigend)",
 "Topics (desc)" => "Themen (absteigend)",
@@ -1787,7 +1787,7 @@
 "Session cookie name used instead of the PHP default configuration" => "Name des Sitzungs-Cookies der anstelle der Standard-PHP-Konfiguration verwendet werden soll",
 "Protect all sessions" => "Schütze alle Sitzungen",
 "Always redirect to HTTPS to prevent session hijack through network sniffing" => "Immer zu HTTPS weiterleiten, um zu verhindern, dass die Sitzung durch Netzwerk-Sniffing entführt wird",
-// "Only activate if you have already configured SSL, otherwise, your will lock yourself of Tiki" => "Only activate if you have already configured SSL, otherwise, your will lock yourself of Tiki",
+"Only activate if you have already configured SSL, otherwise, your will lock yourself of Tiki" => "Nur aktivieren, wenn Du zuvor SSL konfiguriert hast. Andernfalls schließt Du Dich aus Deiner Tiki aus",
 "Use direct pagination links" => "Seitennavigation über Seitenzahlen",
 "Max. number of links around the current item" => "Maximimale Zahl von Links um das aktuelle Objekt",
 "Max. number of links after the first or before the last item" => "Maximimale Zahl von Links nach dem ersten oder vor dem letzten Objekt",
@@ -2032,8 +2032,8 @@
 "Store full-size copy of avatar in file gallery" => "Speichere Kopie des Avatar in voller Größe in den Dateiarchiven",
 "File gallery to store full-size copy of avatar in" => "Dateiarchiv benutzen um eine Kopie des Avatars in voller Größe zu speichern",
 "Enter the gallery id here. Please create a dedicated gallery that is admin-only for security, or make sure gallery permissions are set so that only admins can edit" => "Trage die Archiv-ID hier ein. Bitte erstelle ein zweckbestimmtes Archiv, welches aus Sicherheitsgründen nur für Administratoren ist oder stelle sicher, dass Dateiarchiv-Berechtigungen so eingestellt sind, dass nur Administratoren bearbeiten können",
-// "File ID of default avatar image" => "File ID of default avatar image",
-// "File ID of image to use in file gallery as the avatar if user has no avatar image in file galleries" => "File ID of image to use in file gallery as the avatar if user has no avatar image in file galleries",
+"File ID of default avatar image" => "Datei-ID des Standard-Avatr-Bildes",
+"File ID of image to use in file gallery as the avatar if user has no avatar image in file galleries" => "Datei-ID des im Dateiarchiv zu benutzenden Bildes als Avatr, wenn der Benutzer kein Avatarbild hat",
 "Display who viewed my stuff on the user information page" => "Zeige an, wer meine Sachen auf der Benutzerinformationseite angesehen hat",
 "You will need to activate tracking of views for various items in the action log for this to work" => "Du musst die Überwachung des Ansehens verschiedener Objekte im Aktionslog aktivieren, damit dies funktoniert",
 "Number of days to consider who viewed my stuff" => "Anzahl Tage, um zu überdenken, wer meine Sachen angesehen hat",
@@ -2054,7 +2054,7 @@
 "Synchronize categories of user tracker item to user groups" => "Synchronisiere Kategorieren des Benutzer-Trackereintrags zu Benutzergruppen",
 "Will add the user tracker item to the category of the same name as the user groups and vice versa" => "Fügt den Trackereintrag des Benutzers zur Kategorie hinzu, wenn Kategoriename gleich dem Gruppennamen ist und vice versa",
 "Put user in group only if categorized within" => "Weise Benutzer einer Gruppe zu, wenn in einer der folgenden Kategorien",
-// "Change user system language when changing user tracker item language" => "Change user system language when changing user tracker item language",
+"Change user system language when changing user tracker item language" => "Ändere Benutzersprache im System, wenn die Sprache des Trackereintrages des Benutzers geändert wird",
 "Show user's real name instead of login in autocomplete selector in trackers feature" => "Zeige den Echtnamen des Benutzers anstelle seines Login in der Autovervollständigenauswahl in Trackern",
 "Use user's real name instead of login in autocomplete selector in trackers feature" => "Benutze den Echtnamen des Benutzers anstelle seines Login in der Autovervollständigenauswahl in Trackern",
 "Show user's real name instead of login in autocomplete selector in messaging feature" => "Zeige den Echtnamen des Benutzers anstelle seines Login in der Autovervollständigenauswahl in der Nachrichtenfunktion",
@@ -2114,20 +2114,20 @@
 "Key words or tags describing your site" => "Schlüsselwörter oder Tags, die Deine Site beschreiben",
 "Site Location" => "Site-Ort",
 "Site location as longitude,latitude,zoom" => "Site-Ort als Längengrad,Breitengrad,Zoom",
-// "Send Anonymous Information" => "Send Anonymous Information",
+"Send Anonymous Information" => "Sende anonyme Informationen",
 "Send anonymous usage information" => "Sende anonyme Benutzungs-Information",
 "Connection frequency" => "Verbindungshäufigkeit",
 "How often to send information (in hours)" => "Wie oft Informationen gesenden werden (in Stunden)",
 "Default:" => "Voreingestellt:",
 "weekly" => "wöchentlich",
-// "Experimental. Currently unused, click \"Send Info\" to connect" => "Experimental. Currently unused, click \"Send Info\" to connect",
+"Experimental. Currently unused, click \"Send Info\" to connect" => "Experimentell. Gegenwärtig nicht in Benutzung. Klicke auf \"Sends Info\" zum Verbinden",
 "Tiki Connect Server URL" => "Tiki Verbindung Server-URL",
 "Where to send the information" => "Wohin die Informationen gesendet werden sollen",
 "Last connection" => "Letzte Verbindung",
-// "Connect Server Mode" => "Connect Server Mode",
+"Connect Server Mode" => "Connect-Server-Modus",
 "For use by mother.tiki.org" => "Für die Benutzung durch mother.tiki.org",
-// "Connect GUID" => "Connect GUID",
-// "For use by mother.tiki.org. Do not modify" => "For use by mother.tiki.org. Do not modify",
+"Connect GUID" => "Connect GUID",
+"For use by mother.tiki.org. Do not modify" => "Zur Benutzung für mother.tiki.org. Nicht verändern",
 "Slide" => "Gleiten",
 "Fade" => "Ausblenden",
 "Blind (UI)" => "Blenden (UI)",
@@ -2150,10 +2150,10 @@
 "Right" => "Rechter Rand",
 "Up" => "aufwärts",
 "Down" => "abwärts",
-// "jQuery-ui Select Menu" => "jQuery-ui Select Menu",
-// "Styled replacement for dropdown select menus" => "Styled replacement for dropdown select menus",
-// "Use Select Menu on all select elements" => "Use Select Menu on all select elements",
-// "Applies jQuery-ui Select Menu to every select menu" => "Applies jQuery-ui Select Menu to every select menu",
+"jQuery-ui Select Menu" => "jQuery-ui Auswahlmenü",
+"Styled replacement for dropdown select menus" => "Gestylte Ersetzung für Auswahllisten-Menüs",
+"Use Select Menu on all select elements" => "Benutze Auswahlmenü bei allen Auswahlelementen",
+"Applies jQuery-ui Select Menu to every select menu" => "Wendet das jQuery-ui Auswahlmenü bei allen Auswahlmenüs an",
 "Timezone" => "Zeitzone",
 "Indicates the default time zone to use for the server" => "Gibt an, welche Standardzeitzone auf diesem Server benutzt werden soll",
 "BigBlueButton Web Conferencing" => "BigBlueButton Web Konferenz",
@@ -2253,41 +2253,41 @@
 "Email address for person responsible for editorial content" => "E-Mailaddressen der Person, die für den redaktionellen Inhalt verantwortlich ist",
 "Feed webmaster email" => "E-Mail des Feedwebmaster",
 "Email address for person responsible for technical issues relating to channel" => "E-Mailaddresse der Person, die für technische Fragen bezüglich des Kanals verantwortlich ist",
-// "Feed Image path" => "Feed Image path",
+"Feed Image path" => "Feed Bildpfad",
 "Specifies a GIF, JPEG or PNG image that can be displayed with the feed" => "Legt ein GIF, JPEG oder PNG Bild fest, dass zusammen mit dem Feed angezeigt werden kann",
-// "Feed Language" => "Feed Language",
+"Feed Language" => "Feed Sprache",
 "RSS basic Authentication" => "RSS Basisauthentifizierung",
 "Propose basic http authentication if the user has no permission to see the feed" => "Empfehle Basis-HTTP-Authentifizierung, wenn der Benutzer keine Rechte hat, den Feed einzusehen",
-// "Feed Caching time" => "Feed Caching time",
+"Feed Caching time" => "Feed Cache-Zeit",
 "Use 0 for no caching" => "Benutze 0 für kein caching",
-// "Enabling caching will override existing permissions - all content will be public. Enable this option __only__ if your syndicated content should be public" => "Enabling caching will override existing permissions - all content will be public. Enable this option __only__ if your syndicated content should be public",
-// "RSS for articles" => "RSS for articles",
+"Enabling caching will override existing permissions - all content will be public. Enable this option __only__ if your syndicated content should be public" => "Aktivieren des Cachen überschreibt bestehende Berechitungen. Der gesamte Inhalt wird dann öffentlich. Aktiviere diese Option __nur__ wenn alle Inhalte veröffentlicht werden sollen",
+"RSS for articles" => "RSS für Artikel",
 "RSS feeds for articles" => "RSS Feeds für Artikel",
-// "RSS for blogs" => "RSS for blogs",
+"RSS for blogs" => "RSS für Blogs",
 "RSS feeds for blogs" => "RSS Feeds für Blogs",
-// "RSS for individual blogs" => "RSS for individual blogs",
+"RSS for individual blogs" => "RSS für individuelle Blogs",
 "RSS feed for individual blogs" => "RSS Feeds für individuelle Blogs",
-// "RSS for image galleries" => "RSS for image galleries",
+"RSS for image galleries" => "RSS für Bildergalerie",
 "RSS feed for image galleries" => "RSS Feeds für Bildergalerien",
-// "RSS for individual image galleries" => "RSS for individual image galleries",
+"RSS for individual image galleries" => "RSS für individuelle Bildergalerien",
 "RSS feed for individual image galleries" => "RSS Feeds für individuelle Bildergalerien",
-// "RSS for file galleries" => "RSS for file galleries",
+"RSS for file galleries" => "RSS für Dateiarchive",
 "RSS feed for file galleries" => "RSS Feeds für Dateiarchive",
-// "RSS for individual file galleries" => "RSS for individual file galleries",
+"RSS for individual file galleries" => "RSS für individuelle Dateiarchive",
 "RSS feed for individual file galleries" => "RSS Feeds für individuelle Dateiarchive",
-// "RSS for wiki pages" => "RSS for wiki pages",
+"RSS for wiki pages" => "RSS für Wiki-Seiten",
 "RSS feed for wiki" => "RSS Feeds für Wiki",
-// "RSS for forums" => "RSS for forums",
+"RSS for forums" => "RSS für Foren",
 "RSS feed for forums" => "RSS Feeds für Foren",
-// "RSS for individual forums" => "RSS for individual forums",
+"RSS for individual forums" => "RSS für individuelle Foren",
 "RSS feed for individual forums" => "RSS Feeds für individuelle Foren",
-// "RSS per tracker" => "RSS per tracker",
-// "RSS feed per tracker" => "RSS feed per tracker",
-// "RSS for calendar events" => "RSS for calendar events",
+"RSS per tracker" => "RSS für Tracker",
+"RSS feed per tracker" => "RSS Feed für Tracker",
+"RSS for calendar events" => "RSS für Kalenderereignisse",
 "RSS feed for calendar events" => "RSS Feeds für Kalenderereignisse",
-// "RSS for directories" => "RSS for directories",
+"RSS for directories" => "RSS für Linkverzeichnisse",
 "RSS feed for directories" => "RSS Feeds für Linkverzeichnisse",
-// "RSS for shoutbox" => "RSS for shoutbox",
+"RSS for shoutbox" => "RSS für Shoutbox",
 "RSS feed for shoutbox" => "RSS Feeds für Shoutbox",
 "Maximum number of items to display" => "Maximale Anzahl von anzuzeigenden Einträgen",
 "Show Author" => "Zeige Autor",
@@ -2388,8 +2388,8 @@
 "Restrict search language by default" => "Beschränke standardmäßig die Suchsprache",
 "If enabled, only search content in the interface language, by default" => "Wenn aktiviert, werden standardmäßig nur Inhalte in der gewählten Interfacesprache durchsucht",
 "Autocomplete on page names" => "Seitennamen automatisch vervollständigen",
-// "Index forum replies together with root post" => "Index forum replies together with root post",
-// "If enabled, forum replies will be indexed together with the root post as a single document instead of being separately indexed" => "If enabled, forum replies will be indexed together with the root post as a single document instead of being separately indexed",
+"Index forum replies together with root post" => "Indexiere Forenantworten mit dem Stammeintrag",
+"If enabled, forum replies will be indexed together with the root post as a single document instead of being separately indexed" => "Wenn aktiviert, werden Forenantworten zusammen mit dem Stammeintrag als ein einheitliches Dokument indexiert (anstelle einer getrennten Indexierung)",
 "Mobile Access" => "Mobiler Zugriff",
 "New mobile feature for Tiki 7" => "Neue Mobil-Funktion für Tiki 7",
 "Experimental. This feature is under development" => "Experimentell. Diese Funktion wird noch entwickelt",
@@ -2527,8 +2527,8 @@
 "Item view tab" => "Tab 'Eintrag ansehen'",
 "Show Add to Google Calendar icon" => "Zeige ein \"Zu Googlekalender hinzufügen\"-Symbol",
 "Use FullCalendar to display Calendars" => "Benutze FullCalendar um Kalender anzuzeigen",
-// "Treat calendar item descriptions as HTML" => "Treat calendar item descriptions as HTML",
-// "Use this if you use the WYSIWYG editor for calendars. This is to handle legacy data from Tiki pre 7.0" => "Use this if you use the WYSIWYG editor for calendars. This is to handle legacy data from Tiki pre 7.0",
+"Treat calendar item descriptions as HTML" => "Behandele Kalendereintrag-Beschreibungen als HTML",
+"Use this if you use the WYSIWYG editor for calendars. This is to handle legacy data from Tiki pre 7.0" => "Benutze dies, wenn Du denn WYSIWYG-Editor für Kalender benutzt. Dies ist für Altedaten für Tikiversionen vor 7.0",
 "Home Blog (main blog)" => "Home-Blog (Haupt-Blog)",
 "Home Forum (main forum)" => "Home-Forum (Hauptforum)",
 "Home File Gallery (main file gallery)" => "Hauptverzeichnisgalerie",
@@ -2762,7 +2762,7 @@
 "The Copyright Management System (or ©MS) is a way of licensing your content" => "Das Copyright-Verwaltungssystem (oder ©MS) ist eine Art, Deinen Inhalt zu lizensieren",
 "Shoutbox" => "Shoutbox",
 "Quick comment (graffiti) box. Like a group chat, but not in real time" => "Box für schnelle Kommentare (graffiti). Wie ein Gruppenchat aber nicht in Echtzeit",
-// "MapServer" => "MapServer",
+"MapServer" => "MapServer",
 "Navigable, interactive maps with user-selectable layers" => "Navigierbare, interaktive Karten mit von Benutzern auswählbaren Schichten",
 "Requires MapServer" => "Erfordert MapServer",
 "Google Maps" => "Google Maps",
@@ -2827,8 +2827,8 @@
 "Invoice system" => "Rechnungssystem",
 "Wysiwyg editor" => "WYSIWYG Editor",
 "WYSIWYG is an acronym for What You See Is What You Get. Uses CKEditor" => "WYSIWYG ist ein Akronym und steht für for What You See Is What You Get (Was Du siehst, bekommst Du). Benutzt CKEditor",
-// "Kaltura Video Management" => "Kaltura Video Management",
-// "Integration to the Kaltura video management platform" => "Integration to the Kaltura video management platform",
+"Kaltura Video Management" => "Kaltura Video Verwaltung",
+"Integration to the Kaltura video management platform" => "Integration zur Kaltura Video-Verwaltungsplattform",
 "Friendship Network" => "Freundschaftsnetzwerk",
 "Users can identify other users as their friends" => "Benutzer kann andere Benutzer als seine Freunde identifizieren",
 "Neglected feature" => "vernachlässigte Funktion",
@@ -2850,7 +2850,7 @@
 "My Bookmarks" => "Benutzerlesezeichen",
 "User Contacts" => "Benutzerkontakte",
 "User Watches" => "Benutzerbeobachtungspunkte",
-// "Receive email notification of changes" => "Receive email notification of changes",
+"Receive email notification of changes" => "Erhalte E-Mail-Benachrichtigungen von Änderungen",
 "Group Watches" => "Gruppenbeobachtungspunkte",
 "Daily Reports for User Watches" => "Tägliche Berichte für Benutzerbeobachtungspunkte",
 "User Watches Translations" => "Beobachtungspunkte beobachten auch Übersetzungen",
@@ -2899,8 +2899,8 @@
 "Also known as emoticons" => "Auch bekannt als Emoticons",
 "Draw (SVG-edit)" => "Zeichen (SVG-edit)",
 "Draw gives you the ability to edit SVG images all around Tiki" => "Zeichnen gibt Dir die Möglichkeit, SVG Bildateien überall in Tiki zu bearbeiten",
-// "Docs (WebODF)" => "Docs (WebODF)",
-// "Docs gives you the ability to view/edit Open Document Format" => "Docs gives you the ability to view/edit Open Document Format",
+"Docs (WebODF)" => "Dokumente (WebODF)",
+"Docs gives you the ability to view/edit Open Document Format" => "Dokumente ermöglicht das Ansehen/die Bearbeitung von Dateien im Open Dokument Format",
 "Dynamic Content System" => "Dynamischer Inhalt",
 "Bloc of content which can be reused and programmed (timed)" => "Inhaltsblock, der wiederholt genutzt werden und programmiert werden kann (zeitlich angepasst)",
 "Use File Galleries to store pictures" => "Benutze Dateiarchive um Bilder zu speichern",

Modified: branches/experimental/innodb/lang/fr/language.php
===================================================================
--- branches/experimental/innodb/lang/fr/language.php	2011-09-19 18:34:33 UTC (rev 37428)
+++ branches/experimental/innodb/lang/fr/language.php	2011-09-19 18:35:34 UTC (rev 37429)
@@ -20,7 +20,7 @@
 // need it (like French)
 // Note: the difference is invisible but " :" has an UTF-8 non-breaking-space, not a regular space, but the UTF-8 equivalent of the HTML  .
 // This allows correctly displaying emails and JavaScript messages, not only web pages as would happen with  .
-// $id$
+
 $lang = array(
 "You must specify a directory" => "Vous devez spécifier un répertoire",
 "Creation Date" => "Date de création",
@@ -515,6 +515,9 @@
 "This book has been closed. You can't book into it any more" => "Ce livre a été clôturé. Vous ne pouvez rien y ajouter de plus",
 "Invalid booking date" => "Date de réservation incorrecte",
 "This book has been closed. You can't cancel transactions in it any more" => "Ce livre a été clôturé. Vous ne pouvez plus y annuler d'écritures",
+"New article post" => "Nouvel article publié",
+"Edited article post" => "Modifier une publication d'article",
+"Deleted article post" => "Publication d'article supprimée",
 "The file is not a CSV file or has not a correct syntax" => "Le fichier n'est pas un fichier CSV ou la syntaxe est incorrecte",
 "Error line: %d" => "Erreur à la ligne : %d",
 "Spam is not welcome here" => "Le spam n'est pas le bienvenu ici",
@@ -794,7 +797,7 @@
 "name, size" => "nom, taille",
 "name, type, size" => "nom, type, taille",
 "uploader" => "téléchargeur",
-"mediaplayer" => "lecteur média",
+"mediaplayer" => "Lecteur média",
 "Download" => "Télécharger",
 "Attached and upload files stored in the file galleries to the tracker item" => "Fichiers joints à la fiche de formulaire téléchargés et stockés dans la galerie de fichiers",
 "Gallery ID" => "ID de la gallerie",
@@ -3356,7 +3359,7 @@
 "Zotero Client Key" => "Clé client Zotero",
 "Required identification key. Registration required." => "Paramètre requis. Enregistrement nécessaire.",
 "Zotero Client Secret" => "Code secret Zotero",
-"Zotero Group" => "Groupe Zotero",
+// "Zotero Group ID" => "Zotero Group ID",
 "Numeric ID of the group, can be found in the URL." => "Numéro du groupe, peut être trouvé dans l'URL.",
 "Zotero Reference Style" => "Style de référence Zotero",
 // "Use an alternate Zotero reference style when formatting the references. The reference formats must be installed on the Zotero server" => "Use an alternate Zotero reference style when formatting the references. The reference formats must be installed on the Zotero server",
@@ -3551,6 +3554,7 @@
 "Fast Prev" => "Recul rapide",
 "Prev" => "Préc.",
 "Next" => "Suivant",
+// "More results may be available. Refine criteria to access the estimated %0 results" => "More results may be available. Refine criteria to access the estimated %0 results",
 "First %0" => "Premier %0",
 "Last %0" => "Dernier %0",
 "Next %0" => "%0 suivant",
@@ -3791,15 +3795,13 @@
 "No extra information for that attached file. " => "Aucune information supplémentaire pour ce fichier joint. ",
 "(AT)" => "(À)",
 "(DOT)" => "(PT)",
-"Can add events in the calendar" => "Droit d'ajouter des évènements dans le calendrier",
-"Can change events in the calendar" => "Droit de modifier des évènements dans le calendrier",
-"Can browse the calendar" => "Droit de parcourir le calendrier",
-"Can view events details" => "Droit de voir le détail des évènements",
-"Can add own user to the participants" => "Droit d'ajouter un utilisateur aux participants",
-"Can add guest to the participants" => "Droit d'ajouter un invité aux participants",
-"Can view Tiki tools calendar" => "Droit de parcourir le calendrier des actions Tiki",
-"Administrator can create channels, remove channels, etc" => "L'administrateur peut créer des canaux, en supprimer, etc.",
-"Can use the chat system" => "Droit d'utiliser le système de discussions (chat)",
+"Can create/close a book" => "Droit de créer/clôturer un livre",
+"Can create/edit/lock accounts" => "Pouvoir créer/éditer/verrouiller des comptes",
+"Create a new transaction" => "Créer une nouvelle transaction",
+// "Permission to view the journal" => "Permission to view the journal",
+"Can book into the stack where statements can be changed" => "Droit d'enregistrer dans le brouillard, où des modifications peuvent être apportées",
+"Can import statements from external accounts" => "Droit d'importer des relevés à partir de comptes externes",
+"Can manage templates for recurring transactions" => "Droit de gérer des modèles pour les écritures récurrentes",
 "Can admin the articles" => "Droit d'administrer les articles",
 "Can approve submissions" => "Droit d'approuver les soumissions",
 "Can admin article topics" => "Droit d'administrer les sujets d'articles",
@@ -3814,6 +3816,44 @@
 "Can submit articles" => "Droit de soumettre des articles",
 "Can rate articles" => "Droit de noter les articles",
 "Can read a topic (Applies only to individual topic perms)" => "Droit de lire un élément (ne s'applique qu'aux éléments individuels)",
+"Can join a meeting" => "Droit de se joindre à une réunion",
+"Can moderate a meeting" => "Droit de modérer une réunion",
+"Can create a meeting" => "Droit de créer une réunion",
+"Can admin blogs" => "Droit d'administrer les blogues",
+"Can assign perms to blog" => "Droit d'assigner des permissions sur les blogues",
+"Can post to a blog" => "Droit de publier dans un blogue",
+"Can create a blog" => "Droit de créer des blogues",
+"Can read blogs" => "Droit de lire les blogues",
+"Can view in module and feed the blog posts" => "Droit de voir les messages de blogues dans les modules et les flux",
+"Can view in module and feed the blog" => "Droit de voir les blogues dans les modules et les flux",
+"Can add events in the calendar" => "Droit d'ajouter des évènements dans le calendrier",
+"Can change events in the calendar" => "Droit de modifier des évènements dans le calendrier",
+"Can browse the calendar" => "Droit de parcourir le calendrier",
+"Can view events details" => "Droit de voir le détail des évènements",
+"Can add own user to the participants" => "Droit d'ajouter un utilisateur aux participants",
+"Can add guest to the participants" => "Droit d'ajouter un invité aux participants",
+"Can view Tiki tools calendar" => "Droit de parcourir le calendrier des actions Tiki",
+"Can admin categories" => "Droit d'administrer les catégories",
+"Can see the category in a listing" => "Droit de voir la catégorie dans une liste",
+"Can add objects to the category (needs tiki_p_modify_object_categories)" => "Droit d'ajouter des objets à une catégorie (nécessite tiki_p_modify_object_categories)",
+"Can remove objects from the category (needs tiki_p_modify_object_categories)" => "Droit de retirer des éléments de la catégorie (nécessite tiki_p_modify_object_categories)",
+"Administrator can create channels, remove channels, etc" => "L'administrateur peut créer des canaux, en supprimer, etc.",
+"Can use the chat system" => "Droit d'utiliser le système de discussions (chat)",
+"Can admin received articles" => "Droit d'administrer les articles reçus",
+"Can admin received pages" => "Droit d'administrer les pages reçues",
+"Can send articles to other sites" => "Droit d'envoyer des articles vers d'autres sites",
+"Can send articles to this site" => "Droit d'envoyer des articles à ce site",
+"Can send pages to this site" => "Droit d'envoyer des pages à ce site",
+"Can send pages to other sites" => "Droit d'envoyer des pages vers d'autres sites",
+"Can post new comments" => "Droit de publier de nouveaux commentaires",
+"Can read comments" => "Droit de lire des commentaires",
+"Can admin comments" => "Droit d'administrer les commentaires",
+"Can edit all comments" => "Droit d'édition de tous les commentaires",
+"Can delete comments" => "Droit de supprimer des commentaires",
+"Can vote comments" => "Droit de voter pour un commentaire",
+"Can admin content templates" => "Droit d'administrer les gabarits de contenu",
+"Can edit content templates" => "Droit de modifier les gabarits de contenu",
+"Can use content templates" => "Droit d'utiliser des gabarits de contenu",
 "Can admin contributions" => "Droit d'administrer les contributions",
 "Can admin the directory" => "Droit d'administrer le répertoire des liens",
 "Can admin directory categories" => "Droit d'administrer les catégories de répertoire",
@@ -3822,46 +3862,10 @@
 "Can submit sites to the directory" => "Droit de soumettre des sites au répertoire des liens",
 "Can validate submitted links" => "Peut valider des liens soumis",
 "Can use the directory" => "Droit d'utiliser le répertoire des liens",
+"Can execute arbitrary queries on a given DSN" => "Droit d'exécuter une réquête quelconque sur un DSN donné",
 "Can admin faqs" => "Droit d'administrer les faqs",
 "Can suggest faq questions" => "Droit de suggérer des questions dans les faqs",
 "Can view faqs" => "Droit de voir les faqs",
-"Administrator can manage users, groups and permissions and all features" => "L'administrateur peut gérer les utilisateurs, les groupes, les droits et toutes les fonctionnalités",
-"Can admin users" => "Droit d'administrer les utilisateurs",
-"Can access site when closed" => "Droit d'accés au site lorsqu'il est fermé",
-"Administrator can admin banners" => "L'administrateur peut administrer les bannières",
-"Can ban users or ips" => "Droit de bannir des utilisateurs ou des adresses ip",
-"Can admin the dynamic content system" => "Droit d'administrer le système de contenu dynamique",
-"Can admin integrator repositories and rules" => "Droit d'administrer les dépots d'intégration Tiki et les règles",
-"Can admin mail-in accounts" => "Droit d'administrer les comptes mail-in",
-"Can edit object permissions" => "Droit de modifier les permissions des objets",
-"Can admin external feeds" => "Droit d'administrer les flux externes",
-"Can clean cache" => "Droit de vider le cache",
-"Can create new css suffixed with -user" => "Droit de créer des css suffixé avec -user",
-"Can remove association between two pages in a translation set" => "Droit de supprimer l'association entre des pages d'un jeu de traduction",
-"Can admin cookies" => "Droit d'administrer les cookies",
-"Can edit translations and create new languages" => "Droit de modifier les traductions et d'ajout de nouvelles langues",
-"Can edit menu" => "Droit de modifier les menus",
-"Can edit menu option" => "Droit de modifier les options des menus",
-"Can edit site templates" => "Droit de modifier les gabarits de site",
-"Can search" => "Droit de rechercher",
-"Can report a link to the webmaster" => "Droit de signaler un lien à l'administrateur du site",
-"Can subscribe to groups" => "Droit de s'inscrire dans les groupes",
-"Can send a link to a friend" => "Droit d'envoyer un lien à un ami",
-"Can share a page (email, Twitter, Facebook, message, forums)" => "Droit de partager une page (email, Twitter, Facebook, message, forums)",
-"Can use HTML in pages" => "Droit d'utiliser du code HTML dans les pages",
-"Can view action log" => "Droit de voir le journal des actions",
-"Can view action log for users of his own groups" => "Droit de voir le journal des actions pour ses propres groupes",
-"Can view integrated repositories" => "Droit de lecture sur les dépots d'intégration",
-"Can view referrer stats" => "Droit de voir les statistiques des pages référantes",
-"Can view site stats" => "Droit de voir les statistiques du site",
-"Can view site templates" => "Droit de voir les modèles du site",
-"Can admin blogs" => "Droit d'administrer les blogues",
-"Can assign perms to blog" => "Droit d'assigner des permissions sur les blogues",
-"Can post to a blog" => "Droit de publier dans un blogue",
-"Can create a blog" => "Droit de créer des blogues",
-"Can read blogs" => "Droit de lire les blogues",
-"Can view in module and feed the blog posts" => "Droit de voir les messages de blogues dans les modules et les flux",
-"Can view in module and feed the blog" => "Droit de voir les blogues dans les modules et les flux",
 "Can download files" => "Droit de télécharger des fichiers",
 "Can upload files" => "Droit d'envoyer (upload) des fichiers",
 "Can list file galleries" => "Droit de lister les galeries de fichiers",
@@ -3884,17 +3888,42 @@
 "Can read forums" => "Droit de lire des forums",
 "Can report posts to moderator" => "Droit de rapporter des message au modérateur",
 "Can vote comments in forums" => "Droit de voter pour des commentaires dans les forums",
+"Can browse freetags" => "Droit de parcourir les mots-clés",
 "Can admin freetags" => "Droit d'administrer les mots-clés",
+"Can tag objects" => "Droit de marquer des objets",
+"Can unassign tags from an object" => "Droit de supprimer des tags associés à un objet",
+"Can subscribe to groups" => "Droit de s'inscrire dans les groupes",
+"Can invite user to my groups" => "droit d'inviter un utilisateur dans mes groupes",
+"Can view the group" => "Droit de voir les groupes",
+"Can view the group members" => "Droit de voir les membres d'un groupe",
+"Can add group members" => "Droit d'ajouter les membres aux groupes",
+"Can remove group members" => "Droit de retirer des membres d'un groupe",
+"Can join or leave the group" => "Droit de rejoindre ou quitter un groupe",
+"Can edit HTML pages" => "Droit de modifier les pages HTML",
+"Can view HTML pages" => "Droit de voir les pages HTML",
 "Can admin Image Galleries" => "Droit d'administrer les galeries d'images",
 "Can assign perms to image gallery" => "Droit d'assigner les droits d'accès des galeries d'images",
 "Can upload zip files with images" => "Droit d'envoyer des fichiers zip avec les images",
 "Can create image galleries" => "Droit de créer des galeries d'images",
-"Can tag objects" => "Droit de marquer des objets",
 "Can list image galleries" => "Droit de lister le contenu des galeries d'images",
-"Can unassign tags from an object" => "Droit de supprimer des tags associés à un objet",
 "Can upload images" => "Droit d'envoyer (upload) des images",
-"Can browse freetags" => "Droit de parcourir les mots-clés",
 "Can view image galleries" => "Droit de voir les galeries d'images",
+"Can admin kaltura feature" => "Droit d'administrer la fonctionnalité Kaltura",
+"Can upload video on kaltura server" => "Droit d'envoyer une vidéo sur le serveur Kaltura",
+"Can edit information of kaltura entry" => "Droit d'éditer les information d'une entrée Kaltura",
+// "Can create kaltura remix video" => "Can create kaltura remix video",
+"Can delete kaltura entry" => "Droit d'effacer une entrée Kaltura",
+"Can download kaltura entry" => "Droit de télécharger une entrée Kaltura",
+"Can list kaltura entries" => "Droit de lister les entrées Kaltura",
+"Can view kaltura entry" => "Droit de voir les entrées kaltura",
+"Can create new mapfile" => "Droit de créer de nouveaux fichiers-carte",
+"Can delete mapfiles" => "Droit de supprimer des fichiers-carte",
+"Can edit mapfiles" => "Droit de modifier les fichiers-carte",
+"Can view mapfiles" => "Droit de voir les fichiers-cartes",
+"Can view contents of mapfiles" => "Droit de voir le contenu des fichiers-carte",
+"Can broadcast messages to all user" => "Droit de diffuser des messages vers tous les utilisateurs",
+"Can broadcast messages to groups" => "Droit de diffuser des messages vers les groupes",
+"Can use the messaging system" => "Droit d'utiliser le système de messagerie",
 "Can admin newsletters" => "Droit d'administrer les lettres d'informations",
 "Can subscribe many e-mails at once (requires tiki_p_subscribe email)" => "Droit de soumettre des adresses mail par lot (recquiert tiki_p_subscribe email)",
 "Can send newsletters" => "Droit d'envoyer des lettres d'informations",
@@ -3902,11 +3931,18 @@
 "Can subscribe to newsletters" => "Droit de s'inscrire à des lettres d'informations",
 "Can view the archive of a newsletters" => "Droit de voir les archives d'une newsletter",
 "Can list newsletters" => "Droit de lister les newsletters",
+"Can administer payments" => "Droits d'administrer les paiements",
+"Can view payment requests and details" => "Droit de voir les requêtes de payements ainsi que les détails",
+"Can enter manual payments" => "Droit d'entrer un paiement manuel",
+"Can request a payment" => "Droit de demander un paiement",
+"Can view the perspective" => "Droit de voir la perspective",
+"Can edit the perspective" => "Droit d'éditer une perspective",
+"Can create a perspective" => "Droit de créer une perspective",
+"Can admin perspectives" => "Droits d'administrer les perspectives",
 "Can admin polls" => "Droit d'administrer les sondages",
 "Can view poll results" => "Droit de voir des résultats de sondages",
 "Can vote polls" => "Droit de voter à un sondage",
 "Can view poll voters" => "Droit de voir les votants d'un vote",
-"Can admin toolbars" => "Droit d'administrer les barres d'outils",
 "Can admin quizzes" => "Droit d'administrer les QCMs",
 "Can take quizzes" => "Droit de remplir des QCMs",
 "Can view quiz stats" => "Droit de voir les statistiques du QCM",
@@ -3918,9 +3954,16 @@
 "Can admin shoutbox (Edit/remove messages)" => "Droit d'administrer le mégaphone (Modifier/supprimer les messages)",
 "Can post messages in shoutbox" => "Droit de publier des messages dans le mégaphone",
 "Can view shoutbox" => "Droit de voir le mégaphone",
+"user can use social network integration" => "l'utilisateur peut utiliser l'intégration des réseaux sociaux",
+// "user can register this site with social networks" => "user can register this site with social networks",
+"Admin live support system" => "Administrer le système d'assistance en ligne",
+"Can use live support system" => "Droit d'utiliser le système de support en ligne",
 "Can admin surveys" => "Droit d'administrer les enquêtes",
 "Can take surveys" => "Droit de remplir des enquêtes",
 "Can view survey stats" => "Droit de voir les statistiques des enquêtes",
+"Can admin the TikiTests" => "Droit d'administrer les TikiTests",
+"Can edit TikiTests" => "Droit d'éditer des TikiTests",
+"Can replay the TikiTests" => "Droit de rejouer des TikiTests",
 "Can admin trackers" => "Droit d'administrer les formulaires",
 "Can attach files to tracker items" => "Droit d'attacher des fichiers aux fiches de formulaire",
 "Can view tracker items attachments and download" => "Droit de voir les pièces jointes aux fiches de formulaires et de les télécharger",
@@ -3942,6 +3985,27 @@
 "Can view pending trackers items" => "Droit de voir les élément de formulaire en attente",
 "Can watch tracker" => "Droit de voir les formulaires",
 "Can export tracker items" => "Droit d'exporter des fiches de formulaires",
+"Can save a .CSV backup of entire trackers" => "Droit de sauvegarder au format CSV tous les formulaires",
+"Can trigger the transition between two states" => "Droit de déclencher une transition entre deux états",
+"Can admin users" => "Droit d'administrer les utilisateurs",
+"Can cache user bookmarks" => "Droit de mettre des signets en antémémoire",
+"Can configure modules" => "Droit de configurer des modules",
+"Can create user bookmarks" => "Droit de créer des signets utilisateur",
+"Can use the mini event calendar" => "Droit d'utiliser Mon Calendrier",
+"Can use the notepad" => "Droit d'utiliser le bloc-notes",
+"Can admin public tasks" => "Droit d'administrer les tâches publiques",
+"Can use tasks" => "Droit d'utiliser les tâches",
+"Can receive tasks from other users" => "Pouvoir recevoir des tâches d'autres utilisateurs",
+"Can send tasks to other users" => "Droit d'envoyer des tâches à d'autres utilisateurs",
+"Can upload personal files" => "Droit d'envoyer (upload) des fichiers personnels",
+"Can create items in personal menu" => "Droit de créer des éléments du menu personnel",
+"Can list registered users" => "Droit de lister les utilisateurs enregistrés",
+"Can invite users by email, and include them in groups" => "Droit d'inviter des utilisateurs par courriel, et les inclure dans des groupes",
+"Can use webmail" => "Droit d'utiliser le webmail",
+"Can use group webmail" => "Droit d'utiliser le webmail de groupe",
+"Can admin group webmail accounts" => "Droit d'administrer les comptes webmail de groupe",
+"Can use personal webmail accounts" => "Droit d'utiliser des comptes webmail personnels",
+"Can admin personal webmail accounts" => "Droit d'administrer les comptes webmail personnels",
 "Can view page/pages" => "Droit de voir les pages wiki",
 "Can edit pages" => "Droit de modifier des pages wiki",
 "Can view wiki history" => "Droit de voir l'historique des pages wiki",
@@ -3969,108 +4033,48 @@
 "Can view source of wiki pages" => "Droit de voir le source des pages wiki",
 "Can participate to rating of wiki pages" => "Droit de participer à la notation des pages wiki",
 "Can view similar wiki pages" => "Droit de voir les pages wiki similaires",
-"Can admin received articles" => "Droit d'administrer les articles reçus",
-"Can admin received pages" => "Droit d'administrer les pages reçues",
-"Can send articles to other sites" => "Droit d'envoyer des articles vers d'autres sites",
-"Can send articles to this site" => "Droit d'envoyer des articles à ce site",
-"Can send pages to this site" => "Droit d'envoyer des pages à ce site",
-"Can send pages to other sites" => "Droit d'envoyer des pages vers d'autres sites",
-"Can admin the TikiTests" => "Droit d'administrer les TikiTests",
-"Can edit TikiTests" => "Droit d'éditer des TikiTests",
-"Can replay the TikiTests" => "Droit de rejouer des TikiTests",
-"Can cache user bookmarks" => "Droit de mettre des signets en antémémoire",
-"Can configure modules" => "Droit de configurer des modules",
-"Can create user bookmarks" => "Droit de créer des signets utilisateur",
-"Can use the mini event calendar" => "Droit d'utiliser Mon Calendrier",
-"Can use the notepad" => "Droit d'utiliser le bloc-notes",
-"Can admin public tasks" => "Droit d'administrer les tâches publiques",
-"Can use tasks" => "Droit d'utiliser les tâches",
-"Can receive tasks from other users" => "Pouvoir recevoir des tâches d'autres utilisateurs",
-"Can send tasks to other users" => "Droit d'envoyer des tâches à d'autres utilisateurs",
-"Can upload personal files" => "Droit d'envoyer (upload) des fichiers personnels",
-"Can create items in personal menu" => "Droit de créer des éléments du menu personnel",
-"Can broadcast messages to all user" => "Droit de diffuser des messages vers tous les utilisateurs",
-"Can broadcast messages to groups" => "Droit de diffuser des messages vers les groupes",
-"Can use the messaging system" => "Droit d'utiliser le système de messagerie",
-"Can post new comments" => "Droit de publier de nouveaux commentaires",
-"Can read comments" => "Droit de lire des commentaires",
-"Can admin comments" => "Droit d'administrer les commentaires",
-"Can edit all comments" => "Droit d'édition de tous les commentaires",
-"Can delete comments" => "Droit de supprimer des commentaires",
-"Can vote comments" => "Droit de voter pour un commentaire",
-"Can admin content templates" => "Droit d'administrer les gabarits de contenu",
-"Can edit content templates" => "Droit de modifier les gabarits de contenu",
-"Can use content templates" => "Droit d'utiliser des gabarits de contenu",
-"Can edit HTML pages" => "Droit de modifier les pages HTML",
-"Can view HTML pages" => "Droit de voir les pages HTML",
-"Can list registered users" => "Droit de lister les utilisateurs enregistrés",
-"Admin live support system" => "Administrer le système d'assistance en ligne",
-"Can use live support system" => "Droit d'utiliser le système de support en ligne",
-"Can create new mapfile" => "Droit de créer de nouveaux fichiers-carte",
-"Can delete mapfiles" => "Droit de supprimer des fichiers-carte",
-"Can edit mapfiles" => "Droit de modifier les fichiers-carte",
-"Can view mapfiles" => "Droit de voir les fichiers-cartes",
-"Can view contents of mapfiles" => "Droit de voir le contenu des fichiers-carte",
-"Can use webmail" => "Droit d'utiliser le webmail",
-"Can use group webmail" => "Droit d'utiliser le webmail de groupe",
-"Can admin group webmail accounts" => "Droit d'administrer les comptes webmail de groupe",
-"Can use personal webmail accounts" => "Droit d'utiliser des comptes webmail personnels",
-"Can admin personal webmail accounts" => "Droit d'administrer les comptes webmail personnels",
 "Can view unapproved plugin details" => "Droit de voir les détails des plugiciels non autorisés",
+"Can approve plugin execution" => "Droit d'autoriser l'exécution des plugiciels",
+"View page backlinks" => "Droit de voir les liens arrière (backlinks)",
+"Can view unapproved revisions of pages" => "Droit d'afficher les modifications non approuvées des pages",
+"Can approve revisions of pages" => "Droit d'approuver les modifications de pages",
+"Can view contributions to a page" => "Droit de voir les contributions à une page",
 "Can execute unapproved plugin registered" => "Droit d'exécuter des plugiciels non autorisés enregistré",
-"Can approve plugin execution" => "Droit d'autoriser l'exécution des plugiciels",
+"Administrator can manage users, groups and permissions and all features" => "L'administrateur peut gérer les utilisateurs, les groupes, les droits et toutes les fonctionnalités",
+"Can access site when closed" => "Droit d'accés au site lorsqu'il est fermé",
+"Administrator can admin banners" => "L'administrateur peut administrer les bannières",
+"Can ban users or ips" => "Droit de bannir des utilisateurs ou des adresses ip",
+"Can admin the dynamic content system" => "Droit d'administrer le système de contenu dynamique",
+"Can admin integrator repositories and rules" => "Droit d'administrer les dépots d'intégration Tiki et les règles",
+"Can admin mail-in accounts" => "Droit d'administrer les comptes mail-in",
+"Can edit object permissions" => "Droit de modifier les permissions des objets",
+"Can admin external feeds" => "Droit d'administrer les flux externes",
+"Can clean cache" => "Droit de vider le cache",
+"Can create new css suffixed with -user" => "Droit de créer des css suffixé avec -user",
+"Can remove association between two pages in a translation set" => "Droit de supprimer l'association entre des pages d'un jeu de traduction",
+"Can admin cookies" => "Droit d'administrer les cookies",
+"Can edit translations and create new languages" => "Droit de modifier les traductions et d'ajout de nouvelles langues",
+"Can edit menu" => "Droit de modifier les menus",
+"Can edit menu option" => "Droit de modifier les options des menus",
+"Can edit site templates" => "Droit de modifier les gabarits de site",
+"Can search" => "Droit de rechercher",
+"Can report a link to the webmaster" => "Droit de signaler un lien à l'administrateur du site",
+"Can send a link to a friend" => "Droit d'envoyer un lien à un ami",
+"Can share a page (email, Twitter, Facebook, message, forums)" => "Droit de partager une page (email, Twitter, Facebook, message, forums)",
+"Can use HTML in pages" => "Droit d'utiliser du code HTML dans les pages",
+"Can view action log" => "Droit de voir le journal des actions",
+"Can view action log for users of his own groups" => "Droit de voir le journal des actions pour ses propres groupes",
+"Can view integrated repositories" => "Droit de lecture sur les dépots d'intégration",
+"Can view referrer stats" => "Droit de voir les statistiques des pages référantes",
+"Can view site stats" => "Droit de voir les statistiques du site",
+"Can view site templates" => "Droit de voir les modèles du site",
+"Can admin toolbars" => "Droit d'administrer les barres d'outils",
 "Trust all user inputs including plugins (no security checks)" => "Faire confiance à toutes les saisies de l'utilisateur y compris les plugiciels (aucune vérification de sécurité)",
-"View page backlinks" => "Droit de voir les liens arrière (backlinks)",
 "Can admin mail notifications" => "Droit d'administrer les notifications par mail",
-"Can invite user to my groups" => "droit d'inviter un utilisateur dans mes groupes",
-"Can invite users by email, and include them in groups" => "Droit d'inviter des utilisateurs par courriel, et les inclure dans des groupes",
 "Can delete his/her own account" => "Droit d'effacer son propre compte",
 "Can use the importer" => "Droit d'utiliser l'importateur",
-"Can admin categories" => "Droit d'administrer les catégories",
-"Can see the category in a listing" => "Droit de voir la catégorie dans une liste",
 "Can change the categories of the object" => "Droit de changer la catégorie d'un objet",
-"Can add objects to the category (needs tiki_p_modify_object_categories)" => "Droit d'ajouter des objets à une catégorie (nécessite tiki_p_modify_object_categories)",
-"Can remove objects from the category (needs tiki_p_modify_object_categories)" => "Droit de retirer des éléments de la catégorie (nécessite tiki_p_modify_object_categories)",
-"Can view the perspective" => "Droit de voir la perspective",
-"Can edit the perspective" => "Droit d'éditer une perspective",
-"Can create a perspective" => "Droit de créer une perspective",
-"Can admin perspectives" => "Droits d'administrer les perspectives",
-"Can view the group" => "Droit de voir les groupes",
-"Can view the group members" => "Droit de voir les membres d'un groupe",
-"Can add group members" => "Droit d'ajouter les membres aux groupes",
-"Can remove group members" => "Droit de retirer des membres d'un groupe",
-"Can join or leave the group" => "Droit de rejoindre ou quitter un groupe",
-"Can trigger the transition between two states" => "Droit de déclencher une transition entre deux états",
-"Can admin kaltura feature" => "Droit d'administrer la fonctionnalité Kaltura",
-"Can upload video on kaltura server" => "Droit d'envoyer une vidéo sur le serveur Kaltura",
-"Can edit information of kaltura entry" => "Droit d'éditer les information d'une entrée Kaltura",
-// "Can create kaltura remix video" => "Can create kaltura remix video",
-"Can delete kaltura entry" => "Droit d'effacer une entrée Kaltura",
-"Can download kaltura entry" => "Droit de télécharger une entrée Kaltura",
-"Can list kaltura entries" => "Droit de lister les entrées Kaltura",
-"Can view kaltura entry" => "Droit de voir les entrées kaltura",
-"Can execute arbitrary queries on a given DSN" => "Droit d'exécuter une réquête quelconque sur un DSN donné",
-"Can administer payments" => "Droits d'administrer les paiements",
-"Can view payment requests and details" => "Droit de voir les requêtes de payements ainsi que les détails",
-"Can enter manual payments" => "Droit d'entrer un paiement manuel",
-"Can request a payment" => "Droit de demander un paiement",
 "User can administer modules" => "Droit d'administrer les modules",
-"Can save a .CSV backup of entire trackers" => "Droit de sauvegarder au format CSV tous les formulaires",
-"Can join a meeting" => "Droit de se joindre à une réunion",
-"Can moderate a meeting" => "Droit de modérer une réunion",
-"Can create a meeting" => "Droit de créer une réunion",
-"user can use social network integration" => "l'utilisateur peut utiliser l'intégration des réseaux sociaux",
-// "user can register this site with social networks" => "user can register this site with social networks",
-"Can view contributions to a page" => "Droit de voir les contributions à une page",
-"Can create/close a book" => "Droit de créer/clôturer un livre",
-"Can create/edit/lock accounts" => "Pouvoir créer/éditer/verrouiller des comptes",
-"Create a new transaction" => "Créer une nouvelle transaction",
-// "Permission to view the journal" => "Permission to view the journal",
-"Can book into the stack where statements can be changed" => "Droit d'enregistrer dans le brouillard, où des modifications peuvent être apportées",
-"Can import statements from external accounts" => "Droit d'importer des relevés à partir de comptes externes",
-"Can manage templates for recurring transactions" => "Droit de gérer des modèles pour les écritures récurrentes",
-"Can view unapproved revisions of pages" => "Droit d'afficher les modifications non approuvées des pages",
-"Can approve revisions of pages" => "Droit d'approuver les modifications de pages",
 "Can switch between wiki and WYSIWYG modes while editing" => "Droit de basculer entre les modes wiki et WYSIWYG pendant l'édition",
 "The administrator has not yet validated your account. Please wait." => "L'administrateur n'a pas encore validé votre compte. Attendez SVP.",
 "You must validate your account first. An email has been sent to you" => "Vous devez tout d'abord valider votre compte. Un courriel vous a été envoyé",
@@ -4639,8 +4643,10 @@
 // "Wiki page where search user interface template is found" => "Wiki page where search user interface template is found",
 // "Alphanumeric Unique Identifier for search" => "Alphanumeric Unique Identifier for search",
 // "A unique identifier to distinguish custom searches for storing of previous search criteria entered by users" => "A unique identifier to distinguish custom searches for storing of previous search criteria entered by users",
+// "Autotrigger AJAX search on criteria change" => "Autotrigger AJAX search on criteria change",
 // "Delay in milliseconds before automatically triggering search after change (0 disables)" => "Delay in milliseconds before automatically triggering search after change (0 disables)",
-// "The ID of the div to fade out when AJAX search is in progress, if required" => "The ID of the div to fade out when AJAX search is in progress, if required",
+// "Div to fade when AJAX search in progress" => "Div to fade when AJAX search in progress",
+// "The specific ID of the specific div to fade out when AJAX search is in progress, if not set will attempt to fade the whole area or if failing simply show the spinner" => "The specific ID of the specific div to fade out when AJAX search is in progress, if not set will attempt to fade the whole area or if failing simply show the spinner",
 // "Return users to same search parameters on coming back to the search page after leaving" => "Return users to same search parameters on coming back to the search page after leaving",
 // "In the same session, return users to same search parameters on coming back to the search page after leaving" => "In the same session, return users to same search parameters on coming back to the search page after leaving",
 // "Custom JavaScript wiki page" => "Custom JavaScript wiki page",
@@ -5710,7 +5716,7 @@
 "HTML color code (not color name) for the link text for all send and post services shown in the widget" => "Code couleur HTML (pas le nom) pour le texte du lien pour tous les envois et réceptions montrés dans le gadget",
 "Pop-up" => "Popup",
 "A value of true will cause the widget to show in a pop-up window" => "La valeur vraie fera afficher le gadget dans une fenêtre pop-up",
-// "Embedded Elements" => "Eléments encastrés",
+// "Embedded Elements" => "Embedded Elements",
 "A value of true will allow embedded elements (like flash) to be seen while iframe is loading" => "La valeur <em>true</em> permettra aux éléments embarqués (comme flash) d'être visibles lors du chargement d'une iframe",
 "Sheet" => "Feuille",
 // "Display data from a TikiSheet" => "Display data from a TikiSheet",
@@ -5924,6 +5930,10 @@
 "Subscribe button label, containing %s as the placeholder for the group name" => "Libellé du bouton de souscription, contenant %s pour situer l'emplacement du nom du groupe",
 // "Unsubscribe Action" => "Unsubscribe Action",
 "Unsubscribe button label, containing %s as the placeholder for the group name" => "Titre du bouton de désinscription, contenant %s pour l'emplacement du nom de groupe",
+// "Postsubscribe URL" => "Postsubscribe URL",
+// "URL to send the user to after subscribing, if required" => "URL to send the user to after subscribing, if required",
+// "Postunsubscribe URL" => "Postunsubscribe URL",
+// "URL to send the user to after unsubscribing, if required" => "URL to send the user to after unsubscribing, if required",
 // "Subscribe Groups" => "Subscribe Groups",
 "Allow users to subscribe to a list of groups" => "Autoriser les utilisateurs à s'inscrire à une liste de groupes",
 // "Text shown in the dropdown box. Default: \"Subscribe to a group\"" => "Text shown in the dropdown box. Default: \"Subscribe to a group\"",
@@ -5936,9 +5946,19 @@
 "Group Description" => "Description du groupe",
 "Show the description of the group (not shown by default)" => "Afficher la description du groupe (non affichée par défaut)",
 "Colon separated list of groups. By default the list of groups available to the user" => "Liste de groupes séparés par ':'. Par défaut, la liste des groupes accessibles à l'utilisateur",
-"All groups including this group will be listed" => "Tous les groupes incluant celui-ci seront listés",
+// "Only list groups that include the group being specified here" => "Only list groups that include the group being specified here",
 "Default URL" => "URL par défaut",
 "Page user will be directed to after clicking on icon to change default group" => "Page vers laquelle l'utilisateur sera dirigé après avoir cliqué sur l'icône pour changer le groupe par défaut",
+// "Leader Group Name" => "Leader Group Name",
+// "Name of group for leaders of the group, where \"groupName\" will be substituted by the group name" => "Name of group for leaders of the group, where \"groupName\" will be substituted by the group name",
+// "Pending Users Group Name" => "Pending Users Group Name",
+// "Name of group for users that are waiting for approval to enter the group, where \"groupName\" will be substituted by the group name" => "Name of group for users that are waiting for approval to enter the group, where \"groupName\" will be substituted by the group name",
+// "Group Management Page Name" => "Group Management Page Name",
+// "Name of wiki page for group management by leaders, where \"groupName\" will be substituted by the group name" => "Name of wiki page for group management by leaders, where \"groupName\" will be substituted by the group name",
+// "Hide link for groups including" => "Hide link for groups including",
+// "Hide link to group home page for groups that include the group being specified here" => "Hide link to group home page for groups that include the group being specified here",
+// "Always allow leaving group" => "Always allow leaving group",
+// "Always allow leaving group even if userChoice for group is set to n" => "Always allow leaving group even if userChoice for group is set to n",
 "You do not have permission to subscribe to groups" => "Vous n'avez pas les droits pour vous inscrire à des groupes",
 "Subscribe newsletter" => "S'inscrire à la lettre de nouvelles",
 "Allow users to subscribe to a newsletter" => "Autoriser les utilisateurs à s'inscrire à une lettre de nouvelles",
@@ -6506,7 +6526,7 @@
 "Default: \"All Content Type\"" => "Par défaut : \"Tout type de contenu\"",
 "Options: \"article, wiki page, blog post\"" => "Options : \"article, wiki page, blog post\"",
 "Broaden FreeTag Search" => "Elargir la recherche de mots-clés",
-"Find similar content that contains one of the Tags or All of the Tags" => "Trouver du contenu similaire qui contient un des mots-clés ou tous les mots-clés",
+"Find similar content that contains one of the Tags or All of the Tags" => "Trouver du contenu similaire qui contient un des mots-clés ou tous les mots-clés.",
 "Default: \"n - needs to contain all of the Tags\"" => "Par défaut : \"n - doit contenir tous les mots-clés",
 "Options: \"n - Needs to contain All Tags / y - Needs to contain one of the Tags\"" => "Options: \"n - Doit contenir tous les mots-clés / y - Doit contenir au moins un mot-clé\"",
 "Google AdSense" => "Publicité Google AdSense",
@@ -6560,16 +6580,16 @@
 "Tiki assistant" => "Assistant Tiki",
 "Displays an assistant to guide new Tiki admins." => "Affiche un assistant pour guider les nouveaux administrateurs Tiki.",
 "Babel Fish Links" => "Liens Babel Fish",
-// "Offers a link to the Yahoo! Babel Fish translation service" => "Offers a link to the Yahoo! Babel Fish translation service",
+"Offers a link to the Yahoo! Babel Fish translation service" => "Propose un lien vers le service de traduction Yahoo! Babel Fish",
 "Babel Fish icon link" => "Icône de lien vers Babel Fish",
-// "Offers an icon linked to the Yahoo! Babel Fish translation service" => "Offers an icon linked to the Yahoo! Babel Fish translation service",
+"Offers an icon linked to the Yahoo! Babel Fish translation service" => "Propose une icône liée au service de traduction Yahoo! Babel Fish",
 "Newest Blog Post Comments" => "Derniers commentaires sur les publications de blogue",
 "Displays the specified number of the blog post comments most recently added" => "Affiche le nombre spécifié de commentaires blog les plus récemment ajoutés",
 "No date" => "Pas de date",
-// "If set to \"y\", the date of comments is not displayed in the module box" => "If set to \"y\", the date of comments is not displayed in the module box",
-// "Verbose tooltips" => "Verbose tooltips",
-// "If set to \"y\", blog post title is only visible as a tooltip and not displayed" => "If set to \"y\", blog post title is only visible as a tooltip and not displayed",
-// "Options: \"y,n\"" => "Options: \"y,n\"",
+"If set to \"y\", the date of comments is not displayed in the module box" => "Si défini à \"y\", la date des commentaires n'est pas affichée dans le conteneur du module",
+"Verbose tooltips" => "Infobulles bavardes",
+"If set to \"y\", blog post title is only visible as a tooltip and not displayed" => "Si défini à \"y\", le titre de la publication du blogue est seulement visible sous forme d'infobulle et non affichée",
+"Options: \"y,n\"" => "Options : \"y,n\"",
 "Last-Visited Pages" => "Dernières pages visitées",
 "Displays the last Wiki pages visited by the user." => "Affiche les dernières pages Wiki visitées par l'utilisateur.",
 "Maximum number of characters in page names allowed before truncating" => "Nombre maximum de caractères des noms des pages avant troncature",
@@ -6609,22 +6629,22 @@
 // "Displays controls to trigger category transitions and change the page's state according to predefined rules" => "Displays controls to trigger category transitions and change the page's state according to predefined rules",
 "Change Category" => "Changer la Catégorie",
 "Enables to categorize an object." => "Permet de catégoriser un objet.",
-"This module currently only supports Wiki pages. Some combinations of Multiple categories, Detailed, Unassign and Assign may challenge intuition or be simply broken" => "Ce module ne fonctionne pour le moment qu'avec les pages Wiki. Certaines combinaisons de Plusieurs catégories, Détaillé, Désassigner et Assigner peuvent défier l'intuition ou être simplement cassées",
+"This module currently only supports Wiki pages. Some combinations of Multiple categories, Detailed, Unassign and Assign may challenge intuition or be simply broken" => "Ce module ne fonctionne pour le moment qu'avec les pages Wiki. Certaines combinaisons de plusieurs catégories, Détaillé, Désassigner et Assigner peuvent défier l'intuition ou être simplement cassées",
 "Category identifier" => "Identificateur de catégorie",
 "Changes the root of the displayed categories from default \"TOP\" to the category with the given identifier" => "Change la racine des catégories affichées de \"TOP\" par défaut à la catégorie indiquée par son identificateur",
 "Note that the root category is not displayed" => "Veuillez noter que la catégorie racine n'est pas affichée",
 "Defaults to 0 (root)" => "Par défaut 0 (racine)",
-// "No top" => "No top",
-"In non-detailed view, disallow uncategorizing. Example value: 1" => "Dans une vue non détaillées, désactiver la décatégorisation. Exemple de valeur : 1",
+"No top" => "Vue non détaillée",
+"In non-detailed view, disallow uncategorizing. Example value: 1" => "Dans une vue non détaillée, désactiver la décatégorisation. Exemple de valeur : 1",
 "Display path" => "Afficher le chemin",
-"Instead of category names, diplay their path in the category tree starting from the category root defined" => "Au lieu des noms de catégories, affiche leur chemin dans l'arborescence des catégories en partant de la catégorie définie comme racine",
-"Example value: 1" => "Exemple de valeur : 1",
+"Unless set to \"n\", display relative category paths in the category tree rather than category names" => "A moins d'être défini à \"n\", afficher les chemins relatifs dans l'arbre des catégories plutôt que les noms de catégorie",
+"Paths are relative to the root category, which is not displayed" => "Les chemins sont relatifs à la catégorie racine, qui n'est pas affichée",
 "Multiple categories" => "Plusieurs catégories",
 "If set to \"n\", only allows categorizing in one category (from those displayed)" => "Si défini à \"n\", permet seulement d'affecter à une seule catégorie (parmi celles affichées)",
 "Categorize" => "Catégoriser",
-// "String to display on the button to submit new categories, when multiple categories is enabled. Default value: Categorize" => "String to display on the button to submit new categories, when multiple categories is enabled. Default value: Categorize",
-// "Shy" => "Shy",
-// "If set to \"y\", the module is not shown on pages which are not already categorized" => "If set to \"y\", the module is not shown on pages which are not already categorized",
+"String to display on the button to submit new categories, when multiple categories is enabled. Default value: Categorize" => "Chaîne à afficher dans le bouton pour soumettre de nouvelles catégories, quand les catégories multiples sont autorisées. aleur par défaut : Categoriser",
+"Shy" => "Timide",
+"If set to \"y\", the module is not shown on pages which are not already categorized" => "Si défini à \"y\", le module n'est pas affiché dans les pages non encore catégorisées",
 "Detailed" => "Détaillé",
 "If set to \"y\", shows a list of categories in which the object is. If deletion is not disabled, it is done with the list" => "Si défini à \"y\", montre une liste des catégories dans lesquelles se trouve l'objet. Si la suppression n'est pas désactivée, ce peut être fait avec la liste",
 "Unassign" => "Désattribuer",
@@ -6633,10 +6653,12 @@
 "If set to \"y\", allow to assign new categories" => "Si défini à \"y\", permet d'assigner de nouvelles catégories",
 "Example values: y, n" => "Exemple de valeurs : y, n",
 "Default value: y" => "Valeur par défaut : y",
+"Group filter" => "Filtre de groupe",
+"Very particular filter option. If set to \"y\", only categories with a name matching one of the user's groups are shown, and descendants of these matching categories" => "Option de filtre très particulière. Si définie à \"y\", seules catégories ayant un nom correspondant à un des groupes de l'utilisateur sont affichées, ainsi que les descendantes de ces catégories en correspondance",
 "Default value: n" => "Valeur par défaut : n",
-// "Image URL not in category" => "Image URL not in category",
-"Very particular parameter. If both this and \"Image URL in category\" are set and the root category contains a single child category, the module only displays an image with this URL if the object is not in the category" => "Paramètre très particulier. Si et ceci et «Adresse de l'image dans la catégorie» sont paramétrés, et si la catégorie racine contient une seule catégorie enfant, le module affiche seulement une image avec cette adresse si l'objet n'est pas dans la catégorie",
-// "Image URL in category" => "Image URL in category",
+"Image URL not in category" => "Adresse de l'image pas dans la catégorie",
+"Very particular parameter. If both this and \"Image URL in category\" are set and the root category contains a single child category, the module only displays an image with this URL if the object is not in the category" => "Paramètre très particulier. Si ceci et «Adresse de l'image dans la catégorie» sont paramétrés, et si la catégorie racine contient une seule catégorie enfant, le module affiche seulement une image avec cette adresse si l'objet n'est pas dans la catégorie",
+"Image URL in category" => "Adresse de l'image dans la catégorie",
 "Very particular parameter. If both this and \"Image URL not in category\" are set and the root category contains a single child category, the module only displays an image with this URL if the object is in the category" => "Paramètre très particulier. Si ceci et «Adresse de l'image pas dans la catégorie» sont paramétrés, et si la catégorie racine contient une seule catégorie enfant, le module affiche seulement une image avec cett adresse si l'objet est dans la catégorie",
 "Categorize %s" => "Catégoriser %s",
 "Categorize %s in %s" => "Catégoriser %s dans %s",
@@ -6668,11 +6690,11 @@
 "Topics only" => "Sujets uniquement",
 "If set to \"y\", only displays topics" => "Si défini à \"y\", affiche seulement les sujets",
 "List of forum identifiers" => "Liste d'identifiants de forums",
-// "If set to a list of forum identifiers, restricts the posts to those in the identified forums. Identifiers are separated by colons (\":\")" => "If set to a list of forum identifiers, restricts the posts to those in the identified forums. Identifiers are separated by colons (\":\")",
+"If set to a list of forum identifiers, restricts the posts to those in the identified forums. Identifiers are separated by colons (\":\")" => "Si défini comme une liste d'identifiants de forums, restreint les publications à celles dans les forums spécifiés. Les identifiants sont séparés par deux-points (\":\")",
 "Show date" => "Afficher la date",
-// "If set to \"y\", show post date directly instead of as tooltip" => "If set to \"y\", show post date directly instead of as tooltip",
+"If set to \"y\", show post date directly instead of as tooltip" => "Si défini à \"y\", afficher la date de publication directement plutôt que dans une infobulle",
 "Show author" => "Afficher l'auteur",
-// "If set to \"y\", show post author directly instead of as tooltip" => "If set to \"y\", show post author directly instead of as tooltip",
+"If set to \"y\", show post author directly instead of as tooltip" => "Si défini à \"y\", afficher directement l'auteur plutôt que dans une infobulle",
 "Most commented forums" => "Forums avec le plus de commentaires",
 "Displays the specified number of the forums with the most comments." => "Affiche un nombre déterminé des forums avec le plus de commentaires.",
 "Most-Read Forum Topics" => "Sujets les plus lus",
@@ -6755,20 +6777,20 @@
 // "Target URL of the \"...more\" link at the bottom of the module" => "Target URL of the \"...more\" link at the bottom of the module",
 "Newest Podcasts" => "Derniers Podcasts",
 "Displays Podcasts." => "Affiche les Podcasts.",
-// "File galleries IDs" => "File galleries IDs",
-// "List of IDs of file galleries of type \"Podcast (Audio)\". Identifiers are separated by a colon (\":\"). If none, all file galleries will be scanned" => "List of IDs of file galleries of type \"Podcast (Audio)\". Identifiers are separated by a colon (\":\"). If none, all file galleries will be scanned",
-"width" => "largeur",
-"Width of mediaplayer in pixels. Default is 190" => "Largeur du lecteur média. Par défaut : 190",
-"height" => "hauteur",
-"Height of mediaplayer in pixels. Default is 20" => "Hauteur en pixels du mediaplayer. Par défaut : 20",
-// "Path to mp3 player. For instance media/player_mp3_maxi.swf if you downloaded player_mp3_maxi.swf from http://flash-mp3-player.net/players/maxi/download/ to directory media/ (directory needs to be created or you can chose another place)" => "Path to mp3 player. For instance media/player_mp3_maxi.swf if you downloaded player_mp3_maxi.swf from http://flash-mp3-player.net/players/maxi/download/ to directory media/ (directory needs to be created or you can chose another place)",
-// "Bottom Link URL" => "Bottom Link URL",
-// "URL for a link at bottom of module" => "URL for a link at bottom of module",
-// "Bottom Link URL Text" => "Bottom Link URL Text",
-// "Text for link if Bottom Link URL is set. Default is \"More Podcasts\"" => "Text for link if Bottom Link URL is set. Default is \"More Podcasts\"",
+"File galleries IDs" => "IDs des galeries de fichier",
+"List of IDs of file galleries of type \"Podcast (Audio)\". Identifiers are separated by a colon (\":\"). If none, all file galleries will be scanned" => "Liste des IDs de galeries de fichier du type \"Podcast (Audio)\". Les identificateurs sont séparés par deux-points (\":\"). Si rien n'est spécifié, toutes les galeries de fichiers seront examinées",
+"width" => "Largeur",
+"Width of mediaplayer in pixels." => "Largeur du lecteur média.",
+"height" => "Hauteur",
+"Height of mediaplayer in pixels." => "Hauteur en pixels du lecteur média.",
+"Path to mp3 player. For instance media/player_mp3_maxi.swf if you downloaded player_mp3_maxi.swf from http://flash-mp3-player.net/players/maxi/download/ to directory media/ (directory needs to be created or you can chose another place)" => "Chemin vers le lecteur mp3. Par exemple media/player_mp3_maxi.swf si vous avez téléchargé 'player_mp3_maxi.swf' depuis http://flash-mp3-player.net/players/maxi/download/ vers le répertoire media/ (répertoire à créer ou vous pouvez choisir un autre emplacement)",
+"Bottom Link URL" => "URL du lien inférieur",
+"URL for a link at bottom of module" => "URL pour un lien au pied du module",
+"Bottom Link URL Text" => "Texte du lien inférieur",
+"Text for link if Bottom Link URL is set." => "Texte pour le lien si 'URL du lien inférieur' est définie.",
 "More Podcasts" => "Plus de podcasts",
 "Verbose" => "Détaillé",
-// "Display description of podcast below player if \"y\", and on title mouseover if \"n\". Default is \"y\"" => "Display description of podcast below player if \"y\", and on title mouseover if \"n\". Default is \"y\"",
+"Display description of podcast below player if \"y\", and on title mouseover if \"n\"." => "Afficher la description du podcast en dessous du lecteur si \"y\", et au survol de souris du titre si \"n\".",
 "Newest Article Submissions" => "Dernières soumissions",
 "Lists the specified number of article submissions from newest to oldest." => "Liste un nombre déterminé d'articles soumis du plus récent au plus ancien.",
 "Newest Tracker Comments" => "Derniers commentaires de formulaire",
@@ -6810,9 +6832,9 @@
 "Log-in box" => "Boîte de connexion",
 "Input size" => "Taille de la saisie",
 "Number of characters for username and password input fields" => "Nombre de caractères pour les champs de saisie nom d'utilisateur et mot de passe",
-// "Display mode: module, header or popup. Leave empty for module mode" => "Display mode: module, header or popup. Leave empty for module mode",
-// "Show Register" => "Show Register",
-// "Show the register link" => "Show the register link",
+"Display mode: module, header or popup. Leave empty for module mode" => "Mode d'affichage : 'module', 'header' ou 'popup'. Laisser à blanc pour le mode module",
+"Show Register" => "Afficher 'S'enregistrer'",
+"Show the register link" => "Afficher le lien 'S'enregistrer'",
 "Show I Forgot" => "Afficher 'J'ai oublié'",
 "Show the \"I forgot my password\" link" => "Afficher le lien 'J'ai oublié mon mot de passe'",
 "Show Remember me" => "Afficher 'Se souvenir de moi'",
@@ -6897,7 +6919,7 @@
 "Some helpful tools for admins." => "Quelques outils pratiques pour les administrateurs.",
 "Display mode: module or header. Leave empty for module mode" => "Mode d'affichage : module ou en-tête. Laisser à blanc pour le mode module",
 "Quick Edit" => "Modification rapide",
-// "Deprecated - use Search module instead" => "Deprecated - use Search module instead",
+"Deprecated - use Search module instead" => "Obsolète - utiliser plutôt le module Recherche",
 // "(Enables to quickly create or edit Wiki pages.)" => "(Enables to quickly create or edit Wiki pages.)",
 // "Template identifier" => "Template identifier",
 "If set to a template identifier, the specified template is used for creating new Wiki pages" => "Si réglé sur un nom de gabarit, ce gabarit sera utilisé pour la création de nouvelles pages Wiki",
@@ -6978,14 +7000,14 @@
 "Edit Template identifier" => "Modifier l'identificateur de gabarit",
 "If set to a category identifier, pages created through the module are automatically categorized in the specified category" => "Si réglé sur un identificateur de catégorie, les pages crées au travers de ce module sont automaitquement rattéchées à cette catégorie",
 "Compact mode" => "Mode compact",
-// "Makes the three buttons only appear on mouse-over" => "Makes the three buttons only appear on mouse-over",
-// "Search is disabled" => "Search is disabled",
+"Makes the three buttons only appear on mouse-over" => "Fait que les trois boutons apparaissent uniquement lors du survol de souris",
+"Search is disabled" => "La recherche est désactivée",
 "Search for Wiki Page" => "Chercher dans les pages Wiki",
 "Titles" => "Titres",
-// "(Small search form for wiki, articles, blogs, etc.)" => "(Small search form for wiki, articles, blogs, etc.)",
+"(Small search form for wiki, articles, blogs, etc.)" => "(Petit formulaire de recherche pour wiki, articles, blogs, etc.)",
 "If set to \"y\", the search performed is a \"Tiki search\"" => "Si réglé sur \"y\", la recherche effectuée est une \"recherche Tiki\"",
-// "(Search for a wiki page by name.)" => "(Search for a wiki page by name.)",
-// "Exact match checkbox checked by default if set to \"y\"" => "Exact match checkbox checked by default if set to \"y\"",
+"(Search for a wiki page by name.)" => "(Recherche d'une page wiki par son nom.)",
+"Exact match checkbox checked by default if set to \"y\"" => "La case à cocher 'correspondance exacte' est cochée par défaut si défini à \"y\"",
 "Lists the relationships known for the Wiki page displayed. For each relation type contained in the page, it lists all the pages it links to or gets linked from" => "Liste les relations connues de la page Wiki affichée. Pour chaque type de relation contenue dans la page, il liste toutes les pages en relation (vers ou depuis) la page",
 "Links for sharing, reporting etc" => "Liens pour partager, rapporter etc",
 "Report" => "Rapport",
@@ -6997,11 +7019,11 @@
 // "Wait label" => "Wait label",
 // "Label on the button to post a message when the message is being posted if AJAX is enabled" => "Label on the button to post a message when the message is being posted if AJAX is enabled",
 "Maximum messages shown" => "Nombre maximum de messages affichés",
-// "Number of messages to display" => "Number of messages to display",
+"Number of messages to display" => "Nombre de messages à afficher",
 "Tweet" => "Tweet ",
-// "If set to \"1\" and the user has authorized us to tweet messages with Twitter, the user can decide, if he wants to shout via Twitter" => "If set to \"1\" and the user has authorized us to tweet messages with Twitter, the user can decide, if he wants to shout via Twitter",
+"If set to \"1\" and the user has authorized us to tweet messages with Twitter, the user can decide, if he wants to shout via Twitter" => "Si défini à \"1\" et que l'utilisateur nous a autorisé à publier des tweets avec Twitter, l'utilisateur peut décider, si il veut utiliser le mégaphone via Twiter",
 "Facebook" => "Facebook",
-// "If set to \"1\" and the user has authorized us with Facebook, the user can decide, if he wants to add the shout to his Facebook wall" => "If set to \"1\" and the user has authorized us with Facebook, the user can decide, if he wants to add the shout to his Facebook wall",
+"If set to \"1\" and the user has authorized us with Facebook, the user can decide, if he wants to add the shout to his Facebook wall" => "Si défini à \"1\" et que l'utilisateur nous a autorisé à utiliser Facebook, l'utilisateur peut décider, si il veut ajouter l'annonce du mégaphone sur son mur Facebook",
 "Please wait.." => "Attendez, SVP",
 "Since Last Visit (Simple)" => "Depuis la dernière visite (simple)",
 "Displays to logged in users the number of new or updated objects since their last login date and time" => "Affiche aux utilisateurs authentifiés le nombre d'objets nouveaux ou modifiés depuis leurs dernières connexions",
@@ -7012,16 +7034,16 @@
 "If set to \"n\", do not show new users" => "Si défini à \"n\", ne pas montrer les nouveaux utilisateurs",
 "Show trackers" => "Afficher les formulaires",
 "If set to \"n\", do not show tracker changes" => "Si défini à  \"n\", ne pas afficher les modifications du formulaire",
-// "Calendar focus" => "Calendar focus",
-"Unless set to \"ignore\", the module changes the reference point in time from the user's last login date and time to a day where users browse to using the calendar" => "A moins d'être réglé sur \"ignore\", le module change le point de référence temporel à partir des date et heure de dernière connexion de l'utilisateur jusqu'au jour où l'utilisateur parcourt le calendrier",
+"Calendar focus" => "Point de référence du calendrier",
+"Unless set to \"ignore\", the module changes the reference point in time from the user's last login date and time to a day where users browse to using the calendar." => "A moins d'être réglé sur \"ignore\", le module change le point de référence temporel à partir des date et heure de dernière connexion de l'utilisateur jusqu'au jour où l'utilisateur parcourt le calendrier.",
 "Show date as a calendar link" => "Afficher la date en tant que lien de calendrier",
-// "If set to \"n\", do not add a link to tiki calendar on the date in the header (even if feature calendar is set)" => "If set to \"n\", do not add a link to tiki calendar on the date in the header (even if feature calendar is set)",
-// "Fold sections by default" => "Fold sections by default",

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

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

[<robertplummer@us...>]

Revision: 37428
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37428&view=rev
Author:   robertplummer
Date:     2011-09-19 18:34:33 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] Reverted new tracker query lib call

Modified Paths:
--------------
    trunk/lib/trackers/trackerquerylib.php
    trunk/tiki-tracker_export_join.php

Modified: trunk/lib/trackers/trackerquerylib.php
===================================================================
--- trunk/lib/trackers/trackerquerylib.php	2011-09-19 18:29:32 UTC (rev 37427)
+++ trunk/lib/trackers/trackerquerylib.php	2011-09-19 18:34:33 UTC (rev 37428)
@@ -660,3 +660,5 @@
 		return $output;
 	}
 }
+
+$trkqrylib = new TrackerQueryLib();
\ No newline at end of file

Modified: trunk/tiki-tracker_export_join.php
===================================================================
--- trunk/tiki-tracker_export_join.php	2011-09-19 18:29:32 UTC (rev 37427)
+++ trunk/tiki-tracker_export_join.php	2011-09-19 18:34:33 UTC (rev 37428)
@@ -8,8 +8,7 @@
 
 require_once('tiki-setup.php');
 $trklib = TikiLib::lib("trk");
-TikiLib::lib("trkqry");
-$trkqrylib = new TrackerQueryLib();
+$trkqrylib = TikiLib::lib("trkqry");
 
 $access->check_permission('tiki_p_export_tracker');
 

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37427] trunk/tiki-admin_categories.php

[<sylvieg@us...>]

Revision: 37427
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37427&view=rev
Author:   sylvieg
Date:     2011-09-19 18:29:32 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX]categ: if not tiki_p_admin_categories and see no categ, goto perm denied + duplicated the perms when creating a category and non admin_categories (to see it) + do not show perm icon if non admin_catwegories

Modified Paths:
--------------
    trunk/tiki-admin_categories.php

Modified: trunk/tiki-admin_categories.php
===================================================================
--- trunk/tiki-admin_categories.php	2011-09-19 17:58:01 UTC (rev 37426)
+++ trunk/tiki-admin_categories.php	2011-09-19 18:29:32 UTC (rev 37427)
@@ -21,6 +21,7 @@
 }
 $smarty->assign('parentId', $_REQUEST['parentId']);
 
+
 if (!empty($_REQUEST['parentId'])) {
 	$access->check_permission('tiki_p_admin_categories', '', 'category', $_REQUEST['parentId'] );
 }
@@ -150,7 +151,7 @@
 	);
 	$categlib->notify($values);
 }
-if (isset($_REQUEST["categId"])) {
+if (!empty($_REQUEST["categId"])) {
 	$access->check_permission('tiki_p_admin_categories', '', 'category', $_REQUEST['categId'] );
 	$info = $categlib->get_category($_REQUEST["categId"]);
 } else {
@@ -197,6 +198,9 @@
 		$errors[] = tra('You can not create a category with a name already existing at this level');
 	} else {
 		$newcategId = $categlib->add_category($_REQUEST["parentId"], $_REQUEST["name"], $_REQUEST["description"]);
+		if ($tiki_p_admin_categories != 'y') {
+			$userlib->copy_object_permissions($_REQUEST['parentId'], $newcategId, 'category');
+		}
 	}
 	$info["name"] = '';
 	$info["description"] = '';
@@ -244,6 +248,9 @@
 					$smarty->display('error.tpl');
 					die;
 				}
+				if ($tiki_p_admin_categories != 'y') {
+					$userlib->copy_object_permissions($parentId, $newcategId, 'category');
+				}
 			}
 		}
 	}
@@ -264,8 +271,10 @@
 
 // ---------------------------------------------------
 
-
 $categories = $categlib->getCategories(NULL, false);
+if (empty($categories)) {
+	$access->check_permission('tiki_p_admin_categories');
+}
 $smarty->assign('categories', $categories);
 
 $treeNodes = array();
@@ -274,16 +283,17 @@
 	$data = '<a href="tiki-admin_categories.php?parentId=' . $category['parentId'] . '&amp;categId=' . $category['categId'] . '" title="' . tra('Edit') . '">' . smarty_function_icon(array('_id'=>'page_edit'), $smarty) . '</a>';
 	$data .= '<a href="tiki-admin_categories.php?parentId=' . $category['parentId'] . '&amp;removeCat=' . $category['categId'] . '" title="' . tra('Delete') . '">' . smarty_function_icon(array('_id'=>'cross'), $smarty) . '</a>';
 
-	if ($userlib->object_has_one_permission($category['categId'], 'category')) {
-		$title = tra('Edit permissions for this category');
-		$icon = 'key_active';
-	} else {
-		$title = tra('Assign Permissions');
-		$icon = 'key';
+	if ($tiki_p_asdmin_categories == 'y') {
+		if ($userlib->object_has_one_permission($category['categId'], 'category')) {
+			$title = tra('Edit permissions for this category');
+			$icon = 'key_active';
+		} else {
+			$title = tra('Assign Permissions');
+			$icon = 'key';
+		}
+		$data .= '<a href="tiki-objectpermissions.php?objectType=category&amp;objectId=' . $category['categId'] . '&amp;objectName=' . urlencode($category['name']) . '&amp;permType=all">' . smarty_function_icon(array('_id'=>$icon, 'alt'=>$title), $smarty) . '</a>';
 	}
-	$data .= '<a href="tiki-objectpermissions.php?objectType=category&amp;objectId=' . $category['categId'] . '&amp;objectName=' . urlencode($category['name']) . '&amp;permType=all">' . smarty_function_icon(array('_id'=>$icon, 'alt'=>$title), $smarty) . '</a>';
 	
-	
 	$data .= '<a class="catname" href="tiki-admin_categories.php?parentId=' . $category["categId"] . '">' . htmlspecialchars($category['name']) .'</a> ';
 	$treeNodes[] = array(
 		'id' => $category['categId'],

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

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

[<robertplummer@us...>]

Revision: 37426
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37426&view=rev
Author:   robertplummer
Date:     2011-09-19 17:58:01 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] Fixed tracker reports for new changes in tracker query lib

Modified Paths:
--------------
    trunk/tiki-tracker_export_join.php
    trunk/tiki-tracker_reports.php

Modified: trunk/tiki-tracker_export_join.php
===================================================================
--- trunk/tiki-tracker_export_join.php	2011-09-19 17:57:40 UTC (rev 37425)
+++ trunk/tiki-tracker_export_join.php	2011-09-19 17:58:01 UTC (rev 37426)
@@ -7,8 +7,10 @@
 }
 
 require_once('tiki-setup.php');
-require_once('lib/trackers/trackerlib.php');
-require_once('lib/trackers/trackerquerylib.php');
+$trklib = TikiLib::lib("trk");
+TikiLib::lib("trkqry");
+$trkqrylib = new TrackerQueryLib();
+
 $access->check_permission('tiki_p_export_tracker');
 
 
@@ -87,15 +89,28 @@
 	$i = 0;
 	foreach($_REQUEST['trackerIds'] as $key => $trackerId) {
 		if ($key == 0) {
-
-			$trackerPrimary = $trkqrylib->tracker_query($trackerId, $_REQUEST['start'][$key], $_REQUEST['end'][$key], null, $_REQUEST['q'][$key], $_REQUEST['search'][$key], $_REQUEST['fields'][$key], $_REQUEST['status'][$key]);
+			$trackerPrimary = TrackerQueryLib::tracker($trackerId)
+				->start($_REQUEST['start'][$key])
+				->end($_REQUEST['end'][$key])
+				->equals($_REQUEST['q'][$key])
+				->search($_REQUEST['search'][$key])
+				->fields($_REQUEST['fields'][$key])
+				->status($_REQUEST['status'][$key])
+				->query();
 		} else {
 			$joinVars = $_REQUEST['itemIdFields'][$key - 1];
 			$joinVars = explode('|', $joinVars);
 			
 			$trackerPrimary = $trkqrylib->join_trackers(
 				$trackerPrimary, 
-				$trkqrylib->tracker_query($trackerId, $_REQUEST['start'][$key], $_REQUEST['end'][$key], null, $_REQUEST['q'][$key], $_REQUEST['search'][$key], $_REQUEST['fields'][$key], $_REQUEST['status'][$key]), 
+				TrackerQueryLib::tracker($trackerId)
+					->start($_REQUEST['start'][$key])
+					->end($_REQUEST['end'][$key])
+					 ->equals($_REQUEST['q'][$key])
+					->search($_REQUEST['search'][$key])
+					->fields($_REQUEST['fields'][$key])
+					->status($_REQUEST['status'][$key])
+					->query(),
 				$joinVars[0],
 				$joinVars[1]
 			);

Modified: trunk/tiki-tracker_reports.php
===================================================================
--- trunk/tiki-tracker_reports.php	2011-09-19 17:57:40 UTC (rev 37425)
+++ trunk/tiki-tracker_reports.php	2011-09-19 17:58:01 UTC (rev 37426)
@@ -6,7 +6,7 @@
 // $Id$
 
 require_once('tiki-setup.php');
-require_once('lib/trackers/trackerlib.php');
+$trkqry = TikiLib::lib("trk");
 $access->check_permission('tiki_p_export_tracker');
 
 $headerlib->add_jq_onready('

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37425] trunk/tiki-view_invoice.php

[<robertplummer@us...>]

Revision: 37425
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37425&view=rev
Author:   robertplummer
Date:     2011-09-19 17:57:40 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] removed tracker query lib as var

Modified Paths:
--------------
    trunk/tiki-view_invoice.php

Modified: trunk/tiki-view_invoice.php
===================================================================
--- trunk/tiki-view_invoice.php	2011-09-19 17:27:22 UTC (rev 37424)
+++ trunk/tiki-view_invoice.php	2011-09-19 17:57:40 UTC (rev 37425)
@@ -7,7 +7,7 @@
 
 require_once('tiki-setup.php');
 $trklib = TikiLib::lib('trk');
-$trkqrylib = TikiLib::lib('trkqry');
+TikiLib::lib('trkqry');
 
 $access->check_feature('feature_invoice');
 $access->check_permission('tiki_p_admin');

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

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

[<lphuberdeau@us...>]

Revision: 37424
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37424&view=rev
Author:   lphuberdeau
Date:     2011-09-19 17:27:22 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[MOD] Deploy tracker permission changes to tiki-view_tracker.php

Modified Paths:
--------------
    trunk/lib/core/Tracker/Item.php
    trunk/templates/tiki-view_tracker.tpl
    trunk/tiki-view_tracker.php

Modified: trunk/lib/core/Tracker/Item.php
===================================================================
--- trunk/lib/core/Tracker/Item.php	2011-09-19 16:53:52 UTC (rev 37423)
+++ trunk/lib/core/Tracker/Item.php	2011-09-19 17:27:22 UTC (rev 37424)
@@ -41,7 +41,7 @@
 	function canView()
 	{
 		if (empty($this->info)) {
-			return $this->perms->create_tracker_items;
+			return true;
 		}
 
 		if ($this->canModifyFromSpecialPermissions()) {

Modified: trunk/templates/tiki-view_tracker.tpl
===================================================================
--- trunk/templates/tiki-view_tracker.tpl	2011-09-19 16:53:52 UTC (rev 37423)
+++ trunk/templates/tiki-view_tracker.tpl	2011-09-19 17:27:22 UTC (rev 37424)
@@ -74,14 +74,11 @@
 								</th>
 							{/if}
 							
-							{foreach from=$fields key=ix item=field_value}
-								{if ( $field_value.type eq 's' and ($field_value.name eq "Rating" or $field_value.name eq tra("Rating")) and $field_value.isTblVisible eq 'y' ) || ( $field_value.isTblVisible eq 'y' and $field_value.type ne 'x' and $field_value.type ne 'h' and ($field_value.isHidden eq 'n' or $field_value.isHidden eq 'p' or $tiki_p_admin_trackers eq 'y') ) and ($field_value.type ne 'p' or $field_value.options_array[0] ne 'password') and (empty($field_value.visibleBy) or in_array($default_group, $field_value.visibleBy) or $tiki_p_admin_trackers eq 'y')}
+							{foreach from=$listfields key=ix item=field_value}
+								{if $field_value.isTblVisible eq 'y' and ( $field_value.type ne 'x' and $field_value.type ne 'h') and ($field_value.type ne 'p' or $field_value.options_array[0] ne 'password')}
 									<th class="auto">
 										{self_link _sort_arg='sort_mode' _sort_field='f_'|cat:$field_value.fieldId}{$field_value.name|truncate:255:"..."|escape|default:"&nbsp;"}{/self_link}
 									</th>
-									{if $field_value.type eq 's' and ($field_value.name eq "Rating" or $field_value.name eq tra("Rating"))}
-										{assign var=rateFieldId value=$field_value.fieldId}
-									{/if}
 								{/if}
 							{/foreach}
 							
@@ -123,9 +120,7 @@
 								
 								{* ------- list values --- *}
 								{foreach from=$items[user].field_values key=ix item=field_value}
-									{if $field_value.isTblVisible eq 'y' and $field_value.type ne 'x' and $field_value.type ne 'h' and ($field_value.isHidden eq 'n' 
-										or $field_value.isHidden eq 'p' or $tiki_p_admin_trackers eq 'y') and ($field_value.type ne 'p' or $field_value.options_array[0] ne 'password') 
-										and (empty($field_value.visibleBy) or in_array($default_group, $field_value.visibleBy) or $tiki_p_admin_trackers eq 'y')}
+									{if $field_value.isTblVisible eq 'y' and $field_value.type ne 'x' and $field_value.type ne 'h' and ($field_value.type ne 'p' or $field_value.options_array[0] ne 'password')}
 										<td class={if $field_value.type eq 'n' or $field_value.type eq 'q' or $field_value.type eq 'b'}"numeric"{else}"auto"{/if}>
 											{trackeroutput field=$field_value showlinks=y showpopup="y" item=$items[user] list_mode=y inTable=formcolor reloff=$itemoff}
 										</td>
@@ -204,25 +199,21 @@
 				</tr>
 			{/if}
 			{foreach from=$fields key=ix item=field_value}
-				{if $field_value.isHidden eq 'n' or $field_value.isHidden eq 'c'  or $tiki_p_admin_trackers eq 'y'}
-					{if $field_value.type ne 'x' and $field_value.type ne 'l' and $field_value.type ne 'q' and
-							(empty($field_value.visibleBy) or in_array($default_group, $field_value.visibleBy) or $tiki_p_admin_trackers eq 'y') and
-							(empty($field_value.editableBy) or in_array($default_group, $field_value.editableBy) or $tiki_p_admin_trackers eq 'y') and
-							($field_value.type ne 'A' or $tiki_p_attach_trackers eq 'y') and $field_value.type ne 'N' and $field_value.type ne '*' and
-							!($field_value.type eq 's' and $field_value.name eq 'Rating')}
-						<tr>
-							<td>
-								{if $field_value.isMandatory eq 'y'}
-									{$field_value.name}<em class='mandatory_star'>*</em>
-								{else}
-									{$field_value.name}
-								{/if}
-							</td>
-							<td>
-								{trackerinput field=$field_value inTable=formcolor}
-							</td>
-						</tr>
-					{/if}
+				{if $field_value.type ne 'x' and $field_value.type ne 'l' and $field_value.type ne 'q' and
+						($field_value.type ne 'A' or $tiki_p_attach_trackers eq 'y') and $field_value.type ne 'N' and $field_value.type ne '*' and
+						!($field_value.type eq 's' and $field_value.name eq 'Rating')}
+					<tr>
+						<td>
+							{if $field_value.isMandatory eq 'y'}
+								{$field_value.name}<em class='mandatory_star'>*</em>
+							{else}
+								{$field_value.name}
+							{/if}
+						</td>
+						<td>
+							{trackerinput field=$field_value inTable=formcolor}
+						</td>
+					</tr>
 				{/if}
 			{/foreach}
 			

Modified: trunk/tiki-view_tracker.php
===================================================================
--- trunk/tiki-view_tracker.php	2011-09-19 16:53:52 UTC (rev 37423)
+++ trunk/tiki-view_tracker.php	2011-09-19 17:27:22 UTC (rev 37424)
@@ -191,10 +191,10 @@
 
 $fieldFactory = $trackerDefinition->getFieldFactory();
 
+$itemObject = Tracker_Item::newItem($_REQUEST['trackerId']);
+
 foreach ($xfields['data'] as $i => $current_field) {
-	$current_field_list = array();
-	$current_field_ins = array();
-	$current_field_fields = array();
+	$current_field_ins = null;
 
 	$fid = $current_field["fieldId"];
 	$ins_id = 'ins_' . $fid;
@@ -205,50 +205,32 @@
 	if (!empty($sort_field) and $sort_field == $fid) {
 		$orderkey = true;
 	}
-	if (in_array($current_field['type'], array('u', 'g', 'I')) && isset($current_field['options_array'][0]) && $current_field['options_array'][0] == 1) {
-		$creatorSelector = true;
-	} else {
-		$creatorSelector = false;
-	}
+
+	$fieldIsVisible = $itemObject->canViewField($fid);
+	$fieldIsEditable = $itemObject->canModifyField($fid);
+
 	//exclude fields that should not be listed
-	if (($current_field['isTblVisible'] == 'y' or in_array($fid, $popupFields)) and ($current_field['isHidden'] == 'n' or $current_field['isHidden'] == 'p' or $tiki_p_admin_trackers == 'y' or ($current_field['type'] == 's' and $current_field['name'] == 'Rating' and $tiki_p_tracker_view_ratings == 'y'))) {
-		$current_field_list = $current_field;
+	if ($fieldIsVisible && ($current_field['isTblVisible'] == 'y' or in_array($fid, $popupFields))) {
+		$listfields[$fid] = $current_field;
 	}
-	if ($creatorSelector or $current_field['isHidden'] == 'n' or $current_field['isHidden'] == 'c' or $current_field['isHidden'] == 'p' or $tiki_p_admin_trackers == 'y' or ($current_field['type'] == 's' and $current_field['name'] == 'Rating' and $tiki_p_tracker_view_ratings == 'y')) {
-		$current_field_ins = $current_field;
-		$current_field_fields = $current_field;
 
+	if ($fieldIsVisible || $fieldIsEditable) {
 		$handler = $fieldFactory->getHandler($current_field);
 
 		if ($handler) {
 			$field_values = $insert_values = $handler->getFieldData($_REQUEST);
-
-			if ($insert_values) {
-				$current_field_ins = array_merge($current_field_ins, $insert_values);
-			}
-
-			if ($field_values) {
-				$current_field_fields = array_merge($current_field_fields, $field_values);
-			}
+			$current_field_ins = array_merge($current_field, $insert_values);
 		}
 	}
-	// store values to have them available when there is
-	// an error in the values typed by an user for a field type.
-	if (isset($current_field_fields['fieldId'])) {
-		$current_field_fields['value'] = isset($current_field_ins['value']) ? $current_field_ins['value'] : '';
-	}
 
-	if (! empty($current_field_list)) {
-		$listfields[$fid] = $current_field_list;
-	}
-
 	if (! empty($current_field_ins)) {
-		$ins_fields['data'][$i] = $current_field_ins;
+		if ($fieldIsEditable) {
+			$ins_fields['data'][$i] = $current_field_ins;
+		}
+		if ($fieldIsVisible) {
+			$fields['data'][$i] = $current_field_ins;
+		}
 	}
-
-	if (! empty($current_field_fields)) {
-		$fields['data'][$i] = $current_field_fields;
-	}
 }
 
 // Collect information from the provided fields
@@ -265,7 +247,8 @@
 }
 if (!empty($_REQUEST['remove'])) {
 	$item_info = $trklib->get_item_info($_REQUEST['remove']);
-	if ($tiki_p_admin_trackers == 'y' || ($tiki_p_modify_tracker_items == 'y' && $item_info['status'] != 'p' && $item_info['status'] != 'c') || ($tiki_p_modify_tracker_items_pending == 'y' && $item_info['status'] == 'p') || ($tiki_p_modify_tracker_items_closed == 'y' && $item_info['status'] == 'c')) {
+	$actionObject = Tracker_Item::fromInfo($item_info);
+	if ($actionObject->canRemove()) {
 		$access->check_authenticity();
 		$trklib->remove_tracker_item($_REQUEST['remove']);
 	}
@@ -273,7 +256,8 @@
 	check_ticket('view-trackers');
 	foreach($_REQUEST['action'] as $batchid) {
 		$item_info = $trklib->get_item_info($batchid);
-		if ($tiki_p_admin_trackers == 'y' || ($tiki_p_modify_tracker_items == 'y' && $item_info['status'] != 'p' && $item_info['status'] != 'c') || ($tiki_p_modify_tracker_items_pending == 'y' && $item_info['status'] == 'p') || ($tiki_p_modify_tracker_items_closed == 'y' && $item_info['status'] == 'c')) {
+		$actionObject = Tracker_Item::fromInfo($item_info);
+		if ($actionObject->canRemove()) {
 			$trklib->remove_tracker_item($batchid);
 		}
 	}
@@ -281,7 +265,8 @@
 	check_ticket('view-trackers');
 	foreach($_REQUEST['action'] as $batchid) {
 		$item_info = $trklib->get_item_info($batchid);
-		if ($tiki_p_admin_trackers == 'y' || ($tiki_p_modify_tracker_items == 'y' && $item_info['status'] != 'p' && $item_info['status'] != 'c') || ($tiki_p_modify_tracker_items_pending == 'y' && $item_info['status'] == 'p') || ($tiki_p_modify_tracker_items_closed == 'y' && $item_info['status'] == 'c')) {
+		$actionObject = Tracker_Item::fromInfo($item_info);
+		if ($actionObject->canModify()) {
 			$trklib->replace_item($_REQUEST['trackerId'], $batchid, array(
 				'data' => ''
 			) , $_REQUEST['batchaction']);
@@ -329,7 +314,7 @@
 		fclose($fp);
 	}
 } elseif (isset($_REQUEST["save"])) {
-	if ($tiki_p_create_tracker_items == 'y') {
+	if ($itemObject->canModify()) {
 		global $captchalib; include_once 'lib/captcha/captchalib.php';
 		if (empty($user) && $prefs['feature_antibot'] == 'y' && !$captchalib->validate()) {
 			$smarty->assign('msg', $captchalib->getErrors());
@@ -486,7 +471,7 @@
 }
 foreach($xfields['data'] as $xfd) {
 	$fid = $xfd["fieldId"];
-	if ($xfd['isSearchable'] == 'y' and !isset($listfields[$fid]) and ($xfd['isHidden'] == 'n' or $xfd['isHidden'] == 'p' or $tiki_p_admin_trackers == 'y' or ($xfd['type'] == 's' and $xfd['name'] == 'Rating' and $tiki_p_tracker_view_ratings == 'y'))) {
+	if ($xfd['isSearchable'] == 'y' and !isset($listfields[$fid]) and $itemObject->canViewField($fid)) {
 		$listfields[$fid]['type'] = $xfd["type"];
 		$listfields[$fid]['name'] = $xfd["name"];
 		$listfields[$fid]['options'] = $xfd["options"];

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37423] trunk/lib/prefs/feature.php

[<jonnybradley@us...>]

Revision: 37423
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37423&view=rev
Author:   jonnybradley
Date:     2011-09-19 16:53:52 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] jquery_ui: More suitable default ui theme to match fivealive better

Modified Paths:
--------------
    trunk/lib/prefs/feature.php

Modified: trunk/lib/prefs/feature.php
===================================================================
--- trunk/lib/prefs/feature.php	2011-09-19 16:40:06 UTC (rev 37422)
+++ trunk/lib/prefs/feature.php	2011-09-19 16:53:52 UTC (rev 37423)
@@ -1729,7 +1729,7 @@
 				'ui-lightness' => 'ui-lightness',
 				'vader' => 'vader',
 			), 
-			'default' => 'smoothness',	// theme for UI lib (see http://jqueryui.com/themeroller/ for list & demos - previously ui-darkness)
+			'default' => 'flick',	// theme for UI lib (see http://jqueryui.com/themeroller/ for list & demos - previously ui-darkness)
 		),
 		'feature_jquery_validation' => array(
 			'name' => tra('Validation'),

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

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

[<lphuberdeau@us...>]

Revision: 37422
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37422&view=rev
Author:   lphuberdeau
Date:     2011-09-19 16:40:06 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[MOD] Deploy the field permission changes to the tracker plugin

Modified Paths:
--------------
    trunk/lib/core/Tracker/Item.php
    trunk/lib/trackers/trackerlib.php
    trunk/lib/wiki-plugins/wikiplugin_tracker.php

Modified: trunk/lib/core/Tracker/Item.php
===================================================================
--- trunk/lib/core/Tracker/Item.php	2011-09-19 16:30:24 UTC (rev 37421)
+++ trunk/lib/core/Tracker/Item.php	2011-09-19 16:40:06 UTC (rev 37422)
@@ -24,12 +24,26 @@
 		return $obj;
 	}
 
+	public static function newItem($trackerId)
+	{
+		$obj = new self;
+		$obj->info = array();
+		$obj->definition = Tracker_Definition::get($trackerId);
+		$obj->initialize();
+
+		return $obj;
+	}
+
 	private function __construct()
 	{
 	}
 
 	function canView()
 	{
+		if (empty($this->info)) {
+			return $this->perms->create_tracker_items;
+		}
+
 		if ($this->canModifyFromSpecialPermissions()) {
 			return true;
 		}
@@ -47,6 +61,10 @@
 
 	function canModify()
 	{
+		if (empty($this->info)) {
+			return $this->perms->create_tracker_items;
+		}
+
 		if ($this->canModifyFromSpecialPermissions()) {
 			return true;
 		}
@@ -91,7 +109,7 @@
 	{
 		$this->owner = $this->getItemOwner();
 		$this->ownerGroup = $this->getItemGroupOwner();
-		$this->perms = Perms::get('tracker', $this->info['trackerId']);
+		$this->perms = Perms::get('tracker', $this->definition->getConfiguration('trackerId'));
 	}
 
 	private function getItemOwner()
@@ -108,7 +126,7 @@
 
 		$userField = $this->definition->getUserField();
 		if ($userField) {
-			return $this->info[$userField];
+			return $this->getValue($userField);
 		}
 	}
 
@@ -126,7 +144,7 @@
 
 		$groupField = $this->definition->getWriterGroupField();
 		if ($groupField) {
-			return $this->info[$groupField];
+			return $this->getValue($groupField);
 		}
 	}
 
@@ -167,7 +185,7 @@
 	{
 		// Nothing stops the tracker administrator from doing anything
 		if ($this->perms->admin_trackers) {
-			//return true;
+			return true;
 		}
 
 		// Modify the item is required to modify the field (safety)
@@ -206,5 +224,12 @@
 		$commonGroups = array_intersect($groups, $this->perms->getGroups());
 		return count($commonGroups) != 0;
 	}
+
+	private function getValue($fieldId)
+	{
+		if (isset($this->info[$fieldId])) {
+			return $this->info[$fieldId];
+		}
+	}
 }
 

Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php	2011-09-19 16:30:24 UTC (rev 37421)
+++ trunk/lib/trackers/trackerlib.php	2011-09-19 16:40:06 UTC (rev 37422)
@@ -3207,25 +3207,6 @@
 		}
 		return false;
 	}
-	function fieldId_is_editable($field, $item) {
-		global $tiki_p_admin_trackers, $user;
-		if ($tiki_p_admin_trackers == 'y') {
-			return true;
-		}
-		if (in_array($field['type'], array('u', 'g', 'I'))) {
-			return false;
-		}
-		if (empty($field['isHidden']) || $field['isHidden'] == 'n') {
-			return true;
-		}
-		if ($field['isHidden'] == 'p' || $field['isHidden'] == 'y') {
-			return false;
-		}
-		if (isset($item['createdBy']) && $user == $item['createdBy'] && $field['isHidden'] == 'ec') {
-			return true;
-		}
-		return false;
-	}
 
 	function flaten($fields) {
 		$new = array();

Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_tracker.php	2011-09-19 16:30:24 UTC (rev 37421)
+++ trunk/lib/wiki-plugins/wikiplugin_tracker.php	2011-09-19 16:40:06 UTC (rev 37422)
@@ -453,6 +453,7 @@
 			}
 		}
 	}
+
 	if (!empty($itemId)) {
 		global $logslib; include_once('lib/logs/logslib.php');
 		$logslib->add_action('Viewed', $itemId, 'trackeritem', $_SERVER['REQUEST_URI']);
@@ -541,14 +542,28 @@
 			$definition = Tracker_Definition::get($trackerId);
 			$item_info = isset($item_info) ? $item_info : array();
 			$factory = $definition->getFieldFactory();
+
+			if (empty($item_info)) {
+				$itemObject = Tracker_Item::newItem($trackerId);
+			} elseif (! isset($itemObject)) {
+				$itemObject = Tracker_Item::fromInfo($item_info);
+			}
+
 			if (empty($outf)) {
-				$flds = array('data' => $definition->getFields());
+				$unfiltered = array('data' => $definition->getFields());
 			} else {
-				$flds = array('data' => array());
+				$unfiltered = array('data' => array());
 				foreach ($outf as $fieldId) {
-					$flds['data'][] = $definition->getField($fieldId);
+					$unfiltered['data'][] = $definition->getField($fieldId);
 				}
 			}
+
+			$flds = array('data' => array());
+			foreach ($unfiltered['data'] as $f) {
+				if ($itemObject->canModifyField($f['fieldId'])) {
+					$flds['data'][] = $f;
+				}
+			}
 			$bad = array();
 			$embeddedId = false;
 			$onemandatory = false;
@@ -562,9 +577,6 @@
 						if (!$ff = $trklib->get_field($f, $flds['data'])) {
 							continue;
 						}
-						if (!$trklib->fieldId_is_editable($ff, $item_info)) {
-							continue;
-						}
 						if (preg_match('/categories\(([0-9]+)\)/', $autosavevalues[$i], $matches)) {
 							if (ctype_digit($matches[1]) && $matches[1] > 0) {
 								$filter = array('identifier'=>$matches[1], 'type'=>'descendants'); 

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37421] trunk/lib/jquery_tiki/tiki-jquery.js

[<jonnybradley@us...>]

Revision: 37421
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37421&view=rev
Author:   jonnybradley
Date:     2011-09-19 16:30:24 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] clutips: Shorter delay before clutip appears. Apparently people weren't waiting long enough (thanks marclaporte)

Modified Paths:
--------------
    trunk/lib/jquery_tiki/tiki-jquery.js

Modified: trunk/lib/jquery_tiki/tiki-jquery.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery.js	2011-09-19 16:21:31 UTC (rev 37420)
+++ trunk/lib/jquery_tiki/tiki-jquery.js	2011-09-19 16:30:24 UTC (rev 37421)
@@ -292,7 +292,7 @@
 
 function setUpClueTips() {
 	var ctOptions = {splitTitle: '|', cluezIndex: 2000, width: 'auto', fx: {open: 'fadeIn', openSpeed: 'fast'},
-		clickThrough: true, hoverIntent: {sensitivity: 3, interval: 600, timeout: 0}};
+		clickThrough: true, hoverIntent: {sensitivity: 3, interval: 100, timeout: 0}};
 	$.cluetip.setup({insertionType: 'insertBefore', insertionElement: '#main'});
 	
 	$('.tips[title!=""]').cluetip($.extend(ctOptions, {}));

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37420] trunk/lib/tikiaccesslib.php

[<chealer@us...>]

Revision: 37420
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37420&view=rev
Author:   chealer
Date:     2011-09-19 16:21:31 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
check_permission(): reformat
[FIX] Colons inside translated strings

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

Modified: trunk/lib/tikiaccesslib.php
===================================================================
--- trunk/lib/tikiaccesslib.php	2011-09-19 16:19:48 UTC (rev 37419)
+++ trunk/lib/tikiaccesslib.php	2011-09-19 16:21:31 UTC (rev 37420)
@@ -109,17 +109,22 @@
 
 	function check_permission($permissions, $permission_name='', $objectType='', $objectId='') {
 		require_once ('tiki-setup.php');
-		if ( ! is_array($permissions) ) { $permissions = array($permissions); }
+		if ( ! is_array($permissions) ) {
+			$permissions = array($permissions);
+		}
 		foreach ($permissions as $permission) {
-			$objectperms = Perms::get( $objectType, $objectId );
+			$objectPermissions = Perms::get( $objectType, $objectId );
 			$name = str_replace('tiki_p_', '', $permission);
-			if ($objectperms->$name) {
-					continue;
+			if ($objectPermissions->$name) {
+				continue;
 			}
-
-			if ($permission_name) { $permission = $permission_name; }
-			$this->display_error('', tra("You do not have permission to use this feature").": ". $permission, '403', false);
-			if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI'];
+			if ($permission_name) {
+				$permission = $permission_name;
+			}
+			$this->display_error('', tra("You do not have permission to use this feature:")." ". $permission, '403', false);
+			if (!$user) {
+				$_SESSION['loginfrom'] = $_SERVER['REQUEST_URI'];
+			}
 		}
 	}
 

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37419] trunk/templates/tiki-admin_categories.tpl

[<sylvieg@us...>]

Revision: 37419
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37419&view=rev
Author:   sylvieg
Date:     2011-09-19 16:19:48 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX]missing to 37402

Modified Paths:
--------------
    trunk/templates/tiki-admin_categories.tpl

Modified: trunk/templates/tiki-admin_categories.tpl
===================================================================
--- trunk/templates/tiki-admin_categories.tpl	2011-09-19 16:15:05 UTC (rev 37418)
+++ trunk/templates/tiki-admin_categories.tpl	2011-09-19 16:19:48 UTC (rev 37419)
@@ -41,7 +41,7 @@
 					<td>{tr}Parent:{/tr}</td>
 					<td>
 						<select name="parentId">
-							<option value="0">{tr}Top{/tr}</option>
+							{if $tiki_p_admin_categories eq 'y'}<option value="0">{tr}Top{/tr}</option>{/if}
 								{foreach $categories as $category}
 								<option value="{$category.categId}" {if $category.categId eq $parentId}selected="selected"{/if}>{$category.categpath|escape}</option>
 								{/foreach}

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

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

[<jonnybradley@us...>]

Revision: 37418
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37418&view=rev
Author:   jonnybradley
Date:     2011-09-19 16:15:05 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX] admin: Make the admin buttons a tiny bit smaller so you get 5 across in standard fixed width (as default). Also centre them a little better.

Modified Paths:
--------------
    trunk/css/admin.css
    trunk/templates/admin/include_list_sections.tpl

Modified: trunk/css/admin.css
===================================================================
--- trunk/css/admin.css	2011-09-19 16:01:54 UTC (rev 37417)
+++ trunk/css/admin.css	2011-09-19 16:15:05 UTC (rev 37418)
@@ -1,8 +1,8 @@
 /* $Id$ */
 
 a.admbox {
-	height: 100px;
-	width: 100px;
+	height: 98px;
+	width: 98px;
 	text-align: center;
 	vertical-align: middle;
 	overflow: hidden;

Modified: trunk/templates/admin/include_list_sections.tpl
===================================================================
--- trunk/templates/admin/include_list_sections.tpl	2011-09-19 16:01:54 UTC (rev 37417)
+++ trunk/templates/admin/include_list_sections.tpl	2011-09-19 16:15:05 UTC (rev 37418)
@@ -9,7 +9,7 @@
 	{tr}Enable/disable Tiki features in {/tr}<a class="rbox-link" href="tiki-admin.php?page=features">{tr}Admin{/tr}&nbsp;{$prefs.site_crumb_seper}&nbsp;{tr}Features{/tr}</a>{tr}, but configure them elsewhere{/tr}
 {/remarksbox}
 
-<div class="clearfix cbox-data">
+<div class="clearfix cbox-data" style="padding-left: 10px;">
 	{foreach from=$icons key=page item=info}
 		{if $info.position}
 			{if $info.disabled}

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37417] trunk/lib/tikiaccesslib.php

[<sylvieg@us...>]

Revision: 37417
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37417&view=rev
Author:   sylvieg
Date:     2011-09-19 16:01:54 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX]perms: better to use only the perms layer: thx lph

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

Modified: trunk/lib/tikiaccesslib.php
===================================================================
--- trunk/lib/tikiaccesslib.php	2011-09-19 15:51:47 UTC (rev 37416)
+++ trunk/lib/tikiaccesslib.php	2011-09-19 16:01:54 UTC (rev 37417)
@@ -111,12 +111,12 @@
 		require_once ('tiki-setup.php');
 		if ( ! is_array($permissions) ) { $permissions = array($permissions); }
 		foreach ($permissions as $permission) {
-			global $$permission;
 			$objectperms = Perms::get( $objectType, $objectId );
 			$name = str_replace('tiki_p_', '', $permission);
 			if ($objectperms->$name) {
-				continue;
+					continue;
 			}
+
 			if ($permission_name) { $permission = $permission_name; }
 			$this->display_error('', tra("You do not have permission to use this feature").": ". $permission, '403', false);
 			if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI'];

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

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37416] trunk/lib/tikiaccesslib.php

[<sylvieg@us...>]

Revision: 37416
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37416&view=rev
Author:   sylvieg
Date:     2011-09-19 15:51:47 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[FIX]perms: respect order object perms then global perms: thx chealer - wondering if the best is not to user Perms:get('','') to be sure to have the same behavior

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

Modified: trunk/lib/tikiaccesslib.php
===================================================================
--- trunk/lib/tikiaccesslib.php	2011-09-19 15:40:26 UTC (rev 37415)
+++ trunk/lib/tikiaccesslib.php	2011-09-19 15:51:47 UTC (rev 37416)
@@ -112,16 +112,11 @@
 		if ( ! is_array($permissions) ) { $permissions = array($permissions); }
 		foreach ($permissions as $permission) {
 			global $$permission;
-			if ($$permission == 'y') {
+			$objectperms = Perms::get( $objectType, $objectId );
+			$name = str_replace('tiki_p_', '', $permission);
+			if ($objectperms->$name) {
 				continue;
 			}
-			if (!empty($objectId)) {
-				$objectperms = Perms::get( $objectType, $objectId);
-				$name = str_replace('tiki_p_', '', $permission);
-				if ($objectperms->$name) {
-					continue;
-				}
-			}
 			if ($permission_name) { $permission = $permission_name; }
 			$this->display_error('', tra("You do not have permission to use this feature").": ". $permission, '403', false);
 			if (!$user) $_SESSION['loginfrom'] = $_SERVER['REQUEST_URI'];

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

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

[<lphuberdeau@us...>]

Revision: 37415
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37415&view=rev
Author:   lphuberdeau
Date:     2011-09-19 15:40:26 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
[MOD] Centralize the per-field permission checks

Modified Paths:
--------------
    trunk/lib/core/Tracker/Item.php
    trunk/templates/tiki-view_tracker_item.tpl
    trunk/templates/tracker_pretty_item.tpl
    trunk/tiki-view_tracker_item.php

Modified: trunk/lib/core/Tracker/Item.php
===================================================================
--- trunk/lib/core/Tracker/Item.php	2011-09-19 15:13:50 UTC (rev 37414)
+++ trunk/lib/core/Tracker/Item.php	2011-09-19 15:40:26 UTC (rev 37415)
@@ -129,5 +129,82 @@
 			return $this->info[$groupField];
 		}
 	}
+
+	function canViewField($fieldId)
+	{
+		// Nothing stops the tracker administrator from doing anything
+		if ($this->perms->admin_trackers) {
+			return true;
+		}
+
+		// Viewing the item is required to view the field (safety)
+		if (! $this->canView()) {
+			return false;
+		}
+
+		$field = $this->definition->getField($fieldId);
+		
+		if (! $field) {
+			return false;
+		}
+
+		$isHidden = $field['isHidden'];
+		$visibleBy = $field['visibleBy'];
+
+		if ($isHidden == 'c' && $this->canModifyFromSpecialPermissions()) {
+			// Creator or creator group check when field can be modified by creator only
+			return true;
+		} elseif ($isHidden == 'y') {
+			// Visible by administrator only
+			return false;
+		} else {
+			// Permission based on visibleBy apply
+			return $this->isMemberOfGroups($visibleBy);
+		}
+	}
+
+	function canModifyField($fieldId)
+	{
+		// Nothing stops the tracker administrator from doing anything
+		if ($this->perms->admin_trackers) {
+			//return true;
+		}
+
+		// Modify the item is required to modify the field (safety)
+		if (! $this->canModify()) {
+			return false;
+		}
+
+		$field = $this->definition->getField($fieldId);
+		
+		if (! $field) {
+			return false;
+		}
+
+		$isHidden = $field['isHidden'];
+		$editableBy = $field['editableBy'];
+
+		if ($isHidden == 'c') {
+			// Creator or creator group check when field can be modified by creator only
+			return $this->canModifyFromSpecialPermissions();
+		} elseif ($isHidden == 'p') {
+			// Editable by administrator only
+			return false;
+		} else {
+			// Permission based on editableBy apply
+			return $this->isMemberOfGroups($editableBy);
+		}
+	}
+
+	private function isMemberOfGroups($groups)
+	{
+		// Nothing specified means everyone
+		if (empty($groups)) {
+			return true;
+		}
+
+		$commonGroups = array_intersect($groups, $this->perms->getGroups());
+		return count($commonGroups) != 0;
+	}
 }
 

Modified: trunk/templates/tiki-view_tracker_item.tpl
===================================================================
--- trunk/templates/tiki-view_tracker_item.tpl	2011-09-19 15:13:50 UTC (rev 37414)
+++ trunk/templates/tiki-view_tracker_item.tpl	2011-09-19 15:40:26 UTC (rev 37415)
@@ -78,7 +78,7 @@
 				{assign var=stick value="n"}
 
 				{foreach from=$ins_fields key=ix item=cur_field}
-					{if ($cur_field.isHidden ne 'y' or $tiki_p_admin_trackers eq 'y') and !($tracker_info.doNotShowEmptyField eq 'y' and empty($cur_field.value) and empty($cur_field.cat) and empty($cur_field.links) and $cur_field.type ne 's' and $cur_field.type ne 'h') and ($cur_field.options_array[0] ne 'password') and (empty($cur_field.visibleBy) or in_array($default_group, $cur_field.visibleBy) or $tiki_p_admin_trackers eq 'y')}
+					{if !($tracker_info.doNotShowEmptyField eq 'y' and empty($cur_field.value) and empty($cur_field.cat) and empty($cur_field.links) and $cur_field.type ne 's' and $cur_field.type ne 'h') and ($cur_field.options_array[0] ne 'password')}
 						<tr class="field{$cur_field.fieldId}">
 							<td class="formlabel" >
 								{$cur_field.name|escape}

Modified: trunk/templates/tracker_pretty_item.tpl
===================================================================
--- trunk/templates/tracker_pretty_item.tpl	2011-09-19 15:13:50 UTC (rev 37414)
+++ trunk/templates/tracker_pretty_item.tpl	2011-09-19 15:40:26 UTC (rev 37415)
@@ -3,19 +3,11 @@
 {* param item, fields, wiki(wiki:page or tpl:tpl), list_mode, perms, default_group, listfields *}
 {if !isset($list_mode)}{assign var=list_mode value="n"}{/if}
 {foreach from=$fields item=field}
-	{if $field.isPublic eq 'y'
-	 and ($field.isHidden eq 'n' or ($field.isHidden eq 'c' and $item.itemUser eq $user) or $field.isHidden eq 'p' or $tiki_p_admin_trackers eq 'y')
-	  and $field.type ne 'x'
+	{if $field.type ne 'x'
 	  and (empty($listfields) or in_array($field.fieldId, $listfields)) 
-	  and ($field.type ne 'p' or $field.options_array[0] ne 'password') 
-	  and (empty($field.visibleBy) or in_array($default_group, $field.visibleBy) or $tiki_p_admin_trackers eq 'y')}
+	  and ($field.type ne 'p' or $field.options_array[0] ne 'password')}
 		{capture name=value}
-			{if isset($perms)}
-				{trackeroutput field=$field item=$item list_mode=$list_mode showlinks=$context.showlinks url=$context.url
-					tiki_p_view_trackers=$perms.tiki_p_view_trackers tiki_p_modify_tracker_items=$perms.tiki_p_modify_tracker_items tiki_p_modify_tracker_items_pending=$perms.tiki_p_modify_tracker_items_pending tiki_p_modify_tracker_items_closed=$perms.tiki_p_modify_tracker_items_closed tiki_p_comment_tracker_items=$perms.tiki_p_comment_tracker_items}
-			{else}
-				{trackeroutput item=$item field=$field list_mode=$list_mode showlinks=$context.showlinks url=$context.url}
-			{/if}
+			{trackeroutput item=$item field=$field list_mode=$list_mode showlinks=$context.showlinks url=$context.url}
 		{/capture}
 		{set var="f_"|cat:$field.fieldId value=$smarty.capture.value}
 	{else}

Modified: trunk/tiki-view_tracker_item.php
===================================================================
--- trunk/tiki-view_tracker_item.php	2011-09-19 15:13:50 UTC (rev 37414)
+++ trunk/tiki-view_tracker_item.php	2011-09-19 15:40:26 UTC (rev 37415)
@@ -327,19 +327,12 @@
 	$xfields['data'][$i] = $current_field;
 
 	$current_field_ins = null;
-	$current_field_fields = null;
 
-	if (!isset($mainfield) and $current_field['isMain'] == 'y') {
-		$mainfield = $i;
-	}
-	if ($current_field['type'] == 's' && $current_field['name'] == 'Rating') {
-		if ($tiki_p_tracker_view_ratings == 'y') {
-			$current_field_ins = $current_field;
+	$fieldIsVisible = $itemObject->canViewField($fid);
+	$fieldIsEditable = $itemObject->canModifyField($fid);
 
-		}
-	} elseif ($current_field['isHidden'] == 'n' or $current_field['isHidden'] == 'p' or $tiki_p_admin_trackers == 'y' or ($current_field['isHidden'] == 'c' && !empty($user) && $user == $itemUser)) {
+	if ($fieldIsVisible || $fieldIsEditable) {
 		$current_field_ins = $current_field;
-		$current_field_fields = $current_field;
 
 		$handler = $fieldFactory->getHandler($current_field, $item_info);
 
@@ -348,18 +341,18 @@
 
 			if ($insert_values) {
 				$current_field_ins = array_merge($current_field_ins, $insert_values);
-				$current_field_fields = array_merge($current_field_fields, $insert_values);
 			}
 		}
 	}
 
 	if (! empty($current_field_ins)) {
-		$ins_fields['data'][$i] = $current_field_ins;
+		if ($fieldIsEditable) {
+			$ins_fields['data'][$i] = $current_field_ins;
+		}
+		if ($fieldIsVisible) {
+			$fields['data'][$i] = $current_field_ins;
+		}
 	}
-
-	if (! empty($current_field_fields)) {
-		$fields['data'][$i] = $current_field_fields;
-	}
 }
 
 $authorfield = $definition->getAuthorField();
@@ -372,9 +365,6 @@
 	$smarty->display("error.tpl");
 	die;
 }
-if (!isset($mainfield)) {
-	$mainfield = 0;
-}
 if ($itemObject->canRemove()) {
 	if (isset($_REQUEST["remove"])) {
 		check_ticket('view-trackers-items');
@@ -412,7 +402,6 @@
 			if (isset($rateFieldId) && isset($_REQUEST["ins_$rateFieldId"])) {
 				$trklib->replace_rating($_REQUEST["trackerId"], $_REQUEST["itemId"], $rateFieldId, $user, $_REQUEST["ins_$rateFieldId"]);
 			}
-			$mainvalue = $ins_fields["data"][$mainfield]["value"];
 			$_REQUEST['show'] = 'view';
 			foreach($fields["data"] as $i => $array) {
 				if (isset($fields["data"][$i])) {
@@ -497,31 +486,33 @@
 	$fieldFactory = $definition->getFieldFactory();
 
 	foreach($xfields["data"] as $i => $current_field) {
-		$current_field_fields = null;
-		$current_field_ins = array();
+		$current_field_ins = null;
 
 		$handler = $fieldFactory->getHandler($current_field, $info);
 
-		if ($current_field['isHidden'] == 'n' or $current_field['isHidden'] == 'p' or $tiki_p_admin_trackers == 'y' or ($current_field['type'] == 's' and $xfields[$i]['name'] == 'Rating' and $tiki_p_tracker_view_ratings == 'y') or ($current_field['isHidden'] == 'c' && !empty($user) && $user == $itemUser)) {
-			$current_field_fields = $current_field;
+		$fieldIsVisible = $itemObject->canViewField($fid);
+		$fieldIsEditable = $itemObject->canModifyField($fid);
 
+		if ($fieldIsVisible || $fieldIsEditable) {
+			$current_field_ins = $current_field;
+
 			if ($handler) {
 				$insert_values = $handler->getFieldData();
 
 				if ($insert_values) {
 					$current_field_ins = array_merge($current_field_ins, $insert_values);
-					$current_field_fields = array_merge($current_field_fields, $insert_values);
 				}
 			}
 
 		}
 
-		if ($current_field_fields) {
-			$fields["data"][$i] = $current_field_fields;
-		}
-
 		if (! empty($current_field_ins)) {
-			$ins_fields['data'][$i] = array_merge($ins_fields['data'][$i], $current_field_ins);
+			if ($fieldIsVisible) {
+				$fields['data'][$i] = array_merge($fields['data'][$i], $current_field_ins);
+			}
+			if ($fieldIsEditable) {
+				$ins_fields['data'][$i] = array_merge($ins_fields['data'][$i], $current_field_ins);
+			}
 		}
 	}
 	$smarty->assign('tracker_item_main_value', $trklib->get_isMain_value($_REQUEST['trackerId'], $_REQUEST['itemId']));

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

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

[Filipus Klutiero <chealer@gm...>]

Thanks Jyhem,

Le 2011-09-18 11:54, jyhem@... a écrit :
> Revision: 37380
>            http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37380&view=rev
> Author:   jyhem
> Date:     2011-09-18 15:54:25 +0000 (Sun, 18 Sep 2011)
> Log Message:
> -----------
> [ENH] Allow IP banning of multiple spammers in a practical way (no cut-pasting, less clicks and multiple selection) to cope with recent changes in spammer behaviour
>
> Modified Paths:
> --------------
>      trunk/templates/tiki-admin_banning.tpl
>      trunk/templates/tiki-list_comments.tpl
>      trunk/tiki-admin_banning.php
>      trunk/tiki-list_comments.php
>
> Modified: trunk/templates/tiki-admin_banning.tpl
> ===================================================================
> --- trunk/templates/tiki-admin_banning.tpl	2011-09-18 15:33:34 UTC (rev 37379)
> +++ trunk/templates/tiki-admin_banning.tpl	2011-09-18 15:54:25 UTC (rev 37380)
> @@ -12,6 +12,18 @@
>   	}
>   {/jq}
>
> +{* this script (un/)checks all checkboxes with id 'multi-banning-section' *}
> +{jq notonready=true}
> +	function CheckMultiIP() {
> +		for (var i = 0; i<  document.banningform.elements.length; i++) {
> +			var e = document.banningform.elements[i];
> +			if (e.type == 'checkbox'&&  e.id == 'multi-banning-section'&&  e.name != 'checkall') {
> +				e.checked = document.banningform.checkmultiip.checked;
> +			}
> +		}
> +	}
> +{/jq}
> +
>   {title help="Banning+System"}{tr}Banning system{/tr}{/title}
>
>   <div class="navbar">
> @@ -28,7 +40,7 @@
>   	{/remarksbox}
>   {/if}
>
> -<h2>{tr}Add or edit a rule{/tr}</h2>
> +<h2>{tr}Add or edit rules{/tr}</h2>
>   <form action="tiki-admin_banning.php" name="banningform" method="post">
>   	<input type="hidden" name="banId" value="{$banId|escape}" />
>   	<table class="formcolor">
> @@ -45,7 +57,33 @@
>   				<input type="text" name="userreg" id="banning-userregex" value="{$info.user|escape}" />
>   			</td>
>   		</tr>
> +		{if isset($mass_ban_ip)}
>   		<tr>
> +			<td><label for="banning-ipregex">{tr}Multiple IP regex matching:{/tr}</label></td>
> +			<td>
> +				<input type="radio" name="mode" value="mass_ban_ip" {if $info.mode eq 'mass_ban_ip'}checked="checked"{/if} />
> +				<div class="toggle">
> +					<input type="checkbox" name="checkmultiip" checked="checked" onclick="CheckMultiIP();" />
> +					<label for="sectionswitch">{tr}Check / Uncheck All{/tr}</label>
> +				</div>
> +				<table>
> +					{foreach key=ip item=comment from=$ban_comments_list}
> +						<tr>
> +							<td>
> +								<input type="checkbox" name="multi_banned_ip[{$ip}]" id="multi-banning-section" checked="checked" />  <label for="multi-banning-section">{$ip}</label>
> +							</td>
> +							<td>
> +								{foreach key=id item=user from=$comment}
> +									<div>{$user.userName}</div>
> +								{/foreach}
The username needs to be escaped.