From 230b9c47134ec39d41e4426c2ad161bb228df694 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Mon, 8 Jun 2020 23:43:10 +0200 Subject: [PATCH] Remove obsolete scripts Leftover from https://github.com/nextcloud/server/pull/21224. Signed-off-by: Daniel Kesselberg --- apps/settings/js/certificates.js | 70 ---------------------- apps/settings/templates/settings/frame.php | 2 +- 2 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 apps/settings/js/certificates.js diff --git a/apps/settings/js/certificates.js b/apps/settings/js/certificates.js deleted file mode 100644 index f73ceea23f..0000000000 --- a/apps/settings/js/certificates.js +++ /dev/null @@ -1,70 +0,0 @@ -$(document).ready(function () { - var type = $('#sslCertificate').data('type'); - $('#sslCertificate').on('click', 'td.remove', function () { - var row = $(this).parent(); - $.ajax(OC.generateUrl('settings/' + type + '/certificate/{certificate}', {certificate: row.data('name')}), { - type: 'DELETE' - }); - row.remove(); - - if ($('#sslCertificate > tbody > tr').length === 0) { - $('#sslCertificate').hide(); - } - return true; - }); - - $('#sslCertificate tr > td').tooltip({placement: 'bottom', container: 'body'}); - - $('#rootcert_import').fileupload({ - pasteZone: null, - submit: function (e, data) { - data.formData = _.extend(data.formData || {}, { - requesttoken: OC.requestToken - }); - }, - success: function (data) { - if (typeof data === 'string') { - data = JSON.parse(data); - } else if (data && data.length) { - // fetch response from iframe - data = JSON.parse(data[0].body.innerText); - } - if (!data || typeof(data) === 'string') { - // IE8 iframe workaround comes here instead of fail() - OC.Notification.showTemporary( - t('settings', 'An error occurred. Please upload an ASCII-encoded PEM certificate.')); - return; - } - var issueDate = new Date(data.validFrom * 1000); - var expireDate = new Date(data.validTill * 1000); - var now = new Date(); - var isExpired = !(issueDate <= now && now <= expireDate); - - var row = $(''); - row.data('name', data.name); - row.addClass(isExpired ? 'expired' : 'valid'); - row.append($('').attr('title', data.organization).text(data.commonName)); - row.append($('').attr('title', t('core,', 'Valid until {date}', {date: data.validTillString})) - .text(data.validTillString)); - row.append($('').attr('title', data.issuerOrganization).text(data.issuer)); - row.append($('').addClass('remove').append( - $('').attr({ - alt: t('core', 'Delete'), - title: t('core', 'Delete'), - src: OC.imagePath('core', 'actions/delete.svg') - }).addClass('action') - )); - - $('#sslCertificate tbody').append(row); - $('#sslCertificate').show(); - }, - fail: function () { - OC.Notification.showTemporary( - t('settings', 'An error occurred. Please upload an ASCII-encoded PEM certificate.')); - } - }); - - if ($('#sslCertificate > tbody > tr').length === 0) { - $('#sslCertificate').hide(); - } -}); diff --git a/apps/settings/templates/settings/frame.php b/apps/settings/templates/settings/frame.php index 5f7186559a..53987bf607 100644 --- a/apps/settings/templates/settings/frame.php +++ b/apps/settings/templates/settings/frame.php @@ -22,7 +22,7 @@ */ style('settings', 'settings'); -script('settings', [ 'settings', 'admin', 'log', 'certificates']); +script('settings', [ 'settings', 'admin', 'log']); script('core', 'setupchecks'); script('files', 'jquery.fileupload');