1 files changed, 25 insertions, 33 deletions

diff --git a/app/Controller/Config.php b/app/Controller/Config.php
index 47b844e4..e811f870 100644
--- a/app/Controller/Config.php
+++ b/app/Controller/Config.php
@@ -11,24 +11,6 @@ namespace Kanboard\Controller;
 class Config extends Base
 {
     /**
-     * Common layout for config views
-     *
-     * @access private
-     * @param  string    $template   Template name
-     * @param  array     $params     Template parameters
-     * @return string
-     */
-    private function layout($template, array $params)
-    {
-        $params['board_selector'] = $this->projectPermission->getAllowedProjects($this->userSession->getId());
-        $params['values'] = $this->config->getAll();
-        $params['errors'] = array();
-        $params['config_content_for_layout'] = $this->template->render($template, $params);
-
-        return $this->template->layout('config/layout', $params);
-    }
-
-    /**
      * Common method between pages
      *
      * @access private
@@ -40,8 +22,16 @@ class Config extends Base
             $values =  $this->request->getValues();
 
             switch ($redirect) {
+                case 'application':
+                    $values += array('password_reset' => 0);
+                    break;
                 case 'project':
-                    $values += array('subtask_restriction' => 0, 'subtask_time_tracking' => 0, 'cfd_include_closed_tasks' => 0);
+                    $values += array(
+                        'subtask_restriction' => 0,
+                        'subtask_time_tracking' => 0,
+                        'cfd_include_closed_tasks' => 0,
+                        'disable_private_project' => 0,
+                    );
                     break;
                 case 'integrations':
                     $values += array('integration_gravatar' => 0);
@@ -53,9 +43,9 @@ class Config extends Base
 
             if ($this->config->save($values)) {
                 $this->config->reload();
-                $this->session->flash(t('Settings saved successfully.'));
+                $this->flash->success(t('Settings saved successfully.'));
             } else {
-                $this->session->flashError(t('Unable to save your settings.'));
+                $this->flash->failure(t('Unable to save your settings.'));
             }
 
             $this->response->redirect($this->helper->url->to('config', $redirect));
@@ -69,7 +59,7 @@ class Config extends Base
      */
     public function index()
     {
-        $this->response->html($this->layout('config/about', array(
+        $this->response->html($this->helper->layout->config('config/about', array(
             'db_size' => $this->config->getDatabaseSize(),
             'title' => t('Settings').' > '.t('About'),
         )));
@@ -82,7 +72,7 @@ class Config extends Base
      */
     public function plugins()
     {
-        $this->response->html($this->layout('config/plugins', array(
+        $this->response->html($this->helper->layout->config('config/plugins', array(
             'plugins' => $this->pluginLoader->plugins,
             'title' => t('Settings').' > '.t('Plugins'),
         )));
@@ -97,10 +87,12 @@ class Config extends Base
     {
         $this->common('application');
 
-        $this->response->html($this->layout('config/application', array(
+        $this->response->html($this->helper->layout->config('config/application', array(
             'languages' => $this->config->getLanguages(),
             'timezones' => $this->config->getTimezones(),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
+            'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
+            'datetime_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateTimeFormats()),
+            'time_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getTimeFormats()),
             'title' => t('Settings').' > '.t('Application settings'),
         )));
     }
@@ -114,7 +106,7 @@ class Config extends Base
     {
         $this->common('project');
 
-        $this->response->html($this->layout('config/project', array(
+        $this->response->html($this->helper->layout->config('config/project', array(
             'colors' => $this->color->getList(),
             'default_columns' => implode(', ', $this->board->getDefaultColumns()),
             'title' => t('Settings').' > '.t('Project settings'),
@@ -130,7 +122,7 @@ class Config extends Base
     {
         $this->common('board');
 
-        $this->response->html($this->layout('config/board', array(
+        $this->response->html($this->helper->layout->config('config/board', array(
             'title' => t('Settings').' > '.t('Board settings'),
         )));
     }
@@ -144,7 +136,7 @@ class Config extends Base
     {
         $this->common('calendar');
 
-        $this->response->html($this->layout('config/calendar', array(
+        $this->response->html($this->helper->layout->config('config/calendar', array(
             'title' => t('Settings').' > '.t('Calendar settings'),
         )));
     }
@@ -158,7 +150,7 @@ class Config extends Base
     {
         $this->common('integrations');
 
-        $this->response->html($this->layout('config/integrations', array(
+        $this->response->html($this->helper->layout->config('config/integrations', array(
             'title' => t('Settings').' > '.t('Integrations'),
         )));
     }
@@ -172,7 +164,7 @@ class Config extends Base
     {
         $this->common('webhook');
 
-        $this->response->html($this->layout('config/webhook', array(
+        $this->response->html($this->helper->layout->config('config/webhook', array(
             'title' => t('Settings').' > '.t('Webhook settings'),
         )));
     }
@@ -184,7 +176,7 @@ class Config extends Base
      */
     public function api()
     {
-        $this->response->html($this->layout('config/api', array(
+        $this->response->html($this->helper->layout->config('config/api', array(
             'title' => t('Settings').' > '.t('API'),
         )));
     }
@@ -210,7 +202,7 @@ class Config extends Base
     {
         $this->checkCSRFParam();
         $this->config->optimizeDatabase();
-        $this->session->flash(t('Database optimization done.'));
+        $this->flash->success(t('Database optimization done.'));
         $this->response->redirect($this->helper->url->to('config', 'index'));
     }
 
@@ -226,7 +218,7 @@ class Config extends Base
         $this->checkCSRFParam();
         $this->config->regenerateToken($type.'_token');
 
-        $this->session->flash(t('Token regenerated.'));
+        $this->flash->success(t('Token regenerated.'));
         $this->response->redirect($this->helper->url->to('config', $type));
     }
 }