/[smecontribs]/rpms/smeserver-nag/contribs10/nag_2.3.3.patch
ViewVC logotype

Annotation of /rpms/smeserver-nag/contribs10/nag_2.3.3.patch

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

Revision 1.1 - (hide annotations) (download)
Sun Dec 20 04:59:52 2020 UTC (3 years, 11 months ago) by brianr
Branch: MAIN
CVS Tags: HEAD 
Initial import
1 brianr 1.1 diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header
2     --- smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header 2009-09-28 22:08:33.000000000 -0500
3     +++ mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header 2009-09-28 18:27:10.000000000 -0500
4     @@ -1,6 +1,6 @@
5     //00Header
6     /**
7     - * $Horde: nag/config/prefs.php.dist,v 1.42.2.11 2008/11/25 20:56:00 chuck Exp $
8     + * $Horde: nag/config/prefs.php.dist,v 1.42.2.12 2009/06/19 17:06:22 jan Exp $
9     *
10     * See horde/config/prefs.php for documentation on the structure of this file.
11     */
12     diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display
13     --- smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display 2009-09-28 22:08:33.000000000 -0500
14     +++ mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/110Display 2009-09-28 18:26:02.000000000 -0500
15     @@ -3,7 +3,6 @@
16     'column' => _("General Options"),
17     'label' => _("Display Options"),
18     'desc' => _("Change your task sorting and display options."),
19     - 'members' => array('tasklist_columns', 'show_panel', 'sortby', 'altsortby',
20     - 'sortdir'),
21     + 'members' => array('tasklist_columns', 'sortby', 'altsortby', 'sortdir'),
22     );
23    
24     diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/180ShowPanel mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/180ShowPanel
25     --- smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/180ShowPanel 2008-05-13 19:49:59.000000000 -0500
26     +++ mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/180ShowPanel 2009-09-28 20:09:09.000000000 -0500
27     @@ -5,7 +5,6 @@
28     'value' => 1,
29     'locked' => false,
30     'shared' => false,
31     - 'type' => 'checkbox',
32     - 'desc' => _("Show task list options panel?"),
33     + 'type' => 'implicit',
34     );
35    
36     diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.2/root/etc/e-smith/events/actions/nag_upgrade mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/events/actions/nag_upgrade
37     --- smeserver-nag-2.2/root/etc/e-smith/events/actions/nag_upgrade 2009-10-08 14:26:40.000000000 -0500
38     +++ mezzanine_patched_smeserver-nag-2.2/root/etc/e-smith/events/actions/nag_upgrade 2009-10-08 14:26:27.000000000 -0500
39     @@ -47,6 +47,20 @@
40    
41     # These are all safe to run multiple times
42    
43     +my @statements = (
44     + "ALTER TABLE nag_shares CHANGE share_owner share_owner VARCHAR(255)",
45     + "ALTER TABLE nag_shares_users CHANGE user_uid user_uid VARCHAR(255)",
46     + "ALTER TABLE nag_shares_groups CHANGE group_uid group_uid VARCHAR(255)",
47     +);
48     +
49     +foreach my $statement (@statements)
50     +{
51     + $statement =
52     + $db_naghandle->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_naghandle->prepare("show columns from nag_tasks");
60     @@ -144,42 +158,6 @@
61     $statement->execute or die "execute: $$statement: $DBI::errstr";
62     }
63    
64     -unless (defined $nag_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 nag_shares CHANGE share_owner share_owner ".
70     - "VARCHAR(255)";
71     - $statement = $db_naghandle->prepare($statement) or
72     - die "prepare: $$statement: $DBI::errstr";
73     - $statement->execute or die "execute: $$statement: $DBI::errstr";
74     -}
75     -
76     -unless (defined $nag_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 nag_shares_users CHANGE user_uid user_uid ".
82     - "VARCHAR(255)";
83     - $statement = $db_naghandle->prepare($statement) or
84     - die "prepare: $$statement: $DBI::errstr";
85     - $statement->execute or die "execute: $$statement: $DBI::errstr";
86     -}
87     -
88     -unless (defined $nag_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 nag_shares_groups CHANGE group_uid group_uid ".
94     - "VARCHAR(255)";
95     - $statement = $db_naghandle->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 task_owner if needed
101     unless ($nag_tasks->{task_owner}->{Key})
102     {
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed