diff --git a/VERSION b/VERSION
index d3da947..ab8bba9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-$Name: RELEASE-1_1_0_4 $
+$Name: RELEASE-1_1_0_5 $
diff --git a/config/config.php.example b/config/config.php.example
index 0872fd4..faa0be0 100644
--- a/config/config.php.example
+++ b/config/config.php.example
@@ -46,7 +46,7 @@
/* phpLDAPadmin can encrypt the content of sensitive cookies if you set this
to a big random string. */
-$config->custom->session['blowfish'] = '';
+// $config->custom->session['blowfish'] = null;
/* The language setting. If you set this to 'auto', phpLDAPadmin will attempt
to determine your language automatically. Otherwise, available lanaguages
@@ -66,6 +66,12 @@ $config->custom->session['blowfish'] = '';
environments. */
# $config->custom->password['no_random_crypt_salt'] = true;
+/* PHP script timeout control. If php runs longer than this many seconds then
+ PHP will stop with an Maximum Execution time error. Increase this value from
+ the default if queries to your LDAP server are slow. The default is either
+ 30 seconds or the setting of max_exection_time if this is null. */
+// $config->custom->session['timelimit'] = 30;
+
/*********************************************/
/* Commands */
/*********************************************/
@@ -131,6 +137,13 @@ $config->custom->commands['all'] = array(
/* Configure what objects are shown in left hand tree */
// $config->custom->appearance['tree_filter'] = '(objectclass=*)';
+/* The height and width of the tree. If these values are not set, then
+ no tree scroll bars are provided.
+// $config->custom->appearance['tree_height'] = null;
+# $config->custom->appearance['tree_height'] = 600;
+// $config->custom->appearance['tree_width'] = null;
+# $config->custom->appearance['tree_width'] = 250;
+
/*********************************************/
/* Define your LDAP servers in this section */
/*********************************************/
diff --git a/htdocs/add_oclass_form.php b/htdocs/add_oclass_form.php
index d5b3d9e..eafd013 100644
--- a/htdocs/add_oclass_form.php
+++ b/htdocs/add_oclass_form.php
@@ -1,5 +1,5 @@
0) {
printf('',rawurlencode($entry['dn']['string']));
printf('',$ldapserver->server_id);
- echo '
';
diff --git a/htdocs/add_value_form.php b/htdocs/add_value_form.php
index 682127e..ec12e65 100644
--- a/htdocs/add_value_form.php
+++ b/htdocs/add_value_form.php
@@ -1,5 +1,5 @@
getEntry($entry['dn']['string']);
}
-// define the template of the entry if possible
+# Define the template of the entry if possible
eval('$reader = new '.$_SESSION[APPCONFIG]->GetValue('appearance','entry_reader').'($ldapserver);');
$reader->visit('Start', $entry['ldap']);
@@ -62,7 +62,7 @@ eval('$writer = new '.$_SESSION[APPCONFIG]->GetValue('appearance','entry_writer'
$ldap['attr'] = $entry['ldap']->getAttribute($entry['attr']['string']);
if (!$ldap['attr']) {
- // define a new attribute for the entry
+ # Define a new attribute for the entry
$attributefactoryclass = $_SESSION[APPCONFIG]->GetValue('appearance','attribute_factory');
eval('$attribute_factory = new '.$attributefactoryclass.'();');
$ldap['attr'] = $attribute_factory->newAttribute($entry['attr']['string'], array());
@@ -77,11 +77,6 @@ if (! $_SESSION[APPCONFIG]->isCommandAvailable('attribute_add_value'))
if (($ldap['attr']->getValueCount() == 0) && ! $_SESSION[APPCONFIG]->isCommandAvailable('attribute_add'))
pla_error(sprintf('%s%s %s',_('This operation is not permitted by the configuration'),_(':'),_('add attribute')));
-/*
-$ldap['attrs'] = $ldapserver->getDNAttr($entry['dn']['string'],$entry['attr']['string']);
-$ldap['count'] = count($ldap['attrs']);
-*/
-
$entry['attr']['oclass'] = (strcasecmp($entry['attr']['string'],'objectClass') == 0) ? true : false;
if ($entry['attr']['oclass']) {
@@ -99,88 +94,50 @@ printf('
%s %s %s %s
',
printf('
%s %s %s: %s
',
_('Server'),$ldapserver->name,_('Distinguished Name'),$entry['dn']['html']);
-if ($ldap['count']) {
- printf('%s %s %s %s%s',
- _('Current list of'),$ldap['count'],_('values for attribute'),$ldap['attr']->getFriendlyName(),_(':'));
-} else {
- printf('%s %s.',
- _('No current value for attribute'),$ldap['attr']->getFriendlyName());
-}
-
if ($entry['attr']['oclass']) {
echo '