From f3f0881758442816a39255f5bf0be2f479d41c0e Mon Sep 17 00:00:00 2001
From: Mathias Kresin <m@kresin.me>
Date: Sat, 3 Jan 2015 23:39:00 +0100
Subject: [PATCH] Move token regeneration to the advanced config section

And make clear which services get a new token.
---
 controllers/config.php | 3 +--
 templates/api.php      | 1 -
 templates/config.php   | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/controllers/config.php b/controllers/config.php
index bf5ffaa..d4a4b50 100644
--- a/controllers/config.php
+++ b/controllers/config.php
@@ -89,7 +89,7 @@ Router\get_action('generate-tokens', function() {
         Model\Config\new_tokens();
     }
 
-    Response\redirect('?action=api');
+    Response\redirect('?action=config');
 });
 
 // Optimize the database manually
@@ -204,7 +204,6 @@ Router\get_action('database', function() {
 Router\get_action('api', function() {
 
     Response\html(Template\layout('api', array(
-        'csrf' => Model\Config\generate_csrf(),
         'config' => Model\Config\get_all(),
         'menu' => 'config',
         'title' => t('API')
diff --git a/templates/api.php b/templates/api.php
index 56c8919..e5fea5a 100644
--- a/templates/api.php
+++ b/templates/api.php
@@ -23,7 +23,6 @@
             <li><?= t('API endpoint:') ?> <strong><?= Helper\get_current_base_url().'jsonrpc.php' ?></strong></li>
             <li><?= t('API username:') ?> <strong><?= Helper\escape($config['username']) ?></strong></li>
             <li><?= t('API token:') ?> <strong><?= Helper\escape($config['api_token']) ?></strong></li>
-            <li><a href="?action=generate-tokens&amp;csrf=<?= $csrf ?>"><?= t('Generate new tokens') ?></a></li>
         </ul>
     </div>
 </section>
diff --git a/templates/config.php b/templates/config.php
index 1b2326c..5362b7a 100644
--- a/templates/config.php
+++ b/templates/config.php
@@ -75,6 +75,7 @@
 </div>
 <section class="alert alert-error">
 <ul>
+    <li><a href="?action=generate-tokens&amp;csrf=<?= $values['csrf'] ?>"><?= t('Generate new tokens') ?></a> (<?= t('Miniflux API') ?>, <?= t('Fever API') ?>, <?= t('Bookmarklet') ?>, <?= t('Bookmark RSS Feed') ?>)</li>
     <li><a href="?action=confirm-auto-update"><?= t('Update Miniflux') ?></a> (<?= t('Don\'t forget to backup your database') ?>)</li>
 </ul>
 </section>