diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-08-21 14:15:43 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-08-31 10:47:50 +0200 |
| commit | 1361bbb1e6a47266cf3a11b2ddba77706522d9e0 (patch) | |
| tree | 7051743b5c3e07f54053e537258f3ae139c774ba | |
| parent | e64aa330fdd6ce6180a0ffcf3634dbcae31abfff (diff) | |
| download | nextcloud-server-1361bbb1e6a47266cf3a11b2ddba77706522d9e0.tar.gz nextcloud-server-1361bbb1e6a47266cf3a11b2ddba77706522d9e0.zip | |
Cleanup routes
| -rw-r--r-- | settings/js/personal.js | 3 | ||||
| -rw-r--r-- | settings/routes.php | 4 | ||||
| -rw-r--r-- | 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 d6763cdb295..d6546717d16 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 c7bab409d4b..191b5febbd7 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 6d07b899544..8cb7be27735 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> |