<?php
-
-// FIXME! Namespaces...
-require_once 'ConfigIO.php';
-require_once 'ConfigJson.php';
-require_once 'ConfigPhp.php';
+namespace Shaarli\Config;
/**
* Class ConfigManager
*/
protected static $NOT_FOUND = 'NOT_FOUND';
+ public static $DEFAULT_PLUGINS = array('qrcode');
+
/**
* @var string Config folder.
*/
/**
* Constructor.
+ *
+ * @param string $configFile Configuration file path without extension.
*/
public function __construct($configFile = 'data/config')
{
* @param bool $write Write the new setting in the config file, default false.
* @param bool $isLoggedIn User login state, default false.
*
- * @throws Exception Invalid
+ * @throws \Exception Invalid
*/
public function set($setting, $value, $write = false, $isLoggedIn = false)
{
if (empty($setting) || ! is_string($setting)) {
- throw new Exception('Invalid setting key parameter. String expected, got: '. gettype($setting));
+ throw new \Exception('Invalid setting key parameter. String expected, got: '. gettype($setting));
}
// During the ConfigIO transition, map legacy settings to the new ones.
*
* @throws MissingFieldConfigException: a mandatory field has not been provided in $conf.
* @throws UnauthorizedConfigException: user is not authorize to change configuration.
- * @throws IOException: an error occurred while writing the new config file.
+ * @throws \IOException: an error occurred while writing the new config file.
*/
public function write($isLoggedIn)
{
'general.timezone',
'general.title',
'general.header_link',
- 'general.default_private_links',
- 'extras.redirector',
+ 'privacy.default_private_links',
+ 'redirector.url',
);
// Only logged in user can alter config.
*/
protected function setDefaultValues()
{
- $this->setEmpty('path.data_dir', 'data');
- $this->setEmpty('path.config', 'data/config.php');
- $this->setEmpty('path.datastore', 'data/datastore.php');
- $this->setEmpty('path.ban_file', 'data/ipbans.php');
- $this->setEmpty('path.updates', 'data/updates.txt');
- $this->setEmpty('path.log', 'data/log.txt');
- $this->setEmpty('path.update_check', 'data/lastupdatecheck.txt');
- $this->setEmpty('path.raintpl_tpl', 'tpl/');
- $this->setEmpty('path.raintpl_tmp', 'tmp/');
- $this->setEmpty('path.thumbnails_cache', 'cache');
- $this->setEmpty('path.page_cache', 'pagecache');
+ $this->setEmpty('resource.data_dir', 'data');
+ $this->setEmpty('resource.config', 'data/config.php');
+ $this->setEmpty('resource.datastore', 'data/datastore.php');
+ $this->setEmpty('resource.ban_file', 'data/ipbans.php');
+ $this->setEmpty('resource.updates', 'data/updates.txt');
+ $this->setEmpty('resource.log', 'data/log.txt');
+ $this->setEmpty('resource.update_check', 'data/lastupdatecheck.txt');
+ $this->setEmpty('resource.raintpl_tpl', 'tpl/');
+ $this->setEmpty('resource.theme', 'default');
+ $this->setEmpty('resource.raintpl_tmp', 'tmp/');
+ $this->setEmpty('resource.thumbnails_cache', 'cache');
+ $this->setEmpty('resource.page_cache', 'pagecache');
$this->setEmpty('security.ban_after', 4);
$this->setEmpty('security.ban_duration', 1800);
$this->setEmpty('security.session_protection_disabled', false);
+ $this->setEmpty('security.open_shaarli', false);
- $this->setEmpty('general.check_updates', false);
- $this->setEmpty('general.rss_permalinks', true);
- $this->setEmpty('general.links_per_page', 20);
- $this->setEmpty('general.default_private_links', false);
- $this->setEmpty('general.enable_thumbnails', true);
- $this->setEmpty('general.enable_localcache', true);
- $this->setEmpty('general.check_updates_branch', 'stable');
- $this->setEmpty('general.check_updates_interval', 86400);
$this->setEmpty('general.header_link', '?');
- $this->setEmpty('general.enabled_plugins', array('qrcode'));
+ $this->setEmpty('general.links_per_page', 20);
+ $this->setEmpty('general.enabled_plugins', self::$DEFAULT_PLUGINS);
+
+ $this->setEmpty('updates.check_updates', false);
+ $this->setEmpty('updates.check_updates_branch', 'stable');
+ $this->setEmpty('updates.check_updates_interval', 86400);
+
+ $this->setEmpty('feed.rss_permalinks', true);
+ $this->setEmpty('feed.show_atom', false);
+
+ $this->setEmpty('privacy.default_private_links', false);
+ $this->setEmpty('privacy.hide_public_links', false);
+ $this->setEmpty('privacy.hide_timestamps', false);
+
+ $this->setEmpty('thumbnail.enable_thumbnails', true);
+ $this->setEmpty('thumbnail.enable_localcache', true);
- $this->setEmpty('extras.show_atom', false);
- $this->setEmpty('extras.hide_public_links', false);
- $this->setEmpty('extras.hide_timestamps', false);
- $this->setEmpty('extras.open_shaarli', false);
- $this->setEmpty('extras.redirector', '');
- $this->setEmpty('extras.redirector_encode_url', true);
+ $this->setEmpty('redirector.url', '');
+ $this->setEmpty('redirector.encode_url', true);
$this->setEmpty('plugins', array());
}
/**
* Exception used if a mandatory field is missing in given configuration.
*/
-class MissingFieldConfigException extends Exception
+class MissingFieldConfigException extends \Exception
{
public $field;
/**
* Exception used if an unauthorized attempt to edit configuration has been made.
*/
-class UnauthorizedConfigException extends Exception
+class UnauthorizedConfigException extends \Exception
{
/**
* Construct exception.