wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing PHPDoc and spelling

Browse source
This commit is contained in:
Thomas Mueller 2013-12-02 08:42:28 +01:00
parent 93b0bd0a9e
commit 87e795a693
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/setup/abstractdatabase.php
View file

@ -3,6 +3,10 @@
namespace OC\Setup; namespace OC\Setup;
abstract class AbstractDatabase { abstract class AbstractDatabase {
/**
* @var \OC_L10N
*/
protected $trans; protected $trans;
protected $dbDefinitionFile; protected $dbDefinitionFile;
protected $dbuser; protected $dbuser;

10
lib/private/setup/oci.php
View file

@ -68,7 +68,7 @@ class OCI extends AbstractDatabase {
$this->dbpassword=\OC_Util::generateRandomBytes(30); $this->dbpassword=\OC_Util::generateRandomBytes(30);
//oracle passwords are treated as identifiers: //oracle passwords are treated as identifiers:
// must start with aphanumeric char // 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. // 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);
@ -78,7 +78,7 @@ class OCI extends AbstractDatabase {
\OC_Config::setValue('dbname', $this->dbuser); \OC_Config::setValue('dbname', $this->dbuser);
\OC_Config::setValue('dbpassword', $this->dbpassword); \OC_Config::setValue('dbpassword', $this->dbpassword);
//create the database not neccessary, oracle implies user = schema //create the database not necessary, oracle implies user = schema
//$this->createDatabase($this->dbname, $this->dbuser, $connection); //$this->createDatabase($this->dbname, $this->dbuser, $connection);
} else { } else {
@ -86,7 +86,7 @@ class OCI extends AbstractDatabase {
\OC_Config::setValue('dbname', $this->dbname); \OC_Config::setValue('dbname', $this->dbname);
\OC_Config::setValue('dbpassword', $this->dbpassword); \OC_Config::setValue('dbpassword', $this->dbpassword);
//create the database not neccessary, oracle implies user = schema //create the database not necessary, oracle implies user = schema
//$this->createDatabase($this->dbname, $this->dbuser, $connection); //$this->createDatabase($this->dbname, $this->dbuser, $connection);
} }
@ -133,9 +133,6 @@ class OCI extends AbstractDatabase {
} }
/** /**
*
* @param String $name
* @param String $password
* @param resource $connection * @param resource $connection
*/ */
private function createDBUser($connection) { private function createDBUser($connection) {
@ -210,6 +207,7 @@ class OCI extends AbstractDatabase {
/** /**
* @param resource $connection * @param resource $connection
* @return string
*/ */
protected function getLastError($connection = null) { protected function getLastError($connection = null) {
if ($connection) { if ($connection) {