aboutsummaryrefslogtreecommitdiffstats
path: root/lib/setup/postgresql.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/setup/postgresql.php')
-rw-r--r--lib/setup/postgresql.php92
1 files changed, 44 insertions, 48 deletions
diff --git a/lib/setup/postgresql.php b/lib/setup/postgresql.php
index a86039989e5..3fb1e6b8787 100644
--- a/lib/setup/postgresql.php
+++ b/lib/setup/postgresql.php
@@ -2,27 +2,26 @@
namespace OC\Setup;
-class PostgreSQL {
- public static function setupDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) {
- $e_host = addslashes($dbhost);
- $e_user = addslashes($dbuser);
- $e_password = addslashes($dbpass);
- $l = \OC_Setup::getTrans();
+class PostgreSQL extends AbstractDatabase {
+ public function setupDatabase($username) {
+ $e_host = addslashes($this->dbhost);
+ $e_user = addslashes($this->dbuser);
+ $e_password = addslashes($this->dbpassword);
//check if the database user has admin rights
$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'";
$connection = @pg_connect($connection_string);
if(!$connection) {
// Try if we can connect to the DB with the specified name
- $e_dbname = addslashes($dbname);
+ $e_dbname = addslashes($this->dbname);
$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
$connection = @pg_connect($connection_string);
if(!$connection)
- throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'),
- $l->t('You need to enter either an existing account or the administrator.'));
+ throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+ $this->trans->t('You need to enter either an existing account or the administrator.'));
}
- $e_user = pg_escape_string($dbuser);
+ $e_user = pg_escape_string($this->dbuser);
//check for roles creation rights in postgresql
$query="SELECT 1 FROM pg_roles WHERE rolcreaterole=TRUE AND rolname='$e_user'";
$result = pg_query($connection, $query);
@@ -30,45 +29,45 @@ class PostgreSQL {
//use the admin login data for the new database user
//add prefix to the postgresql user name to prevent collisions
- $dbusername='oc_'.$username;
+ $this->dbuser='oc_'.$username;
//create a new password so we don't need to store the admin config in the config file
- $dbpassword=OC_Util::generate_random_bytes(30);
+ $this->dbpassword=OC_Util::generate_random_bytes(30);
- self::createDBUser($dbusername, $dbpassword, $connection);
+ $this->createDBUser($connection);
- \OC_Config::setValue('dbuser', $dbusername);
- \OC_Config::setValue('dbpassword', $dbpassword);
+ \OC_Config::setValue('dbuser', $this->dbuser);
+ \OC_Config::setValue('dbpassword', $this->dbpassword);
//create the database
- self::createDatabase($dbname, $dbusername, $connection);
+ $this->createDatabase($connection);
}
else {
- \OC_Config::setValue('dbuser', $dbuser);
- \OC_Config::setValue('dbpassword', $dbpass);
+ \OC_Config::setValue('dbuser', $this->dbuser);
+ \OC_Config::setValue('dbpassword', $this->dbpassword);
//create the database
- self::createDatabase($dbname, $dbuser, $connection);
+ $this->createDatabase($connection);
}
// the connection to dbname=postgres is not needed anymore
pg_close($connection);
- // connect to the ownCloud database (dbname=$dbname) and check if it needs to be filled
- $dbuser = \OC_Config::getValue('dbuser');
- $dbpass = \OC_Config::getValue('dbpassword');
+ // connect to the ownCloud database (dbname=$this->dbname) and check if it needs to be filled
+ $this->dbuser = \OC_Config::getValue('dbuser');
+ $this->dbpassword = \OC_Config::getValue('dbpassword');
- $e_host = addslashes($dbhost);
- $e_dbname = addslashes($dbname);
- $e_user = addslashes($dbuser);
- $e_password = addslashes($dbpass);
+ $e_host = addslashes($this->dbhost);
+ $e_dbname = addslashes($this->dbname);
+ $e_user = addslashes($this->dbuser);
+ $e_password = addslashes($this->dbpassword);
$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
$connection = @pg_connect($connection_string);
if(!$connection) {
- throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'),
- $l->t('You need to enter either an existing account or the administrator.'));
+ throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+ $this->trans->t('You need to enter either an existing account or the administrator.'));
}
- $query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
+ $query = "select count(*) FROM pg_class WHERE relname='".$this->dbtableprefix."users' limit 1";
$result = pg_query($connection, $query);
if($result) {
$row = pg_fetch_row($result);
@@ -78,17 +77,15 @@ class PostgreSQL {
}
}
- private static function createDatabase($name, $user, $connection) {
-
+ private function createDatabase($connection) {
//we cant use OC_BD functions here because we need to connect as the administrative user.
- $l = \OC_Setup::getTrans();
- $e_name = pg_escape_string($name);
- $e_user = pg_escape_string($user);
+ $e_name = pg_escape_string($this->dbname);
+ $e_user = pg_escape_string($this->dbuser);
$query = "select datname from pg_database where datname = '$e_name'";
$result = pg_query($connection, $query);
if(!$result) {
- $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
- $entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
+ $entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+ $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
}
if(! pg_fetch_row($result)) {
@@ -96,8 +93,8 @@ class PostgreSQL {
$query = "CREATE DATABASE \"$e_name\" OWNER \"$e_user\"";
$result = pg_query($connection, $query);
if(!$result) {
- $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
- $entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
+ $entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+ $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
}
else {
@@ -107,15 +104,14 @@ class PostgreSQL {
}
}
- private static function createDBUser($name, $password, $connection) {
- $l = \OC_Setup::getTrans();
- $e_name = pg_escape_string($name);
- $e_password = pg_escape_string($password);
+ private function createDBUser($connection) {
+ $e_name = pg_escape_string($this->dbuser);
+ $e_password = pg_escape_string($this->dbpassword);
$query = "select * from pg_roles where rolname='$e_name';";
$result = pg_query($connection, $query);
if(!$result) {
- $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
- $entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
+ $entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+ $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
}
@@ -124,8 +120,8 @@ class PostgreSQL {
$query = "CREATE USER \"$e_name\" CREATEDB PASSWORD '$e_password';";
$result = pg_query($connection, $query);
if(!$result) {
- $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
- $entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
+ $entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+ $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
}
}
@@ -133,8 +129,8 @@ class PostgreSQL {
$query = "ALTER ROLE \"$e_name\" WITH PASSWORD '$e_password';";
$result = pg_query($connection, $query);
if(!$result) {
- $entry = $l->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
- $entry .= $l->t('Offending command was: "%s"', array($query)) . '<br />';
+ $entry = $this->trans->t('DB Error: "%s"', array(pg_last_error($connection))) . '<br />';
+ $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
\OC_Log::write('setup.pg', $entry, \OC_Log::WARN);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 03:26:59 +0000