/[smeserver]/rpms/e-smith-base/sme7/e-smith-base-4.18.1-freebusy.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme7/e-smith-base-4.18.1-freebusy.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.4 - (hide annotations) (download)
Sat Apr 19 15:16:28 2008 UTC (16 years, 6 months ago) by slords
Branch: MAIN
CVS Tags: e-smith-base-4_18_1-10_el4_sme, e-smith-base-4_18_1-20_el4_sme, e-smith-base-4_18_1-11_el4_sme, e-smith-base-4_18_1-23_el4_sme, e-smith-base-4_18_1-27_el4_sme, e-smith-base-4_18_1-15_el4_sme, e-smith-base-4_18_1-13_el4_sme, e-smith-base-4_18_1-17_el4_sme, e-smith-base-4_18_1-25_el4_sme, e-smith-base-4_18_1-21_el4_sme, e-smith-base-4_18_1-19_el4_sme, e-smith-base-4_18_1-12_el4_sme, e-smith-base-4_18_1-22_el4_sme, e-smith-base-4_18_1-16_el4_sme, e-smith-base-4_18_1-14_el4_sme, e-smith-base-4_18_1-18_el4_sme, e-smith-base-4_18_1-26_el4_sme, e-smith-base-4_18_1-24_el4_sme
Changes since 1.3: +1 -1 lines 
* Sat Apr 19 2008 Shad L. Lords <slords@mail.com> 4.18.1-10
- Fix FreeBusy param when disabled [SME: 1806]
- Remove .orig file [SME: 4228]
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.&nbsp;&nbsp;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 slords 1.2 @@ -54,6 +54,7 @@
43     print_save_or_add_button
44     get_pptp_value
45     print_ipsec_client_section
46     + get_prop
47    
48     system_password_compare
49     system_valid_password
50 slords 1.1 @@ -283,6 +283,9 @@
51     my $fwd = $cgi->param('ForwardAddress') ?
52     $cgi->param('ForwardAddress') :
53     ($rec ? ($rec->prop('ForwardAddress')) : '');
54     + my $fb = $cgi->param('FreeBusy') ?
55     + $cgi->param('FreeBusy') :
56     + ($rec ? ($rec->prop('FreeBusy')) : '');
57     my $pptp = $cgi->param('VPNClientAccess') ?
58     $cgi->param('VPNClientAccess') :
59     ($rec ? ($rec->prop('VPNClientAccess')) : 'no');
60     @@ -296,6 +299,7 @@
61     $cgi->param(-name=>'Phone', -value=>$phone);
62     $cgi->param(-name=>'EmailForward', -value=>$emf);
63     $cgi->param(-name=>'ForwardAddress', -value=>$fwd);
64     + $cgi->param(-name=>'FreeBusy', -value=>$fb);
65     $cgi->param(-name=>'VPNClientAccess', -value=>$pptp);
66     } else {
67     print qq(
68     @@ -752,6 +756,7 @@
69     'Street' => $self->{cgi}->param('Street'),
70     'EmailForward' => $self->{cgi}->param('EmailForward'),
71     'ForwardAddress' => $self->{cgi}->param('ForwardAddress'),
72     + 'FreeBusy' => $self->{cgi}->param('FreeBusy'),
73     'VPNClientAccess'=> $self->{cgi}->param('VPNClientAccess'),
74     );
75     $acct->merge_props(%newProperties);
76     @@ -807,7 +812,7 @@
77    
78     my %userprops;
79     foreach my $field ( qw( FirstName LastName Phone Company Dept
80     - City Street EmailForward ForwardAddress VPNClientAccess) )
81     + City Street EmailForward ForwardAddress FreeBusy VPNClientAccess) )
82     {
83     $userprops{$field} = $q->param($field);
84     }
85 slords 1.4 @@ -1103,6 +1109,20 @@
86 slords 1.2 }
87    
88    
89     +=head2 get_prop ITEM PROP
90     +
91     +A simple accessor for esmith::ConfigDB::Record::prop
92     +
93     +=cut
94     +
95     +sub get_prop
96     +{
97     + my ($fm, $item, $prop, $default) = @_;
98     +
99 slords 1.3 + return $configdb->get_prop($item, $prop) || $default;
100 slords 1.2 +}
101     +
102     +
103     =head1 System Password manipulation routines
104    
105     XXX FIXME - These should be merged with the useraccouts versions
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed