PHP5 compatibility and code cleanup

[contagged] / config.php

diff --git a/config.php b/config.php
index 8de50798f2cc2dda7b7bf5e4dec04377d6e69f77..84cd10d465f97a3b1861e950d005d6c07fa9d356 100644 (file)
--- a/config.php
+++ b/config.php
@@ -1,50 +1,53 @@
 <?
 
+  // LDAP URL; if set, takes precedence over ldapserver and ldapport
+  #$conf['ldapurl']     = 'ldaps://ldap.example.com/';
+
   // Which LDAP Server to use?
-  $conf[ldapserver]  = 'ldap';
+  $conf['ldapserver']  = 'ldap';
 
   // Which LDAP Port Server to use? (389 is standard, 636 for ssl)
-  $conf[ldapport]    = 389;
+  $conf['ldapport']    = 389;
 
   // What is the root dn on this Server?
-  $conf[ldaprootdn]  = 'o=cosmocode, c=de';
+  $conf['ldaprootdn']  = 'o=cosmocode, c=de';
 
   // Where are the user Accounts stored?
-  $conf[usertree]    = 'ou=people, '.$conf[ldaprootdn];
+  $conf['usertree']    = 'ou=people, '.$conf['ldaprootdn'];
 
   // How to match users? %u is replaced by the given login
-  $conf[userfilter]  = '(&(uid=%u)(objectClass=posixAccount))';
+  $conf['userfilter']  = '(&(uid=%u)(objectClass=posixAccount))';
 
   // Use these values to bind to the ldap directory when not logged in (leave blank for anonymous bind)
-  $conf[anonbinddn]  = '';
-  $conf[anonbindpw]  = '';
+  $conf['anonbinddn']  = '';
+  $conf['anonbindpw']  = '';
 
   // Which language to use (see lang directory)
-  $conf[lang]        = 'en';
+  $conf['lang']        = 'en';
 
   // Where to store public contacts?
-  $conf[publicbook]  = 'ou=contacts, '.$conf[ldaprootdn];
+  $conf['publicbook']  = 'ou=contacts, '.$conf['ldaprootdn'];
 
-  // Where to store private contacts (relative to $conf[usertree])
-  $conf[privatebook] = 'ou=contacts';
+  // Where to store private contacts (relative to $conf['usertree'])
+  $conf['privatebook'] = 'ou=contacts';
 
   // Should the additional schema ldapab.schema be used? (0|1)
   // Note: openxchange and extended are currently exclusive, do not use both at the same time!
-  $conf[extended]    = 1;
+  $conf['extended']    = 1;
   
   // Should we use some parts of the openxchange.schema? (0|1)
   // Note: openxchange and extended are currently exclusive, do not use both at the same time!
-  $conf[openxchange] = 0;
+  $conf['openxchange'] = 0;
  
   // Should we try to login using the username and password provided by httpd? (0|1)
-  $conf[httpd_auth]  = 0;
+  $conf['httpd_auth']  = 0;
  
   // Dateformat for birthdays when using extended schema
   // see http://www.php.net/manual/en/function.strftime.php
-  #$conf[dateformat]  = '%Y/%m/%d';
-  $conf[dateformat]  = '%d.%m.%Y';
+  #$conf['dateformat']  = '%Y/%m/%d';
+  $conf['dateformat']  = '%d.%m.%Y';
 
   // Force recompilation of smarty templates?
-  $conf[smartycompile] = 0;
+  $conf['smartycompile'] = 0;
 
 ?>