1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/createlinks mezzanine_patched_e-smith-turba-1.7.0/createlinks |
2 |
|
|
--- e-smith-turba-1.7.0/createlinks 2007-01-23 20:48:11.000000000 -0700 |
3 |
|
|
+++ mezzanine_patched_e-smith-turba-1.7.0/createlinks 2007-01-23 20:43:03.000000000 -0700 |
4 |
|
|
@@ -25,6 +25,7 @@ |
5 |
|
|
foreach (qw( |
6 |
|
|
40mysql.create.turba |
7 |
|
|
50turba_upgrade |
8 |
|
|
+ 57turba_mysql_reset_addressbook_pref |
9 |
|
|
60migrate-imp-to-turba |
10 |
|
|
)) |
11 |
|
|
{ |
12 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/etc/e-smith/sql/init/57turba_mysql_reset_addressbook_pref mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/etc/e-smith/sql/init/57turba_mysql_reset_addressbook_pref |
13 |
|
|
--- e-smith-turba-1.7.0/root/etc/e-smith/templates/etc/e-smith/sql/init/57turba_mysql_reset_addressbook_pref 1969-12-31 17:00:00.000000000 -0700 |
14 |
|
|
+++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/etc/e-smith/sql/init/57turba_mysql_reset_addressbook_pref 2007-01-23 20:44:18.000000000 -0700 |
15 |
|
|
@@ -0,0 +1,2 @@ |
16 |
|
|
+#! /bin/sh |
17 |
|
|
+exec mysql < /home/httpd/html/horde/scripts/db/turba_mysql_reset_addressbook_pref.sql |
18 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/conf.php/100Conf mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/conf.php/100Conf |
19 |
|
|
--- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/conf.php/100Conf 2007-01-23 20:48:11.000000000 -0700 |
20 |
|
|
+++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/conf.php/100Conf 2007-01-23 20:41:08.000000000 -0700 |
21 |
|
|
@@ -1,6 +1,6 @@ |
22 |
|
|
// 100Conf |
23 |
|
|
$conf['menu']['import_export'] = true; |
24 |
|
|
$conf['client']['addressbook'] = 'localsql'; |
25 |
|
|
-$conf['shares']['source'] = 'sql'; |
26 |
|
|
+$conf['shares']['source'] = 'localsql'; |
27 |
|
|
$conf['comments']['allow'] = true; |
28 |
|
|
$conf['documents']['type'] = 'horde'; |
29 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks |
30 |
|
|
--- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks 2007-01-23 20:48:11.000000000 -0700 |
31 |
|
|
+++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/prefs.php/170addressbooks 2007-01-23 20:41:31.000000000 -0700 |
32 |
|
|
@@ -1,7 +1,7 @@ |
33 |
|
|
//170addressbooks |
34 |
|
|
// address books to be displayed |
35 |
|
|
$_prefs['addressbooks'] = array( |
36 |
|
|
- 'value' => "localsql\nlocalldap", |
37 |
|
|
+ 'value' => "", |
38 |
|
|
'locked' => false, |
39 |
|
|
'shared' => false, |
40 |
|
|
'type' => 'implicit' |
41 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL |
42 |
|
|
--- e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL 2007-01-23 20:48:11.000000000 -0700 |
43 |
|
|
+++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/40LocalSQL 2007-01-23 20:42:24.000000000 -0700 |
44 |
|
|
@@ -62,6 +62,9 @@ |
45 |
|
|
), |
46 |
|
|
'export' => true, |
47 |
|
|
'browse' => true, |
48 |
|
|
- 'use_shares' => false, |
49 |
|
|
+{ |
50 |
|
|
+ my $sab = ($horde{SharedAddressBooks} || 'disabled') eq 'enabled' ? 'true' : 'false'; |
51 |
|
|
+ $OUT = " 'use_shares' => $sab,"; |
52 |
|
|
+} |
53 |
|
|
); |
54 |
|
|
|
55 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/57turba_mysql_reset_addressbook_pref mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/57turba_mysql_reset_addressbook_pref |
56 |
|
|
--- e-smith-turba-1.7.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/57turba_mysql_reset_addressbook_pref 1969-12-31 17:00:00.000000000 -0700 |
57 |
|
|
+++ mezzanine_patched_e-smith-turba-1.7.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/57turba_mysql_reset_addressbook_pref 2005-04-18 16:04:19.000000000 -0600 |
58 |
|
|
@@ -0,0 +1 @@ |
59 |
|
|
+PERMS=0544 |
60 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-1.7.0/root/home/httpd/html/horde/scripts/db/turba_mysql_reset_addressbook_pref.sql mezzanine_patched_e-smith-turba-1.7.0/root/home/httpd/html/horde/scripts/db/turba_mysql_reset_addressbook_pref.sql |
61 |
|
|
--- e-smith-turba-1.7.0/root/home/httpd/html/horde/scripts/db/turba_mysql_reset_addressbook_pref.sql 1969-12-31 17:00:00.000000000 -0700 |
62 |
|
|
+++ mezzanine_patched_e-smith-turba-1.7.0/root/home/httpd/html/horde/scripts/db/turba_mysql_reset_addressbook_pref.sql 2007-01-23 20:47:44.000000000 -0700 |
63 |
|
|
@@ -0,0 +1,5 @@ |
64 |
|
|
+CONNECT horde; |
65 |
|
|
+ |
66 |
|
|
+update horde_prefs set pref_value = '' where pref_scope = 'turba' and pref_name= 'addressbooks' and pref_value = 'localsql\nlocalldap'; |
67 |
|
|
+ |
68 |
|
|
+FLUSH PRIVILEGES; |