diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00header 2006-09-22 18:48:32.000000000 -0500 @@ -0,0 +1,4 @@ +//00header +/** + * $Horde: turba/config/sources.php.dist,v 1.97.6.20 2006/06/20 09:38:33 jan Exp $ + */ diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL 2006-03-15 20:48:40.000000000 -0600 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL 2006-09-22 19:45:34.000000000 -0500 @@ -1,3 +1,4 @@ +//40LocalSQL /** * A local address book in an SQL database. This implements a per-user * address book. @@ -7,7 +8,7 @@ * this source. */ $cfgSources['localsql'] = array( - 'title' => _("My Addressbook"), + 'title' => _("My Address Book"), 'type' => 'sql', // The default connection details are pulled from the Horde-wide // SQL connection configuration. @@ -59,10 +60,8 @@ 'owner_id', 'object_type', ), - 'public' => false, - 'readonly' => false, - 'admin' => array(), - 'export' => true + 'export' => true, + 'browse' => true, + 'use_shares' => false, ); - diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP --- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP 2006-03-15 20:48:40.000000000 -0600 +++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP 2006-09-22 19:45:45.000000000 -0500 @@ -1,3 +1,6 @@ +//50LocalLDAP +if (Util::extensionExists('ldap')) \{ + $cfgSources['localldap'] = array( 'title' => 'Local LDAP', 'type' => 'ldap', @@ -11,6 +14,7 @@ 'objectclass' => array('top', 'person', 'organizationalPerson','inetOrgPerson'), + 'scope' => 'one', 'charset' => 'iso-8859-1', // check if all required attributes for an entry are set and add them // if needed. @@ -41,8 +45,7 @@ 'strict' => array( 'dn', ), - 'public' => true, - 'readonly' => true, - 'admin' => array(), - 'export' => true + 'export' => true, + 'browse' => true, ); +\}