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
--- 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
+++ 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
@@ -377,4 +377,19 @@
An error occurred while trying to delete the user.
+
+ FREEBUSY_URL
+ Calendar Free/Busy URL
+
+
+ FREEBUSY_DESCRIPTION
+
+
+ https://www.domain.com/horde/kronolith/fb.php?u=user%40domain.com. Note:
+ %40 translates to the @ character.
+
+ ]]>
+
+
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
--- e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts 2007-01-19 14:33:22.000000000 -0700
+++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts 2008-04-01 09:13:23.000000000 -0600
@@ -213,6 +213,11 @@
>
+
+
+ FREEBUSY_DESCRIPTION
+
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
--- 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
+++ 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
@@ -54,6 +54,7 @@
print_save_or_add_button
get_pptp_value
print_ipsec_client_section
+ get_prop
system_password_compare
system_valid_password
@@ -283,6 +283,9 @@
my $fwd = $cgi->param('ForwardAddress') ?
$cgi->param('ForwardAddress') :
($rec ? ($rec->prop('ForwardAddress')) : '');
+ my $fb = $cgi->param('FreeBusy') ?
+ $cgi->param('FreeBusy') :
+ ($rec ? ($rec->prop('FreeBusy')) : '');
my $pptp = $cgi->param('VPNClientAccess') ?
$cgi->param('VPNClientAccess') :
($rec ? ($rec->prop('VPNClientAccess')) : 'no');
@@ -296,6 +299,7 @@
$cgi->param(-name=>'Phone', -value=>$phone);
$cgi->param(-name=>'EmailForward', -value=>$emf);
$cgi->param(-name=>'ForwardAddress', -value=>$fwd);
+ $cgi->param(-name=>'FreeBusy', -value=>$fb);
$cgi->param(-name=>'VPNClientAccess', -value=>$pptp);
} else {
print qq(
@@ -752,6 +756,7 @@
'Street' => $self->{cgi}->param('Street'),
'EmailForward' => $self->{cgi}->param('EmailForward'),
'ForwardAddress' => $self->{cgi}->param('ForwardAddress'),
+ 'FreeBusy' => $self->{cgi}->param('FreeBusy'),
'VPNClientAccess'=> $self->{cgi}->param('VPNClientAccess'),
);
$acct->merge_props(%newProperties);
@@ -807,7 +812,7 @@
my %userprops;
foreach my $field ( qw( FirstName LastName Phone Company Dept
- City Street EmailForward ForwardAddress VPNClientAccess) )
+ City Street EmailForward ForwardAddress FreeBusy VPNClientAccess) )
{
$userprops{$field} = $q->param($field);
}
@@ -1103,6 +1109,20 @@
}
+=head2 get_prop ITEM PROP
+
+A simple accessor for esmith::ConfigDB::Record::prop
+
+=cut
+
+sub get_prop
+{
+ my ($fm, $item, $prop, $default) = @_;
+
+ return $configdb->get_prop($item, $prop) || $default;
+}
+
+
=head1 System Password manipulation routines
XXX FIXME - These should be merged with the useraccouts versions