Merge pull request #14 from araname/master

[contagged] / inc / config.php.dist

diff --git a/inc/config.php.dist b/inc/config.php.dist
index bb08e3c6ba993558342b5c8464aa573afbb27fad..63a46795978687e643465c3f3d8bd3476facb0f7 100644 (file)
--- a/inc/config.php.dist
+++ b/inc/config.php.dist
@@ -57,8 +57,13 @@
   $conf['dateformat']  = '%Y/%m/%d';
   #$conf['dateformat']  = '%d.%m.%Y';
 
-  // Enable maps with locations
-  $conf['enablemaps'] = true;
+  // Google maps key, you can specify multiple when running the app through different vhosts
+  $conf['gmaps'] = array(
+    'localhost'        => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RT2yXp_ZAY8_ufC3CFXhHIE1NvwkxSoniRWQPYZHIWuWPbij8hFqvrEuw',
+    'intranet.cosmo'   => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RTxyuybgLnXtMVD7dljhze3zUboVhTqk9yc-rQVvv2YwFFJN20RCNbIVA',
+    'intranet'         => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RTjlGRJ-JcA4ENdYSxSTUELqnaldxSOyZdbUNylw_BZHH1bBLrQNGtjZg',
+    'fileserver.cosmo' => 'ABQIAAAAwcgTzX14Lq48uGhuAgaC-RQ2oMD1p7-NjsUZiDyjvzpK3IuhixTXdHGQRp8jtjwAl-P4oPPEB_hGgw',
+  );
 
   // Force recompilation of smarty templates?
   $conf['smartycompile'] = 0;
@@ -66,7 +71,7 @@
 // LDAP classes to store with contacts.
 $conf['oclasses'] = array(
     'inetOrgPerson',
-    //'contactPerson',
+    'contactPerson',
     //'OXUserObject',
     //'evolutionPerson',
     //'officePerson',