1 |
mrjhb3 |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP mezzanine_patched_e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP |
2 |
|
|
--- e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP 2010-08-01 20:07:00.000000000 -0500 |
3 |
|
|
+++ mezzanine_patched_e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP 2010-08-01 20:05:39.000000000 -0500 |
4 |
|
|
@@ -36,7 +36,6 @@ |
5 |
|
|
if (($horde{freebusy} || "disabled") eq "enabled") { |
6 |
|
|
$OUT =<<HERE; |
7 |
|
|
'inetOrgPerson', |
8 |
|
|
- 'turbaContact', |
9 |
|
|
'calEntry'), |
10 |
|
|
HERE |
11 |
|
|
} else { |
12 |
|
|
@@ -86,14 +85,6 @@ |
13 |
|
|
// // included above: |
14 |
|
|
// '__type' => 'turbaType', |
15 |
|
|
// '__members' => 'turbaMembers', |
16 |
|
|
-{ |
17 |
|
|
- if (($horde{freebusy} || "disabled") eq "enabled") { |
18 |
|
|
- $OUT =<<HERE; |
19 |
|
|
- '__type' => 'turbaType', |
20 |
|
|
- '__members' => 'turbaMembers', |
21 |
|
|
-HERE |
22 |
|
|
-} |
23 |
|
|
-} |
24 |
|
|
// |
25 |
|
|
'name' => 'cn', |
26 |
|
|
'email' => 'mail', |