Fix found errors
This commit is contained in:
parent
42c44d5165
commit
e93ce26f27
|
@ -43,6 +43,6 @@ abstract class AbstractDatabase {
|
||||||
$this->dbpassword = $dbpass;
|
$this->dbpassword = $dbpass;
|
||||||
$this->dbname = $dbname;
|
$this->dbname = $dbname;
|
||||||
$this->dbhost = $dbhost;
|
$this->dbhost = $dbhost;
|
||||||
$this->tableprefix = $tableprefix;
|
$this->tableprefix = $dbtableprefix;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,7 +149,7 @@ class MSSQL extends AbstractDatabase {
|
||||||
//fill the database if needed
|
//fill the database if needed
|
||||||
$query = "SELECT * FROM INFORMATION_SCHEMA.TABLES"
|
$query = "SELECT * FROM INFORMATION_SCHEMA.TABLES"
|
||||||
." WHERE TABLE_SCHEMA = '".$this->dbname."'"
|
." WHERE TABLE_SCHEMA = '".$this->dbname."'"
|
||||||
." AND TABLE_NAME = '".$this->dbtableprefix."users'";
|
." AND TABLE_NAME = '".$this->tableprefix."users'";
|
||||||
$result = sqlsrv_query($connection, $query);
|
$result = sqlsrv_query($connection, $query);
|
||||||
if ($result === false) {
|
if ($result === false) {
|
||||||
if ( ($errors = sqlsrv_errors() ) != null) {
|
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||||
|
|
|
@ -23,7 +23,7 @@ class MySQL extends AbstractDatabase {
|
||||||
$this->dbuser=substr('oc_'.$username, 0, 16);
|
$this->dbuser=substr('oc_'.$username, 0, 16);
|
||||||
if($this->dbuser!=$oldUser) {
|
if($this->dbuser!=$oldUser) {
|
||||||
//hash the password so we don't need to store the admin config in the config file
|
//hash the password so we don't need to store the admin config in the config file
|
||||||
$this->dbpassword=OC_Util::generate_random_bytes(30);
|
$this->dbpassword=\OC_Util::generate_random_bytes(30);
|
||||||
|
|
||||||
$this->createDBUser($connection);
|
$this->createDBUser($connection);
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ class MySQL extends AbstractDatabase {
|
||||||
|
|
||||||
//fill the database if needed
|
//fill the database if needed
|
||||||
$query='select count(*) from information_schema.tables'
|
$query='select count(*) from information_schema.tables'
|
||||||
." where table_schema='".$this->dbname."' AND table_name = '".$this->dbtableprefix."users';";
|
." where table_schema='".$this->dbname."' AND table_name = '".$this->tableprefix."users';";
|
||||||
$result = mysql_query($query, $connection);
|
$result = mysql_query($query, $connection);
|
||||||
if($result) {
|
if($result) {
|
||||||
$row=mysql_fetch_row($result);
|
$row=mysql_fetch_row($result);
|
||||||
|
|
|
@ -65,14 +65,14 @@ class OCI extends AbstractDatabase {
|
||||||
//add prefix to the oracle user name to prevent collisions
|
//add prefix to the oracle user name to prevent collisions
|
||||||
$this->dbuser='oc_'.$username;
|
$this->dbuser='oc_'.$username;
|
||||||
//create a new password so we don't need to store the admin config in the config file
|
//create a new password so we don't need to store the admin config in the config file
|
||||||
$this->dbpassword=OC_Util::generate_random_bytes(30);
|
$this->dbpassword=\OC_Util::generate_random_bytes(30);
|
||||||
|
|
||||||
//oracle passwords are treated as identifiers:
|
//oracle passwords are treated as identifiers:
|
||||||
// must start with aphanumeric char
|
// must start with aphanumeric char
|
||||||
// needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
|
// needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
|
||||||
$this->dbpassword=substr($this->dbpassword, 0, 30);
|
$this->dbpassword=substr($this->dbpassword, 0, 30);
|
||||||
|
|
||||||
$this->createDBUser($this->dbtablespace, $connection);
|
$this->createDBUser($connection);
|
||||||
|
|
||||||
\OC_Config::setValue('dbuser', $this->dbusername);
|
\OC_Config::setValue('dbuser', $this->dbusername);
|
||||||
\OC_Config::setValue('dbname', $this->dbusername);
|
\OC_Config::setValue('dbname', $this->dbusername);
|
||||||
|
@ -136,10 +136,9 @@ class OCI extends AbstractDatabase {
|
||||||
*
|
*
|
||||||
* @param String $name
|
* @param String $name
|
||||||
* @param String $password
|
* @param String $password
|
||||||
* @param String $tablespace
|
|
||||||
* @param resource $connection
|
* @param resource $connection
|
||||||
*/
|
*/
|
||||||
private function createDBUser($tablespace, $connection) {
|
private function createDBUser($connection) {
|
||||||
$name = $this->dbuser;
|
$name = $this->dbuser;
|
||||||
$password = $this->password;
|
$password = $this->password;
|
||||||
$query = "SELECT * FROM all_users WHERE USERNAME = :un";
|
$query = "SELECT * FROM all_users WHERE USERNAME = :un";
|
||||||
|
|
|
@ -33,7 +33,7 @@ class PostgreSQL extends AbstractDatabase {
|
||||||
//add prefix to the postgresql user name to prevent collisions
|
//add prefix to the postgresql user name to prevent collisions
|
||||||
$this->dbuser='oc_'.$username;
|
$this->dbuser='oc_'.$username;
|
||||||
//create a new password so we don't need to store the admin config in the config file
|
//create a new password so we don't need to store the admin config in the config file
|
||||||
$this->dbpassword=OC_Util::generate_random_bytes(30);
|
$this->dbpassword=\OC_Util::generate_random_bytes(30);
|
||||||
|
|
||||||
$this->createDBUser($connection);
|
$this->createDBUser($connection);
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ class PostgreSQL extends AbstractDatabase {
|
||||||
throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
|
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.'));
|
$this->trans->t('You need to enter either an existing account or the administrator.'));
|
||||||
}
|
}
|
||||||
$query = "select count(*) FROM pg_class WHERE relname='".$this->dbtableprefix."users' limit 1";
|
$query = "select count(*) FROM pg_class WHERE relname='".$this->tableprefix."users' limit 1";
|
||||||
$result = pg_query($connection, $query);
|
$result = pg_query($connection, $query);
|
||||||
if($result) {
|
if($result) {
|
||||||
$row = pg_fetch_row($result);
|
$row = pg_fetch_row($result);
|
||||||
|
|
|
@ -6,6 +6,7 @@ class Sqlite extends AbstractDatabase {
|
||||||
public $dbprettyname = 'Sqlite';
|
public $dbprettyname = 'Sqlite';
|
||||||
|
|
||||||
public function validate($config) {
|
public function validate($config) {
|
||||||
|
return array();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function initialize($config) {
|
public function initialize($config) {
|
||||||
|
|
Loading…
Reference in New Issue