diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-04-03 17:52:18 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-06-29 21:15:05 +0200 |
| commit | 6831b78597ae38ed03343e274448dfb210af817b (patch) | |
| tree | 04ca627fc599517765fd4b73c6aa7f9eae71773c /lib/setup.php | |
| parent | 2faccaee0d22efa6b23586b65f222e8cc5404366 (diff) | |
| download | nextcloud-server-6831b78597ae38ed03343e274448dfb210af817b.tar.gz nextcloud-server-6831b78597ae38ed03343e274448dfb210af817b.zip | |
Use db setup class for option validation
Diffstat (limited to 'lib/setup.php')
| -rw-r--r-- | lib/setup.php | 48 |
1 files changed, 15 insertions, 33 deletions
diff --git a/lib/setup.php b/lib/setup.php index e73ba6cdf4f..11c6cc76b66 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -19,6 +19,14 @@ class DatabaseSetupException extends Exception } class OC_Setup { + static $db_setup_classes = array( + 'mysql' => '\OC\Setup\MySQL', + 'pgsql' => '\OC\Setup\PostgreSQL', + 'oci' => '\OC\Setup\OCI', + 'mssql' => '\OC\Setup\MSSQL', + 'sqlite' => '\OC\Setup\Sqlite', + 'sqlite3' => '\OC\Setup\Sqlite', + ); public static function getTrans(){ return OC_L10N::get('lib'); @@ -40,31 +48,14 @@ class OC_Setup { $options['directory'] = OC::$SERVERROOT."/data"; } - if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { // these needs more config options - if($dbtype == 'mysql') - $dbprettyname = 'MySQL'; - else if($dbtype == 'pgsql') - $dbprettyname = 'PostgreSQL'; - else if ($dbtype == 'mssql') - $dbprettyname = 'MS SQL Server'; - else - $dbprettyname = 'Oracle'; - - - if(empty($options['dbuser'])) { - $error[] = $l->t("%s enter the database username.", array($dbprettyname)); - } - if(empty($options['dbname'])) { - $error[] = $l->t("%s enter the database name.", array($dbprettyname)); - } - if(substr_count($options['dbname'], '.') >= 1) { - $error[] = $l->t("%s you may not use dots in the database name", array($dbprettyname)); - } - if($dbtype != 'oci' && empty($options['dbhost'])) { - $options['dbhost'] = 'localhost'; - } + if (!isset(self::$db_setup_classes[$dbtype])) { + $dbtype = 'sqlite'; } + $class = self::$db_setup_classes[$dbtype]; + $db_setup = new $class(self::getTrans()); + $error = array_merge($error, $db_setup->validate($options)); + if(count($error) != 0) { return $error; } @@ -91,17 +82,8 @@ class OC_Setup { OC_Config::setValue('datadirectory', $datadir); OC_Config::setValue('dbtype', $dbtype); OC_Config::setValue('version', implode('.', OC_Util::getVersion())); - $db_setup_classes = array( - 'mysql' => '\OC\Setup\MySQL', - 'pgsql' => '\OC\Setup\PostgreSQL', - 'oci' => '\OC\Setup\OCI', - 'mssql' => '\OC\Setup\MSSQL', - 'sqlite' => '\OC\Setup\Sqlite', - 'sqlite3' => '\OC\Setup\Sqlite', - ); try { - $class = $db_setup_classes[$dbtype]; - $db_setup = new $class(self::getTrans(), $options); + $db_setup->initialize($options); $db_setup->setupDatabase($username); } catch (DatabaseSetupException $e) { $error[] = array( |