1 files changed, 18 insertions, 50 deletions

diff --git a/app/Model/Config.php b/app/Model/Config.php
index 6561efc8..cf634f80 100644
--- a/app/Model/Config.php
+++ b/app/Model/Config.php
@@ -12,16 +12,9 @@ use Kanboard\Core\Session;
  * @package  model
  * @author   Frederic Guillot
  */
-class Config extends Base
+class Config extends Setting
 {
     /**
-     * SQL table name
-     *
-     * @var string
-     */
-    const TABLE = 'settings';
-
-    /**
      * Get available currencies
      *
      * @access public
@@ -170,8 +163,7 @@ class Config extends Base
     public function get($name, $default_value = '')
     {
         if (! Session::isOpen()) {
-            $value = $this->db->table(self::TABLE)->eq('option', $name)->findOneColumn('value');
-            return $value ?: $default_value;
+            return $this->getOption($name, $default_value);
         }
 
         // Cache config in session
@@ -187,43 +179,6 @@ class Config extends Base
     }
 
     /**
-     * Get all settings
-     *
-     * @access public
-     * @return array
-     */
-    public function getAll()
-    {
-        return $this->db->hashtable(self::TABLE)->getAll('option', 'value');
-    }
-
-    /**
-     * Save settings in the database
-     *
-     * @access public
-     * @param  $values  array   Settings values
-     * @return boolean
-     */
-    public function save(array $values)
-    {
-        foreach ($values as $option => $value) {
-
-            // Be sure that a trailing slash is there for the url
-            if ($option === 'application_url' && ! empty($value) && substr($value, -1) !== '/') {
-                $value .= '/';
-            }
-
-            $result = $this->db->table(self::TABLE)->eq('option', $option)->update(array('value' => $value));
-
-            if (! $result) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
      * Reload settings in the session and the translations
      *
      * @access public
@@ -310,8 +265,21 @@ class Config extends Base
      */
     public function regenerateToken($option)
     {
-        return $this->db->table(self::TABLE)
-                 ->eq('option', $option)
-                 ->update(array('value' => Security::generateToken()));
+        $this->save(array($option => Security::generateToken()));
+    }
+
+    /**
+     * Prepare data before save
+     *
+     * @access public
+     * @return array
+     */
+    public function prepare(array $values)
+    {
+        if (! empty($values['application_url']) && substr($values['application_url'], -1) !== '/') {
+            $values['application_url'] = $values['application_url'].'/';
+        }
+
+        return $values;
     }
 }