diff options
| author | alecpl <alec@alec.pl> | 2008-05-08 08:22:18 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2008-05-08 08:22:18 +0000 |
| commit | ed5ed98bea879a801c11c66589395452b9b8087b (patch) | |
| tree | 57ad9c5bcb957e25cd3ccd4114fe891cd5b11c8c | |
| parent | 6153e205162478cda6687f2d326c1821ac3e6dd9 (diff) | |
- make address_book_type option case insensitive
| -rw-r--r-- | program/steps/addressbook/func.inc | 6 | ||||
| -rw-r--r-- | program/steps/mail/addcontact.inc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 8938cfaed..ea67ec247 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -22,7 +22,7 @@ // instantiate a contacts object according to the given source if (($source = get_input_value('_source', RCUBE_INPUT_GPC)) && isset($CONFIG['ldap_public'][$source])) $CONTACTS = new rcube_ldap($CONFIG['ldap_public'][$source]); -else if ($CONFIG['address_book_type'] == 'ldap') { +else if (strtolower($CONFIG['address_book_type']) == 'ldap') { // Get the first LDAP address book. $source = key((array)$CONFIG['ldap_public']); $prop = current((array)$CONFIG['ldap_public']); @@ -49,7 +49,7 @@ $OUTPUT->set_env('readonly', $CONTACTS->readonly, false); // add list of address sources to client env $js_list = array(); -if ($CONFIG['address_book_type'] != 'ldap') { +if (strtolower($CONFIG['address_book_type']) != 'ldap') { // We are using the DB address book, add it. $js_list = array("0" => array('id' => 0, 'readonly' => false)); } // end if @@ -76,7 +76,7 @@ function rcmail_directory_list($attrib) // allow the following attributes to be added to the <ul> tag $out = '<ul' . create_attrib_string($attrib, array('style', 'class', 'id')) . ">\n"; - if ($CONFIG['address_book_type'] != 'ldap') { + if (strtolower($CONFIG['address_book_type']) != 'ldap') { $out .= sprintf($line_templ, 'rcmli'.$local_id, !$current ? 'selected' : '', diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc index 65682688f..aefdd83de 100644 --- a/program/steps/mail/addcontact.inc +++ b/program/steps/mail/addcontact.inc @@ -24,7 +24,7 @@ $done = false; if (!empty($_POST['_address'])) { $CONTACTS = array(); - if ($CONFIG['address_book_type'] == 'ldap') { + if (strtolower($CONFIG['address_book_type']) == 'ldap') { // Use the first writable LDAP address book. foreach ($CONFIG["ldap_public"] as $id => $prop) { if ($prop["writable"]) { |