Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions core/Controller/SetupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ public function loadAutoConfig(array $post): array {
if ($dbIsSet and $directoryIsSet and $adminAccountIsSet) {
$post['install'] = 'true';
}
$post['dbIsSet'] = $dbIsSet;
$post['directoryIsSet'] = $directoryIsSet;

return $post;
}
Expand Down
10 changes: 2 additions & 8 deletions core/src/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,16 @@ export type DbType = 'sqlite' | 'mysql' | 'pgsql' | 'oci'
export type SetupConfig = {
adminlogin: string
adminpass: string
directory: string
dbuser: string
dbpass: string
dbname: string
dbtablespace: string
dbhost: string
dbtype: DbType | ''

hasSQLite: boolean
hasMySQL: boolean
hasPostgreSQL: boolean
hasOracle: boolean
databases: Record<DbType, string>
databases: Partial<Record<DbType, string>>

dbIsSet: boolean
directory: string
directoryIsSet: boolean
hasAutoconfig: boolean
htaccessWorking: boolean
serverRoot: string
Expand Down
4 changes: 2 additions & 2 deletions core/src/utils/xhr-request.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const isNextcloudUrl = (url) => {
/**
* Check if a user was logged in but is now logged-out.
* If this is the case then the user will be forwarded to the login page.
* @returns {Promise<void>}
* @return {Promise<void>}
*/
async function checkLoginStatus() {
// skip if no logged in user
Expand Down Expand Up @@ -66,7 +66,7 @@ async function checkLoginStatus() {

/**
* Clear all Browser storages connected to current origin.
* @returns {Promise<void>}
* @return {Promise<void>}
*/
export async function wipeBrowserStorages() {
try {
Expand Down
Loading
Loading