/[smecontribs]/rpms/smeserver-gollem/contribs8/smeserver-gollem-1.0-15.gollem-1.1.patch
ViewVC logotype

Annotation of /rpms/smeserver-gollem/contribs8/smeserver-gollem-1.0-15.gollem-1.1.patch

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

Revision 1.1 - (hide annotations) (download)
Thu Jul 8 15:01:01 2010 UTC (13 years, 10 months ago) by slords
Branch: MAIN
CVS Tags: smeserver-gollem-1_0-18_el5_sme, HEAD 
Import for sme8
1 slords 1.1 diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/00
2     header mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/00header
3     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/00header 2009-03-23 23:30:42.
4     000000000 -0500
5     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/00header 2009
6     -03-20 20:41:30.000000000 -0500
7     @@ -1,3 +1,94 @@
8     //00Header
9     -// * $Horde: gollem/config/backends.php.dist,v 1.41.2.7 2006/11/27 03:32:40 slusarz Exp $
10     +/**
11     + * $Horde: gollem/config/backends.php.dist,v 1.41.2.8 2008/10/09 20:54:40 jan Exp $
12     + *
13     + * This file is where you specify what backends people using your
14     + * installation of Gollem can log in to. There are a number of properties
15     + * that you can set for each backend:
16     + *
17     + * name: This is the plaintext name that you want displayed if you are using
18     + * the drop down server list.
19     + *
20     + * driver: The VFS (Virtual File System) driver to use to connect.
21     + * Valid options:
22     + * 'file' -- Work with a local file system.
23     + * 'ftp' -- Connect to a FTP server.
24     + * 'smb' -- Connect to a SMB fileshare.
25     + * 'sql' -- Connect to VFS filesystem stored in SQL database.
26     + * 'ssh2' -- Connect to a remote server via SSH2.
27     + *
28     + * preferred: This is only useful if you want to use the same backend.php
29     + * file for different machines: if the hostname of the Gollem
30     + * machine is identical to one of those in the preferred list,
31     + * then the corresponding option in the select box will include
32     + * SELECTED, i.e. it is selected by default. Otherwise the
33     + * first entry in the list is selected.
34     + *
35     + * hordeauth: If this parameter is present and true, then Gollem will attempt
36     + * to use the user's existing credentials (the username/password
37     + * they used to log in to Horde) to log in to this source. If this
38     + * parameter is 'full', the username will be used unmodified;
39     + * otherwise, everything after and including the first @ in the
40     + * username will be stripped before attempting authentication.
41     + *
42     + * params: A parameters array containing any additional information that the
43     + * VFS driver needs.
44     + *
45     + * loginparams: A list of parameters that can be changed by the user on the
46     + * login screen. The key is the parameter name that can be
47     + * changed, the value is the text that will be displayed next to
48     + * the entry box on the login screen.
49     + *
50     + * root: The directory that will be the "top" or "root" directory, being the
51     + * topmost directory where users can change to. This is in addition to
52     + * a vfsroot parameter set in the params array.
53     + *
54     + * home: The directory that will be used as home directory for the user.
55     + * This parameter will overrule a home parameter in the params array.
56     + * If empty, this will default to the active working directory
57     + * immediately after logging into the VFS backend (i.e. for ftp,
58     + * this will most likely be ~user, for SQL based VFS backends,
59     + * this will probably be the root directory).
60     + *
61     + * createhome: If this parameter is set to true, and the home directory does
62     + * not exist, attempt to create the home directory on login.
63     + *
64     + * filter: If set, all files that match the regex will be hidden in the
65     + * folder view. The regex must be in pcre syntax (See
66     + * http://www.php.net/pcre).
67     + *
68     + * quota: If set, turn on VFS quota checking for the backend if it supports
69     + * it. The entry must be in the following format:
70     + * size [metric]
71     + * metric = B (bytes), KB (kilobytes), MB (megabytes), GB (gigabytes)
72     + * If no metric is given, bytes are assumed.
73     + * Examples: "2 MB", "2048 B", "1.5 GB"
74     + * If false or not set, quota support is disabled.
75     + *
76     + * ** For quotas to work, you must be using a version of Horde **
77     + * ** that contains VFS quota support. **
78     + *
79     + * clipboard: If set, allows the user to cut/copy/paste files. Since not all
80     + * VFS backends have support for the necessary commands, and there
81     + * is no way to auto-detect which backends do have support, this
82     + * option must be manually set. True enables clipboard support,
83     + * false (the default) disables support. In the examples below,
84     + * clipboard has been enabled in all VFS backends that have
85     + * cut/copy/paste support since the initial release of Horde 3.0.
86     + * For all other backends, you will have to manually check and
87     + * see if your current VFS version/backend supports the necessary
88     + * commands.
89     + *
90     + * attributes: The list of attributes that the driver supports. Available
91     + * attributes:
92     + * 'edit'
93     + * 'download'
94     + * 'group'
95     + * 'modified'
96     + * 'name'
97     + * 'owner'
98     + * 'permission'
99     + * 'size'
100     + * 'type'
101     + */
102    
103     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/10
104     0LocalFtp mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100Loca
105     lFtp
106     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100LocalFtp 2009-03-23 2
107     3:30:42.000000000 -0500
108     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100LocalFtp2009-03-20 20:47:21.000000000 -0500
109     @@ -37,6 +37,6 @@
110     'filter' => '.qmail|.ssh|Maildir',
111     // 'quota' => false,
112     'clipboard' => true,
113     - 'attributes' => array('type', 'name', 'download', 'modified', 'size', 'permission', 'owner', 'group')
114     + 'attributes' => array('type', 'name', 'edit', 'download', 'modified', 'size', 'permission', 'owner', 'group')
115     );
116    
117     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/10
118     0LocalSSH mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100Loca
119     lSSH
120     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100LocalSSH 1969-12-31 1
121     8:00:00.000000000 -0600
122     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100LocalSSH2009-03-20 21:04:38.000000000 -0500
123     @@ -0,0 +1,42 @@
124     +//100LocalSSH
125     +// SSH2 Example
126     +// ** For the SSH2 backend to work, you must be using a version of Horde
127     +// ** that contains the SSH2 VFS driver. See the test.php script to determine
128     +// ** whether the SSH2 driver is present on your system.
129     +// $backends['ssh2'] = array(
130     +// 'name' => 'Local SSH2 Server',
131     +// 'driver' => 'ssh2',
132     +// 'preferred' => '',
133     +// 'hordeauth' => true,
134     +// 'params' => array(
135     +// // The hostname/IP Address of the SSH server
136     +// 'hostspec' => 'localhost',
137     +// // The port number of the SSH server
138     +// 'port' => 22,
139     +// // Set timeout (in seconds) for the SSH server. Default: 90 seconds
140     +// // 'timeout' => 90,
141     +// // If true and the POSIX extension is available the driver will map
142     +// // the user and group IDs returned from the SSH server with the local
143     +// // IDs from the local password file. This is useful only if the SSH
144     +// // server is running on localhost or if the local user/group
145     +// // IDs are identical to the remote SSH server.
146     +// // 'maplocalids' => true,
147     +// // The default permissions to set for newly created folders and
148     +// // files.
149     +// // 'permissions' => '750'
150     +// ),
151     +// 'loginparams' => array(
152     +// // Allow the user to change the SSH server
153     +// // 'hostspec' => 'Hostname',
154     +// // Allow the user to change the SSH port
155     +// // 'port' => 'Port'
156     +// ),
157     +// // 'root' => '',
158     +// // 'home' => '',
159     +// // 'createhome' => false,
160     +// // 'filter' => '.qmail|.ssh|Maildir',
161     +// // 'quota' => false,
162     +// 'clipboard' => true,
163     +// 'attributes' => array('type', 'name', 'edit', 'download', 'modified', 'size', 'permission', 'owner', 'group')
164     +// );
165     +
166     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/00head
167     er mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/00header
168     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/00header 2006-03-02 21:53:14.
169     000000000 -0600
170     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/00header 2009
171     -03-20 22:09:40.000000000 -0500
172     @@ -1,4 +1,3 @@
173     //00Header
174     /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
175     -// $Horde: gollem/config/conf.xml,v 1.5.2.2 2005/12/11 18:31:18 slusarz Exp $
176     -
177     +// $Horde: gollem/config/conf.xml,v 1.5.2.3 2008/10/09 20:54:40 jan Exp $ -->
178     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Bac
179     kends mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Backends
180     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Backends 1969-12-31 18:00:00.
181     000000000 -0600
182     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Backends 2009
183     -03-23 23:27:19.000000000 -0500
184     @@ -0,0 +1,3 @@
185     +//100Backends
186     +$conf['backend']['backend_list'] = 'none';
187     +
188     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Dat
189     eFormat mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100DateFormat
190     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100DateFormat 2006-03-01 08:04:57.
191     000000000 -0600
192     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100DateFormat1969-12-31 18:00:00.000000000 -0600
193     @@ -1,3 +0,0 @@
194     -//100DateFormat
195     -$conf['manager']['date_format'] = '%x';
196     -
197     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Bac
198     kends mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Backends
199     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Backends 2006-03-02 21:52:33.
200     000000000 -0600
201     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Backends 1969
202     -12-31 18:00:00.000000000 -0600
203     @@ -1,3 +0,0 @@
204     -//110Backends
205     -$conf['backend']['backend_list'] = 'none';
206     -
207     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Fol
208     derCache mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110FolderCac
209     he
210     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110FolderCache 1969-12-31 18:00:00.
211     000000000 -0600
212     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110FolderCache2009-03-23 23:28:47.000000000 -0500
213     @@ -0,0 +1,4 @@
214     +//110FolderCache
215     +$conf['foldercache']['lifetime'] = 120;
216     +$conf['foldercache']['use_cache'] = true;
217     +
218     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/00Hea
219     der mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/00Header
220     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/00Header 2006-03-01 08:14:06.
221     000000000 -0600
222     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/00Header 2009
223     -03-20 21:43:49.000000000 -0500
224     @@ -1,7 +1,7 @@
225    
226     //00Header
227     /**
228     - * $Horde: gollem/config/prefs.php.dist,v 1.32 2005/06/16 05:47:44 slusarz Exp $
229     + * $Horde: gollem/config/prefs.php.dist,v 1.32.2.1 2008/10/09 20:54:40 jan Exp $
230     *
231     * See horde/config/prefs.php for documentation on the structure of this file.
232     */
233     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/100Di
234     splay mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/100Display
235     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/100Display 2006-03-02 05:59:15.
236     000000000 -0600
237     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/100Display 2009
238     -03-20 21:45:32.000000000 -0500
239     @@ -1,4 +1,4 @@
240     -//10Display
241     +//100Display
242     // Make sure that constants are defined.
243     require_once dirname(__FILE__) . '/../lib/Gollem.php';
244    
245     @@ -7,5 +7,5 @@
246     'label' => _("File Display"),
247     'desc' => _("Change your file sorting options."),
248     'members' => array('show_dotfiles', 'sortdirsfirst', 'columnselect',
249     - 'sortby', 'sortdir'));
250     + 'sortby', 'sortdir', 'perpage'));
251    
252     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/110Se
253     ttings mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/110Settings
254     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/110Settings 2006-03-02 06:16:43.
255     000000000 -0600
256     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/110Settings 2009
257     -03-20 21:46:01.000000000 -0500
258     @@ -3,6 +3,5 @@
259     'column' => _("User Interface"),
260     'label' => _("Settings"),
261     'desc' => _("Change file and folder handling settings."),
262     - 'members' => array('recursive_deletes')
263     -);
264     + 'members' => array('recursive_deletes'));
265    
266     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/175Pe
267     rPage mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/175PerPage
268     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/175PerPage 1969-12-31 18:00:00.
269     000000000 -0600
270     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/175PerPage 2009
271     -03-20 22:03:49.000000000 -0500
272     @@ -0,0 +1,10 @@
273     +//175PerPage
274     +// number of items per page
275     +$_prefs['perpage'] = array(
276     + 'value' => 20,
277     + 'locked' => false,
278     + 'shared' => true,
279     + 'type' => 'number',
280     + 'desc' => _("Items per page")
281     +);
282     +
283     diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/180Re
284     cursiveDeletes mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/180Re
285     cursiveDeletes
286     --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/180RecursiveDeletes 2006-03-02 2
287     2:54:09.000000000 -0600
288     +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/180RecursiveDele
289     tes 2009-03-20 22:04:39.000000000 -0500
290     @@ -1,5 +1,5 @@
291     //180RecursiveDeletes
292     -//user preferred recursive deletes
293     +// user preferred recursive deletes
294     $_prefs['recursive_deletes'] = array(
295     'value' => 'warn',
296     'locked' => false,
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed