summaryrefslogtreecommitdiff
path: root/app/Models/Configuration.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-19 22:25:49 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-19 22:25:49 +0100
commit4e4b0f717fe0a8378e2b751393a8c19d1ada6eb2 (patch)
tree6b268cfe46eb3eee8ebaddcd1e17067eaca0214f /app/Models/Configuration.php
parent12e0b6b094041fc22937520b3218e4f61915fd50 (diff)
parent79d4893fc792119c390d2f744246df210b74f637 (diff)
Merge remote-tracking branch 'origin/dev' into beta
Diffstat (limited to 'app/Models/Configuration.php')
-rw-r--r--app/Models/Configuration.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index c29e74603..f3fb76e72 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -9,6 +9,7 @@ class FreshRSS_Configuration {
'keep_history_default' => 0,
'mail_login' => '',
'token' => '',
+ 'passwordHash' => '', //CRYPT_BLOWFISH
'posts_per_page' => 20,
'view_mode' => 'normal',
'default_view' => 'not_read',
@@ -24,7 +25,7 @@ class FreshRSS_Configuration {
'scroll' => false,
'reception' => false,
),
- 'theme' => 'default',
+ 'theme' => 'Origine',
'shortcuts' => array(
'mark_read' => 'r',
'mark_favorite' => 'f',
@@ -162,6 +163,9 @@ class FreshRSS_Configuration {
}
}
}
+ public function _passwordHash ($value) {
+ $this->data['passwordHash'] = ctype_graph($value) && (strlen($value) >= 60) ? $value : '';
+ }
public function _mail_login ($value) {
$value = filter_var($value, FILTER_VALIDATE_EMAIL);
if ($value) {