Changeset ed5ed98 in github

Timestamp:

May 8, 2008 4:22:18 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

583850d

Parents:

6153e20

Message:

• make address_book_type option case insensitive

Location:

program/steps

Files:

• addressbook/func.inc (modified) (3 diffs)
• mail/addcontact.inc (modified) (1 diff)

program/steps/addressbook/func.inc

@@ -23 +23 @@
 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']);
@@ -50 +50 @@
 // 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));
@@ -77 +77 @@
   // 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,

program/steps/mail/addcontact.inc

@@ -25 +25 @@
 {
   $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) {