diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-07-25 16:51:48 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-07-25 16:51:48 +0200 |
| commit | 82611c9622ed23b0e9fcf5f9f651ddffa1fd7706 (patch) | |
| tree | fc2c97fd8dd84ec30473cb85b889d8326c9a831a /app/install.php | |
| parent | 744a9e8cf00aef7dec0acfa5f90f0dcfa2ef8837 (diff) | |
| parent | 042b40eeeea77db854daab1bec96fce5c2cdd4b2 (diff) | |
Merge pull request #2451 from FreshRSS/dev1.14.3
FreshRSS 1.14.3
Diffstat (limited to 'app/install.php')
| -rw-r--r-- | app/install.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/app/install.php b/app/install.php index b15cc76ea..961a7c171 100644 --- a/app/install.php +++ b/app/install.php @@ -125,7 +125,9 @@ function saveStep2() { $_SESSION['title'] = $system_default_config->title; $_SESSION['old_entries'] = param('old_entries', $user_default_config->old_entries); $_SESSION['auth_type'] = param('auth_type', 'form'); - $_SESSION['default_user'] = substr(preg_replace('/[^0-9a-zA-Z_]/', '', param('default_user', '')), 0, 38); + if (FreshRSS_user_Controller::checkUsername(param('default_user', ''))) { + $_SESSION['default_user'] = param('default_user', ''); + } $password_plain = param('passwordPlain', false); if ($password_plain !== false && cryptAvailable()) { @@ -605,18 +607,18 @@ function printStep3() { <label class="group-name" for="type"><?php echo _t('install.bdd.type'); ?></label> <div class="group-controls"> <select name="type" id="type" tabindex="1"> - <?php if (extension_loaded('pdo_mysql')) {?> - <option value="mysql" - <?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'mysql') ? 'selected="selected"' : ''; ?>> - MySQL - </option> - <?php }?> <?php if (extension_loaded('pdo_sqlite')) {?> <option value="sqlite" <?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'sqlite') ? 'selected="selected"' : ''; ?>> SQLite </option> <?php }?> + <?php if (extension_loaded('pdo_mysql')) {?> + <option value="mysql" + <?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'mysql') ? 'selected="selected"' : ''; ?>> + MySQL + </option> + <?php }?> <?php if (extension_loaded('pdo_pgsql')) {?> <option value="pgsql" <?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'pgsql') ? 'selected="selected"' : ''; ?>> @@ -722,6 +724,7 @@ case 5: <head> <meta charset="UTF-8" /> <meta name="viewport" content="initial-scale=1.0" /> + <script id="jsonVars" type="application/json">{}</script> <title><?php echo _t('install.title'); ?></title> <link rel="stylesheet" href="../themes/base-theme/template.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/base-theme/template.css'); ?>" /> <link rel="stylesheet" href="../themes/Origine/origine.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/Origine/origine.css'); ?>" /> |