diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/00 header mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/00header --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/00header 2009-03-23 23:30:42. 000000000 -0500 +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/00header 2009 -03-20 20:41:30.000000000 -0500 @@ -1,3 +1,94 @@ //00Header -// * $Horde: gollem/config/backends.php.dist,v 1.41.2.7 2006/11/27 03:32:40 slusarz Exp $ +/** + * $Horde: gollem/config/backends.php.dist,v 1.41.2.8 2008/10/09 20:54:40 jan Exp $ + * + * This file is where you specify what backends people using your + * installation of Gollem can log in to. There are a number of properties + * that you can set for each backend: + * + * name: This is the plaintext name that you want displayed if you are using + * the drop down server list. + * + * driver: The VFS (Virtual File System) driver to use to connect. + * Valid options: + * 'file' -- Work with a local file system. + * 'ftp' -- Connect to a FTP server. + * 'smb' -- Connect to a SMB fileshare. + * 'sql' -- Connect to VFS filesystem stored in SQL database. + * 'ssh2' -- Connect to a remote server via SSH2. + * + * preferred: This is only useful if you want to use the same backend.php + * file for different machines: if the hostname of the Gollem + * machine is identical to one of those in the preferred list, + * then the corresponding option in the select box will include + * SELECTED, i.e. it is selected by default. Otherwise the + * first entry in the list is selected. + * + * hordeauth: If this parameter is present and true, then Gollem will attempt + * to use the user's existing credentials (the username/password + * they used to log in to Horde) to log in to this source. If this + * parameter is 'full', the username will be used unmodified; + * otherwise, everything after and including the first @ in the + * username will be stripped before attempting authentication. + * + * params: A parameters array containing any additional information that the + * VFS driver needs. + * + * loginparams: A list of parameters that can be changed by the user on the + * login screen. The key is the parameter name that can be + * changed, the value is the text that will be displayed next to + * the entry box on the login screen. + * + * root: The directory that will be the "top" or "root" directory, being the + * topmost directory where users can change to. This is in addition to + * a vfsroot parameter set in the params array. + * + * home: The directory that will be used as home directory for the user. + * This parameter will overrule a home parameter in the params array. + * If empty, this will default to the active working directory + * immediately after logging into the VFS backend (i.e. for ftp, + * this will most likely be ~user, for SQL based VFS backends, + * this will probably be the root directory). + * + * createhome: If this parameter is set to true, and the home directory does + * not exist, attempt to create the home directory on login. + * + * filter: If set, all files that match the regex will be hidden in the + * folder view. The regex must be in pcre syntax (See + * http://www.php.net/pcre). + * + * quota: If set, turn on VFS quota checking for the backend if it supports + * it. The entry must be in the following format: + * size [metric] + * metric = B (bytes), KB (kilobytes), MB (megabytes), GB (gigabytes) + * If no metric is given, bytes are assumed. + * Examples: "2 MB", "2048 B", "1.5 GB" + * If false or not set, quota support is disabled. + * + * ** For quotas to work, you must be using a version of Horde ** + * ** that contains VFS quota support. ** + * + * clipboard: If set, allows the user to cut/copy/paste files. Since not all + * VFS backends have support for the necessary commands, and there + * is no way to auto-detect which backends do have support, this + * option must be manually set. True enables clipboard support, + * false (the default) disables support. In the examples below, + * clipboard has been enabled in all VFS backends that have + * cut/copy/paste support since the initial release of Horde 3.0. + * For all other backends, you will have to manually check and + * see if your current VFS version/backend supports the necessary + * commands. + * + * attributes: The list of attributes that the driver supports. Available + * attributes: + * 'edit' + * 'download' + * 'group' + * 'modified' + * 'name' + * 'owner' + * 'permission' + * 'size' + * 'type' + */ diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/10 0LocalFtp mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100Loca lFtp --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100LocalFtp 2009-03-23 2 3:30:42.000000000 -0500 +++ 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 @@ -37,6 +37,6 @@ 'filter' => '.qmail|.ssh|Maildir', // 'quota' => false, 'clipboard' => true, - 'attributes' => array('type', 'name', 'download', 'modified', 'size', 'permission', 'owner', 'group') + 'attributes' => array('type', 'name', 'edit', 'download', 'modified', 'size', 'permission', 'owner', 'group') ); diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/10 0LocalSSH mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100Loca lSSH --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/backends.php/100LocalSSH 1969-12-31 1 8:00:00.000000000 -0600 +++ 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 @@ -0,0 +1,42 @@ +//100LocalSSH +// SSH2 Example +// ** For the SSH2 backend to work, you must be using a version of Horde +// ** that contains the SSH2 VFS driver. See the test.php script to determine +// ** whether the SSH2 driver is present on your system. +// $backends['ssh2'] = array( +// 'name' => 'Local SSH2 Server', +// 'driver' => 'ssh2', +// 'preferred' => '', +// 'hordeauth' => true, +// 'params' => array( +// // The hostname/IP Address of the SSH server +// 'hostspec' => 'localhost', +// // The port number of the SSH server +// 'port' => 22, +// // Set timeout (in seconds) for the SSH server. Default: 90 seconds +// // 'timeout' => 90, +// // If true and the POSIX extension is available the driver will map +// // the user and group IDs returned from the SSH server with the local +// // IDs from the local password file. This is useful only if the SSH +// // server is running on localhost or if the local user/group +// // IDs are identical to the remote SSH server. +// // 'maplocalids' => true, +// // The default permissions to set for newly created folders and +// // files. +// // 'permissions' => '750' +// ), +// 'loginparams' => array( +// // Allow the user to change the SSH server +// // 'hostspec' => 'Hostname', +// // Allow the user to change the SSH port +// // 'port' => 'Port' +// ), +// // 'root' => '', +// // 'home' => '', +// // 'createhome' => false, +// // 'filter' => '.qmail|.ssh|Maildir', +// // 'quota' => false, +// 'clipboard' => true, +// 'attributes' => array('type', 'name', 'edit', 'download', 'modified', 'size', 'permission', 'owner', 'group') +// ); + diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/00head er mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/00header --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/00header 2006-03-02 21:53:14. 000000000 -0600 +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/00header 2009 -03-20 22:09:40.000000000 -0500 @@ -1,4 +1,3 @@ //00Header /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */ -// $Horde: gollem/config/conf.xml,v 1.5.2.2 2005/12/11 18:31:18 slusarz Exp $ - +// $Horde: gollem/config/conf.xml,v 1.5.2.3 2008/10/09 20:54:40 jan Exp $ --> diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Bac kends mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Backends --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Backends 1969-12-31 18:00:00. 000000000 -0600 +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Backends 2009 -03-23 23:27:19.000000000 -0500 @@ -0,0 +1,3 @@ +//100Backends +$conf['backend']['backend_list'] = 'none'; + diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100Dat eFormat mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100DateFormat --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/100DateFormat 2006-03-01 08:04:57. 000000000 -0600 +++ 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 @@ -1,3 +0,0 @@ -//100DateFormat -$conf['manager']['date_format'] = '%x'; - diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Bac kends mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Backends --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Backends 2006-03-02 21:52:33. 000000000 -0600 +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Backends 1969 -12-31 18:00:00.000000000 -0600 @@ -1,3 +0,0 @@ -//110Backends -$conf['backend']['backend_list'] = 'none'; - diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110Fol derCache mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110FolderCac he --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/conf.php/110FolderCache 1969-12-31 18:00:00. 000000000 -0600 +++ 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 @@ -0,0 +1,4 @@ +//110FolderCache +$conf['foldercache']['lifetime'] = 120; +$conf['foldercache']['use_cache'] = true; + diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/00Hea der mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/00Header --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/00Header 2006-03-01 08:14:06. 000000000 -0600 +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/00Header 2009 -03-20 21:43:49.000000000 -0500 @@ -1,7 +1,7 @@ //00Header /** - * $Horde: gollem/config/prefs.php.dist,v 1.32 2005/06/16 05:47:44 slusarz Exp $ + * $Horde: gollem/config/prefs.php.dist,v 1.32.2.1 2008/10/09 20:54:40 jan Exp $ * * See horde/config/prefs.php for documentation on the structure of this file. */ diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/100Di splay mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/100Display --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/100Display 2006-03-02 05:59:15. 000000000 -0600 +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/100Display 2009 -03-20 21:45:32.000000000 -0500 @@ -1,4 +1,4 @@ -//10Display +//100Display // Make sure that constants are defined. require_once dirname(__FILE__) . '/../lib/Gollem.php'; @@ -7,5 +7,5 @@ 'label' => _("File Display"), 'desc' => _("Change your file sorting options."), 'members' => array('show_dotfiles', 'sortdirsfirst', 'columnselect', - 'sortby', 'sortdir')); + 'sortby', 'sortdir', 'perpage')); diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/110Se ttings mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/110Settings --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/110Settings 2006-03-02 06:16:43. 000000000 -0600 +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/110Settings 2009 -03-20 21:46:01.000000000 -0500 @@ -3,6 +3,5 @@ 'column' => _("User Interface"), 'label' => _("Settings"), 'desc' => _("Change file and folder handling settings."), - 'members' => array('recursive_deletes') -); + 'members' => array('recursive_deletes')); diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/175Pe rPage mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/175PerPage --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/175PerPage 1969-12-31 18:00:00. 000000000 -0600 +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/175PerPage 2009 -03-20 22:03:49.000000000 -0500 @@ -0,0 +1,10 @@ +//175PerPage +// number of items per page +$_prefs['perpage'] = array( + 'value' => 20, + 'locked' => false, + 'shared' => true, + 'type' => 'number', + 'desc' => _("Items per page") +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/180Re cursiveDeletes mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/180Re cursiveDeletes --- smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/180RecursiveDeletes 2006-03-02 2 2:54:09.000000000 -0600 +++ mezzanine_patched_smeserver-gollem-1.0/root/etc/e-smith/templates/home/httpd/html/horde/gollem/config/prefs.php/180RecursiveDele tes 2009-03-20 22:04:39.000000000 -0500 @@ -1,5 +1,5 @@ //180RecursiveDeletes -//user preferred recursive deletes +// user preferred recursive deletes $_prefs['recursive_deletes'] = array( 'value' => 'warn', 'locked' => false,