/[smecontribs]/rpms/smeserver-kronolith/contribs7/kronolith-2.3.2.patch
ViewVC logotype

Contents of /rpms/smeserver-kronolith/contribs7/kronolith-2.3.2.patch

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


Revision 1.1 - (show annotations) (download)
Sat Oct 10 03:25:26 2009 UTC (15 years ago) by mrjhb3
Branch: MAIN
CVS Tags: smeserver-kronolith-2_2-11_el4_sme, smeserver-kronolith-2_2-5_el4_sme, smeserver-kronolith-2_2-10_el4_sme, smeserver-kronolith-2_2-6_el4_sme, HEAD
Please see changelog

1 diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header
2 --- smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header 2009-09-28 22:35:38.000000000 -0500
3 +++ mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header 2009-09-28 22:31:20.000000000 -0500
4 @@ -1,7 +1,7 @@
5
6 //00Header
7 /**
8 - * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.12 2008/07/17 00:21:57 mrubinsk Exp $
9 + * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.14 2009/06/19 17:06:22 jan Exp $
10 *
11 * See horde/config/prefs.php for documentation on the structure of this file.
12 */
13 diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View
14 --- smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View 2008-04-08 22:41:02.000000000 -0500
15 +++ mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/100View 2009-09-28 22:32:07.000000000 -0500
16 @@ -7,6 +7,6 @@
17 'time_between_days', 'week_start_monday',
18 'day_hour_start', 'day_hour_end', 'day_hour_force',
19 'slots_per_hour', 'show_icons', 'show_time', 'show_location',
20 - 'show_legend', 'show_panel', 'show_fb_legend', 'show_shared_side_by_side', 'show_external_colors'),
21 + 'show_legend', 'show_fb_legend', 'show_shared_side_by_side', 'show_external_colors'),
22 );
23
24 diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/205ShowPanel mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/205ShowPanel
25 --- smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/205ShowPanel 2008-04-09 22:01:19.000000000 -0500
26 +++ mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/205ShowPanel 2009-09-28 22:33:22.000000000 -0500
27 @@ -5,7 +5,6 @@
28 'value' => 1,
29 'locked' => false,
30 'shared' => false,
31 - 'type' => 'checkbox',
32 - 'desc' => _("Show calendar options panel?"),
33 + 'type' => 'implicit',
34 );
35
36 diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.2/root/etc/e-smith/events/actions/kronolith_upgrade mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/events/actions/kronolith_upgrade
37 --- smeserver-kronolith-2.2/root/etc/e-smith/events/actions/kronolith_upgrade 2009-10-08 14:17:23.000000000 -0500
38 +++ mezzanine_patched_smeserver-kronolith-2.2/root/etc/e-smith/events/actions/kronolith_upgrade 2009-10-08 14:17:08.000000000 -0500
39 @@ -46,6 +46,20 @@
40
41 # These are all safe to run multiple times
42
43 +my @statements = (
44 + "ALTER TABLE kronolith_shares CHANGE share_owner share_owner VARCHAR(255)",
45 + "ALTER TABLE kronolith_shares_users CHANGE user_uid user_uid VARCHAR(255)",
46 + "ALTER TABLE kronolith_shares_groups CHANGE group_uid group_uid VARCHAR(255)",
47 +);
48 +
49 +foreach my $statement (@statements)
50 +{
51 + $statement =
52 + $db_kronolithhandle->prepare("$statement")
53 + or die "prepare: $$statement: $DBI::errstr";
54 + $statement->execute or die "execute: $$statement: $DBI::errstr";
55 +}
56 +
57 # We now need to create some columns, but we need to first check
58 # whether they exist already
59 my $sth = $db_kronolithhandle->prepare("show columns from kronolith_events");
60 @@ -91,42 +105,6 @@
61 $statement->execute or die "execute: $$statement: $DBI::errstr";
62 }
63
64 -unless (defined $kronolith_shares->{share_owner})
65 -{
66 - # We need to be careful about this one as it will fail if the
67 - # column exists, so we check the error.
68 - my $statement =
69 - 'ALTER TABLE kronolith_shares CHANGE share_owner share_owner ' .
70 - 'VARCHAR(255) ';
71 - $statement = $db_kronolithhandle->prepare($statement) or
72 - die "prepare: $$statement: $DBI::errstr";
73 - $statement->execute or die "execute: $$statement: $DBI::errstr";
74 -}
75 -
76 -unless (defined $kronolith_shares_users->{user_uid})
77 -{
78 - # We need to be careful about this one as it will fail if the
79 - # column exists, so we check the error.
80 - my $statement =
81 - 'ALTER TABLE kronolith_shares_users CHANGE user_uid user_uid ' .
82 - 'VARCHAR(255) ';
83 - $statement = $db_kronolithhandle->prepare($statement) or
84 - die "prepare: $$statement: $DBI::errstr";
85 - $statement->execute or die "execute: $$statement: $DBI::errstr";
86 -}
87 -
88 -unless (defined $kronolith_shares_groups->{group_uid})
89 -{
90 - # We need to be careful about this one as it will fail if the
91 - # column exists, so we check the error.
92 - my $statement =
93 - 'ALTER TABLE kronolith_shares_groups CHANGE group_uid group_uid ' .
94 - 'VARCHAR(255) ';
95 - $statement = $db_kronolithhandle->prepare($statement) or
96 - die "prepare: $$statement: $DBI::errstr";
97 - $statement->execute or die "execute: $$statement: $DBI::errstr";
98 -}
99 -
100 # Create an index for calendar_id if needed
101 unless ($kronolith_events ->{calendar_id}->{Key})
102 {

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed