| 1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header |
| 2 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header 2008-05-24 21:46:21.000000000 -0500 |
| 3 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/00Header 2008-09-29 21:39:28.000000000 -0500 |
| 4 |
@@ -1,7 +1,7 @@ |
| 5 |
|
| 6 |
//00Header |
| 7 |
/** |
| 8 |
-* $Horde: kronolith/config/prefs.php.dist,v 1.66.2.11 2008/02/01 21:47:08 chuck Exp $ |
| 9 |
+ * $Horde: kronolith/config/prefs.php.dist,v 1.66.2.12 2008/07/17 00:21:57 mrubinsk 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.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/122Maintenance mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/122Maintenance |
| 14 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/122Maintenance 1969-12-31 18:00:00.000000000 -0600 |
| 15 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/122Maintenance 2008-09-29 21:51:40.000000000 -0500 |
| 16 |
@@ -0,0 +1,8 @@ |
| 17 |
+//122Maintenance |
| 18 |
+$prefGroups['maintenance'] = array( |
| 19 |
+ 'column' => _("Events"), |
| 20 |
+ 'label' => _("Maintenance"), |
| 21 |
+ 'desc' => _("Set options for deleting old events."), |
| 22 |
+ 'members' => array('purge_events', 'purge_events_interval', 'purge_events_keep') |
| 23 |
+); |
| 24 |
+ |
| 25 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/232ShareSelect mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/232ShareSelect |
| 26 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/232ShareSelect 1969-12-31 18:00:00.000000000 -0600 |
| 27 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/232ShareSelect 2008-09-29 22:01:04.000000000 -0500 |
| 28 |
@@ -0,0 +1,4 @@ |
| 29 |
+//232ShareSelect |
| 30 |
+// default calendar selection widget |
| 31 |
+$_prefs['shareselect'] = array('type' => 'special'); |
| 32 |
+ |
| 33 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/245ShareSelect mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/245ShareSelect |
| 34 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/245ShareSelect 2008-04-09 22:04:00.000000000 -0500 |
| 35 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/245ShareSelect 1969-12-31 18:00:00.000000000 -0600 |
| 36 |
@@ -1,4 +0,0 @@ |
| 37 |
-//245ShareSelect |
| 38 |
-// default calendar selection widget |
| 39 |
-$_prefs['shareselect'] = array('type' => 'special'); |
| 40 |
- |
| 41 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/260DisplayRemoteCals mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/260DisplayRemoteCals |
| 42 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/260DisplayRemoteCals 2008-04-09 22:05:05.000000000 -0500 |
| 43 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/260DisplayRemoteCals 2008-09-29 22:02:37.000000000 -0500 |
| 44 |
@@ -1,5 +1,5 @@ |
| 45 |
//260DisplayRemoteCals |
| 46 |
-// store the remote calendars to display |
| 47 |
+// remote calendars |
| 48 |
$_prefs['remote_cals'] = array( |
| 49 |
'value' => 'a:0:\{\}', |
| 50 |
'locked' => false, |
| 51 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/265DisplayRemoteCals mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/265DisplayRemoteCals |
| 52 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/265DisplayRemoteCals 1969-12-31 18:00:00.000000000 -0600 |
| 53 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/265DisplayRemoteCals 2008-09-29 22:04:47.000000000 -0500 |
| 54 |
@@ -0,0 +1,9 @@ |
| 55 |
+//265DisplayRemoteCals |
| 56 |
+// store the remote calendars to display |
| 57 |
+$_prefs['display_remote_cals'] = array( |
| 58 |
+ 'value' => 'a:0:\{\}', |
| 59 |
+ 'locked' => false, |
| 60 |
+ 'shared' => false, |
| 61 |
+ 'type' => 'implicit' |
| 62 |
+); |
| 63 |
+ |
| 64 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayExternalCals mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayExternalCals |
| 65 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayExternalCals 1969-12-31 18:00:00.000000000 -0600 |
| 66 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayExternalCals 2008-09-29 22:05:32.000000000 -0500 |
| 67 |
@@ -0,0 +1,9 @@ |
| 68 |
+//270DisplayExternalCals |
| 69 |
+// store the external calendars to display |
| 70 |
+$_prefs['display_external_cals'] = array( |
| 71 |
+ 'value' => 'a:0:\{\}', |
| 72 |
+ 'locked' => false, |
| 73 |
+ 'shared' => false, |
| 74 |
+ 'type' => 'implicit' |
| 75 |
+); |
| 76 |
+ |
| 77 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayRemoteCals mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayRemoteCals |
| 78 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayRemoteCals 2008-04-09 22:05:57.000000000 -0500 |
| 79 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/270DisplayRemoteCals 1969-12-31 18:00:00.000000000 -0600 |
| 80 |
@@ -1,9 +0,0 @@ |
| 81 |
-//270DisplayRemoteCals |
| 82 |
-// store the remote calendars to display |
| 83 |
-$_prefs['display_remote_cals'] = array( |
| 84 |
- 'value' => 'a:0:\{\}', |
| 85 |
- 'locked' => false, |
| 86 |
- 'shared' => false, |
| 87 |
- 'type' => 'implicit' |
| 88 |
-); |
| 89 |
- |
| 90 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/290EventReminder mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/290EventReminder |
| 91 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/290EventReminder 2008-04-16 07:53:58.000000000 -0500 |
| 92 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/290EventReminder 2008-09-29 22:07:26.000000000 -0500 |
| 93 |
@@ -1,5 +1,5 @@ |
| 94 |
//290EventReminder |
| 95 |
-//reminder notifications |
| 96 |
+// reminder notifications |
| 97 |
$_prefs['event_reminder'] = array( |
| 98 |
'value' => 'owner', |
| 99 |
'locked' => false, |
| 100 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/310SearchSources mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/310SearchSources |
| 101 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/310SearchSources 2008-06-18 22:16:01.000000000 -0500 |
| 102 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/310SearchSources 2008-09-29 22:09:05.000000000 -0500 |
| 103 |
@@ -7,7 +7,7 @@ |
| 104 |
// 'value' => "source_one\tsource_two" |
| 105 |
// refer to turba/config/sources.php for possible source values |
| 106 |
$_prefs['search_sources'] = array( |
| 107 |
- 'value' => "localldap", |
| 108 |
+ 'value' => "localldap\tlocalsql", |
| 109 |
'locked' => false, |
| 110 |
'shared' => false, |
| 111 |
'type' => 'implicit', |
| 112 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/330PurgeEvents mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/330PurgeEvents |
| 113 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/330PurgeEvents 1969-12-31 18:00:00.000000000 -0600 |
| 114 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/330PurgeEvents 2008-09-29 22:11:16.000000000 -0500 |
| 115 |
@@ -0,0 +1,9 @@ |
| 116 |
+//330PurgeEvents |
| 117 |
+$_prefs['purge_events'] = array( |
| 118 |
+ 'value' => 0, |
| 119 |
+ 'locked' => false, |
| 120 |
+ 'shared' => false, |
| 121 |
+ 'type' => 'checkbox', |
| 122 |
+ 'desc' => _("Purge old events from your calender?"), |
| 123 |
+); |
| 124 |
+ |
| 125 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/335PurgeEventsInterval mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/335PurgeEventsInterval |
| 126 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/335PurgeEventsInterval 1969-12-31 18:00:00.000000000 -0600 |
| 127 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/335PurgeEventsInterval 2008-09-29 22:12:05.000000000 -0500 |
| 128 |
@@ -0,0 +1,10 @@ |
| 129 |
+//335PurgeEventsInterval |
| 130 |
+// 'value': yearly = 1, monthly = 2, weekly = 3, daily = 4, every login = 5 |
| 131 |
+$_prefs['purge_events_interval'] = array( |
| 132 |
+ 'value' => '2', |
| 133 |
+ 'locked' => false, |
| 134 |
+ 'shared' => false, |
| 135 |
+ 'type' => 'select', |
| 136 |
+ 'desc' => _("Purge old events how often:"), |
| 137 |
+); |
| 138 |
+ |
| 139 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/340PurgeEventsKeep mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/340PurgeEventsKeep |
| 140 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/340PurgeEventsKeep 1969-12-31 18:00:00.000000000 -0600 |
| 141 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/340PurgeEventsKeep 2008-09-29 22:12:49.000000000 -0500 |
| 142 |
@@ -0,0 +1,9 @@ |
| 143 |
+//340PurgeEventsKeep |
| 144 |
+$_prefs['purge_events_keep'] = array( |
| 145 |
+ 'value' => 365, |
| 146 |
+ 'locked' => false, |
| 147 |
+ 'shared' => false, |
| 148 |
+ 'type' => 'number', |
| 149 |
+ 'desc' => _("Purge old events older than this amount of days."), |
| 150 |
+); |
| 151 |
+ |
| 152 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/345LastKronolithMaintenance mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/345LastKronolithMaintenance |
| 153 |
--- smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/345LastKronolithMaintenance 1969-12-31 18:00:00.000000000 -0600 |
| 154 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/templates/home/httpd/html/horde/kronolith/config/prefs.php/345LastKronolithMaintenance 2008-09-29 22:13:35.000000000 -0500 |
| 155 |
@@ -0,0 +1,10 @@ |
| 156 |
+//345LastKronolithMaintenance |
| 157 |
+// last time maintenance was run. |
| 158 |
+// value is a UNIX timestamp of the last time maintenance ran for the user. |
| 159 |
+$_prefs['last_kronolith_maintenance'] = array( |
| 160 |
+ 'value' => 0, |
| 161 |
+ 'locked' => false, |
| 162 |
+ 'shared' => false, |
| 163 |
+ 'type' => 'implicit' |
| 164 |
+); |
| 165 |
+ |
| 166 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/etc/e-smith/events/actions/kronolith_upgrade mezzanine_patched_smeserv |
| 167 |
er-kronolith-2.3/root/etc/e-smith/events/actions/kronolith_upgrade |
| 168 |
--- smeserver-kronolith-2.3/root/etc/e-smith/events/actions/kronolith_upgrade 2008-05-29 23:18:17.000000000 -0500 |
| 169 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/etc/e-smith/events/actions/kronolith_upgrade 2008-09-29 22:28:23.000000000 -0500 |
| 170 |
@@ -91,6 +91,18 @@ |
| 171 |
$statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 172 |
} |
| 173 |
|
| 174 |
+unless (defined $kronolith_shares_groups->{group_uid}) |
| 175 |
+{ |
| 176 |
+ # We need to be careful about this one as it will fail if the |
| 177 |
+ # column exists, so we check the error. |
| 178 |
+ my $statement = |
| 179 |
+ 'ALTER TABLE kronolith_shares_groups CHANGE group_uid group_uid ' . |
| 180 |
+ 'VARCHAR(255) '; |
| 181 |
+ $statement = $db_kronolithhandle->prepare($statement) or |
| 182 |
+ die "prepare: $$statement: $DBI::errstr"; |
| 183 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
| 184 |
+} |
| 185 |
+ |
| 186 |
# Create an index for calendar_id if needed |
| 187 |
unless ($kronolith_events ->{calendar_id}->{Key}) |
| 188 |
{ |
| 189 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-kronolith-2.3/root/home/httpd/html/horde/smeserver/kronolith.mysql.sql mezzanine_patched_ |
| 190 |
smeserver-kronolith-2.3/root/home/httpd/html/horde/smeserver/kronolith.mysql.sql |
| 191 |
--- smeserver-kronolith-2.3/root/home/httpd/html/horde/smeserver/kronolith.mysql.sql 2008-06-18 22:58:30.000000000 -0500 |
| 192 |
+++ mezzanine_patched_smeserver-kronolith-2.3/root/home/httpd/html/horde/smeserver/kronolith.mysql.sql 2008-09-29 22:23:25.00000000 |
| 193 |
0 -0500 |
| 194 |
@@ -1,4 +1,4 @@ |
| 195 |
--- $Horde: kronolith/scripts/sql/kronolith.mysql.sql,v 1.3.2.5 2008/04/29 19:33:21 chuck Exp $ |
| 196 |
+-- $Horde: kronolith/scripts/sql/kronolith.mysql.sql,v 1.3.2.8 2008/09/23 15:18:27 jan Exp $ |
| 197 |
|
| 198 |
CREATE TABLE IF NOT EXISTS kronolith_events ( |
| 199 |
event_id VARCHAR(32) NOT NULL, |
| 200 |
@@ -48,14 +48,12 @@ |
| 201 |
PRIMARY KEY (share_id) |
| 202 |
); |
| 203 |
|
| 204 |
- |
| 205 |
CREATE TABLE IF NOT EXISTS kronolith_shares_groups ( |
| 206 |
share_id INT NOT NULL, |
| 207 |
- group_uid INT NOT NULL, |
| 208 |
+ group_uid VARCHAR(255) NOT NULL, |
| 209 |
perm SMALLINT NOT NULL |
| 210 |
); |
| 211 |
|
| 212 |
- |
| 213 |
CREATE TABLE IF NOT EXISTS kronolith_shares_users ( |
| 214 |
share_id INT NOT NULL, |
| 215 |
user_uid VARCHAR(255) NOT NULL, |
Parent Directory
| 
Revision Log
| 
Revision Graph
