e-smith-turba/sme8/e-smith-turba-3.2.0-freebusy.patch

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
--- e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP   2010-04-24 20:56:40.000000000 -0500
+++ mezzanine_patched_e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP 2010-04-24 20:55:53.000000000 -0500
@@ -32,7 +32,19 @@
          'objectclass' => array('top',
                                 'person',
                                 'organizationalPerson',
+{
+    if (($horde{freebusy} || "disabled") eq "enabled") {
+          $OUT =<<HERE;
+                                'inetOrgPerson',
+                                'turbaContact',
+                                'calEntry'),
+HERE
+} else {
+          $OUT =<<HERE;      
                                 'inetOrgPerson'),
+HERE
+}
+}
                                 // Add 'turbaContact' to this array if using
                                 // 'turbaType' attribute below, and 'calEntry'
 //                              // if using 'freebusyUrl'.
@@ -73,6 +85,14 @@
 //         // included above:
 //           '__type' => 'turbaType',
 //           '__members' => 'turbaMembers',
+{
+    if (($horde{freebusy} || "disabled") eq "enabled") {
+          $OUT =<<HERE;
+         '__type' => 'turbaType',
+         '__members' => 'turbaMembers',         
+HERE
+}
+}
 //
          'name' => 'cn',
          'email' => 'mail',
@@ -83,8 +103,15 @@
 //
 //         // From rfc2739.schema:
 {
-        my $hordefreebusy = $horde{'freebusy'} || 'disabled'; return "        #freebusy is currently not enabled.  To enable - config setprop horde freebusy enabled" unless ($hordefreebusy eq "enabled");
-        $OUT .= '        \'freebusyUrl\' => \'calFBURL\'';
+    if (($horde{freebusy} || "disabled") eq "enabled") {
+         $OUT =<<HERE;
+         'freebusyUrl\' => 'calFBURL',       
+HERE
+} else {
+         $OUT =<<HERE;  
+         #freebusy is currently not enabled.  To enable - config setprop horde freebusy enabled
+HERE
+}
 }
 //
 //         // For Active Directory servers:
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-04-24 20:56:40.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-04-24 20:55:53.000000000 -0500
4			@@ -32,7 +32,19 @@
5			'objectclass' => array('top',
6			'person',
7			'organizationalPerson',
8			+{
9			+ if (($horde{freebusy} \|\| "disabled") eq "enabled") {
10			+ $OUT =<<HERE;
11			+ 'inetOrgPerson',
12			+ 'turbaContact',
13			+ 'calEntry'),
14			+HERE
15			+} else {
16			+ $OUT =<<HERE;
17			'inetOrgPerson'),
18			+HERE
19			+}
20			+}
21			// Add 'turbaContact' to this array if using
22			// 'turbaType' attribute below, and 'calEntry'
23			// // if using 'freebusyUrl'.
24			@@ -73,6 +85,14 @@
25			// // included above:
26			// '__type' => 'turbaType',
27			// '__members' => 'turbaMembers',
28			+{
29			+ if (($horde{freebusy} \|\| "disabled") eq "enabled") {
30			+ $OUT =<<HERE;
31			+ '__type' => 'turbaType',
32			+ '__members' => 'turbaMembers',
33			+HERE
34			+}
35			+}
36			//
37			'name' => 'cn',
38			'email' => 'mail',
39			@@ -83,8 +103,15 @@
40			//
41			// // From rfc2739.schema:
42			{
43			- my $hordefreebusy = $horde{'freebusy'} \|\| 'disabled'; return " #freebusy is currently not enabled. To enable - config setprop horde freebusy enabled" unless ($hordefreebusy eq "enabled");
44			- $OUT .= ' \'freebusyUrl\' => \'calFBURL\'';
45			+ if (($horde{freebusy} \|\| "disabled") eq "enabled") {
46			+ $OUT =<<HERE;
47			+ 'freebusyUrl\' => 'calFBURL',
48			+HERE
49			+} else {
50			+ $OUT =<<HERE;
51			+ #freebusy is currently not enabled. To enable - config setprop horde freebusy enabled
52			+HERE
53			+}
54			}
55			//
56			// // For Active Directory servers: