/[smeserver]/rpms/e-smith-horde/sme7/e-smith-horde-1.13.0-20.horde_314.patch
ViewVC logotype

Annotation of /rpms/e-smith-horde/sme7/e-smith-horde-1.13.0-20.horde_314.patch

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

Revision 1.1 - (hide annotations) (download)
Tue Jun 12 15:33:12 2007 UTC (17 years, 5 months ago) by slords
Branch: MAIN
CVS Tags: e-smith-horde-1_13_0-22_el4_sme, e-smith-horde-1_13_0-24_el4_sme, e-smith-horde-1_13_0-21_el4_sme 
Import on branch sme7 of package e-smith-horde-1.13.0-21.el4.sme.src.rpm
1 slords 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header
2     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2007-03-25 18:10:57.000000000 -0500
3     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2007-03-25 16:33:33.000000000 -0500
4     @@ -1,2 +1,2 @@
5     /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
6     -// $Horde: horde/config/conf.xml,v 1.74.2.41 2006/08/04 17:13:25 jan Exp $
7     +// $Horde: horde/config/conf.xml,v 1.74.2.48 2007/02/02 11:03:05 jan Exp $
8     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings
9     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings 2006-03-15 17:51:23.000000000 -0600
10     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings 2007-03-25 16:37:12.000000000 -0500
11     @@ -1,11 +1,11 @@
12     // 100GeneralSettings
13     $conf['debug_level'] = E_ALL;
14     $conf['max_exec_time'] = 0;
15     +$conf['compress_pages'] = true;
16     +$conf['umask'] = 077;
17     $conf['use_ssl'] = 2;
18     $conf['server']['name'] = $_SERVER['SERVER_NAME'];
19     $conf['server']['port'] = $_SERVER['SERVER_PORT'];
20     -$conf['compress_pages'] = true;
21     -$conf['umask'] = 077;
22     $conf['session']['name'] = 'Horde';
23     $conf['session']['cache_limiter'] = 'nocache';
24     $conf['session']['timeout'] = 0;
25     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/110SQL mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/110SQL
26     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/110SQL 2006-03-15 17:51:24.000000000 -0600
27     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/110SQL 2007-03-25 16:42:16.000000000 -0500
28     @@ -1,6 +1,5 @@
29     // 110SQL
30     $conf['sql']['persistent'] = false;
31     -$conf['sql']['hostspec'] = 'localhost';
32     $conf['sql']['username'] = 'horde';
33     {
34     $horderec = $DB->get('horde');
35     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/320Hooks mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/320Hooks
36     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/320Hooks 2006-03-15 17:51:23.000000000 -0600
37     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/320Hooks 2007-03-25 16:57:27.000000000 -0500
38     @@ -1,4 +1,5 @@
39     // 320Hooks
40     +$conf['hooks']['permsdenied'] = false;
41     $conf['hooks']['username'] = false;
42     $conf['hooks']['preauthenticate'] = false;
43     $conf['hooks']['postauthenticate'] = false;
44     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/prefs.php/00header mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/prefs.php/00header
45     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/prefs.php/00header 2007-03-25 18:10:57.000000000 -0500
46     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/prefs.php/00header 2007-03-25 17:50:42.000000000 -0500
47     @@ -1,6 +1,6 @@
48     //00header
49     /**
50     - * $Horde: horde/config/prefs.php.dist,v 1.85.2.7 2006/06/22 18:47:55 chuck Exp $
51     + * $Horde: horde/config/prefs.php.dist,v 1.85.2.8 2006/12/08 15:29:16 jan Exp $
52     *
53     * Preferences Information
54     * =======================
55     @@ -27,34 +27,47 @@
56     * The $_prefs array's are listed in the same order as listed in the
57     * members element of $prefGroups.
58     *
59     - * value: This entry will either hold a number or a text value based on the
60     + * value: This entry will hold the default preference value depending on the
61     * preference type:
62     + * checkbox: 0 or false for unchecked, 1 or true for checked
63     + * enum: Preselected item from associated enumeration
64     * implicit: See Preference type
65     - * text: Text value
66     + * link: Not used
67     * number: Number value
68     - * checkbox: Value should be 0 for unchecked, 1 for checked
69     - * select: Value associated with that selection list
70     - *
71     + * password: Should be ''
72     + * select: Preselected item from associated selection list
73     + * special: Not used
74     + * text: Text value
75     + * textarea: Text value, lines separated with "\n"
76     + *
77     * locked: Allow preference to be changed from UI
78     - * true: Do not show this preference in the UI
79     - * false: Show this preference in the UI and allow changing
80     - *
81     + * true: Do not show this preference in the UI.
82     + * This has no effect on 'link' type preferences.
83     + * false: Show this preference in the UI and allow changing.
84     + *
85     * shared: Share with other horde apps
86     * true: Share this pref with other Horde apps
87     * false: Keep this pref local to the current app
88     *
89     * type: Preference type
90     - * special: Provides a UI widget
91     - * select: Provides a selection list in the UI
92     - * checkbox: Provides a checkbox
93     - * implicit: Provides storage for 'special' types
94     + * checkbox: Provides a checkbox.
95     + * enum: Provides a selection list in the UI, list is
96     + * specified in the associated 'enum' setting.
97     + * implicit: Provides storage for 'special' types.
98     + * link: Provides a link to another data entry form.
99     + * number: Provides a 3-character textbox to enter a natural
100     + * number; syntaxcheck is performed after data entry.
101     * password: Provides a textbox for password entry.
102     - * enum: Use static list of elements...similar to 'select'
103     - *
104     - * enum: Static list of elements.
105     - *
106     - * escaped: For an enum or a select, are the keys and values already html-escaped?
107     - * Defaults to false if not present.
108     + * select: Provides a selection list in the UI that is built in
109     + * lib/prefs.php.
110     + * special: Provides an UI widget.
111     + * text: Provides a single-line textbox.
112     + * textarea: Provides a multi-line textbox.
113     + *
114     + * enum: Static list of elements for 'type' => 'enum'.
115     + *
116     + * escaped: For an enum or a select, are the keys and values already
117     + * html-escaped? Defaults to false if not present.
118     *
119     * hook: Call a hook function for the value of this preference
120     * true: Will call the function _prefs_hook_<prefname>
121     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header
122     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header 2007-03-25 18:10:57.000000000 -0500
123     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header 2007-03-25 18:09:20.000000000 -0500
124     @@ -2,7 +2,7 @@
125     /**
126     * registry.php -- Horde application registry.
127     *
128     - * $Horde: horde/config/registry.php.dist,v 1.255.2.17 2006/07/21 15:49:46 jan Exp $
129     + * $Horde: horde/config/registry.php.dist,v 1.255.2.19 2006/11/24 10:48:30 jan Exp $
130     *
131     * This configuration file is used by Horde to determine which Horde
132     * applications are installed and where, as well as how they interact.
133     @@ -38,3 +38,8 @@
134     * url string The (optional) URL of 'heading' entries.
135     */
136    
137     +// We try to automatically determine the proper webroot for Horde here. This
138     +// still assumes that applications live under horde/. If this results in
139     +// incorrect results for you, simply change the 'webroot' setting in the
140     +// 'horde' stanza below.
141     +
142     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/100webroot mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/100webroot
143     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/100webroot 2006-03-15 17:51:24.000000000 -0600
144     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/100webroot 1969-12-31 18:00:00.000000000 -0600
145     @@ -1,21 +0,0 @@
146     -// 100webroot
147     -// We try to automatically determine the proper webroot for Horde
148     -// here. This still assumes that applications live under horde/. If
149     -// this results in incorrect results for you, simply change the two
150     -// uses of the $webroot variable in the 'horde' stanza below.
151     -//
152     -// Note for Windows users: the below assumes that your PHP_SELF
153     -// variable uses forward slashes. If it does not, you'll have to tweak
154     -// this.
155     -if (isset($_SERVER['PHP_SELF'])) \{
156     - $webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY);
157     - $webroot = strstr(dirname(__FILE__), '/' . array_shift($webroot));
158     - if ($webroot !== false) \{
159     - $webroot = preg_replace(';/config$;', '', $webroot);
160     - \} else \{
161     - $webroot = '/horde';
162     - \}
163     -\} else \{
164     - $webroot = '/horde';
165     -\}
166     -
167     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/110AppRegistryHorde mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/110AppRegistryHorde
168     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/110AppRegistryHorde 2006-03-15 17:51:23.000000000 -0600
169     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/110AppRegistryHorde2007-03-29 20:25:25.000000000 -0500
170     @@ -1,7 +1,7 @@
171     // 110AppRegistryHorde
172     $this->applications['horde'] = array(
173     'fileroot' => dirname(__FILE__) . '/..',
174     - 'webroot' => $webroot,
175     + 'webroot' => '/horde',
176     'initial_page' => 'login.php',
177     'name' => _("Horde"),
178     'status' => 'active',
179     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/520AppRegistryMidas mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/520AppRegistryMidas
180     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/520AppRegistryMidas 2007-03-25 18:10:57.000000000 -0500
181     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/520AppRegistryMidas 2007-03-25 17:38:30.000000000 -0500
182     @@ -4,6 +4,6 @@
183     'webroot' => $this->applications['horde']['webroot'] . '/midas',
184     'name' => _("Ads"),
185     'status' => 'inactive',
186     - 'menu_parent' => 'website'
187     + 'menu_parent' => 'office'
188     );
189    
190     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/800WebRoot mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/800WebRoot
191     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/800WebRoot 1969-12-31 18:00:00.000000000 -0600
192     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/800WebRoot 2007-03-25 17:42:07.000000000 -0500
193     @@ -0,0 +1,28 @@
194     +// 800webRoot
195     +function _detect_webroot()
196     +\{
197     + // Note for Windows users: the below assumes that your PHP_SELF variable
198     + // uses forward slashes. If it does not, you'll have to tweak this.
199     + if (isset($_SERVER['SCRIPT_URL']) || isset($_SERVER['SCRIPT_NAME'])) \{
200     + $path = empty($_SERVER['SCRIPT_URL']) ?
201     + $_SERVER['SCRIPT_NAME'] :
202     + $_SERVER['SCRIPT_URL'];
203     + $hordedir = basename(preg_replace(';/config/registry.php$;', '', __FILE__));
204     + $webroot = preg_replace(';/' . $hordedir . '.*;', '/' . $hordedir, $path);
205     + \} elseif (isset($_SERVER['PHP_SELF'])) \{
206     + $webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY);
207     + $webroot = strstr(dirname(__FILE__), DIRECTORY_SEPARATOR . array_shift($webroot));
208     + if ($webroot !== false) \{
209     + $webroot = preg_replace(array('/\\\\/', ';/config$;'), array('/', ''), $webroot);
210     + \} elseif ($webroot === false) \{
211     + $webroot = '';
212     + \} else \{
213     + $webroot = '/horde';
214     + \}
215     + \} else \{
216     + $webroot = '/horde';
217     + \}
218     +
219     + return $webroot;
220     +\}
221     +
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed