1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts |
2 |
|
|
--- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-03-26 10:49:00.000000000 -0600 |
3 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-04-01 09:14:53.000000000 -0600 |
4 |
|
|
@@ -377,4 +377,19 @@ |
5 |
|
|
An error occurred while trying to delete the user. |
6 |
|
|
</trans> |
7 |
|
|
</entry> |
8 |
|
|
+ <entry> |
9 |
|
|
+ <base>FREEBUSY_URL</base> |
10 |
|
|
+ <trans>Calendar Free/Busy URL</trans> |
11 |
|
|
+ </entry> |
12 |
|
|
+ <entry> |
13 |
|
|
+ <base>FREEBUSY_DESCRIPTION</base> |
14 |
|
|
+ <trans> |
15 |
|
|
+ <![CDATA[ |
16 |
|
|
+ The Calendar Free/Busy URL needs to be in the following format:<br> |
17 |
|
|
+ https://www.<b>domain.com</b>/horde/kronolith/fb.php?u=<b>user%40domain.com. Note:</b> |
18 |
|
|
+ %40 translates to the @ character.<br> |
19 |
|
|
+ </p> |
20 |
|
|
+ ]]> |
21 |
|
|
+ </trans> |
22 |
|
|
+ </entry> |
23 |
|
|
</lexicon> |
24 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts |
25 |
|
|
--- e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts 2007-01-19 14:33:22.000000000 -0700 |
26 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts 2008-04-01 09:13:23.000000000 -0600 |
27 |
|
|
@@ -213,6 +213,11 @@ |
28 |
|
|
> |
29 |
|
|
<label>FORWARDING_ADDRESS</label> |
30 |
|
|
</field> |
31 |
|
|
+ <field type="text" id="FreeBusy" size="85" |
32 |
|
|
+ display="get_prop('horde', 'freebusy')"> |
33 |
|
|
+ <label>FREEBUSY_URL</label> |
34 |
|
|
+ <description>FREEBUSY_DESCRIPTION</description> |
35 |
|
|
+ </field> |
36 |
|
|
<field type="select" id="VPNClientAccess" options="'yes' => 'YES', |
37 |
|
|
'no' => 'NO'" validation="nonblank" value="get_pptp_value()"> |
38 |
|
|
<label>VPN_CLIENT_ACCESS</label> |
39 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm |
40 |
|
|
--- e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2008-03-26 10:49:00.000000000 -0600 |
41 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2008-04-01 09:24:23.000000000 -0600 |
42 |
|
|
@@ -283,6 +283,9 @@ |
43 |
|
|
my $fwd = $cgi->param('ForwardAddress') ? |
44 |
|
|
$cgi->param('ForwardAddress') : |
45 |
|
|
($rec ? ($rec->prop('ForwardAddress')) : ''); |
46 |
|
|
+ my $fb = $cgi->param('FreeBusy') ? |
47 |
|
|
+ $cgi->param('FreeBusy') : |
48 |
|
|
+ ($rec ? ($rec->prop('FreeBusy')) : ''); |
49 |
|
|
my $pptp = $cgi->param('VPNClientAccess') ? |
50 |
|
|
$cgi->param('VPNClientAccess') : |
51 |
|
|
($rec ? ($rec->prop('VPNClientAccess')) : 'no'); |
52 |
|
|
@@ -296,6 +299,7 @@ |
53 |
|
|
$cgi->param(-name=>'Phone', -value=>$phone); |
54 |
|
|
$cgi->param(-name=>'EmailForward', -value=>$emf); |
55 |
|
|
$cgi->param(-name=>'ForwardAddress', -value=>$fwd); |
56 |
|
|
+ $cgi->param(-name=>'FreeBusy', -value=>$fb); |
57 |
|
|
$cgi->param(-name=>'VPNClientAccess', -value=>$pptp); |
58 |
|
|
} else { |
59 |
|
|
print qq( |
60 |
|
|
@@ -752,6 +756,7 @@ |
61 |
|
|
'Street' => $self->{cgi}->param('Street'), |
62 |
|
|
'EmailForward' => $self->{cgi}->param('EmailForward'), |
63 |
|
|
'ForwardAddress' => $self->{cgi}->param('ForwardAddress'), |
64 |
|
|
+ 'FreeBusy' => $self->{cgi}->param('FreeBusy'), |
65 |
|
|
'VPNClientAccess'=> $self->{cgi}->param('VPNClientAccess'), |
66 |
|
|
); |
67 |
|
|
$acct->merge_props(%newProperties); |
68 |
|
|
@@ -807,7 +812,7 @@ |
69 |
|
|
|
70 |
|
|
my %userprops; |
71 |
|
|
foreach my $field ( qw( FirstName LastName Phone Company Dept |
72 |
|
|
- City Street EmailForward ForwardAddress VPNClientAccess) ) |
73 |
|
|
+ City Street EmailForward ForwardAddress FreeBusy VPNClientAccess) ) |
74 |
|
|
{ |
75 |
|
|
$userprops{$field} = $q->param($field); |
76 |
|
|
} |