From ed5ed98bea879a801c11c66589395452b9b8087b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 08 May 2008 04:22:18 -0400
Subject: [PATCH] - make address_book_type option case insensitive
---
program/steps/addressbook/func.inc | 6 +++---
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 8938cfa..ea67ec2 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 @@
// 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 @@
// 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 6568268..aefdd83 100644
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -24,7 +24,7 @@
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"]) {
--
Gitblit v1.9.1