deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

Comment fixes

Browse Source
This commit is contained in:
Deon George 2009-07-09 21:47:23 +10:00
parent 0d71a96e34
commit e2c74f9467
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/TemplateRender.php
View File

@ -224,7 +224,7 @@ class TemplateRender extends PageRender {
/** /**
* MultiList will query the LDAP server and provide a multi select list of values * MultiList will query the LDAP server and provide a multi select list of values
* eg: <![CDATA[<value>=php.MultiList(/;(objectClass=posixAccount);uid)</value>]]> * eg: <![CDATA[=php.MultiList(/;(objectClass=posixAccount);uid)]]>
* *
* eg: <![CDATA[=php.MultiList(/;(&(objectClass=posixAccount)(uid=groupA*));uid;%cn/U% (%gidNumber%);memberUid;dmdName=users,root => cn=root;nobody => cn=nobody;gidNumber;10;(gidNuber=%gidNumber%);uid)]]> * eg: <![CDATA[=php.MultiList(/;(&(objectClass=posixAccount)(uid=groupA*));uid;%cn/U% (%gidNumber%);memberUid;dmdName=users,root => cn=root;nobody => cn=nobody;gidNumber;10;(gidNuber=%gidNumber%);uid)]]>
* *

8
lib/functions.php
View File

@ -1310,7 +1310,7 @@ function pla_compare_dns($dn1,$dn2) {
/** /**
* For LDAP servers with auto_number enabled, this function will get the next * For LDAP servers with auto_number enabled, this function will get the next
* available uidNumber using the host's preferred mechanism (pool or search). * available number using the host's preferred mechanism (pool or search).
* *
* This is configured in config.php by server: * This is configured in config.php by server:
* *
@ -1330,15 +1330,11 @@ function pla_compare_dns($dn1,$dn2) {
* incrementing the smallest attribute until an unused value is found. * incrementing the smallest attribute until an unused value is found.
* *
* NOTE: Both mechanisms do NOT prevent race conditions or toe-stomping, so * NOTE: Both mechanisms do NOT prevent race conditions or toe-stomping, so
* care must be taken when actually creating the entry to check that the uidNumber * care must be taken when actually creating the entry to check that the number
* returned here has not been used in the mean time. Note that the two different * returned here has not been used in the mean time. Note that the two different
* mechanisms may (will!) return different values as they use different algorithms * mechanisms may (will!) return different values as they use different algorithms
* to arrive at their result. Do not be alarmed if (when!) this is the case. * to arrive at their result. Do not be alarmed if (when!) this is the case.
* *
* Also note that both algorithms are susceptible to a race condition. If two admins
* are adding users simultaneously, the users may get identical uidNumbers with this
* function.
*
* See config.php.example for more notes on the two mechanisms. * See config.php.example for more notes on the two mechanisms.
* *
* @param string Base to start the search from * @param string Base to start the search from