RELEASE 0.9.7.2

This commit is contained in:
Deon George 2009-06-30 19:41:11 +10:00
parent b443271175
commit 1f7f96122f
6 changed files with 223 additions and 181 deletions

View File

@ -1 +1 @@
0.9.7.1 $Name: RELEASE-0_9_7_2 $

View File

@ -1,5 +1,4 @@
<?php <?php
/** /**
* The phpLDAPadmin config file * The phpLDAPadmin config file
* *
@ -20,176 +19,215 @@
* You must specify at least one LDAP server there. You may add * You must specify at least one LDAP server there. You may add
* as many as you like. You can also specify your language, and * as many as you like. You can also specify your language, and
* many other options. * many other options.
*
* NOTE: Commented out values in this file prefixed by //, represent the
* defaults that have been defined in config_default.php.
* Commented out values prefixed by #, dont refelct their default value, you can
* check config_default.php if you want to see what the default is.
*
* DONT change config_default.php, you changes will be lost by the next release
* of PLA. Instead change this file - as it will NOT be replaced by a new
* version of phpLDAPadmin.
*/ */
/** **/ /*********************************************/
/** Miscellaneous Configuration overrides **/ /* Useful important configuration overrides */
/** **/ /*********************************************/
/* If you are asked to put pla in debug mode, this is how you do it: */ /* If you are asked to put pla in debug mode, this is how you do it: */
// $config->custom->debug['level'] = 2; # $config->custom->debug['level'] = 2;
// $config->custom->debug['syslog'] = true; # $config->custom->debug['syslog'] = true;
# $config->custom->debug['file'] = '/tmp/pla_debug.log';
/* phpLDAPadmin can encrypt the content of sensitive cookies if you set this /* phpLDAPadmin can encrypt the content of sensitive cookies if you set this
to a big random string. */ to a big random string. */
$config->custom->session['blowfish'] = ''; $config->custom->session['blowfish'] = '';
/* The language setting. If you set this to 'auto', phpLDAPadmin will /* The language setting. If you set this to 'auto', phpLDAPadmin will attempt
attempt to determine your language automatically. Otherwise, available to determine your language automatically. Otherwise, available lanaguages
lanaguages are: 'ct', 'de', 'en', 'es', 'fr', 'it', 'nl', and 'ru' are: 'ct', 'de', 'en', 'es', 'fr', 'it', 'nl', and 'ru'
Localization is not complete yet, but most strings have been translated. Localization is not complete yet, but most strings have been translated.
Please help by writing language files. See lang/en.php for an example. */ Please help by writing language files. See lang/en.php for an example. */
// $config->custom->appearance['language'] = 'auto'; // $config->custom->appearance['language'] = 'auto';
/* The temporary storage directory where we will put jpegPhoto data /* The temporary storage directory where we will put jpegPhoto data
This directory must be readable and writable by your web server. */ This directory must be readable and writable by your web server. */
// $config->custom->jpeg['tmpdir'] = "c:\\temp"; // Example for Windows systems // $config->custom->jpeg['tmpdir'] = "/tmp"; // Example for Unix systems
$config->custom->jpeg['tmpdir'] = "/tmp"; // Example for Unix systems # $config->custom->jpeg['tmpdir'] = "c:\\temp"; // Example for Windows systems
/** **/ /*********************************************/
/** Your LDAP servers **/ /* Define your LDAP servers in this section */
/** **/ /*********************************************/
$i=0; $i=0;
$ldapservers = new LDAPServers; $ldapservers = new LDAPServers;
/* A convenient name that will appear in the tree viewer and throughout phpLDAPadmin to /* A convenient name that will appear in the tree viewer and throughout
identify this LDAP server to users. */ phpLDAPadmin to identify this LDAP server to users. */
$ldapservers->SetValue($i,'server','name','My LDAP Server'); $ldapservers->SetValue($i,'server','name','My LDAP Server');
/* Examples: /* Examples:
'ldap.example.com', 'ldap.example.com',
'ldaps://ldap.example.com/', 'ldaps://ldap.example.com/',
'ldapi://%2fusr%local%2fvar%2frun%2fldapi' (Unix socket at /usr/local/var/run/ldap) */ 'ldapi://%2fusr%local%2fvar%2frun%2fldapi'
(Unix socket at /usr/local/var/run/ldap) */
// $ldapservers->SetValue($i,'server','host','127.0.0.1'); // $ldapservers->SetValue($i,'server','host','127.0.0.1');
/* The port your LDAP server listens on (no quotes). 389 is standard. */ /* The port your LDAP server listens on (no quotes). 389 is standard. */
// $ldapservers->SetValue($i,'server','port','389'); // $ldapservers->SetValue($i,'server','port','389');
/* Array of base DNs of your LDAP server. Leave this blank to have phpLDAPadmin auto-detect it for you. */ /* Array of base DNs of your LDAP server. Leave this blank to have phpLDAPadmin
auto-detect it for you. */
// $ldapservers->SetValue($i,'server','base',array('')); // $ldapservers->SetValue($i,'server','base',array(''));
/* Three options for auth_type: /* Three options for auth_type:
1. 'cookie': you will login via a web form, and a client-side cookie will store your 1. 'cookie': you will login via a web form, and a client-side cookie will
login dn and password. store your login dn and password.
2. 'session': same as cookie but your login dn and password are stored on the web server in 2. 'session': same as cookie but your login dn and password are stored on the
a persistent session variable. web server in a persistent session variable.
3. 'config': specify your login dn and password here in this config file. No login will be 3. 'config': specify your login dn and password here in this config file. No
required to use phpLDAPadmin for this server. login will be required to use phpLDAPadmin for this server.
Choose wisely to protect your authentication information appropriately for your situation. If Choose wisely to protect your authentication information appropriately for
you choose 'cookie', your cookie contents will be encrypted using blowfish and the secret your specify your situation. If you choose 'cookie', your cookie contents will be
above as session['blowfish']. */ encrypted using blowfish and the secret your specify above as
session['blowfish']. */
// $ldapservers->SetValue($i,'server','auth_type','cookie'); // $ldapservers->SetValue($i,'server','auth_type','cookie');
/* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or 'cookie' or 'session' auth_types, /* The DN of the user for phpLDAPadmin to bind with. For anonymous binds or
leave the login_dn and login_pass blank. If you specify a login_attr in conjunction with a cookie or 'cookie' or 'session' auth_types, LEAVE THE LOGIN_DN AND LOGIN_PASS BLANK. If
session auth_type, then you can also specify the login_dn/login_pass here for searching the directory for you specify a login_attr in conjunction with a cookie or session auth_type,
users (ie, if your LDAP server does not allow anonymous binds. */ then you can also specify the login_dn/login_pass here for searching the
// $ldapservers->SetValue($i,'login','dn','cn=Manager,dc=example,dc=com'); directory for users (ie, if your LDAP server does not allow anonymous binds. */
// $ldapservers->SetValue($i,'login','dn','');
# $ldapservers->SetValue($i,'login','dn','cn=Manager,dc=example,dc=com');
/* Your LDAP password. If you specified an empty login_dn above, this MUST also be blank. */ /* Your LDAP password. If you specified an empty login_dn above, this MUST also
// $ldapservers->SetValue($i,'login','pass','secret'); be blank. */
// $ldapservers->SetValue($i,'login','pass','');
# $ldapservers->SetValue($i,'login','pass','secret');
/* Use TLS (Transport Layer Security) to connect to the LDAP server. */ /* Use TLS (Transport Layer Security) to connect to the LDAP server. */
// $ldapservers->SetValue($i,'server','tls',false); // $ldapservers->SetValue($i,'server','tls',false);
/* If the link between your web server and this LDAP server is slow, it is recommended that you set /* If the link between your web server and this LDAP server is slow, it is
'low_bandwidth' to true. This will cause phpLDAPadmin to forego some "fancy" features to conserve bandwidth. */ recommended that you set 'low_bandwidth' to true. This will enable
phpLDAPadmin to forego some "fancy" features to conserve bandwidth. */
// $ldapservers->SetValue($i,'server','low_bandwidth',false); // $ldapservers->SetValue($i,'server','low_bandwidth',false);
/* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5, blowfish, crypt or /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5,
leave blank for now default algorithm. */ blowfish, crypt or leave blank for now default algorithm. */
// $ldapservers->SetValue($i,'appearance','password_hash','md5'); // $ldapservers->SetValue($i,'appearance','password_hash','md5');
/* If you specified 'cookie' or 'session' as the auth_type above, you can optionally specify here an attribute /* If you specified 'cookie' or 'session' as the auth_type above, you can
to use when logging in. If you enter 'uid' and login as 'dsmith', phpLDAPadmin will search for (uid=dsmith) optionally specify here an attribute to use when logging in. If you enter
and log in as that user. Leave blank or specify 'dn' to use full DN for logging in. Note also that if your 'uid' and login as 'dsmith', phpLDAPadmin will search for (uid=dsmith)
LDAP server requires you to login to perform searches, you can enter the DN to use when searching in 'login_dn' and log in as that user.
and 'login_pass' above. You may also specify 'string', in which case you can provide a string to use for Leave blank or specify 'dn' to use full DN for logging in. Note also that if
logging users in. See 'login_string' directly below. */ your LDAP server requires you to login to perform searches, you can enter the
// $ldapservers->SetValue($i,'login','attr','uid'); DN to use when searching in 'login_dn' and 'login_pass' above. You may also
specify 'string', in which case you can provide a string to use for logging
users in. See 'login_string' directly below. */
// $ldapservers->SetValue($i,'login','attr','dn');
/* If you specified 'cookie' or 'session' as the auth_type above, and you specified 'string' for 'login_attr' /* If you specified 'cookie' or 'session' as the auth_type above, and you
above, you must provide a string here for logging users in. If, for example, I have a lot of user entries with specified 'string' for 'login_attr' above, you must provide a string here for
DNs like "uid=dsmith,ou=People,dc=example,dc=com", then I can specify a string logging users in. If, for example, I have a lot of user entries with DNs like
"uid=<username>,ou=People,dc=example,dc=com" and my users can login with their user names alone, ie: "dsmith" "uid=dsmith,ou=People,dc=example,dc=com", then I can specify a string
in this case. */ "uid=<username>,ou=People,dc=example,dc=com" and my users can login with
// $ldapservers->SetValue($i,'login','string','uid=<username>,ou=People,dc=example,dc=com'); their user names alone, ie: "dsmith" in this case. */
# $ldapservers->SetValue($i,'login','string','uid=<username>,ou=People,dc=example,dc=com');
/* If 'login_attr' is used above such that phpLDAPadmin will search for your DN at login, you may restrict the /* If 'login_attr' is used above such that phpLDAPadmin will search for your DN
search to a specific objectClass. E.g., set this to 'posixAccount' or 'inetOrgPerson', depending upon your setup. */ at login, you may restrict the search to a specific objectClass. EG, set this
to 'posixAccount' or 'inetOrgPerson', depending upon your setup. */
// $ldapservers->SetValue($i,'login','class',''); // $ldapservers->SetValue($i,'login','class','');
/* Specify true If you want phpLDAPadmin to not display or permit any modification to the LDAP server. */ /* Specify true If you want phpLDAPadmin to not display or permit any
modification to the LDAP server. */
// $ldapservers->SetValue($i,'server','read_only',false); // $ldapservers->SetValue($i,'server','read_only',false);
/* Specify false if you do not want phpLDAPadmin to draw the 'Create new' links in the tree viewer. */ /* Specify false if you do not want phpLDAPadmin to draw the 'Create new' links
in the tree viewer. */
// $ldapservers->SetValue($i,'appearance','show_create',true); // $ldapservers->SetValue($i,'appearance','show_create',true);
/* This feature allows phpLDAPadmin to automatically determine the next available uidNumber for a new entry. */ /* This feature allows phpLDAPadmin to automatically determine the next
available uidNumber for a new entry. */
// $ldapservers->SetValue($i,'auto_number','enable',true); // $ldapservers->SetValue($i,'auto_number','enable',true);
/* The mechanism to use when finding the next available uidNumber. Two possible values: 'uidpool' or 'search'. /* The mechanism to use when finding the next available uidNumber. Two possible
The 'uidpool' mechanism uses an existing uidPool entry in your LDAP server to blindly lookup the next available values: 'uidpool' or 'search'.
uidNumber. The 'search' mechanism searches for entries with a uidNumber value and finds the first available The 'uidpool' mechanism uses an existing uidPool entry in your LDAP server to
uidNumber (slower). */ blindly lookup the next available uidNumber. The 'search' mechanism searches
for entries with a uidNumber value and finds the first available uidNumber
(slower). */
// $ldapservers->SetValue($i,'auto_number','mechanism','search'); // $ldapservers->SetValue($i,'auto_number','mechanism','search');
/* The DN of the search base when the 'search' mechanism is used above. */ /* The DN of the search base when the 'search' mechanism is used above. */
// $ldapservers->SetValue($i,'auto_number','search_base','ou=People,dc=example,dc=com'); // $ldapservers->SetValue($i,'auto_number','search_base','ou=People,dc=example,dc=com');
/* The minimum number to use when searching for the next available UID number (only when 'search' is used for /* The minimum number to use when searching for the next available UID number
auto_uid_number_mechanism' */ (only when 'search' is used for auto_uid_number_mechanism' */
// $ldapservers->SetValue($i,'auto_number','min','1000'); // $ldapservers->SetValue($i,'auto_number','min','1000');
/* The DN of the uidPool entry when 'uidpool' mechanism is used above. */ /* The DN of the uidPool entry when 'uidpool' mechanism is used above. */
// $servers[$i]['auto_uid_number_uid_pool_dn'] = 'cn=uidPool,dc=example,dc=com'; // $servers[$i]['auto_uid_number_uid_pool_dn'] = 'cn=uidPool,dc=example,dc=com';
/* If you set this, then phpldapadmin will bind to LDAP with this user ID when searching for the uidnumber. The /* If you set this, then phpldapadmin will bind to LDAP with this user ID when
idea is, this user id would have full (readonly) access to uidnumber in your ldap directory (the logged in user searching for the uidnumber. The idea is, this user id would have full
may not), so that you can be guaranteed to get a unique uidnumber for your directory. */ (readonly) access to uidnumber in your ldap directory (the logged in user
may not), so that you can be guaranteed to get a unique uidnumber for your
directory. */
// $ldapservers->SetValue($i,'auto_number','dn',''); // $ldapservers->SetValue($i,'auto_number','dn','');
/* The password for the dn above. */ /* The password for the dn above. */
// $ldapservers->SetValue($i,'auto_number','pass',''); // $ldapservers->SetValue($i,'auto_number','pass','');
/* Disable the anonymous login. */ /* Enable anonymous bind login. */
// $ldapservers->SetValue($i,'login','anon_bind',true); // $ldapservers->SetValue($i,'login','anon_bind',true);
/* Use customized page with prefix when available. */ /* Use customized page with prefix when available. */
// $ldapservers->SetValue($i,'custom','pages_prefix','custom_'); // $ldapservers->SetValue($i,'custom','pages_prefix','custom_');
/* If you set this, then phpldapadmin will bind to LDAP with this user when testing for unique attributes (as set /* If you set this, then phpldapadmin will bind to LDAP with this user when
in unique_attrs array). If you want to enforce unique attributes, than this id should have full (readonly) access testing for unique attributes (as set in unique_attrs array). If you want to
to the attributes in question (the logged in user may not have enough access) */ enforce unique attributes, than this id should have full (readonly) access
to the attributes in question (the logged in user may not have enough access)
*/
// $ldapservers->SetValue($i,'unique_attrs','dn',''); // $ldapservers->SetValue($i,'unique_attrs','dn','');
/* The password for the dn above */ /* The password for the dn above */
// $ldapservers->SetValue($i,'unique_attrs','pass',''); // $ldapservers->SetValue($i,'unique_attrs','pass','');
/* If you set this, then only these DNs are allowed to log in. This array can contain individual users, groups or /* If you set this, then only these DNs are allowed to log in. This array can
ldap search filter(s). Keep in mind that the user has not authenticated yet, so this will be an anonymous search contain individual users, groups or ldap search filter(s). Keep in mind that
to the LDAP server, so make your ACLs allow these searches to return results! */ the user has not authenticated yet, so this will be an anonymous search to
// $ldapservers->SetValue($i,'login','allowed_dns',array( the LDAP server, so make your ACLs allow these searches to return results! */
// 'uid=stran,ou=People,dc=example,dc=com', # $ldapservers->SetValue($i,'login','allowed_dns',array(
// '(&(gidNumber=811)(objectClass=groupOfNames))', # 'uid=stran,ou=People,dc=example,dc=com',
// '(|(uidNumber=200)(uidNumber=201))', # '(&(gidNumber=811)(objectClass=groupOfNames))',
// 'cn=callcenter,ou=Group,dc=example,dc=com')); # '(|(uidNumber=200)(uidNumber=201))',
# 'cn=callcenter,ou=Group,dc=example,dc=com'));
/* Set this if you dont want this LDAP server to show in the tree */ /* Set this if you dont want this LDAP server to show in the tree */
// $ldapservers->SetValue($i,'appearance','visible',true); // $ldapservers->SetValue($i,'appearance','visible',true);
/* This is the time out value in minutes for the server. After as many minutes of inactivity you will be /* This is the time out value in minutes for the server. After as many minutes
automatically logged out. If not set, the default value will be ( session_cache_expire()-1 ) */ of inactivity you will be automatically logged out. If not set, the default
// $ldapservers->SetValue($i,'login','timeout',30); value will be ( session_cache_expire()-1 ) */
# $ldapservers->SetValue($i,'login','timeout',30);
/* Set this if you want phpldapadmin to perform rename operation on entry which has children. Certain servers are known /* Set this if you want phpldapadmin to perform rename operation on entry which
to allow it, certain are not */ has children. Certain servers are known to allow it, certain are not */
// $ldapservers->SetValue($i,'server','branch_rename',false); // $ldapservers->SetValue($i,'server','branch_rename',false);
/* If you want to configure additional LDAP servers, do so below. */ /**************************************************************************
* If you want to configure additional LDAP servers, do so below. *
* Remove the commented lines and use this section as a template for all *
* your other LDAP servers. *
**************************************************************************/
/*
$i++; $i++;
$ldapservers->SetValue($i,'server','name','LDAP Server'); $ldapservers->SetValue($i,'server','name','LDAP Server');
$ldapservers->SetValue($i,'server','host','127.0.0.1'); $ldapservers->SetValue($i,'server','host','127.0.0.1');
@ -216,93 +254,91 @@ $ldapservers->SetValue($i,'login','anon_bind',true);
$ldapservers->SetValue($i,'custom','pages_prefix','custom_'); $ldapservers->SetValue($i,'custom','pages_prefix','custom_');
$ldapservers->SetValue($i,'unique_attrs','dn',''); $ldapservers->SetValue($i,'unique_attrs','dn','');
$ldapservers->SetValue($i,'unique_attrs','pass',''); $ldapservers->SetValue($i,'unique_attrs','pass','');
$ldapservers->SetValue($i,'appearance','visible',false); */
/* If you want to configure more LDAP servers, copy and paste the above (including the "$i++;") /*********************************************/
Dont forget to change 'visible' to true! */ /* User-friendly attribute translation */
/*********************************************/
/** **/
/** User-friendly attribute translation **/
/** **/
/* Use this array to map attribute names to user friendly names. For example, if you
don't want to see "facsimileTelephoneNumber" but rather "Fax". */
/* Use this array to map attribute names to user friendly names. For example, if
you don't want to see "facsimileTelephoneNumber" but rather "Fax". */
$friendly_attrs = array(); $friendly_attrs = array();
$friendly_attrs[ 'facsimileTelephoneNumber' ] = 'Fax'; $friendly_attrs['facsimileTelephoneNumber'] = 'Fax';
$friendly_attrs[ 'telephoneNumber' ] = 'Phone'; $friendly_attrs['telephoneNumber'] = 'Phone';
/** **/ /*********************************************/
/** Support for attrs display order **/ /* Support for attrs display order */
/** **/ /*********************************************/
/* Use this array if you want to have your attributes displayed in a specific order. /* Use this array if you want to have your attributes displayed in a specific
You can use default attribute names or their fridenly names. order. You can use default attribute names or their fridenly names.
For example, "sn" will be displayed right after "givenName". All the other attributes For example, "sn" will be displayed right after "givenName". All the other
that are not specified in this array will be displayed after in alphabetical order. */ attributes that are not specified in this array will be displayed after in
alphabetical order. */
# $attrs_display_order = array(
# 'givenName',
# 'sn',
# 'cn',
# 'displayName',
# 'uid',
# 'uidNumber',
# 'gidNumber',
# 'homeDirectory',
# 'mail',
# 'userPassword'
# );
// $attrs_display_order = array( /*********************************************/
// "givenName", /* Hidden attributes */
// "sn", /*********************************************/
// "cn",
// "displayName",
// "uid",
// "uidNumber",
// "gidNumber",
// "homeDirectory",
// "mail",
// "userPassword"
// );
/** **/ /* You may want to hide certain attributes from being displayed in the editor
/** Hidden attributes **/ screen. Do this by adding the desired attributes to this list (and uncomment
/** **/ it). This only affects the editor screen. Attributes will still be visible in
the schema browser and elsewhere. An example is provided below:
NOTE: The user must be able to read the hidden_except_dn entry to be
excluded. */
# $hidden_attrs = array( 'jpegPhoto', 'objectClass' );
# $hidden_except_dn = "cn=PLA UnHide,ou=Groups,c=AU";
/* You may want to hide certain attributes from being displayed in the editor screen /* Hidden attributes in read-only mode. If undefined, it will be equal to
Do this by adding the desired attributes to this list (and uncomment it). This $hidden_attrs. */
only affects the editor screen. Attributes will still be visible in the schema # $hidden_attrs_ro = array(
browser and elsewhere. An example is provided below: # 'objectClass','shadowWarning', 'shadowLastChange', 'shadowMax',
NOTE: The user must be able to read the hidden_except_dn entry to be excluded. */ # 'shadowFlag', 'shadowInactive', 'shadowMin', 'shadowExpire');
//$hidden_attrs = array( 'jpegPhoto', 'objectClass' );
//$hidden_except_dn = "cn=PLA UnHide,ou=Groups,c=AU";
/* Hidden attributes in read-only mode. If undefined, it will be equal to $hidden_attrs. */
// $hidden_attrs_ro = array( 'objectClass','shadowWarning', 'shadowLastChange', 'shadowMax',
// 'shadowFlag', 'shadowInactive', 'shadowMin', 'shadowExpire');
/** **/ /** **/
/** Read-only attributes **/ /** Read-only attributes **/
/** **/ /** **/
/* You may want to phpLDAPadmin to display certain attributes as read only, meaning /* You may want to phpLDAPadmin to display certain attributes as read only,
that users will not be presented a form for modifying those attributes, and they meaning that users will not be presented a form for modifying those
will not be allowed to be modified on the "back-end" either. You may configure attributes, and they will not be allowed to be modified on the "back-end"
this list here: either. You may configure this list here:
NOTE: The user must be able to read the read_only_except_dn entry to be excluded. */ NOTE: The user must be able to read the read_only_except_dn entry to be
excluded. */
//$read_only_attrs = array( 'objectClass' ); # $read_only_attrs = array( 'objectClass' );
//$read_only_except_dn = "cn=PLA ReadWrite,ou=Groups,c=AU"; # $read_only_except_dn = "cn=PLA ReadWrite,ou=Groups,c=AU";
/* An example of how to specify multiple read-only attributes: */ /* An example of how to specify multiple read-only attributes: */
// $read_only_attrs = array( 'jpegPhoto', 'objectClass', 'someAttribute' ); # $read_only_attrs = array( 'jpegPhoto', 'objectClass', 'someAttribute' );
/** **/ /*********************************************/
/** Unique attributes **/ /* Unique attributes */
/** **/ /*********************************************/
/* You may want phpLDAPadmin to enforce some attributes to have unique values (ie: /* You may want phpLDAPadmin to enforce some attributes to have unique values
not belong to other entries in your tree. This (together with "unique_attrs_dn" (ie: not belong to other entries in your tree. This (together with
and "unique_attrs_dn_pass" option will not let updates to occur with other attributes unique_attrs['dn'] and unique_attrs['pass'] option will not let updates to
have the same value. occur with other attributes have the same value.
NOTE: Currently the unique_attrs is NOT enforced when copying a dn. (Need to present a user with NOTE: Currently the unique_attrs is NOT enforced when copying a dn. (Need to
the option of changing the unique attributes. */ present a user with the option of changing the unique attributes. */
//$unique_attrs = array('uid','uidNumber','mail'); # $unique_attrs = array('uid','uidNumber','mail');
/** **/ /*********************************************/
/** Predefined Queries (canned views) **/ /* Predefined Queries (canned views) */
/** **/ /*********************************************/
/* To make searching easier, you may setup predefined queries below: */ /* To make searching easier, you may setup predefined queries below: */
$q=0; $q=0;
@ -337,18 +373,4 @@ $queries[$q]['base'] = 'dc=example,dc=com';
$queries[$q]['scope'] = 'sub'; $queries[$q]['scope'] = 'sub';
$queries[$q]['filter'] = '(&(objectClass=sambaAccount)(uid=*$))'; $queries[$q]['filter'] = '(&(objectClass=sambaAccount)(uid=*$))';
$queries[$q]['attributes'] = 'uid, homeDirectory'; $queries[$q]['attributes'] = 'uid, homeDirectory';
/** **/
/** Date type attributes **/
/** **/
/* If you wish to use the jscalendar popup to select a date graphically,
define this array of date type attributes.
Modify the file htdocs/js/date_selector.js to set up the calendar format.
The default format is:
ifFormat : '%m/%e/%Y', // format of the input field
showsTime : false, // will display a time selector
singleClick : false, // double-click mode
align : 'BR', // alignement
step : 0 // show all years in drop-down boxes
*/
?> ?>

View File

@ -1,5 +1,5 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/search.php,v 1.71.2.1 2005/10/09 09:07:21 wurley Exp $ // $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/search.php,v 1.71.2.2 2005/11/08 08:09:41 wurley Exp $
/** /**
* Perform LDAP searches and draw the advanced/simple search forms * Perform LDAP searches and draw the advanced/simple search forms
@ -98,8 +98,7 @@ flush();
if( isset( $_GET['search'] ) ) { if( isset( $_GET['search'] ) ) {
if( $form == 'advanced' ) { if( $form == 'advanced' ) {
if (isset( $_GET['display_attrs'])) { if (isset( $_GET['display_attrs'])) {
preg_replace('/\s+/','',$_GET['display_attrs']); $search_result_attributes = explode(',',rawurldecode(preg_replace('/\s+/','',rawurldecode($_GET['display_attrs']))));
$search_result_attributes = explode(',',rawurldecode($_GET['display_attrs']));
} else { } else {
$search_result_attributes = $config->GetValue('search','result_attributes'); $search_result_attributes = $config->GetValue('search','result_attributes');
} }

View File

@ -1,5 +1,5 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/functions.php,v 1.275.2.16 2005/11/01 10:06:53 wurley Exp $ // $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/functions.php,v 1.275.2.17 2005/11/12 04:41:17 wurley Exp $
/** /**
* A collection of functions used throughout phpLDAPadmin. * A collection of functions used throughout phpLDAPadmin.
@ -2962,17 +2962,34 @@ function get_default_hash($server_id) {
* @return string The current version as read from the VERSION file. * @return string The current version as read from the VERSION file.
*/ */
function pla_version() { function pla_version() {
if (DEBUG_ENABLED)
debug_log('pla_version(): Entered with ()',2);
$version_file = realpath('../VERSION'); $version_file = realpath('../VERSION');
if (! file_exists($version_file)) if (! file_exists($version_file))
return 'unknown version'; $return = 'UNKNOWN';
else {
$f = fopen($version_file,'r'); $f = fopen($version_file,'r');
$version = fread($f, filesize($version_file)); $version = trim(fread($f, filesize($version_file)));
fclose($f); fclose($f);
return trim($version);
# We use cvs_prefix, because CVS will translate this on checkout otherwise.
$cvs_prefix = '\$Name:';
$return = preg_replace('/^'.$cvs_prefix.' RELEASE-([0-9_]+)\s*\$$/','$1',$version);
$return = preg_replace('/_/','.',$return);
# Check if we are a CVS copy.
if (preg_match('/^'.$cvs_prefix.'?\s*\$$/',$return))
$return = 'CVS';
# If return is still the same as version, then the tag is not one we expect.
elseif ($return == $version)
$return = 'UNKNOWN';
}
if (DEBUG_ENABLED)
debug_log('pla_version(): Entered with (), Returning (%s)',2,$return);
return $return;
} }
/** /**

View File

@ -1,5 +1,5 @@
<?php <?php
/* $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.27.2.7 2005/11/01 10:06:53 wurley Exp $ */ /* $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/server_functions.php,v 1.27.2.8 2005/11/12 02:37:19 wurley Exp $ */
/** /**
* Classes and functions for LDAP server configuration and capability * Classes and functions for LDAP server configuration and capability
@ -1467,7 +1467,7 @@ class LDAPservers {
$this->default->login['attr'] = array( $this->default->login['attr'] = array(
'desc'=>'Attribute to use to find the users DN', 'desc'=>'Attribute to use to find the users DN',
'var'=>'login_attr', 'var'=>'login_attr',
'default'=>'uid'); 'default'=>'dn');
$this->default->login['class'] = array( $this->default->login['class'] = array(
'desc'=>'Strict login to users containing a specific objectClass', 'desc'=>'Strict login to users containing a specific objectClass',

View File

@ -1,5 +1,5 @@
<?php <?php
/* $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.25.2.8 2005/10/25 12:50:29 wurley Exp $ */ /* $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/template_functions.php,v 1.25.2.9 2005/11/12 02:46:18 wurley Exp $ */
/** /**
* Classes and functions for the template engine.ation and capability * Classes and functions for the template engine.ation and capability
@ -178,6 +178,10 @@ class Templates {
$this->_template[$template]['attribute'][$attr_details['ID']] = $this->_parseXML($index,$attr_details); $this->_template[$template]['attribute'][$attr_details['ID']] = $this->_parseXML($index,$attr_details);
} else { } else {
if (! strcmp($index,'ID'))
continue;
foreach ($attr_details as $key => $values) { foreach ($attr_details as $key => $values) {
if (is_array($values) && isset($values['ID'])) { if (is_array($values) && isset($values['ID'])) {