diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-15 22:32:57 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-15 22:32:57 +0100 |
| commit | e9168f6cd21d7e95aff183f2a503911a1208a0af (patch) | |
| tree | cc947082fc545b5847bec81e35b32048966022fa | |
| parent | 6d8e05713a5ef8278fde3748bf2fad1a5223eb46 (diff) | |
Suppression du champs "sel" lors de l'installation
Génération d'un sel basé sur le temps à la place. Pas parfait mais
sûrement suffisant pour FreshRSS
| -rw-r--r-- | public/install.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/public/install.php b/public/install.php index 5b0618c37..dba088148 100644 --- a/public/install.php +++ b/public/install.php @@ -137,13 +137,13 @@ function saveLanguage () { } function saveStep2 () { if (!empty ($_POST)) { - if (empty ($_POST['sel']) || - empty ($_POST['title']) || + if (empty ($_POST['title']) || empty ($_POST['old_entries'])) { return false; } - $_SESSION['sel'] = addslashes ($_POST['sel']); + $first_sel = small_hash (time ()); + $_SESSION['sel'] = small_hash (time () . $first_sel) . $first_sel; $_SESSION['base_url'] = addslashes ($_POST['base_url']); $_SESSION['title'] = addslashes ($_POST['title']); $_SESSION['old_entries'] = $_POST['old_entries']; @@ -481,17 +481,11 @@ function printStep2 () { <form action="index.php?step=2" method="post"> <legend><?php echo _t ('general_configuration'); ?></legend> - <div class="form-group"> - <label class="group-name" for="sel"><?php echo _t ('random_string'); ?></label> - <div class="group-controls"> - <input type="text" id="sel" name="sel" value="<?php echo isset ($_SESSION['sel']) ? $_SESSION['sel'] : '123~abcdefghijklmnopqrstuvwxyz~321'; ?>" /> <i class="icon i_help"></i> <?php echo _t ('change_value'); ?> - </div> - </div> - <?php $url = substr ($_SERVER['PHP_SELF'], 0, -10); ?> <div class="form-group" style="display:none"> + <!-- TODO: if no problem during version 0.6, remove for version 0.7 --> <label class="group-name" for="base_url"><?php echo _t ('base_url'); ?></label> <div class="group-controls"> <input type="text" id="base_url" name="base_url" value="<?php echo isset ($_SESSION['base_url']) ? $_SESSION['base_url'] : $url; ?>" /> <i class="icon i_help"></i> <?php echo _t ('do_not_change_if_doubt'); ?> |