githubFork/roundcubemail.git

			@@ -29,7 +29,6 @@
			var $config = array();
			var $configured = false;
			var $last_error = null;
			var $db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql', 'sqlsrv' => 'mssql');
			var $email_pattern = '([a-z0-9][a-z0-9\-\.\+\_]@[a-z0-9]([a-z0-9\-][.]?)[a-z0-9])';
			var $bool_config_props = array();

			@@ -47,8 +46,7 @@

			// these config options are required for a working system
			var $required_config = array(
			'db_dsnw', 'db_table_contactgroups', 'db_table_contactgroupmembers',
			'des_key', 'session_lifetime', 'support_url',
			'db_dsnw', 'des_key', 'session_lifetime',
			);

			// list of supported database drivers
			@@ -65,7 +63,7 @@
			/**
			* Constructor
			*/
			function rcube_install()
			function __construct()
			{
			$this->step = intval($_REQUEST['_step']);
			$this->is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
			@@ -74,7 +72,7 @@
			/**
			* Singleton getter
			*/
			function get_instance()
			static function get_instance()
			{
			static $inst;

			@@ -259,6 +257,11 @@
			$out['obsolete'][] = array('prop' => $prop);
			$seen[$prop] = true;
			}
			}

			// the old default mime_magic reference is obsolete
			if ($this->config['mime_magic'] == '/usr/share/misc/magic') {
			$out['obsolete'][] = array('prop' => 'mime_magic', 'explain' => "Set value to null in order to use system default");
			}

			// iterate over default config
			@@ -448,11 +451,11 @@
			'0.2-alpha', '0.2-beta', '0.2-stable',
			'0.3-stable', '0.3.1',
			'0.4-beta', '0.4.2',
			'0.5-beta', '0.5', '0.5.1',
			'0.5-beta', '0.5', '0.5.1', '0.5.2', '0.5.3', '0.5.4',
			'0.6-beta', '0.6',
			'0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3',
			'0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4',
			'0.9-beta',
			'0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3', '0.7.4',
			'0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6',
			'0.9-beta', '0.9-rc', '0.9-rc2',
			));
			return $select;
			}
			@@ -604,7 +607,7 @@
			*/
			function init_db($DB)
			{
			$engine = isset($this->db_map[$DB->db_provider]) ? $this->db_map[$DB->db_provider] : $DB->db_provider;
			$engine = $DB->db_provider;

			// read schema file from /SQL/*
			$fname = INSTALL_PATH . "SQL/$engine.initial.sql";
			@@ -634,7 +637,7 @@
			*/
			function update_db($version)
			{
			system(INSTALL_PATH . "bin/updatedb.sh --label=roundcube --version=" . $version
			system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $version
			. " --dir=" . INSTALL_PATH . "SQL", $result);

			return !$result;