summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/i18n/en.php5
-rw-r--r--app/i18n/fr.php5
-rw-r--r--app/i18n/install.en.php2
-rw-r--r--app/i18n/install.fr.php2
-rw-r--r--app/views/configure/users.phtml4
-rw-r--r--p/i/install.php75
6 files changed, 68 insertions, 25 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php
index c90563036..6dc7a4acf 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -160,8 +160,8 @@ return array (
'think_to_add' => '<a href="./?c=configure&amp;a=feed">Remember to add some RSS feeds!</a>',
'current_user' => 'Current user',
- 'default_user' => 'Username of the default user (maximum 16 alphanumeric characters)',
- 'password' =>'Password<br /><small>(for the Web-form login method)</small>',
+ 'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
+ 'password_form' =>'Password<br /><small>(for the Web-form login method)</small>',
'persona_connection_email' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
'allow_anonymous' => 'Allow anonymous reading for the default user (%s)',
'auth_token' => 'Authentication token',
@@ -176,6 +176,7 @@ return array (
'users_list' => 'List of users',
'create_user' => 'Create new user',
'username' => 'Username',
+ 'password' => 'Password',
'create' => 'Create',
'user_created' => 'User %s has been created',
'user_deleted' => 'User %s has been deleted',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 37f847f4d..16d93a59a 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -160,8 +160,8 @@ return array (
'think_to_add' => '<a href="./?c=configure&amp;a=feed">Pensez à en ajouter !</a>',
'current_user' => 'Utilisateur actuel',
- 'password' =>'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
- 'default_user' => 'Nom de l’utilisateur par défaut (16 caractères alphanumériques maximum)',
+ 'password_form' =>'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+ 'default_user' => 'Nom de l’utilisateur par défaut <small>(16 caractères alphanumériques maximum)</small>',
'persona_connection_email' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
'allow_anonymous' => 'Autoriser la lecture anonyme pour l’utilisateur par défaut (%s)',
'auth_token' => 'Jeton d’identification',
@@ -176,6 +176,7 @@ return array (
'users_list' => 'Liste des utilisateurs',
'create_user' => 'Créer un nouvel utilisateur',
'username' => 'Nom d’utilisateur',
+ 'password' => 'Mot de passe',
'create' => 'Créer',
'user_created' => 'L’utilisateur %s a été créé',
'user_deleted' => 'L’utilisateur %s a été supprimé',
diff --git a/app/i18n/install.en.php b/app/i18n/install.en.php
index 24335c6c9..1c24c7d7e 100644
--- a/app/i18n/install.en.php
+++ b/app/i18n/install.en.php
@@ -53,8 +53,6 @@ return array (
'bdd_conf_is_ok' => 'Database configuration has been saved.',
'bdd_conf_is_ko' => 'Verify your database information.',
'host' => 'Host',
- 'username' => 'Username',
- 'password' => 'Password',
'bdd' => 'Database',
'prefix' => 'Table prefix',
diff --git a/app/i18n/install.fr.php b/app/i18n/install.fr.php
index 554d17587..68927df6d 100644
--- a/app/i18n/install.fr.php
+++ b/app/i18n/install.fr.php
@@ -53,8 +53,6 @@ return array (
'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
'bdd_conf_is_ko' => 'Vérifiez les informations d’accès à la base de données.',
'host' => 'Hôte',
- 'username' => 'Nom utilisateur',
- 'password' => 'Mot de passe',
'bdd' => 'Base de données',
'prefix' => 'Préfixe des tables',
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index 0419df747..602dfaf62 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -18,7 +18,7 @@
</div>
<div class="form-group">
- <label class="group-name" for="passwordPlain"><?php echo Minz_Translate::t('password'); ?></label>
+ <label class="group-name" for="passwordPlain"><?php echo Minz_Translate::t('password_form'); ?></label>
<div class="group-controls">
<input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" />
<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
@@ -140,7 +140,7 @@
</div>
<div class="form-group">
- <label class="group-name" for="new_user_passwordPlain"><?php echo Minz_Translate::t('password'); ?></label>
+ <label class="group-name" for="new_user_passwordPlain"><?php echo Minz_Translate::t('password_form'); ?></label>
<div class="group-controls">
<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" pattern=".{7,}" />
<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
diff --git a/p/i/install.php b/p/i/install.php
index 08ed9ccb9..294231fc0 100644
--- a/p/i/install.php
+++ b/p/i/install.php
@@ -1,5 +1,11 @@
<?php
+if (function_exists('opcache_reset')) {
+ opcache_reset();
+}
+
require('../../constants.php');
+const BCRYPT_COST = 9;
+
include(LIB_PATH . '/lib_rss.php');
session_name('FreshRSS');
@@ -149,6 +155,7 @@ function saveStep2 () {
if (!empty ($_POST)) {
if (empty ($_POST['title']) ||
empty ($_POST['old_entries']) ||
+ empty ($_POST['auth_type']) ||
empty ($_POST['default_user'])) {
return false;
}
@@ -161,6 +168,12 @@ function saveStep2 () {
}
$_SESSION['mail_login'] = filter_var($_POST['mail_login'], FILTER_VALIDATE_EMAIL);
$_SESSION['default_user'] = substr(preg_replace('/[^a-zA-Z0-9]/', '', $_POST['default_user']), 0, 16);
+ $_SESSION['auth_type'] = $_POST['auth_type'];
+ if (!empty($_POST['passwordPlain'])) {
+ $passwordHash = password_hash($_POST['passwordPlain'], PASSWORD_BCRYPT, array('cost' => BCRYPT_COST));
+ $passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash); //Compatibility with bcrypt.js
+ $_SESSION['passwordHash'] = $passwordHash;
+ }
$token = '';
if ($_SESSION['mail_login']) {
@@ -169,8 +182,10 @@ function saveStep2 () {
$config_array = array (
'language' => $_SESSION['language'],
+ 'theme' => $_SESSION['theme'],
'old_entries' => $_SESSION['old_entries'],
'mail_login' => $_SESSION['mail_login'],
+ 'passwordHash' => $_SESSION['passwordHash'],
'token' => $token,
);
@@ -214,7 +229,7 @@ function saveStep3 () {
'title' => $_SESSION['title'],
'default_user' => $_SESSION['default_user'],
'auth_type' => $_SESSION['auth_type'],
- 'allow_anonymous' => $_SESSION['allow_anonymous'],
+ 'allow_anonymous' => isset($_SESSION['allow_anonymous']) ? $_SESSION['allow_anonymous'] : false,
),
'db' => array(
'type' => $_SESSION['bd_type'],
@@ -466,21 +481,11 @@ function checkStep0 () {
} else {
$userConfig = array();
}
- if (isset($userConfig['theme'])) {
- switch (strtolower($userConfig['theme'])) {
- case 'default': //v0.6
- $userConfig['theme'] = 'Origine';
- break;
- case 'flat-design': //v0.6
- $userConfig['theme'] = 'Flat';
- break;
- case 'default_dark': //v0.6
- $userConfig['theme'] = 'Dark';
- break;
- }
+ if (empty($_SESSION['auth_type'])) { //v0.7b
+ $_SESSION['auth_type'] = '';
}
- $keys = array('language', 'old_entries', 'mail_login');
+ $keys = array('language', 'theme', 'old_entries', 'mail_login', 'passwordHash');
foreach ($keys as $key) {
if ((!isset($_SESSION[$key])) && isset($userConfig[$key])) {
$_SESSION[$key] = $userConfig[$key];
@@ -491,6 +496,25 @@ function checkStep0 () {
$language = isset ($_SESSION['language']) &&
isset ($languages[$_SESSION['language']]);
+ if (empty($_SESSION['passwordHash'])) { //v0.7b
+ $_SESSION['passwordHash'] = '';
+ }
+ if (empty($_SESSION['theme'])) {
+ $_SESSION['theme'] = 'Origine';
+ } else {
+ switch (strtolower($_SESSION['theme'])) {
+ case 'default': //v0.7b
+ $_SESSION['theme'] = 'Origine';
+ break;
+ case 'flat-design': //v0.7b
+ $_SESSION['theme'] = 'Flat';
+ break;
+ case 'default_dark': //v0.7b
+ $_SESSION['theme'] = 'Dark';
+ break;
+ }
+ }
+
return array (
'language' => $language ? 'ok' : 'ko',
'all' => $language ? 'ok' : 'ko'
@@ -778,9 +802,30 @@ function printStep2 () {
</div>
<div class="form-group">
+ <label class="group-name" for="auth_type"><?php echo _t('auth_type'); ?></label>
+ <div class="group-controls">
+ <select id="auth_type" name="auth_type" required="required">
+ <option value=""></option>
+ <option value="form"<?php echo $_SESSION['auth_type'] === 'form' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_form'); ?></option>
+ <option value="persona"<?php echo $_SESSION['auth_type'] === 'persona' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
+ <option value="http_auth"<?php echo $_SESSION['auth_type'] === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+ <option value="none"<?php echo $_SESSION['auth_type'] === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
+ <div class="group-controls">
+ <input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" />
+ <noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
+ </div>
+ </div>
+
+ <div class="form-group">
<label class="group-name" for="mail_login"><?php echo _t ('persona_connection_email'); ?></label>
<div class="group-controls">
- <input type="email" id="mail_login" name="mail_login" value="<?php echo isset ($_SESSION['mail_login']) ? $_SESSION['mail_login'] : ''; ?>" placeholder="<?php echo _t ('blank_to_disable'); ?>" />
+ <input type="email" id="mail_login" name="mail_login" value="<?php echo isset ($_SESSION['mail_login']) ? $_SESSION['mail_login'] : ''; ?>" placeholder="alice@example.net" />
<noscript><b><?php echo _t ('javascript_should_be_activated'); ?></b></noscript>
</div>
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 11:58:26 +0000