mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing indent

This commit is contained in:
Thomas Mueller 2013-02-12 01:05:47 +01:00
parent b2dfdacaa1
commit 8136851010
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/setup.php
View File

@ -46,8 +46,8 @@ class OC_Setup {
else if($dbtype == 'pgsql') else if($dbtype == 'pgsql')
$dbprettyname = 'PostgreSQL'; $dbprettyname = 'PostgreSQL';
else if ($dbtype == 'mssql') else if ($dbtype == 'mssql')
$dbprettyname = 'MS SQL Server'; $dbprettyname = 'MS SQL Server';
else else
$dbprettyname = 'Oracle'; $dbprettyname = 'Oracle';
@ -154,7 +154,7 @@ class OC_Setup {
return $error; return $error;
} }
} }
elseif ($dbtype == 'mssql') { elseif ($dbtype == 'mssql') {
$dbuser = $options['dbuser']; $dbuser = $options['dbuser'];
$dbpass = $options['dbpass']; $dbpass = $options['dbpass'];
$dbname = $options['dbname']; $dbname = $options['dbname'];
@ -176,7 +176,7 @@ class OC_Setup {
); );
return $error; return $error;
} }
} }
else { else {
//delete the old sqlite database first, might cause infinte loops otherwise //delete the old sqlite database first, might cause infinte loops otherwise
if(file_exists("$datadir/owncloud.db")) { if(file_exists("$datadir/owncloud.db")) {
@ -614,12 +614,12 @@ class OC_Setup {
$masterConnection = @sqlsrv_connect($dbhost, $masterConnectionInfo); $masterConnection = @sqlsrv_connect($dbhost, $masterConnectionInfo);
if(!$masterConnection) { if(!$masterConnection) {
$entry = null; $entry = null;
if( ($errors = sqlsrv_errors() ) != null) { if( ($errors = sqlsrv_errors() ) != null) {
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />'; $entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
} else { } else {
$entry = ''; $entry = '';
} }
throw new Exception('MS SQL username and/or password not valid: '.$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); 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."';"; $query = "SELECT * FROM master.sys.server_principals WHERE name = '".$name."';";
$result = sqlsrv_query($connection, $query); $result = sqlsrv_query($connection, $query);
if ($result === false) { if ($result === false) {
@ -736,7 +736,7 @@ class OC_Setup {
if ( ($errors = sqlsrv_errors() ) != null) { if ( ($errors = sqlsrv_errors() ) != null) {
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />'; $entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
} else { } else {
$entry = ''; $entry = '';
} }
$entry.='Offending command was: '.$query.'<br />'; $entry.='Offending command was: '.$query.'<br />';
echo($entry); echo($entry);