diff options
| author |  Joris Kinable <j.kinable@gmail.com>
| 2019-09-16 21:18:42 +0200 |
|---|---|---|
| committer |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-09-16 21:18:42 +0200 |
| commit | 80590daeb3627e5712be15fdc4bd98f0e2c40ea5 (patch) | |
| tree | d0e0b908ce31e0ab7d993e8326d257289b2a3133 | |
| parent | c76a318193cda63064625b2d92c719b7150d7d64 (diff) | |
Configure user defaults (#2490)
* new users inherit defaults from config-user.php
* installer creates ./data/config-user.php
* fixed typo
* .gitignore fix
* fixed style issues
* Fixed comments
* Update according to feedback
- rename file into `data/config-user.custom.php`
- make it optional (and so, don't copy it during installation)
* fixup! Update according to feedback
| -rw-r--r-- | app/Controllers/userController.php | 17 | ||||
| -rw-r--r-- | config-user.default.php | 3 | ||||
| -rw-r--r-- | data/.gitignore | 1 |
3 files changed, 18 insertions, 3 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index 96e4fec8c..69c1820e5 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -211,9 +211,20 @@ class FreshRSS_user_Controller extends Minz_ActionController { } } - public static function createUser($new_user_name, $email, $passwordPlain, $apiPasswordPlain, $userConfig = array(), $insertDefaultFeeds = true) { - if (!is_array($userConfig)) { - $userConfig = array(); + public static function createUser($new_user_name, $email, $passwordPlain, $apiPasswordPlain, $userConfigOverride = array(), $insertDefaultFeeds = true) { + $userConfig = array(); + + $customUserConfigPath = join_path(DATA_PATH, 'config-user.custom.php'); + if (file_exists($customUserConfigPath)) { + $customUserConfig = include($customUserConfigPath); + } + + if (is_array($customUserConfig)) { + $userConfig = $customUserConfig; + } + + if (is_array($userConfigOverride)) { + $userConfig = array_merge($userConfig, $userConfigOverride); } $ok = self::checkUsername($new_user_name); diff --git a/config-user.default.php b/config-user.default.php index d7149778d..950bef045 100644 --- a/config-user.default.php +++ b/config-user.default.php @@ -1,5 +1,8 @@ <?php +# Do not modify this file, which defines default values, but create a +# `./data/config-user.custom.php` file instead, containing the keys you want to +# override. return array ( 'language' => 'en', 'old_entries' => 3, diff --git a/data/.gitignore b/data/.gitignore index 0410f3797..1d2d8db89 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1,6 +1,7 @@ .htpasswd config.php config.php.bak.php +config-user.custom.php force-https.txt last_update.txt no-cache.txt |