summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-05 16:54:16 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-05 16:54:16 +0100
commit51a71ec4b9d62528054be8faee1576a8fd6d37f6 (patch)
treef92299dd5314aef43e9e69e8fde317b9b7790213 /data
parent7584364a4c2b407e97909e94ba274da62620abea (diff)
New configuration system (not working yet)
- Use only Minz_Configuration - register() method to load a new configuration file - get() to get a configuration - new exceptions related to configuration - fix a list configuration calls to have FRSS working Current problems to resolve: - How to handle configuration param verifications (i.e. check auth_type is a value from none, http_auth, persona or form) - We must use $conf = Minz_Configuration::get('system'); $general_conf = $conf->general; to access global system configuration which is quite annoying. How to change that? See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'data')
-rw-r--r--data/config.default.php32
-rw-r--r--data/users/_/config.default.php66
2 files changed, 98 insertions, 0 deletions
diff --git a/data/config.default.php b/data/config.default.php
new file mode 100644
index 000000000..a69d8050b
--- /dev/null
+++ b/data/config.default.php
@@ -0,0 +1,32 @@
+<?php
+
+return array(
+ 'general' => array(
+ 'environment' => 'production',
+ 'salt' => '',
+ 'base_url' => '',
+ 'language' => 'en',
+ 'title' => 'FreshRSS',
+ 'default_user' => '_',
+ 'allow_anonymous' => false,
+ 'allow_anonymous_refresh' => false,
+ 'auth_type' => 'none',
+ 'api_enabled' => false,
+ 'unsafe_autologin_enabled' => false,
+ ),
+ 'limits' => array(
+ 'cache_duration' => 800,
+ 'timeout' => 10,
+ 'max_inactivity' => PHP_INT_MAX,
+ 'max_feeds' => 16384,
+ 'max_categories' => 16384,
+ ),
+ 'db' => array(
+ 'type' => 'sqlite',
+ 'host' => '',
+ 'user' => '',
+ 'password' => '',
+ 'base' => '',
+ 'prefix' => '',
+ ),
+);
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
new file mode 100644
index 000000000..56d54b293
--- /dev/null
+++ b/data/users/_/config.default.php
@@ -0,0 +1,66 @@
+<?php
+
+return array (
+ 'language' => 'en',
+ 'old_entries' => 3,
+ 'keep_history_default' => 0,
+ 'ttl_default' => 3600,
+ 'mail_login' => '',
+ 'token' => '',
+ 'passwordHash' => '',
+ 'apiPasswordHash' => '',
+ 'posts_per_page' => 20,
+ 'view_mode' => 'normal',
+ 'default_view' => 'adaptive',
+ 'default_state' => FreshRSS_Entry::STATE_NOT_READ,
+ 'auto_load_more' => true,
+ 'display_posts' => false,
+ 'display_categories' => false,
+ 'hide_read_feeds' => true,
+ 'onread_jump_next' => true,
+ 'lazyload' => true,
+ 'sticky_post' => true,
+ 'reading_confirm' => false,
+ 'auto_remove_article' => false,
+ 'sort_order' => 'DESC',
+ 'anon_access' => false,
+ 'mark_when' => array (
+ 'article' => true,
+ 'site' => true,
+ 'scroll' => false,
+ 'reception' => false,
+ ),
+ 'theme' => 'Origine',
+ 'content_width' => 'thin',
+ 'shortcuts' => array (
+ 'mark_read' => 'r',
+ 'mark_favorite' => 'f',
+ 'go_website' => 'space',
+ 'next_entry' => 'j',
+ 'prev_entry' => 'k',
+ 'first_entry' => 'home',
+ 'last_entry' => 'end',
+ 'collapse_entry' => 'c',
+ 'load_more' => 'm',
+ 'auto_share' => 's',
+ 'focus_search' => 'a',
+ 'user_filter' => 'u',
+ 'help' => 'f1',
+ 'close_dropdown' => 'escape',
+ ),
+ 'topline_read' => true,
+ 'topline_favorite' => true,
+ 'topline_date' => true,
+ 'topline_link' => true,
+ 'bottomline_read' => true,
+ 'bottomline_favorite' => true,
+ 'bottomline_sharing' => true,
+ 'bottomline_tags' => true,
+ 'bottomline_date' => true,
+ 'bottomline_link' => true,
+ 'sharing' => array (
+ ),
+ 'queries' => array (
+ ),
+ 'html5_notif_timeout' => 0,
+);