nextcloud / server

lib/private/DB/ConnectionFactory.php

Indentation +193 added lines, -193 removed lines

@@ -37,197 +37,197 @@
  * Takes care of creating and configuring Doctrine connections.
  */
 class ConnectionFactory {
-	/**
-	 * @var array
-	 *
-	 * Array mapping DBMS type to default connection parameters passed to
-	 * \Doctrine\DBAL\DriverManager::getConnection().
-	 */
-	protected $defaultConnectionParams = [
-		'mysql' => [
-			'adapter' => '\OC\DB\AdapterMySQL',
-			'charset' => 'UTF8',
-			'driver' => 'pdo_mysql',
-			'wrapperClass' => 'OC\DB\Connection',
-		],
-		'oci' => [
-			'adapter' => '\OC\DB\AdapterOCI8',
-			'charset' => 'AL32UTF8',
-			'driver' => 'oci8',
-			'wrapperClass' => 'OC\DB\OracleConnection',
-		],
-		'pgsql' => [
-			'adapter' => '\OC\DB\AdapterPgSql',
-			'driver' => 'pdo_pgsql',
-			'wrapperClass' => 'OC\DB\Connection',
-		],
-		'sqlite3' => [
-			'adapter' => '\OC\DB\AdapterSqlite',
-			'driver' => 'pdo_sqlite',
-			'wrapperClass' => 'OC\DB\Connection',
-		],
-	];
-
-	/** @var SystemConfig */
-	private $config;
-
-	/**
-	 * ConnectionFactory constructor.
-	 *
-	 * @param SystemConfig $systemConfig
-	 */
-	public function __construct(SystemConfig $systemConfig) {
-		$this->config = $systemConfig;
-		if ($this->config->getValue('mysql.utf8mb4', false)) {
-			$this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
-		}
-	}
-
-	/**
-	 * @brief Get default connection parameters for a given DBMS.
-	 * @param string $type DBMS type
-	 * @throws \InvalidArgumentException If $type is invalid
-	 * @return array Default connection parameters.
-	 */
-	public function getDefaultConnectionParams($type) {
-		$normalizedType = $this->normalizeType($type);
-		if (!isset($this->defaultConnectionParams[$normalizedType])) {
-			throw new \InvalidArgumentException("Unsupported type: $type");
-		}
-		$result = $this->defaultConnectionParams[$normalizedType];
-		// \PDO::MYSQL_ATTR_FOUND_ROWS may not be defined, e.g. when the MySQL
-		// driver is missing. In this case, we won't be able to connect anyway.
-		if ($normalizedType === 'mysql' && defined('\PDO::MYSQL_ATTR_FOUND_ROWS')) {
-			$result['driverOptions'] = array(
-				\PDO::MYSQL_ATTR_FOUND_ROWS => true,
-			);
-		}
-		return $result;
-	}
-
-	/**
-	 * @brief Get default connection parameters for a given DBMS.
-	 * @param string $type DBMS type
-	 * @param array $additionalConnectionParams Additional connection parameters
-	 * @return \OC\DB\Connection
-	 */
-	public function getConnection($type, $additionalConnectionParams) {
-		$normalizedType = $this->normalizeType($type);
-		$eventManager = new EventManager();
-		switch ($normalizedType) {
-			case 'mysql':
-				$eventManager->addEventSubscriber(
-					new SQLSessionInit("SET SESSION AUTOCOMMIT=1"));
-				break;
-			case 'oci':
-				$eventManager->addEventSubscriber(new OracleSessionInit);
-				// the driverOptions are unused in dbal and need to be mapped to the parameters
-				if (isset($additionalConnectionParams['driverOptions'])) {
-					$additionalConnectionParams = array_merge($additionalConnectionParams, $additionalConnectionParams['driverOptions']);
-				}
-				$host = $additionalConnectionParams['host'];
-				$port = isset($additionalConnectionParams['port']) ? $additionalConnectionParams['port'] : null;
-				$dbName = $additionalConnectionParams['dbname'];
-
-				// we set the connect string as dbname and unset the host to coerce doctrine into using it as connect string
-				if ($host === '') {
-					$additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name
-				} else {
-					$additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName;
-				}
-				unset($additionalConnectionParams['host']);
-				break;
-			case 'sqlite3':
-				$journalMode = $additionalConnectionParams['sqlite.journal_mode'];
-				$additionalConnectionParams['platform'] = new OCSqlitePlatform();
-				$eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode));
-				break;
-		}
-		/** @var Connection $connection */
-		$connection = DriverManager::getConnection(
-			array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams),
-			new Configuration(),
-			$eventManager
-		);
-		return $connection;
-	}
-
-	/**
-	 * @brief Normalize DBMS type
-	 * @param string $type DBMS type
-	 * @return string Normalized DBMS type
-	 */
-	public function normalizeType($type) {
-		return $type === 'sqlite' ? 'sqlite3' : $type;
-	}
-
-	/**
-	 * Checks whether the specified DBMS type is valid.
-	 *
-	 * @param string $type
-	 * @return bool
-	 */
-	public function isValidType($type) {
-		$normalizedType = $this->normalizeType($type);
-		return isset($this->defaultConnectionParams[$normalizedType]);
-	}
-
-	/**
-	 * Create the connection parameters for the config
-	 *
-	 * @return array
-	 */
-	public function createConnectionParams() {
-		$type = $this->config->getValue('dbtype', 'sqlite');
-
-		$connectionParams = [
-			'user' => $this->config->getValue('dbuser', ''),
-			'password' => $this->config->getValue('dbpassword', ''),
-		];
-		$name = $this->config->getValue('dbname', 'owncloud');
-
-		if ($this->normalizeType($type) === 'sqlite3') {
-			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
-			$connectionParams['path'] = $dataDir . '/' . $name . '.db';
-		} else {
-			$host = $this->config->getValue('dbhost', '');
-			if (strpos($host, ':')) {
-				// Host variable may carry a port or socket.
-				list($host, $portOrSocket) = explode(':', $host, 2);
-				if (ctype_digit($portOrSocket)) {
-					$connectionParams['port'] = $portOrSocket;
-				} else {
-					$connectionParams['unix_socket'] = $portOrSocket;
-				}
-			}
-			$connectionParams['host'] = $host;
-			$connectionParams['dbname'] = $name;
-		}
-
-		$connectionParams['tablePrefix'] = $this->config->getValue('dbtableprefix', 'oc_');
-		$connectionParams['sqlite.journal_mode'] = $this->config->getValue('sqlite.journal_mode', 'WAL');
-
-		//additional driver options, eg. for mysql ssl
-		$driverOptions = $this->config->getValue('dbdriveroptions', null);
-		if ($driverOptions) {
-			$connectionParams['driverOptions'] = $driverOptions;
-		}
-
-		// set default table creation options
-		$connectionParams['defaultTableOptions'] = [
-			'collate' => 'utf8_bin',
-			'tablePrefix' => $connectionParams['tablePrefix']
-		];
-
-		if ($this->config->getValue('mysql.utf8mb4', false)) {
-			$connectionParams['defaultTableOptions'] = [
-				'collate' => 'utf8mb4_bin',
-				'charset' => 'utf8mb4',
-				'row_format' => 'compressed',
-				'tablePrefix' => $connectionParams['tablePrefix']
-			];
-		}
-
-		return $connectionParams;
-	}
+    /**
+     * @var array
+     *
+     * Array mapping DBMS type to default connection parameters passed to
+     * \Doctrine\DBAL\DriverManager::getConnection().
+     */
+    protected $defaultConnectionParams = [
+        'mysql' => [
+            'adapter' => '\OC\DB\AdapterMySQL',
+            'charset' => 'UTF8',
+            'driver' => 'pdo_mysql',
+            'wrapperClass' => 'OC\DB\Connection',
+        ],
+        'oci' => [
+            'adapter' => '\OC\DB\AdapterOCI8',
+            'charset' => 'AL32UTF8',
+            'driver' => 'oci8',
+            'wrapperClass' => 'OC\DB\OracleConnection',
+        ],
+        'pgsql' => [
+            'adapter' => '\OC\DB\AdapterPgSql',
+            'driver' => 'pdo_pgsql',
+            'wrapperClass' => 'OC\DB\Connection',
+        ],
+        'sqlite3' => [
+            'adapter' => '\OC\DB\AdapterSqlite',
+            'driver' => 'pdo_sqlite',
+            'wrapperClass' => 'OC\DB\Connection',
+        ],
+    ];
+
+    /** @var SystemConfig */
+    private $config;
+
+    /**
+     * ConnectionFactory constructor.
+     *
+     * @param SystemConfig $systemConfig
+     */
+    public function __construct(SystemConfig $systemConfig) {
+        $this->config = $systemConfig;
+        if ($this->config->getValue('mysql.utf8mb4', false)) {
+            $this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
+        }
+    }
+
+    /**
+     * @brief Get default connection parameters for a given DBMS.
+     * @param string $type DBMS type
+     * @throws \InvalidArgumentException If $type is invalid
+     * @return array Default connection parameters.
+     */
+    public function getDefaultConnectionParams($type) {
+        $normalizedType = $this->normalizeType($type);
+        if (!isset($this->defaultConnectionParams[$normalizedType])) {
+            throw new \InvalidArgumentException("Unsupported type: $type");
+        }
+        $result = $this->defaultConnectionParams[$normalizedType];
+        // \PDO::MYSQL_ATTR_FOUND_ROWS may not be defined, e.g. when the MySQL
+        // driver is missing. In this case, we won't be able to connect anyway.
+        if ($normalizedType === 'mysql' && defined('\PDO::MYSQL_ATTR_FOUND_ROWS')) {
+            $result['driverOptions'] = array(
+                \PDO::MYSQL_ATTR_FOUND_ROWS => true,
+            );
+        }
+        return $result;
+    }
+
+    /**
+     * @brief Get default connection parameters for a given DBMS.
+     * @param string $type DBMS type
+     * @param array $additionalConnectionParams Additional connection parameters
+     * @return \OC\DB\Connection
+     */
+    public function getConnection($type, $additionalConnectionParams) {
+        $normalizedType = $this->normalizeType($type);
+        $eventManager = new EventManager();
+        switch ($normalizedType) {
+            case 'mysql':
+                $eventManager->addEventSubscriber(
+                    new SQLSessionInit("SET SESSION AUTOCOMMIT=1"));
+                break;
+            case 'oci':
+                $eventManager->addEventSubscriber(new OracleSessionInit);
+                // the driverOptions are unused in dbal and need to be mapped to the parameters
+                if (isset($additionalConnectionParams['driverOptions'])) {
+                    $additionalConnectionParams = array_merge($additionalConnectionParams, $additionalConnectionParams['driverOptions']);
+                }
+                $host = $additionalConnectionParams['host'];
+                $port = isset($additionalConnectionParams['port']) ? $additionalConnectionParams['port'] : null;
+                $dbName = $additionalConnectionParams['dbname'];
+
+                // we set the connect string as dbname and unset the host to coerce doctrine into using it as connect string
+                if ($host === '') {
+                    $additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name
+                } else {
+                    $additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName;
+                }
+                unset($additionalConnectionParams['host']);
+                break;
+            case 'sqlite3':
+                $journalMode = $additionalConnectionParams['sqlite.journal_mode'];
+                $additionalConnectionParams['platform'] = new OCSqlitePlatform();
+                $eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode));
+                break;
+        }
+        /** @var Connection $connection */
+        $connection = DriverManager::getConnection(
+            array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams),
+            new Configuration(),
+            $eventManager
+        );
+        return $connection;
+    }
+
+    /**
+     * @brief Normalize DBMS type
+     * @param string $type DBMS type
+     * @return string Normalized DBMS type
+     */
+    public function normalizeType($type) {
+        return $type === 'sqlite' ? 'sqlite3' : $type;
+    }
+
+    /**
+     * Checks whether the specified DBMS type is valid.
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function isValidType($type) {
+        $normalizedType = $this->normalizeType($type);
+        return isset($this->defaultConnectionParams[$normalizedType]);
+    }
+
+    /**
+     * Create the connection parameters for the config
+     *
+     * @return array
+     */
+    public function createConnectionParams() {
+        $type = $this->config->getValue('dbtype', 'sqlite');
+
+        $connectionParams = [
+            'user' => $this->config->getValue('dbuser', ''),
+            'password' => $this->config->getValue('dbpassword', ''),
+        ];
+        $name = $this->config->getValue('dbname', 'owncloud');
+
+        if ($this->normalizeType($type) === 'sqlite3') {
+            $dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
+            $connectionParams['path'] = $dataDir . '/' . $name . '.db';
+        } else {
+            $host = $this->config->getValue('dbhost', '');
+            if (strpos($host, ':')) {
+                // Host variable may carry a port or socket.
+                list($host, $portOrSocket) = explode(':', $host, 2);
+                if (ctype_digit($portOrSocket)) {
+                    $connectionParams['port'] = $portOrSocket;
+                } else {
+                    $connectionParams['unix_socket'] = $portOrSocket;
+                }
+            }
+            $connectionParams['host'] = $host;
+            $connectionParams['dbname'] = $name;
+        }
+
+        $connectionParams['tablePrefix'] = $this->config->getValue('dbtableprefix', 'oc_');
+        $connectionParams['sqlite.journal_mode'] = $this->config->getValue('sqlite.journal_mode', 'WAL');
+
+        //additional driver options, eg. for mysql ssl
+        $driverOptions = $this->config->getValue('dbdriveroptions', null);
+        if ($driverOptions) {
+            $connectionParams['driverOptions'] = $driverOptions;
+        }
+
+        // set default table creation options
+        $connectionParams['defaultTableOptions'] = [
+            'collate' => 'utf8_bin',
+            'tablePrefix' => $connectionParams['tablePrefix']
+        ];
+
+        if ($this->config->getValue('mysql.utf8mb4', false)) {
+            $connectionParams['defaultTableOptions'] = [
+                'collate' => 'utf8mb4_bin',
+                'charset' => 'utf8mb4',
+                'row_format' => 'compressed',
+                'tablePrefix' => $connectionParams['tablePrefix']
+            ];
+        }
+
+        return $connectionParams;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -133,7 +133,7 @@ 
 				if ($host === '') {
 					$additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name
 				} else {
-					$additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName;
+					$additionalConnectionParams['dbname'] = '//'.$host.(!empty($port) ? ":{$port}" : "").'/'.$dbName;
 				}
 				unset($additionalConnectionParams['host']);
 				break;
@@ -187,8 +187,8 @@ 
 		$name = $this->config->getValue('dbname', 'owncloud');
 
 		if ($this->normalizeType($type) === 'sqlite3') {
-			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
-			$connectionParams['path'] = $dataDir . '/' . $name . '.db';
+			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT.'/data');
+			$connectionParams['path'] = $dataDir.'/'.$name.'.db';
 		} else {
 			$host = $this->config->getValue('dbhost', '');
 			if (strpos($host, ':')) {

lib/private/Setup/OCI.php

Indentation +213 added lines, -213 removed lines

@@ -31,240 +31,240 @@
 namespace OC\Setup;
 
 class OCI extends AbstractDatabase {
-	public $dbprettyname = 'Oracle';
+    public $dbprettyname = 'Oracle';
 
-	protected $dbtablespace;
+    protected $dbtablespace;
 
-	public function initialize($config) {
-		parent::initialize($config);
-		if (array_key_exists('dbtablespace', $config)) {
-			$this->dbtablespace = $config['dbtablespace'];
-		} else {
-			$this->dbtablespace = 'USERS';
-		}
-		// allow empty hostname for oracle
-		$this->dbHost = $config['dbhost'];
+    public function initialize($config) {
+        parent::initialize($config);
+        if (array_key_exists('dbtablespace', $config)) {
+            $this->dbtablespace = $config['dbtablespace'];
+        } else {
+            $this->dbtablespace = 'USERS';
+        }
+        // allow empty hostname for oracle
+        $this->dbHost = $config['dbhost'];
 
-		$this->config->setValues([
-			'dbhost'		=> $this->dbHost,
-			'dbtablespace'	=> $this->dbtablespace,
-		]);
-	}
+        $this->config->setValues([
+            'dbhost'		=> $this->dbHost,
+            'dbtablespace'	=> $this->dbtablespace,
+        ]);
+    }
 
-	public function validate($config) {
-		$errors = array();
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if(empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if(empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
-		}
-		return $errors;
-	}
+    public function validate($config) {
+        $errors = array();
+        if(empty($config['dbuser']) && empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
+        } else if(empty($config['dbuser'])) {
+            $errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
+        } else if(empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
+        }
+        return $errors;
+    }
 
-	public function setupDatabase($username) {
-		$e_host = addslashes($this->dbHost);
-		// casting to int to avoid malicious input
-		$e_port = (int)$this->dbPort;
-		$e_dbname = addslashes($this->dbName);
-		//check if the database user has admin right
-		if ($e_host == '') {
-			$easy_connect_string = $e_dbname; // use dbname as easy connect name
-		} else {
-			$easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname;
-		}
-		$this->logger->debug('connect string: ' . $easy_connect_string, ['app' => 'setup.oci']);
-		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
-			$errorMessage = $this->getLastError();
-			if ($errorMessage) {
-				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
-				$errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
-							.' ORACLE_SID='.getenv('ORACLE_SID')
-							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
-							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
-			}
-			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
-					'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
-							.' ORACLE_SID='.getenv('ORACLE_SID')
-							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
-							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
-		}
-		//check for roles creation rights in oracle
+    public function setupDatabase($username) {
+        $e_host = addslashes($this->dbHost);
+        // casting to int to avoid malicious input
+        $e_port = (int)$this->dbPort;
+        $e_dbname = addslashes($this->dbName);
+        //check if the database user has admin right
+        if ($e_host == '') {
+            $easy_connect_string = $e_dbname; // use dbname as easy connect name
+        } else {
+            $easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname;
+        }
+        $this->logger->debug('connect string: ' . $easy_connect_string, ['app' => 'setup.oci']);
+        $connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
+        if(!$connection) {
+            $errorMessage = $this->getLastError();
+            if ($errorMessage) {
+                throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
+                $errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+                            .' ORACLE_SID='.getenv('ORACLE_SID')
+                            .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+                            .' NLS_LANG='.getenv('NLS_LANG')
+                            .' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+            }
+            throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+                    'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+                            .' ORACLE_SID='.getenv('ORACLE_SID')
+                            .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+                            .' NLS_LANG='.getenv('NLS_LANG')
+                            .' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+        }
+        //check for roles creation rights in oracle
 
-		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
-			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
-		$result = oci_execute($stmt);
-		if($result) {
-			$row = oci_fetch_row($stmt);
+        $query='SELECT count(*) FROM user_role_privs, role_sys_privs'
+            ." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
+        $stmt = oci_parse($connection, $query);
+        if (!$stmt) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
+        $result = oci_execute($stmt);
+        if($result) {
+            $row = oci_fetch_row($stmt);
 
-			if ($row[0] > 0) {
-				//use the admin login data for the new database user
+            if ($row[0] > 0) {
+                //use the admin login data for the new database user
 
-				//add prefix to the oracle user name to prevent collisions
-				$this->dbUser='oc_'.$username;
-				//create a new password so we don't need to store the admin config in the config file
-				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
+                //add prefix to the oracle user name to prevent collisions
+                $this->dbUser='oc_'.$username;
+                //create a new password so we don't need to store the admin config in the config file
+                $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 
-				//oracle passwords are treated as identifiers:
-				//  must start with alphanumeric char
-				//  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);
+                //oracle passwords are treated as identifiers:
+                //  must start with alphanumeric char
+                //  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->createDBUser($connection);
-			}
-		}
+                $this->createDBUser($connection);
+            }
+        }
 
-		$this->config->setValues([
-			'dbuser'		=> $this->dbUser,
-			'dbname'		=> $this->dbName,
-			'dbpassword'	=> $this->dbPassword,
-		]);
+        $this->config->setValues([
+            'dbuser'		=> $this->dbUser,
+            'dbname'		=> $this->dbName,
+            'dbpassword'	=> $this->dbPassword,
+        ]);
 
-		//create the database not necessary, oracle implies user = schema
-		//$this->createDatabase($this->dbname, $this->dbuser, $connection);
+        //create the database not necessary, oracle implies user = schema
+        //$this->createDatabase($this->dbname, $this->dbuser, $connection);
 
-		//FIXME check tablespace exists: select * from user_tablespaces
+        //FIXME check tablespace exists: select * from user_tablespaces
 
-		// the connection to dbname=oracle is not needed anymore
-		oci_close($connection);
+        // the connection to dbname=oracle is not needed anymore
+        oci_close($connection);
 
-		// connect to the oracle database (schema=$this->dbuser) an check if the schema needs to be filled
-		$this->dbUser = $this->config->getValue('dbuser');
-		//$this->dbname = \OC_Config::getValue('dbname');
-		$this->dbPassword = $this->config->getValue('dbpassword');
+        // connect to the oracle database (schema=$this->dbuser) an check if the schema needs to be filled
+        $this->dbUser = $this->config->getValue('dbuser');
+        //$this->dbname = \OC_Config::getValue('dbname');
+        $this->dbPassword = $this->config->getValue('dbpassword');
 
-		$e_host = addslashes($this->dbHost);
-		$e_dbname = addslashes($this->dbName);
+        $e_host = addslashes($this->dbHost);
+        $e_dbname = addslashes($this->dbName);
 
-		if ($e_host == '') {
-			$easy_connect_string = $e_dbname; // use dbname as easy connect name
-		} else {
-			$easy_connect_string = '//' . $e_host . (!empty($e_port) ? ":{$e_port}" : "") . '/' . $e_dbname;
-		}
-		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
-			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
-					$this->trans->t('You need to enter either an existing account or the administrator.'));
-		}
-		$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
-		$stmt = oci_parse($connection, $query);
-		$un = $this->tablePrefix.'users';
-		oci_bind_by_name($stmt, ':un', $un);
-		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning( $entry, ['app' => 'setup.oci']);
-		}
-		$result = oci_execute($stmt);
+        if ($e_host == '') {
+            $easy_connect_string = $e_dbname; // use dbname as easy connect name
+        } else {
+            $easy_connect_string = '//' . $e_host . (!empty($e_port) ? ":{$e_port}" : "") . '/' . $e_dbname;
+        }
+        $connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
+        if(!$connection) {
+            throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+                    $this->trans->t('You need to enter either an existing account or the administrator.'));
+        }
+        $query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
+        $stmt = oci_parse($connection, $query);
+        $un = $this->tablePrefix.'users';
+        oci_bind_by_name($stmt, ':un', $un);
+        if (!$stmt) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning( $entry, ['app' => 'setup.oci']);
+        }
+        $result = oci_execute($stmt);
 
-		if($result) {
-			$row = oci_fetch_row($stmt);
-		}
-		if(!$result or $row[0]==0) {
-			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
-		}
-	}
+        if($result) {
+            $row = oci_fetch_row($stmt);
+        }
+        if(!$result or $row[0]==0) {
+            \OC_DB::createDbFromStructure($this->dbDefinitionFile);
+        }
+    }
 
-	/**
-	 * @param resource $connection
-	 */
-	private function createDBUser($connection) {
-		$name = $this->dbUser;
-		$password = $this->dbPassword;
-		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
-		oci_bind_by_name($stmt, ':un', $name);
-		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
+    /**
+     * @param resource $connection
+     */
+    private function createDBUser($connection) {
+        $name = $this->dbUser;
+        $password = $this->dbPassword;
+        $query = "SELECT * FROM all_users WHERE USERNAME = :un";
+        $stmt = oci_parse($connection, $query);
+        if (!$stmt) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
+        oci_bind_by_name($stmt, ':un', $name);
+        $result = oci_execute($stmt);
+        if(!$result) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
 
-		if(! oci_fetch_row($stmt)) {
-			//user does not exists let's create it :)
-			//password must start with alphabetic character in oracle
-			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$this->dbtablespace;
-			$stmt = oci_parse($connection, $query);
-			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-				$this->logger->warning($entry, ['app' => 'setup.oci']);
+        if(! oci_fetch_row($stmt)) {
+            //user does not exists let's create it :)
+            //password must start with alphabetic character in oracle
+            $query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$this->dbtablespace;
+            $stmt = oci_parse($connection, $query);
+            if (!$stmt) {
+                $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+                $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+                $this->logger->warning($entry, ['app' => 'setup.oci']);
 
-			}
-			//oci_bind_by_name($stmt, ':un', $name);
-			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-					array($query, $name, $password)) . '<br />';
-				$this->logger->warning($entry, ['app' => 'setup.oci']);
+            }
+            //oci_bind_by_name($stmt, ':un', $name);
+            $result = oci_execute($stmt);
+            if(!$result) {
+                $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+                $entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
+                    array($query, $name, $password)) . '<br />';
+                $this->logger->warning($entry, ['app' => 'setup.oci']);
 
-			}
-		} else { // change password of the existing role
-			$query = "ALTER USER :un IDENTIFIED BY :pw";
-			$stmt = oci_parse($connection, $query);
-			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-				$this->logger->warning($entry, ['app' => 'setup.oci']);
-			}
-			oci_bind_by_name($stmt, ':un', $name);
-			oci_bind_by_name($stmt, ':pw', $password);
-			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-				$this->logger->warning($entry, ['app' => 'setup.oci']);
-			}
-		}
-		// grant necessary roles
-		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
-		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-				array($query, $name, $password)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
-	}
+            }
+        } else { // change password of the existing role
+            $query = "ALTER USER :un IDENTIFIED BY :pw";
+            $stmt = oci_parse($connection, $query);
+            if (!$stmt) {
+                $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+                $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+                $this->logger->warning($entry, ['app' => 'setup.oci']);
+            }
+            oci_bind_by_name($stmt, ':un', $name);
+            oci_bind_by_name($stmt, ':pw', $password);
+            $result = oci_execute($stmt);
+            if(!$result) {
+                $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+                $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+                $this->logger->warning($entry, ['app' => 'setup.oci']);
+            }
+        }
+        // grant necessary roles
+        $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
+        $stmt = oci_parse($connection, $query);
+        if (!$stmt) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
+        $result = oci_execute($stmt);
+        if(!$result) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
+                array($query, $name, $password)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
+    }
 
-	/**
-	 * @param resource $connection
-	 * @return string
-	 */
-	protected function getLastError($connection = null) {
-		if ($connection) {
-			$error = oci_error($connection);
-		} else {
-			$error = oci_error();
-		}
-		foreach (array('message', 'code') as $key) {
-			if (isset($error[$key])) {
-				return $error[$key];
-			}
-		}
-		return '';
-	}
+    /**
+     * @param resource $connection
+     * @return string
+     */
+    protected function getLastError($connection = null) {
+        if ($connection) {
+            $error = oci_error($connection);
+        } else {
+            $error = oci_error();
+        }
+        foreach (array('message', 'code') as $key) {
+            if (isset($error[$key])) {
+                return $error[$key];
+            }
+        }
+        return '';
+    }
 }

Spacing +42 added lines, -42 removed lines

@@ -53,11 +53,11 @@ 
 
 	public function validate($config) {
 		$errors = array();
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
+		if (empty($config['dbuser']) && empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if(empty($config['dbuser'])) {
+		} else if (empty($config['dbuser'])) {
 			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if(empty($config['dbname'])) {
+		} else if (empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
 		}
 		return $errors;
@@ -66,7 +66,7 @@ 
 	public function setupDatabase($username) {
 		$e_host = addslashes($this->dbHost);
 		// casting to int to avoid malicious input
-		$e_port = (int)$this->dbPort;
+		$e_port = (int) $this->dbPort;
 		$e_dbname = addslashes($this->dbName);
 		//check if the database user has admin right
 		if ($e_host == '') {
@@ -74,9 +74,9 @@ 
 		} else {
 			$easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname;
 		}
-		$this->logger->debug('connect string: ' . $easy_connect_string, ['app' => 'setup.oci']);
+		$this->logger->debug('connect string: '.$easy_connect_string, ['app' => 'setup.oci']);
 		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
+		if (!$connection) {
 			$errorMessage = $this->getLastError();
 			if ($errorMessage) {
 				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
@@ -84,41 +84,41 @@ 
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
 							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 			}
 			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
 					'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
 							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 		}
 		//check for roles creation rights in oracle
 
-		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
+		$query = 'SELECT count(*) FROM user_role_privs, role_sys_privs'
 			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		$result = oci_execute($stmt);
-		if($result) {
+		if ($result) {
 			$row = oci_fetch_row($stmt);
 
 			if ($row[0] > 0) {
 				//use the admin login data for the new database user
 
 				//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
 				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 
 				//oracle passwords are treated as identifiers:
 				//  must start with alphanumeric char
 				//  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($connection);
 			}
@@ -149,10 +149,10 @@ 
 		if ($e_host == '') {
 			$easy_connect_string = $e_dbname; // use dbname as easy connect name
 		} else {
-			$easy_connect_string = '//' . $e_host . (!empty($e_port) ? ":{$e_port}" : "") . '/' . $e_dbname;
+			$easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname;
 		}
 		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
+		if (!$connection) {
 			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
 					$this->trans->t('You need to enter either an existing account or the administrator.'));
 		}
@@ -161,16 +161,16 @@ 
 		$un = $this->tablePrefix.'users';
 		oci_bind_by_name($stmt, ':un', $un);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning( $entry, ['app' => 'setup.oci']);
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
+			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		$result = oci_execute($stmt);
 
-		if($result) {
+		if ($result) {
 			$row = oci_fetch_row($stmt);
 		}
-		if(!$result or $row[0]==0) {
+		if (!$result or $row[0] == 0) {
 			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
 		}
 	}
@@ -184,35 +184,35 @@ 
 		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		oci_bind_by_name($stmt, ':un', $name);
 		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+		if (!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 
-		if(! oci_fetch_row($stmt)) {
+		if (!oci_fetch_row($stmt)) {
 			//user does not exists let's create it :)
 			//password must start with alphabetic character in oracle
 			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$this->dbtablespace;
 			$stmt = oci_parse($connection, $query);
 			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 
 			}
 			//oci_bind_by_name($stmt, ':un', $name);
 			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+			if (!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
 				$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-					array($query, $name, $password)) . '<br />';
+					array($query, $name, $password)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 
 			}
@@ -220,16 +220,16 @@ 
 			$query = "ALTER USER :un IDENTIFIED BY :pw";
 			$stmt = oci_parse($connection, $query);
 			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 			}
 			oci_bind_by_name($stmt, ':un', $name);
 			oci_bind_by_name($stmt, ':pw', $password);
 			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			if (!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 			}
 		}
@@ -237,15 +237,15 @@ 
 		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+		if (!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
 			$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-				array($query, $name, $password)) . '<br />';
+				array($query, $name, $password)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 	}