No OneTemporary
Actions

Size

34 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
	index 3ea62e115..bb036d6b3 100644
	--- a/config/main.inc.php.dist
	+++ b/config/main.inc.php.dist
	@@ -1,414 +1,416 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| Main configuration file \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	+-----------------------------------------------------------------------+

	*/

	$rcmail_config = array();


	// system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace
	$rcmail_config['debug_level'] = 1;

	// log driver: 'syslog' or 'file'.
	$rcmail_config['log_driver'] = 'file';

	// Syslog ident string to use, if using the 'syslog' log driver.
	$rcmail_config['syslog_id'] = 'roundcube';

	// Syslog facility to use, if using the 'syslog' log driver.
	// For possible values see installer or http://php.net/manual/en/function.openlog.php
	$rcmail_config['syslog_facility'] = LOG_USER;

	// use this folder to store log files (must be writeable for apache user)
	// This is used by the 'file' log driver.
	$rcmail_config['log_dir'] = 'logs/';

	// use this folder to store temp files (must be writeable for apache user)
	$rcmail_config['temp_dir'] = 'temp/';

	// enable caching of messages and mailbox data in the local database.
	// this is recommended if the IMAP server does not run on the same machine
	$rcmail_config['enable_caching'] = TRUE;

	// lifetime of message cache
	// possible units: s, m, h, d, w
	$rcmail_config['message_cache_lifetime'] = '10d';

	// automatically create a new RoundCube user when log-in the first time.
	// a new user will be created once the IMAP login succeeds.
	// set to false if only registered users can use this service
	$rcmail_config['auto_create_user'] = TRUE;

	// the mail host chosen to perform the log-in
	// leave blank to show a textbox at login, give a list of hosts
	// to display a pulldown menu or set one host as string.
	// To use SSL connection, enter ssl://hostname:993
	$rcmail_config['default_host'] = '';

	// TCP port used for IMAP connections
	$rcmail_config['default_port'] = 143;

	// IMAP auth type. Can be "auth" (CRAM-MD5), "plain" (PLAIN) or "check" to auto detect.
	// Optional, defaults to "check"
	$rcmail_config['imap_auth_type'] = null;

	// If you know your imap's root directory and its folder delimiter,
	// you can specify them here. Otherwise they will be determined automatically.
	$rcmail_config['imap_root'] = null;
	$rcmail_config['imap_delimiter'] = null;

	// Automatically add this domain to user names for login
	// Only for IMAP servers that require full e-mail addresses for login
	// Specify an array with 'host' => 'domain' values to support multiple hosts
	$rcmail_config['username_domain'] = '';

	// This domain will be used to form e-mail addresses of new users
	// Specify an array with 'host' => 'domain' values to support multiple hosts
	$rcmail_config['mail_domain'] = '';

	// Path to a virtuser table file to resolve user names and e-mail addresses
	$rcmail_config['virtuser_file'] = '';

	// Query to resolve user names and e-mail addresses from the database
	// %u will be replaced with the current username for login.
	// The query should select the user's e-mail address as first col
	$rcmail_config['virtuser_query'] = '';

	// use this host for sending mails.
	// to use SSL connection, set ssl://smtp.host.com
	// if left blank, the PHP mail() function is used
	$rcmail_config['smtp_server'] = '';

	// SMTP port (default is 25; 465 for SSL)
	$rcmail_config['smtp_port'] = 25;

	// SMTP username (if required) if you use %u as the username RoundCube
	// will use the current username for login
	$rcmail_config['smtp_user'] = '';

	// SMTP password (if required) if you use %p as the password RoundCube
	// will use the current user's password for login
	$rcmail_config['smtp_pass'] = '';

	// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
	// best server supported one)
	$rcmail_config['smtp_auth_type'] = '';

	// SMTP HELO host
	// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages
	// Leave this blank and you will get the server variable 'server_name' or
	// localhost if that isn't defined.
	$rcmail_config['smtp_helo_host'] = '';

	// Log sent messages
	$rcmail_config['smtp_log'] = TRUE;

	// How many seconds must pass between emails sent by a user
	$rcmail_config['sendmail_delay'] = 0;

	// These cols are shown in the message list. Available cols are:
	// subject, from, to, cc, replyto, date, size, flag, attachment
	$rcmail_config['list_cols'] = array('subject', 'from', 'date', 'size', 'flag', 'attachment');

	// Includes should be interpreted as PHP files
	$rcmail_config['skin_include_php'] = FALSE;

	// Session lifetime in minutes
	// must be greater than 'keep_alive'/60
	$rcmail_config['session_lifetime'] = 10;

	// check client IP in session athorization
	$rcmail_config['ip_check'] = false;

	// Use an additional frequently changing cookie to athenticate user sessions.
	// There have been problems reported with this feature.
	$rcmail_config['double_auth'] = false;

	// this key is used to encrypt the users imap password which is stored
	// in the session record (and the client cookie if remember password is enabled).
	// please provide a string of exactly 24 chars.
	$rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str';

	// the default locale setting (leave empty for auto-detection)
	// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR
	$rcmail_config['language'] = null;

	// use this format for short date display
	$rcmail_config['date_short'] = 'D H:i';

	// use this format for detailed date/time formatting
	$rcmail_config['date_long'] = 'd.m.Y H:i';

	// use this format for today's date display
	$rcmail_config['date_today'] = 'H:i';

	// add this user-agent to message headers when sending
	$rcmail_config['useragent'] = 'RoundCube Webmail/0.2-beta';

	// use this name to compose page titles
	$rcmail_config['product_name'] = 'RoundCube Webmail';

	// store draft message is this mailbox
	// leave blank if draft messages should not be stored
	$rcmail_config['drafts_mbox'] = 'Drafts';

	// store spam messages in this mailbox
	$rcmail_config['junk_mbox'] = 'Junk';

	// store sent message is this mailbox
	// leave blank if sent messages should not be stored
	$rcmail_config['sent_mbox'] = 'Sent';

	// move messages to this folder when deleting them
	// leave blank if they should be deleted directly
	$rcmail_config['trash_mbox'] = 'Trash';

	// display these folders separately in the mailbox list.
	// these folders will also be displayed with localized names
	$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');

	// automatically create the above listed default folders on login
	$rcmail_config['create_default_folders'] = FALSE;

	// protect the default folders from renames, deletes, and subscription changes
	$rcmail_config['protect_default_folders'] = TRUE;

	// if in your system 0 quota means no limit set this option to TRUE
	$rcmail_config['quota_zero_as_unlimited'] = FALSE;

	// Behavior if a received message requests a message delivery notification (read receipt)
	// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask)
	$rcmail_config['mdn_requests'] = 0;

	// Use this charset as fallback for message decoding
	$rcmail_config['default_charset'] = 'ISO-8859-1';

	// Make use of the built-in spell checker. It is based on GoogieSpell.
	// Since Google only accepts connections over https your PHP installatation
	// requires to be compiled with Open SSL support
	$rcmail_config['enable_spellcheck'] = TRUE;

	// Set the spell checking engine. 'googie' is the default. 'pspell' is also available,
	// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here.
	$rcmail_config['spellcheck_engine'] = 'googie';

	// For a locally installed Nox Spell Server, please specify the URI to call it.
	// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72
	// Leave empty to use the Google spell checking service, what means
	// that the message content will be sent to Google in order to check spelling
	$rcmail_config['spellcheck_uri'] = '';

	// These languages can be selected for spell checking.
	// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch');
	// Leave empty for default set of Google spell check languages, should be defined
	// when using local Pspell extension
	$rcmail_config['spellcheck_languages'] = NULL;

	// path to a text file which will be added to each sent message
	// paths are relative to the RoundCube root folder
	$rcmail_config['generic_message_footer'] = '';

	// add a received header to outgoing mails containing the creators IP and hostname
	$rcmail_config['http_received_header'] = false;

	// this string is used as a delimiter for message headers when sending
	// leave empty for auto-detection
	$rcmail_config['mail_header_delimiter'] = NULL;

	// session domain: .example.org
	$rcmail_config['session_domain'] = '';

	// This indicates which type of address book to use. Possible choises:
	// 'sql' (default) and 'ldap'.
	// If set to 'ldap' then it will look at using the first writable LDAP
	// address book as the primary address book and it will not display the
	// SQL address book in the 'Address Book' view.
	$rcmail_config['address_book_type'] = 'sql';

	// In order to enable public ldap search, configure an array like the Verisign
	// example further below. if you would like to test, simply uncomment the example.
	+$rcmail_config['ldap_public'] = array();
	+
	//
	// If you are going to use LDAP for individual address books, you will need to
	// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it.
	//
	// The recommended directory structure for LDAP is to store all the address book entries
	// under the users main entry, e.g.:
	//
	// o=root
	// ou=people
	// uid=user@domain
	// mail=contact@contactdomain
	//
	// So the base_dn would be uid=%fu,ou=people,o=root
	// The bind_dn would be the same as based_dn or some super user login.
	/**
	* example config for Verisign directory
	*
	* $rcmail_config['ldap_public']['Verisign'] = array(
	* 'name' => 'Verisign.com',
	* 'hosts' => array('directory.verisign.com'),
	* 'port' => 389,
	* 'use_tls' => false,
	* 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
	* // %fu - The full username provided, assumes the username is an email
	* // address, uses the username_domain value if not an email address.
	* // %u - The username prior to the '@'.
	* // %d - The domain name after the '@'.
	* 'base_dn' => '',
	* 'bind_dn' => '',
	* 'bind_pass' => '',
	* 'writable' => false, // Indicates if we can write to the LDAP directory or not.
	* // If writable is true then these fields need to be populated:
	* // LDAP_Object_Classes, required_fields, LDAP_rdn
	* 'LDAP_Object_Classes' => array("top", "inetOrgPerson"), // To create a new contact these are the object classes to specify (or any other classes you wish to use).
	* 'required_fields' => array("cn", "sn", "mail"), // The required fields needed to build a new contact as required by the object classes (can include additional fields not required by the object classes).
	* 'LDAP_rdn' => 'mail', // The RDN field that is used for new entries, this field needs to be one of the search_fields, the base of base_dn is appended to the RDN to insert into the LDAP directory.
	* 'ldap_version' => 3, // using LDAPv3
	* 'search_fields' => array('mail', 'cn'), // fields to search in
	* 'name_field' => 'cn', // this field represents the contact's name
	* 'email_field' => 'mail', // this field represents the contact's e-mail
	* 'surname_field' => 'sn', // this field represents the contact's last name
	* 'firstname_field' => 'gn', // this field represents the contact's first name
	* 'sort' => 'cn', // The field to sort the listing by.
	* 'scope' => 'sub', // search mode: sub\|base\|list
	* 'filter' => '', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
	* 'fuzzy_search' => true); // server allows wildcard search
	*/

	// An ordered array of the ids of the addressbooks that should be searched
	// when populating address autocomplete fields server-side. ex: array('sql','Verisign');
	$rcmail_config['autocomplete_addressbooks'] = array('sql');

	// don't allow these settings to be overriden by the user
	$rcmail_config['dont_override'] = array();

	// Set identities access level:
	// 0 - many identities with possibility to edit all params
	// 1 - many identities with possibility to edit all params but not email address
	// 2 - one identity with possibility to edit all params
	// 3 - one identity with possibility to edit all params but not email address
	$rcmail_config['identities_level'] = 0;

	// try to load host-specific configuration
	// see http://trac.roundcube.net/wiki/Howto_Config for more details
	$rcmail_config['include_host_config'] = false;

	// don't let users set pagesize to more than this value if set
	$rcmail_config['max_pagesize'] = 200;

	// mime magic database
	$rcmail_config['mime_magic'] = '/usr/share/misc/magic';

	// default sort col
	$rcmail_config['message_sort_col'] = 'date';

	// default sort order
	$rcmail_config['message_sort_order'] = 'DESC';

	// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA.
	// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
	$rcmail_config['enable_installer'] = false;

	// Log successful logins
	$rcmail_config['log_logins'] = false;

	/**
	* 'Delete always'
	* This setting reflects if mail should be always marked as deleted,
	* even if moving to "Trash" fails. This is necessary in some setups
	* because a) people may not have a Trash folder or b) they are over
	* quota (and Trash is included in the quota).
	*
	* This is a failover setting for iil_C_Move when a message is moved
	* to the Trash.
	*/
	$rcmail_config['delete_always'] = false;

	// Minimal value of user's 'keep_alive' setting (in seconds)
	// Must be less than 'session_lifetime'
	$rcmail_config['min_keep_alive'] = 60;

	/*** these settings can be overwritten by user's preferences ***/

	// skin name: folder from skins/
	$rcmail_config['skin'] = 'default';

	// show up to X items in list view
	$rcmail_config['pagesize'] = 40;

	// use this timezone to display date/time
	$rcmail_config['timezone'] = 'auto';

	// is daylight saving On?
	$rcmail_config['dst_active'] = (bool)date('I');

	// prefer displaying HTML messages
	$rcmail_config['prefer_html'] = TRUE;

	// display remote inline images
	// 0 - Never, always ask
	// 1 - Ask if sender is not in address book
	// 2 - Always show inline images
	$rcmail_config['show_images'] = 0;

	// compose html formatted messages by default
	$rcmail_config['htmleditor'] = FALSE;

	// show pretty dates as standard
	$rcmail_config['prettydate'] = TRUE;

	// save compose message every 300 seconds (5min)
	$rcmail_config['draft_autosave'] = 300;

	// default setting if preview pane is enabled
	$rcmail_config['preview_pane'] = FALSE;

	// focus new window if new message arrives
	$rcmail_config['focus_on_new_message'] = true;

	// Clear Trash on logout
	$rcmail_config['logout_purge'] = FALSE;

	// Compact INBOX on logout
	$rcmail_config['logout_expunge'] = FALSE;

	// Display attached images below the message body
	$rcmail_config['inline_images'] = TRUE;

	// Encoding of long/non-ascii attachment names:
	// 0 - Full RFC 2231 compatible
	// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default)
	// 2 - Full 2047 compatible
	$rcmail_config['mime_param_folding'] = 0;

	// Set TRUE if deleted messages should not be displayed
	// This will make the application run slower
	$rcmail_config['skip_deleted'] = FALSE;

	// Set true to Mark deleted messages as read as well as deleted
	// False means that a message's read status is not affected by marking it as deleted
	$rcmail_config['read_when_deleted'] = TRUE;

	// When a Trash folder is not present and a message is deleted, flag
	// the message for deletion rather than deleting it immediately. Setting this to
	// false causes deleted messages to be permanantly removed if there is no Trash folder
	$rcmail_config['flag_for_deletion'] = FALSE;

	// Default interval for keep-alive/check-recent requests (in seconds)
	// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime'
	$rcmail_config['keep_alive'] = 60;

	// If true all folders will be checked for recent messages
	$rcmail_config['check_all_folders'] = FALSE;

	// end of config file
	?>
	diff --git a/installer/rcube_install.php b/installer/rcube_install.php
	index 4bef17eb2..96134d2b9 100644
	--- a/installer/rcube_install.php
	+++ b/installer/rcube_install.php
	@@ -1,541 +1,593 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| rcube_install.php \|
	\| \|
	\| This file is part of the RoundCube Webmail package \|
	\| Copyright (C) 2008, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU Public License \|
	+-----------------------------------------------------------------------+

	$Id: $

	*/


	/**
	* Class to control the installation process of the RoundCube Webmail package
	*
	* @category Install
	* @package RoundCube
	* @author Thomas Bruederli
	*/
	class rcube_install
	{
	var $step;
	var $is_post = false;
	var $failures = 0;
	var $config = array();
	var $configured = false;
	var $last_error = null;
	var $email_pattern = '([a-z0-9][a-z0-9\-\.\+\_]@[a-z0-9]([a-z0-9\-][.]?)[a-z0-9])';
	var $bool_config_props = array();

	var $obsolete_config = array('db_backend');
	var $replaced_config = array(
	'skin_path' => 'skin',
	'locale_string' => 'language',
	'multiple_identities' => 'identities_level',
	'addrbook_show_images' => 'show_images',
	);

	// these config options are optional or can be set to null
	var $optional_config = array(
	'log_driver', 'syslog_id', 'syslog_facility', 'imap_auth_type',
	- 'smtp_helo_host', 'sendmail_delay', 'double_auth', 'language',
	- 'mail_header_delimiter', 'create_default_folders',
	+ 'smtp_helo_host', 'smtp_auth_type', 'sendmail_delay', 'double_auth',
	+ 'language', 'mail_header_delimiter', 'create_default_folders',
	'quota_zero_as_unlimited', 'spellcheck_uri', 'spellcheck_languages',
	'http_received_header', 'session_domain', 'mime_magic', 'log_logins',
	- 'enable_installer', 'skin_include_php');
	+ 'enable_installer', 'skin_include_php', 'imap_root', 'imap_delimiter',
	+ 'virtuser_file', 'virtuser_query', 'dont_override');

	/**
	* Constructor
	*/
	function rcube_install()
	{
	$this->step = intval($_REQUEST['_step']);
	$this->is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
	}

	/**
	* Singleton getter
	*/
	function get_instance()
	{
	static $inst;

	if (!$inst)
	$inst = new rcube_install();

	return $inst;
	}

	/**
	* Read the default config files and store properties
	*/
	function load_defaults()
	{
	$this->_load_config('.php.dist');
	}


	/**
	* Read the local config files and store properties
	*/
	function load_config()
	{
	$this->config = array();
	$this->_load_config('.php');
	$this->configured = !empty($this->config);
	}

	/**
	* Read the default config file and store properties
	* @access private
	*/
	function _load_config($suffix)
	{
	@include RCMAIL_CONFIG_DIR . '/main.inc' . $suffix;
	if (is_array($rcmail_config)) {
	$this->config += $rcmail_config;
	}

	@include RCMAIL_CONFIG_DIR . '/db.inc'. $suffix;
	if (is_array($rcmail_config)) {
	$this->config += $rcmail_config;
	}
	}


	/**
	* Getter for a certain config property
	*
	* @param string Property name
	* @param string Default value
	* @return string The property value
	*/
	function getprop($name, $default = '')
	{
	$value = $this->config[$name];

	if ($name == 'des_key' && !$this->configured && !isset($_REQUEST["_$name"]))
	$value = rcube_install::random_key(24);

	return $value !== null && $value !== '' ? $value : $default;
	}


	/**
	* Take the default config file and replace the parameters
	* with the submitted form data
	*
	* @param string Which config file (either 'main' or 'db')
	* @return string The complete config file content
	*/
	function create_config($which, $force = false)
	{
	$out = file_get_contents(RCMAIL_CONFIG_DIR . "/{$which}.inc.php.dist");

	if (!$out)
	return '[Warning: could not read the template file]';

	foreach ($this->config as $prop => $default) {
	$value = (isset($_POST["_$prop"]) \|\| $this->bool_config_props[$prop]) ? $_POST["_$prop"] : $default;

	// convert some form data
	if ($prop == 'debug_level') {
	$val = 0;
	if (is_array($value))
	foreach ($value as $dbgval)
	$val += intval($dbgval);
	$value = $val;
	}
	else if ($which == 'db' && $prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
	if ($_POST['_dbtype'] == 'sqlite')
	$value = sprintf('%s://%s?mode=0646', $_POST['_dbtype'], $_POST['_dbname']{0} == '/' ? '/' . $_POST['_dbname'] : $_POST['_dbname']);
	else
	$value = sprintf('%s://%s:%s@%s/%s', $_POST['_dbtype'],
	rawurlencode($_POST['_dbuser']), rawurlencode($_POST['_dbpass']), $_POST['_dbhost'], $_POST['_dbname']);
	}
	else if ($prop == 'smtp_auth_type' && $value == '0') {
	$value = '';
	}
	else if ($prop == 'default_host' && is_array($value)) {
	$value = rcube_install::_clean_array($value);
	if (count($value) <= 1)
	$value = $value[0];
	}
	else if ($prop == 'pagesize') {
	$value = max(2, intval($value));
	}
	else if ($prop == 'smtp_user' && !empty($_POST['_smtp_user_u'])) {
	$value = '%u';
	}
	else if ($prop == 'smtp_pass' && !empty($_POST['_smtp_user_u'])) {
	$value = '%p';
	}
	else if (is_bool($default)) {
	$value = (bool)$value;
	}
	else if (is_numeric($value)) {
	$value = intval($value);
	}

	// skip this property
	if (!$force && ($value == $default))
	continue;

	// save change
	$this->config[$prop] = $value;

	// replace the matching line in config file
	$out = preg_replace(
	'/(\$rcmail_config\[\''.preg_quote($prop).'\'\])\s+=\s+(.+);/Uie',
	- "'\\1 = ' . var_export(\$value, true) . ';'",
	+ "'\\1 = ' . rcube_install::_dump_var(\$value) . ';'",
	$out);
	}

	return trim($out);
	}


	/**
	* Check the current configuration for missing properties
	* and deprecated or obsolete settings
	*
	* @return array List with problems detected
	*/
	function check_config()
	{
	$this->config = array();
	$this->load_defaults();
	$defaults = $this->config;

	$this->load_config();
	if (!$this->configured)
	return null;

	$out = $seen = array();
	$optional = array_flip($this->optional_config);

	// iterate over the current configuration
	foreach ($this->config as $prop => $value) {
	if ($replacement = $this->replaced_config[$prop]) {
	$out['replaced'][] = array('prop' => $prop, 'replacement' => $replacement);
	$seen[$replacement] = true;
	}
	else if (!$seen[$prop] && in_array($prop, $this->obsolete_config)) {
	$out['obsolete'][] = array('prop' => $prop);
	$seen[$prop] = true;
	}
	}

	// iterate over default config
	foreach ($defaults as $prop => $value) {
	if (!$seen[$prop] && !isset($this->config[$prop]) && !isset($optional[$prop]))
	$out['missing'][] = array('prop' => $prop);
	}

	// check config dependencies and contradictions
	if ($this->config['enable_spellcheck'] && $this->config['spellcheck_engine'] == 'pspell') {
	if (!extension_loaded('pspell')) {
	$out['dependencies'][] = array('prop' => 'spellcheck_engine',
	'explain' => 'This requires the <tt>pspell</tt> extension which could not be loaded.');
	}
	if (empty($this->config['spellcheck_languages'])) {
	$out['dependencies'][] = array('prop' => 'spellcheck_languages',
	'explain' => 'You should specify the list of languages supported by your local pspell installation.');
	}
	}

	if ($this->config['log_driver'] == 'syslog') {
	if (!function_exists('openlog')) {
	$out['dependencies'][] = array('prop' => 'log_driver',
	'explain' => 'This requires the <tt>sylog</tt> extension which could not be loaded.');
	}
	if (empty($this->config['syslog_id'])) {
	$out['dependencies'][] = array('prop' => 'syslog_id',
	'explain' => 'Using <tt>syslog</tt> for logging requires a syslog ID to be configured');
	}
	-
	+ }
	+
	+ // check ldap_public sources having global_search enabled
	+ if (is_array($this->config['ldap_public']) && !is_array($this->config['autocomplete_addressbooks'])) {
	+ foreach ($this->config['ldap_public'] as $ldap_public) {
	+ if ($ldap_public['global_search']) {
	+ $out['replaced'][] = array('prop' => 'ldap_public::global_search', 'replacement' => 'autocomplete_addressbooks');
	+ break;
	+ }
	+ }
	}

	return $out;
	}


	/**
	* Merge the current configuration with the defaults
	* and copy replaced values to the new options.
	*/
	function merge_config()
	{
	$current = $this->config;
	$this->config = array();
	$this->load_defaults();

	foreach ($this->replaced_config as $prop => $replacement)
	if (isset($current[$prop])) {
	if ($prop == 'skin_path')
	$this->config[$replacement] = preg_replace('#skins/(\w+)/?$#', '\\1', $current[$prop]);
	else if ($prop == 'multiple_identities')
	$this->config[$replacement] = $current[$prop] ? 2 : 0;
	else
	$this->config[$replacement] = $current[$prop];

	unset($current[$prop]);
	}

	foreach ($this->obsolete_config as $prop) {
	unset($current[$prop]);
	}

	- $this->config = array_merge($current, $this->config);
	+ // add all ldap_public sources having global_search enabled to autocomplete_addressbooks
	+ if (is_array($current['ldap_public'])) {
	+ foreach ($current['ldap_public'] as $key => $ldap_public) {
	+ if ($ldap_public['global_search']) {
	+ $this->config['autocomplete_addressbooks'][] = $key;
	+ unset($current['ldap_public'][$key]['global_search']);
	+ }
	+ }
	+ }
	+
	+ $this->config = array_merge($this->config, $current);
	+
	+ foreach ((array)$current['ldap_public'] as $key => $values) {
	+ $this->config['ldap_public'][$key] = $current['ldap_public'][$key];
	+ }
	}


	/**
	* Compare the local database schema with the reference schema
	* required for this version of RoundCube
	*
	* @param boolean True if the schema schould be updated
	* @return boolean True if the schema is up-to-date, false if not or an error occured
	*/
	function db_schema_check($update = false)
	{
	if (!$this->configured)
	return false;

	$options = array(
	'use_transactions' => false,
	'log_line_break' => "\n",
	'idxname_format' => '%s',
	'debug' => false,
	'quote_identifier' => true,
	'force_defaults' => false,
	'portability' => true
	);

	$schema =& MDB2_Schema::factory($this->config['db_dsnw'], $options);
	$schema->db->supported['transactions'] = false;

	if (PEAR::isError($schema)) {
	$this->raise_error(array('code' => $schema->getCode(), 'message' => $schema->getMessage() . ' ' . $schema->getUserInfo()));
	return false;
	}
	else {
	$definition = $schema->getDefinitionFromDatabase();
	$definition['charset'] = 'utf8';

	if (PEAR::isError($definition)) {
	$this->raise_error(array('code' => $definition->getCode(), 'message' => $definition->getMessage() . ' ' . $definition->getUserInfo()));
	return false;
	}

	// load reference schema
	$dsn = MDB2::parseDSN($this->config['db_dsnw']);
	$ref_schema = INSTALL_PATH . 'SQL/' . $dsn['phptype'] . '.schema.xml';

	if (is_file($ref_schema)) {
	$reference = $schema->parseDatabaseDefinition($ref_schema, false, array(), $schema->options['fail_on_invalid_names']);

	if (PEAR::isError($reference)) {
	$this->raise_error(array('code' => $reference->getCode(), 'message' => $reference->getMessage() . ' ' . $reference->getUserInfo()));
	}
	else {
	$diff = $schema->compareDefinitions($reference, $definition);

	if (empty($diff)) {
	return true;
	}
	else if ($update) {
	// update database schema with the diff from the above check
	$success = $schema->alterDatabase($reference, $definition, $diff);

	if (PEAR::isError($success)) {
	$this->raise_error(array('code' => $success->getCode(), 'message' => $success->getMessage() . ' ' . $success->getUserInfo()));
	}
	else
	return true;
	}
	echo '<pre>'; var_dump($diff); echo '</pre>';
	return false;
	}
	}
	else
	$this->raise_error(array('message' => "Could not find reference schema file ($ref_schema)"));
	return false;
	}

	return false;
	}


	/**
	* Getter for the last error message
	*
	* @return string Error message or null if none exists
	*/
	function get_error()
	{
	return $this->last_error['message'];
	}


	/**
	* Return a list with all imap hosts configured
	*
	* @return array Clean list with imap hosts
	*/
	function get_hostlist()
	{
	$default_hosts = (array)$this->getprop('default_host');
	$out = array();

	foreach ($default_hosts as $key => $name) {
	if (!empty($name))
	$out[] = is_numeric($key) ? $name : $key;
	}

	return $out;
	}


	/**
	* Display OK status
	*
	* @param string Test name
	* @param string Confirm message
	*/
	function pass($name, $message = '')
	{
	echo Q($name) . ':  <span class="success">OK</span>';
	$this->_showhint($message);
	}


	/**
	* Display an error status and increase failure count
	*
	* @param string Test name
	* @param string Error message
	* @param string URL for details
	*/
	function fail($name, $message = '', $url = '')
	{
	$this->failures++;

	echo Q($name) . ':  <span class="fail">NOT OK</span>';
	$this->_showhint($message, $url);
	}


	/**
	* Display warning status
	*
	* @param string Test name
	* @param string Warning message
	* @param string URL for details
	*/
	function na($name, $message = '', $url = '')
	{
	echo Q($name) . ':  <span class="na">NOT AVAILABLE</span>';
	$this->_showhint($message, $url);
	}


	function _showhint($message, $url = '')
	{
	$hint = Q($message);

	if ($url)
	$hint .= ($hint ? '; ' : '') . 'See <a href="' . Q($url) . '" target="_blank">' . Q($url) . '</a>';

	if ($hint)
	echo '<span class="indent">(' . $hint . ')</span>';
	}


	- function _clean_array($arr)
	+ static function _clean_array($arr)
	{
	$out = array();

	- foreach (array_unique($arr) as $i => $val)
	- if (!empty($val))
	- $out[] = $val;
	+ foreach (array_unique($arr) as $k => $val) {
	+ if (!empty($val)) {
	+ if (is_numeric($k))
	+ $out[] = $val;
	+ else
	+ $out[$k] = $val;
	+ }
	+ }

	return $out;
	}


	+ static function _dump_var($var) {
	+ if (is_array($var)) {
	+ if (empty($var)) {
	+ return 'array()';
	+ }
	+ else { // check if all keys are numeric
	+ $isnum = true;
	+ foreach ($var as $key => $value) {
	+ if (!is_numeric($key)) {
	+ $isnum = false;
	+ break;
	+ }
	+ }
	+
	+ if ($isnum)
	+ return 'array(' . join(', ', array_map(array('rcube_install', '_dump_var'), $var)) . ')';
	+ }
	+ }
	+
	+ return var_export($var, true);
	+ }
	+
	+
	/**
	* Initialize the database with the according schema
	*
	* @param object rcube_db Database connection
	* @return boolen True on success, False on error
	*/
	function init_db($DB)
	{
	$db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql');
	$engine = isset($db_map[$DB->db_provider]) ? $db_map[$DB->db_provider] : $DB->db_provider;

	// read schema file from /SQL/*
	$fname = "../SQL/$engine.initial.sql";
	if ($lines = @file($fname, FILE_SKIP_EMPTY_LINES)) {
	$buff = '';
	foreach ($lines as $i => $line) {
	if (eregi('^--', $line))
	continue;

	$buff .= $line . "\n";
	if (eregi(';$', trim($line))) {
	$DB->query($buff);
	$buff = '';
	if ($this->get_error())
	break;
	}
	}
	}
	else {
	$this->fail('DB Schema', "Cannot read the schema file: $fname");
	return false;
	}

	if ($err = $this->get_error()) {
	$this->fail('DB Schema', "Error creating database schema: $err");
	return false;
	}

	return true;
	}

	/**
	* Handler for RoundCube errors
	*/
	function raise_error($p)
	{
	$this->last_error = $p;
	}


	/**
	* Generarte a ramdom string to be used as encryption key
	*
	* @param int Key length
	* @return string The generated random string
	* @static
	*/
	function random_key($length)
	{
	$alpha = 'ABCDEFGHIJKLMNOPQERSTUVXYZabcdefghijklmnopqrtsuvwxyz0123456789+*%&?!$-_=';
	$out = '';

	for ($i=0; $i < $length; $i++)
	$out .= $alpha{rand(0, strlen($alpha)-1)};

	return $out;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 12:36 PM (54 m, 57 s)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166980
Default Alt Text: (34 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions