fixing indent
This commit is contained in:
parent
b2dfdacaa1
commit
8136851010
|
@ -46,8 +46,8 @@ class OC_Setup {
|
|||
else if($dbtype == 'pgsql')
|
||||
$dbprettyname = 'PostgreSQL';
|
||||
else if ($dbtype == 'mssql')
|
||||
$dbprettyname = 'MS SQL Server';
|
||||
else
|
||||
$dbprettyname = 'MS SQL Server';
|
||||
else
|
||||
$dbprettyname = 'Oracle';
|
||||
|
||||
|
||||
|
@ -154,7 +154,7 @@ class OC_Setup {
|
|||
return $error;
|
||||
}
|
||||
}
|
||||
elseif ($dbtype == 'mssql') {
|
||||
elseif ($dbtype == 'mssql') {
|
||||
$dbuser = $options['dbuser'];
|
||||
$dbpass = $options['dbpass'];
|
||||
$dbname = $options['dbname'];
|
||||
|
@ -176,7 +176,7 @@ class OC_Setup {
|
|||
);
|
||||
return $error;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
//delete the old sqlite database first, might cause infinte loops otherwise
|
||||
if(file_exists("$datadir/owncloud.db")) {
|
||||
|
@ -614,12 +614,12 @@ class OC_Setup {
|
|||
|
||||
$masterConnection = @sqlsrv_connect($dbhost, $masterConnectionInfo);
|
||||
if(!$masterConnection) {
|
||||
$entry = null;
|
||||
if( ($errors = sqlsrv_errors() ) != null) {
|
||||
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||
} else {
|
||||
$entry = '';
|
||||
}
|
||||
$entry = null;
|
||||
if( ($errors = sqlsrv_errors() ) != null) {
|
||||
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||
} else {
|
||||
$entry = '';
|
||||
}
|
||||
throw new Exception('MS SQL username and/or password not valid: '.$entry);
|
||||
}
|
||||
|
||||
|
@ -637,7 +637,7 @@ class OC_Setup {
|
|||
self::mssql_createDatabaseStructure($dbhost, $dbname, $dbuser, $dbpass, $dbtableprefix);
|
||||
}
|
||||
|
||||
private static function mssql_createDBLogin($name, $password, $connection) {
|
||||
private static function mssql_createDBLogin($name, $password, $connection) {
|
||||
$query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';";
|
||||
$result = sqlsrv_query($connection, $query);
|
||||
if ($result === false) {
|
||||
|
@ -736,7 +736,7 @@ class OC_Setup {
|
|||
if ( ($errors = sqlsrv_errors() ) != null) {
|
||||
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
|
||||
} else {
|
||||
$entry = '';
|
||||
$entry = '';
|
||||
}
|
||||
$entry.='Offending command was: '.$query.'<br />';
|
||||
echo($entry);
|
||||
|
|
Loading…
Reference in New Issue