summaryrefslogtreecommitdiff
path: root/app/Controller
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controller')
-rw-r--r--app/Controller/Base.php9
-rw-r--r--app/Controller/Board.php8
-rw-r--r--app/Controller/Config.php124
-rw-r--r--app/Controller/User.php2
-rw-r--r--app/Controller/Webhook.php4
5 files changed, 105 insertions, 42 deletions
diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index e07aabf7..9c1416fc 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -5,7 +5,6 @@ namespace Controller;
use Core\Tool;
use Core\Registry;
use Core\Security;
-use Core\Translator;
use Model\LastLogin;
/**
@@ -123,12 +122,8 @@ abstract class Base
$this->response->hsts();
}
- // Load translations
- $language = $this->config->get('language', 'en_US');
- if ($language !== 'en_US') Translator::load($language);
-
- // Set timezone
- date_default_timezone_set($this->config->get('timezone', 'UTC'));
+ $this->config->setupTranslations();
+ $this->config->setupTimezone();
// Authentication
if (! $this->authentication->isAuthenticated($controller, $action)) {
diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index b56adca0..0e1dd3e1 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -177,8 +177,8 @@ class Board extends Base
'categories' => $this->category->getList($project['id'], false),
'title' => $project['name'],
'no_layout' => true,
- 'auto_refresh' => true,
'not_editable' => true,
+ 'board_public_refresh_interval' => $this->config->get('board_public_refresh_interval'),
)));
}
@@ -238,6 +238,8 @@ class Board extends Base
'menu' => 'boards',
'title' => $projects[$project['id']],
'board_selector' => $board_selector,
+ 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'),
+ 'board_highlight_period' => $this->config->get('board_highlight_period'),
)));
}
@@ -407,6 +409,8 @@ class Board extends Base
'current_project_id' => $project_id,
'board' => $this->board->get($project_id),
'categories' => $this->category->getList($project_id, false),
+ 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'),
+ 'board_highlight_period' => $this->config->get('board_highlight_period'),
)),
201
);
@@ -443,6 +447,8 @@ class Board extends Base
'current_project_id' => $project_id,
'board' => $this->board->get($project_id),
'categories' => $this->category->getList($project_id, false),
+ 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'),
+ 'board_highlight_period' => $this->config->get('board_highlight_period'),
))
);
}
diff --git a/app/Controller/Config.php b/app/Controller/Config.php
index 4c3018c1..869d4331 100644
--- a/app/Controller/Config.php
+++ b/app/Controller/Config.php
@@ -11,59 +11,118 @@ namespace Controller;
class Config extends Base
{
/**
- * Display the settings page
+ * Common layout for config views
*
- * @access public
+ * @access private
+ * @param string $template Template name
+ * @param array $params Template parameters
+ * @return string
*/
- public function index()
+ private function layout($template, array $params)
{
- $this->response->html($this->template->layout('config_index', array(
- 'db_size' => $this->config->getDatabaseSize(),
- 'languages' => $this->config->getLanguages(),
- 'values' => $this->config->getAll(),
- 'errors' => array(),
- 'menu' => 'config',
- 'title' => t('Settings'),
- 'timezones' => $this->config->getTimezones(),
- 'default_columns' => implode(', ', $this->board->getDefaultColumns()),
- )));
+ $params['values'] = $this->config->getAll();
+ $params['errors'] = array();
+ $params['menu'] = 'config';
+ $params['config_content_for_layout'] = $this->template->load($template, $params);
+
+ return $this->template->layout('config_layout', $params);
}
/**
- * Validate and save settings
+ * Common method between pages
*
- * @access public
+ * @access private
+ * @param string $redirect Action to redirect after saving the form
*/
- public function save()
+ private function common($redirect)
{
- $values = $this->request->getValues();
- list($valid, $errors) = $this->config->validateModification($values);
+ if ($this->request->isPost()) {
- if ($valid) {
+ $values = $this->request->getValues();
if ($this->config->save($values)) {
$this->config->reload();
$this->session->flash(t('Settings saved successfully.'));
- } else {
+ }
+ else {
$this->session->flashError(t('Unable to save your settings.'));
}
- $this->response->redirect('?controller=config');
+ $this->response->redirect('?controller=config&action='.$redirect);
}
+ }
- $this->response->html($this->template->layout('config_index', array(
+ /**
+ * Display the about page
+ *
+ * @access public
+ */
+ public function index()
+ {
+ $this->response->html($this->layout('config_about', array(
'db_size' => $this->config->getDatabaseSize(),
+ 'title' => t('About'),
+ )));
+ }
+
+ /**
+ * Display the application settings page
+ *
+ * @access public
+ */
+ public function application()
+ {
+ $this->common('application');
+
+ $this->response->html($this->layout('config_application', array(
+ 'title' => t('Application settings'),
'languages' => $this->config->getLanguages(),
- 'values' => $values,
- 'errors' => $errors,
- 'menu' => 'config',
- 'title' => t('Settings'),
'timezones' => $this->config->getTimezones(),
+ )));
+ }
+
+ /**
+ * Display the board settings page
+ *
+ * @access public
+ */
+ public function board()
+ {
+ $this->common('board');
+
+ $this->response->html($this->layout('config_board', array(
+ 'title' => t('Board settings'),
'default_columns' => implode(', ', $this->board->getDefaultColumns()),
)));
}
/**
+ * Display the webhook settings page
+ *
+ * @access public
+ */
+ public function webhook()
+ {
+ $this->common('webhook');
+
+ $this->response->html($this->layout('config_webhook', array(
+ 'title' => t('Webhook settings'),
+ )));
+ }
+
+ /**
+ * Display the api settings page
+ *
+ * @access public
+ */
+ public function api()
+ {
+ $this->response->html($this->layout('config_api', array(
+ 'title' => t('API'),
+ )));
+ }
+
+ /**
* Download the Sqlite database
*
* @access public
@@ -89,15 +148,18 @@ class Config extends Base
}
/**
- * Regenerate all application tokens
+ * Regenerate webhook token
*
* @access public
*/
- public function tokens()
+ public function token()
{
+ $type = $this->request->getStringParam('type');
+
$this->checkCSRFParam();
- $this->config->regenerateTokens();
- $this->session->flash(t('All tokens have been regenerated.'));
- $this->response->redirect('?controller=config');
+ $this->config->regenerateToken($type.'_token');
+
+ $this->session->flash(t('Token regenerated.'));
+ $this->response->redirect('?controller=config&action='.$type);
}
}
diff --git a/app/Controller/User.php b/app/Controller/User.php
index cc7464e6..bbed9f6f 100644
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -73,7 +73,7 @@ class User extends Base
}
/**
- * Common layout for project views
+ * Common layout for user views
*
* @access private
* @param string $template Template name
diff --git a/app/Controller/Webhook.php b/app/Controller/Webhook.php
index c72dc983..71acab08 100644
--- a/app/Controller/Webhook.php
+++ b/app/Controller/Webhook.php
@@ -17,7 +17,7 @@ class Webhook extends Base
*/
public function task()
{
- if ($this->config->get('webhooks_token') !== $this->request->getStringParam('token')) {
+ if ($this->config->get('webhook_token') !== $this->request->getStringParam('token')) {
$this->response->text('Not Authorized', 401);
}
@@ -49,7 +49,7 @@ class Webhook extends Base
*/
public function github()
{
- if ($this->config->get('webhooks_token') !== $this->request->getStringParam('token')) {
+ if ($this->config->get('webhook_token') !== $this->request->getStringParam('token')) {
$this->response->text('Not Authorized', 401);
}
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 02:23:24 +0000