Home / Browse / Tiki Wiki CMS Groupware / Mail / Archive

Tiki Wiki CMS Groupware

Email Archive: tikiwiki-cvs (read-only)

2002:	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (246)
2003:	_Jan (243)	_Feb (145)	_Mar (512)	_Apr (423)	_May (572)	_Jun (344)	_Jul (1439)	_Aug (1086)	_Sep (452)	_Oct (1093)	_Nov (1000)	_Dec (1070)
2004:	_Jan (1462)	_Feb (753)	_Mar (1752)	_Apr (714)	_May (617)	_Jun (1326)	_Jul (829)	_Aug (726)	_Sep (723)	_Oct (777)	_Nov (295)	_Dec (203)
2005:	_Jan (694)	_Feb (664)	_Mar (606)	_Apr (798)	_May (429)	_Jun (236)	_Jul (197)	_Aug (340)	_Sep (432)	_Oct (443)	_Nov (334)	_Dec (434)
2006:	_Jan (452)	_Feb (283)	_Mar (163)	_Apr (341)	_May (202)	_Jun (147)	_Jul (291)	_Aug (363)	_Sep (342)	_Oct (309)	_Nov (600)	_Dec (722)
2007:	_Jan (363)	_Feb (699)	_Mar (1009)	_Apr (186)	_May (368)	_Jun (551)	_Jul (1146)	_Aug (1152)	_Sep (500)	_Oct (714)	_Nov (780)	_Dec (725)
2008:	_Jan (640)	_Feb (670)	_Mar (679)	_Apr (496)	_May (351)	_Jun (331)	_Jul (621)	_Aug (627)	_Sep (361)	_Oct (579)	_Nov (423)	_Dec (342)
2009:	_Jan (384)	_Feb (603)	_Mar (815)	_Apr (663)	_May (1194)	_Jun (1055)	_Jul (699)	_Aug (907)	_Sep (1104)	_Oct (1142)	_Nov (942)	_Dec (631)
2010:	_Jan (935)	_Feb (1420)	_Mar (766)	_Apr (517)	_May (715)	_Jun (512)	_Jul (499)	_Aug (725)	_Sep (1272)	_Oct (855)	_Nov (657)	_Dec (959)
2011:	_Jan (1048)	_Feb (1135)	_Mar (703)	_Apr (548)	_May (659)	_Jun (543)	_Jul (980)	_Aug (1197)	_Sep (1358)	_Oct (890)	_Nov (522)	_Dec (318)
2012:	_Jan (400)	_Feb (402)	_Mar (846)	_Apr (748)	_May (565)	_Jun (583)	_Jul (383)	_Aug (331)	_Sep (451)	_Oct (615)	_Nov (483)	_Dec (325)
2013:	_Jan (353)	_Feb (335)	_Mar (402)	_Apr (498)	_May (243)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[28183] trunk/lib/smarty_tiki/function.user_selector. php

From: <jonnybradley@us...> - 2010-07-28 16:31

Revision: 28183
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28183&view=rev
Author:   jonnybradley
Date:     2010-07-28 16:31:09 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
[FIX] User selector smarty function: Use more efficient count of users to test (not just listing them all!) and make "editable" param y/n to match perms.
Also, don't render out the other user options if not editable.

Modified Paths:
--------------
    trunk/lib/smarty_tiki/function.user_selector.php

Modified: trunk/lib/smarty_tiki/function.user_selector.php
===================================================================
--- trunk/lib/smarty_tiki/function.user_selector.php	2010-07-28 15:47:50 UTC (rev 28182)
+++ trunk/lib/smarty_tiki/function.user_selector.php	2010-07-28 16:31:09 UTC (rev 28183)
@@ -25,36 +25,45 @@
 	static $iUserSelector = 0;
 	$iUserSelector++;
 	
-	$defaults = array( 'user' => $user, 'group' => 'all', name => 'user', id => 'user_selector_' . $iUserSelector, 'editable' => $tiki_p_admin == 'y');
+	$defaults = array( 'user' => $user, 'group' => 'all', name => 'user', id => 'user_selector_' . $iUserSelector, 'editable' => $tiki_p_admin);
 	$params = array_merge($defaults, $params);
 	if (isset($params['size'])) {
 		$sz = ' size="' . $params['size'] . '"';
 	} else {
 		$sz = '';
 	}
-	if (!$params['editable']) {
+	if ($params['editable'] != 'y') {
 		$ed = ' disabled="disabled"';
 	} else {
 		$ed = '';
 	}
+	
 	if ($params['group'] == 'all') {
-		$usrs = $tikilib->list_users(0, -1, 'login_asc');
-		$users = array();
-		foreach ($usrs['data'] as $usr) {
-			$users[] = $usr['login'];
-		}
+		$ucant = $tikilib->list_users(0, 0, 'login_asc');
+		$ucant = $ucant['cant'];
 	} else {
-		$users = $userlib->get_group_users($params['group']);
+		$ucant = $userlib->count_users($params['group']);
 	}
 	$ret = '';
 	
-	if ($prefs['feature_jquery_autocomplete'] == 'y' && count($users) > $prefs['user_selector_threshold']) {
+	if ($prefs['feature_jquery_autocomplete'] == 'y' && $ucant > $prefs['user_selector_threshold']) {
 		$ret .= '<input id="' . $params['id'] . '" type="text" name="' . $params['name'] . '" value="' . $params['user'] . '"' . $sz . $ed . ' />';
 		$headerlib->add_jq_onready('$jq("#' . $params['id'] . '").tiki("autocomplete", "username", {mustMatch: true});');
 	} else {
+		if ($params['group'] == 'all') {
+			$usrs = $tikilib->list_users(0, -1, 'login_asc');
+			$users = array();
+			foreach ($usrs['data'] as $usr) {
+				$users[] = $usr['login'];
+			}
+		} else {
+			$users = $userlib->get_group_users($params['group']);
+		}
 		$ret .= '<select name="' . $params['name'] . '" id="' . $params['id'] . '"' . $sz . $ed . '>';
 		foreach($users as $usr) {
-			$ret .= '<option value="' . $usr . '"' . ($usr == $params['user'] ? ' selected="selected"' : '') . ' >' . $usr .'</option>';
+			if ($params['editable'] == 'y' || $usr == $params['user']) {
+				$ret .= '<option value="' . $usr . '"' . ($usr == $params['user'] ? ' selected="selected"' : '') . ' >' . $usr .'</option>';
+			}
 		}
 		$ret .= '</select>';
 	}


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:[28765] trunk/lib/smarty_tiki/function.user_selector. php

From: <sylvieg@us...> - 2010-08-30 13:17

Revision: 28765
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28765&view=rev
Author:   sylvieg
Date:     2010-08-30 13:16:56 +0000 (Mon, 30 Aug 2010)

Log Message:
-----------
syntax error

Modified Paths:
--------------
    trunk/lib/smarty_tiki/function.user_selector.php

Modified: trunk/lib/smarty_tiki/function.user_selector.php
===================================================================
--- trunk/lib/smarty_tiki/function.user_selector.php	2010-08-30 12:18:08 UTC (rev 28764)
+++ trunk/lib/smarty_tiki/function.user_selector.php	2010-08-30 13:16:56 UTC (rev 28765)
@@ -25,7 +25,7 @@
 	static $iUserSelector = 0;
 	$iUserSelector++;
 	
-	$defaults = array( 'user' => $user, 'group' => 'all', name => 'user', id => 'user_selector_' . $iUserSelector, 'editable' => $tiki_p_admin);
+	$defaults = array( 'user' => $user, 'group' => 'all', 'name' => 'user', 'id' => 'user_selector_' . $iUserSelector, 'editable' => $tiki_p_admin);
 	$params = array_merge($defaults, $params);
 	if (isset($params['size'])) {
 		$sz = ' size="' . $params['size'] . '"';


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:[28765] trunk/lib/smarty_tiki/function.user_selector. php

From: Jonny Bradley <jonny@ti...> - 2010-08-30 15:07

Thanks Sylvie - too much JavaScripting for me maybe? ;)

jb


On 30 Aug 2010, at 14:16, sylvieg@... wrote:

> Revision: 28765
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28765&view=rev
> Author:   sylvieg
> Date:     2010-08-30 13:16:56 +0000 (Mon, 30 Aug 2010)
> 
> Log Message:
> -----------
> syntax error
> 
> Modified Paths:
> --------------
>    trunk/lib/smarty_tiki/function.user_selector.php
> 
> Modified: trunk/lib/smarty_tiki/function.user_selector.php
> ===================================================================
> --- trunk/lib/smarty_tiki/function.user_selector.php	2010-08-30 12:18:08 UTC (rev 28764)
> +++ trunk/lib/smarty_tiki/function.user_selector.php	2010-08-30 13:16:56 UTC (rev 28765)
> @@ -25,7 +25,7 @@
> 	static $iUserSelector = 0;
> 	$iUserSelector++;
> 	
> -	$defaults = array( 'user' => $user, 'group' => 'all', name => 'user', id => 'user_selector_' . $iUserSelector, 'editable' => $tiki_p_admin);
> +	$defaults = array( 'user' => $user, 'group' => 'all', 'name' => 'user', 'id' => 'user_selector_' . $iUserSelector, 'editable' => $tiki_p_admin);
> 	$params = array_merge($defaults, $params);
> 	if (isset($params['size'])) {
> 		$sz = ' size="' . $params['size'] . '"';
> 
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> ------------------------------------------------------------------------------
> Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
> Be part of this innovative community and reach millions of netbook users 
> worldwide. Take advantage of special opportunities to increase revenue and 
> speed time-to-market. Join now, and jumpstart your future.
> http://p.sf.net/sfu/intel-atom-d2d
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[33473] trunk/lib/smarty_tiki/function.user_selector. php

From: <jonnybradley@us...> - 2011-03-17 19:18

Revision: 33473
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33473&view=rev
Author:   jonnybradley
Date:     2011-03-17 19:18:10 +0000 (Thu, 17 Mar 2011)

Log Message:
-----------
[FIX] user_selector: set user_selector_threshold param to pref value if not set

Modified Paths:
--------------
    trunk/lib/smarty_tiki/function.user_selector.php

Modified: trunk/lib/smarty_tiki/function.user_selector.php
===================================================================
--- trunk/lib/smarty_tiki/function.user_selector.php	2011-03-17 19:16:01 UTC (rev 33472)
+++ trunk/lib/smarty_tiki/function.user_selector.php	2011-03-17 19:18:10 UTC (rev 33473)
@@ -28,7 +28,17 @@
 	static $iUserSelector = 0;
 	$iUserSelector++;
 	
-	$defaults = array( 'user' => $user, 'group' => 'all', 'contact'=> 'false','name' => 'user', 'id' => 'user_selector_' . $iUserSelector, 'multiple'=> 'false', 'mustmatch' => 'true', 'style'=> '' ,'editable' => $tiki_p_admin);
+	$defaults = array( 'user' => $user,
+			'group' => 'all',
+			'contact'=> 'false',
+			'name' => 'user',
+			'id' => 'user_selector_' . $iUserSelector,
+			'multiple'=> 'false',
+			'mustmatch' => 'true',
+			'style'=> '' ,
+			'editable' => $tiki_p_admin,
+			'user_selector_threshold' => $prefs['user_selector_threshold'],
+	);
 	$params = array_merge($defaults, $params);
 	if (isset($params['size'])) {
 		$sz = ' size="' . $params['size'] . '"';
@@ -49,7 +59,7 @@
 	}
 	$ret = '';
 	
-	if ($prefs['feature_jquery_autocomplete'] == 'y' && ($ucant > $prefs['user_selector_threshold'] or $ucant> $params['user_selector_threshold'])) {
+	if ($prefs['feature_jquery_autocomplete'] == 'y' && ($ucant > $prefs['user_selector_threshold'] or $ucant > $params['user_selector_threshold'])) {
 		$ret .= '<input id="' . $params['id'] . '" type="text" name="' . $params['name'] . '" value="' . $params['user'] . '"' . $sz . $ed . ' style="'.$params['style'].'" />';
 		$headerlib->add_jq_onready('$("#' . $params['id'] . '").tiki("autocomplete", "'.(($params['contact'] == 'true')?('usersandcontacts'):('username')).'", {mustMatch: '.$params['mustmatch'].', multiple: '.$params['multiple'].' });');
 	} else {


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:[33491] trunk/lib/smarty_tiki/function.user_selector. php

From: <jonnybradley@us...> - 2011-03-17 23:23

Revision: 33491
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33491&view=rev
Author:   jonnybradley
Date:     2011-03-17 23:22:59 +0000 (Thu, 17 Mar 2011)

Log Message:
-----------
[FIX] user_selector: user real names if pref set

Modified Paths:
--------------
    trunk/lib/smarty_tiki/function.user_selector.php

Modified: trunk/lib/smarty_tiki/function.user_selector.php
===================================================================
--- trunk/lib/smarty_tiki/function.user_selector.php	2011-03-17 23:18:22 UTC (rev 33490)
+++ trunk/lib/smarty_tiki/function.user_selector.php	2011-03-17 23:22:59 UTC (rev 33491)
@@ -24,6 +24,7 @@
 function smarty_function_user_selector($params, &$smarty) {
 	global $prefs, $user, $userlib, $headerlib, $tikilib, $tiki_p_admin;
 	require_once 'lib/userslib.php';
+	require_once $smarty->_get_plugin_filepath('modifier', 'username');
 	
 	static $iUserSelector = 0;
 	$iUserSelector++;
@@ -76,9 +77,9 @@
 		foreach($users as $usr) {
 			if ($params['editable'] == 'y' || $usr == $params['user']) {
 			    if (isset($params['select'])) {
-				$ret .= '<option value="' . $usr . '"' . ($usr == $params['select'] ? ' selected="selected"' : '') . ' >' . $usr .'</option>';
+					$ret .= '<option value="' . $usr . '"' . ($usr == $params['select'] ? ' selected="selected"' : '') . ' >' . smarty_modifier_username( $usr ) .'</option>';
 				} else {
-				$ret .= '<option value="' . $usr . '"' . ($usr == $params['user'] ? ' selected="selected"' : '') . ' >' . $usr .'</option>';
+					$ret .= '<option value="' . $usr . '"' . ($usr == $params['user'] ? ' selected="selected"' : '') . ' >' . smarty_modifier_username( $usr ) .'</option>';
 				}
 			}
 		}


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:[33926] trunk/lib/smarty_tiki/function.user_selector. php

From: <chealer@us...> - 2011-04-12 19:43

Revision: 33926
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33926&view=rev
Author:   chealer
Date:     2011-04-12 19:43:35 +0000 (Tue, 12 Apr 2011)

Log Message:
-----------
[FIX] HTML special characters encoding

Modified Paths:
--------------
    trunk/lib/smarty_tiki/function.user_selector.php

Modified: trunk/lib/smarty_tiki/function.user_selector.php
===================================================================
--- trunk/lib/smarty_tiki/function.user_selector.php	2011-04-12 19:41:13 UTC (rev 33925)
+++ trunk/lib/smarty_tiki/function.user_selector.php	2011-04-12 19:43:35 UTC (rev 33926)
@@ -61,7 +61,7 @@
 	$ret = '';
 	
 	if ($prefs['feature_jquery_autocomplete'] == 'y' && ($ucant > $prefs['user_selector_threshold'] or $ucant > $params['user_selector_threshold'])) {
-		$ret .= '<input id="' . $params['id'] . '" type="text" name="' . $params['name'] . '" value="' . $params['user'] . '"' . $sz . $ed . ' style="'.$params['style'].'" />';
+		$ret .= '<input id="' . $params['id'] . '" type="text" name="' . $params['name'] . '" value="' . htmlspecialchars($params['user']) . '"' . $sz . $ed . ' style="'.$params['style'].'" />';
 		$headerlib->add_jq_onready('$("#' . $params['id'] . '").tiki("autocomplete", "'.(($params['contact'] == 'true')?('usersandcontacts'):('username')).'", {mustMatch: '.$params['mustmatch'].', multiple: '.$params['multiple'].' });');
 	} else {
 		if ($params['group'] == 'all') {
@@ -77,9 +77,9 @@
 		foreach($users as $usr) {
 			if ($params['editable'] == 'y' || $usr == $params['user']) {
 			    if (isset($params['select'])) {
-					$ret .= '<option value="' . $usr . '"' . ($usr == $params['select'] ? ' selected="selected"' : '') . ' >' . smarty_modifier_username( $usr ) .'</option>';
+					$ret .= '<option value="' . htmlspecialchars($usr) . '"' . ($usr == $params['select'] ? ' selected="selected"' : '') . ' >' . smarty_modifier_username( $usr ) .'</option>';
 				} else {
-					$ret .= '<option value="' . $usr . '"' . ($usr == $params['user'] ? ' selected="selected"' : '') . ' >' . smarty_modifier_username( $usr ) .'</option>';
+					$ret .= '<option value="' . htmlspecialchars($usr) . '"' . ($usr == $params['user'] ? ' selected="selected"' : '') . ' >' . smarty_modifier_username( $usr ) .'</option>';
 				}
 			}
 		}


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