/[smeserver]/rpms/e-smith-base/sme8/e-smith-base-5.2.0-remove-freebusy-references.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme8/e-smith-base-5.2.0-remove-freebusy-references.patch

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

Revision 1.1 - (hide annotations) (download)
Tue May 11 04:00:39 2010 UTC (14 years, 5 months ago) by mrjhb3
Branch: MAIN
CVS Tags: e-smith-base-5_2_0-34_el5_sme, e-smith-base-5_2_0-32_el5_sme, e-smith-base-5_2_0-30_el5_sme, e-smith-base-5_2_0-67_el5_sme, e-smith-base-5_2_0-71_el5_sme, e-smith-base-5_2_0-52_el5_sme, e-smith-base-5_2_0-51_el5_sme, e-smith-base-5_2_0-53_el5_sme, e-smith-base-5_2_0-68_el5_sme, e-smith-base-5_2_0-77_el5_sme, e-smith-base-5_2_0-21_el5_sme, e-smith-base-5_2_0-26_el5_sme, e-smith-base-5_2_0-59_el5_sme, e-smith-base-5_2_0-36_el5_sme, e-smith-base-5_2_0-56_el5_sme, e-smith-base-5_2_0-55_el5_sme, e-smith-base-5_2_0-78_el5_sme, e-smith-base-5_2_0-86_el5_sme, e-smith-base-5_2_0-76_el5_sme, e-smith-base-5_2_0-84_el5_sme, e-smith-base-5_2_0-38_el5_sme, e-smith-base-5_2_0-65_el5_sme, e-smith-base-5_2_0-88_el5_sme, e-smith-base-5_2_0-64_el5_sme, e-smith-base-5_2_0-47_el5_sme, e-smith-base-5_2_0-81_el5_sme, e-smith-base-5_2_0-82_el5_sme, e-smith-base-5_2_0-50_el5_sme, e-smith-base-5_2_0-57_el5_sme, e-smith-base-5_2_0-89_el5_sme, e-smith-base-5_2_0-49_el5_sme, e-smith-base-5_2_0-90_el5_sme, e-smith-base-5_2_0-48_el5_sme, e-smith-base-5_2_0-33_el5_sme, e-smith-base-5_2_0-87_el5_sme, e-smith-base-5_2_0-80_el5_sme, e-smith-base-5_2_0-28_el5_sme, e-smith-base-5_2_0-24_el5_sme, e-smith-base-5_2_0-70_el5_sme, e-smith-base-5_2_0-66_el5_sme, e-smith-base-5_2_0-63_el5_sme, e-smith-base-5_2_0-41_el5_sme, e-smith-base-5_2_0-42_el5_sme, e-smith-base-5_2_0-61_el5_sme, e-smith-base-5_2_0-60_el5_sme, e-smith-base-5_2_0-58_el5_sme, e-smith-base-5_2_0-20_el5_sme, e-smith-base-5_2_0-31_el5_sme, e-smith-base-5_2_0-45_el5_sme, e-smith-base-5_2_0-46_el5_sme, e-smith-base-5_2_0-29_el5_sme, e-smith-base-5_2_0-85_el5_sme, e-smith-base-5_2_0-69_el5_sme, e-smith-base-5_2_0-79_el5_sme, e-smith-base-5_2_0-27_el5_sme, e-smith-base-5_2_0-72_el5_sme, e-smith-base-5_2_0-75_el5_sme, e-smith-base-5_2_0-22_el5_sme, e-smith-base-5_2_0-73_el5_sme, e-smith-base-5_2_0-54_el5_sme, e-smith-base-5_2_0-37_el5_sme, e-smith-base-5_2_0-43_el5_sme, e-smith-base-5_2_0-44_el5_sme, e-smith-base-5_2_0-62_el5_sme, e-smith-base-5_2_0-25_el5_sme, e-smith-base-5_2_0-74_el5_sme, e-smith-base-5_2_0-35_el5_sme, e-smith-base-5_2_0-83_el5_sme, e-smith-base-5_2_0-23_el5_sme 
Please see changelog
1 mrjhb3 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-base-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts
2     --- e-smith-base-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-08-20 16:17:24.000000000 -0500
3     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2010-04-24 22:08:51.000000000 -0500
4     @@ -341,19 +341,4 @@
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-5.2.0/root/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts
25     --- e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts 2008-08-20 16:17:24.000000000 -0500
26     +++ mezzanine_patched_e-smith-base-5.2.0/root/etc/e-smith/web/functions/useraccounts 2010-04-24 22:04:45.000000000 -0500
27     @@ -213,11 +213,6 @@
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-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm mezzanine_patched_e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm
40     --- e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2008-08-20 16:17:24.000000000 -0500
41     +++ mezzanine_patched_e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2010-04-24 22:14:26.000000000 -0500
42     @@ -284,9 +284,6 @@
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     @@ -300,7 +297,6 @@
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     @@ -759,9 +755,6 @@
61     'ForwardAddress' => $self->{cgi}->param('ForwardAddress'),
62     'VPNClientAccess'=> $self->{cgi}->param('VPNClientAccess'),
63     );
64     - $newProperties{'FreeBusy'} = $self->{cgi}->param('FreeBusy')
65     - if defined $self->{cgi}->param('FreeBusy');
66     - $acct->merge_props(%newProperties);
67    
68     $accountdb->create_user_auto_pseudonyms($acctName);
69    
70     @@ -814,7 +807,7 @@
71    
72     my %userprops;
73     foreach my $field ( qw( FirstName LastName Phone Company Dept
74     - City Street EmailForward ForwardAddress FreeBusy VPNClientAccess) )
75     + City Street EmailForward ForwardAddress VPNClientAccess) )
76     {
77     $userprops{$field} = $q->param($field);
78     }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed