From 1361bbb1e6a47266cf3a11b2ddba77706522d9e0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 21 Aug 2014 14:15:43 +0200
Subject: [PATCH] Cleanup routes
---
settings/js/personal.js | 3 +--
settings/routes.php | 4 ++--
settings/templates/personal.php | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/settings/js/personal.js b/settings/js/personal.js
index d6763cdb29..d6546717d1 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -306,7 +306,7 @@ $(document).ready(function () {
$('#sslCertificate').on('click', 'td.remove > img', function () {
var row = $(this).parent().parent();
- $.post(OC.filePath('settings', 'ajax', 'removeRootCertificate.php'), {
+ $.post(OC.generateUrl('settings/ajax/removeRootCertificate'), {
cert: row.data('name')
});
row.remove();
@@ -317,7 +317,6 @@ $(document).ready(function () {
$('#rootcert_import').fileupload({
done: function (e, data) {
- console.log(data.result);
var issueDate = new Date(data.result.validFrom * 1000);
var expireDate = new Date(data.result.validTill * 1000);
var now = new Date();
diff --git a/settings/routes.php b/settings/routes.php
index c7bab409d4..191b5febbd 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -62,9 +62,9 @@ $this->create('settings_ajax_restorekeys', '/settings/ajax/restorekeys.php')
->actionInclude('settings/ajax/restorekeys.php');
$this->create('settings_ajax_deletekeys', '/settings/ajax/deletekeys.php')
->actionInclude('settings/ajax/deletekeys.php');
-$this->create('core_cert_post', '/settings/ajax/addRootCertificate.php')
+$this->create('settings_cert_post', '/settings/ajax/addRootCertificate')
->actionInclude('settings/ajax/addRootCertificate.php');
-$this->create('core_cert_remove', '/settings/ajax/removeRootCertificate.php')
+$this->create('settings_cert_remove', '/settings/ajax/removeRootCertificate')
->actionInclude('settings/ajax/removeRootCertificate.php');
// apps
$this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php')
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 6d07b89954..8cb7be2773 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -182,7 +182,7 @@ if($_['passwordChangeSupported']) {
<?php endforeach; ?>
</tbody>
</table>
- <form class="uploadButton" method="post" action="<?php p(\OC_Helper::linkToRoute('core_cert_post')); ?>" target="certUploadFrame">
+ <form class="uploadButton" method="post" action="<?php p(\OC_Helper::linkToRoute('settings_cert_post')); ?>" target="certUploadFrame">
<input type="file" id="rootcert_import" name="rootcert_import" class="hidden">
<input type="button" id="rootcert_import_button" value="<?php p($l->t('Import Root Certificate')); ?>"/>
</form>
--
GitLab