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

testing process

Browse source 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
Maxence Lange 2019-07-15 22:03:57 -01:00
parent bf408c58c2
commit 22b141525f
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public.php
View file

@ -68,7 +68,7 @@ try {
OC_App::loadApps(array('filesystem', 'logging')); OC_App::loadApps(array('filesystem', 'logging'));
if (!\OC::$server->getAppManager()->isInstalled($app)) { if (!\OC::$server->getAppManager()->isInstalled($app)) {
http_response_code(501); http_response_code(404);
exit; exit;
} }
OC_App::loadApp($app); OC_App::loadApp($app);

5
settings/Application.php
View file

@ -220,6 +220,11 @@ class Application extends App {
$appConfig['core']['public_webfinger'] = $publicWebFinger; $appConfig['core']['public_webfinger'] = $publicWebFinger;
} }
$publicNodeInfo = \OC::$server->getConfig()->getAppValue('core', 'public_nodeinfo', '');
if (!empty($publicNodeInfo)) {
$appConfig['core']['public_nodeinfo'] = $publicNodeInfo;
}
$settings['array']['oc_appconfig'] = json_encode($appConfig); $settings['array']['oc_appconfig'] = json_encode($appConfig);
} }
} }

7
settings/js/admin.js
View file

@ -248,7 +248,8 @@ $(document).ready(function(){
// run setup checks then gather error messages // run setup checks then gather error messages
$.when( $.when(
OC.SetupChecks.checkWebDAV(), OC.SetupChecks.checkWebDAV(),
OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!OC.appConfig.core.public_webfinger, [200, 501]), OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!OC.appConfig.core.public_webfinger, [200, 404]),
OC.SetupChecks.checkWellKnownUrl('/.well-known/nodeinfo', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!OC.appConfig.core.public_nodeinfo, [200, 404]),
OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocm-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocm-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
@ -257,8 +258,8 @@ $(document).ready(function(){
OC.SetupChecks.checkGeneric(), OC.SetupChecks.checkGeneric(),
OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), OC.theme.docPlaceholderUrl), OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), OC.theme.docPlaceholderUrl),
OC.SetupChecks.checkDataProtected() OC.SetupChecks.checkDataProtected()
).then(function (check1, check2, check3, check4, check5, check6, check7, check8, check9, check10) { ).then(function (check1, check2, check3, check4, check5, check6, check7, check8, check9, check10, check11) {
var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8, check9, check10); var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8, check9, check10, check11);
var $el = $('#postsetupchecks'); var $el = $('#postsetupchecks');
$('#security-warning-state-loading').addClass('hidden'); $('#security-warning-state-loading').addClass('hidden');