summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php
diff options
context:
space:
mode:
Diffstat (limited to 'kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php')
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php21
1 files changed, 10 insertions, 11 deletions
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php
index 5155981..fd59266 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php
@@ -118,28 +118,27 @@ class LdapAuthorizationConsumerConf {
$this->sid = $consumer_conf->sid;
$this->consumerType = $consumer_conf->consumer_type;
- $this->numericConsumerConfId = $consumer_conf->numeric_consumer_conf_id;
+ $this->numericConsumerConfId = isset($consumer_conf->numeric_consumer_conf_id)? $consumer_conf->numeric_consumer_conf_id : NULL;
$this->status = ($consumer_conf->status) ? 1 : 0;
$this->onlyApplyToLdapAuthenticated = (bool)(@$consumer_conf->only_ldap_authenticated);
$this->deriveFromDn = (bool)(@$consumer_conf->derive_from_dn);
- $this->deriveFromDnAttr = $consumer_conf->derive_from_dn_attr;
+ $this->deriveFromDnAttr = isset($consumer_conf->derive_from_dn_attr) ? $consumer_conf->derive_from_dn_attr : NULL;
- $this->deriveFromAttr = (bool)($consumer_conf->derive_from_attr);
+ $this->deriveFromAttr = (bool)(@$consumer_conf->derive_from_attr);
$this->deriveFromAttrAttr = $this->linesToArray($consumer_conf->derive_from_attr_attr);
- $this->deriveFromAttrUseFirstAttr = (bool)($consumer_conf->derive_from_attr_use_first_attr);
- $this->deriveFromAttrNested = (bool)($consumer_conf->derive_from_attr_nested);
+ $this->deriveFromAttrUseFirstAttr = (bool)(@$consumer_conf->derive_from_attr_use_first_attr);
+ $this->deriveFromAttrNested = (bool)(@$consumer_conf->derive_from_attr_nested);
$this->deriveFromEntry = (bool)(@$consumer_conf->derive_from_entry);
$this->deriveFromEntryEntries = $this->linesToArray($consumer_conf->derive_from_entry_entries);
- $this->deriveFromEntryEntriesAttr = $consumer_conf->derive_from_entry_entries_attr;
-
+ $this->deriveFromEntryEntriesAttr = isset($consumer_conf->derive_from_entry_entries_attr) ? $consumer_conf->derive_from_entry_entries_attr : NULL;
$this->deriveFromEntryMembershipAttr = $consumer_conf->derive_from_entry_attr;
- $this->deriveFromEntryAttrMatchingUserAttr = $consumer_conf->derive_from_entry_user_ldap_attr;
- $this->deriveFromEntrySearchAll = (bool)($consumer_conf->derive_from_entry_search_all);
- $this->deriveFromEntryUseFirstAttr = (bool)($consumer_conf->derive_from_entry_use_first_attr);
- $this->deriveFromEntryNested = $consumer_conf->derive_from_entry_nested;
+ $this->deriveFromEntryAttrMatchingUserAttr = isset($consumer_conf->derive_from_entry_user_ldap_attr) ? $consumer_conf->derive_from_entry_user_ldap_attr : NULL;
+ $this->deriveFromEntrySearchAll = (bool)(@$consumer_conf->derive_from_entry_search_all);
+ $this->deriveFromEntryUseFirstAttr = (bool)(@$consumer_conf->derive_from_entry_use_first_attr);
+ $this->deriveFromEntryNested = isset($consumer_conf->derive_from_entry_nested) ? $consumer_conf->derive_from_entry_nested : NULL;
$this->mappings = $this->pipeListToArray($consumer_conf->mappings, FALSE);
$this->useMappingsAsFilter = (bool)(@$consumer_conf->use_filter);