From e95ea785476da70bfe893457c20bd7d5c9a3173b Mon Sep 17 00:00:00 2001
From: Pierre-Lin Bonnemaison <pierre.lin@free.fr>
Date: Sun, 16 Aug 2015 04:39:13 +0200
Subject: [PATCH] Gestion international
---
controllers/internalTools.php | 4 ++--
templates/contacts/add.php | 2 +-
templates/contacts/edit.php | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/controllers/internalTools.php b/controllers/internalTools.php
index 5942a68..4d33043 100755
--- a/controllers/internalTools.php
+++ b/controllers/internalTools.php
@@ -8,8 +8,8 @@
*/
public static function parsePhone($number)
{
- $number = preg_replace('#[^0-9+]#', '', $number);
- if (preg_match('#^(0|\+33)[1-9][0-9]{8}$#', $number))
+ $number = preg_replace('#[^-0-9+]#', '', $number);
+ if (preg_match('#^(0|\+[1-9]{1,3}|\+1\-[0-9]{3})[1-9][0-9]{8}$#', $number))
{
return $number;
}
diff --git a/templates/contacts/add.php b/templates/contacts/add.php
index b17a663..517c3a0 100755
--- a/templates/contacts/add.php
+++ b/templates/contacts/add.php
@@ -49,7 +49,7 @@
<label>Numéro de téléphone du contact</label>
<div class="form-group input-group">
<span class="input-group-addon"><span class="fa fa-phone"></span></span>
- <input name="phone" class="form-control" type="text" placeholder="Numéro du contact" pattern="((0[1-9])|(\+33( )?[0-9]))( ?)([0-9] ?){8}" required>
+ <input name="phone" class="form-control" type="text" placeholder="Numéro du contact" pattern="(0|\+[1-9]{1,3}|\+1\-[0-9]{3})[1-9][0-9]{8}" required>
</div>
</div>
<a class="btn btn-danger" href="<?php echo $this->generateUrl('contacts'); ?>">Annuler</a>
diff --git a/templates/contacts/edit.php b/templates/contacts/edit.php
index 9f8797e..90b151d 100755
--- a/templates/contacts/edit.php
+++ b/templates/contacts/edit.php
@@ -53,7 +53,7 @@
<label>Numéro de téléphone du contact</label>
<div class="form-group input-group">
<span class="input-group-addon"><span class="fa fa-phone"></span></span>
- <input name="contacts[<?php secho($contact['id']); ?>][phone]" class="form-control" type="text" placeholder="Numéro du contact" pattern="((0[1-9])|(\+33( )?[0-9]))( ?)([0-9] ?){8}" required value="<?php secho($contact['number']); ?>">
+ <input name="contacts[<?php secho($contact['id']); ?>][phone]" class="form-control" type="text" placeholder="Numéro du contact" pattern="(0|\+[1-9]{1,3}|\+1\-[0-9]{3})[1-9][0-9]{8}" required value="<?php secho($contact['number']); ?>">
</div>
</div>
<hr/>