From 32d9c3b7905f4e43ffdf4bf2bf37723cfd18390c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 2 Sep 2018 13:19:58 +0200
Subject: Use mb_strcut (#1996)

* Use mb_strcut

Avoid cutting in the middle of a multi-byte UTF-8 character

* Forgotten php5-*

* Typo

* Whitespace

* More mb_strcut
---
 app/install.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/install.php')

diff --git a/app/install.php b/app/install.php
index c30f8d583..100360f82 100644
--- a/app/install.php
+++ b/app/install.php
@@ -462,6 +462,12 @@ function printStep1() {
 	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.xml.nok'); ?></p>
 	<?php } ?>
 
+	<?php if ($res['mbstring'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.mbstring.ok'); ?></p>
+	<?php } else { ?>
+	<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.mbstring.nok'); ?></p>
+	<?php } ?>
+
 	<?php if ($res['fileinfo'] == 'ok') { ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.fileinfo.ok'); ?></p>
 	<?php } else { ?>
-- 
cgit v1.2.3


From de4db714f5d232a80877addd3214c0cd7197c8d4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 8 Sep 2018 11:42:18 +0200
Subject: MySQL allow dash in database name (#2005)

Allow `-` in database name
https://diasp.eu.com/posts/d2e36450847101364cab0007cb0b6c8d
---
 app/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/install.php')

diff --git a/app/install.php b/app/install.php
index 100360f82..eec65be9c 100644
--- a/app/install.php
+++ b/app/install.php
@@ -651,7 +651,7 @@ function printStep3() {
 		<div class="form-group">
 			<label class="group-name" for="base"><?php echo _t('install.bdd'); ?></label>
 			<div class="group-controls">
-				<input type="text" id="base" name="base" maxlength="64" pattern="[0-9A-Za-z_]{1,64}" value="<?php echo isset($_SESSION['bd_base']) ? $_SESSION['bd_base'] : ''; ?>" tabindex="5" />
+				<input type="text" id="base" name="base" maxlength="64" pattern="[0-9A-Za-z_-]{1,64}" value="<?php echo isset($_SESSION['bd_base']) ? $_SESSION['bd_base'] : ''; ?>" tabindex="5" />
 			</div>
 		</div>
 
-- 
cgit v1.2.3